Merge branch 'need_pool823'

src/views/datasheet_manage/components/CustomTable.vue

@@ -48,7 +48,9 @@
                 :data-cindex="columnHeader[sub_index]"
                 @click="() => { !disabled && item==='EdbName' && clickEdbName(edb)}"
               >
-                <template v-if="item === 'EdbName'">{{ edb.EdbAliasName||edb[item] }}</template>
+                <template v-if="item === 'EdbName'">
+                  <span :class="{'edbname-td':disabled}" @click="edbJumpToBase(edb)">{{ edb.EdbAliasName||edb[item] }}</span>
+                </template>
                 <template v-else>{{ edb[item] }}/{{ edb.Frequency }}</template>
               </td>
             </tr>
@@ -233,7 +235,9 @@
                 :data-cindex="columnHeader[edb_index]"
                 @click="() => { !disabled && item==='EdbName' && clickEdbName(edb)}"
               >
-                <template v-if="item === 'EdbName'">{{ edb[item] }}</template>
+                <template v-if="item === 'EdbName'">
+                  <span :class="{'edbname-td':disabled}" @click="edbJumpToBase(edb)">{{ edb.EdbAliasName||edb[item] }}</span>
+                </template>
                 <template v-else>{{ edb[item] }}/{{ edb.Frequency }}</template>
               </td>
 
@@ -396,6 +400,7 @@ import {
 } from '../common/customTable';
 import addDateCellDia from './addDateCellDia';
 import * as sheetInterface from '@/api/modules/sheetApi.js';
+import { dataBaseInterface }  from '@/api/api.js';
 import mDialog from '@/components/mDialog.vue'
 export default {
   props: {
@@ -749,6 +754,23 @@ export default {
       }
     },
 
+    /* 跳转到指标库 */
+    async edbJumpToBase(edb) {
+      //非详情页不跳转
+      if(!this.disabled) return
+
+      const res = await dataBaseInterface.targetDetail({EdbInfoId:edb.EdbInfoId})
+      if(res.Ret !== 200) return
+
+       //EdbInfoType=1 跳预测指标详情,=0跳指标库详情
+      const {ClassifyId,UniqueCode,EdbInfoId,EdbInfoType} = res.Data;
+      let {href} = this.$router.resolve({
+        path:EdbInfoType===1?'/predictEdb':'/database',
+        query:{code:UniqueCode,id:EdbInfoId,classifyId:ClassifyId}
+      });
+      window.open(href,'_blank');
+    },
+
     /* 清空所有数据 */
     reset() {
       this.config.data = [];
@@ -843,6 +865,11 @@ export default {
     &.insert {
       background: #FFEFDD;
     }
+    .edbname-td {
+      &:hover {
+        text-decoration: underline;
+      }
+    }
   }
   
   .th-tg {