Merge branch 'develop' into dev_20241202_xukangle

@@ -37,7 +37,7 @@ VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
 
 
 # 数据标准、元数据、数据目录 接口地址
 # 数据标准、元数据、数据目录 接口地址
-VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
+VITE_APP_PLAN_BASEURL = ms-daop-data-plan-service
 
 
 #数据质量接口地址
 #数据质量接口地址
 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service

@@ -71,7 +71,7 @@ VITE_BPMN_URL = https://workflow-swzl-test.csbr.cn
 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
 VITE_APP_WORK_FLOW_URL = 'ms-daop-workflow-service'
 
 
 # 数据标准、元数据、数据目录 接口地址
 # 数据标准、元数据、数据目录 接口地址
-VITE_APP_PLAN_BASEURL = ms-daop-zcgl-data-plan-service
+VITE_APP_PLAN_BASEURL = ms-daop-data-plan-service
 
 
 #数据质量接口地址
 #数据质量接口地址
 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service
 VITE_APP_QUALITY_BASEURL = ms-daop-data-quality-service

@@ -84,9 +84,8 @@ export const getProduct = (params) => request({
 })
 })
 // 查看平台会员详情
 // 查看平台会员详情
 export const getTenantDetailInfo = (params) => request({
 export const getTenantDetailInfo = (params) => request({
-  url: `${import.meta.env.VITE_APP_API_BASEURL}/tenant/data/detail`,
-  method: 'get',
-  params
+  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`,
+  method: 'get'
 })
 })
 
 
 
 
@@ -123,7 +122,7 @@ export const getServiceTenants = (params) => request({
 
 
 /** 获取会员的附件模板 */
 /** 获取会员的附件模板 */
 export const getTenantAttach = (params) => request({
 export const getTenantAttach = (params) => request({
-  url: `${import.meta.env.VITE_APP_API_BASEURL}/attachment-template/list-attachment?tenantGuid=${params}`,
+  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/attachment-template/list-attachment?tenantGuid=${params}`,
   method: 'get'
   method: 'get'
 })
 })
 
 

@@ -35,7 +35,7 @@ const routes: RouteRecordRaw[] = [
           reuse: true
           reuse: true
         },
         },
         beforeEnter: (to, from) => {
         beforeEnter: (to, from) => {
-          to.meta.title = to.query.type == 'edit' ? `编辑-${to.query.name}` : '新建资产登记';
+          to.meta.title = to.query.type == 'create' ? '新建资产登记' : `编辑-${to.query.name}`;
           to.meta.editPage = true;
           to.meta.editPage = true;
         }
         }
       },
       },

@@ -4,7 +4,7 @@ import router from '@/router'
 import { ElMessage } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import apiUser from '@/api/modules/user'
 import apiUser from '@/api/modules/user'
 import { getCurrentTime } from '@/utils/common'
 import { getCurrentTime } from '@/utils/common'
-import { getSystemMenu, getUserInfo, getTokenByCode, loginOut, refreshToken, editPasswordInterface, getCurrentUserInfo, getCurrentUserInfo } from '@/api/modules/queryService'
+import { getSystemMenu, getUserInfo, getTokenByCode, loginOut, refreshToken, editPasswordInterface, getCurrentUserInfo } from '@/api/modules/queryService'
 
 
 const useUserStore = defineStore(
 const useUserStore = defineStore(
   // 唯一ID
   // 唯一ID

@@ -515,13 +515,11 @@ const tabChange = (val) => {
 
 
 const nodeClick = (data, node) => {
 const nodeClick = (data, node) => {
   if (data.classifyDetailGuid == 'all') {
   if (data.classifyDetailGuid == 'all') {
-    fieldItemList.value[4].default = '';
     fieldItemList.value[5].default = [];
     fieldItemList.value[5].default = [];
   } else {
   } else {
     const nodeData = JSON.parse(JSON.stringify(data));
     const nodeData = JSON.parse(JSON.stringify(data));
     let parentGuids = nodeData.parentGuids || [];
     let parentGuids = nodeData.parentGuids || [];
     parentGuids.push(nodeData.guid)
     parentGuids.push(nodeData.guid)
-    fieldItemList.value[4].default = 'Y';
     fieldItemList.value[5].default = parentGuids;
     fieldItemList.value[5].default = parentGuids;
   }
   }
   nextTick(() => {
   nextTick(() => {
@@ -822,7 +820,6 @@ const cascaderChange = (val, info) => {
     } else {
     } else {
       treeInfoRef.value.expandedKey = val || ['all'];
       treeInfoRef.value.expandedKey = val || ['all'];
       treeInfoRef.value.setCurrentKey(val?.at(-1) || 'all');
       treeInfoRef.value.setCurrentKey(val?.at(-1) || 'all');
-      val && (fieldItemList.value[4].default = 'Y');
       promiseList(
       promiseList(
         getFieldTableData()
         getFieldTableData()
       )
       )
@@ -904,18 +901,12 @@ const selectChange = (val, item, scope = null) => {
       }
       }
     }
     }
   } else if (item.field == 'isClassify') {
   } else if (item.field == 'isClassify') {
-    fieldItemList.value[5].default = [];
-    fieldItemList.value[6].default = '';
-    treeInfo.value.expandedKey = ['all'];
-    treeInfoRef.value.setCurrentKey('all');
     fieldItemList.value[4].default = val || '';
     fieldItemList.value[4].default = val || '';
+    fieldItemList.value[5].default = scope.classifyName;
     nextTick(() => {
     nextTick(() => {
       promiseList(
       promiseList(
         getFieldTableData()
         getFieldTableData()
       )
       )
-      const treeRef = treeInfoRef.value.treeRef;
-      const container = treeRef.$el;
-      container.scrollTo({ top: 0, behavior: 'smooth' });
     })
     })
 
 
   }
   }

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

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

@@ -226,6 +226,7 @@ const rulesDetailTableBtnClick = (scope, btn) => {
   if (type == 'ruleDetail') {
   if (type == 'ruleDetail') {
     detailLoading.value = true;
     detailLoading.value = true;
     if (detailJson.value[row.ruleConfGuid]) {
     if (detailJson.value[row.ruleConfGuid]) {
+      detailInfo.value = detailJson.value[row.ruleConfGuid];
       ruleType.value = detailInfo.value.ruleCode;
       ruleType.value = detailInfo.value.ruleCode;
       toSubjectTables.value = [{
       toSubjectTables.value = [{
         guid: detailInfo.value.subjectGuid,
         guid: detailInfo.value.subjectGuid,

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

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

@@ -94,7 +94,7 @@ const getSubjectTableTreeData = () => {
           d.label = d.name;
           d.label = d.name;
           d.children = d.children?.map(child => {
           d.children = d.children?.map(child => {
             child.label = child.name + `(${child.tableName})`;
             child.label = child.name + `(${child.tableName})`;
-            child.dataServerName = d.name;
+            child.dataServerName = child.databaseName;
             child.dataSourceGuid = d.guid;
             child.dataSourceGuid = d.guid;
             return child;
             return child;
           })
           })

@@ -253,20 +253,24 @@ onBeforeMount(() => {
       ElMessage.error(res.msg);
       ElMessage.error(res.msg);
     }
     }
   })
   })
-  getSmallCategoryList().then((res: any) => {
+  let ps1 =  getLargeCategoryList().then((res: any) => {
     if (res.code == proxy.$passCode) {
     if (res.code == proxy.$passCode) {
-      smallCategoryList.value = res.data || [];
+      return res.data || [];
     } else {
     } else {
       ElMessage.error(res.msg);
       ElMessage.error(res.msg);
     }
     }
-  })
-  getLargeCategoryList().then((res: any) => {
+  });
+  let ps2 = getSmallCategoryList().then((res: any) => {
         if (res.code == proxy.$passCode) {
         if (res.code == proxy.$passCode) {
-      largeCategoryList.value = res.data || [];
+          return res.data || [];
         } else {
         } else {
           ElMessage.error(res.msg);
           ElMessage.error(res.msg);
         }
         }
       })
       })
+  Promise.all([ps1, ps2]).then((res: any[]) => {
+    largeCategoryList.value = res[0];
+    smallCategoryList.value = res[1];
+  })
 })
 })
 
 
 onActivated(() => {
 onActivated(() => {