From 59c300406700cc46a3deff59b4095686e96b6210 Mon Sep 17 00:00:00 2001
From: fks-yangshouda <yangshoudamhy@163.com>
Date: Wed, 14 Aug 2024 17:29:18 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E4=B8=AD=E5=BF=83=20-=20?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9B=91=E6=8E=A7=20=E6=A0=B9=E6=8D=AEUI?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=9B=BE=E8=BF=9B=E8=A1=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/icon/xianshiqi.svg           |  10 +
 hx-ai-intelligent/src/icon/zongheshuju.svg         |  21 ++
 .../environmentMonitor/aggregateData/index.vue     | 219 ++++++++++++---------
 .../environmentMonitor/averageData/index.vue       |  32 ++-
 .../environmentMonitor/historyData/index.vue       |  37 ++--
 5 files changed, 204 insertions(+), 115 deletions(-)
 create mode 100644 hx-ai-intelligent/src/icon/xianshiqi.svg
 create mode 100644 hx-ai-intelligent/src/icon/zongheshuju.svg

diff --git a/hx-ai-intelligent/src/icon/xianshiqi.svg b/hx-ai-intelligent/src/icon/xianshiqi.svg
new file mode 100644
index 0000000..64cd691
--- /dev/null
+++ b/hx-ai-intelligent/src/icon/xianshiqi.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="37.921875" height="30.218994140625" viewBox="0 0 37.921875 30.218994140625" fill="none">
+<path d="M37.6256 11.8506L0.296264 11.8506C0.133319 11.8506 0 11.9839 0 12.1469L0 21.9236C0 22.5791 0.529573 23.1086 1.18506 23.1086L17.4796 23.1086C17.6426 23.1086 17.7759 23.242 17.7759 23.4049L17.7759 26.3676C17.7759 26.5305 17.6426 26.6638 17.4796 26.6638L10.9618 26.6638C10.7988 26.6638 10.6655 26.7972 10.6655 26.9601L10.6655 28.8118C10.6655 28.9747 10.7988 29.108 10.9618 29.108L17.4796 29.108C17.6426 29.108 17.7759 29.2413 17.7759 29.4043L17.7759 30.0709C17.7759 30.1523 17.8425 30.219 17.924 30.219L19.9979 30.219C20.0793 30.219 20.146 30.1523 20.146 30.0709L20.146 29.4043C20.146 29.2413 20.2793 29.108 20.4422 29.108L26.9601 29.108C27.123 29.108 27.2563 28.9747 27.2563 28.8118L27.2563 26.9601C27.2563 26.7972 27.123 26.6638 26.9601 26.6638L20.4422 26.6638C20.2793 26.6638 20.146 26.5305 20.146 26.3676L20.146 23.4049C20.146 23.242 20.2793 23.1086 20.4422 23.1086L36.7368 23.1086C37.3923 23.1086 37.9219 22.5791 37.9219 21.9236L37.9219 12.1469C37.9219 11.9839 37.7885 11.8506 37.6256 11.8506ZM4.74023 16.5908C4.74023 15.9353 5.2698 15.4057 5.92529 15.4057C6.58078 15.4057 7.11035 15.9353 7.11035 16.5908C7.11035 17.2463 6.58078 17.7759 5.92529 17.7759C5.2698 17.7759 4.74023 17.2463 4.74023 16.5908ZM32.8335 17.4278C32.6187 17.6425 32.3225 17.7759 31.9966 17.7759L10.6655 17.7759C10.01 17.7759 9.48046 17.2463 9.48046 16.5908C9.48046 15.9353 10.01 15.4057 10.6655 15.4057L31.9966 15.4057C32.6521 15.4057 33.1816 15.9353 33.1816 16.5908C33.1816 16.9167 33.0483 17.213 32.8335 17.4278ZM36.7368 0L1.18506 0C0.529573 0 0 0.529572 0 1.18507L0 10.9618C0 11.1247 0.133319 11.2581 0.296264 11.2581L37.6256 11.2581C37.7885 11.2581 37.9219 11.1247 37.9219 10.9618L37.9219 1.18507C37.9219 0.529572 37.3923 0 36.7368 0ZM4.74023 4.74022C4.74023 4.08473 5.2698 3.55516 5.92529 3.55516C6.58078 3.55516 7.11035 4.08473 7.11035 4.74022C7.11035 5.39571 6.58078 5.92529 5.92529 5.92529C5.2698 5.92529 4.74023 5.39571 4.74023 4.74022ZM32.8335 5.57718C32.6187 5.79196 32.3225 5.92529 31.9966 5.92529L10.6655 5.92529C10.01 5.92529 9.48046 5.39571 9.48046 4.74022C9.48046 4.08473 10.01 3.55516 10.6655 3.55516L31.9966 3.55516C32.6521 3.55516 33.1816 4.08473 33.1816 4.74022C33.1816 5.06613 33.0483 5.36238 32.8335 5.57718Z"   fill="url(#linear_fill_0_5271)" >
+</path>
+<defs>
+<linearGradient id="linear_fill_0_5271" x1="18.9609375" y1="0" x2="18.9609375" y2="30.218994140625" gradientUnits="userSpaceOnUse">
+<stop offset="0" stop-color="#2BC69C"  />
+<stop offset="1" stop-color="#0CA87E"  />
+</linearGradient>
+</defs>
+</svg>
diff --git a/hx-ai-intelligent/src/icon/zongheshuju.svg b/hx-ai-intelligent/src/icon/zongheshuju.svg
new file mode 100644
index 0000000..abf6ff9
--- /dev/null
+++ b/hx-ai-intelligent/src/icon/zongheshuju.svg
@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="42" height="42" viewBox="0 0 42 42">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#50a6ff"/>
+      <stop offset="1" stop-color="#4182fb"/>
+    </linearGradient>
+    <filter id="矩形_8514" x="0" y="0" width="42" height="42" filterUnits="userSpaceOnUse">
+      <feOffset dy="6" input="SourceAlpha"/>
+      <feGaussianBlur stdDeviation="3" result="blur"/>
+      <feFlood flood-color="#4886fb" flood-opacity="0.2"/>
+      <feComposite operator="in" in2="blur"/>
+      <feComposite in="SourceGraphic"/>
+    </filter>
+  </defs>
+  <g id="组_21753" data-name="组 21753" transform="translate(-1578 -238)">
+    <g transform="matrix(1, 0, 0, 1, 1578, 238)" filter="url(#矩形_8514)">
+      <rect id="矩形_8514-2" data-name="矩形 8514" width="24" height="24" rx="8" transform="translate(9 3)" fill="url(#linear-gradient)"/>
+    </g>
+    <path id="wodeshenqing" d="M130.422,98.2H123.2a1.211,1.211,0,0,0-1.2,1.215v8.1a1.21,1.21,0,0,0,1.2,1.215h7.221a1.21,1.21,0,0,0,1.2-1.215v-8.1A1.21,1.21,0,0,0,130.422,98.2Zm-3.62,2.041a.606.606,0,1,1-.6.606A.606.606,0,0,1,126.8,100.241Zm-2.6,0a.606.606,0,1,1-.6.606A.6.6,0,0,1,124.206,100.241Zm-.2,2.827h4.429a.406.406,0,0,1,0,.812H124a.406.406,0,0,1,0-.812Zm5.606,3.224H124a.406.406,0,0,1,0-.812h5.606a.406.406,0,0,1,0,.812Zm-.2-4.836a.606.606,0,1,1,.6-.606A.6.6,0,0,1,129.413,101.455Z" transform="translate(1471.873 149.182)" fill="#fff"/>
+  </g>
+</svg>
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
index 816e37c..ff4e517 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
@@ -12,17 +12,43 @@
           box-shadow: 0 0 0 2px rgba(218, 218, 218, 0.5);
           border-radius: 10px;
           background: #ffffff;
-        "
-        ><span>设备状态</span>
-        <div style="display: flex; width: 100%; height: 100%">
-          <div ref="ringChartRef" style="width: 50%; height: 80%"></div>
-          <div style="width: 50%; height: 80%; padding-top: 5%">
+        ">
+        <div style="display: flex">
+          <ns-icon name="zongheshuju" size="30" style="margin-right: 3px" />
+          <span>设备状态</span>
+        </div>
+
+        <div style="width: 100%; height: 100%; padding-left: 10%; padding-right: 10%">
+          <!-- <div ref="ringChartRef" style="width: 50%; height: 80%"></div> -->
+          <div
+            style="
+              height: 40%;
+              background: #f3fbf9;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+            ">
+            <ns-icon name="xianshiqi" size="30" style="margin-right: 30px" />
+            <div style="height: 100%; display: flex">
+              <div style="display: inline-flex; align-items: flex-end; height: 75%">设备总计</div>
+              <div
+                style="
+                  font-size: 46px;
+                  font-weight: 700;
+                  letter-spacing: 2.76px;
+                  color: rgba(22, 178, 136, 1);
+                  text-align: center;
+                  height: 75%;
+                "
+                >{{ sum }}</div
+              >
+              <div style="display: inline-flex; align-items: flex-end; height: 75%">台</div>
+            </div>
+          </div>
+          <div style="width: 100%; height: 60%">
             <div v-for="(item, index) in ringData" :key="index">
               {{ item.name }} : {{ item.value }} {{ item.unit }}
-              <a-progress
-                :percent="(100 * item.value) / sum"
-                :show-info="false"
-                style="padding-right: 30%" />
+              <a-progress :percent="(100 * item.value) / sum" :show-info="false" />
             </div>
           </div>
         </div>
@@ -37,7 +63,10 @@
           border-radius: 10px;
           background: #ffffff;
         ">
-        <div style="height: 10%">平均值</div>
+        <div style="display: flex">
+          <ns-icon name="zongheshuju" size="30" style="margin-right: 3px" />
+          <div style="height: 10%">平均值</div>
+        </div>
 
         <div style="display: flex; display: flex; flex-wrap: wrap; width: 100%; height: 100%">
           <div v-for="(item, index) in averageData" :key="index" style="width: 33%; height: 45%">
@@ -102,8 +131,9 @@
           border-radius: 10px;
           background: #ffffff;
         ">
-        <div style="width: 100%; display: flex"
-          ><div style="width: 20%">环境指数分析</div>
+        <div style="width: 100%; display: flex">
+          <ns-icon name="zongheshuju" size="30" style="margin-right: 3px" />
+          <div style="width: 20%">环境指数分析</div>
           <div style="width: 80%; float: right; padding-right: 40px">
             <a-select
               v-model:value="typeValue"
@@ -113,7 +143,7 @@
             <!-- {{ quyuvalue }} {{ defaultValues }} -->
             <a-tree-select
               v-model:value="quyuvalue"
-              style="width: 20%; margin-left: 10px"
+              style="width: 35%; margin-left: 10px"
               :tree-data="treeData2"
               show-checked-strategy="SHOW_CHILD"
               :default-value="defaultValues"
@@ -130,7 +160,7 @@
             <a-select
               v-model:value="frequencyValue"
               placeholder="请选择采集频率"
-              style="width: 20%; margin-left: 10px"
+              style="width: 10%; margin-left: 10px"
               :options="frequencyOptions" />
             <a-date-picker style="width: 20%; margin-left: 10px" v-model:value="timeValue" />
 
@@ -176,7 +206,7 @@
   // 采集频率list
   const frequencyOptions = ref<SelectProps['options']>([]);
 
-  const ringChartRef = ref(null);
+  // const ringChartRef = ref(null);
   const hotChartRef = ref(null);
 
   const ringData = ref();
@@ -189,7 +219,7 @@
   const timeValue = ref<Dayjs>(dayjs());
 
   // 圆环图
-  let ringChar: echarts.ECharts | null = null;
+  // let ringChar: echarts.ECharts | null = null;
   // 热力图
   let hotChar: echarts.ECharts | null = null;
   const sum = ref(0);
@@ -213,7 +243,8 @@
           unit: '台',
         },
       ];
-      drawRing(ringData.value);
+      sum.value = res.data.在线 + res.data.离线;
+      // drawRing(ringData.value);
     });
   };
   // 获取平均值
@@ -234,7 +265,7 @@
             value: res.data[0].value,
             unit: res.data[0].unit,
             iconName:
-              'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAG2RJREFUeF7tXQmUVMW5/up2zwyzsYiAAu4CiuACBhc0otA9AmF6MBJ9MD2IJsYlJjGrL3lGs2pM8kwiRokxyPTgQqJ0j+gwPcNiVBTjggsQURRcAZfA7N3Tfeu9asEMM7fvre7q7rkz969zOHBO/99fdb+/Pqrurb+qGKgQA8RAUgYYcUMMEAPJGSCBUO8gBkwYIIH0UveYObNmYEEcUznwRYAfDeDAn8EA2wHwHWBsB+PYwl1YE6qr3NJLTXV0tSSQHIZfiCIvHv8OY64zwXlZilW/yYEnNI09EFxduSZFLJmnyQAJJE3iUoVVeKuv4NCuB/hJqWIN7G/XwG9dGa7akwFf5IKmWL3XBypmBKZxF7shjRHDvNEM25jObwk2VN3Xe0/X/2umESSLMS73LruZQbspi1UAjN0Xqq9clNU6HOycBJKl4Pu8gUcAzM2S+25u2Y5QuPKY3NTlrFpIIFmIt89b/UeAXZcF12Yu3wyF/WNyXGe/r44EkuEQV3gDV3JgSYbdSrrjd4TCVd+UNCYzCQZIIBIkyZr4vDWXAPxBWfvudgzsLXD+CWcYD6A4HT8M7BfBcOWN6WAJ05MBEkgGe4XPG3gewGRZlwyoAdfWcBbfGnVpW+vqKpsOYOd47z9Bgz6BIz4h1Rd9Bu30YHjBC7LtILvkDJBAMtQ7Up1acfAba8NVv5CpvtwTKAfjv2ZgJ8jYc+DPtWH/12VsycacARJIhnpICqPHBzr4OY+Gq95Otepyb83tDPzbMjgaRWRYsrYhgVhzZGlR4an2c8aqLQ3BPgiFK0dZ2yW3qPBUX8YZW2rlg3Msrm3w5/pLmlWz+tzvJJAMhKyirGYF53yelSstro9buWbhNis7q9993urHADbL1I5hZ6jeLxIgqSgwQAJRIE9Ap01bOmBQvvvfAAaYuuL8G6GGqjsVq0vAfTNrxiPON1v54gwza+v9q63s6PfkDJBAFHtHubf6Ugb2gLkb3hgKV3kUqzoILpXGwtjdofrKqzNZr9N8kUAUI+7z1twC8Bss3PwpFPZfq1jVQfA5Zct8GteCFj43hcL+0zJZr9N8kUAUI+4rq7kLnF9l5oYxdn2wvvL3ilUdBJ/rrR6ug+228Lk3FPYPyWS9TvNFAlGMuM8bENOrS00ForEZ2djk5PPWvGa1v4RFY0OC6xftVXxMx8JJIIqh93kDdQAuNHOjgY/IxuamCm/NvRz8clNxcu20YMOCTYqP6Vg4CUQx9D5PYB0Yppm5CYX9WeFZ5kWd6Tg/2Ohfr/iYjoVnJXBOYpME0r+jTQJRjC8JRJFAm8NJIIoBkhEIOOSnOAzNEEf96K7ba9fMN/1KRVMsxeBJwEkgEiSZmQiBcManMWSBShc7yew8LBKIYvAk4FmIqkSt/cjE56l5HoxL7wFJ7dHZ5qjrkMl1dbMiRjgSSGpspmNNAkmHtS4YnyfwPhhGKrpJCudAZW3Yv5wEki2Gzf2SQBR593kC/wbDYEU3JgLRf1obXngzCSRbDJNAsspsuSfwPsviCALGFoTqK+8ngWQ1jEmd0wiiyLvPU/06GBur6MYkQMn3l9M7SLZY/49fEogix5995mXTAK7oyRD+/VDY/9tkjkkg2aD8YJ8kEEWOD6yDcHBk5lMvawH4K5qu/3Bl48KnzJpHAlEMngScBCJBkpmJzEIh5WIpktyLcBKIIvkkEEUCbQ4ngSgGiASiSKDN4SQQxQCRQBQJtDmcBKIYIBKIIoE2h5NAFANEAlEk0OZwEohigGQEklK6eyrtYeJ2XNbjcLiun5xpR2EqhPa0JYGo8YesprurtE1ElgMkEBUSkY1NDGoN6mvo7Ka7q7EhRhJNZ7QnXYFGGkEUyBPQbKe7KzaPRhBFAkkgigRmO91dsXlgOrs+2JjZQ+tU29SX8CQQxWhlPd1dqX1cCISmWAockkAUyPtsipXddHfF5tEUS5FAEogigVlOd1dsHX3FUiWQBKLIYObT3RUblIDv/8Yr/kUnKyoRSgJRoi/xFcvy6NGglp2zox/gBXiIF5o+AQlELcAkEDX+SCCK/NkdTgJRjBCNIIoE2hxOAlEMEAlEkUCbw0kgigEigSgSaHM4CUQxQCQQRQJtDieBKAZIRiATEFOsxRi+BxrEn+6F0t0zRzcJRJFLSndXJNDmcBKIYoAo3V2RQJvDSSCKAaJ0d0UCbQ4ngSgGiNLdFQm0OZwEohggSndXJNDmcBKIYoAo3V2RQJvDSSCKAaJ0d0UCbQ4ngSgGiNLdFQm0OZwEohggmYXC4Lc2K9ZiDH/g2WF4aONwU9+U7q5GPQlEjT+5dHcSiCLLvQcngShyTyOIIoE2h5NAFANEAlEk0OZwEohigEggigTaHE4CUQwQCUSRQJvDSSCKAZIRyIRRrYq1GMP3NOVhT3N+jx8p3T1zdJNAFLmkdHdFAm0OJ4EoBojS3RUJtDmcBKIYIEp3VyTQ5nASiGKAKN1dkUCbw0kgigGidHdFAm0OJ4EoBojS3RUJtDmcBKIYIEp3VyTQ5nASiGKAZNZBFKtIGU7rIClTlhRAAlHkUkYgg2+tVKzFGN7e+DIija+a+qZ0dzXqSSBq/Emlu5NAFEnuRTgJRJF8GkEUCbQ5nASiGCASiCKBNoeTQBQDRAJRJNDmcBKIYoBIIIoE2hxOAlEMEAlEkUCbw0kgigEigSgSaHM4CUQxQCQQRQJtDieBKAaIBKJIoM3hJBDFAJFAFAm0OZwEohggEogigTaHk0AUA0QCUSTQ5nASiGKASCCKBNocTgJRDBAJRJFAm8NJIIoBIoEoEmhzOAlEMUAkEEUCbQ4ngSgGiASiSKDN4SQQxQCRQBQJtDmcBKIYIBKIIoE2h5NAFANEAlEk0OZwEohigEggigTaHE4CUQwQCUSRQJvDSSCKASKBKBJoczgJRDFAJBBFAm0OJ4EoBogEokigzeEkEMUAkUAUCbQ5nASiGCASiCKBNoeTQBQDRAJRJNDmcBKIYoBIIIoE2hxOAlEMEAlEkUCbw0kgigEigSgSaHM4CUQxQCQQRQJtDieBKAaIBKJIoM3hJBDFAJFAFAm0OZwEohggEogigTaHk0AUA0QCUSTQ5nASiGKASCCKBNocTgJRDBAJRJFAm8NJIAoB8pUFfgSOX1q56M1bbgH8A3F2dWhN5RardtLvPRkggaTRKyo8y08F02/jgEcG3ssCAQc6GMM1oXr/Upn2ks1/GCCBpNgbKsqqv805uw1Aniy0twXSpZ1LtLj+45VrFn4i23an25FAJHvArFlLD8uLuf8EYK4kJGHmPnYESq6UGmhScZuwjW3fhZZ7GlPCceBlxvTvheoXpgZMqZb+Y0wCkYjlnBk1Z2ouvgwcYyXMDzIZMHMSBpw3PlWYnH1cx75fPQzeGpGz/49VnDN8t7be/4dUgU6zJ4FYRLzcW30pA3sgnY7hPvJQFM47C65hg9KBS2E61r+GjtWbpGy7GzGOxcEG/3VpgR0CIoGYBNrnXXYDoN2STl/Im3Akir58JlhhfjrwlDDRF99C++Mvgrd0pIQTxgxsVTBcOSdloEMAJJAkgU535HAfNwIFZ42DEEgui/5pCyJPbUVkw+spV8sY+1uwvvIrKQMdACCBGAS5vGz5+Yzra1OJv2v00IQw8icfmwos47axHR8h8vRWdL76Tmq+OX4davDfkBqo/1uTQLrFuKJs+RTO9Y2phL7gvPEonDkpFUjWbaMb30D76pfA26PSdXHoP60NL7xZGuAAQxJIlyDPKbv/JA3xR2S/VmmDi1E4axLyTj7Kll0l9t4n6Kh7EbHtu6XbRyI5mCoSSBc+yr2BxxkwU6Y35Z10RGLU0A4tlTHvPRvOEy/wkSe3SreBAXODYX9QGtCPDUkg+4NbXhb4GeO4USbWeSeMQvHCaQCTpy++Zx+YpoENLgZzazLVZNSmve4lRJ7YLOtzE4vGzg+uX7RXFtBf7eQj3F8ZAFDuCZQzhpDMI7qPGY7iqmlSn295RyciG/6Fzpd3Ir77s76mDSxCwfSJKDhjjEx1GbVpD/0TkWfkvnJxsN/Xhiuvz2gD+qAzxwuk3PPASKbFGsBhudztGnkIiqvOg3j3sCrRZ15PfHKNf9RkaFrytRlwH3eYlZuM/962YgPEuolMoamWWCdyeCn3BpYw4EorGlhRAUSndh0+xNRULNa1rtiA2LYPTO20YQMx8JuzgTyXVdUZ/731r2vRadG+/ZW+EAr7T894A/qQQ0cLpMK7fDKH/rxMvAovOgMFU8ynRfquvWi5txF6s9yKdum3ZlsKTqZtqdqIUa116VqIxUWrwoCvB8P+P1vZ9dffHS0Q2dFDCEMIxKzEd36E5rvqU+onpd/+ElyHDU4Jkynjzq3voXXZehl3jh5FHCsQ2dFDTKnE1EpMsZKV2Nu70bKkQaazHWQz6OZLwAZIbytJ2b8VoOOJzeioe8nKTMzDHTuKOFYgsqNH0SVTkX/aMUk7UeeW99BaLfU/8UE+8qeMQZHFqGTZczNg0LIkjNjbe6w8OXYUcaRA5k5fNlZ3aZbfO/NOFOsd5ycfOXZ+hJa/rgUinVYd7KDfE4uMsydBO6T3Fxk7N7+L1sATlu1nnPmDDZU1lob9zMCRAin3BL7DGH5nFcuSr86A+/gkn2IjnQlxxHZ+ZOXm899ZcQEGXHAyCqaOk8bkwrD1/ifR+cpOi6rYQ6Fw5aW5aI+d6nCkQHze6rUASz40AMifcjyKLjozaazaV25EZOMb0rHMP+XoxAKha3j2Nk9JN6abYeydj9Hyp9VW8NZ4TB+3au3C960M+9PvjhNI+YxlpzFNe9EqiCVf80Ds7TAqstMSgRWLigOmT0T+F463qrJXf29Zuhax183XbsBxVajBv6RXG5rjyh0nkApP4EbO8DMznt1HD0PJVWVJTVrvaUTn9l3WoSpwo/RKL1yjDrG27WULserfXvtP01Zw8FW14SpH7T50nEB83sDTAM426wmFX5qMgnNONDSJvrAdbX97Rqo7F80/F/k2TYXv/gD6J81o+o11Olo8po920jTLUQKZN2+FK7ov8imAgUl7eIEbA6+fkzTfqvnOOsTftT5WaoD3FAy4YKKUkOxiJDfNYheFGipX2qXN2W6HowQytyxwis5hegRI/klHosj/RUPexXqBWDewKmLdRKyf9LUi9oy0P/aCebMdtjXXUQIp9wYWMMD0W36h91QUXDDBsJMkNh79w/qI29LrZvWJ947uDxl7cxda/mJ1nhxfFwpXXdDXxJ9uex0lEJ8ncCsYfmhGVskV0+Eec7ihSfPvapOmrx8A2GWFPJ0OwWM69t30IBDXzeCtobC/JB3/fRHjNIGsAsNss0AN+tmlYPnuHibx9z9F8x2PW8a4r44eBx6s+c7ViL/7selz6gyTH633W34qtySrDxg4SiDl3sAmBpySLC7ic6zo4EYl+twbaHvE/LCTvjx6HHjm9lUvJM7XMiucYWZtvd9yZbEP9H/LJjpKID5vQKyEGc+fxHHtYq/5ZcYL7EIcQiSm07OrvHAfPdyS9JwaxOKIi30fOk98mbPKHu54YkviJBSzwhguDtb7H87pc/RSZU4TSAxA0i184vie4vnnGoai5e4wYjvMs14H/qAC2iH2mZ6LVJjImlehN7V9/kxWo1xk4za0r3zOvDsyLAzV+6t7qc/mtFrHCGTu9GVDdZdmOrk22xjVfPuqzw9eSBahQb+Y3ysnlhi1x+xqhIIZE1E4w3imGX3pbbQ9JNZSkxcGXBMM++/KaU/tpcocIxDf9JrxcHHTc28Kzj0RhbMnG4ai6VePHPQ/cXcjVjIAg/7n4l4KY7dqO+No+uNj0JMcGCGsSy6/AO6xI3u0V3Kn4ff//0vWb+3xsNlthWMEUjEjMI1rWGdGp9n/rHtvfBDoFDM04+IeeQhKvmn8gp/dEPb0Hv/w32j+w2Om1RaWfwEFZ/dMuxenMLbcY7470kmnLzpGIHNnVJ+oa8x0la/g9ONQePFZhh1r700PmW6Mch1xKEqvvTDXWjCsL/raO2ir+Ye5QGZNQsEXe5501PnaO2i1wHLGrq6tr7zbFg+b5UY4RiCzZy8f4u7URR5W0pI35nAUXzHdeIp1Wwj6p81JsdrQUgz8vi/L4ZJzH3liC9otvkQVfeVs5E/qeRK9OPS6baXF2d3cOflYjhGI6Fo+b0DcVZb0RhvXsIEo/W65YS9suavedPcgK8rHoJ/Y44qNtoefRfSfb5qqKdk7SMe6V9FR/7KVEqeGwv4NVkb94XeHCaT6HYAdkSxwLM+NQT833lUq9m2LjVJmJVu32aba0Vr+3IDYW+Ynuic7ckhmoZC54scH6y7bnmq7+qK9wwQSEDuCTE8KHHTjPIi9492LzBbbkq9Oh/v4pOuQOekf4jzgfTc/ZFnXwB9fDK10QA878YlXfOo1K/nRptK/rb/W+tQ5y1bY38BZAvEELHOxkuVStTe+jEjjq6YRLTjvJBTOPK1Xoy67HTjZaNd63zp0/sts2zlrCYUre/84lhyx7CiBlHsDf2HAFWbcFn35LOR/4bgeJuJY0abfrzINi1kuV47iibbQc4g+s818BDj5KIjdjkal6Zd/tzo6dXso7Lf3BvsMku0ogfjKAr8Ex4/M+MubeCSKFxhvmJJZTS9ecC7yJvbOjVO8uR3Nd9SZLmiKZy+69Bzkn3p0DxrE/YYtd1sen7ohFPb3vd1gaYrGUQKRWSxkBXkQR4IanXvfHt6EyNrXzEeR0UNRes2FgJZ7amWmgaLxYsVfrPz3eM96TNxEZb4hzEmLhIKf3EcxTSVnClburd7DwIaZ+Su5fDrcY3u+bMvtuEPiPUS8j+SyyI4eeeNHJy4AMpxe3Ra0PvFdZyeHGivNX8Zy+eBZrstxAvF5A3cCuMaMV7OXbZkNRWL0EJ1QpM/nqrTd/ySilqcjInEYnjgUr3uREz/bHApXGu9HztWD5rgexwmkvCxwIeOoM+PZNWooSq8zvsszumkH2h58yjJMuUxelBWHOEZVHKdqVNpXPY/IU/8yfS6nTa8cOcUSR/9E9nV8aDnNqpoG9/jRhh1GnOYuTnW3Ku4jhqLkWqlLc61cJf29o/EViD8yJTGqGTyTvq8VLXesht7Sbi4QHj+ntuEy81x4mYb0IRvHjSAiNr6ywD3g+KpZnMQ7iHgXMSpy05HPkK4Rg1G86Hypew1T7TeyL+XCr/hqJb5eGZWO+k3oWGf+8QFw3vTKkSOIeOiKssBXOIflcnPRf50Dcei0UWl75FlEnzPPdzqAE3laYn1FXHuQiSJeyNvDL1vmW3WtS2Qai4zj7kX/uBnNix+HWIE3K4zhf4P1/u9mov19yYcjR5D9mb3iS4zpW7T7mBEo+brHMJ56U3viEDlxZKdsyTv56MQeDHH2bzpFCKNj4zZ0Prfdcq2jq//CJKntwqb90ecRedr83UPYOemghq7cOVIgggCft+YGgN9i1VGL5p2F/Mk9V9YFLrblPbSkcbuUWEgU962Lr1wye9jF16n4W7sT7z1d95dbtT0xtZp0LERqu1GJi0tHF9eBx+JWrv4eCvvnWRn1x98dK5DyqfeWsuJ8sfHB+JTq/dG2etGWm78n7zraYYPhPnwI2NASuIYOhFZUgPgnzdA/bkr8Hd++W6YDG1YgLggVWbvJitj3IfZ/WBWd82mPNlRZX0Nl5agP/u5YgewfRa4BuFgXMS1iBBEjSbLS8tc1iG370MpNzn83S7+XOodXTK2Ae2vDftMPGjl/sBxW6GiBfCaSgLjLIPlVUvuDIbanirl8spLK59Zsx9c9biRKFiU/Pjf64ltoWyG136mTcW1KsGGB6YHf2X6e3vTveIGUe2oqGeMBmSAUVUxB/pljk5rK7OeWqUfFxuzwbeFXHCLXLO4B4VymmttDYf93ZAz7q43jBbJ/FBEprF6ZICfbiXcAKw6Xa3/4WctDrmXqStUmWRpJVz9NP/879NYOa9cMH7vj2hkPNy54y9q4/1qQQBLTrOo5AKuVDfPgn14CFOQlNU/3c6xs/d3t8icfi4KzxsE1eqipC3FRp7iwU6Y4Ma3EiBcSyH5WKjw1P+CM/1qm8wibkqvL4D7KfD0j20LJm3BkQhjJLhv9/FkiscRiYNzkILluz/1wKOy3ySl4shHJjh0JpAuvPk/gHjDzFJSuYSicewYKzhhjGRkhlOhr7yL2xgfofONDoNNy3SGpT9eIQXCPGZlIx88zOBmxOzD+/idoWdIAHk1+6F03zOtDorFT71u/SGIeZvnofd6ABNIthD5PYB0YjDdMGIRbCCTxdctkynUQrDOO6OvvJ65cFncdxj9uAkwW6rSBRdAOLUXeuFEJUbgOHyLd6To37UCrROZxV4d6nE15dE2l+XW30i3o+4YkEIMY+jyB98DM01C6wsRUS1zYKT6vplP0fW0QOVEibYW3R/cvGpbCdehAIC/pYfRJq+JtUXRs2Gp5yEQPBwyXh+r9S9N5hv6KIYEYRFbmJHijDiEu7xS5VkZJgbnqQOK+c5FblUqOmGibU5MRreJCAknCULmn+nTGWFpTDSGSgqknQBxHmqsizrIS4rC6Ps2oPQxoCIb9Up+5c/U8dqmHBGISiYtm1oyOx/kOs0t3ksFFinv+2eOQP3YUXEf2TDPPRAfgrRF0bvsA0U1vJ95p0imc4ee19f6fpIN1AoYEYhHlefNW5Ef3RcR9AMZnAUn0EtfIIYkvT3mnHAVxTYJKSYjilZ0JYXS+ucv0SgarehhnZcGGSuuL360c9ePfSSCSwfV5A78B8D1J86RmrmGD4D7lyETWLisq+Pxv8W9x5Clzu8DbIhBC0Fsj4O37/93WgdgbuyzP3JVrH9+s6Zi3srHK/LZOOWf92ooEkkJ4fd6AEIgQSp8tDKjRW6PX1D59hfxOrz77tOoNJ4GkyKGvLFAFjtsAjEgRagNzfmsoXPXfNmhIn2kCCSSNUM26YPlReW79WgDfAFCYhoscQ9j9mqYtXrl6vkjtp5ICAySQFMjqbuqbUTORa/wbDLhSwU32oByPcQ2La+v9q7NXSf/2TALJQHzLPTVTGeNiNDG+fScDdaTo4knGsDhY71+RIo7MuzFAAslgl/B5qmeBsfkAnwkwte+5abSLA3VgfGVtfdU9acAJYsAACSQL3WLetBUlkfyIjwEzsy0WIQoNrA5a56PB1YvEoiaVDDJAAskgmclczfEu+5LGNHEFbgU4MrGsHmSch9AZDwbXL9qbg0dwbBUkkByHXhxa54rrw6FrIxj4cHB9BDRtODgXn42HA6wYDLvBubiFczdL/K3v1l35u9CJ3bVr5pvfzpnj5+nv1ZFA+nuE6fmUGCCBKNFH4P7OAAmkv0eYnk+Jgf8DHHY5bsRnMNMAAAAASUVORK5CYII=',
+              'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iNDgiIGhlaWdodD0iNDgiIHZpZXdCb3g9IjAgMCA0OCA0OCIgZmlsbD0ibm9uZSI+DQo8cGF0aCBkPSJNMjQgMEMxMC43NDQ2IDAgLTAuMDAwNzkxMDg0IDEwLjc0NiAwIDI0LjAwMTRDMCAzNy4yNTU0IDEwLjc0NiA0OC4wMDA4IDI0LjAwMTQgNDhDMzcuMjU1NCA0OCA0OC4wMDA4IDM3LjI1NCA0OCAyMy45OTg2QzQ4IDEwLjc0MDQgMzcuMjUyNCAtMC4wMDM5NjY4NiAyMy45OTcxIDEuNDMwNTNlLTA2TDI0IDBaTTExLjExNTQgMjIuODI0OEM4LjkxOTQgMjAuNjI4NiA4LjkxOTQgMTcuMDY4IDExLjExNTQgMTQuODcxOEwxNS4wODk3IDEwLjg5NzVMMTkuMDY4NCAxNC44NzE4QzIxLjI2NDkgMTcuMDY3OSAyMS4yNjQ5IDIwLjYyODcgMTkuMDY4NiAyMi44MjVDMTYuODcyMyAyNS4wMjEzIDEzLjMxMTQgMjUuMDIxMyAxMS4xMTUyIDIyLjgyNUwxMS4xMTU0IDIyLjgyNDhaTTI3LjM1NDcgMzkuMTQxQzI0LjExNDggMzkuMTU4MSAyMS4yODMzIDM2Ljk1NzIgMjAuNTAwNCAzMy44MTMzQzE5LjcxNzQgMzAuNjY5MyAyMS4xODYgMjcuMzk3NiAyNC4wNTU2IDI1Ljg5MzJMMjQuMDU1NiAxMi4xNDk2QzI0LjA1NzkgMTAuMzI5MiAyNS41MzQzIDguODU0NzQgMjcuMzU0NyA4Ljg1NDcxQzI5LjE3NTEgOC44NTQ3MSAzMC42NTE0IDEwLjMyOTIgMzAuNjUzOCAxMi4xNDk2TDMwLjY1MzggMTIuODUwNEwzMi4wNTU1IDEyLjg1MDRDMzIuMzA3MiAxMi44MzAzIDMyLjU0ODkgMTIuOTUzMiAzMi42ODEgMTMuMTY4NEMzMi44MTMgMTMuMzgzNyAzMi44MTMgMTMuNjU0OCAzMi42ODEgMTMuODcwMUMzMi41NDg5IDE0LjA4NTMgMzIuMzA3MiAxNC4yMDgyIDMyLjA1NTUgMTQuMTg4TDMwLjY1ODEgMTQuMTg4TDMwLjY1ODEgMTcuMDE3MUwzMi4wNTU1IDE3LjAxNzFDMzIuNDIzNyAxNy4wMTcxIDMyLjcyMjIgMTcuMzE1NiAzMi43MjIyIDE3LjY4MzhDMzIuNzIyMiAxOC4wNTIgMzIuNDIzNyAxOC4zNTA0IDMyLjA1NTUgMTguMzUwNEwzMC42NTgxIDE4LjM1MDRMMzAuNjU4MSAyMS4xNzk1TDMyLjA1NTUgMjEuMTc5NUMzMi4zMDcyIDIxLjE1OTMgMzIuNTQ4OSAyMS4yODIyIDMyLjY4MSAyMS40OTc1QzMyLjgxMyAyMS43MTI3IDMyLjgxMyAyMS45ODM5IDMyLjY4MSAyMi4xOTkxQzMyLjU0ODkgMjIuNDE0MyAzMi4zMDcyIDIyLjUzNzIgMzIuMDU1NSAyMi41MTcxTDMwLjY1ODEgMjIuNTE3MUwzMC42NTgxIDI1LjkxMDNDMzMuNTI3NiAyNy40MTQ3IDM0Ljk5NjIgMzAuNjg2NCAzNC4yMTMzIDMzLjgzMDNDMzMuNDMwMyAzNi45NzQzIDMwLjU5ODkgMzkuMTc1MSAyNy4zNTkgMzkuMTU4MUwyNy4zNTQ3IDM5LjE0MVoiICAgZmlsbD0iIzI3NzhGRiIgPg0KPC9wYXRoPg0KPC9zdmc+DQo=',
           },
           {
             id: res.data[1].code,
@@ -242,7 +273,7 @@
             value: res.data[1].value,
             unit: res.data[1].unit,
             iconName:
-              'data:image/png;base64,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',
+              'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0Ny45OTYiIGhlaWdodD0iNDguMDAxIiB2aWV3Qm94PSIwIDAgNDcuOTk2IDQ4LjAwMSI+DQogIDxwYXRoIGlkPSLlh4/ljrtfMTA3MiIgZGF0YS1uYW1lPSLlh4/ljrsgMTA3MiIgZD0iTS0xNjU5Ni05YTIzLjg0LDIzLjg0LDAsMCwxLTE2Ljk2Ny03LjAyOUEyMy44MzEsMjMuODMxLDAsMCwxLTE2NjIwLTMzYTIzLjg0NSwyMy44NDUsMCwwLDEsNy4wMjUtMTYuOTczQTIzLjg0MSwyMy44NDEsMCwwLDEtMTY1OTYtNTdoLjAwOGEyMy44MzIsMjMuODMyLDAsMCwxLDE2Ljk2NSw3LjAyOUEyMy44NDUsMjMuODQ1LDAsMCwxLTE2NTcyLTMzYTIzLjg0MywyMy44NDMsMCwwLDEtNy4wMjksMTYuOTcxQTIzLjg0NSwyMy44NDUsMCwwLDEtMTY1OTYtOVptNy4zNTQtMjQuMTIxYTUsNSwwLDAsMC0xLjQ4OC4yMjUsOS44MDgsOS44MDgsMCwwLDEtMi45ODYsNy4wODcsNSw1LDAsMCwwLDQuNDc5LDIuNzQ1LDUuMDU5LDUuMDU5LDAsMCwwLDEuNTU3LS4yNDYsNS4wMSw1LjAxLDAsMCwwLDMuNDA4LTUuNTY4QTUsNSwwLDAsMC0xNjU4OC42NDgtMzMuMTIyWk0tMTY2MDAtNDEuMDgxYTguMzg4LDguMzg4LDAsMCwwLTguMzc5LDguMzgsOC4zODgsOC4zODgsMCwwLDAsOC4zNzksOC4zOCw4LjM4Niw4LjM4NiwwLDAsMCw4LjM3NS04LjM4QTguMzg2LDguMzg2LDAsMCwwLTE2NjAwLTQxLjA4MVptNi4zMjItNS40NDNhNS4wMzMsNS4wMzMsMCwwLDAtNC45MSw0LDkuNzczLDkuNzczLDAsMCwxLDcuNDUxLDUuMzcyLDUuMDM1LDUuMDM1LDAsMCwwLDIuMzI0LTUuNjU2LDUuMDM1LDUuMDM1LDAsMCwwLTQuODQ2LTMuNzEyaC0uMDJaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxNjYxOS45OTggNTcuMDAyKSIgZmlsbD0iIzI3NzhmZiIvPg0KPC9zdmc+DQo=',
           },
           {
             id: res.data[2].code,
@@ -250,7 +281,7 @@
             value: res.data[2].value,
             unit: res.data[2].unit,
             iconName:
-              'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAAAXNSR0IArs4c6QAAFnRJREFUeF7tXQuUFNWZ/v6a4TFTA6vuJuge3FWTFYwehe7BtyfGB8ZEdzUryGONjxiza3zgdDVGPUcnm/hguhpdwfWIBo0gD8nG3SQbFE7ErOIDpgcE0bA+T+ImYoiCTA0IM/Uvtxl1IMx0db26uu9f58xhgP/5/ffrqr51738JcgkCgkC/CJBgIwgIAv0jIASR0SEIDICAEESGhyAgBJExIAj4Q0DuIP5wEy1NEBCCaFJoSdMfAkIQf7iJliYICEE0KbSk6Q8BIYg/3ERLEwSEIJoUWtL0h4AQxB9uoqUJAkIQTQotafpDQAjiDzfR0gQBIYgmhZY0/SEgBPGHm2hpgoAQRJNCS5r+EBCC+MNNtDRBQAiiSaElTX8ICEH84SZamiAgBNGk0JKmPwSEIP5wEy1NEBCCaFJoSdMfAkIQf7iJliYICEE0KbSk6Q8BIYg/3ERLEwSEIJoUWtL0h4AQxB9uoqUJAkIQTQotafpDQAjiDzfR0gQBIYgmhZY0/SEgBPGHm2hpgoD2BBnSnv1CneGeDabxBHwBzCNANALA7wH8gYGXAFo6hI1nP2yesVWTcSFp9iKgLUGGvmwdXtdN1wN8vafRQHgXRP/mvG7ei4mtOz3piFDVI6AlQZrasxOYeDaAz/uoYAe5yHSOs5/xoSsqVYaAdgQxC5mpAM0PWidy8RUhSVAUk6+vFUEaV1utZOC2sMpCxEd3pvKvhmVP7CQPAW0IYnZkvwnmH4dbAn6HCF9PGkmGtWdGdxMdZTBGAxgNooOIsBbgDW6Pu7GLOjeieU5XuFjUpjU9CPKyZZq78CIIx4ReRsajTrN9aeh2fRhsbM+miHgGgLMGVGf8jghtnWlbfQ+TawAEtCBIYyFzM4Fuj24k0LlOOvdkdPZLW25sz1xJRA+WluwjQbTcSeXGl6WjmbAWBDELlvqecFR0taXHnHTun6KzP7Bls5B5G6DD/PpncHNXOl/wq1/LejVPkMZCJk2g9kiLyPjAabb/MlIf/Rhv7LCeI8YpQX07abvmx4IfjGoelLBnrvoDuRLTvmYhOx0ofucIfBFoTmc6953AhmrMQM0TpKmQfYDBV0VeN6IpTiq3MHI/vQ6GvTx9lNvtPgfgr8LySUTXdaZys8KyVwt2ap4gZsH6GYDzIy8Ws+U05/OR++l1YHZkbTBnwvbn1huHbj+u7d2w7VarvdonSLv1CxC+HnmBmLJOc86O3M+nBLFWgHF62P6IaWJnc25J2Har1V7tE6TDegiMb0VeIOJvOqn8vMj9qGeq56YP297gfhSNL77bSedborFdfVZrniBNheztDL458tIwneM055ZF7gdA02rrdDawIgpfBLzQmbZPjsJ2NdrUgCDWGQz8KuriOB91DcNX/r0zaj/KftQzczLl+1kVa54gaL9qkEnD/w/A5yIcvEudtP21CO3vZbqpMP0bDPc/IvFHtMpJ5U6IxHYVGq19gqhP3PbMvUR0bYT1ucJJ2w9HaH9vgqy2jmED66Pwx+D7utL5a6KwXY02tSCIuSF7MO9wnyXQF0MvEmGJk7Inhm53IIMbWgebO5ytAA8N3S/RpU4q92jodqvUoBYEUbUxC9blAOaGXKfNVI+vdB5nvxKy3ZLmzIKl1k6lSgqWKWAwH7WtOf+bMtVqVlwbghRJ0mE9DsaE0KrZ457lHD8z8gmA/cVrtls3gXBHaLkUDfFcJ52Pfko83KAjtaYVQRSSjQVrFgGBn7HZxfe7xtmtkVanhHGzYK0FcFxYMbgf94zcfvLdakJDrl4EtCPInjtJcXdhzmfTBiDmt+b9jdZhhexpLvh/whjNBFzcmbYfD8NWLdnQkiCqgGW3/WHeBCL1pnyek7bXJWUQmO3WQ6BgKwUYeKMrbf9dUnJKUhzaEuSTItRC47jGQuYqAj3gZ2AxYWVXyj7Vj64Xnd7YLgBwLog2EGNlNS2r154gXopcDTLmquzBVMf/ysC3Pca7GaCck861eZQvT+z1a4eYHw1ZCSC9P8VqeVsvBCmv7ImXNtszl4JwLsEYx+Aj9g6YdgBYCcZaYxA9uO24to1RJVRyMoT4LieVvykq/2HZFYKEhWQC7QxdfcMR9Ua9IsohLuOF7Q1Na3B0PG1TzY7sK2A+ul9YKrhNuZxSCUHKQUtkPSNgFiwuJVyJbcqlYtr3/4Ug5SIm8p4QkDuIJ5hESFcESvYCkO8gug4NyfsTBAZ6zJJZLBkngkBx1ULmTrh0IQij5D2IDAlBoMYQkC/pNVZQSSdcBIQg4eI5oLWha6YdVucapzPXnQDiY0E4lpg3g+lVEDYA/Kshu3a+8MGJsyLqWBJjsjXiSiuCmKuyY1DHqpfUVpDxWyfVFstejuJ6JKYrQPCy11udf/gUg+Z0pXO/qJFxVrVpaEGQxkL2PNrTfnSvDosMPNGVtr8RVfV6z0K8sb/1SB78/tyFccf2dNuLHmRFJAIEap4gQ9tv/Js66lHbU/fbw5aYru5szt0fNra95Ahjf8VWcnGBnIcYdoW82at5ghSnGZm+NxAcPUb34TvG3vOON8hKS0XRt8plnLi92X6ptHeRCBMBDQjiZR+6e7mTnvlIGMBGQY5P4pJDQ8OoUHk2hCBFvMIhSGPBOp8A1U0+motoA7pxlnN87r1oHIjVfRHQgCDxPWKZBWt5yQM0A49BujGyTU6BY6s9A7VPkPU3j8DOnf1+4ob1Jd0stFwGGNF3VyTa4Lhbx6J5zq7aG47JyyhxBGlanbmI66gZjHHFH8K7AKsvp+tg4BVnbF59Spd1NXVkvsQwHt93A0+Y07xNBet5Bk4qKzDfwuE8Evp2r5FiYggyrD0zusegHxDjogHxJ/zYSdmXlV2j168d0rRlyIVMfBiINoX5orDh5ekjjW73d2XH5FeB8Uun2Y7+UCC/8dWQXiIIYnZYd4DheX8ygzuZ6aykTHuaHdnJYF4Q57ggGvT5ztSdf4zTp46+Kk6QIJ3Xk7KnwCxYqgmdFecAYgPndY21/ztOnzr6qihBGjsy5xLTLwMAbztpOxtAPxRVs2CpbuiXhGLMoxF2cWXXOPtHHsVFzCcCFSVIU4e1khnBjvuK8WzA/jA2C9ZTAMb7rIEvNQbf0pXOh9y82lcoNa1UMYI0hXUIDGOB02xPrWSVGgvWTwm4MM4YiHB9Z8q+N06fOvqqHEEK2YsZvCgE0F9z0vaXQrDj20Rje/Z+Iv5n3wZ8KBJoUmc6t9iHqqiUgUDFCGIWMjMAml5GrP2KDjK6D9wy9p4tYdjyYyPK9Vf9xVMNPaX8YJk0ncoRpMNaAYbavBT4qvRgaeiwTjIYzwdOxLMBfsdJ5w/3LB6B4J7NZz1jAOM4EMaAeRXB6IDLGzrHxX/iVgQpFk1WjCBNBeuHDNwSRmIN243hm09t2xaGLb82zIKlDp75a7/6ZerlnLQdyt23TL8YtubGk1235wcAzuj37kZ43gX/sCuVX1qu/aTJV4wgDQXrQgP4aWBAGGudZntsYDsBDZRs1hzQfl91Bjd3pfNqE1isl9mRtcGc8eqUmWd1Neev8yqfRLmKEUSdy1FP/EZQUAh4sDNtq+20Fb0a1rccanxsrATh0CgDIdCcSpyvYbZn3gPRiLJzI9zppOyby9ZLiELFCKLyD2N6lIi/3JnKh3IMWdCaNBWsaxiYFdTOQPqVuHsEXSlQzSfnVpQgTYVpRzHqX/U9oIhuclK5u3zrR6DYVMg+wWB1olLoFxN9qyuVC/so6wHjNAvWsbtPh1KrqX2fyc6En3Sl7PBOFw4d2f4NVpQgKqymQvZ2Bvu6BSdlLda+8JoF60MAB4RZx4o9WoW0zoxcntA5Lv+TMDGJw1bFCaKSrPbVvPsrlNlhrQFjTEhFfNpJ22eGZKssM2ZHdhmYzy5LaX/ChBlOyh6weUZgHxEYSARBVF6R7weJALxSJs0OLw0jBrbC4Pu60vnA57qXirW//zcLWQfgRr/6ffQqRvIgsSeGIJ8kEcWOwiAABdXtPeVVzbLt9zDLAez/vNLdFRtXt4wlw+gIikFRn7HNabaHh2IrRiOJI0iMucfqylydmUx1xhns8pkg7PctOAEvuMBTBH7RSefVCuGKXo3tNx9CtPP3IQXxupO2jwzJVmxmhCCxQd3H0Yqrm4YMM0cYdT0jjF11XW539x+3D3beT2IjBrOQeRugw0KA6XEnbV8cgp1YTQhBYoW7+pw1dlhLSvYJ8JIW4XtOyp7hRTRJMkKQJFUjgbGEtlKZ6RynObcsgSkOGJI2BJlwF//FoMEYBRejWB0H5mI0AwcTFV+ANTDQQECD+r33pVgdCB+CsYWBLQbhQ2ZsUf+m/k6MN1zGi4uz9Eq1Fb3ceM2AK693nwfd2pW2v1+u3yTI1yRBLmvloR834TRmnEaE04rn4zEOiQjwTgAvMrDKIKxFPdYuuJ5ej8hXZcyuuLrJHN7od7X0Zidtf64ygQf3WhMEaW1l43+bcLbLOIUIpzBwCgFDgsPj28JbRFBneizfRVi+pIXUUviqvhrWtJxsuMbKspMgd4yTmvly2XoJUahagky4j5sGbcd4JownxnjG/qdOE4DzDkUU9VNXj2Xzp9HGBMTkOwTPCxdrpLld1RHk4hz/Qx3hHxUxwCh/+bXvoRGSImGFIgsTli9qofaQrMZqxuzIXAKXvgqC2odzVB/n60BYwz14tlZaElUNQSbleAoRLo++e3p8Y40Iy1zG/EUWzYvPa7ieDlgz7YDu7voxg6huzYfNM7aGa73y1hJPkMk2Xwngit0HW8bUGLoiRVnHhHlUh3kLp9GmikQgTveLQGIJMtkuriBVXRODryStnuJvIsY8BuYtzNK66gm7diNNHEEm5VltWZ1OjIqtYE1CuQmY1+Ni/uLpVHUv18LEb3KOj2WgeBKxYWADDcILj11H74bpYyBbiSLIlBxfwwTVrSOKfd0fgLGKgbcNA2+pP90evF3Xg7cX3ERqg9OfXVPv5eHYiZGs4mGMdA2MVLERY+SeVjcxTBIwnth9Qu/shVl6Oq5BkQQ/l93NB3zs4rbdL2qn7RsPESYuyNCSOOJMBEEiepxS06ntYLQT45kF02lt2IBOupMPQx1OIMLxjD1/AhgUtp9eew/X1WH2/BsonOXnEQUZhtnJdnHL8m1A/xvOCGheYFHknV0qShD1gm9jE9oAeG4lU6IALzFhKVw8uShLFTky+eI2ThkGzgJwzkC9o3wOpG4wZruM2Yun05s+bSRWbaC7xr5BMzBnkUXfiTqZihFkis1pRpEc/TYg85j8b5ihetQurRQp+otzyp18IA/GGeziTKIiYY7wmNPAYow/MTB7cANmPXoN/SkUmxU24uWusVeIjI0LszQ66rArQpBJOf42EdTS5wMDJPgzNrC4ZyQWL5lIPQHsxKY6qY3VujBFFnWE3N+G4PhNEGb/YRtmP9NK3SHYi93E1Dyf5zLUjsvzy3W+0KLIx2/kDvomPaGVB9eZuIcI/1IuGH3kH3aB+xdbtDqAjYqqTpjJB9W7xZeeiijHBA2GGR1E+NGQTsx9pJXU0pbEX0GIoZKruUesqTN4pFuPB8H4qq/q1eBszlUP8KCPthWJcjkBJ/rCpa8S4TW4eHjQLsx99ObkPXpdkmNzF2MCESaA8DXf+RI2GIyJj1nkv6eaR+ex3EGKX756imuQ/LTBeZoNzF7UQmq6s2avyTZPVkQJ48UoEX7rulBntifie9lUm8e5gGocp36Cbd8l/NpgXB0HOdRgi4Ugk/N89/7ms0uM9nVg3LMwS6rQ2lyT8vz35KIFhC+HlHTsM3vqUXrQMJziujhVbT/ondELng7h9lHbcGtrK7nBjXmzEBdBXgHjaG8hAURYMLgHmUem03tedWpNTr00dQktFO4yfjX1vZ6BVwlQOyHXLLRoc1Ds1AtV3omTXMZJBuFUBk4DMDio3U/0CVjNBm5d2EJPhmXTq514CGLz7l2X3i4CbllgkRxOqZ5H2vjgegMtQPGnzhuC5UmpFQWkSMNYQ4QdYOxg9aeLHQZ99nvx3wwMJ2A4GKq/1XAmfLH43amMD7/yois+4ty9qwG3LvkuqZ2bsV/xECTPXu4gb7qMzOIs/VfsKCTc4ZSZfDxctDBQdW1zAkCrlpLcu9Ci5wLYCKwaD0FsVu88+j8RKcZZicCIVdDAJJsvoj13k1pe+q8mcxQx/rOCUH/qOhaCKG9TbF7UzyfgMwbw3bhmJZIAetAYpth8FaP4cq3cdqZBXUepvwrAgwsteihKJ+Xajo0gKrDel0OTdp83cS6Adcz49aIstZYbtMjvQWBSnq8ghjojPuhynUpCugKEuQszNL+SQfTnO1aCJBGAWohpis3nuMBUQpEsRhXk1LN79fNSGJib9Pdb2hBEh8Zxk2fy0VB3FBcXgPZqppAEznwEYBkTlmEnli+6id5JQlClYqhJgkjjOGBKG4+Beiex50XdqUBxs1e8F+M1MrCcXajDTZ8O451LvAnE9CY96qSkcVxphBVhmHB67xv608M+Ig6AWk28HoT1apNadw+WLbmxunuAKVSr9g4ijeNKk2Igid69/0cawJGsfhijCDhInYjHgEmAqX4v/hA2gfE+gE1EeB+MTQy8DwObuAfvcz3eWnwDvRYsomRqVx1BpHFcMgdSrUZVNQSRxnG1OgSTnVfiCSKN45I9gGo9usQSJKJOJ0mvpzSOS1iFEkcQaRy3Z4RI47g9OEjjuD6fGNI4bj8fnzW41djLTUIax/VBKaLHKWkc52UkJlDGSwsgaRznr3Cxby/dN0xpHOevcEpLGsf1fZySxnH+R5I0jlN9f6RxXIkRJI3jAGkc5/9jxpNmrLNY0jhuT02kcdyne4N8dVRUGErjuH35XYOzOdI4ztOH+J8LxbhFO5Y7iDSOKz0QpHFcaYx6XxBJ47heqKRxnMcxU0Is9pk9aRxXZuEme2v786lVaRwHSOO4zwaZNI7rQzhpHPcZGNI4ThrH9b0XSeO4fu7M0jiuzEeWEMVj+ZI+WRrHhVIyaRwXCoxlGYmFICoiaRxXVl0GFJbGceFhWcpSbARRgUjjuFLlKO//pXFceXj5kY6VIH4CFJ3SCEjjuNIY+ZUQgvhFLoF60jgu/KIIQcLHNBEWpXFcOGUQgoSDY+KtSOM4fyUSgvjDreq1pHGctxIKQbzhJFKaIiAE0bTwkrY3BIQg3nASKU0REIJoWnhJ2xsCQhBvOImUpggIQTQtvKTtDQEhiDecREpTBIQgmhZe0vaGgBDEG04ipSkCQhBNCy9pe0NACOINJ5HSFAEhiKaFl7S9ISAE8YaTSGmKgBBE08JL2t4QEIJ4w0mkNEVACKJp4SVtbwgIQbzhJFKaIiAE0bTwkrY3BIQg3nASKU0REIJoWnhJ2xsCQhBvOImUpggIQTQtvKTtDQEhiDecREpTBIQgmhZe0vaGgBDEG04ipSkCQhBNCy9pe0NACOINJ5HSFAEhiKaFl7S9ISAE8YaTSGmKgBBE08JL2t4QEIJ4w0mkNEVACKJp4SVtbwgIQbzhJFKaIiAE0bTwkrY3BIQg3nASKU0REIJoWnhJ2xsCQhBvOImUpggIQTQtvKTtDQEhiDecREpTBIQgmhZe0vaGgBDEG04ipSkCQhBNCy9pe0NACOINJ5HSFAEhiKaFl7S9ISAE8YaTSGmKgBBE08JL2t4Q+H/1v2tBJc7J8AAAAABJRU5ErkJggg==',
+              'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0Ny45OTYiIGhlaWdodD0iNDguMDA2IiB2aWV3Qm94PSIwIDAgNDcuOTk2IDQ4LjAwNiI+DQogIDxwYXRoIGlkPSLlh4/ljrtfMTA3MyIgZGF0YS1uYW1lPSLlh4/ljrsgMTA3MyIgZD0iTS0xNjU5NS41LTlhMjMuODI1LDIzLjgyNSwwLDAsMS0xNi45NjUtNy4wMzFBMjMuODMyLDIzLjgzMiwwLDAsMS0xNjYxOS41LTMzYTIzLjg1OCwyMy44NTgsMCwwLDEsNy4wMjctMTYuOTc1QTIzLjgzMiwyMy44MzIsMCwwLDEtMTY1OTUuNS01N2EyMy44NTMsMjMuODUzLDAsMCwxLDE2Ljk2OSw3LjAyOEEyMy44MzIsMjMuODMyLDAsMCwxLTE2NTcxLjUtMzNhMjMuODU5LDIzLjg1OSwwLDAsMS03LjAyNywxNi45NzVBMjMuODQ4LDIzLjg0OCwwLDAsMS0xNjU5NS41LTlabTUuNjMzLTE0LjM3MmExLjYxOSwxLjYxOSwwLDAsMC0xLjYxNywxLjYxNiwxLjYxOSwxLjYxOSwwLDAsMCwxLjYxNywxLjYxNiwxLjYxNiwxLjYxNiwwLDAsMCwxLjYxMy0xLjYxNkExLjYxNiwxLjYxNiwwLDAsMC0xNjU4OS44NzEtMjMuMzY5Wm0tNi40NjUsMGExLjYxOSwxLjYxOSwwLDAsMC0xLjYxNywxLjYxNiwxLjYxOSwxLjYxOSwwLDAsMCwxLjYxNywxLjYxNiwxLjYxOSwxLjYxOSwwLDAsMCwxLjYxNy0xLjYxNkExLjYxOSwxLjYxOSwwLDAsMC0xNjU5Ni4zMzYtMjMuMzY5Wm0tNi40NjUsMGExLjYxNiwxLjYxNiwwLDAsMC0xLjYxMywxLjYxNiwxLjYxNiwxLjYxNiwwLDAsMCwxLjYxMywxLjYxNiwxLjYxOSwxLjYxOSwwLDAsMCwxLjYxNy0xLjYxNkExLjYxOSwxLjYxOSwwLDAsMC0xNjYwMi44LTIzLjM2OVptMS41Ny0xNi4xNjZhNi40NDcsNi40NDcsMCwwLDAtMi4yNTguNDA3LDYuNSw2LjUsMCwwLDAtNC4yLDYuMDYzLDYuNDkxLDYuNDkxLDAsMCwwLDQuMiw2LjA1NSw2LjUyMiw2LjUyMiwwLDAsMCwyLjI2Mi40MDgsNi40NSw2LjQ1LDAsMCwwLDQuODkxLTIuMjI4LDYuNDYxLDYuNDYxLDAsMCwwLDQuODg3LDIuMjI3LDYuNSw2LjUsMCwwLDAsMi45NzMtLjcyMiw2LjQ1Miw2LjQ1MiwwLDAsMCwzLjMtNy4zLDYuNDQxLDYuNDQxLDAsMCwwLTYuMjc3LTQuOTE2aC0uMDM5YTYuNDI2LDYuNDI2LDAsMCwwLTQuODQ4LDIuMjM3QTYuNDczLDYuNDczLDAsMCwwLTE2NjAxLjIzLTM5LjUzNVptMTkuNDQ1LDQuODU1YTEuNjE5LDEuNjE5LDAsMCwwLTEuNjE3LDEuNjE2LDEuNjE5LDEuNjE5LDAsMCwwLDEuNjE3LDEuNjE2LDEuNjE5LDEuNjE5LDAsMCwwLDEuNjE3LTEuNjE2QTEuNjE5LDEuNjE5LDAsMCwwLTE2NTgxLjc4NS0zNC42OFptLTI5LjEsMGExLjYxOSwxLjYxOSwwLDAsMC0xLjYxNywxLjYxNiwxLjYxOSwxLjYxOSwwLDAsMCwxLjYxNywxLjYxNiwxLjYxOSwxLjYxOSwwLDAsMCwxLjYxNy0xLjYxNkExLjYxOSwxLjYxOSwwLDAsMC0xNjYxMC44ODctMzQuNjhaTS0xNjU4OS44NzEtNDZhMS42MTksMS42MTksMCwwLDAtMS42MTcsMS42MTYsMS42MTksMS42MTksMCwwLDAsMS42MTcsMS42MTYsMS42MTYsMS42MTYsMCwwLDAsMS42MTMtMS42MTZBMS42MTYsMS42MTYsMCwwLDAtMTY1ODkuODcxLTQ2Wm0tNi40NjUsMGExLjYxOSwxLjYxOSwwLDAsMC0xLjYxNywxLjYxNiwxLjYxOSwxLjYxOSwwLDAsMCwxLjYxNywxLjYxNiwxLjYxOSwxLjYxOSwwLDAsMCwxLjYxNy0xLjYxNkExLjYxOSwxLjYxOSwwLDAsMC0xNjU5Ni4zMzYtNDZabS02LjQ2NSwwYTEuNjE2LDEuNjE2LDAsMCwwLTEuNjEzLDEuNjE2LDEuNjE2LDEuNjE2LDAsMCwwLDEuNjEzLDEuNjE2LDEuNjE5LDEuNjE5LDAsMCwwLDEuNjE3LTEuNjE2QTEuNjE5LDEuNjE5LDAsMCwwLTE2NjAyLjgtNDZaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxNjYxOS41IDU3LjAwMykiIGZpbGw9IiMyNzc4ZmYiLz4NCjwvc3ZnPg0K',
           },
           {
             id: res.data[3].code,
@@ -258,7 +289,7 @@
             value: res.data[3].value,
             unit: res.data[3].unit,
             iconName:
-              'data:image/png;base64,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',
+              'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0Ny45OTYiIGhlaWdodD0iNDguMDAxIiB2aWV3Qm94PSIwIDAgNDcuOTk2IDQ4LjAwMSI+DQogIDxwYXRoIGlkPSLlh4/ljrtfMTA3NiIgZGF0YS1uYW1lPSLlh4/ljrsgMTA3NiIgZD0iTS0xNjU5Ni05YTIzLjg0LDIzLjg0LDAsMCwxLTE2Ljk2Ny03LjAyOUEyMy44MzEsMjMuODMxLDAsMCwxLTE2NjIwLTMzYTIzLjg0NSwyMy44NDUsMCwwLDEsNy4wMjUtMTYuOTczQTIzLjg0MSwyMy44NDEsMCwwLDEtMTY1OTYtNTdoLjAwOGEyMy44MzIsMjMuODMyLDAsMCwxLDE2Ljk2NSw3LjAyOUEyMy44NDUsMjMuODQ1LDAsMCwxLTE2NTcyLTMzYTIzLjg0MywyMy44NDMsMCwwLDEtNy4wMjksMTYuOTcxQTIzLjg0NSwyMy44NDUsMCwwLDEtMTY1OTYtOVptLTEuMDU1LTEzLjE1MmgwdjMuNzA4Yy4zNS4wMjUuNy4wMzgsMS4wNTUuMDM4YTE0LjgsMTQuOCwwLDAsMCwxNC43ODctMTQuNzgyYzAtLjMzNS0uMDEyLS42OC0uMDM5LTEuMDU1aC0zLjcwN2MuMDMzLjM0My4wNTEuNy4wNTEsMS4wNTVBMTEuMSwxMS4xLDAsMCwxLTE2NTk2LTIyLjFjLS4zNTUsMC0uNzExLS4wMTctMS4wNTUtLjA1Wm0tNy4xMjktNS4yODQtMy40ODYsMy40ODIsMi40MzksMi40MzYsMy40ODItMy40NzlabTguNDMtMTMuMTQ0YTcuNCw3LjQsMCwwLDAtNy4zODcsNy4zOTEsNy40LDcuNCwwLDAsMCw3LjM4Nyw3LjM5MSw3LjQsNy40LDAsMCwwLDcuMzk1LTcuMzkxQTcuNCw3LjQsMCwwLDAtMTY1OTUuNzU2LTQwLjU4Wm0tMTUuMDIzLDUuNjY4aDB2My40NDloNC45MjZ2LTMuNDQ5aC00LjkyNlptMjQuMDEyLTkuOTUxLTMuNDgyLDMuNDg2LDIuNDM5LDIuNDQsMy40ODQtMy40ODdabS0xOC4yODktLjE3MS0yLjQ0MSwyLjQzOSwzLjQ4NCwzLjQ4MywyLjQzOS0yLjQ0Wm03LjU3OC0yLjkzOGgwdjQuOTNoMy40NDl2LTQuOTNoLTMuNDQ5WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTY2MTkuOTk4IDU3LjAwMikiIGZpbGw9IiMyNzc4ZmYiLz4NCjwvc3ZnPg0K',
           },
           {
             id: res.data[4].code,
@@ -266,7 +297,7 @@
             value: res.data[4].value,
             unit: res.data[4].unit,
             iconName:
-              'data:image/png;base64,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',
+              'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0OC4wMDQiIGhlaWdodD0iNDcuOTk2IiB2aWV3Qm94PSIwIDAgNDguMDA0IDQ3Ljk5NiI+DQogIDxwYXRoIGlkPSLlh4/ljrtfMTA3NCIgZGF0YS1uYW1lPSLlh4/ljrsgMTA3NCIgZD0iTS0xNjU5Ni05YTIzLjgzLDIzLjgzLDAsMCwxLTE2Ljk2NS03LjAyOEEyMy44MzIsMjMuODMyLDAsMCwxLTE2NjIwLTMzYTIzLjg0NiwyMy44NDYsMCwwLDEsNy4wMjctMTYuOTdBMjMuODM5LDIzLjgzOSwwLDAsMS0xNjU5Ni01N2guMDE2YTIzLjgyNywyMy44MjcsMCwwLDEsMTYuOTY1LDcuMDNBMjMuODQ2LDIzLjg0NiwwLDAsMS0xNjU3Mi0zM2EyMy44NDMsMjMuODQzLDAsMCwxLTcuMDMxLDE2Ljk3QTIzLjg1NywyMy44NTcsMCwwLDEtMTY1OTYtOVptMTAuMjczLTM5LjE4NGEyLjk2NCwyLjk2NCwwLDAsMC0xLC4xNywxLjk1OSwxLjk1OSwwLDAsMC0xLjI0NiwxLjEzMSwxLjM1NSwxLjM1NSwwLDAsMCwuMTU2LDEuMThjMi44NCw0LjQ2NCwxLjc3Myw2LjY2NS0uMTYsMTAuNjZsLS4wMTIuMDIyLS4wOTQuMTkyLS4wOTQuMmMtLjQzLjktLjkxNCwxLjkxOC0xLjM2NywzLjAxN2ExMi4yNzEsMTIuMjcxLDAsMCwwLS4yOTMsOS4wOTQsMTIuMTY4LDEyLjE2OCwwLDAsMCwyLjEzNywzLjc1NSwyLjYsMi42LDAsMCwwLDEuOTIyLjc2MiwyLjgzMywyLjgzMywwLDAsMCwxLjI5My0uMywxLjc3NiwxLjc3NiwwLDAsMCwxLTEuMiwxLjQwOCwxLjQwOCwwLDAsMC0uMzcxLTEuMjA4LDguNjUsOC42NSwwLDAsMS0xLjU0My0yLjc4NSw5LjgwNiw5LjgwNiwwLDAsMSwuMjgxLTcuMDk0Yy40NTMtMS4xLjkyMi0yLjA3MSwxLjM3NS0zLjAxbDAtLjAwOS4xMDktLjIzMi4wMTItLjAyYzEuMTcyLTIuNDEzLDIuMTg0LTQuNSwyLjE4NC02LjkzYTExLjk2OSwxMS45NjksMCwwLDAtMi4yLTYuNDA4QTIuNDgzLDIuNDgzLDAsMCwwLTE2NTg1LjczLTQ4LjE4N1ptLTkuNDg4LDBhMi45NjQsMi45NjQsMCwwLDAtMSwuMTcsMS45NTMsMS45NTMsMCwwLDAtMS4yNDYsMS4xMjYsMS4zNTMsMS4zNTMsMCwwLDAsLjE1MiwxLjE4NWMyLjg0OCw0LjQ3MywxLjc3Nyw2LjY3OS0uMTY4LDEwLjY4M2wtLjEuMi0uMDM5LjA4M2MtLjQ0MS45My0uOTQxLDEuOTgzLTEuNDIyLDMuMTI4YTEyLjQxMywxMi40MTMsMCwwLDAtLjI5Myw5LjEsMTEuNzc0LDExLjc3NCwwLDAsMCwyLjE0MSwzLjc1MiwyLjYsMi42LDAsMCwwLDEuOTIyLjc2MiwyLjg1NiwyLjg1NiwwLDAsMCwxLjI5My0uMywxLjc2OSwxLjc2OSwwLDAsMCwxLTEuMiwxLjQsMS40LDAsMCwwLS4zNzEtMS4yMTMsOC42NSw4LjY1LDAsMCwxLTEuNTQzLTIuNzg1LDkuODA2LDkuODA2LDAsMCwxLC4yODEtNy4wOTRjLjQ1My0xLjEwOC45MjYtMi4wODYsMS4zODMtMy4wMzJsLjA1NS0uMTEzLjA1MS0uMTA1YzEuMTc2LTIuNDIxLDIuMTkxLTQuNTExLDIuMTkxLTYuOTVhMTEuOTUsMTEuOTUsMCwwLDAtMi4yLTYuNDA4QTIuNDgzLDIuNDgzLDAsMCwwLTE2NTk1LjIxOS00OC4xODdabS05LjQ4NCwwYTIuOTA5LDIuOTA5LDAsMCwwLS45OTIuMTcsMS45NjcsMS45NjcsMCwwLDAtMS4yNTQsMS4xMzQsMS4zMzUsMS4zMzUsMCwwLDAsLjE1MiwxLjE3N2MyLjg0OCw0LjQ2LDEuNzg1LDYuNjU3LS4xNDUsMTAuNjQ2bC0uMDE2LjAzN2MtLjA0My4wOTQtLjA5LjE4OS0uMTM3LjI4NmwtLjA1OS4xMTgtLjEuMjA2Yy0uNC44MzktLjg1MiwxLjc4OS0xLjI3MywyLjhhMTIuMzMsMTIuMzMsMCwwLDAsMS44MzYsMTIuODM3bC4wMTIuMDEzYTIuNTg0LDIuNTg0LDAsMCwwLDEuOTE4Ljc2MiwyLjg4MiwyLjg4MiwwLDAsMCwxLjMtLjMsMS43NzksMS43NzksMCwwLDAsMS0xLjIwNSwxLjQxNSwxLjQxNSwwLDAsMC0uMzgzLTEuMjA3LDkuNjQsOS42NCwwLDAsMS0xLjI1OC05Ljg3OGMuNDczLTEuMTU5Ljk1Ny0yLjE1OCwxLjUtMy4yNTFsLjAyLS4wMzgsMC0uMDEyYzEuMTYtMi40LDIuMTYtNC40NzgsMi4xNi02LjlhMTIuMDM2LDEyLjAzNiwwLDAsMC0yLjE5MS02LjQwOEEyLjUsMi41LDAsMCwwLTE2NjA0LjctNDguMTg3WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTY2MjAgNTYuOTk4KSIgZmlsbD0iIzI3NzhmZiIvPg0KPC9zdmc+DQo=',
           },
           {
             id: res.data[5].code,
@@ -274,7 +305,7 @@
             value: res.data[5].value,
             unit: res.data[5].unit,
             iconName:
-              'data:image/png;base64,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',
+              'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0Ny45OTYiIGhlaWdodD0iNDguMDAxIiB2aWV3Qm94PSIwIDAgNDcuOTk2IDQ4LjAwMSI+DQogIDxwYXRoIGlkPSLlh4/ljrtfMTA3OCIgZGF0YS1uYW1lPSLlh4/ljrsgMTA3OCIgZD0iTS0xNjU5Ni05YTIzLjg0LDIzLjg0LDAsMCwxLTE2Ljk2Ny03LjAyOUEyMy44MzEsMjMuODMxLDAsMCwxLTE2NjIwLTMzYTIzLjg0NSwyMy44NDUsMCwwLDEsNy4wMjUtMTYuOTczQTIzLjg0MSwyMy44NDEsMCwwLDEtMTY1OTYtNTdoLjAwOGEyMy44MzIsMjMuODMyLDAsMCwxLDE2Ljk2NSw3LjAyOUEyMy44NDUsMjMuODQ1LDAsMCwxLTE2NTcyLTMzYTIzLjg0MywyMy44NDMsMCwwLDEtNy4wMjksMTYuOTcxQTIzLjg0NSwyMy44NDUsMCwwLDEtMTY1OTYtOVptLTIuODQ0LTM0LjIyNGgtLjAxYTEuMjA2LDEuMjA2LDAsMCwwLS45My4zOTJjLS4xMDcuMTE5LS42NjIuNzI4LTEuMjA1LDEuMzkzbC0uMDQzLjA1MmMtMS43OTUsMi4xODQtNS45NjksNy42LTUuOTY5LDEwLjdhOC4xNjksOC4xNjksMCwwLDAsMi43MTcsNi4yOTQsOC4yOTMsOC4yOTMsMCwwLDAsNS40MywyLjExMWguMDU1YTguNTYsOC41NiwwLDAsMCw1LjM0NC0yLjA3Myw4LjQ2Miw4LjQ2MiwwLDAsMCwyLjc0NC02LjI5NGMwLTMuNjc2LTUuOC0xMC41MzgtNS44NTUtMTAuNjA3LS4wMS0uMDEyLTEtMS4yNDgtMS4zOTUtMS42MTRBMS4zNDQsMS4zNDQsMCwwLDAtMTY1OTguODQ2LTQzLjIyNVptMTAuMDc4LS43NzZoLS4wMDZhLjUzLjUzLDAsMCwwLS40LjE1OGMtLjAwNiwwLS4yNjIuMjc2LS41MTguNTcybC0uMDI1LjAyOWMtLjc2Ni44ODktMi41NDksMy4wOTEtMi41NDksNC4zNDZhMy4yNzEsMy4yNzEsMCwwLDAsMS4xNiwyLjU2NSwzLjY3NywzLjY3NywwLDAsMCwyLjMzMi44NTloLjAyMWEzLjc0NiwzLjc0NiwwLDAsMCwyLjI4OS0uODQzLDMuMzc4LDMuMzc4LDAsMCwwLDEuMTc2LTIuNTY1YzAtMS41MDYtMi40ODItNC4yOTMtMi41MDYtNC4zMjEsMCwwLS40MzItLjUxLS42LS42NTlBLjU5LjU5LDAsMCwwLTE2NTg4Ljc2OC00NFptLTguNTYxLDE4LjIyNWEuNjM3LjYzNywwLDAsMS0uNjMxLS4zMWMtLjItLjQ0NS4zLTEuMjExLDEuMTI3LTEuNzA2YTIuNTM5LDIuNTM5LDAsMCwxLDEuMjMtLjQuNjQzLjY0MywwLDAsMSwuNjM1LjMxM2MuMi40NDUtLjMsMS4yMDktMS4xMjcsMS43QTIuNTYsMi41NiwwLDAsMS0xNjU5Ny4zMjgtMjUuNzc2WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTY2MTkuOTk4IDU3LjAwMikiIGZpbGw9IiMyNzc4ZmYiLz4NCjwvc3ZnPg0K',
           },
         ];
       });
@@ -628,80 +659,80 @@
     // drawRing(ringData.value);
   });
 
-  const drawRing = (data: any[]) => {
-    if (data && data.length > 0) {
-      if (ringChar) {
-        ringChar.dispose();
-      }
-      ringChar = echarts.init(ringChartRef.value);
+  // const drawRing = (data: any[]) => {
+  //   if (data && data.length > 0) {
+  //     if (ringChar) {
+  //       ringChar.dispose();
+  //     }
+  //     ringChar = echarts.init(ringChartRef.value);
 
-      var seriesdata = [];
-      var dateX = [];
-      sum.value = 0;
-      // var legendList: string | any[] = [];
-      for (let i = 0; i < data.length; i++) {
-        dateX.push(data[i].name);
-        sum.value += data[i].value;
-        seriesdata.push({ value: data[i].value, name: data[i].name });
-      }
-      var seriesList = [
-        {
-          data: seriesdata,
-          type: 'pie',
-          // 圆环内径和外径
-          radius: ['70%', '90%'],
-          center: ['40%', '50%'], // 调整环形图的位置，百分比表示相对于容器的宽高
-          // // 显示折线
-          labelLine: {
-            show: false,
-          },
-          label: {
-            show: false,
-          },
-          itemStyle: {
-            normal: {
-              // 白色间距
-              borderWidth: 2,
-              borderColor: '#ffffff',
-            },
-          },
-        },
-      ];
+  //     var seriesdata = [];
+  //     var dateX = [];
+  //     sum.value = 0;
+  //     // var legendList: string | any[] = [];
+  //     for (let i = 0; i < data.length; i++) {
+  //       dateX.push(data[i].name);
+  //       sum.value += data[i].value;
+  //       seriesdata.push({ value: data[i].value, name: data[i].name });
+  //     }
+  //     var seriesList = [
+  //       {
+  //         data: seriesdata,
+  //         type: 'pie',
+  //         // 圆环内径和外径
+  //         radius: ['70%', '90%'],
+  //         center: ['40%', '50%'], // 调整环形图的位置，百分比表示相对于容器的宽高
+  //         // // 显示折线
+  //         labelLine: {
+  //           show: false,
+  //         },
+  //         label: {
+  //           show: false,
+  //         },
+  //         itemStyle: {
+  //           normal: {
+  //             // 白色间距
+  //             borderWidth: 2,
+  //             borderColor: '#ffffff',
+  //           },
+  //         },
+  //       },
+  //     ];
 
-      const option = {
-        tooltip: {
-          trigger: 'item',
-        },
-        graphic: [
-          {
-            type: 'text',
-            left: '31%',
-            top: '33%',
-            style: {
-              text: '总计',
-              fill: '#000',
-              fontSize: 20,
-            },
-          },
-          {
-            type: 'text',
-            left: sum.value > 100 ? '25%' : '30%',
-            top: '55%',
-            style: {
-              text: sum.value,
-              fill: '#000',
-              fontSize: 32,
-              fontWeight: 'bold',
-            },
-          },
-        ],
-        series: seriesList,
-      };
+  //     const option = {
+  //       tooltip: {
+  //         trigger: 'item',
+  //       },
+  //       graphic: [
+  //         {
+  //           type: 'text',
+  //           left: '31%',
+  //           top: '33%',
+  //           style: {
+  //             text: '总计',
+  //             fill: '#000',
+  //             fontSize: 20,
+  //           },
+  //         },
+  //         {
+  //           type: 'text',
+  //           left: sum.value > 100 ? '25%' : '30%',
+  //           top: '55%',
+  //           style: {
+  //             text: sum.value,
+  //             fill: '#000',
+  //             fontSize: 32,
+  //             fontWeight: 'bold',
+  //           },
+  //         },
+  //       ],
+  //       series: seriesList,
+  //     };
 
-      ringChar = echarts.init(ringChartRef.value);
-      ringChar.setOption(option);
-    }
-  };
+  //     ringChar = echarts.init(ringChartRef.value);
+  //     ringChar.setOption(option);
+  //   }
+  // };
   const drawHot = (data: any) => {
     if (data) {
       if (hotChar) {
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/index.vue
index 7b55d5f..19bc73e 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/averageData/index.vue
@@ -1,19 +1,22 @@
 <!-- eslint-disable vue/v-on-event-hyphenation -->
 <template>
   <!-- <a-spin :spinning="loading"> -->
-  <div style="background: #ffffff; height: 95%">
+  <div style="background: #ffffff; height: 95%; position: relative">
     <a-spin :spinning="loading">
       <a-table
         :columns="tableColumns"
         :data-source="pageData"
         bordered
         :pagination="false"
+        style="height: 75%"
         :scroll="{ x: 100, y: 450 }">
         <template #title>
           <div
             style="display: flex; align-items: center; justify-content: space-between; width: 100%">
             <div style="display: flex; align-items: center; width: 85%">
-              <div style="width: 10%">数据报表</div>
+              <div style="width: 10%"
+                ><ns-icon name="title" size="11" style="margin-right: 3px" />数据报表</div
+              >
 
               <a-select
                 v-model:value="frequencyValue"
@@ -39,15 +42,24 @@
           </div>
         </template>
       </a-table>
-      <a-pagination
-        :current="queryParams.pageNum"
-        :total="total"
-        :page-size="queryParams.pageSize"
-        style="display: flex; justify-content: center; margin-top: 16px"
-        :show-size-changer="true"
-        :show-quick-jumper="true"
-        @change="onChange" />
     </a-spin>
+    <a-pagination
+      :current="queryParams.pageNum"
+      :total="total"
+      :show-total="(total, range) => ` 共 ${total} 条`"
+      :page-size="queryParams.pageSize"
+      style="
+        display: flex;
+        position: absolute;
+        bottom: 20px;
+        right: 30px;
+        justify-content: right;
+        margin-top: 16px;
+        margin-right: 30px;
+      "
+      :show-size-changer="true"
+      :show-quick-jumper="true"
+      @change="onChange" />
   </div>
   <!-- </a-spin> -->
 </template>
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/historyData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/historyData/index.vue
index 3527889..64b7731 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/historyData/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/historyData/index.vue
@@ -1,18 +1,21 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <template>
-  <div style="background: #ffffff; height: 95%">
-    <a-spin :spinning="loading">
+  <div style="background: #ffffff; height: 95%; position: relative">
+    <a-spin :spinning="loading" style="height: 100%">
       <a-table
         :columns="tableColumns"
         :data-source="pageData"
         bordered
         :pagination="false"
-        :scroll="{ x: 100 }">
+        :height="500"
+        :scroll="{ x: 3000, y: 440 }">
         <template #title>
           <div
             style="display: flex; align-items: center; justify-content: space-between; width: 100%">
             <div style="display: flex; align-items: center; width: 85%">
-              <div style="width: 10%">数据报表</div>
+              <div style="width: 10%"
+                ><ns-icon name="title" size="11" style="margin-right: 3px" />数据报表</div
+              >
               <a-select
                 v-model:value="typeValue"
                 placeholder="请选择环境参数"
@@ -20,7 +23,7 @@
                 :options="typeList" />
               <a-tree-select
                 v-model:value="quyuvalue"
-                style="width: 17%; margin-left: 10px"
+                style="width: 22%; margin-left: 10px"
                 :tree-data="treeData2"
                 :field-names="{
                   children: 'childList',
@@ -54,13 +57,22 @@
           </div>
         </template>
       </a-table>
-      <a-pagination
-        :total="total"
-        show-size-changer
-        show-quick-jumper
-        @change="onChange"
-        style="display: flex; justify-content: center; margin-top: 10px" />
     </a-spin>
+    <a-pagination
+      :total="total"
+      :show-total="(total, range) => ` 共 ${total} 条`"
+      show-size-changer
+      show-quick-jumper
+      @change="onChange"
+      style="
+        display: flex;
+        position: absolute;
+        bottom: 20px;
+        right: 30px;
+        justify-content: right;
+        margin-top: 10px;
+        margin-right: 30px;
+      " />
   </div>
 </template>
 <script lang="ts" setup>
@@ -138,6 +150,7 @@
     {
       title: '区域名称',
       dataIndex: 'location',
+      width: 100,
       customCell: (record, rowIndex) => {
         if (rowIndex == undefined) {
           return {
@@ -160,6 +173,7 @@
     {
       title: '点位',
       dataIndex: 'pointName',
+      width: 100,
       customCell: (record, rowIndex) => {
         if (rowIndex == undefined) {
           return {
@@ -186,6 +200,7 @@
     {
       title: '日期',
       dataIndex: 'time',
+      width: 110,
     },
   ];
 

From 897db024e0b1dc1d76d6954a8f8a9bfe2ce02857 Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Thu, 15 Aug 2024 15:30:36 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2UI,?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/carbonEmissionFactorLibrary.ts         |   3 +
 .../carbonAssets/carbonAssetsDetail/index.vue      |  63 +-
 .../carbonEmissionFactorLibrary/index.vue          |  11 +-
 .../energyConsumption/index copy.vue               | 952 ---------------------
 .../energyConsumption/index.vue                    |  56 +-
 .../quickCalculation/index copy.vue                | 587 +++++++++++++
 .../quickCalculation/index.vue                     |  14 +-
 .../carbonInventoryCheck/fillInPage/index.vue      |  61 +-
 .../carbonInventoryCheck/index.vue                 |  29 +-
 .../carbonPlanning/all/index.vue                   |  74 +-
 .../carbonPlanning/category/categoryDeatil.vue     |  49 +-
 .../carbonPlanning/category/index.vue              |  36 +-
 12 files changed, 882 insertions(+), 1053 deletions(-)
 delete mode 100644 hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index copy.vue
 create mode 100644 hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue

diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
index 2f9c803..df67ea8 100644
--- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
+++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
@@ -49,6 +49,7 @@ export enum carbonInventoryCheck {
   createOrUpdate = '/carbon-smart/api/carbon/report/createOrUpdate',
   findById = '/carbon-smart/api/carbon/report/findById',
   delete = '/carbon-smart/api/carbon/report/delete',
+  downloadZip = '/carbon-smart/api/carbon/report/downloadZip',
   // 填报页面接口
   // 最左侧碳盘查报告树
   getCategoryTree = '/carbon-smart/api/carbon/inventory/contact/getCategoryTree',
@@ -77,6 +78,8 @@ export enum carbonAssets {
   createOrUpdate = '/carbon-smart/api/carbon/trade/details/createOrUpdate',
   delete = '/carbon-smart/api/carbon/trade/details/delete',
   quotaStatistics = '/carbon-smart/api/carbon/trade/details/quotaStatistics',
+  import = '/carbon-smart/api/carbon/trade/details/import',
+  export = '/carbon-smart/api/carbon/trade/details/export',
 }
 // 上传图片接口
 export enum uploadPic {
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
index c99a2f6..2509768 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
@@ -51,10 +51,17 @@
       <a-card>
         <div class="ns-form-title">
           <div class="title">交易明细</div>
-          <div class="operation">
+          <div class="operation" style="display: flex">
             <a-button type="primary" @click="addDetail">新增</a-button>
-            <a-button type="primary" style="margin-left: 6px">导入</a-button>
-            <a-button type="primary" style="margin-left: 6px">导出</a-button>
+            <a-upload
+              v-model:file-list="importFileList"
+              name="file"
+              accept=".xlsx"
+              :showUploadList="false"
+              :custom-request="importFile">
+              <a-button type="primary" style="margin-left: 6px">导入</a-button>
+            </a-upload>
+            <a-button type="primary" style="margin-left: 6px" @click="exportFile">导出</a-button>
             <a-button
               type="primary"
               style="margin-left: 6px"
@@ -196,8 +203,8 @@
   const orgId = ref('');
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
   orgId.value = result;
-  const fetch = (api, params = { orgId }) => {
-    return http.post(api, params);
+  const fetch = (api, params = { orgId }, config) => {
+    return http.post(api, params, config);
   };
   // 详情部分变量
   const selectedRowKeys = ref([]);
@@ -400,6 +407,52 @@
     visible.value = true;
     getDictList();
   };
+  const importFileList = ref<UploadProps['fileList']>([]);
+  const importFile = (options: UploadRequestOption) => {
+    const { file, onSuccess, onError } = options;
+    const formData = ref(new FormData());
+    formData.value.append('file', file as any);
+    formData.value.append('orgId', orgId.value);
+    formData.value.append('year', queryParams.value.year);
+    fetch(carbonAssets.import, formData.value)
+      .then((res) => {
+        message.success('操作成功！');
+        getDetailList();
+      })
+      .catch((error) => {
+        console.log('error', error);
+      });
+  };
+  const exportFile = () => {
+    const exportQuery = ref({
+      orgId: orgId.value,
+      pageNum: 1,
+      pageSize: 999,
+      year: queryParams.value.year,
+      ids: selectedRowKeys.value,
+    });
+    const config = {
+      responseType: 'blob',
+    };
+    fetch(carbonAssets.export, exportQuery.value, config)
+      .then((res) => {
+        // 创建一个 URL 对象，指向图片数据的 blob
+        const url = window.URL.createObjectURL(new Blob([res]));
+        // 创建一个 <a> 标签，用于触发下载
+        const link = document.createElement('a');
+        link.href = url;
+        link.setAttribute('download', 'carbonTradeDetails.xlsx'); // 设置下载的文件名
+        document.body.appendChild(link);
+        link.click();
+
+        // 清理 URL 对象
+        window.URL.revokeObjectURL(url);
+        selectedRowKeys.value = []
+      })
+      .catch((error) => {
+        console.error('下载失败：', error);
+      });
+  };
   // 上传附件
   const fileList = ref<UploadProps['fileList']>([]);
   const beforeUpload: UploadProps['beforeUpload'] = (file) => {
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index f2f6914..c310738 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -429,7 +429,7 @@
   };
   // 点击数据点的复选框
   const checkedIds = ref([]);
-  const emissionType = ref();
+  const emissionList = ref([]);
   const checkTreeNode = (checkedKeys, info) => {
     checkedTreeNodeKeys.value = checkedKeys;
     checkedIds.value = [];
@@ -437,7 +437,7 @@
       checkedIds.value.push(item.id);
     });
     sessionStorage.setItem('checkedTreeNode', checkedIds.value);
-    emissionType.value = checkedIds.value.join(',');
+    emissionList.value = checkedIds.value;
     mainRef.value?.nsTableRef.reload();
   };
   // 点击新增树节点
@@ -522,7 +522,7 @@
         getDefaultIds(items.children);
       }
     });
-    emissionType.value = defaultIds.value.join(',');
+    emissionList.value = defaultIds.value.join(',');
     checkedIds.value = defaultIds.value;
     sessionStorage.setItem('checkedTreeNode', checkedIds.value);
   };
@@ -609,7 +609,7 @@
     api: carbonEmissionFactorLibrary.getTableList,
     params: {
       orgId,
-      emissionType,
+      emissionList,
     },
     headerActions: [
       {
@@ -661,10 +661,12 @@
         label: '导出',
         type: 'primary',
         handle: () => {
+          // console.log( mainRef.value.nsTableRef.tableState.selectedRowKeys)
           const exportQuery = {
             orgId: orgId.value,
             pageNum: 1,
             pageSize: 999,
+            ids: mainRef.value.nsTableRef.tableState.selectedRowKeys,
           };
           const config = {
             responseType: 'blob',
@@ -682,6 +684,7 @@
 
               // 清理 URL 对象
               window.URL.revokeObjectURL(url);
+              mainRef.value.nsTableRef.tableState.selectedRowKeys = [];
             })
             .catch((error) => {
               console.error('下载失败：', error);
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index copy.vue
deleted file mode 100644
index 715b3e8..0000000
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index copy.vue	
+++ /dev/null
@@ -1,952 +0,0 @@
-<template>
-  <div>
-    <!-- <a-table 
-      :columns="tableColumns" 
-      :data-source="data" 
-      bordered
-      :pagination="false"
-      :scroll="{ x: 2000 }">
-      <template #bodyCell="{ column, text, record }">
-        <template v-if="column.key === 'action'">
-          <span>
-            <a @click="editData(record)">编辑</a>
-            <a-divider type="vertical" />
-            <a @click="delData(record)">删除</a>
-          </span>
-        </template>
-      </template>
-      <template #title>
-        <a-date-picker v-model:value="selectYear" picker="year" @change="changeYearData" valueFormat="YYYY" />
-        <div class="buttonGroup">
-          <a-button type="primary" @click="addNewData">新增</a-button>
-          <a-button type="primary">导入</a-button>
-          <a-button type="primary">导出</a-button>
-          <a-button type="primary">模板下载</a-button>
-          <a-button type="primary" @click="uploadVoucher">上传凭证</a-button>
-          <a-button type="primary">凭证下载</a-button>
-        </div>
-      </template>
-    </a-table> -->
-    <ns-view-list-table
-      v-bind="tableConfig"
-      :model="data"
-      ref="mainRef"
-      :scroll="{ x: 1500, y: 350 }">
-      <!-- <template #bodyCell="{ column, text, record }">
-        <template v-if="column.dataIndex === 'janFlag'">
-          <span v-if="record.janFlag===1" style="color: rgba(243, 97, 99, 1);">{{text}}</span>
-          <span v-else style="color: rgba(57, 215, 287, 1);">{{text}}</span>
-        </template>
-      </template> -->
-    </ns-view-list-table>
-    <!-- <a-pagination 
-        :current="queryParams.pageNum"
-        :total="total"
-        :page-size="queryParams.pageSize"
-        style="display: flex;justify-content: center;margin-top: 16px;"
-        :show-size-changer="true"
-        :show-quick-jumper="true"
-        @change="onChange" /> -->
-    <!-- 新增数据库数据 -->
-    <a-drawer
-      :width="500"
-      :visible="visible"
-      :body-style="{ paddingBottom: '80px' }"
-      :footer-style="{ textAlign: 'right' }"
-      destroyOnClose
-      @close="onClose">
-      <a-form
-        ref="formRef"
-        :model="formState"
-        :rules="rules"
-        :label-col="labelCol"
-        :wrapper-col="wrapperCol">
-        <a-form-item ref="name" label="能耗名称" name="energyType">
-          <a-input v-model:value="formState.energyType" placeholder="请输入能源种类" />
-        </a-form-item>
-        <a-form-item label="计量单位" name="unit">
-          <a-cascader v-model:value="formState.unit" :options="measurementUnit" />
-        </a-form-item>
-        <a-form-item label="能耗类型" name="emissionType" :required="isRequired">
-          <a-select v-model:value="formState.emissionType" placeholder="请选择能耗类型">
-            <a-select-option v-for="(item, index) in energyTypeOptions" :key="index" :value="item.dicKey">
-              {{ item.cnValue }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item label="自动采集节点" name="collectionNode">
-          <a-tree-select
-            v-model:value="formState.collectionNode"
-            :tree-line="true"
-            :tree-data="treeData">
-          </a-tree-select>
-        </a-form-item>
-        <a-form-item label="计算碳排" name="isComputeCarbon">
-          <a-radio-group v-model:value="formState.isComputeCarbon" @change="changeRadio">
-            <a-radio :value="0">是</a-radio>
-            <a-radio :value="1">否</a-radio>
-          </a-radio-group>
-        </a-form-item>
-        <a-form-item label="排放类型" name="emissionType" :required="isRequired">
-          <a-select v-model:value="formState.emissionType" placeholder="请选择排放类型">
-            <a-select-option v-for="(item, index) in emissionTypeDic" :key="index" :value="item.id">
-              {{ item.cnValue }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-row>
-          <a-col :span="24" style="display: flex; justify-content: space-around">
-            <a-form-item
-              label="1月"
-              name="janFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.janFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-            <a-form-item
-              label="2月"
-              name="febFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.febFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-            <a-form-item
-              label="3月"
-              name="marFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.marFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24" style="display: flex; justify-content: space-around">
-            <a-form-item
-              label="4月"
-              name="aprFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.aprFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-            <a-form-item
-              label="5月"
-              name="mayFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.mayFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-            <a-form-item
-              label="6月"
-              name="junFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.junFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24" style="display: flex; justify-content: space-around">
-            <a-form-item
-              label="7月"
-              name="julFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.julFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-            <a-form-item
-              label="8月"
-              name="augFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.augFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-            <a-form-item
-              label="9月"
-              name="sepFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.sepFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24" style="display: flex; justify-content: space-around">
-            <a-form-item
-              label="10月"
-              name="octFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.octFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-            <a-form-item
-              label="11月"
-              name="novFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.novFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-            <a-form-item
-              label="12月"
-              name="decFlag"
-              :label-col="switchLabelCol"
-              :wrapper-col="switchWrapperCol">
-              <a-switch
-                v-model:checked="formState.decFlag"
-                :checked-value="1"
-                :unCheckedValue="0" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-form-item ref="name" label="上传凭证">
-          <a-upload
-            :file-list="fileList"
-            name="file"
-            accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf"
-            @remove="handleFileRemove"
-            :before-upload="beforeUpload"
-            @change="handleChange">
-            <a-button>
-              <upload-outlined></upload-outlined>
-              上传
-            </a-button>
-          </a-upload>
-        </a-form-item>
-      </a-form>
-      <template #footer>
-        <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
-        <a-button type="primary" @click="onSubmit">确定</a-button>
-      </template>
-    </a-drawer>
-    <!-- 上传凭证弹窗 -->
-    <!-- <a-modal :visible="openUpload" title="凭证上传" @ok="handleOk" @cancel="closeOpenUpload">
-      <a-upload-dragger
-        v-model:fileList="fileList"
-        name="file"
-        :multiple="true"
-        action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-        @change="handleChange"
-        @drop="handleDrop"
-      >
-        <p class="ant-upload-drag-icon">
-          <inbox-outlined></inbox-outlined>
-        </p>
-        <p class="ant-upload-hint" style="display: flex;flex-direction: column;">
-          <p>1.仅支持pdf格式文件或文件夹</p>
-          <p>2.文件命名规则为【能源种类_年份】</p>
-          <p>3.每次上传自动覆盖</p>
-        </p>
-      </a-upload-dragger>
-    </a-modal> -->
-    <!-- 凭证下载 -->
-    <a-drawer
-      :visible="downLoadVisible"
-      title="凭证列表"
-      :width="500"
-      @close="onCloseDownLoad"
-      :footer-style="{ textAlign: 'right' }">
-      <div></div>
-      <a-table
-        :columns="downLoadColumns"
-        :data-source="downLoadData"
-        bordered
-        rowKey="id"
-        :rowSelection="{
-          selectedRowKeys: selectedRowKeysSet,
-          onChange: onSelectionChangeSet,
-        }"
-        :pagination="false">
-        <template #bodyCell="{ column, text, record }">
-          <template v-if="column.key === 'action'">
-            <span>
-              <a @click="downLoad(record)">下载</a>
-            </span>
-          </template>
-        </template>
-      </a-table>
-      <template #footer>
-        <a-button style="margin-right: 8px" @click="onCloseDownLoad">取消</a-button>
-        <a-button type="primary" @click="onSubmitDownLoad">确定</a-button>
-      </template>
-    </a-drawer>
-  </div>
-</template>
-<script lang="ts" setup>
-  import { ref, toRaw, defineExpose } from 'vue';
-  import type { Rule } from 'ant-design-vue/es/form';
-  import { Pagination, message, Modal } from 'ant-design-vue';
-  import { UploadOutlined } from '@ant-design/icons-vue';
-  import type { TreeSelectProps, UploadChangeParam, UploadProps } from 'ant-design-vue';
-  import { NsMessage } from '/nerv-lib/component';
-  import dayjs, { Dayjs } from 'dayjs';
-  import { http } from '/nerv-lib/util/http';
-  import { Cookies } from '/nerv-lib/util/cookie';
-  import { tableColumns } from '../config';
-  import {
-    energyConsumption,
-    carbonEmissionFactorLibrary,
-    uploadPic,
-  } from '/@/api/carbonEmissionFactorLibrary';
-  import { dict } from '/@/api';
-  import { group } from '/@/api/deviceManage';
-  defineOptions({
-    energyType: 'EnergyConsumption', // 与页面路由name一致缓存才可生效
-    components: {
-      'a-pagination': Pagination,
-    },
-  });
-  const orgId = ref('');
-  const result = JSON.parse(sessionStorage.getItem('ORGID')!);
-  orgId.value = result;
-  const fetch = (api, params = { orgId }, config) => {
-    return http.post(api, params, config);
-  };
-  const selectYear = ref<Dayjs>(dayjs(new Date().getFullYear().toString()));
-  const total = ref<number>();
-  const queryParams = ref({
-    pageNum: 1,
-    pageSize: 10,
-    orgId: orgId.value,
-    year: selectYear.value.format('YYYY'),
-  });
-  const isRequired = ref(false);
-  const visible = ref(false);
-  const openUpload = ref<boolean>(false);
-  const data = ref([]);
-  interface FormState {
-    energyType: string;
-    unit: string;
-    collectionNode: string;
-    emissionType: string | undefined;
-    isComputeCarbon: string;
-    janFlag: string;
-    febFlag: string;
-    marFlag: string;
-    aprFlag: string;
-    mayFlag: string;
-    junFlag: string;
-    julFlag: string;
-    augFlag: string;
-    sepFlag: string;
-    octFlag: string;
-    novFlag: string;
-    decFlag: string;
-  }
-  const formRef = ref();
-  const labelCol = { span: 5 };
-  const wrapperCol = { span: 19 };
-  const switchLabelCol = { span: 10 };
-  const switchWrapperCol = { span: 14 };
-  const formState = ref({
-    orgId: orgId.value,
-  });
-  // 定义form表单的必填
-  const rules: Record<string, Rule[]> = {
-    energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
-    isComputeCarbon: [{ required: true, message: '请选择是否计算碳排', trigger: 'change' }],
-    unit: [{ required: true, message: '请选择计量单位', trigger: 'change' }],
-  };
-  // 排放类型的变量
-  const emissionTypeDic = ref();
-  // 计量单位的变量
-  const measurementUnit = ref([]);
-  // 定义自动采集节点数的变量
-  const treeData = ref<TreeSelectProps['treeData']>([]);
-  // 年份选择改变触发
-  const changeYearData = () => {
-    queryParams.value.year = selectYear.value;
-    getTableList();
-  };
-  const mainRef = ref();
-  const year = selectYear.value.format('YYYY');
-  const tableConfig = ref({
-    title: '能耗统计',
-    api: energyConsumption.pageList,
-    params: queryParams.value,
-    headerActions: [
-      {
-        label: '新增',
-        name: 'userAdd',
-        type: 'primary',
-        handle: () => {
-          getDictList();
-          visible.value = true;
-        },
-      },
-      {
-        label: '导入',
-        type: 'primary',
-        name: 'userImport',
-        handle: () => {},
-      },
-      {
-        label: '导出',
-        type: 'primary',
-        name: 'userExports',
-      },
-      {
-        label: '模板下载',
-        type: 'primary',
-      },
-      // {
-      //   label: '上传凭证',
-      //   type: 'primary',
-      //   handle: () => {
-      //     openUpload.value = true;
-      //   },
-      // },
-      {
-        label: '凭证下载',
-        type: 'primary',
-        handle: () => {
-          fetch(energyConsumption.voucherDownloadList, { bizType: 3 }).then((res) => {
-            downLoadData.value = res.data;
-          });
-          downLoadVisible.value = true;
-        },
-      },
-    ],
-    columns: [
-      {
-        title: '序号',
-        customRender: (text: any) => {
-          return text.index + 1;
-        },
-      },
-      {
-        title: '能源种类',
-        dataIndex: 'energyType',
-      },
-      {
-        title: '计量单位',
-        className: 'unitName',
-        dataIndex: 'unitName',
-      },
-      {
-        title: '全年',
-        dataIndex: 'yearly',
-      },
-      {
-        title: '1月',
-        dataIndex: 'jan',
-        // customRender: ({ text }: { text: string }) => {
-        //   return <span :style="{ color: getColor(text) }">{text}</span>;
-        // }
-      },
-      {
-        title: '2月',
-        dataIndex: 'feb',
-      },
-      {
-        title: '3月',
-        dataIndex: 'mar',
-      },
-      {
-        title: '4月',
-        dataIndex: 'apr',
-      },
-      {
-        title: '5月',
-        dataIndex: 'may',
-      },
-      {
-        title: '6月',
-        dataIndex: 'jun',
-      },
-      {
-        title: '7月',
-        dataIndex: 'jul',
-      },
-      {
-        title: '8月',
-        dataIndex: 'aug',
-      },
-      {
-        title: '9月',
-        dataIndex: 'sep',
-      },
-      {
-        title: '10月',
-        dataIndex: 'oct',
-      },
-      {
-        title: '11月',
-        dataIndex: 'nov',
-      },
-      {
-        title: '12月',
-        dataIndex: 'dec',
-      },
-    ],
-    columnActions: {
-      title: '操作',
-      actions: [
-        {
-          label: '编辑',
-          name: 'userEdit',
-          handle: (record: any) => {
-            getDictList();
-            visible.value = true;
-            fetch(energyConsumption.findById, { id: record.id }).then((res) => {
-              if (res.data.emissionType) {
-                res.data.emissionType = Number(res.data.emissionType);
-              }
-              if (res.data.unit) {
-                let selectDevice = ref([Number(res.data.unit)]);
-                findParentIds(measurementUnit.value, res.data.unit, selectDevice.value);
-                res.data.unit = selectDevice;
-              }
-              formState.value = res.data;
-              emissionType.value = res.data.emissionType;
-              if (formState.value.isComputeCarbon === 0) {
-                isRequired.value = true;
-              } else {
-                isRequired.value = false;
-              }
-            });
-            fetch(uploadPic.select, { bizId: record.id, bizType: 3 }).then((res) => {
-              fileList.value = res.data.map((item) => ({
-                uid: item.id.toString(), // 使用文件的id作为唯一标识
-                name: item.fileName, // 文件名
-                status: 'done', // 设置默认状态为已完成
-                type: 'done',
-                url: item.filePath, // 文件的URL，这里假设用示例的URL格式
-              }));
-            });
-          },
-        },
-        {
-          label: '删除',
-          name: 'userDelete',
-          dynamicParams: { id: 'id' },
-          confirm: true,
-          isReload: true,
-          api: energyConsumption.del,
-        },
-      ],
-    },
-
-    formConfig: {
-      schemas: [
-        {
-          field: 'year',
-          label: '年份',
-          component: 'NsDatePicker',
-          componentProps: {
-            picker: 'year',
-            valueFormat: 'YYYY',
-            defaultValue: selectYear.value.format('YYYY'),
-          },
-        },
-      ],
-      params: {},
-    },
-    rowKey: 'id',
-  });
-  const getColor = (value: string | number): string => {
-    debugger;
-    if (typeof value === 'string') {
-      switch (value) {
-        case 'active':
-          return 'green';
-        case 'inactive':
-          return 'red';
-        default:
-          return 'black';
-      }
-    } else if (typeof value === 'number') {
-      return value > 30 ? 'blue' : 'purple'; // 示例：根据年龄设置颜色
-    }
-    return 'black';
-  };
-
-  defineExpose({
-    mainRef,
-  });
-  // 定义一个递归函数来查找每一级的id 设备类型回显 层级方法
-  function findParentIds(tree: any, targetId: number, result: any) {
-    for (let item of tree) {
-      if (item.children && item.children.length > 0) {
-        if (item.children.some((child: any) => child.value === targetId)) {
-          result.unshift(item.value); // 将当前节点的id添加到结果数组的最前面
-          findParentIds(tree, item.value, result); // 递归查找父级节点的id
-          break; // 找到后可以退出循环
-        }
-      }
-    }
-  }
-  // 获取表格数据
-  const getTableList = () => {
-    fetch(energyConsumption.pageList, queryParams.value).then((res) => {
-      data.value = res.data.records;
-    });
-  };
-  // 分页器
-  const onChange = (pageNumber: number, size: number) => {
-    queryParams.value.pageNum = pageNumber;
-    queryParams.value.pageSize = size;
-    mainRef.value?.nsTableRef.reload();
-  };
-  // 计算碳排切换
-  const emissionType = ref();
-  const changeRadio = (e) => {
-    if (e.target.value === 0) {
-      isRequired.value = true;
-      if (emissionType.value) {
-        formState.value.emissionType = emissionType.value;
-      }
-    } else {
-      isRequired.value = false;
-      formState.value.emissionType = '';
-    }
-  };
-  // 点击确定提交
-  const onSubmit = () => {
-    formRef.value
-      .validate()
-      .then(() => {
-        console.log('values', formState, toRaw(formState));
-        formState.value.year = selectYear.value.format('YYYY');
-        if (formState.value.unit) {
-          formState.value.unit = formState.value.unit.join(',').split(',')[1];
-        }
-        if (formState.value.id) {
-          fetch(energyConsumption.update, formState.value).then((res) => {
-            if (fileList.value.length !== 0) {
-              const formData = ref(new FormData());
-              fileList.value.forEach((file) => {
-                if (file.type !== 'done') {
-                  formData.value.append('files', file.originFileObj);
-                }
-              });
-              formData.value.append('bizType', 3);
-              formData.value.append('bizId', formState.value.id);
-              delIds.value.forEach((item) => {
-                formData.value.append('deleteList', item);
-              });
-              fetch(uploadPic.uploadfiles, formData.value)
-                .then((res) => {
-                  message.success('操作成功！');
-                  visible.value = false;
-                  delIds.value = [];
-                  formState.value = {
-                    orgId: orgId.value,
-                  };
-                  mainRef.value?.nsTableRef.reload();
-                })
-                .catch((error) => {
-                  console.log('error', error);
-                });
-            } else {
-              visible.value = false;
-              delIds.value = [];
-              formState.value = {
-                orgId: orgId.value,
-              };
-              message.success('操作成功！');
-              mainRef.value?.nsTableRef.reload();
-            }
-          });
-        } else {
-          fetch(energyConsumption.creat, formState.value).then((res) => {
-            if (res.data === '新增数据已存在') {
-              visible.value = false;
-              delIds.value = [];
-              NsMessage.warning(res.data);
-            } else {
-              if (fileList.value.length !== 0) {
-                const formData = ref(new FormData());
-                fileList.value.forEach((file) => {
-                  formData.value.append('files', file.originFileObj);
-                });
-                formData.value.append('bizType', 3);
-                formData.value.append('bizId', res.data);
-                fetch(uploadPic.uploadfiles, formData.value)
-                  .then((res) => {
-                    message.success('操作成功！');
-                    visible.value = false;
-                    delIds.value = [];
-                    formState.value = {
-                      orgId: orgId.value,
-                    };
-                    mainRef.value?.nsTableRef.reload();
-                  })
-                  .catch((error) => {
-                    console.log('error', error);
-                  });
-              } else {
-                visible.value = false;
-                delIds.value = [];
-                formState.value = {
-                  orgId: orgId.value,
-                };
-                message.success('操作成功！');
-                mainRef.value?.nsTableRef.reload();
-              }
-            }
-          });
-        }
-      })
-      .catch((error) => {
-        console.log('error', error);
-      });
-  };
-  const energyTypeOptions = ref([]);
-  // 获取字典值
-  const getDictList = async () => {
-    // 获取能耗类型
-     const options = await dict({ params: { dicKey: 'ENERGY_TYPE' } });
-     energyTypeOptions.value = options.data.data
-    console.log(energyTypeOptions);
-    debugger
-    // 获取排放类型的数据
-    fetch(energyConsumption.getDicList, { grp: 'EMISSION_TYPE' }).then((res) => {
-      emissionTypeDic.value = res.data;
-    });
-    // 获取计量单位的数据
-    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, { grp: 'MEASUREMENT_UNIT' }).then(
-      (res) => {
-        measurementUnit.value = res.data;
-        measurementUnit.value = measurementUnit.value.map((item) => ({
-          value: item.id,
-          label: item.cnValue,
-          children: item.children
-            ? item.children.map((child) => ({
-                value: child.id,
-                label: child.cnValue,
-              }))
-            : [],
-        }));
-      },
-    );
-    // 获取自动采集节点的数据
-    fetch(group.queryDeviceGroupTree, { energyType: 'ELECTRICITY_USAGE', orgId: orgId.value }).then(
-      (res) => {
-        treeData.value = res.data;
-        treeData.value = treeData.value.map((item) => ({
-          value: item.id,
-          label: item.pointName,
-          children: item.children
-            ? item.children.map((child) => ({
-                value: child.id,
-                label: child.pointName,
-              }))
-            : [],
-        }));
-      },
-    );
-  };
-  // 点击新增按钮
-  const addNewData = () => {
-    getDictList();
-    visible.value = true;
-  };
-  // 点击编辑按钮
-  const editData = (record) => {
-    getDictList();
-    visible.value = true;
-    fetch(energyConsumption.findById, { id: record.id }).then((res) => {
-      if (res.data.unitName) {
-        res.data.unitName = res.data.unitName.split(',');
-      }
-      formState.value = res.data;
-    });
-  };
-  // 点击删除
-  const delData = (record) => {
-    Modal.confirm({
-      title: '警告',
-      content: '确定要删除吗?',
-      okText: '确定',
-      okType: 'primary',
-      cancelText: '取消',
-      onOk() {
-        fetch(energyConsumption.del, { id: record.id }).then((res) => {
-          message.success('操作成功！');
-          mainRef.value?.nsTableRef.reload();
-        });
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-  };
-  // 关闭新增抽屉
-  const onClose = () => {
-    visible.value = false;
-    delIds.value = [];
-    formState.value = {
-      orgId: orgId.value,
-    };
-    formRef.value.resetFields();
-  };
-  // 点击上传凭证按钮
-  const uploadVoucher = () => {
-    openUpload.value = true;
-  };
-  // 上传凭证弹窗点击确定
-  const handleOk = (e: MouseEvent) => {
-    console.log(e);
-    openUpload.value = false;
-  };
-  // 上传凭证相关方法及变量
-  const fileList = ref<UploadProps['fileList']>([]);
-  const beforeUpload: UploadProps['beforeUpload'] = (file) => {
-    return false;
-  };
-  const handleChange = (info: UploadChangeParam) => {
-    fileList.value = [...info.fileList];
-    if (info.file.status !== 'uploading') {
-      console.log(info.file, info.fileList);
-    }
-    if (info.file.status === 'done') {
-      message.success(`${info.file.name} 文件上传成功`);
-    } else if (info.file.status === 'error') {
-      message.error(`${info.file.name} 文件上传失败`);
-    }
-  };
-  const delIds = ref([]);
-  const handleFileRemove = (file) => {
-    delIds.value.push(file.uid);
-    const newFileList = [];
-    fileList.value.forEach((item) => {
-      if (item.uid !== file.uid) {
-        newFileList.push(item);
-      }
-    });
-    fileList.value = newFileList;
-  };
-  // 关闭上传凭证弹窗
-  const closeOpenUpload = () => {
-    openUpload.value = false;
-  };
-  // 凭证下载
-  const downLoadVisible = ref(false);
-  const downLoadColumns = [
-    {
-      title: '序号',
-      customRender: (text: any) => {
-        return text.index + 1;
-      },
-    },
-    {
-      title: '能源类型',
-      dataIndex: 'bizName',
-    },
-    {
-      title: '文件名',
-      dataIndex: 'fileName',
-      ellipsis: true,
-    },
-    {
-      title: '操作',
-      key: 'action',
-    },
-  ];
-  const downLoadData = ref([]);
-  const selectedRowKeysSet = ref([]);
-  const onSelectionChangeSet = (selectedKeys, selectedRows) => {
-    selectedRowKeysSet.value = selectedKeys;
-  };
-  const downLoad = (record) => {
-    const deleteId = ref(new FormData());
-    deleteId.value.append('id', record.id);
-    const config = {
-      headers: {
-        responseType: 'blob',
-      },
-    };
-    fetch(uploadPic.download, deleteId.value, config)
-      .then((res) => {
-        // 创建一个 URL 对象，指向图片数据的 blob
-        const url = window.URL.createObjectURL(new Blob([res.data]));
-        // 创建一个 <a> 标签，用于触发下载
-        const link = document.createElement('a');
-        link.href = url;
-        link.setAttribute('download', record.fileName); // 设置下载的文件名
-        document.body.appendChild(link);
-        link.click();
-
-        // 清理 URL 对象
-        window.URL.revokeObjectURL(url);
-      })
-      .catch((error) => {
-        console.error('下载图片失败：', error);
-      });
-  };
-  const onSubmitDownLoad = () => {
-    const deleteIds = ref(new FormData());
-    selectedRowKeysSet.value.forEach((item) => {
-      deleteIds.value.append('ids', item);
-    });
-    fetch(uploadPic.downloadZip, deleteIds.value)
-      .then((res) => {
-        // 创建一个 URL 对象，指向图片数据的 blob
-        const url = window.URL.createObjectURL(new Blob([res.data]));
-        // 创建一个 <a> 标签，用于触发下载
-        const link = document.createElement('a');
-        link.href = url;
-        debugger;
-        link.setAttribute('download', ''); // 设置下载的文件名
-        document.body.appendChild(link);
-        link.click();
-
-        // 清理 URL 对象
-        window.URL.revokeObjectURL(url);
-        onCloseDownLoad();
-      })
-      .catch((error) => {
-        console.error('下载图片失败：', error);
-      });
-  };
-  const onCloseDownLoad = () => {
-    selectedRowKeysSet.value = [];
-    downLoadVisible.value = false;
-  };
-</script>
-<style scoped lang="less">
-  :deep(.ant-table-title) {
-    display: flex;
-  }
-  :deep(.ant-table-container) {
-    padding: 0px 16px;
-  }
-  .buttonGroup {
-    margin-left: 1vw;
-    width: 30vw;
-    display: flex;
-    justify-content: space-around;
-  }
-</style>
-<style scoped>
-  th.column-money,
-  td.column-money {
-    text-align: right !important;
-  }
-</style>
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 fe3cb14..0038a2c 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -210,22 +210,33 @@
           </template>
         </template>
       </a-table>
-      <div class="ns-form-title"><div class="title">凭证上传</div></div>
+      <div class="ns-form-title" style="display: flex">
+        <div class="title">凭证上传</div>
+      </div>
       <a-upload
         :file-list="fileList"
         name="file"
-        accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf"
+        accept=".pdf"
         @remove="handleFileRemove"
         :before-upload="beforeUpload"
         @change="handleChange">
-        <a-button>
+        <a-button style="margin-left: 6px; color: #4f95ff; border-color: #4f95ff">
           <upload-outlined></upload-outlined>
-          上传
+          上传凭证
         </a-button>
       </a-upload>
-      <div style="display: flex; flex-direction: column">
+      <div
+        style="
+          display: flex;
+          flex-direction: column;
+          border-radius: 4px;
+          background: rgba(250, 250, 250, 1);
+          color: rgba(153, 153, 153, 1);
+          padding: 5px;
+        ">
         <span>1.仅支持pdf格式文件或文件夹</span>
         <span>2.文件名命名规则为【能源种类_年份】</span>
+        <span>3.每次上传自动覆盖</span>
       </div>
 
       <template #footer>
@@ -289,7 +300,7 @@
 <script lang="ts" setup>
   import { ref, toRaw, defineExpose, createVNode } from 'vue';
   import type { Rule } from 'ant-design-vue/es/form';
-  import { Pagination, message, Modal } from 'ant-design-vue';
+  import { Pagination, message, Modal, Upload } from 'ant-design-vue';
   import { UploadOutlined } from '@ant-design/icons-vue';
   import type { TreeSelectProps, UploadChangeParam, UploadProps } from 'ant-design-vue';
   import { NsMessage } from '/nerv-lib/component';
@@ -1058,19 +1069,29 @@
   };
   // 上传凭证相关方法及变量
   const fileList = ref<UploadProps['fileList']>([]);
+  const isValidFileName = (filename: string): boolean => {
+    const regex = /^[\s\S]+_\d{4}\.pdf$/;
+    return regex.test(filename);
+  };
   const beforeUpload: UploadProps['beforeUpload'] = (file) => {
+    const filename = file.name;
+    if (!isValidFileName(filename)) {
+      message.error('文件名不符合规则');
+      return Upload.LIST_IGNORE; // 阻止文件上传
+    }
     return false;
   };
   const handleChange = (info: UploadChangeParam) => {
-    fileList.value = [...info.fileList];
-    if (info.file.status !== 'uploading') {
-      console.log(info.file, info.fileList);
-    }
-    if (info.file.status === 'done') {
-      message.success(`${info.file.name} 文件上传成功`);
-    } else if (info.file.status === 'error') {
-      message.error(`${info.file.name} 文件上传失败`);
+    // fileList.value = [...info.fileList];
+    const { fileList: newFileList } = info;
+    delIds.value.push(info.fileList[0].uid);
+    // 删除fileList中的第一条数据
+    if (newFileList.length > 1) {
+      newFileList.shift(); // 删除第一条数据
     }
+
+    // 更新fileList
+    fileList.value = [...newFileList];
   };
   const delIds = ref([]);
   const handleFileRemove = (file) => {
@@ -1229,6 +1250,13 @@
   .grey-background.ant-switch .ant-switch-handle {
     background-color: rgba(238, 238, 238, 1) !important;
   }
+
+  .ant-switch-checked {
+    background-color: rgba(57, 215, 187, 1) !important;
+  }
+  .grey-background.ant-switch .ant-switch-handle {
+    background-color: rgba(238, 238, 238, 1) !important;
+  }
 </style>
 <style scoped>
   th.column-money,
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue
new file mode 100644
index 0000000..2ba11a2
--- /dev/null
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue	
@@ -0,0 +1,587 @@
+<template>
+  <div class="main">
+    <div class="left">
+      <div class="top">
+        <a-form style="width: 100%; margin: 0 auto">
+          <div class="ns-form-title"><div class="title">因子分类</div></div>
+          <div style="padding: 0 16px !important; width: 100%">
+            <a-row>
+              <a-col :span="24" style="margin-bottom: 16px">
+                <a-input-search
+                  v-model:value="searchValue"
+                  placeholder="请输入关键词"
+                  @search="onSearchTreeData" />
+              </a-col>
+            </a-row>
+          </div>
+        </a-form>
+        <a-tree
+          v-if="gData && gData.length > 0"
+          :expanded-keys="expandedKeys"
+          :auto-expand-parent="autoExpandParent"
+          :selectedKeys="selectedKeys"
+          :tree-data="gData"
+          show-line
+          @expand="onExpand"
+          @select="onSelect"
+          style="padding: 0 16px !important">
+          <template #title="data">
+            <span
+              v-if="data.energyType && searchValue && data.energyType.indexOf(searchValue) > -1">
+              {{ data.energyType.substring(0, data.energyType.indexOf(searchValue)) }}
+              <span style="color: #f50">{{ searchValue }}</span>
+              {{
+                data.energyType.substring(data.energyType.indexOf(searchValue) + searchValue.length)
+              }}
+            </span>
+            <span v-else>{{ data.energyType }}</span>
+          </template>
+        </a-tree>
+      </div>
+    </div>
+    <div class="right">
+      <!-- <a-table 
+        :columns="columns" 
+        :data-source="tableData" 
+        bordered
+        :pagination="false">
+        <template #bodyCell="{ column, text, record }">
+          <template v-if="column.key === 'action'">
+            <span>
+              <a @click="editData(record)">编辑</a>
+              <a-divider type="vertical" />
+              <a @click="delData(record)">删除</a>
+            </span>
+          </template>
+        </template>
+        <template #title>
+          <div class="ns-table-title"><span>排放因子库</span></div>
+          <div class="buttonGroup">
+            <a-button type="primary" @click="addNewData">新增</a-button>
+          </div>
+        </template>
+      </a-table> -->
+      <ns-view-list-table
+        v-bind="tableConfig"
+        :model="tableData"
+        ref="mainRef"
+        :scroll="{ x: 1000 }" />
+      <a-pagination
+        :current="queryParams.pageNum"
+        :total="total"
+        :page-size="queryParams.pageSize"
+        style="display: flex; justify-content: center; margin-top: 16px"
+        :show-size-changer="true"
+        :show-quick-jumper="true"
+        @change="onChange" />
+      <!-- 新增/编辑 -->
+      <a-drawer
+        :width="500"
+        :visible="visible"
+        :body-style="{ paddingBottom: '80px' }"
+        :footer-style="{ textAlign: 'right' }"
+        destroyOnClose
+        @close="onClose">
+        <a-form
+          ref="formRef"
+          :model="formState"
+          :rules="rules"
+          :label-col="labelCol"
+          :wrapper-col="wrapperCol">
+          <a-row>
+            <a-col :span="24">
+              <a-form-item ref="name" label="日期范围" name="dateRange">
+                <a-range-picker
+                  v-model:value="formState.dateRange"
+                  picker="month"
+                  valueFormat="YYYY-MM" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item ref="name" label="排放因子" name="emissionFactors">
+                <ns-input v-model:value="formState.emissionFactors" disabled />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <span
+            key=""
+            style="font-size: 16px; font-weight: 700; color: rgba(51, 51, 51, 1); text-align: left">
+            因子列表
+          </span>
+          <a-row>
+            <a-col :span="12">
+              <a-form-item ref="name">
+                <ns-input style="margin-top: 5px" v-model:value="selectData" @change="keyChange" />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+        <a-table
+          :columns="drawerColumns"
+          :data-source="newTableData"
+          bordered
+          rowKey="id"
+          :rowSelection="{
+            selectedRowKeys: selectedRowKeys,
+            onChange: onSelectionChange,
+            type: 'radio',
+          }"
+          :pagination="false">
+        </a-table>
+        <template #footer>
+          <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
+          <a-button type="primary" @click="onSubmit">确定</a-button>
+        </template>
+      </a-drawer>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { ref, watch, toRaw, defineExpose } from 'vue';
+  import type { TreeProps } from 'ant-design-vue';
+  import { Pagination, Modal } from 'ant-design-vue';
+  import { columns, drawerColumns } from '../config';
+  import { http } from '/nerv-lib/util/http';
+  import {
+    quickCalculation,
+    carbonEmissionFactorLibrary,
+  } from '/@/api/carbonEmissionFactorLibrary';
+  import { or } from '@vueuse/core';
+  defineOptions({
+    energyType: 'quickCalculation', // 与页面路由name一致缓存才可生效
+    components: {
+      'a-pagination': Pagination,
+    },
+  });
+  const orgId = ref('');
+  const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+  orgId.value = result;
+  const fetch = (api, params = { orgId }) => {
+    return http.post(api, params);
+  };
+  const mainRef = ref();
+  // 数结构
+  const x = 3;
+  const y = 2;
+  const z = 1;
+  const genData: TreeProps['treeData'] = [];
+
+  const generateData = (_level: number, _preKey?: string, _tns?: TreeProps['treeData']) => {
+    const preKey = _preKey || '0';
+    const tns = _tns || genData;
+
+    const children = [];
+    for (let i = 0; i < x; i++) {
+      const key = `${preKey}-${i}`;
+      tns.push({ title: key, key });
+      if (i < y) {
+        children.push(key);
+      }
+    }
+    if (_level < 0) {
+      return tns;
+    }
+    const level = _level - 1;
+    children.forEach((key, index) => {
+      tns[index].children = [];
+      return generateData(level, key, tns[index].children);
+    });
+  };
+  generateData(z);
+
+  const dataList: TreeProps['treeData'] = [];
+  const generateList = (data: TreeProps['treeData']) => {
+    for (let i = 0; i < data.length; i++) {
+      const node = data[i];
+      const key = node.key;
+      dataList.push({ key, title: key });
+      if (node.children) {
+        generateList(node.children);
+      }
+    }
+  };
+  generateList(genData);
+
+  const getParentKey = (
+    key: string | number,
+    tree: TreeProps['treeData'],
+  ): string | number | undefined => {
+    let parentKey;
+    for (let i = 0; i < tree.length; i++) {
+      const node = tree[i];
+      if (node.children) {
+        if (node.children.some((item) => item.key === key)) {
+          parentKey = node.key;
+        } else if (getParentKey(key, node.children)) {
+          parentKey = getParentKey(key, node.children);
+        }
+      }
+    }
+    return parentKey;
+  };
+  const expandedKeys = ref<(string | number)[]>(['0-0']);
+  const selectedKeys = ref<string[]>(['0-0-0']);
+  const searchValue = ref<string>('');
+  const autoExpandParent = ref<boolean>(true);
+  const gData = ref<TreeProps['treeData']>(genData);
+
+  const onExpand = (keys: string[]) => {
+    expandedKeys.value = keys;
+    autoExpandParent.value = false;
+  };
+  // 被选中的树节点
+  const energyType = ref();
+  const onSelect = (selectedKey: string[], info: any) => {
+    selectedKeys.value = selectedKey;
+    if (info.selected) {
+      energyType.value = info.node.id;
+      statsId.value = info.node.id;
+      mainRef.value?.nsTableRef.reload();
+    }
+  };
+
+  watch(searchValue, (value) => {
+    const expanded = dataList
+      .map((item: TreeProps['treeData'][number]) => {
+        if (item.title.indexOf(value) > -1) {
+          return getParentKey(item.key, gData.value);
+        }
+        return null;
+      })
+      .filter((item, i, self) => item && self.indexOf(item) === i);
+    expandedKeys.value = expanded;
+    searchValue.value = value;
+    autoExpandParent.value = true;
+  });
+  // 查询因子分类树数据
+  const onSearchTreeData = () => {};
+  const statsId = ref();
+  // 获取因子分类树数据
+  const getTreeData = () => {
+    fetch(quickCalculation.carbonQuickTree, { orgId: orgId.value }).then((res) => {
+      gData.value = res.data;
+      energyType.value = gData.value[0].children[0].id;
+      statsId.value = gData.value[0].children[0].id;
+      mainRef.value?.nsTableRef.reload();
+    });
+  };
+  getTreeData();
+  // 列表数据
+  const total = ref<number>();
+  const queryParams = ref({
+    pageNum: 1,
+    pageSize: 10,
+    orgId: orgId.value,
+  });
+  const tableData = ref([]);
+  const emissionSources = ref();
+  const tableConfig = ref({
+    title: '排放因子库',
+    api: quickCalculation.queryCarbonEmissionPage,
+    params: {
+      orgId,
+      energyType,
+    },
+    headerActions: [
+      {
+        label: '新增',
+        name: 'userAdd',
+        type: 'primary',
+        handle: () => {
+          visible.value = true;
+          // getNewTable();
+        },
+      },
+    ],
+    columns: [
+      {
+        title: '序号',
+        customRender: (text: any) => {
+          return text.index + 1;
+        },
+      },
+      {
+        title: '因子值',
+        dataIndex: 'emissionFactors',
+      },
+      {
+        title: '计量单位',
+        className: 'carbonEmissionSuffix',
+        dataIndex: 'carbonEmissionSuffix',
+      },
+      {
+        title: '更新时间',
+        className: 'updateTime',
+        dataIndex: 'updateTime',
+        ellipsis: true,
+      },
+      {
+        title: '启用时间',
+        className: 'startTime',
+        dataIndex: 'startTime',
+      },
+      {
+        title: '结束时间',
+        className: 'endTime',
+        dataIndex: 'endTime',
+      },
+      {
+        title: '数据来源',
+        className: 'dataSources',
+        dataIndex: 'dataSources',
+      },
+    ],
+    columnActions: {
+      title: '操作',
+      actions: [
+        {
+          label: '编辑',
+          name: 'userEdit',
+          handle: (record: any) => {
+            selectedRowKeys.value = [record.factorId];
+            formState.value.id = record.id;
+            formState.value.emissionFactors = record.emissionFactors;
+            formState.value.dateRange = [record.startTime, record.endTime];
+            formState.value.factorId = record.factorId;
+            visible.value = true;
+            emissionSources.value = record.emissionSources;
+            queryData.value.emissionSources = emissionSources.value;
+            getNewTable();
+          },
+        },
+        {
+          label: '删除',
+          name: 'userDelete',
+          dynamicParams: { id: 'id' },
+          confirm: true,
+          isReload: true,
+          api: quickCalculation.del,
+        },
+      ],
+    },
+    rowKey: 'id',
+  });
+
+  defineExpose({
+    getTreeData,
+  });
+  // 获取列表数据
+  const getTableList = () => {
+    fetch(quickCalculation.queryCarbonEmissionPage, queryParams.value).then((res) => {
+      tableData.value = res.data.records;
+      total.value = res.data.total;
+    });
+  };
+  // 分页器
+  const onChange = (pageNumber: number, size: number) => {
+    queryParams.value.pageNum = pageNumber;
+    queryParams.value.pageSize = size;
+    mainRef.value?.nsTableRef.reload();
+  };
+  // 新增/编辑
+  const formRef = ref();
+  const labelCol = { span: 6 };
+  const wrapperCol = { span: 18 };
+  const formState = ref({
+    orgId: orgId.value,
+  });
+  const visible = ref(false);
+
+  // 定义form表单的必填
+  const rules: Record<string, Rule[]> = {
+    dateRange: [{ required: true, message: '请选择日期范围', trigger: 'change' }],
+    emissionFactors: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
+  };
+  // 点击新增按钮
+  const addNewData = () => {
+    visible.value = true;
+    // getNewTable();
+  };
+  // 获取新增页面的列表
+  const selectedRowKeys = ref([]);
+  const onSelectionChange = (selectedKeys, selectedRows) => {
+    selectedRowKeys.value = selectedKeys;
+    formState.value.emissionFactors = selectedRows[0].emissionFactors;
+    formState.value.factorId = selectedRows[0].id;
+  };
+  const queryData = ref({
+    orgId: orgId.value,
+    pageNum: 1,
+    pageSize: 999,
+  });
+  const newTableData = ref([]);
+  const getNewTable = () => {
+    fetch(carbonEmissionFactorLibrary.getTableList, queryData.value).then((res) => {
+      newTableData.value = res.data.records;
+    });
+  };
+  const selectData = ref();
+  const keyChange = () => {
+    if (selectData.value === '') {
+      queryData.value.emissionSources = emissionSources.value;
+    } else {
+      queryData.value.emissionSources = selectData.value;
+    }
+    getNewTable();
+  };
+  // 点击编辑按钮
+  const editData = (record) => {
+    selectedRowKeys.value = [record.factorId];
+    formState.value.id = record.id;
+    formState.value.emissionFactors = record.emissionFactors;
+    formState.value.dateRange = [record.startTime, record.endTime];
+    formState.value.factorId = record.factorId;
+    visible.value = true;
+    getNewTable();
+  };
+  // 点击确定提交
+  const onSubmit = () => {
+    formRef.value
+      .validate()
+      .then(() => {
+        formState.value.statsId = statsId.value;
+        formState.value.startTime = formState.value.dateRange[0];
+        formState.value.endTime = formState.value.dateRange[1];
+        console.log('values', formState, toRaw(formState));
+        if (formState.value.id) {
+          fetch(quickCalculation.update, formState.value).then((res) => {
+            visible.value = false;
+            selectedRowKeys.value = [];
+            formState.value = {};
+            formRef.value.resetFields();
+            mainRef.value?.nsTableRef.reload();
+          });
+        } else {
+          fetch(quickCalculation.creat, formState.value).then((res) => {
+            visible.value = false;
+            selectedRowKeys.value = [];
+            formState.value = {};
+            formRef.value.resetFields();
+            mainRef.value?.nsTableRef.reload();
+          });
+        }
+      })
+      .catch((error) => {
+        console.log('error', error);
+      });
+  };
+  // 删除数据
+  const delData = (record) => {
+    Modal.confirm({
+      title: '警告',
+      content: '确定要删除吗?',
+      okText: '确定',
+      okType: 'primary',
+      cancelText: '取消',
+      onOk() {
+        fetch(quickCalculation.del, { id: record.id }).then((res) => {
+          message.success('操作成功！');
+          getTableList();
+        });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+  // 关闭新增抽屉
+  const onClose = () => {
+    visible.value = false;
+    selectedRowKeys.value = [];
+    formState.value = {};
+    formRef.value.resetFields();
+  };
+</script>
+
+<style lang="less" scoped>
+  .main {
+    background-color: @ns-content-bg;
+    display: flex;
+    height: 100%;
+  }
+  .left {
+    width: 300px;
+    margin-right: @ns-gap;
+    min-width: fit-content;
+    > div {
+      background-color: @white;
+      flex: 1;
+    }
+
+    display: flex;
+    flex-direction: column;
+    .top {
+      position: relative;
+      .addTreeNode {
+        width: 100%;
+        padding: 16px;
+        position: absolute;
+        bottom: 0;
+      }
+    }
+  }
+  .right {
+    flex: 1;
+    min-width: 0;
+    height: 100%;
+    background: #ffffff;
+  }
+  :deep(.ant-table-container) {
+    padding: 0px 16px;
+  }
+  :deep(.ns-table-main) {
+    margin-top: unset !important;
+  }
+  .top {
+    overflow: auto;
+  }
+  .ns-form-title {
+    font-weight: bold;
+    user-select: text;
+    padding: 16px;
+    margin-bottom: 16px;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #e9e9e9;
+  }
+  .title {
+    text-align: left;
+    height: 32px;
+    line-height: 32px;
+    font-weight: bold;
+    user-select: text;
+    position: relative;
+    padding-left: 9px;
+  }
+  .title::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    height: 13px;
+    width: 3px;
+    border-radius: 1px;
+    background-color: #2778ff;
+  }
+  :deep(.ant-table-title) {
+    display: flex;
+    height: 100%;
+    align-items: center;
+  }
+  .ns-table-title {
+    font-weight: bold;
+  }
+  .buttonGroup {
+    margin-left: 1vw;
+    width: 5vw;
+    display: flex;
+    justify-content: space-around;
+  }
+</style>
+<style scoped>
+  th.column-money,
+  td.column-money {
+    text-align: right !important;
+  }
+</style>
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
index 2ba11a2..da6d795 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -66,14 +66,14 @@
         :model="tableData"
         ref="mainRef"
         :scroll="{ x: 1000 }" />
-      <a-pagination
+      <!-- <a-pagination
         :current="queryParams.pageNum"
         :total="total"
         :page-size="queryParams.pageSize"
         style="display: flex; justify-content: center; margin-top: 16px"
         :show-size-changer="true"
         :show-quick-jumper="true"
-        @change="onChange" />
+        @change="onChange" /> -->
       <!-- 新增/编辑 -->
       <a-drawer
         :width="500"
@@ -499,14 +499,19 @@
     background-color: @ns-content-bg;
     display: flex;
     height: 100%;
+    padding: 16px;
   }
   .left {
     width: 300px;
     margin-right: @ns-gap;
     min-width: fit-content;
+    border-radius: 8px;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
     > div {
       background-color: @white;
       flex: 1;
+      border-radius: 8px;
     }
 
     display: flex;
@@ -526,6 +531,11 @@
     min-width: 0;
     height: 100%;
     background: #ffffff;
+    border-radius: 8px !important;
+    box-shadow: 0px 2px 20px rgb(69 123 234 / 20%);
+    :deep(.ns-table-main) {
+      border-radius: 8px !important;
+    }
   }
   :deep(.ant-table-container) {
     padding: 0px 16px;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
index f905077..a3878f1 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -248,7 +248,7 @@
     </a-drawer>
     <!-- 点击编辑弹出框 -->
     <a-drawer
-      :width="700"
+      :width="500"
       :visible="editData"
       :body-style="{ paddingBottom: '80px' }"
       :footer-style="{ textAlign: 'right' }"
@@ -260,7 +260,7 @@
         :label-col="labelCol"
         :wrapper-col="wrapperCol">
         <a-row>
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-item ref="name" label="数据来源" name="dataSources">
               <a-select
                 ref="select"
@@ -272,14 +272,14 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-item ref="name" label="消耗量" name="consumption">
               <ns-input v-model:value="editFormState.consumption" :disabled="canEdit" />
             </a-form-item>
           </a-col>
         </a-row>
         <a-row v-if="automatic">
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-item ref="name" label="采集节点" name="collectionNode">
               <a-tree-select
                 v-model:value="editFormState.collectionNode"
@@ -291,12 +291,12 @@
           </a-col>
         </a-row>
         <a-row>
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-item ref="name" label="因子值" name="factorId">
               <ns-input v-model:value="editFormState.factorId" />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-item ref="name" label="关键字" name="emissionFactors">
               <a-input-search
                 v-model:value="editFormState.emissionFactors"
@@ -325,24 +325,14 @@
         :current="queryData.pageNum"
         :total="total"
         :page-size="queryData.pageSize"
+        :pageSizeOptions="['5']"
         style="display: flex; justify-content: center; margin-top: 16px"
         :show-size-changer="true"
         :show-quick-jumper="true"
         @change="onChange" />
-      <!-- <a-upload
-        v-model:file-list="fileList"
-        name="file"
-        accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf"
-        @remove="handleFileRemove"
-        :before-upload="beforeUpload"
-        @change="handleChange">
-        <a-button>
-          <upload-outlined></upload-outlined>
-          点击上传凭证
-        </a-button>
-      </a-upload> -->
       <a-upload-dragger
         v-model:fileList="fileList"
+        accept=".pdf"
         name="file"
         @remove="handleFileRemove"
         :before-upload="beforeUpload"
@@ -365,7 +355,7 @@
 <script lang="ts" setup>
   import { ref, watch, toRaw, defineEmits, nextTick } from 'vue';
   import { http } from '/nerv-lib/util/http';
-  import { Pagination, Modal, message } from 'ant-design-vue';
+  import { Pagination, Modal, message, Upload } from 'ant-design-vue';
   import type { TreeProps, UploadChangeParam } from 'ant-design-vue';
   import {
     EditOutlined,
@@ -935,7 +925,7 @@
   const queryData = ref({
     orgId: orgId.value,
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 5,
   });
   const edit = (record) => {
     getDictList();
@@ -975,6 +965,8 @@
     if (value === '3') {
       canEdit.value = true;
       automatic.value = true;
+    } else {
+      automatic.value = false;
     }
   };
   // 定义采集节点数的变量
@@ -997,24 +989,31 @@
       },
     );
   };
-  const selectNode = (value) => {
-    debugger;
-  };
   // 上传附件
   const fileList = ref<UploadProps['fileList']>([]);
+  const isValidFileName = (filename: string): boolean => {
+    const regex = /^[\s\S]+_\d{4}\.pdf$/;
+    return regex.test(filename);
+  };
   const beforeUpload: UploadProps['beforeUpload'] = (file) => {
+    const filename = file.name;
+    if (!isValidFileName(filename)) {
+      message.error('文件名不符合规则');
+      return Upload.LIST_IGNORE; // 阻止文件上传
+    }
     return false;
   };
   const handleChange = (info: UploadChangeParam) => {
-    fileList.value = [...info.fileList];
-    if (info.file.status !== 'uploading') {
-      console.log(info.file, info.fileList);
-    }
-    if (info.file.status === 'done') {
-      message.success(`${info.file.name} 文件上传成功`);
-    } else if (info.file.status === 'error') {
-      message.error(`${info.file.name} 文件上传失败`);
+    // fileList.value = [...info.fileList];
+    const { fileList: newFileList } = info;
+    delIds.value.push(info.fileList[0].uid);
+    // 删除fileList中的第一条数据
+    if (newFileList.length > 1) {
+      newFileList.shift(); // 删除第一条数据
     }
+
+    // 更新fileList
+    fileList.value = [...newFileList];
   };
   const delIds = ref([]);
   const handleFileRemove = (file) => {
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
index a8e3dd6..c7efdd0 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -68,8 +68,8 @@
   const orgId = ref('');
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
   orgId.value = result;
-  const fetch = (api, params = { orgId }) => {
-    return http.post(api, params);
+  const fetch = (api, params = { orgId }, config) => {
+    return http.post(api, params, config);
   };
   // 判断展示哪个页面
   const isMainPage = ref(true);
@@ -205,7 +205,30 @@
         {
           label: '下载',
           name: 'download',
-          handle: (record: any) => {},
+          handle: (record: any) => {
+            const deleteId = ref(new FormData());
+            deleteId.value.append('id', record.id);
+            const config = {
+              responseType: 'blob',
+            };
+            fetch(carbonInventoryCheck.downloadZip, deleteId.value, config)
+              .then((res) => {
+                // 创建一个 URL 对象，指向图片数据的 blob
+                const url = window.URL.createObjectURL(new Blob([res]));
+                // 创建一个 <a> 标签，用于触发下载
+                const link = document.createElement('a');
+                link.href = url;
+                link.setAttribute('download', '碳盘查凭证.zip'); // 设置下载的文件名
+                document.body.appendChild(link);
+                link.click();
+
+                // 清理 URL 对象
+                window.URL.revokeObjectURL(url);
+              })
+              .catch((error) => {
+                console.error('下载图片失败：', error);
+              });
+          },
         },
         {
           label: '删除',
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
index 0285bb9..c34aae4 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue
@@ -100,8 +100,20 @@
   const drawEcharts = () => {
     data.value.forEach((item, index) => {
       const chart = echarts.init(document.getElementById(`ydlChart_${index}`)!);
-
-      const handred = 100;
+      const bottomColor = [
+        'rgba(219, 222, 232, 1)',
+        'rgba(221, 226, 223, 1)',
+        'rgba(233, 228, 219, 1)',
+        'rgba(221, 216, 235, 1)',
+        'rgba(240, 228, 228, 1)',
+      ];
+      const mianColor = [
+        'rgba(24, 106, 255, 1)',
+        'rgba(58, 194, 127, 1)',
+        'rgba(249, 183, 50, 1)',
+        'rgba(120, 76, 212, 1)',
+        'rgba(255, 55, 103, 1)',
+      ];
       let point = parseInt(item.budgetAchievement.replace('%', ''));
       const option = {
         backgroundColor: 'transparent',
@@ -127,55 +139,61 @@
             },
           },
         ],
-        // tooltip: {
-        //   formatter: function (params) {
-        //     return params.name + '：' + params.percent + ' %';
-        //   },
-        // },
         series: [
           {
-            name: 'circle',
             type: 'pie',
-            clockWise: true,
             radius: ['40%', '50%'],
             center: ['50%', '40%'],
-            itemStyle: {
+            label: {
               normal: {
-                label: {
-                  show: false,
-                },
-                labelLine: {
-                  show: false,
-                },
+                show: false,
               },
             },
-            hoverAnimation: false,
+            data: [
+              {
+                name: '',
+                value: 100,
+                itemStyle: {
+                  normal: {
+                    color: bottomColor[index],
+                  },
+                },
+              },
+            ],
+            zlevel: 1,
+          },
+          {
+            name: 'main',
+            type: 'pie',
+            radius: ['38%', '55%'],
+            center: ['50%', '40%'],
             data: [
               {
                 value: point,
-                name: '占比',
+                label: {
+                  show: true,
+                  position: 'center',
+                  fontSize: 40,
+                },
+                labelLine: { show: false },
                 itemStyle: {
                   normal: {
-                    color: '#4FADFD',
-                    label: {
-                      show: false,
-                    },
-                    labelLine: {
-                      show: false,
-                    },
+                    color: mianColor[index],
+                    shadowBlur: 10,
+                    shadowColor: mianColor[index],
                   },
                 },
               },
               {
-                name: '剩余',
-                value: handred - point,
+                value: 100 - point,
                 itemStyle: {
                   normal: {
-                    color: '#E1E8EE',
+                    color: 'transparent',
                   },
                 },
               },
             ],
+            zlevel: 2,
           },
         ],
       };
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
index 788e04e..c1d912d 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue
@@ -459,7 +459,26 @@
           barWidth: 18,
           itemStyle: {
             normal: {
-              color: '#6395f9',
+              color: new echarts.graphic.LinearGradient(
+                0,
+                0,
+                0,
+                1,
+                [
+                  {
+                    offset: 0,
+                    color: 'rgba(45, 178, 246, 1)', // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: 'rgba(255, 255, 255, 0)', // 100% 处的颜色
+                  },
+                ],
+                false,
+              ),
+              borderWidth: 2,
+              borderColor: 'rgba(45, 178, 246, 1)',
+              padding: 0,
             },
           },
           data: lastYearActualUsageList.value,
@@ -469,9 +488,26 @@
           type: 'bar',
           barWidth: 18,
           itemStyle: {
-            normal: {
-              color: '#62daab',
-            },
+            color: new echarts.graphic.LinearGradient(
+              0,
+              0,
+              0,
+              1,
+              [
+                {
+                  offset: 0,
+                  color: 'rgba(28, 184, 142, 1)', // 0% 处的颜色
+                },
+                {
+                  offset: 1,
+                  color: 'rgba(255, 255, 255, 0)', // 100% 处的颜色
+                },
+              ],
+              false,
+            ),
+            borderWidth: 2,
+            borderColor: 'rgba(28, 184, 142, 1)',
+            padding: 0,
           },
           data: actualUsageList.value,
         },
@@ -481,7 +517,7 @@
           smooth: true, // 开启平滑曲线
           symbol: 'none', //标记的图形为实心圆
           lineStyle: {
-            color: '#f4664a',
+            color: 'rgba(255, 188, 70, 1)',
             width: 2,
           },
           data: budgetList.value,
@@ -492,7 +528,7 @@
           smooth: true, // 开启平滑曲线
           symbol: 'none', //标记的图形为实心圆
           lineStyle: {
-            color: '#f4664a',
+            color: 'rgba(195, 142, 255, 1)',
             width: 2,
           },
           data: referenceValueList.value,
@@ -559,6 +595,7 @@
   .contant {
     width: 100%;
     height: calc(100% - 5vh);
+    overflow: auto;
     .chartsPart {
       width: 100%;
       height: 63%;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
index df3bfc8..bf972d7 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue
@@ -260,25 +260,45 @@
       series: [
         {
           name: '实际用量',
-          type: 'bar',
-          barWidth: 18,
+          type: 'pictorialBar',
+          symbol: 'rect',
           itemStyle: {
+            color: '#6395f9',
+          },
+          symbolRepeat: true,
+          symbolSize: [14, 4],
+          symbolMargin: 0.5,
+          symbolPosition: 'start',
+          z: -20,
+          data: actualUsage.value,
+          label: {
             normal: {
-              color: '#6395f9',
+              show: false,
+              position: 'top',
+              verticalAlign: 'top',
             },
           },
-          data: actualUsage.value,
         },
         {
           name: '预算量',
-          type: 'bar',
-          barWidth: 18,
+          type: 'pictorialBar',
+          symbol: 'rect',
           itemStyle: {
+            color: '#62daab',
+          },
+          symbolRepeat: true,
+          symbolSize: [14, 4],
+          symbolMargin: 0.5,
+          symbolPosition: 'start',
+          z: -20,
+          data: budget.value,
+          label: {
             normal: {
-              color: '#62daab',
+              show: false,
+              position: 'top',
+              verticalAlign: 'top',
             },
           },
-          data: budget.value,
         },
         {
           name: '基准线',

From a47f8ae50fc477a611ab14d93af6a320ca690d27 Mon Sep 17 00:00:00 2001
From: fks-yangshouda <yangshoudamhy@163.com>
Date: Thu, 15 Aug 2024 15:34:50 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/icon/xiazai.svg              | 11 +++-
 .../src/view/monitor/deviceMonitor/page.vue        | 15 +++--
 .../src/view/monitor/deviceMonitor/tree/index.vue  | 12 ++--
 .../monitor/energyMonitor/analysisGraph/index.vue  | 68 ++++++++++++++++------
 .../monitor/energyMonitor/graphGraph/index.vue     | 21 ++++++-
 .../src/view/monitor/energyMonitor/page.vue        | 38 ++++++++++--
 .../src/view/monitor/energyMonitor/tree/index.vue  | 14 +++--
 .../environmentMonitor/aggregateData/index.vue     |  6 +-
 .../src/view/monitor/environmentMonitor/index.vue  |  6 +-
 9 files changed, 147 insertions(+), 44 deletions(-)

diff --git a/hx-ai-intelligent/src/icon/xiazai.svg b/hx-ai-intelligent/src/icon/xiazai.svg
index 738f4a4..f77ac5b 100644
--- a/hx-ai-intelligent/src/icon/xiazai.svg
+++ b/hx-ai-intelligent/src/icon/xiazai.svg
@@ -1 +1,10 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1720430904326" class="icon" viewBox="0 0 1354 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3403" xmlns:xlink="http://www.w3.org/1999/xlink" width="21.15625" height="16"><path d="M1034.83248 645.406063l-191.508238 191.508238a53.622507 53.622507 0 0 1-75.964301 0l-191.508238-191.508238a53.622507 53.622507 0 0 1 0-75.964301 53.622507 53.622507 0 0 1 75.965301 0l102.775054 102.775054V303.884205a53.622507 53.622507 0 1 1 107.245014 0v368.332611l95.753119-102.775054a53.622507 53.622507 0 0 1 75.965301 0 53.622507 53.622507 0 0 1 1.276988 75.964301z m262.364587-175.548385a365.141641 365.141641 0 0 0-97.030108-98.94609 378.546518 378.546518 0 0 0-29.364729-123.202867 397.697341 397.697341 0 0 0-89.369178-127.671825 404.719277 404.719277 0 0 0-133.418773-91.28516A408.549242 408.549242 0 0 0 792.894706 0.026a400.251318 400.251318 0 0 0-225.977921 67.665377 410.464224 410.464224 0 0 0-97.669102 91.285161 261.088598 261.088598 0 0 0-63.836412-7.65993 247.044727 247.044727 0 0 0-176.18738 70.857348 245.129745 245.129745 0 0 0-72.134336 202.360139 324.925011 324.925011 0 0 0-84.263225 72.77333A308.965158 308.965158 0 0 0 0.053 702.22054a310.242146 310.242146 0 0 0 97.029107 228.531898 331.307952 331.307952 0 0 0 105.969025 69.58136 330.030964 330.030964 0 0 0 127.670826 23.619782h656.233963A360.034688 360.034688 0 0 0 1242.298572 919.261544a360.034688 360.034688 0 0 0 81.071254-116.181932 354.288741 354.288741 0 0 0 27.449748-138.523725 344.713829 344.713829 0 0 0-54.260501-194.699209z" fill="#16B187" p-id="3404"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="14.6600341796875" viewBox="0 0 20 14.6600341796875" fill="none">
+<path d="M20 11.96C20 12.2933 19.9433 12.6067 19.83 12.9C19.7167 13.1933 19.56 13.46 19.36 13.7C19.16 13.94 18.9233 14.1367 18.65 14.29C18.3767 14.4433 18.08 14.5467 17.76 14.6L17.76 14.64L17.34 14.64L17.32 14.64L4.34 14.64C4.31333 14.64 4.29667 14.6433 4.29 14.65C4.28333 14.6567 4.26667 14.66 4.24 14.66C4.21333 14.66 4.19333 14.6567 4.18 14.65C4.16667 14.6433 4.14667 14.64 4.12 14.64L4 14.64L4 14.62C3.44 14.5933 2.91667 14.4667 2.43 14.24C1.94333 14.0133 1.52 13.71 1.16 13.33C0.8 12.95 0.516667 12.51 0.31 12.01C0.103333 11.51 -7.45058e-08 10.98 0 10.42C7.45058e-08 9.86 0.103333 9.33333 0.31 8.84C0.516667 8.34666 0.796667 7.91333 1.15 7.54001C1.50333 7.16667 1.91667 6.86 2.39 6.62C2.86333 6.37999 3.37333 6.24001 3.92 6.20001C4.01333 5.33333 4.25333 4.52335 4.64 3.77C5.02667 3.01666 5.52333 2.36 6.13 1.8C6.73667 1.24001 7.43333 0.799988 8.22 0.479996C9.00667 0.160004 9.84667 0 10.74 0C11.6867 0 12.58 0.180008 13.42 0.539993C14.26 0.899994 14.99 1.39333 15.61 2.02C16.23 2.64667 16.72 3.37666 17.08 4.20999C17.44 5.04333 17.62 5.93333 17.62 6.88C17.62 7.30667 17.58 7.72334 17.5 8.13C17.42 8.53668 17.3067 8.92665 17.16 9.3C17.1867 9.3 17.2167 9.29666 17.25 9.29001C17.2833 9.28333 17.3133 9.28 17.34 9.28C17.7133 9.28 18.06 9.35001 18.38 9.48999C18.7 9.62999 18.98 9.81999 19.22 10.06C19.46 10.3 19.65 10.5833 19.79 10.91C19.93 11.2367 20 11.5867 20 11.96L20 11.96ZM13.42 9C13.58 8.73334 13.6267 8.57999 13.56 8.54001C13.4933 8.5 13.3267 8.48001 13.06 8.48001C12.9 8.48001 12.6767 8.47667 12.39 8.47C12.1033 8.46333 11.8867 8.45999 11.74 8.45999C11.5267 8.45999 11.39 8.37332 11.33 8.2C11.27 8.02666 11.24 7.78667 11.24 7.48C11.24 7.05333 11.2367 6.70999 11.23 6.45C11.2233 6.19 11.22 5.90666 11.22 5.59999C11.22 5.25333 11.1967 5 11.15 4.84C11.1033 4.67999 10.9133 4.60001 10.58 4.60001C10.34 4.60001 10.16 4.60333 10.04 4.61C9.92 4.61665 9.75333 4.61998 9.54 4.61998C9.18 4.61998 8.95667 4.72334 8.87 4.93001C8.78333 5.13666 8.74 5.34 8.74 5.53999L8.74 6.17999C8.74 6.35332 8.74333 6.52 8.75 6.68001C8.75667 6.84 8.76 7.00667 8.76 7.17999L8.76 7.75999C8.76 7.97333 8.73333 8.13667 8.68 8.25C8.62667 8.36334 8.5 8.42 8.3 8.42C8.22 8.43332 8.11 8.44333 7.97 8.45C7.83 8.45667 7.68667 8.46333 7.54 8.47C7.39333 8.47667 7.25333 8.48 7.12 8.48001L6.8 8.48001C6.52 8.48001 6.35333 8.56667 6.3 8.74001C6.24667 8.91333 6.33333 9.13333 6.56 9.40001C6.78667 9.67999 7.03 9.98334 7.29 10.31C7.55 10.6367 7.80667 10.9667 8.06 11.3C8.31333 11.6333 8.55667 11.9567 8.79 12.27C9.02333 12.5833 9.24 12.8533 9.44 13.08C9.8 13.48 10.1467 13.4733 10.48 13.06C10.68 12.8333 10.9133 12.54 11.18 12.18C11.4467 11.82 11.72 11.4433 12 11.05C12.28 10.6567 12.5467 10.2767 12.8 9.90999C13.0533 9.54332 13.26 9.24001 13.42 9L13.42 9Z"   fill="url(#linear_fill_0_2380)" >
+</path>
+<defs>
+<linearGradient id="linear_fill_0_2380" x1="10" y1="0" x2="10" y2="14.6600341796875" gradientUnits="userSpaceOnUse">
+<stop offset="0" stop-color="#2BC69C"  />
+<stop offset="1" stop-color="#0CA87E"  />
+</linearGradient>
+</defs>
+</svg>
diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/page.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/page.vue
index afae477..ed43d30 100644
--- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/page.vue
+++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/page.vue
@@ -1,18 +1,25 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <template>
-  <a-row type="flex" style="display: flex; position: relative">
+  <a-row type="flex" style="display: flex; position: relative; background: #f1f2f6">
     <a-col :span="4">
-      <div style="padding: 0 20px; width: 100%; height: 100%">
+      <div style="width: 100%; height: 100%">
         <tree ref="treeRef" />
       </div>
     </a-col>
     <a-col :span="20">
-      <div style="width: 100%; height: 100%">
+      <div
+        style="
+          width: 98%;
+          height: 100%;
+          border-radius: 10px;
+          background: #ffffff;
+          margin-left: 1.5%;
+        ">
         <div class="ns-right-title">
           <span><ns-icon name="title" size="11" style="margin-right: 3px" />历史数据</span>
           <div class="button">
             <ns-icon name="xiazai" size="18" style="margin-right: 10px" @click="downloadChart" />
-            <ns-icon :name="iconName" size="18" style="margin-right: 10px" @click="change" />
+            <ns-icon :name="iconName" size="15" style="margin-right: 10px" @click="change" />
           </div>
         </div>
         <graph ref="graphRef" v-if="isGraph" />
diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
index 8c6e29e..826eeb1 100644
--- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
@@ -33,7 +33,7 @@
         placeholder="请选择点位"
         :style="{
           top: '50px',
-          left: `${divWidth + 40}px`,
+          left: `${divWidth + 55}px`,
           zIndex: 9,
           position: 'absolute',
           width: `${divWidth}px`,
@@ -44,7 +44,7 @@
         placeholder="请选择频率"
         :style="{
           top: '50px',
-          left: `${divWidth * 2 + 50}px`,
+          left: `${divWidth * 2 + 65}px`,
           zIndex: 9,
           position: 'absolute',
           width: `${divWidth}px`,
@@ -58,7 +58,7 @@
         @calendarChange="onCalendarChange"
         :style="{
           top: '50px',
-          left: `${divWidth * 3 + 60}px`,
+          left: `${divWidth * 3 + 75}px`,
           zIndex: 9,
           position: 'absolute',
           width: `${divWidth}px`,
@@ -68,7 +68,7 @@
         type="primary"
         :style="{
           top: '50px',
-          left: `${divWidth * 4 + 70}px`,
+          left: `${divWidth * 4 + 85}px`,
           zIndex: 9,
           position: 'absolute',
         }"
@@ -390,6 +390,10 @@
   }
   .parent-container {
     // position: relative;
+    border-radius: 10px;
+    background: #ffffff;
+    padding-left: 10px;
+    padding-right: 10px;
     height: 100%;
   }
 
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue
index ac7558b..77aeba6 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-row type="flex" style="height: 90%">
+  <a-row type="flex" style="height: 100%">
     <a-col :span="8" style="height: 100%">
       <div
         style="
-          box-shadow: 0 0 0 2px rgba(218, 218, 218, 0.5); /* 灰色阴影 */
+          box-shadow: 0 0 15px rgba(69, 123, 234, 0.2);
+          border-radius: 10px;
           width: 98%;
           height: 96%;
           margin: 2%;
@@ -32,7 +33,8 @@
         style="
           width: 98%;
           height: 38%;
-          box-shadow: 0 0 0 2px rgba(218, 218, 218, 0.5);
+          box-shadow: 0 0 15px rgba(69, 123, 234, 0.2);
+          border-radius: 10px;
           margin: 1%;
         "></div>
       <div
@@ -40,7 +42,8 @@
         style="
           width: 98%;
           height: 57%;
-          box-shadow: 0 0 0 2px rgba(218, 218, 218, 0.5);
+          box-shadow: 0 0 15px rgba(69, 123, 234, 0.2);
+          border-radius: 10px;
           margin: 1%;
         "></div>
     </a-col>
@@ -242,7 +245,9 @@
           var seriesdata = [];
           var dateX = [];
           // var legendList: string | any[] = [];
+          let sum = 0;
           for (let i = 0; i < data.value.length; i++) {
+            sum += data.value[i].value;
             dateX.push(data.value[i].name);
 
             seriesdata.push({
@@ -262,7 +267,7 @@
               clockwise: '10',
               // hoverAnimation: true,
               // 圆环内径和外径
-              radius: ['70%', '90%'],
+              radius: ['60%', '80%'],
               center: ['30%', '50%'], // 调整环形图的位置，百分比表示相对于容器的宽高
               // 显示折线
               labelLine: {
@@ -294,6 +299,29 @@
             tooltip: {
               trigger: 'item',
             },
+            graphic: [
+              {
+                type: 'text',
+                left: '28%',
+                top: '33%',
+                style: {
+                  text: '总计',
+                  fill: '#000',
+                  fontSize: 14,
+                },
+              },
+              {
+                type: 'text',
+                left: sum > 100 ? '24%' : '30%',
+                top: '50%',
+                style: {
+                  text: sum,
+                  fill: '#000',
+                  fontSize: 30,
+                  fontWeight: 700,
+                },
+              },
+            ],
 
             // 图例
             legend: {
@@ -334,7 +362,9 @@
           chartRight1.on('click', function (params) {
             // 控制台输出数据的名称
             console.log(params.name + ' 被点击了');
-            drawRight2(params);
+            if (params.name && params.name != '') {
+              drawRight2(params);
+            }
           });
         }
       };
@@ -360,18 +390,18 @@
         });
         const option = {
           // 图例
-          legend: {
-            data: [
-              { name: '对比值', icon: 'rect' }, // 对比值使用矩形图标
-              {
-                name: '参考线',
-                icon: 'path://M234.666667 490.666667h-153.6a25.6 25.6 0 1 0 0 51.2h153.6a25.6 25.6 0 1 0 0-51.2zM473.6 490.666667h-153.6a25.6 25.6 0 1 0 0 51.2h153.6a25.6 25.6 0 1 0 0-51.2zM934.4 490.666667h-136.533333a25.6 25.6 0 1 0 0 51.2h136.533333a25.6 25.6 0 1 0 0-51.2zM712.533333 490.666667h-153.6a25.6 25.6 0 1 0 0 51.2h153.6a25.6 25.6 0 1 0 0-51.2z',
-              }, // 参考线使用自定义路径图标，只显示线条
-            ],
-            orient: 'horizontal',
-            bottom: 10,
-            left: 60,
-          },
+          // legend: {
+          //   data: [
+          //     { name: '对比值', icon: 'rect' }, // 对比值使用矩形图标
+          //     {
+          //       name: '参考线',
+          //       icon: 'path://M234.666667 490.666667h-153.6a25.6 25.6 0 1 0 0 51.2h153.6a25.6 25.6 0 1 0 0-51.2zM473.6 490.666667h-153.6a25.6 25.6 0 1 0 0 51.2h153.6a25.6 25.6 0 1 0 0-51.2zM934.4 490.666667h-136.533333a25.6 25.6 0 1 0 0 51.2h136.533333a25.6 25.6 0 1 0 0-51.2zM712.533333 490.666667h-153.6a25.6 25.6 0 1 0 0 51.2h153.6a25.6 25.6 0 1 0 0-51.2z',
+          //     }, // 参考线使用自定义路径图标，只显示线条
+          //   ],
+          //   orient: 'horizontal',
+          //   bottom: 10,
+          //   left: 60,
+          // },
           tooltip: {
             trigger: 'axis',
             axisPointer: {
@@ -409,7 +439,7 @@
               zoomLock: true,
               startValue: 0, // 从头开始。
               endValue: 5,
-              bottom: '0%',
+              bottom: 20,
               height: 10,
               showDetail: false,
             },
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue
index a36cf9b..13dc5ca 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="graphGraphchart" style="width: 100%; height: 80%"></div>
+  <div ref="graphGraphchart" style="width: 100%; height: 100%"></div>
 </template>
 
 <script lang="ts">
@@ -77,6 +77,10 @@
           legendList.push(data.value[i].name);
         }
         const option = {
+          grid: {
+            top: 40,
+            bottom: 50,
+          },
           legend: {
             data: legendList,
             orient: 'horizontal',
@@ -107,6 +111,21 @@
             type: 'value',
           },
           series: seriesList,
+          // 使用 ECharts 的 graphic 组件来展示无数据的提示
+          graphic:
+            data.value.length === 0
+              ? {
+                  type: 'text',
+                  left: 'center',
+                  top: 'middle',
+                  style: {
+                    text: '无数据',
+                    fontSize: 20,
+                    fontWeight: 'bold',
+                    fill: '#999',
+                  },
+                }
+              : null,
         };
 
         chartInstance = echarts.init(graphGraphchart.value);
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue
index 4985b36..3149bc7 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue
@@ -1,13 +1,20 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <template>
-  <a-row type="flex" style="height: 92%; display: flex; position: relative">
+  <a-row type="flex" style="height: 100%; display: flex; position: relative; background: #f1f2f6">
     <a-col :span="4">
-      <div style="padding: 0 20px; width: 100%; height: 100%">
+      <div style="width: 100%; height: 100%">
         <tree ref="treeRef" />
       </div>
     </a-col>
     <a-col :span="20">
-      <div style="width: 100%; height: 100%">
+      <div
+        style="
+          width: 98%;
+          height: 100%;
+          border-radius: 10px;
+          background: #ffffff;
+          margin-left: 1.5%;
+        ">
         <div style="height: 22%">
           <div class="ns-right-title">
             <a-tabs
@@ -16,6 +23,9 @@
               @change="changeActive">
               <a-tab-pane key="1" tab="图表" />
               <a-tab-pane key="2" tab="分析" />
+              <!-- <template #renderTabBar="{ DefaultTabBar, ...props }">
+                <component :is="DefaultTabBar" v-bind="props" :style="{ opacity: 0.5 }" />
+              </template> -->
             </a-tabs>
             <div class="button">
               <ns-icon name="xiazai" size="18" style="margin-right: 10px" @click="downloadChart" />
@@ -27,11 +37,11 @@
           >
         </div>
 
-        <div v-if="activeKey == '1'" style="height: 82%; width: 100%">
+        <div v-if="activeKey == '1'" style="height: 72%; width: 100%">
           <graph-graph ref="graphRef" v-if="isGraph" />
           <environment-table ref="tableRef" v-else style="width: 100%" />
         </div>
-        <div v-else style="height: 82%; width: 100%">
+        <div v-else style="height: 78%; width: 100%">
           <analysis-graph ref="analysisGraphRef" v-if="isGraph" style="height: 100%; width: 100%" />
           <analysis-table ref="analysisTableRef" v-else />
         </div>
@@ -110,4 +120,22 @@
     display: inline-block;
     padding-right: 10px;
   }
+  ::v-deep .ant-tabs-tab {
+    font-weight: bold; /* 选中标签的加粗 */
+    // font-size: 16px;
+    // letter-spacing: 1.33px;
+    color: #666666 !important;
+  }
+  ::v-deep .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
+    // background-color: #f0f0f0; /* 自定义选中背景色 */
+    // color: #1890ff; /* 自定义选中文字颜色 */
+    // border-radius: 5px; /* 选中标签的圆角 */
+    // font-weight: bold; /* 选中标签的加粗 */
+
+    color: #000000 !important;
+  }
+
+  ::v-deep .ant-tabs-tab:hover {
+    color: #000000; /* 悬停时的文字颜色 */
+  }
 </style>
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
index 11c127f..e50637d 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
@@ -55,7 +55,7 @@
         placeholder="请选择能耗类型"
         :style="{
           top: '100px',
-          left: `${divWidth + 40}px`,
+          left: `${divWidth + 55}px`,
           zIndex: 9,
           position: 'absolute',
           width: `${divWidth}px`,
@@ -67,7 +67,7 @@
         placeholder="请选择日期类型"
         :style="{
           top: '100px',
-          left: `${divWidth * 2 + 50}px`,
+          left: `${divWidth * 2 + 65}px`,
           zIndex: 9,
           position: 'absolute',
           width: `${divWidth}px`,
@@ -77,7 +77,7 @@
       <a-range-picker
         :style="{
           top: '100px',
-          left: `${divWidth * 3 + 60}px`,
+          left: `${divWidth * 3 + 75}px`,
           zIndex: 9,
           position: 'absolute',
           width: `${divWidth}px`,
@@ -90,7 +90,7 @@
       <a-date-picker
         :style="{
           top: '100px',
-          left: `${divWidth * 3 + 60}px`,
+          left: `${divWidth * 3 + 75}px`,
           zIndex: 9,
           position: 'absolute',
           width: `${divWidth}px`,
@@ -103,7 +103,7 @@
         type="primary"
         :style="{
           top: '100px',
-          left: `${divWidth * 4 + 70}px`,
+          left: `${divWidth * 4 + 85}px`,
           zIndex: 9,
           position: 'absolute',
         }"
@@ -601,6 +601,10 @@
   }
   .parent-container {
     // position: relative;
+    border-radius: 10px;
+    background: #ffffff;
+    padding-left: 10px;
+    padding-right: 10px;
     height: 100%;
   }
 
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
index ff4e517..882fcb5 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
@@ -9,7 +9,7 @@
           height: 35%;
           width: 100%;
           padding: 2%;
-          box-shadow: 0 0 0 2px rgba(218, 218, 218, 0.5);
+          box-shadow: 0 0 15px rgba(69, 123, 234, 0.2);
           border-radius: 10px;
           background: #ffffff;
         ">
@@ -59,7 +59,7 @@
           height: 62%;
           margin-top: 4%;
           padding: 2%;
-          box-shadow: 0 0 0 2px rgba(218, 218, 218, 0.5);
+          box-shadow: 0 0 15px rgba(69, 123, 234, 0.2);
           border-radius: 10px;
           background: #ffffff;
         ">
@@ -127,7 +127,7 @@
           height: 100%;
           margin-left: 20px;
           padding: 1%;
-          box-shadow: 0 0 0 2px rgba(218, 218, 218, 0.5);
+          box-shadow: 0 0 15px rgba(69, 123, 234, 0.2);
           border-radius: 10px;
           background: #ffffff;
         ">
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
index fbf6225..7dabdd5 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
@@ -1,7 +1,9 @@
 <template>
-  <div style="background: #f2f6fd; width: 100%; height: 100%">
+  <div style="width: 100%; height: 100%">
     <div style="display: flex">
-      <a-tabs v-model:activeKey="activeKey" style="height: 5%; width: 100%; background: #ffffff">
+      <a-tabs
+        v-model:activeKey="activeKey"
+        style="height: 5%; width: 100%; margin-top: 0.5%; background: #ffffff">
         <a-tab-pane key="1" tab="综合数据" />
         <a-tab-pane key="2" tab="历史数据" />
         <a-tab-pane key="3" tab="平均数据" />

From df589c5a8ebe6b6b68ad65ae462111fb96bc11e6 Mon Sep 17 00:00:00 2001
From: fks-yangshouda <yangshoudamhy@163.com>
Date: Thu, 15 Aug 2024 16:25:13 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitor/energyMonitor/analysisGraph/index.vue  | 17 ++++++++++++-
 .../src/view/monitor/energyMonitor/tree/index.vue  | 29 ++++++++++++++++++++--
 .../src/view/monitor/environmentMonitor/index.vue  | 21 +++++++++++++++-
 3 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue
index 77aeba6..d3a9f89 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/analysisGraph/index.vue
@@ -556,4 +556,19 @@
     },
   });
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+  ::v-deep .ant-radio-button-wrapper-checked {
+    border: none !important; /* 移除选中时的边框 */
+    box-shadow: none !important; /* 移除选中时的阴影 */
+    background-color: #2778ff !important; /* 使用 !important 强制覆盖背景颜色 */
+    color: #ffffff !important; /* 使用 !important 强制覆盖文字颜色 */
+  }
+  /* 未选中时的颜色 */
+  ::v-deep .ant-radio-button-wrapper {
+    // border: none !important; /* 移除所有边框 */
+    box-shadow: none !important; /* 去掉阴影（如果有的话） */
+    background-color: #f9f9f9;
+    color: #2778ff;
+    border-color: #2778ff;
+  }
+</style>
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
index e50637d..7f77d44 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
@@ -11,10 +11,17 @@
       v-model:value="mode"
       @change="changeMode"
       style="padding-bottom: 10px; width: 100%">
-      <a-radio-button value="0" style="width: 50%; text-align: center" :disabled="shebei">
+      <a-radio-button
+        value="0"
+        style="width: 47.5%; margin-right: 2.5%; text-align: center; border-radius: 4px"
+        :disabled="shebei">
         设备
       </a-radio-button>
-      <a-radio-button value="1" style="width: 50%; text-align: center">节点</a-radio-button>
+      <a-radio-button
+        value="1"
+        style="width: 47.5%; margin-left: 2.5%; text-align: center; border-radius: 4px"
+        >节点</a-radio-button
+      >
     </a-radio-group>
     <a-input
       v-model:value="deviceName"
@@ -614,4 +621,22 @@
   //   width: 100%;
   //   margin-bottom: 10px;
   // }
+  /* 选中状态的背景色和文字颜色 */
+  ::v-deep .ant-radio-button-wrapper-checked {
+    border: none !important; /* 移除选中时的边框 */
+    box-shadow: none !important; /* 移除选中时的阴影 */
+    background-color: #ecf3ff !important; /* 使用 !important 强制覆盖背景颜色 */
+    color: #4388fb !important; /* 使用 !important 强制覆盖文字颜色 */
+  }
+  /* 未选中时的颜色 */
+  ::v-deep .ant-radio-button-wrapper {
+    border: none !important; /* 移除所有边框 */
+    box-shadow: none !important; /* 去掉阴影（如果有的话） */
+    background-color: #f9f9f9;
+    // color: #333333;
+  }
+
+  .ant-radio-button-wrapper:not(:first-child)::before {
+    width: 0;
+  }
 </style>
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
index 7dabdd5..bd898d2 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
@@ -446,4 +446,23 @@
     queryDeviceInfoListPage();
   });
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+  ::v-deep .ant-tabs-tab {
+    font-weight: bold; /* 选中标签的加粗 */
+    // font-size: 16px;
+    // letter-spacing: 1.33px;
+    color: #666666 !important;
+  }
+  ::v-deep .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
+    // background-color: #f0f0f0; /* 自定义选中背景色 */
+    // color: #1890ff; /* 自定义选中文字颜色 */
+    // border-radius: 5px; /* 选中标签的圆角 */
+    // font-weight: bold; /* 选中标签的加粗 */
+
+    color: #000000 !important;
+  }
+
+  ::v-deep .ant-tabs-tab:hover {
+    color: #000000; /* 悬停时的文字颜色 */
+  }
+</style>

From 0f81a21cb5380eb17d1bf209b0aab27f70fa5312 Mon Sep 17 00:00:00 2001
From: fks-yangshouda <yangshoudamhy@163.com>
Date: Thu, 15 Aug 2024 17:02:54 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E4=B8=AD=E5=BF=83=20-=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=B5=8B=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?type=E5=8F=82=E6=95=B0=200=EF=BC=9A=E6=9F=A5=E7=9C=8B=EF=BC=8C1?=
 =?UTF-8?q?=EF=BC=9A=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/api/monitor.ts                            | 2 +-
 hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hx-ai-intelligent/src/api/monitor.ts b/hx-ai-intelligent/src/api/monitor.ts
index 7681b71..e4076b1 100644
--- a/hx-ai-intelligent/src/api/monitor.ts
+++ b/hx-ai-intelligent/src/api/monitor.ts
@@ -1,7 +1,7 @@
 // 设备监测
 export enum deviceMonitor {
   getDeviceGraph = '/carbon-smart/api/monitor/getDeviceGraph',
-  getDevicePointToMonitor = '/carbon-smart//api/monitor/getDevicePointToMonitor',
+  getDevicePointToMonitor = '/carbon-smart/api/monitor/getDevicePointToMonitor',
 }
 
 // 能耗监测
diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
index 826eeb1..7f849cf 100644
--- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue
@@ -212,6 +212,7 @@
             .post(deviceMonitor.getDevicePointToMonitor, {
               deviceIds: checkedKeys.value,
               orgId: orgId.value,
+              type: 0,
             })
             .then((res) => {
               if (res.retcode == 0) {