Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue

@@ -51,7 +51,6 @@
   <div style="display: flex; margin-top: 20px; height: calc(85% - 20px)">
     <div class="detailTable">
       <ns-view-list-table
-        class="content-table"
         v-bind="tableConfig"
         :model="data"
         ref="mainRef"
@@ -208,10 +207,11 @@
   });
   const transactionTypeValue = ref();
   const changeSelect = (value, selectedOptions) => {
-    transactionTypeValue.value = selectedOptions.flatMap((group) =>
+    debugger;
-      group.flatMap((node) => [node.value, ...(node.children?.map((child) => child.value) || [])]),
+    // transactionTypeValue.value = selectedOptions.flatMap((group) =>
-    );
+    //   group.flatMap((node) => [node.value, ...(node.children?.map((child) => child.value) || [])]),
-    // transactionTypeValue.value  = value.flat()
+    // );
+    transactionTypeValue.value = value.flat();
   };
   const searchTableList = () => {
     year.value = queryParams.value.year;

hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue

@@ -6,9 +6,13 @@
           ><img width="68" height="68" src="../../../../src/icon/carbonAssetsMoney-1.svg"
         /></div>
         <div class="moneyTitle">全国碳账户估值（CNY）</div>
-        <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">{{
+        <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">
-          nationwide.valuation
+          <span
-        }}</div>
+            style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
+            :title="nationwide.valuation">
+            {{ nationwide.valuation }}
+          </span>
+        </div>
         <div class="moneyDetail">
           <div
             class="detailClick"
@@ -61,7 +65,13 @@
           ><img width="68" height="68" src="../../../../src/icon/carbonAssetsMoney-2.svg"
         /></div>
         <div class="moneyTitle">地方碳账户估值（CNY）</div>
-        <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">{{ place.valuation }}</div>
+        <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">
+          <span
+            style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
+            :title="place.valuation">
+            {{ place.valuation }}
+          </span>
+        </div>
         <div class="moneyDetail">
           <div
             class="detailClick"
@@ -114,7 +124,13 @@
           ><img width="68" height="68" src="../../../../src/icon/carbonAssetsMoney-3.svg"
         /></div>
         <div class="moneyTitle">CCER资产估值（CNY）</div>
-        <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">{{ ccer.valuation }}</div>
+        <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">
+          <span
+            style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
+            :title="ccer.valuation">
+            {{ ccer.valuation }}
+          </span>
+        </div>
         <div class="moneyDetail">
           <div
             class="detailClick"
@@ -167,7 +183,13 @@
           ><img width="68" height="68" src="../../../../src/icon/carbonAssetsMoney-4.svg"
         /></div>
         <div class="moneyTitle">碳资产总估值（CNY）</div>
-        <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">{{ whole.whole }}</div>
+        <div class="moneyTotal" style="color: rgba(229, 102, 22, 1)">
+          <span
+            style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
+            :title="whole.whole">
+            {{ whole.whole }}
+          </span>
+        </div>
       </div>
       <div class="title" style="justify-content: center">
         <img
@@ -277,7 +299,7 @@
     display: flex;
     align-items: center;
     .moneyImg {
-      width: 18%;
+      width: 15%;
       display: flex;
       justify-content: center;
     }
@@ -295,23 +317,24 @@
     .moneyTotal {
       width: 33%;
       display: flex;
-      justify-content: center;
+      justify-content: left;
       opacity: 1;
       font-size: 40px;
-      font-weight: 400;
+      font-weight: 500;
       line-height: 52px;
       text-align: left;
     }
     .moneyDetail {
-      width: 14%;
+      width: 17%;
       display: flex;
       justify-content: center;
       cursor: pointer;
       .detailClick {
         border-radius: 4px;
-        padding: 3px;
+        padding: 10px;
         > span {
           font-size: 12px;
+          margin-left: 2px;
         }
       }
     }

hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue

@@ -1,11 +1,9 @@
 <template>
-  <div>
+  <div style="height: 100%">
-    <ns-view-list-table
+    <div class="table" style="height: 100%">
-      v-bind="tableConfig"
+      <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 1500 }">
-      :model="data"
-      ref="mainRef"
-      :scroll="{ x: 1500, y: 350 }">
       </ns-view-list-table>
+    </div>
     <!-- 新增数据库数据 -->
     <a-drawer
       :width="500"

hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue

@@ -66,4 +66,10 @@
     text-align: left;
     vertical-align: top;
   }
+  :deep(.ant-tabs-content) {
+    height: 100%;
+  }
+  :deep(.ant-tabs-tabpane) {
+    height: 100%;
+  }
 </style>