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

@@ -20,7 +20,6 @@ import {
   changeNum,
   changeNum,
 } from "@/utils/common";
 } from "@/utils/common";
 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService";
 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService";
-import { content } from "html2canvas/dist/types/css/property-descriptors/content";
 
 
 const { proxy } = getCurrentInstance() as any;
 const { proxy } = getCurrentInstance() as any;
 const router = useRouter();
 const router = useRouter();
@@ -216,6 +215,7 @@ const toSearch = (val: any, clear: boolean = false) => {
   if (clear) {
   if (clear) {
     searchItemList.value.map((item) => (item.default = ""));
     searchItemList.value.map((item) => (item.default = ""));
     searchItemValue.value = {};
     searchItemValue.value = {};
+    currExchangeGuid.value = '';
   } else {
   } else {
     searchItemValue.value = Object.keys(val).length ? { ...val } : {};
     searchItemValue.value = Object.keys(val).length ? { ...val } : {};
   }
   }
@@ -790,8 +790,11 @@ const btnClick = (item) => {
   }
   }
 }
 }
 
 
+const currExchangeGuid = ref('');
+
 const cardBtnClick = (item) => {
 const cardBtnClick = (item) => {
   console.log(item, '------------------')
   console.log(item, '------------------')
+  currExchangeGuid.value = item.exchangeGuid;
   getTableData(item.exchangeGuid);
   getTableData(item.exchangeGuid);
 }
 }
 
 
@@ -920,22 +923,23 @@ const formInfo = ref<any>({
     </div>
     </div>
     <div v-loading="flowDetailLoading">
     <div v-loading="flowDetailLoading">
       <div class="list-content" v-if="demandListData.length > 0">
       <div class="list-content" v-if="demandListData.length > 0">
-        <div class="card-content" v-for="item in demandListData" :key="item.guid" @click="cardBtnClick(item)">
+        <div class="card-content" v-for="item in demandListData" :key="item.guid" @click="cardBtnClick(item)" :class="{ active: currExchangeGuid == item.exchangeGuid }">
           <div class="header">
           <div class="header">
             <div class="header-top">
             <div class="header-top">
               <img class="left-img"
               <img class="left-img"
                 :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo" alt="" />
                 :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo" alt="" />
-              <div class="title">{{ item.exchangeName ?? '--' }}</div>
+              <div class="title">  <ellipsis-tooltip :content="item.exchangeName ?? '--'" class-name="w100f"
+                :refName="'tooltipOver'"></ellipsis-tooltip></div>
             </div>
             </div>
             <div class="right-main">
             <div class="right-main">
               <div class="count-group">
               <div class="count-group">
                 <div class="count-item">
                 <div class="count-item">
                   <div class="item-label">已上架产品数</div>
                   <div class="item-label">已上架产品数</div>
-                  <div class="item-num">{{ item.listingNum || '--' }}</div>
+                  <div class="item-num">{{ changeNum(item.listingNum || 0) }}</div>
                 </div>
                 </div>
                 <div class="count-item">
                 <div class="count-item">
                   <div class="item-label">审批中产品数</div>
                   <div class="item-label">审批中产品数</div>
-                  <div class="item-num">{{ item.underReviewNum || '--' }}</div>
+                  <div class="item-num">{{ changeNum(item.underReviewNum || 0) }}</div>
                 </div>
                 </div>
               </div>
               </div>
             </div>
             </div>
@@ -1000,15 +1004,27 @@ const formInfo = ref<any>({
     display: flex;
     display: flex;
 
 
     flex-wrap: wrap;
     flex-wrap: wrap;
-    padding: 0 8px;
+    padding: 0 0px 0px 8px;
 
 
     .card-content {
     .card-content {
-      width: 300px;
+      width: 290px;
       // box-shadow: 0 0 0 1px #d9d9d9;
       // box-shadow: 0 0 0 1px #d9d9d9;
       border: 1px solid #d9d9d9;
       border: 1px solid #d9d9d9;
       border-radius: 3px;
       border-radius: 3px;
       margin-right: 12px;
       margin-right: 12px;
       margin-bottom: 12px;
       margin-bottom: 12px;
+      cursor: pointer;
+
+      &:hover {
+        border: 1px solid var(--el-color-primary);
+      }
+
+      &.active {
+        border: 1px solid var(--el-color-primary);
+        .header {
+          background-color: #ebf6f7;
+        }
+      }
 
 
       .header {
       .header {
         display: flex;
         display: flex;