commit

src/views/datasheet_manage/common/customTable.js

@@ -146,19 +146,20 @@ export function getRightClickMenu(pos,canEdit=false) {
     { label: "指标计算",
       key: "insert-edb-calculate",
       children: [
-        { label: '累计值转月值',key: 1,fromEdbKey:5 },
-        { label: '同比值',key: 2,fromEdbKey:6 },
-        { label: '同差值',key: 3,fromEdbKey:7 },
-        { label: 'N数值移动平均计算',key: 4,fromEdbKey:8 },
-        { label: 'N数值环比值',key: 5,fromEdbKey:12 },
-        { label: '升频',key: 6,fromEdbKey:14 },
-        { label: '时间移位',key: 7,fromEdbKey:22 },
-        { label: '超季节性',key: 8,fromEdbKey:35 },
-        { label: '年化',key: 9,fromEdbKey:52 },
-        { label: '降频',key: 10,fromEdbKey:51 },
-        { label: '累计值',key: 11,fromEdbKey:62 },
-        { label: '指数修匀',key: 12,fromEdbKey:'alpha' },
-        { label: '日均值',key: 14,fromEdbKey:75 },
+        { label: '累计值转月/季值',source: 1,fromEdbKey:5 },
+        { label: '同比值',source: 3,fromEdbKey:6 },
+        { label: '同差值',source: 4,fromEdbKey:7 },
+        { label: 'N数值移动平均计算',source: 5,fromEdbKey:8 },
+        { label: 'N数值环比值',source: 6,fromEdbKey:12 },
+        { label: 'N数值环差值',source: 7,fromEdbKey:13 },
+        { label: '升频',source: 8,fromEdbKey:14 },
+        { label: '时间移位',source: 10,fromEdbKey:22 },
+        { label: '超季节性',source: 11,fromEdbKey:35 },
+        { label: '年化',source: 12,fromEdbKey:52 },
+        { label: '降频',source: 9,fromEdbKey:51 },
+        { label: '累计值',source: 13,fromEdbKey:62 },
+        { label: '指数修匀',source: 15,fromEdbKey:'alpha' },
+        { label: '日均值',source: 16,fromEdbKey:75 },
       ]
     },
     { label: "清空", key: "reset" },

src/views/datasheet_manage/components/MixedTable.vue

@@ -175,6 +175,7 @@
       @insert="insertDatehandle"
     />
 
+    <!-- 指标计算弹窗 -->
     <calculateEdbDia
       :isShow.sync="isInsertCalculate"
       :info="insertCalculateInfo"
@@ -664,7 +665,9 @@ export default {
       }else {//单元格
         pos = 'cell'
       }
-      this.config.contextMenuOption = getRightClickMenu(pos,cell.DataType===1&&[1,2].includes(cell.DataTimeType))
+      this.config.contextMenuOption = pos === 'cell' 
+        ? getRightClickMenu(pos,cell.DataType===1&&[1,2].includes(cell.DataTimeType))
+        : getRightClickMenu(pos)
 
 
       const dom = $('#contextMenu-wrapper')[0];

src/views/datasheet_manage/components/calculateEdbDia.vue

@@ -14,8 +14,19 @@
             <el-radio :label="2">ETA指标&预测指标</el-radio>
           </el-radio-group>
 
-        <template v-if="info.fromEdbKey===62">
+        <template v-if="info.fromEdbKey===5">
           <el-divider direction="vertical" style="margin: 0 20px;"/>
+          
+          <el-radio-group 
+            v-model="formData.source"
+          >
+            <el-radio :label="1">累计值转月</el-radio>
+            <el-radio :label="2">累计值转季值</el-radio>
+          </el-radio-group>
+        </template>
+
+        <template v-else-if="info.fromEdbKey===62">
+          <el-divider direction="vertical" style="margin: 0 20px;"/>     
           <el-radio-group 
             v-model="formData.source"
           >
@@ -182,10 +193,16 @@ export default {
     }
   },
   components: { selectTarget,edbDetailSection,tableEdbListSection },
+  watch: {
+    isShow(nval) {
+      const { source } = this.info
+      this.formData.source = source;
+    }
+  },
   data() {
     return {
       formData: {
-        edbFromSource: 2,
+        edbFromSource: 1,
         source: this.info.fromEdbKey,
         nNum: 1,
 				moveType: 1,