Merge branch 'debug' of http://8.136.199.33:3000/eta_gn_front/eta_front into debug

src/api/modules/chartApi.js

@@ -1432,6 +1432,16 @@ const edbCollectInterface = {
 			return http.post('/datamanage/edb_collect/move',params)
 		},
 
+		/**
+		 * 移动收藏分类
+		 * @param {*} params ClassifyId
+		 * PrevClassifyId NextClassifyId
+		 * @returns 
+		 */
+		moveCollectClassify: params => {
+			return http.post('/datamanage/edb_collect/classify/move',params)
+		},
+
 		/**
 		 * 收藏指标
 		 * @param {*} params ClassifyId EdbInfoId

src/mixins/reportApproveConfig.js

@@ -54,7 +54,7 @@ export default{
                 ReportType:type,
                 ClassifyFirstId:classify[0]||0,
                 ClassifySecondId:classify[1]||0,
-                ClassifyThirId:classify[2]||0,
+                ClassifyThirdId:classify[2]||0,
             }
             approveInterence.checkClassifyApprove(params).then(res=>{
                 this.checkLoading=false

src/routes/modules/oldRoutes.js

@@ -138,7 +138,7 @@ export default [
       {
         path: "classifylist",
         component: classifylist,
-        name: "分类列表",
+        name: "分类管理",
         hidden: false,
         meta: {
           keepAlive: false,
@@ -153,7 +153,7 @@ export default [
         meta: {
           name_en:"Chapter Setting",
           pathFrom: "classifylist",
-          pathName: "分类列表",
+          pathName: "分类管理",
           pathName_en:"Category list"
         },
       },

src/views/approve_manage/approveList.vue

@@ -188,7 +188,29 @@ export default {
         };
     },
     methods: {
-        getTableData(){  
+        handleReportClassifyId(){
+            const ids = {
+                ClassifyFirstId:0,
+                ClassifySecondId:0,
+                ClassifyThirdld:0,
+            }
+            if(this.classify.length === 2){
+                ids.ClassifyFirstId = this.classify[this.classify.length-1]||0;
+                ids.ClassifySecondId = 0;
+                ids.ClassifyThirdld = 0;
+            } else if(this.classify.length === 3){
+                ids.ClassifyFirstId = this.classify[this.classify.length-2]||0
+                ids.ClassifySecondId = this.classify[this.classify.length-1]||0
+                ids.ClassifyThirdld = 0;
+            } else {  //分类最多只有三级
+                ids.ClassifyFirstId = this.classify.length > 1 ? this.classify[this.classify.length-3]||0 : 0;
+                ids.ClassifySecondId = this.classify.length > 1 ? this.classify[this.classify.length-2]||0 : 0;
+                ids.ClassifyThirdld = this.classify.length > 1 ? this.classify[this.classify.length-1]||0 : 0;
+            }
+
+            return ids
+        },
+        getTableData(){
             this.tableLoading = true
             this.tableData=[]
             const baseParams = {
@@ -200,8 +222,9 @@ export default {
             const selectParams = {
                 //关联报告
                 ReportType:this.classify[0]||0,
-                ClassifyFirstId:this.classify[this.classify.length-2]||0,
-                ClassifySecondId:this.classify[this.classify.length-1]||0,
+                ClassifyFirstId:this.handleReportClassifyId().ClassifyFirstId||0,
+                ClassifySecondId:this.handleReportClassifyId().ClassifySecondId||0,
+                ClassifyThirdld:this.handleReportClassifyId().ClassifyThirdld||0,
                 //时间
                 TimeType:this.timeType,
                 StartTime:this.timeDate?this.timeDate[0]||'':'',

src/views/dataEntry_manage/databaseComponents/collectEdbMenu.vue

@@ -4,9 +4,12 @@
         class="catalog-tree other-tree"
         empty-text="暂无图库"
         :data="data"
+        :allow-drop="canDropHandle"
+        draggable
         node-key="ClassifyId"
         :expand-on-click-node="false"
         @current-change="(data,node)=>{$parent.nodeChange(data,node)}"
+        @node-drop="handleDropClassify"
         >
         <div class="custom-tree-node" slot-scope="{ data }">
             <span class="tree-label">{{ data.ClassifyName }}</span>
@@ -61,6 +64,41 @@ export default {
       
     },
 
+    async handleDropClassify(dragNode,dropNode,type) {
+      console.log(dragNode,dropNode,type)
+      let PrevClassifyId,NextClassifyId;
+
+      let list = dropNode.parent.childNodes;
+      let targetIndex = list.findIndex(_ => _.data.ClassifyId===dragNode.data.ClassifyId)
+
+      if(targetIndex===0){
+        const data=list[targetIndex+1].data
+        NextClassifyId = data.ClassifyId
+        PrevClassifyId = 0
+      }else if(targetIndex===list.length-1){
+        const data=list[targetIndex-1].data
+        PrevClassifyId = data.ClassifyId
+        NextClassifyId = 0
+      }else{
+        PrevClassifyId=list[targetIndex-1].data.ClassifyId
+        NextClassifyId=list[targetIndex+1].data.ClassifyId
+      }
+
+      let params = {
+        ClassifyId: dragNode.data.ClassifyId,
+        PrevClassifyId,
+        NextClassifyId
+      }
+
+      const res = await edbCollectInterface.moveCollectClassify(params)
+      if(res.Ret !== 200) return 
+      this.$message.success('移动成功')
+    },
+
+    canDropHandle(draggingNode, dropNode, type) {
+      return dropNode.level===draggingNode.level&&type!=='inner'
+    },
+
     initSelect(id) {
       console.log(id)
       this.$nextTick(() => {

src/views/dataEntry_manage/databaseComponents/operationDialog.vue

@@ -868,8 +868,10 @@ export default {
             if(this.tableData[0].EdbType===2){
                 this.$emit('lookHistory',this.select_target)
             }else{
-                const {ClassifyId,UniqueCode,EdbInfoId} = this.tableData[0]
-                let {href} = this.$router.resolve({path:`/database`,query:{code:UniqueCode,id:EdbInfoId,classifyId:ClassifyId}});
+                const {ClassifyId,UniqueCode,EdbInfoId,HaveOperaAuth} = this.tableData[0]
+								if(!HaveOperaAuth) return this.$message.warning('暂无指标权限')
+
+                let {href} = this.$router.resolve({path:'/edbBasicbase',query:{code:UniqueCode,id:EdbInfoId,classifyId:ClassifyId}});
                 window.open(href,'_blank');
             }
         },

src/views/dataEntry_manage/databaseComponents/smoothEdbDialog.vue

@@ -560,8 +560,10 @@ export default {
             if(this.tableData[0].EdbType===2){
                 this.$emit('lookHistory',this.select_target)
             }else{
-                const {ClassifyId,UniqueCode,EdbInfoId} = this.tableData[0]
-                let {href} = this.$router.resolve({path:`/database`,query:{code:UniqueCode,id:EdbInfoId,classifyId:ClassifyId}});
+                const {ClassifyId,UniqueCode,EdbInfoId,HaveOperaAuth} = this.tableData[0]
+                if(!HaveOperaAuth) return this.$message.warning('暂无指标权限')
+                
+                let {href} = this.$router.resolve({path:'/edbBasicbase',query:{code:UniqueCode,id:EdbInfoId,classifyId:ClassifyId}});
                 window.open(href,'_blank');
             }
         },

src/views/knowledge_manage/list.vue

@@ -247,7 +247,7 @@ export default {
     },
     tableColums() {
       return [
-        { label: '开始时间',key: 'StartTime' },
+        { label: [2,3].includes(this.ResourceType)?'时间':'开始时间',key: 'StartTime' },
         { label: '标题',key: 'Title',minwidthsty:'150px' },
         { label: '来源',key: 'SourceFrom' },
         { label: '分类',key: 'ClassifyFullName' },

src/views/semantics_manage/summery/summeryEdit.vue

@@ -457,8 +457,8 @@ export default {
       
       loading.close();
       this.isSending = false;
-      this.$message.success(res.Msg)
       if(res.Ret !== 200) return
+      this.$message.success(res.Msg)
 
       this.resultForm.content = res.Data.Answer;
       this.chatTopicId = res.Data.AiChatTopicId;

src/views/supply_manage/analyseVariety.vue

@@ -176,7 +176,7 @@ export default {
       });
 
       if (res.Ret !== 200) return;
-      this.$message.success(/* "计算成功" */this.$t('SupplyAnalysis.StockPlant.calculate_hint'));
+      this.$message.success(/* "计算成功" */this.$t('SupplyAnalysis.StockPlant.calculate_success'));
 
       this.getTargetList();