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

@@ -339,7 +339,7 @@ onMounted(() => {
         </template>
         <template #default="scope" v-else-if="item.type == 'text_btn'">
           <span v-if="scope.row[item.field] != null" :class="[
-            (item.getName(scope) === '--' || item.getName(scope) === null) ? '' : 'text_btn',
+            (item.getName?.(scope) === '--' || item.getName?.(scope) === null) ? '' : 'text_btn',
             item.class,
             scope.row.cellClass,
           ]"

@@ -52,20 +52,21 @@ onMounted(() => {
     </div> -->
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
+
+        <div class="v-uerinfo">
+          <div class="v-top">{{ userStore.userName }}</div>
+          <div class="v-top"> {{ JSON.parse(loaclStorageInfo).abbreviation }}</div>
+        </div>
         <el-avatar size="small">
           <el-icon>
             <svg-icon name="ep:user-filled" />
           </el-icon>
         </el-avatar>
-        <div class="v-uerinfo">
-          <div class="v-top">{{ userStore.userName }}</div>
-          <div class="v-top"> {{ JSON.parse(loaclStorageInfo).abbreviation }}</div>
-        </div>
-        <div>
+        <!-- <div>
           <el-icon>
             <svg-icon name="ep:caret-bottom" />
           </el-icon>
-        </div>
+        </div> -->
       </div>
       <template #dropdown>
         <el-dropdown-menu class="user-dropdown">
@@ -87,8 +88,20 @@ onMounted(() => {
 .tools {
   display: flex;
   align-items: center;
-  padding: 0 20px;
+  padding: 0 10px !important;
   white-space: nowrap;
+  position: relative;
+  margin-left: 16px;
+
+  &::before {
+    content: '';
+    height: 35px;
+    border-left: 1px solid #fff;
+    position: absolute;
+    top: 50%;
+    left: -1px;
+    transform: translateY(-50%);
+  }
 
   .buttons {
     margin-right: 20px;
@@ -160,10 +173,14 @@ onMounted(() => {
       display: flex;
       flex-direction: column;
       font-size: 12px;
+      margin-right: 6px;
+
 
       .v-top {
         height: 18px;
         line-height: 18px;
+        text-align: right;
+        max-width: 120px;
       }
     }
 

@@ -188,6 +188,7 @@ const tableInfo = ref({
 
 const getTableData = () => {
   tableInfo.value.loading = true;
+  // flowDetailLoading.value = true;
   getListingList(
     Object.assign({}, searchItemValue.value, {
       pageIndex: page.value.curr,
@@ -196,6 +197,7 @@ const getTableData = () => {
   )
     .then((res: any) => {
       tableInfo.value.loading = false;
+      // flowDetailLoading.value = false;
       tableInfo.value.data = res.data.records || [];
       tableInfo.value.page.curr = res.data.pageIndex;
       tableInfo.value.page.limit = res.data.pageSize;
@@ -203,6 +205,7 @@ const getTableData = () => {
     })
     .catch((res) => {
       tableInfo.value.loading = false;
+      // flowDetailLoading.value = false;
     });
 };
 
@@ -271,10 +274,12 @@ const tableSwitchChange = (val, scope, field) => {
           message: res.msg,
         });
         getTableData();
+        getListingCountData();
         reject(false)
       }
     }).catch(() => {
       getTableData();
+      getListingCountData();
       reject(false)
     })
   })
@@ -334,6 +339,7 @@ const tableBtnClick = (scope, btn) => {
         if (res.code == '00000') {
           ElMessage.success('删除成功')
           getTableData();
+          getListingCountData();
         } else {
           ElMessage.error(res.msg)
         }
@@ -356,6 +362,7 @@ const tableBtnClick = (scope, btn) => {
         if (res.code == '00000') {
           ElMessage.success('撤销成功！')
           getTableData();
+          getListingCountData();
         } else {
           ElMessage.error(res.msg)
         }
@@ -554,6 +561,7 @@ const passSubmit = () => {
           ElMessage.success('审批通过！')
           dialogVisible.value = false;
           getTableData();
+          getListingCountData();
         } else {
           ElMessage.error(res.msg)
         }
@@ -605,6 +613,7 @@ const rejectSubmit = async () => {
           ElMessage.success('驳回成功！')
           dialogVisible.value = false;
           getTableData();
+          getListingCountData();
         } else {
           ElMessage.error(res.msg)
         }
@@ -902,12 +911,13 @@ const formInfo = ref<any>({
         <el-button type="primary" @click="toPatn1('add', 'add1')" v-preReClick>新建</el-button>
       </div> -->
     </div>
-    <div class="list-content" v-if="demandListData.length > 0" v-loading="flowDetailLoading">
+    <div v-loading="flowDetailLoading">
+      <div class="list-content" v-if="demandListData.length > 0">
         <div class="card-content" v-for="item in demandListData" :key="item.guid">
           <div class="header">
             <div class="header-top">
-            <img class="left-img" :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo"
-              alt="" />
+              <img class="left-img"
+                :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo" alt="" />
               <div class="title">{{ item.exchangeName ?? '--' }}</div>
             </div>
             <div class="right-main">
@@ -934,7 +944,7 @@ const formInfo = ref<any>({
         <div class="tip-des">
           在各数交所上架时，会同时在门户、专区和主平台门户进行展示；在门户上架则只会在门户上架，不会在数交所、专区及主平台门户上架。
         </div>
-
+      </div>
     </div>
     <div class="table_panel_wrap" :style="{
       height: demandListData.length > 0 ? 'calc(100% - 230px)' : 'calc(100% - 54px)'
@@ -981,7 +991,7 @@ const formInfo = ref<any>({
 
   .list-content {
     display: flex;
-    justify-content: flex-start;
+
     flex-wrap: wrap;
     padding: 0 8px;
 

@@ -41,7 +41,7 @@ const tableInfo = ref({
     },
     { label: "数据类型", field: "damTypeName", width: 90 },
     {
-      label: '权力主体', field: 'rightMainName', width: 140,
+      label: '权利主体', field: 'rightMainName', width: 200,
     },
     {
       label: "是否公共数据", field: "isPublicData", width: 120, getName: (scope) => {