fix

src/lang/modules/DataSources/En.js

@@ -81,7 +81,8 @@ export default {
     opera_user:'Operator',
     insert_up_row:'Insert Row Above',
     insert_down_row:'Insert Row Below',
-    max_batch_msg: 'Please do not add more than 30 metrics at a time!'
+    max_batch_msg: 'Please do not add more than 30 metrics at a time!',
+    export_msg:`Export the Filtered Metric List of the Current Page`
   },
 
   /* 期货数据库页面 */

src/lang/modules/DataSources/Zh.js

@@ -81,7 +81,8 @@ export default {
     opera_user:'操作人',
     insert_up_row:'向上插入',
     insert_down_row:'向下插入',
-    max_batch_msg:'批量添加指标数量不得超过30个！'
+    max_batch_msg:'批量添加指标数量不得超过30个！',
+    export_msg:`导出当前页面筛选的指标列表`
   },
 
   /* 期货数据库页面 */

src/views/dataEntry_manage/components/insertData.vue

@@ -101,12 +101,12 @@ export default {
         {
           name:/* "模板1"  */this.$t('ManualEntryPage.tem_msg',{index:1}),
           url: process.env.VUE_APP_API_ROOT + "/entry/template?Source=1",
-          previewImg: require('@/assets/img/data_m/tem1.png')
+          previewImg: require('@/assets/img/data_m/tem1.jpg')
         },
         {
           name:/* "模板2" */this.$t('ManualEntryPage.tem_msg',{index:2}),
           url: process.env.VUE_APP_API_ROOT + "/entry/template?Source=2",
-          previewImg: require('@/assets/img/data_m/tem2.png')
+          previewImg: require('@/assets/img/data_m/tem2.jpg')
         },
       ],
       params: {},

src/views/dataEntry_manage/dataEntry/addToBaseList.vue

@@ -79,6 +79,7 @@
         <el-table
           :data="tableData"
           ref="table"
+          key="table"
           element-loading-text="加载中..."
           v-loading="tableLoading"
           border
@@ -136,11 +137,9 @@
           :data="addToBaseList" 
           border
           ref="addTableRef"
+          key="addTableRef"
         >
           <el-table-column :label="$t('Edb.Detail.e_id')" align="center" prop="TradeCode">
-            <template slot="header" slot-scope="scope">
-                  {{$t('Edb.Detail.e_id')}}
-            </template>
             <template slot-scope="scope">
                 {{scope.row.TradeCode}}
             </template>
@@ -708,5 +707,19 @@ export default {
       justify-content: center;
       align-items: center;
     }
+    .name-cell {
+      .error {
+        position: absolute;
+        bottom: -5px;
+        color: #f00;
+      }
+    }
+}
+</style>
+<style lang="scss">
+.batch-opera-list {
+    .error-ipt .el-input__inner{
+      border-color: #f00;
+    }
 }
 </style>

src/views/dataEntry_manage/dataEntry/components/edbDetail.vue

@@ -317,8 +317,8 @@ export default {
     /* 更改日期 */
     async handleTimeChange(index, e) {
         // 判断选择的日期是否重复
-      let flag = this.dataList.some((item) => item.Dt === e.Dt);
-      if (flag) {
+      let arr = this.dataList.filter((item) => item.Dt&&(item.Dt===e.Dt));
+      if (arr.length>1) {
         if (!this.tempTime) {
           // 如果是新增行的
           e.Dt = "";
@@ -327,17 +327,19 @@ export default {
         }
         this.$message.warning(/* "该日期已存在"  */this.$t('Edb.MsgPrompt.date_haved_msg'));
       } else {
-       
-          // // 修改日期
-          // let params = {
-          //   CreateDate: e.Dt, //新录入日期
-          //   OldCreateDate: this.tempTime, //之前日期
-          //   List: this.dataList,
-          // };
-          // const res = await dataInterence.modifyTargetDate(params);
-          // if (res.Ret === 200) {
-          //   this.$message.success("修改成功");
-          // }
+          if(!this.tempTime) return
+
+          // 修改日期
+          let params = {
+            TradeCode: e.TradeCode,
+            CreateDate: e.Dt, //新录入日期
+            OldCreateDate: this.tempTime, //之前日期
+            Close: e.Close,
+          };
+          const res = await dataInterence.editData(params);
+          if (res.Ret === 200) {
+            this.$message.success("修改成功");
+          }
       }
     },
 
@@ -345,7 +347,7 @@ export default {
     handleTimeFocus(index, e) {
       if(!this.hasEditAuth) return 
 
-      this.tempTime = e.timeVal;
+      this.tempTime = e.Dt;
       this.rightMouseMenu.rindex = index;
       this.rightMouseMenu.cindex = 0;
     },

src/views/dataEntry_manage/dataEntry/components/operateLogsDia.vue

@@ -10,7 +10,6 @@
         :data="tableData"
         style="box-shadow: 0px 3px 6px rgba(155, 170, 219, 0.2);margin-top: 20px"
         border
-        height="auto"
         ref="table"
       >
         <el-table-column
@@ -71,7 +70,7 @@ export default {
     return {
       tableData: [],
       page_no:1,
-      pageSize: 10,
+      pageSize: 8,
       total: 0
     }
   },

src/views/dataEntry_manage/dataEntry/index.vue

@@ -121,7 +121,8 @@
                 align="center"
               >
                 <template slot-scope="{row}">
-                  <span>{{row[item.key]}}</span>
+                  <span v-if="item.key==='SecName'" class="editsty" @click="lookDetailHandle(row)">{{row[item.key]}}</span>
+                  <span v-else>{{row[item.key]}}</span>
                 </template>
               </el-table-column>
 
@@ -201,7 +202,6 @@ import edbDetail from './components/edbDetail.vue'
 import operateLogsDia from './components/operateLogsDia.vue';
 import insertData from '../components/insertData.vue';
 import completeTargetDia from '../databaseComponents/completeTargetDia.vue';
-import { escape } from '@antv/x6/lib/util/string/string';
 export default {
   components: { 
     mPage,
@@ -241,8 +241,6 @@ export default {
 			this.selectedEdb = nval;
 
 			this.selectNode = this.searchOptions.find(_ => _.TradeCode===nval).UniqueCode;
-    
-      this.$refs.treeRef.setCurrentNode(this.selectNode)
     }
   },
   data() {
@@ -266,7 +264,7 @@ export default {
       current_search: '',
       search_have_more: false,
 
-      exportMsg: `导出当前页面筛选的指标列表`,//导出tip
+      exportMsg: /* `导出当前页面筛选的指标列表` */this.$t('ManualEntryPage.export_msg'),//导出tip
 
       selectClassifyId: 0,
       selectNode: '',
@@ -289,6 +287,12 @@ export default {
     this.getTableData()
   },
   methods:{
+    lookDetailHandle(row) {
+      this.selectClassifyId = 0;
+			this.selectNode = '';
+			this.selectedEdb = row.TradeCode;
+    },
+
     // 获取分类
 		getClassify() {
 			dataInterence.getClassifyV2().then(res =>{

src/views/dataEntry_manage/onlineExcelCopy.vue

@@ -23,7 +23,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency" :rules="[{required:true,message:'频度不能为空',trigger:'change'}]">
-            <el-select v-model="dataForm.frequency" placeholder="请选择频度" style="width: 100%;" @change="changeFrequency">
+            <el-select v-model="dataForm.frequency" :placeholder="Edb.InputHolderAll.input_fre" style="width: 100%;" @change="changeFrequency">
               <el-option :label="item.label" :value="item.value" v-for="item in frequencyList" :key="item.value"></el-option>
             </el-select>
           </el-form-item>