From 7dadb221819e0c3296c09b3abfcbf80391fcceb9 Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Wed, 24 Jul 2024 09:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carbonEmissions/index.vue                      |  8 ++++----
 .../energyConsumption/index.vue                    | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
index 412aae7..52ac5ea 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -5,7 +5,7 @@
       :data-source="data" 
       bordered
       :pagination="false"
-      :scroll="{ x: 2000 }">
+      :scroll="{ x: 2000,y:480 }">
       <template #title>
         <a-date-picker v-model:value="selectYear" picker="year" @change="changeYearData" valueFormat="YYYY" />
       </template>
@@ -164,11 +164,11 @@
   // 获取表格数据
   const getTableList = () => {
     fetch(carbonEmission.carbonEmissionStatistics , queryParams.value).then((res) => {
-      data.value = res.data.records
-      total.value = res.data.total
+      data.value = res.data
+      total.value = res.data.length
     });
   };
-    getTableList()
+  getTableList()
   // 分页器
   const onChange = (pageNumber: number,size: number) => {
     queryParams.value.pageNum = pageNumber;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
index 410741c..eeaadb1 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -27,7 +27,19 @@
         </div>
       </template>
     </a-table> -->
-    <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 1500,y:350 }" />
+    <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 1500,y:350 }">
+      <!-- <template #bodyCell="{ record, column }">
+        <template v-if="column.dataIndex === 'enableRules'">
+          <a-switch
+            :checked="record.enableRules === 1 ? true : false"
+            :class="{
+              'blue-background': record.enableRules === 1 ? true : false,
+              'grey-background': record.enableRules === 1 ? false : true,
+            }"
+            @click="clickSwitch({ enableRules: record.enableRules, record: record })" />
+        </template>
+      </template> -->
+    </ns-view-list-table>
       <!-- <a-pagination 
         :current="queryParams.pageNum"
         :total="total"