bug修复

src/lang/modules/DataSources/En.js

@@ -253,6 +253,7 @@ export default {
     start_time_right_end_time:'The start time cannot be greater than the deadline.',
     batch_operation_limit:'The upper limit of batch operation is 500 indicators.',
     index_has_exist_prompt:'The following indicator names are duplicated with the existing indicators in the indicator library. Please modify the indicator name and confirm.',
+    indicator_been_referenced_prompt:'The indicator has been referenced.',
 
     no_rehabilitation:'No',
     forward_rehabilitation_1:'Pre-restoration rights (calculation of dividend plan)',

src/lang/modules/DataSources/Zh.js

@@ -255,6 +255,7 @@ export default {
     start_time_right_end_time:'起始时间不能大于截止时间',
     batch_operation_limit:'批量操作的上限为500个指标',
     index_has_exist_prompt:'以下指标名称与指标库已有指标重复，请修改指标名称后确定',
+    indicator_been_referenced_prompt:'指标已被引用',
 
     no_rehabilitation:'不复权',
     forward_rehabilitation_1:'前复权（分红方案计算）',

src/styles/global.scss

@@ -158,4 +158,5 @@ button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusri
 .el-cascader-menu__wrap{
     height: auto;
     max-height: 408px;
+    overflow-x: auto;
 }

src/views/dataEntry_manage/databaseComponents/addTargetDiaBase.vue

@@ -592,7 +592,8 @@ export default {
 												Frequency:'日度',
 												EdbName:isCommon?`${item.StockCode}${isCommon.label}`:`${item.StockCode}${item.EdbCode}`,
 												EdbCode:item.EdbCode,
-												StockCode:item.StockCode
+												StockCode:item.StockCode,
+												ApiExtraPars:this.ExtraPars
 											}
 											this.BatchList.push(params)
 											let datas = item.DataList || []

src/views/dataEntry_manage/thirdBase/components/highFrequency/addHighFrequencyData.vue

@@ -236,7 +236,7 @@ import { highFrequencyDataInterface } from '@/api/api.js'
         indexCodeSelected:[],
         periodList:[1,3,5,10,15,30,60],
         otherParams:{
-          startDate:this.$moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'),
+          startDate:this.$moment(new Date()).subtract(6, 'months').format('YYYY-MM-DD'),
           startTime:'09:15:00',
           deadlineType:'1',
           deadlineDate:this.$moment(new Date()).format('YYYY-MM-DD'),
@@ -324,7 +324,7 @@ import { highFrequencyDataInterface } from '@/api/api.js'
         this.indexCode=[]
         this.indexCodeSelected=[]
         this.otherParams={
-          startDate:this.$moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'),
+          startDate:this.$moment(new Date()).subtract(6, 'months').format('YYYY-MM-DD'),
           startTime:'09:15:00',
           deadlineType:'1',
           deadlineDate:this.$moment(new Date()).format('YYYY-MM-DD'),

src/views/dataEntry_manage/thirdBase/components/highFrequency/classifySetting.vue

@@ -56,7 +56,7 @@
               />
               <!-- 添加子项 -->
               <img
-                v-if="!data.IndexId"
+                v-if="!data.IndexId && data.Level<6"
                 src="~@/assets/img/set_m/add.png"
                 style="width: 14px; height: 14px; margin-right: 8px"
                 @click.stop="addNode(node, data)"
@@ -188,6 +188,7 @@ import { highFrequencyDataInterface } from '@/api/api.js'
         if(value){
           this.requestDataList=false
           this.requestClassifyList=false
+          this.getClassify()
         }
       }
     },

src/views/dataEntry_manage/thirdBase/highFrequencyData.vue

@@ -22,18 +22,21 @@
               <el-cascader :placeholder="$t('HighFrequencyData.select_classify_prompt')"
                 v-model="classifyArr" @change="searchListDelay" :options="classifyListTree" 
                 style="max-width: 160px;"
+                key="isAssociativeSub"
+                v-if="searchParams.isAssociativeSub"
                 :show-all-levels="false" collapse-tags
-                :props="{
-                  emitPath:false,
-                  value:'ClassifyId',
-                  label:'ClassifyName',
-                  children:'Children',
-                  multiple:true
-                }" 
+                :props="classifyProps" 
+                clearable/>
+              <el-cascader :placeholder="$t('HighFrequencyData.select_classify_prompt')"
+                v-model="classifyArr" @change="searchListDelay" :options="classifyListTree" 
+                style="max-width: 160px;" v-else key="noIsAssociativeSub"
+                :show-all-levels="false" collapse-tags
+                :props="classifyProps" 
                 clearable/>
+                {{ classifyArr }}
               <div class="associative-box">
                 <span>{{$t('HighFrequencyData.associative_sub_classify')}}</span>
-                <el-switch v-model="searchParams.isAssociativeSub" @change="searchList"></el-switch>
+                <el-switch v-model="searchParams.isAssociativeSub" @change="changeAssociativeSub"></el-switch>
                 <span class="span-button" @click="setClassify" 
                 v-permission="[permissionBtn.dataSourcePermission.highFrequency_classify_move,permissionBtn.dataSourcePermission.highFrequency_classify_delete,
                   permissionBtn.dataSourcePermission.highFrequency_classify_editAdd,'or']"
@@ -375,36 +378,25 @@ import addToIndexDatabaseBatch from './components/highFrequency/addToIndexDataba
       },
       frequencyList() {
         return [
-            {
-            value: "1m",
-            label: "1m",
-            },
-            {
-            value: "3m",
-            label: '3m',
-            },
-            {
-            value: "5m",
-            label: "5m",
-            },
-            {
-            value: "10m",
-            label: "10m",
-            },
-            {
-            value: "15m",
-            label: "15m",
-            },
-            {
-            value: "30m",
-            label: "30m",
-            },
-            {
-            value: "60m",
-            label: "60m",
-            },
+          {value: "1m",label: "1m"},
+          {value: "3m",label: '3m'},
+          {value: "5m",label: "5m"},
+          {value: "10m",label: "10m"},
+          {value: "15m",label: "15m"},
+          {value: "30m",label: "30m"},
+          {value: "60m",label: "60m"}
         ];
       },
+      classifyProps(){
+        return {
+          checkStrictly:(!this.searchParams.isAssociativeSub),
+          value:'ClassifyId',
+          label:'ClassifyName',
+          children:'Children',
+          emitPath:this.searchParams.isAssociativeSub,
+          multiple:true
+        }
+      }
     },
     watch:{
       classifyArr(value){
@@ -484,6 +476,11 @@ import addToIndexDatabaseBatch from './components/highFrequency/addToIndexDataba
           // 调用 callback 返回建议列表的数据
           cb(results);
         },
+        changeAssociativeSub(value){
+          // 清空
+          this.classifyArr=[]
+          this.searchListDelay()
+        },
         searchListDelay(){
           setTimeout(()=>{
             this.searchList()
@@ -491,7 +488,6 @@ import addToIndexDatabaseBatch from './components/highFrequency/addToIndexDataba
         },
         //表格筛选项改变时触发
         searchList(){
-          console.log('search');
           this.searchParams.currentPage = 1
           this.getTableData('search')
         },
@@ -525,9 +521,9 @@ import addToIndexDatabaseBatch from './components/highFrequency/addToIndexDataba
           }
           if(type==='search'){
               //如果是表格筛选项改变导致重新请求数据
-              //数据获取完成后，列表全选，表格全选
+              //清除所选
               this.selectList = []
-              this.listCheckAllChange(true)
+              this.listCheckAllChange(false)
           }else{
               //若不是，数据获取完成后，查询列表全选的值
               //若当页有数据在selectList内，则勾选/剔除
@@ -727,7 +723,7 @@ import addToIndexDatabaseBatch from './components/highFrequency/addToIndexDataba
           this.classifySettingShow=true
         },
         classifyCloseHandle({requestClassifyList,requestDataList}){
-          if(requestDataList) this.getTableData()
+          if(requestDataList) this.getTableData('search')
           if(requestClassifyList) this.getClassifyList()
           this.classifySettingShow=false
         },
@@ -778,10 +774,30 @@ import addToIndexDatabaseBatch from './components/highFrequency/addToIndexDataba
           }
           highFrequencyDataInterface.highFreDataBatchOperation(params).then(res=>{
             if(res.Ret == 200){
-              this.$message.success(this.$t('MsgPrompt.operate_success_msg'))
               if(this.batchOperationData.type==2){
+                // 批量删除
+                let deleteFails=res.Data.Fail || []
+                let deleteSuccess=res.Data.Success || []
+                if(deleteSuccess.length) this.$message.success(this.$t('MsgPrompt.operate_success_msg'))
+
+                if(deleteFails){
+                  let message = '';
+                  deleteFails.forEach(item => {
+                    message+=`${item.IndexName}:${this.$t('HighFrequencyData.indicator_been_referenced_prompt')}</br>`
+                  })
+                  // 和成功提示错开
+                  this.$nextTick(()=>{
+                    this.$message({
+                      dangerouslyUseHTMLString: true,
+                      message,
+                      type: 'error'
+                    })
+                  })
+                }
                 // 删除之后 调整选中
                 this.listCheckAllChange(false)
+              }else{
+                this.$message.success(this.$t('MsgPrompt.operate_success_msg'))
               }
               this.getTableData()
               this.batchOperationDialogShow=false