Merge branch 'dev_20241202_xukangle' into develop

@@ -188,6 +188,7 @@ const tableInfo = ref({
 
 
 const getTableData = () => {
 const getTableData = () => {
   tableInfo.value.loading = true;
   tableInfo.value.loading = true;
+  // flowDetailLoading.value = true;
   getListingList(
   getListingList(
     Object.assign({}, searchItemValue.value, {
     Object.assign({}, searchItemValue.value, {
       pageIndex: page.value.curr,
       pageIndex: page.value.curr,
@@ -196,6 +197,7 @@ const getTableData = () => {
   )
   )
     .then((res: any) => {
     .then((res: any) => {
       tableInfo.value.loading = false;
       tableInfo.value.loading = false;
+      // flowDetailLoading.value = false;
       tableInfo.value.data = res.data.records || [];
       tableInfo.value.data = res.data.records || [];
       tableInfo.value.page.curr = res.data.pageIndex;
       tableInfo.value.page.curr = res.data.pageIndex;
       tableInfo.value.page.limit = res.data.pageSize;
       tableInfo.value.page.limit = res.data.pageSize;
@@ -203,6 +205,7 @@ const getTableData = () => {
     })
     })
     .catch((res) => {
     .catch((res) => {
       tableInfo.value.loading = false;
       tableInfo.value.loading = false;
+      // flowDetailLoading.value = false;
     });
     });
 };
 };
 
 
@@ -908,39 +911,40 @@ const formInfo = ref<any>({
         <el-button type="primary" @click="toPatn1('add', 'add1')" v-preReClick>新建</el-button>
         <el-button type="primary" @click="toPatn1('add', 'add1')" v-preReClick>新建</el-button>
       </div> -->
       </div> -->
     </div>
     </div>
-    <div class="list-content" v-if="demandListData.length > 0" v-loading="flowDetailLoading">
-      <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="" />
-            <div class="title">{{ item.exchangeName ?? '--' }}</div>
-          </div>
-          <div class="right-main">
-            <div class="count-group">
-              <div class="count-item">
-                <div class="item-label">已上架产品数</div>
-                <div class="item-num">{{ item.listingNum || '--' }}</div>
-              </div>
-              <div class="count-item">
-                <div class="item-label">审批中产品数</div>
-                <div class="item-num">{{ item.underReviewNum || '--' }}</div>
+    <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="" />
+              <div class="title">{{ item.exchangeName ?? '--' }}</div>
+            </div>
+            <div class="right-main">
+              <div class="count-group">
+                <div class="count-item">
+                  <div class="item-label">已上架产品数</div>
+                  <div class="item-num">{{ item.listingNum || '--' }}</div>
+                </div>
+                <div class="count-item">
+                  <div class="item-label">审批中产品数</div>
+                  <div class="item-num">{{ item.underReviewNum || '--' }}</div>
+                </div>
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>
-        </div>
-        <div class="operator-btn" @click="btnClick(item)">
-          <!-- <div class="left-btn">更新模板</div> -->
-          <div class="right-btn">产品上架</div>
+          <div class="operator-btn" @click="btnClick(item)">
+            <!-- <div class="left-btn">更新模板</div> -->
+            <div class="right-btn">产品上架</div>
+          </div>
         </div>
         </div>
       </div>
       </div>
-    </div>
-    <div class="v-tip">
-      <div class="tip-icon"></div>
-      <div class="tip-des">
-        在各数交所上架时，会同时在门户、专区和主平台门户进行展示；在门户上架则只会在门户上架，不会在数交所、专区及主平台门户上架。
+      <div class="v-tip">
+        <div class="tip-icon"></div>
+        <div class="tip-des">
+          在各数交所上架时，会同时在门户、专区和主平台门户进行展示；在门户上架则只会在门户上架，不会在数交所、专区及主平台门户上架。
+        </div>
       </div>
       </div>
-
     </div>
     </div>
     <div class="table_panel_wrap" :style="{
     <div class="table_panel_wrap" :style="{
       height: demandListData.length > 0 ? 'calc(100% - 230px)' : 'calc(100% - 54px)'
       height: demandListData.length > 0 ? 'calc(100% - 230px)' : 'calc(100% - 54px)'
@@ -987,7 +991,7 @@ const formInfo = ref<any>({
 
 
   .list-content {
   .list-content {
     display: flex;
     display: flex;
-    justify-content: flex-start;
+
     flex-wrap: wrap;
     flex-wrap: wrap;
     padding: 0 8px;
     padding: 0 8px;
 
 

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