eta1.6.5

src/views/dataEntry_manage/databaseComponents/batchComputedV2.vue

@@ -0,0 +1,127 @@
+<template>
+    <el-dialog
+		:visible.sync="isShow"
+		:close-on-click-modal="false"
+		:modal-append-to-body="false"
+		@close="handleClose"
+		custom-class="batch-computed-dialog fit-screen-dialog"
+		center
+		top="5vh"
+		v-dialogDrag
+        title="批量计算-选择指标和计算公式"
+	>
+        <div class="batch-computed-wrap">
+            <div class="type-wrap">
+                <div>
+                    <span>计算公式</span>
+                    <el-select v-model="computedType" placeholder="请选择">
+                        <el-option 
+                            v-for="opt in computedBatchTypes" 
+                            :key="opt.type" 
+                            :label="opt.name"
+                            :value="opt.type"
+                        />
+                    </el-select>
+                </div>
+                <div>
+
+                </div>
+            </div>
+            <div class="table-wrap">
+                <div class="left-box">
+                    <p style="margin-bottom:20px">待选指标（选择指标数量不超过50）</p>
+                    <el-cascader
+						v-model="filter.classify"
+						:options="classifyOpt"
+						:props="classifyProps"
+						clearable
+						placeholder="指标分类"
+                        style="width: 200px"
+					/>
+                    <el-select
+						v-model="filter.frequency"
+						placeholder="请选择频率"
+						style="width: 200px"
+						clearable
+					>
+						<el-option
+							v-for="item in frequencyArr"
+							:key="item"
+							:label="item"
+							:value="item"
+						>
+						</el-option>
+					</el-select>
+                    <el-cascader
+						v-model="filter.classify"
+						:options="classifyOpt"
+						:props="classifyProps"
+						clearable
+						placeholder="创建人"
+                        style="width: 200px"
+					/>
+                    <el-input 
+                        placeholder="指标ID/指标名称" 
+                        v-model="filter.keyword"
+                        style="width: 200px"
+                    >
+                        <i slot="prefix" class="el-input__icon el-icon-search"></i>
+                    </el-input>
+                    
+                </div>
+            </div>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import {computedBatchTypesV2} from './util'
+export default {
+    props:{
+        isShow:{
+            type: Boolean
+        },
+    },
+    data() {
+        return {
+            computedBatchTypes:computedBatchTypesV2,
+            computedType:computedBatchTypesV2[0].type,
+
+            filter:{
+                classify:'',
+                frequency:'',
+                user:'',
+                keyword:''
+            },
+
+            frequencyArr: ['日度', '周度','旬度','月度', '季度', '年度'],
+            classifyOpt: [],
+			classifyProps: {
+				label: 'ClassifyName',
+				value: 'ClassifyId',
+				children: 'Children',
+				checkStrictly: true
+			},
+        }
+    },
+    
+    methods: {
+        handleClose(){
+            this.$emit('close')
+        }
+    },
+}
+</script>
+
+<style lang="scss">
+.batch-computed-dialog{
+    max-width: 1200px;
+    width:85vw;
+	overflow: hidden;
+}
+.batch-computed-wrap{
+    .table-wrap{
+        margin-top: 50px;
+    }
+}
+</style>

src/views/dataEntry_manage/databaseComponents/computedDialog.vue

@@ -260,8 +260,11 @@ import { dataBaseInterface } from '@/api/api.js';
 import * as preDictEdbInterface from '@/api/modules/predictEdbApi.js';
 import { formRules } from '../databaseComponents/util';
 import { unitArr } from '@/utils/defaultOptions';
-const tag_arr = [];
-for(let i=0;i<26;i++) tag_arr.push(String.fromCharCode(65+i));
+import {generateSeriesArray} from './util'
+const MAXEDBNUM=50//最大可添加的指标数量
+const tag_arr = generateSeriesArray();
+
+// for(let i=0;i<26;i++) tag_arr.push(String.fromCharCode(65+i));
 export default {
 	name: '',
 	props: {
@@ -355,14 +358,26 @@ export default {
 
 		'addList':{
 			handler(n){
+				if(this.selectTimeSeriesVal=='all_edb') return
+				const arr=this.addList.filter(item=>item.target).map(item=>{
+					return {
+						label:`指标${item.tag}`,
+						value:item.tag
+					}
+				})
+				if(!arr.length) return
 				if(!this.selectTimeSeriesVal){
-					const arr=this.addList.filter(item=>item.target).map(item=>{
-						return {
-							label:`指标${item.tag}`,
-							value:item.tag
+					this.selectTimeSeriesVal=arr[0].value
+				}else{//已经有选择的值了
+					let flag=false
+					arr.forEach(item=>{
+						if(item.value==this.selectTimeSeriesVal){
+							flag=true
 						}
 					})
-					this.selectTimeSeriesVal=arr[0].value
+					if(!flag){
+						this.selectTimeSeriesVal=arr[0].value
+					}
 				}
 			},
 			deep:true
@@ -478,7 +493,8 @@ export default {
 		},
 		/* 添加额外的指标列 */
 		addTargetHandle() {
-			if(this.addList.length >= 26) return this.$message.warning('添加指标个数已达上限')
+			const MAXNUM=this.edbSource === 'predict'?26:MAXEDBNUM
+			if(this.addList.length >=MAXNUM) return this.$message.warning('添加指标个数已达上限')
 			let tag = this.addList[this.addList.length-1].tag;
 			let index = tag_arr.findIndex(item => item === tag);
 			const item = {

src/views/dataEntry_manage/databaseComponents/diffusionIndexDia.vue

@@ -150,11 +150,12 @@
 
 <script>
 import { dataBaseInterface } from '@/api/api.js';
-import { formRules } from './util';
+import { formRules,generateSeriesArray } from './util';
 import * as preDictEdbInterface from '@/api/modules/predictEdbApi.js';
 import { unitArr } from '@/utils/defaultOptions';
-const tag_arr = [];
-for(let i=0;i<26;i++) tag_arr.push(String.fromCharCode(65+i));
+const MAXEDBNUM=50//最大可添加的指标数量
+const tag_arr = generateSeriesArray();
+// for(let i=0;i<26;i++) tag_arr.push(String.fromCharCode(65+i));
 export default {
 	name:'',
 	props: {
@@ -371,7 +372,8 @@ export default {
 
 		/* 添加指标 */
 		addTargetHandle() {
-			if(this.targetList.length === 26) return this.$message.warning('添加指标个数已达上限')
+			const NUM=this.isPredict?26:MAXEDBNUM
+			if(this.targetList.length === NUM) return this.$message.warning('添加指标个数已达上限')
 			let tag = this.targetList[this.targetList.length-1].tag;
 			let index = tag_arr.findIndex(item => item === tag);
 			const item = {

src/views/dataEntry_manage/databaseComponents/util.js

@@ -153,6 +153,50 @@ export const computedBatchTypes = [
 	}
 ]
 
+//批量指标类型
+export const computedBatchTypesV2=[
+	{
+		name:'同比值',
+		type:6
+	},
+	{
+		name:'同差值',
+		type:7
+	},
+	{
+		name:'N数值移动平均计算',
+		type:8
+	},
+	{
+		name:'N数值环比值',
+		type:12
+	},
+	{
+		name:'N数值环差值',
+		type:13
+	},
+	{
+		name:'升频',
+		type:14
+	},
+	{
+		name:'累计值转月/季值',
+		type:'toMonthSeason'
+	},
+	{
+		name: '累计值',
+		type: 'accumulate'
+	},
+	{
+		name:'指数修匀',
+		type:'alpha'
+	},
+	{
+		name:'日均值',
+		type: 75
+	}
+]
+
 //频度
 export const frequencyArr = ['日度','周度','旬度','月度','季度','年度']
 //添加基础指标来源 已改为从接口获取 datamanage/edb_source/list
@@ -485,4 +529,21 @@ export const THSCommonIndexFuturesCodeArr=[
 	{value:'ths_chg_ratio_future',label:"涨跌幅"},
 	{value:'ths_swing_d_future',label:"日振幅"},
 	{value:'ths_open_interest_future',label:"持仓量"},
-]
+]
+
+// 生成序列数组
+export function generateSeriesArray(){
+	let result = [];
+	const alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+	for(let i=0;i<26;i++) result.push(String.fromCharCode(65+i))
+	for (let i = 0; i < 26; i++) {
+		const firstChar = alphabet[i];
+
+		for (let j = 0; j < 26; j++) {
+			const secondChar = alphabet[j];
+			result.push(firstChar + secondChar);
+		}
+	}
+
+	return result;
+}

src/views/dataEntry_manage/databaseList.vue

@@ -384,7 +384,7 @@
 			</div>
 			<ul class="computed-ul">
 				<li
-					:class="['cpmputed-li',{'act':item.type === computed_type}]" 
+					:class="['cpmputed-li',item.type === computed_type?'act':'']" 
 					v-for="item in computedTypes" 
 					:key="item.type" 
 					@click="changeComputedType(item.type)">
@@ -498,6 +498,9 @@
 			@addCallBack="addComputedCallBack"
 			@lookHistory="id => {toHistoryPage(id,$route.matched);lookEdbId=id;}"
 		/>
+
+		<!-- 批量计算指标 -->
+		<batchComputedV2 :isShow="showBatchComputedPop" />
 	</div>
 </template>
 
@@ -526,6 +529,7 @@ import EdbLabelList from '@/components/edbLabelList.vue';
 import chartTrendRender from './databaseComponents/chartTrendRender.vue';
 import edbDetailData from './databaseComponents/edbDetailData.vue';
 import SmoothEdbDialog from './databaseComponents/smoothEdbDialog.vue';
+import batchComputedV2 from './databaseComponents/batchComputedV2.vue';
 export default {
 	name: '',
 	components: {
@@ -550,6 +554,7 @@ export default {
 		chartTrendRender,
 		edbDetailData,
 		SmoothEdbDialog,
+		batchComputedV2
 	},
 	directives: {
 		drag(el, bindings,vnode) {
@@ -739,6 +744,8 @@ export default {
 			activeName:'second',
 
 			isMainLeftShow:true,
+
+			showBatchComputedPop:false,
 		};
 	},
 	watch: {