fix

xukangle
Showing 6 changed files with 32 additions and 25 deletions
src/views/data_asset/qualityEvaluate.vue
src/views/data_asset/registerCatalogManagement.vue
src/views/data_asset/valueEvaluate.vue
src/views/data_inventory/classifyGradeCatalogue.vue
src/views/data_inventory/dataLabel.vue
src/views/data_product/productListing.vue
--- a/src/views/data_asset/qualityEvaluate.vue
View file @9309294
+++ b/src/views/data_asset/qualityEvaluate.vue
View file @9309294
@@ -180,7 +180,7 @@ const getTableBtns = (row) => {
  const approveState = row.approveVO.approveState || null;
  const approveStaffGuids = approveVO.approveStaffGuids || [];
  const staffGuid = approveVO.staffGuid || '';
-  const bizApproveState = row.bizApproveState;
+  const bizApproveState = row.approveState;
  const currentStaffGuid = userData.staffGuid
  let isShowCancel = false;
  let flowState;
--- a/src/views/data_asset/registerCatalogManagement.vue
View file @9309294
+++ b/src/views/data_asset/registerCatalogManagement.vue
View file @9309294
@@ -346,8 +346,8 @@ const handleWindowResize = () => {
    </div>
    <div class="table_panel_wrap" :style="{ height: `calc(100% - ${tableToolsHeight + 60}px)` }">
      <div class="data-content" v-loading="listDataLoading" :style="{ height: `calc(100% - ${tableToolsHeight}px)` }">
-        <div class="v-add" @click.stop="handleCreate" v-if="listData.length">
+        <div class="v-add" @click.stop="handleCreate">
-          <div class="add-img"></div>
+          <div class=" add-img"></div>
          <div class="add-titile">
            新增数据产品
          </div>
@@ -430,10 +430,10 @@ const handleWindowResize = () => {
            </div>
          </div>
        </div>
-        <div v-if="!listData.length" class="card-noData">
+        <!-- <div v-if="listData.length" class="card-noData">
          <img src="../../assets/images/no-data.png" :style="{ width: '96px', height: '96px' }" />
          <span>暂无数据资源目录</span>
-        </div>
+        </div> -->
      </div>
    </div>
@@ -467,6 +467,8 @@ const handleWindowResize = () => {
  position: relative;
  .card-noData {
+    height: 100%;
+    width: 100%;
    background: #fafafa;
    display: flex;
    flex-direction: column;
@@ -506,6 +508,7 @@ const handleWindowResize = () => {
    justify-content: center;
    align-items: center;
    flex-direction: column;
+    z-index: 10;
    &:hover {
      box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
--- a/src/views/data_asset/valueEvaluate.vue
View file @9309294
+++ b/src/views/data_asset/valueEvaluate.vue
View file @9309294
@@ -267,7 +267,7 @@ const getTableBtns = (row) => {
  const approveState = row.approveVO.approveState || null;
  const approveStaffGuids = approveVO.approveStaffGuids || [];
  const staffGuid = approveVO.staffGuid || '';
-  const bizApproveState = row.bizApproveState;
+  const bizApproveState = row.approveState;
  const currentStaffGuid = userData.staffGuid
  let isShowCancel = false;
  let flowState;
--- a/src/views/data_inventory/classifyGradeCatalogue.vue
View file @9309294
+++ b/src/views/data_inventory/classifyGradeCatalogue.vue
View file @9309294
@@ -44,26 +44,27 @@ const CgDirTreeList = ref();
 const getCgDirTreeData = async () => {
  treeInfo.value.loading = true;
  const params = {
-    execGuid: execGuidInfo.value.execGuid
+    execGuid: execGuidInfo.value?.execGuid
  }
  const res: any = await getTaskExeTreeList(params);
  if (res.code == proxy.$passCode) {
    const transformedData: any = [{
-      classifyDetailGuid: execGuidInfo.value.guid, // 新增字段 GUID
+      classifyDetailGuid: execGuidInfo.value?.guid, // 新增字段 GUID
-      classifyName: execGuidInfo.value.cgDirName,               // 新增字段目录名称
+      classifyName: execGuidInfo.value?.cgDirName,               // 新增字段目录名称
      children: res.data,                     // 将原始数据放入 children
    }];
    CgDirTreeList.value = transformedData;
    treeInfo.value.data = transformedData;
-    currentPath.value = [transformedData[0].classifyName];
+    currentPath.value = [transformedData[0]?.classifyName];
-    treeInfo.value.expandedKey.push(transformedData[0].classifyDetailGuid);
+    treeInfo.value.expandedKey.push(transformedData[0]?.classifyDetailGuid);
-    treeInfo.value.currentNodeKey = transformedData[0].classifyDetailGuid;
+    treeInfo.value.currentNodeKey = transformedData[0]?.classifyDetailGuid;
    // classifyDetailGuidInfo.value = res.data[0].classifyDetailGuid;
    searchItemList.value[0].options = res.data || [];
-    refGradeGuid.value = res.data[0].refGradeGuid || '';
+    refGradeGuid.value = res.data[0]?.refGradeGuid || '';
    treeInfo.value.loading = false;
  } else {
+    treeInfo.value.loading = false;
    proxy.$ElMessage.error(res.msg);
  }
 }
@@ -143,7 +144,7 @@ onMounted(async () => {
  await getExecGuid();
  await getCgDirTreeData();
  await getCgDirFieldPage({
-    execGuid: execGuidInfo.value.execGuid,
+    execGuid: execGuidInfo.value?.execGuid,
    classifyDetail: classifyDetailGuidInfo.value
  });
  // getDictionaryList();
@@ -1280,8 +1281,8 @@ const getDataBaseTreeData = async () => {
    if (localStorage.getItem("shouldReloadData")) {
      dataBaseTreeInfo.value.expandedKey = [];
      const info = JSON.parse(localStorage.getItem("onActiveInfo") || '{}');
-      dataBaseTreeInfo.value.expandedKey.push(dataArray[info.dbindex].guid);
+      dataBaseTreeInfo.value.expandedKey.push(dataArray[info.dbindex]?.guid);
-      dataBaseTreeInfo.value.currentNodeKey = dataArray[info.dbindex].guid;
+      dataBaseTreeInfo.value.currentNodeKey = dataArray[info.dbindex]?.guid;
      dataBaseGuid.value = dataArray[info?.dbindex].databaseGuid;
      currentDatabasePath.value = info?.path;
      if (dataArray[info?.dbindex].dicType === 1) {
@@ -1323,6 +1324,7 @@ const getDataBaseTreeData = async () => {
    dataBaseTreeInfo.value.loading = false;
  } else {
+    dataBaseTreeInfo.value.loading = true;
    proxy.$ElMessage.error(res.msg);
  }
 };
--- a/src/views/data_inventory/dataLabel.vue
View file @9309294
+++ b/src/views/data_inventory/dataLabel.vue
View file @9309294
@@ -29,16 +29,16 @@ const getClassifyGradeTree = async () => {
    classGradeTreeData.value = transformedData || [];
    treeInfo.value.data = classGradeTreeData.value;
    // 默认展开第一级
-    expandedKey.value = classGradeTreeData.value[0].guid;
+    expandedKey.value = classGradeTreeData.value[0]?.guid;
-    treeInfo.value.expandedKey.push(classGradeTreeData.value[0].guid);
+    treeInfo.value.expandedKey.push(classGradeTreeData.value[0]?.guid);
    // 寻找第一children中guid
    if (classGradeTreeData.value[0].children) {
-      treeInfo.value.currentNodeKey = classGradeTreeData.value[0].children[0].guid;
+      treeInfo.value.currentNodeKey = classGradeTreeData.value[0].children[0]?.guid;
      // 分类明细guid
-      classifyDetailGuid.value = classGradeTreeData.value[0].children[0].guid;
+      classifyDetailGuid.value = classGradeTreeData.value[0].children[0]?.guid;
    }
    // 分别赋值 分类guid
-    classifyGuid.value = classGradeTreeData.value[0].guid;
+    classifyGuid.value = classGradeTreeData.value[0]?.guid;
    console.log('getClassifyGradeTree', transformedData);
    newCreateGradeFormItems.value[1].options = transformDataForTree([transformedData[0]])
    treeInfo.value.loading = false;
--- a/src/views/data_product/productListing.vue
View file @9309294
+++ b/src/views/data_product/productListing.vue
View file @9309294
@@ -848,7 +848,7 @@ const formInfo = ref<any>({
        <el-button type="primary" @click="toPatn1('add', 'add1')" v-preReClick>新建</el-button>
      </div> -->
    </div>
-    <div class="list-content">
+    <div class="list-content" v-if="demandListData.length > 0">
      <div class="card-content" v-for="item in demandListData" :key="item.guid">
        <div class="header">
          <img class="left-img" :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo"
@@ -868,12 +868,14 @@ const formInfo = ref<any>({
          </div>
        </div>
        <div class="operator-btn" @click="btnClick(item)">
-          <!-- <div class="left-btn borderRight" @click="btnClick(item)">更新模板</div> -->
          <div class="left-btn">资产登记</div>
        </div>
      </div>
    </div>
-    <div class="table_panel_wrap">
+    <div class="table_panel_wrap" :style="{
+      height: demandListData.length > 0 ? 'calc(100% - 230px)' : 'calc(100% - 54px)'
+    }">
      <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange"
        @tableSwitchBeforeChange="tableSwitchBeforeChange" />
    </div>
@@ -910,7 +912,7 @@ const formInfo = ref<any>({
  .table_panel_wrap {
    width: 100%;
-    height: calc(100% - 230px);
+    // height: calc(100% - 54px);
    padding: 0px 8px 0;
  }