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

xukangle
Showing 4 changed files with 20 additions and 17 deletions
src/store/modules/user.ts
src/views/data_asset/qualityEvaluate.vue
src/views/data_asset/registerManagemant.vue
src/views/data_asset/valueEvaluate.vue
--- a/src/store/modules/user.ts
View file @a04a9a7
+++ b/src/store/modules/user.ts
View file @a04a9a7
@@ -54,17 +54,13 @@ const useUserStore = defineStore(
              currentTenantGuid.value = res.data.tenantInfoList && res.data.tenantInfoList.length ? res.data.tenantInfoList[0].guid : '';
              localStorage.setItem('currentTenantGuid', currentTenantGuid.value);
              let currentTenant = res.data.tenantInfoList?.[0];
-              getCurrentUserInfo({tenantGuid: currentTenantGuid.value}).then((res: any) => {
+              return getCurrentUserInfo({tenantGuid: currentTenantGuid.value}).then((res: any) => {
                console.log(res, 'getCurrentUserInfo');
                if (res.code == '00000') {
                  userName.value = res.data.staffName;
                  localStorage.setItem('userName', res.data?.staffName);
                  localStorage.setItem('userData', JSON.stringify(res.data));
-                } else {
+                  return getSystemMenu({ tenantGuid: currentTenantGuid.value }).then((info: any) => { //解决页面调用流程接口传递staffGuid，为空的问题
-                  ElMessage.error(res.msg)
-                }
-              })
-              return getSystemMenu({ tenantGuid: currentTenantGuid.value }).then((info: any) => {
                    if (info.code == '00000') {
                      localStorage.setItem('userInfoData', JSON.stringify(info.data));
                      userInfoData.value = info.data;
@@ -73,6 +69,10 @@ const useUserStore = defineStore(
                    }
                  })
                } else {
+                  ElMessage.error(res.msg)
+                }
+              })
+            } else {
              isLogin.value = false;
             // ElMessage.error(res.msg);//授权码被重复使用，不抛出异常。
            }
--- a/src/views/data_asset/qualityEvaluate.vue
View file @a04a9a7
+++ b/src/views/data_asset/qualityEvaluate.vue
View file @a04a9a7
@@ -35,7 +35,7 @@ const tableFields = ref([
  { label: "资产名称", field: "daName", width: 160, align: "left", type: 'text_btn', value: 'productDetail', columClass: 'text_btn' },
  { label: "登记时间", field: "registerTime", width: 120 },
  //   { label: "企业名称", field: "tenantName", width: 240, align: "left" },
-  { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" },
+  { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" },
  { label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' },
 ]);
@@ -465,6 +465,7 @@ const dialogBtnClick = (btn, info) => {
          })
        }
      } else {
+        dialogInfo.value.footer.btns[1].loading = false;
        ElMessage.error(res.msg);
      }
    })
--- a/src/views/data_asset/registerManagemant.vue
View file @a04a9a7
+++ b/src/views/data_asset/registerManagemant.vue
View file @a04a9a7
@@ -531,11 +531,11 @@ const rejectDialogBtnClick = (btn, info) => {
    </div>
    <div class="content_main_wrap">
      <div class="list-content">
-        <div class="card-content" :class="{ active: exchangGuid == item.exchangeGuid }" v-for="item in exchangeList"
+        <template v-for="(item, i) in exchangeList" :key="item.exchangeGuid">
-          :key="item.exchangeGuid">
+          <div class="card-content" :class="{ active: exchangGuid == item.exchangeGuid }">
            <div class="header">
-            <img class="left-img" :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo"
+              <img class="left-img"
-              alt="" />
+                :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo" alt="" />
              <div class="right-main">
                <div class="title" :class="{ active: exchangGuid == item.exchangeGuid }"
                  @click="btnClick({ value: 'search', ...item })" v-preReClick>{{ item.exchangeName ?? '--' }}</div>
@@ -556,6 +556,8 @@ const rejectDialogBtnClick = (btn, info) => {
              <div class="left-btn is_block" @click="btnClick({ value: 'create', ...item })">资产登记</div>
            </div>
          </div>
+          <div v-if="i < exchangeList.length - 1" class="space_partition"></div>
+        </template>
      </div>
      <div class="table_panel_wrap">
        <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" />
@@ -727,16 +729,12 @@ const rejectDialogBtnClick = (btn, info) => {
  flex-wrap: wrap;
  .card-content {
-    width: calc(33.33% - 6px);
+    width: calc(25% - 6px);
    padding: 16px;
    box-shadow: 0 0 0 1px #d9d9d9;
    margin-bottom: 8px;
    max-width: 400px;
-    +.card-content {
-      margin-left: 8px;
-    }
    &.active {
      box-shadow: 0 0 0 1px var(--el-color-primary);
    }
@@ -819,5 +817,9 @@ const rejectDialogBtnClick = (btn, info) => {
      }
    }
  }
+  .space_partition {
+    width: 8px;
+  }
 }
 </style>
--- a/src/views/data_asset/valueEvaluate.vue
View file @a04a9a7
+++ b/src/views/data_asset/valueEvaluate.vue
View file @a04a9a7
@@ -44,7 +44,7 @@ const tableFields = ref([
  { label: "资产名称", field: "daName", width: 160, align: "left", type: 'text_btn', value: 'productDetail', columClass: 'text_btn' },
  { label: "登记时间", field: "registerTime", width: 120 },
  //   { label: "企业名称", field: "tenantName", width: 240, align: "left" },
-  { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" },
+  { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" },
  {
    label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
      const approveVO = scope.row.approveVO || {}