ETA1.6.5

src/views/dataEDB/Detail.vue

@@ -101,6 +101,10 @@ function handleEdit(){
     }
     // 计算指标
     if(data.EdbType === 2 && ![27,40,58,59].includes(data.Source)){
+        if([81,82].includes(data.Source)){
+            showToast('请在pc端操作')
+            return
+        }
         router.push({
             path:'/dataEDB/calculate/detail',
             query:{

src/views/dataEDB/Index.vue

@@ -213,6 +213,10 @@ function handleEDBOpt(type,data){
 
     //查看计算指标
     if(type==='see'){
+        if([81,82].includes(data.Source)){
+            showToast('请在PC端操作')
+            return
+        }
         router.push({
             path:'/dataEDB/calculate/detail',
             query:{

src/views/dataEDB/calculate/components/DiffusionIndexCalcualate.vue

@@ -7,7 +7,8 @@ import SelectEDBClassify from '../../components/SelectEDBClassify.vue'
 import SelectEDBUnit from '../../components/SelectEDBUnit.vue'
 import SelectEDBFrequency from '../../components/SelectEDBFrequency.vue'
 import EDBHistory from '@/views/dataEDB/components/EDBHistory.vue'
-import {calculateTypeTipsMap} from '../../util/config'
+import {calculateTypeTipsMap,MAXADDEDBNUM} from '../../util/config'
+import {generateSeriesArray} from '@/views/dataEDB/util/util.js'
 import { useRoute, useRouter } from 'vue-router';
 import moment from 'moment';
 import {useToHistoryPage} from '@/hooks/edb/useToHistoryPage'
@@ -62,13 +63,7 @@ const showTips=ref(false)
 const tipsContent=ref(calculateTypeTipsMap.get(Number(route.query.source))||'')
 
 
-const letterOpts = [];//字母数据
-function initLetterOpt(){
-    for(let i=0;i<26;i++){
-        letterOpts.push(String.fromCharCode(65+i));
-    }
-}
-initLetterOpt()
+const letterOpts = generateSeriesArray()||[];//字母数据
 
 //选择的指标集合
 const edbList=ref([
@@ -90,7 +85,7 @@ const edbList=ref([
     }
 ])
 function handleAddEdbList(){
-    if(edbList.value.length>=26){
+    if(edbList.value.length>=MAXADDEDBNUM){
         showToast('添加指标个数已达上限')
         return
     }

src/views/dataEDB/calculate/components/FormulaCalculate.vue

@@ -7,7 +7,8 @@ import EDBHistory from '@/views/dataEDB/components/EDBHistory.vue'
 import SelectEDBClassify from '../../components/SelectEDBClassify.vue'
 import SelectEDBUnit from '../../components/SelectEDBUnit.vue'
 import SelectEDBFrequency from '../../components/SelectEDBFrequency.vue'
-import {calculateTypeTipsMap} from '../../util/config'
+import {calculateTypeTipsMap,MAXADDEDBNUM} from '../../util/config'
+import {generateSeriesArray} from '@/views/dataEDB/util/util.js'
 import { useRoute, useRouter } from 'vue-router';
 import {useToHistoryPage} from '@/hooks/edb/useToHistoryPage'
 const {toHistoryPage} = useToHistoryPage()
@@ -68,13 +69,7 @@ watch(
 // 预览页面
 const isPreview=ref(route.query.type==='preview'||false)
 
-const letterOpts = [];//字母数据
-function initLetterOpt(){
-    for(let i=0;i<26;i++){
-        letterOpts.push(String.fromCharCode(65+i));
-    }
-}
-initLetterOpt()
+const letterOpts = generateSeriesArray()||[];//字母数据
 
 //公式说明
 const showTips=ref(false)
@@ -117,7 +112,7 @@ const edbList=ref([
     }
 ])
 function handleAddEdbList(){
-    if(edbList.value.length>=26){
+    if(edbList.value.length>=MAXADDEDBNUM){
         showToast('添加指标个数已达上限')
         return
     }

src/views/dataEDB/util/config.js

@@ -1,3 +1,6 @@
+//添加指标进行计算的最大指标数量
+export const MAXADDEDBNUM=50
+
 //指标频率配置项
 export const edbFrequencyOpts=['日度','周度','旬度','月度','季度','年度']
 

src/views/dataEDB/util/util.js

@@ -25,4 +25,21 @@ export function deleteClassifyItemEmpty(arr){
             delete item.Children
         }
     })
+}
+
+//生成指标序列数据
+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;
 }