Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

@@ -382,7 +382,7 @@ const getQueryTreeData = ()=>{
         currNodeInfo.value = {type:2,guid:dataSourceGuid,name:datasourceName}
       }
       nextTick(() => {
-        treeInfo.value.currentNodeKey = currentNodeKey.value
+        treeInfo.value.currentNodeKey = <string>route.query.tableGuid || currentNodeKey.value;
         treeInfo.value.expandedKey = expandedKey.value
       })
       nodeClick({type:2,guid:dataSourceGuid,name:datasourceName}) 

@@ -683,7 +683,6 @@ const download = () => {
     <div v-show="!isWordStyle" class="header-detail">
       <template v-if="detailInfo.analysisReportType == 1">
         <span>{{ '表名称：' + (detailInfo.qualityModelName ?? '--') }}</span>
-        <span style="margin-left: 40px;">{{ '所属主题：' + (detailInfo.subjectDomainName ?? '--') }}</span>
         <span style="margin-left: 40px;">{{ '所属数据源：' + (detailInfo.dataSourceName ?? '--') }}</span>
       </template>
       <span v-else-if="detailInfo.analysisReportType == 3">{{ '分组名称：' + (detailInfo.qualityModelGroupName ?? '--')
@@ -787,7 +786,6 @@ const download = () => {
           <div style=" height: 40px;line-height: 40px;font-size: 14px;color: #666666;">
             <template v-if="detailInfo.analysisReportType == 1">
               <span>{{ '表名称：' + (detailInfo.qualityModelName ?? '--') }}</span>
-              <span style="margin-left: 40px;">{{ '所属主题：' + (detailInfo.subjectDomainName ?? '--') }}</span>
               <span style="margin-left: 40px;">{{ '所属数据源：' + (detailInfo.dataSourceName ?? '--') }}</span>
             </template>
             <span v-else-if="detailInfo.analysisReportType == 3">{{ '分组名称：' + (detailInfo.qualityModelGroupName ?? '--')

@@ -331,7 +331,7 @@ onActivated(() => {
   let tab: any = userStore.tabbar.find((tab: any) => tab.fullPath === fullPath);
   if (tab) {
     if (route.query.detail) {
-      tab.meta.title = `新建规则(${route.query.planName})`;
+      tab.meta.title = `方案详情-${route.query.planName}`;
       if (fullPath === route.fullPath) {
         document.title = tab.meta.title;
       }

@@ -28,10 +28,8 @@ import {
 import useDataQualityStore from "@/store/modules/dataQuality";
 import { useValidator } from '@/hooks/useValidator';
 import { TableColumnWidth } from '@/utils/enum';
-import useDataCatalogStore from "@/store/modules/dataCatalog";
 
 const dataQualityStore = useDataQualityStore();
-const dataCatalogStore = useDataCatalogStore();
 
 const { proxy } = getCurrentInstance() as any;
 const { orderNum, description } = useValidator();
@@ -411,10 +409,27 @@ const tableBtnClick = (scope, btn) => {
   } else if (type == "delete") {
     open("此操作将永久删除, 是否继续?", "warning");
   } else if (type == 'locateDataCatalog') {
-    dataCatalogStore.setLocateSubjectName(row.name);
-    router.push({
-      name: 'dataWarehouse'
-    });
+    // dataCatalogStore.setLocateSubjectName(row.name);
+    // router.push({
+    //   name: 'dataWarehouse'
+    // });
+    if (row.dataSource == '4') {
+      router.push({
+        name: 'classifyGradeCatalogue',
+        query: {
+          databaseGuid: row.dataSourceGuid,
+          tableGuid: row.subjectGuid
+        }
+      });
+    } else {
+      router.push({
+        name: 'metadataQuery',
+        query: {
+          dataSourceGuid: row.dataSourceGuid,
+          tableGuid: row.subjectGuid
+        }
+      });
+    }
   }
 };