From 6278e3ff1763bf2db40563ff1e7fdbdc43e2db8c Mon Sep 17 00:00:00 2001
From: fks-yangshouda <yangshoudamhy@163.com>
Date: Tue, 16 Jul 2024 15:31:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1.=E7=9B=91=E6=8E=A7=E4=B8=AD=E5=BF=83=20-?=
 =?UTF-8?q?=20=E7=8E=AF=E5=A2=83=E7=9B=91=E6=B5=8B=20=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E6=8C=87=E6=95=B0=E5=88=86=E6=9E=90=E6=B7=BB=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=83=A8=E5=88=86=202.=E4=BF=AE=E6=94=B9=20=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E4=B8=AD=E5=BF=83=20-=20=E8=83=BD=E8=80=97=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B=E5=B7=A6=E4=BE=A7=E6=A0=91=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/view/monitor/energyMonitor/tree/index.vue  |  48 +++----
 .../environmentMonitor/aggregateData/index.vue     | 160 ++++++++++++++++++++-
 2 files changed, 178 insertions(+), 30 deletions(-)

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 f6e8062..b599c83 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
@@ -40,18 +40,22 @@
     <div class="fixed-bottom">
       <a-divider />
       <a-select
-        v-model:value="frequencyValue"
-        placeholder="请选择采集频率"
+        v-model:value="dateTypeValue"
+        placeholder="请选择日期类型"
         style="width: 100%; margin-bottom: 10px"
         :options="options2" />
-      <a-range-picker
+      <a-date-picker
+        style="width: 100%; margin-bottom: 10px"
+        v-model:value="dateValue"
+        :picker="dateTypeValue" />
+      <!-- <a-range-picker
         :value="hackValue || dateRange"
         :disabled-date="disabledDate"
         @change="onChange"
         @openChange="onOpenChange"
         @calendarChange="onCalendarChange"
         style="width: 100%; margin-bottom: 10px"
-        :placeholder="['请选择日期', '请选择日期']" />
+        :placeholder="['请选择日期', '请选择日期']" /> -->
       <a-button type="primary" style="width: 100%; margin-bottom: 10px" @click="getSelect">
         查询
       </a-button>
@@ -89,15 +93,15 @@
 
       // 能耗类型list
       const options1 = ref<SelectProps['options']>([]);
-      // 采集频率list
+      // 日期类型list
       const options2 = ref<SelectProps['options']>([]);
       const mode = ref<String>('1');
       // 能耗类型
       const selectedValue = ref<string | number | null | undefined>();
-      // 采集频率
-      const frequencyValue = ref<string | undefined>();
+      // 日期类型
+      const dateTypeValue = ref<string | undefined>();
       // 时间
-      const dateRange = ref<[Dayjs, Dayjs] | undefined>();
+      const dateValue = ref<[Dayjs, Dayjs] | undefined>();
 
       // 页面初始化参数
       const getOptionsList = async () => {
@@ -115,20 +119,12 @@
         }
         options2.value = [
           {
-            value: '1',
-            label: '5分钟',
-          },
-          {
-            value: '2',
-            label: '10分钟',
+            value: 'month',
+            label: '月',
           },
           {
-            value: '3',
-            label: '30分钟',
-          },
-          {
-            value: '4',
-            label: '1小时',
+            value: 'year',
+            label: '年',
           },
         ];
       };
@@ -691,9 +687,9 @@
         }
       };
 
-      const onChange = (val: RangeValue) => {
-        dateRange.value = val;
-      };
+      // const onChange = (val: RangeValue) => {
+      //   dateRange.value = val;
+      // };
 
       const onCalendarChange = (val: RangeValue) => {
         dates.value = val;
@@ -716,8 +712,8 @@
         options2,
         mode,
         selectedValue,
-        frequencyValue,
-        dateRange,
+        dateTypeValue,
+        dateValue,
         getOptionsList,
         getSelect,
         getSelect11,
@@ -725,7 +721,7 @@
         disabledDate,
         onCalendarChange,
         onOpenChange,
-        onChange,
+        // onChange,
         hackValue,
         treeLoading,
         changeEnergyType,
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 1536c37..1831fc5 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/multi-word-component-names -->
 <template>
   <a-row type="flex" style="height: 100%; width: 96%; margin: 2%">
     <a-col :span="6">
@@ -59,7 +60,8 @@
                 align-items: center;
               ">
               <!-- <ns-icon :name="item.iconName" size="50" /> -->
-              <img :src="item.iconName" alt="" width="48px" height="48px" />
+
+              <img :src="item.iconName" alt="" style="width: 48px; height: 48px" />
               <div
                 style="
                   font-family: '微软雅黑', sans-serif;
@@ -106,8 +108,42 @@
           padding: 1%;
           box-shadow: 0 0 0 2px rgba(218, 218, 218, 0.5);
           border-radius: 10px;
-        "
-        >环境指数分析 <div ref="hotChartRef" style="width: 100%; height: 95%"></div
+        ">
+        <div style="width: 100%; display: flex"
+          ><div style="width: 20%">环境指数分析</div>
+          <div style="width: 80%; float: right; padding-right: 40px">
+            <a-select
+              v-model:value="typeValue"
+              placeholder="请选择环境参数"
+              style="width: 20%"
+              :options="typeList" />
+            <a-tree-select
+              v-model:value="quyuvalue"
+              style="width: 20%; margin-left: 10px"
+              :tree-data="treeData2"
+              tree-checkable
+              allow-clear
+              placeholder="请选择区域"
+              tree-node-filter-prop="label"
+              :maxTagCount="1" />
+            <a-select
+              v-model:value="frequencyValue"
+              placeholder="请选择采集频率"
+              style="width: 20%; margin-left: 10px"
+              :options="frequencyOptions" />
+            <a-date-picker style="width: 20%; margin-left: 10px" v-model:value="timeValue" />
+            <!-- <a-range-picker
+            :value="hackValue || dateRange"
+            :disabled-date="disabledDate"
+            @change="onChange"
+            @openChange="onOpenChange"
+            @calendarChange="onCalendarChange"
+            style="width: 100%; margin-bottom: 10px"
+            :placeholder="['请选择日期', '请选择日期']" /> -->
+            <a-button type="primary" style="margin-left: 10px" @click="getSelect"> 查询 </a-button>
+          </div>
+        </div>
+        <div ref="hotChartRef" style="width: 100%; height: 95%"></div
       ></div>
 
       <!-- </div> -->
@@ -124,16 +160,30 @@
 <script lang="ts" setup>
   import { ref, onMounted } from 'vue';
   import * as echarts from 'echarts';
-  import { Progress } from 'ant-design-vue';
+  import { Progress, SelectProps, TreeSelectProps } from 'ant-design-vue';
+  import type { Dayjs } from 'dayjs';
   defineOptions({
     name: 'AggregateData', // 与页面路由name一致缓存才可生效
   });
 
+  // 采集频率
+  const frequencyValue = ref<string | undefined>();
+
+  const quyuvalue = ref<string[]>([]);
+
+  // 采集频率list
+  const frequencyOptions = ref<SelectProps['options']>([]);
+
   const ringChartRef = ref(null);
   const hotChartRef = ref(null);
 
   const ringData = ref();
   const averageData = ref();
+  const typeList = ref();
+  const typeValue = ref();
+
+  const treeData2 = ref<TreeSelectProps['treeData']>([]);
+  const timeValue = ref<Dayjs>();
 
   // 圆环图
   let ringChar: echarts.ECharts | null = null;
@@ -142,6 +192,102 @@
   const sum = ref(0);
 
   onMounted(() => {
+    frequencyOptions.value = [
+      {
+        value: '1',
+        label: '5分钟',
+      },
+      {
+        value: '2',
+        label: '10分钟',
+      },
+      {
+        value: '3',
+        label: '30分钟',
+      },
+      {
+        value: '4',
+        label: '1小时',
+      },
+      {
+        value: '5',
+        label: '天',
+      },
+    ];
+    typeList.value = [
+      {
+        id: 1,
+        value: '温度',
+      },
+      {
+        id: 2,
+        value: 'CO2浓度',
+      },
+      {
+        id: 3,
+        value: 'PM2.5',
+      },
+      {
+        id: 4,
+        value: '光照度',
+      },
+      {
+        id: 5,
+        value: 'TVOC',
+      },
+      {
+        id: 6,
+        value: '湿度',
+      },
+    ];
+    treeData2.value = [
+      {
+        label: '办公区',
+        value: '0-0',
+        children: [
+          {
+            label: '办公一区',
+            value: '0-0-0',
+          },
+          {
+            label: '办公二区',
+            value: '0-0-1',
+          },
+          {
+            label: '办公三区',
+            value: '0-0-2',
+          },
+          {
+            label: '办公四区',
+            value: '0-0-3',
+          },
+        ],
+      },
+      {
+        label: '站厅',
+        value: '0-1',
+
+        children: [
+          {
+            label: '站厅一区',
+            value: '0-1-0',
+            // disabled: true,
+          },
+          {
+            label: '站厅二区',
+            value: '0-1-1',
+          },
+          {
+            label: '站厅三区',
+            value: '0-1-2',
+          },
+          {
+            label: '站厅四区',
+            value: '0-1-3',
+          },
+        ],
+      },
+    ];
     // 接口获取设备状态数据
     ringData.value = [
       {
@@ -157,6 +303,7 @@
     ];
     averageData.value = [
       {
+        id: 1,
         name: '温度',
         value: 28.55,
         unit: '℃',
@@ -164,6 +311,7 @@
           'data:image/png;base64,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',
       },
       {
+        id: 2,
         name: 'CO2浓度',
         value: 456,
         unit: 'ppm',
@@ -171,6 +319,7 @@
           'data:image/png;base64,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',
       },
       {
+        id: 3,
         name: 'PM2.5',
         value: 61.51,
         unit: 'μg/m³',
@@ -178,6 +327,7 @@
           '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==',
       },
       {
+        id: 4,
         name: '光照度',
         value: 60,
         unit: 'lux',
@@ -185,6 +335,7 @@
           'data:image/png;base64,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',
       },
       {
+        id: 5,
         name: 'TVOC',
         value: 245,
         unit: 'mg/m³',
@@ -192,6 +343,7 @@
           'data:image/png;base64,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',
       },
       {
+        id: 6,
         name: '湿度',
         value: 43,
         unit: '%',

From 5eba9a35a0e5b68688013453fdb8dc00d8243adb Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Tue, 16 Jul 2024 15:36:47 +0800
Subject: [PATCH 2/3] taskid:084 remark:'commit'

---
 .../src/api/carbonEmissionFactorLibrary.ts         |  11 +
 .../carbonEmissionFactorLibrary/index.vue          | 243 ++++++++++---
 .../carbonEmissionStatistics/config.ts             |  42 ++-
 .../energyConsumption/index.vue                    |   1 +
 .../quickCalculation/index copy.vue                | 401 ---------------------
 .../quickCalculation/index.vue                     | 188 ++++++----
 6 files changed, 368 insertions(+), 518 deletions(-)
 delete 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 7783915..aaad9c2 100644
--- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
+++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
@@ -11,6 +11,9 @@ export enum carbonEmissionFactorLibrary {
   // 单位管理
   dictionaryUnitManagement = '/carbon-smart/api/carbon/emission/factor/dictionaryUnitManagement',
   findOutermost = '/carbon-smart/api/carbon/emission/factor/findOutermost',
+  createDictionary = '/carbon-smart/api/carbon/emission/factor/createDictionary',
+  updateDictionary = '/carbon-smart/api/carbon/emission/factor/updateDictionary',
+  delDictionary = '/carbon-smart/api/carbon/emission/factor/delDictionary',
 }
 // 碳排管理-碳排统计接口
 export enum energyConsumption {
@@ -20,4 +23,12 @@ export enum energyConsumption {
   creat = '/carbon-smart/api/carbon/stats/creat',
   update = '/carbon-smart/api/carbon/stats/update',
   del = '/carbon-smart/api/carbon/stats/del',
+}
+// 碳排管理-碳排速算接口
+export enum quickCalculation {
+  carbonQuickTree = '/carbon-smart/api/carbon/energy/correlation/carbonQuickTree',
+  queryCarbonEmissionPage = '/carbon-smart/api/carbon/energy/correlation/queryCarbonEmissionPage',
+  creat = '/carbon-smart/api/carbon/energy/correlation/creat',
+  update = '/carbon-smart/api/carbon/energy/correlation/update',
+  del = '/carbon-smart/api/carbon/energy/correlation/del',
 }
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index 94b132f..cf05dbf 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -46,18 +46,18 @@
                 </span>
                 <span v-else>{{ data.emissionName }}</span>
               </div>
-              <a-popover placement="rightTop" trigger="focus">
-                <template #content>
-                  <div style="display: flex;flex-direction: column;">
-                    <a-button type="text" @click="editTreeNodeData">编辑</a-button>
-                    <a-button type="text" @click="addTreeNodeData">新增子节点</a-button>
-                    <a-button type="text">上移</a-button>
-                    <a-button type="text">下移</a-button>
-                    <a-button type="text" @click="deleteTreeNode">删除</a-button>
-                  </div>
+              <a-dropdown>
+                <ns-icon name="actionMore" size="14" class="actionMore" />
+                <template #overlay>
+                  <a-menu>
+                    <a-menu-item @click="editTreeNodeData">编辑</a-menu-item>
+                    <a-menu-item @click="addTreeNodeData">新增子节点</a-menu-item>
+                    <a-menu-item>上移</a-menu-item>
+                    <a-menu-item>下移</a-menu-item>
+                    <a-menu-item @click="deleteTreeNode">删除</a-menu-item>
+                  </a-menu>
                 </template>
-                <MoreOutlined class="actionMore" />
-              </a-popover>
+              </a-dropdown>
             </div>
           </template>
         </a-tree>
@@ -107,61 +107,89 @@
       title="单位管理"
       @close="closeUnitManag">
       <div class="addButton">
-        <a-button type="primary">新增分组</a-button>
-        <a-button type="primary">新增单位</a-button>
+        <a-button type="primary" @click="addGroup">新增分组</a-button>
+        <a-button type="primary" @click="addUnit">新增单位</a-button>
       </div>
       <div class="treePart">
         <div style="width: 100%;height: 7%;display: flex;justify-content: center;align-items: center;">
           <a-select
             ref="select"
-            :value="unitTreeParams.cnValue"
+            :value="unitTreeParams.id"
+            allowClear
             style="width: 96%"
             placeholder="选择分组"
             @change="handleChange"
           >
-            <a-select-option v-for="(item, index) in groupData" :key="index" :value="item.cnValue">
+            <a-select-option v-for="(item, index) in groupData" :key="index" :value="item.id">
               {{ item.cnValue }}
             </a-select-option>
           </a-select>
         </div>
         <a-tree
-          :expandedKeys="unitExpandedKeys"
+          :expanded-keys="unitExpandedKeys"
           :selectedKeys="unitSelectedKeys"
           :tree-data="unitTreeData"
           v-if="unitTreeData && unitTreeData.length > 0"
-        >
+          class="draggable-tree"
+          block-node>
           <template #title="data">
             <div class="treeRow">
               <div>
                 <span>{{ data.cnValue }}</span>
               </div>
-              <a-popover placement="rightTop" trigger="focus">
-                <template #content>
-                  <div style="display: flex;flex-direction: column;">
-                    <a-button type="text" @click="editTreeNodeData">编辑</a-button>
-                    <a-button type="text" @click="addTreeNodeData">新增子节点</a-button>
-                    <a-button type="text">上移</a-button>
-                    <a-button type="text">下移</a-button>
-                    <a-button type="text" @click="deleteTreeNode">删除</a-button>
-                  </div>
-                </template>
-                <MoreOutlined class="actionMore" />
-              </a-popover>
+              <div class="actionMore">
+                <EditOutlined v-if="!data.parentId" @click="editGroup(data)" />
+                <EditOutlined v-else @click="editUnit(data)" />
+                <MinusCircleOutlined style="margin-left: 6px;" @click="delUnit(data)" />
+                <PlusCircleOutlined v-if="!data.parentId" style="margin-left: 6px;" @click="addUnit(data)" />
+              </div>
             </div>
           </template>
         </a-tree>
       </div>
       <template #footer>
         <a-button style="margin-right: 8px" @click="closeUnitManag">取消</a-button>
-        <a-button type="primary" @click="onEdit">确定</a-button>
       </template>
     </a-drawer>
+    <!-- 新增分组管理 -->
+    <ns-modal :visible="addGroupManage" :title="addGroupTitle" @ok="unitOrGroupOk" @cancel="groupCancel">
+      <a-form
+        ref="unitFormRef"
+        :model="formState"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-item label="分组名称" name="cnValue" :required="true">
+          <a-input v-model:value="formState.cnValue" placeholder="请输入分组名称" />
+        </a-form-item>
+      </a-form>
+    </ns-modal>
+    <!-- 新增单位 -->
+    <ns-modal :visible="addUnitManage" :title="addUnitTitle" @ok="unitOrGroupOk" @cancel="unitCancel">
+      <a-form
+        ref="unitFormRef"
+        :model="formState"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-item label="单位名称" name="cnValue" :required="true">
+          <a-input v-model:value="formState.cnValue" placeholder="请输入单位名称" />
+        </a-form-item>
+        <a-form-item label="选择分组" name="parentId" :required="true">
+          <a-select v-model:value="formState.parentId" placeholder="请选择所属分组" :disabled="canSelect">
+            <a-select-option v-for="(item, index) in groupData" :key="index" :value="item.id">
+              {{ item.cnValue }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-form>
+    </ns-modal>
   </div>
 </template>
 <script lang="ts" setup>
-  import { MoreOutlined,ExclamationCircleOutlined  } from '@ant-design/icons-vue';
+  import { MoreOutlined,ExclamationCircleOutlined,EditOutlined,PlusCircleOutlined,MinusCircleOutlined } from '@ant-design/icons-vue';
   import { Modal } from 'ant-design-vue';
-  import { computed, createVNode, defineComponent, reactive, ref, watchEffect,watch } from 'vue';
+  import { computed, createVNode, defineComponent, reactive, ref, watchEffect,watch,toRaw } from 'vue';
   import { http } from '/nerv-lib/util/http';
   import { NsMessage, NsModal } from '/nerv-lib/component';
   import { formConfig, formConfig2 } from './config';
@@ -215,7 +243,7 @@
   const y = 2;
   const z = 1;
   const genData: TreeProps['treeData'] = [];
-  const checkedTreeNodeKeys = ref<string[]>(['0-0']);
+  const checkedTreeNodeKeys = ref<string[]>();
 
   const generateData = (_level: number, _preKey?: string, _tns?: TreeProps['treeData']) => {
     const preKey = _preKey || '0';
@@ -423,15 +451,15 @@
     fetch(carbonEmissionFactorLibrary.getCarbonFactorTree, params).then((res) => {
       gData.value = res.data
       // 找到匹配的节点数据
-      const selectedNodes = [];
-      checkedTreeNodeKeys.value.forEach(key => {
-        const [parentId, childId] = key.split('-').map(Number);
-        if (parentId >= 0 && childId >= 0 && gData.value[parentId]?.children?.[childId]) {
-          selectedNodes.push(gData.value[parentId]);
-        }
-      });
+      // const selectedNodes = [];
+      // checkedTreeNodeKeys.value.forEach(key => {
+      //   const [parentId, childId] = key.split('-').map(Number);
+      //   if (parentId >= 0 && childId >= 0 && gData.value[parentId]?.children?.[childId]) {
+      //     selectedNodes.push(gData.value[parentId]);
+      //   }
+      // });
       // 获取默认选中节点的所有id
-      getDefaultIds(selectedNodes)
+      // getDefaultIds(selectedNodes)
     });
   };
   const defaultIds = ref([])
@@ -494,6 +522,9 @@
     userAuthList.value.splice(0);
   };
   const closeUnitManag = () => {
+    unitTreeParams.value = {
+      grp: 'MEASUREMENT_UNIT'
+    }
     unitManagement.value = false;
   };
   const onEdit = () => {
@@ -573,9 +604,7 @@
           fetch(carbonEmissionFactorLibrary.findOutermost).then((res) => {
             groupData.value = res.data
           });
-          fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, unitTreeParams.value).then((res) => {
-            unitTreeData.value = res.data
-          });
+          getUnitTree()
         },
       },
     ],
@@ -770,10 +799,134 @@
   const groupData = ref([])
   const unitTreeData = ref<TreeProps['treeData']>(genData);
   const handleChange = (value: string) => {
-    unitTreeParams.value.cnValue = value
+    unitTreeParams.value.id = value
+    getUnitTree()
+  };
+  const getUnitTree = () => {
     fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, unitTreeParams.value).then((res) => {
       unitTreeData.value = res.data
     });
+  }
+  // 新增单位管理
+  const labelCol = { span: 5 };
+  const wrapperCol = { span: 19 };
+  const unitFormRef = ref();
+  const addGroupManage = ref(false);
+  const addUnitManage = ref(false);
+  const canSelect = ref(false);
+  const formState = ref({
+    grp: 'MEASUREMENT_UNIT',
+    grpDesc: '计量单位',
+  })
+  const addGroupTitle = ref<string>('新增分组');
+  const addUnitTitle = ref<string>('新增单位');
+  const addGroup = () => {
+    addGroupTitle.value = '新增分组'
+    addGroupManage.value = true
+  };
+  const editGroup = (data) => {
+    addGroupTitle.value = '编辑分组'
+    addGroupManage.value = true
+    formState.value.id = data.id
+    formState.value.cnValue = data.cnValue
+  };
+  const groupCancel = () => {
+    addGroupManage.value = false
+    unitFormRef.value.resetFields();
+    formState.value = {
+      grp: 'MEASUREMENT_UNIT',
+      grpDesc: '计量单位',
+    }
+  };
+  const addUnit = (data) => {
+    if(data.id){
+      canSelect.value = true
+      formState.value.parentId = data.id
+    }else{
+      canSelect.value = false
+    }
+    fetch(carbonEmissionFactorLibrary.findOutermost).then((res) => {
+      groupData.value = res.data
+    });
+    addUnitTitle.value = '新增单位'
+    addUnitManage.value = true
+  };
+  const editUnit = (data) => {
+    addUnitTitle.value = '编辑单位'
+    addUnitManage.value = true
+    canSelect.value = true
+    formState.value.parentId = data.parentId
+    formState.value.id = data.id
+    formState.value.cnValue = data.cnValue
+  };
+  const unitCancel = () => {
+    addUnitManage.value = false
+    unitFormRef.value.resetFields();
+    formState.value = {
+      grp: 'MEASUREMENT_UNIT',
+      grpDesc: '计量单位',
+    }
+  };
+  const unitOrGroupOk = () => {
+    unitFormRef.value
+      .validate()
+      .then(() => {
+        console.log('values', formState, toRaw(formState));
+        if(formState.value.id){
+          fetch(carbonEmissionFactorLibrary.updateDictionary, formState.value).then((res) => {
+            unitTreeData.value = res.data
+            if(formState.value.parentId){
+              addUnitManage.value = false
+            }else{
+              addGroupManage.value = false
+            }
+            unitFormRef.value.resetFields();
+            formState.value = {
+              grp: 'MEASUREMENT_UNIT',
+              grpDesc: '计量单位',
+            }
+            getUnitTree()
+          });
+        }else{
+          fetch(carbonEmissionFactorLibrary.createDictionary, formState.value).then((res) => {
+            unitTreeData.value = res.data
+            if(formState.value.parentId){
+              addUnitManage.value = false
+            }else{
+              addGroupManage.value = false
+            }
+            unitFormRef.value.resetFields();
+            formState.value = {
+              grp: 'MEASUREMENT_UNIT',
+              grpDesc: '计量单位',
+            }
+            getUnitTree()
+          });
+        }
+      })
+      .catch(error => {
+        console.log('error', error);
+      });
+  };
+  // 删除单位管理的树节点
+  const delUnit = (data) => {
+    formState.value.id = data.id
+    Modal.confirm({
+      title: '警告',
+      content: '确定要删除吗?',
+      okText: '确定',
+      okType: 'primary',
+      cancelText: '取消',
+      onOk() {
+        fetch(carbonEmissionFactorLibrary.delDictionary , formState.value).then((res) => {
+          message.success('操作成功！');
+          getUnitTree()
+        });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
   };
 
 </script>
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index 09b276d..6c8fd15 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -87,36 +87,56 @@ export const columns = [
   },
   {
     title: '因子值',
-    dataIndex: 'energyType',
+    dataIndex: 'emissionFactors',
   },
   {
     title: '计量单位',
-    className: 'unit',
-    dataIndex: 'unit',
+    className: 'carbonEmissionSuffix',
+    dataIndex: 'carbonEmissionSuffix',
   },
   {
     title: '更新时间',
-    className: 'unit',
-    dataIndex: 'unit',
+    className: 'updateTime',
+    dataIndex: 'updateTime',
   },
   {
     title: '启用时间',
-    className: 'unit',
-    dataIndex: 'unit',
+    className: 'startTime ',
+    dataIndex: 'startTime ',
   },
   {
     title: '结束时间',
-    className: 'unit',
-    dataIndex: 'unit',
+    className: 'endTime',
+    dataIndex: 'endTime',
   },
   {
     title: '数据来源',
-    className: 'unit',
-    dataIndex: 'unit',
+    className: 'dataSources',
+    dataIndex: 'dataSources',
   },
   {
     title: '操作',
     key: 'action',
     width: 130
   },
+];
+export const drawerColumns = [
+  {
+    title: '名称',
+    dataIndex: 'emissionSources',
+  },
+  {
+    title: '因子值',
+    dataIndex: 'emissionFactors',
+  },
+  {
+    title: '排放环节',
+    className: 'emissionProcess',
+    dataIndex: 'emissionProcess',
+  },
+  {
+    title: '数据来源',
+    className: 'dataSources',
+    dataIndex: 'dataSources',
+  },
 ];
\ No newline at end of file
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 0e88f8d..7026fdb 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -181,6 +181,7 @@
   const queryParams = ref({
     pageNum: 1,
     pageSize: 10,
+    orgId: orgId.value,
   })
   const isRequired = ref(false);
   const visible = ref(false);
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
deleted file mode 100644
index 81d30db..0000000
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue	
+++ /dev/null
@@ -1,401 +0,0 @@
-<!-- @format -->
-
-<template>
-  <div class="main">
-    <div class="left">
-      <div class="top">
-        <a-form style="width: 100%;margin: 0 auto;">
-          <div class="ns-form-title"><span>排放分类</span></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="selectTreeDataValue"
-                  placeholder="请输入关键词"
-                  @search="onSearchTreeData"
-                />
-              </a-col>
-            </a-row>
-          </div>
-        </a-form>
-        <a-tree
-          v-if="gData && gData.length > 0"
-          class="draggable-tree"
-          style="padding: 0 16px !important;"
-          show-line
-          block-node
-          :tree-data="gData"
-          :checkedKeys="checkedTreeNodeKeys"
-          :selectedKeys="selectedKeys"
-          @check="checkTreeNode"
-          @select="onSelect"
-          :expanded-keys="expandedKeys"
-          :auto-expand-parent="autoExpandParent"
-          @expand="onExpand">
-           <template #title="{ emissionName }">
-            <span v-if="emissionName && selectTreeDataValue && emissionName.indexOf(selectTreeDataValue) > -1">
-              {{ emissionName.substring(0, emissionName.indexOf(selectTreeDataValue)) }}
-              <span style="color: #f50">{{ selectTreeDataValue }}</span>
-              {{ emissionName.substring(emissionName.indexOf(selectTreeDataValue) + selectTreeDataValue.length) }}
-            </span>
-            <span v-else>{{ emissionName }}</span>
-          </template>
-        </a-tree>
-      </div>
-    </div>
-    <div class="right">
-      <a-table :columns="columns" :data-source="tableData" bordered :pagination="false">
-        <template #bodyCell="{ column, text }">
-          <template v-if="column.dataIndex === 'name'">
-            <a>{{ text }}</a>
-          </template>
-        </template>
-        <template #title>Header</template>
-      </a-table>
-    </div>
-    <!-- 新增树节点 -->
-    <ns-modal :visible="treeNodeAdd" :title="operationTree" @ok="handleOk" @cancel="handleCancel">
-      <ns-input
-        v-model:value="addTreeNode"
-        class="input"
-        placeholder="请输入排放类型"/>
-    </ns-modal>
-    <!-- 新增数据库数据 -->
-    <a-drawer
-      :width="500"
-      :visible="visible"
-      :body-style="{ paddingBottom: '80px' }"
-      :footer-style="{ textAlign: 'right' }"
-      destroyOnClose
-      @close="onClose">
-      <ns-form
-        ref="formRef"
-        :model="formData"
-        class="form"
-        :wrapperCol="{ span: 20 }"
-        formLayout="vertical" />
-      <template #footer>
-        <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
-        <a-button type="primary" @click="onEdit">确定</a-button>
-      </template>
-    </a-drawer>
-  </div>
-</template>
-<script lang="ts" setup>
-  import { Modal } from 'ant-design-vue';
-  import { computed, createVNode, defineComponent, reactive, ref, watchEffect,watch } from 'vue';
-  import { http } from '/nerv-lib/util/http';
-  import { NsMessage, NsModal } from '/nerv-lib/component';
-  import { carbonEmissionFactorLibrary } from '/@/api/carbonEmissionFactorLibrary';
-  import type {
-    AntTreeNodeDragEnterEvent,
-    AntTreeNodeDropEvent,
-    TreeProps,
-  } from 'ant-design-vue/es/tree';
-import { log } from 'node:console';
-
-  defineOptions({ name: 'QuickCalculation' });
-  const selectTreeDataValue = ref<string>('');
-  const data = reactive({});
-  let formData = ref({});
-  const formRef = ref();
-  const visible = ref(false);
-  const searchValue = ref<string>('');
-  const searchValue2 = ref<string>('');
-  const disabled = ref(false);
-  const treeNodeAdd = ref<boolean>(false);
-  const operationTree = ref<string>('新增');
-
-  const opMap: any = ref({
-    type: 'add',
-    fuc: () => {},
-    record: {},
-  });
-  watchEffect(() => {
-    disabled.value = opMap.value.type === 'edit';
-  });
-  const casData = ref([]);
-  const treeData = ref([]);
-  const userAuthList = ref([]);
-  const orgId = ref('');
-  const result = JSON.parse(sessionStorage.getItem('ORGID')!);
-  orgId.value = result;
-  const dynamicDisabled = computed(() => {
-    return formRef.value?.validateResult && userAuthList.value?.length;
-  });
-  const fetch = (api, params = { orgId }) => {
-    return http.post(api, params);
-  };
-
-  // 树结构
-  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);
-  type TreeDataItem = TreeProps['treeData'][number];
-  const gData = ref<TreeProps['treeData']>(genData);
-  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)[]>([]);
-  const autoExpandParent = ref<boolean>(true);
-
-  const onExpand = (keys: string[]) => {
-    expandedKeys.value = keys;
-    autoExpandParent.value = false;
-  };
-  watch(selectTreeDataValue, 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;
-    selectTreeDataValue.value = value;
-    autoExpandParent.value = true;
-  });
-  // 筛选树结构中的数据
-  const onSearchTreeData = (selectTreeDataValue: string) => {
-    console.log('use value', selectTreeDataValue);
-    console.log('or use this.value', value.value);
-  };
-  // 点击数据点的复选框
-  const checkedIds = ref([])
-  const emissionType = ref()
-  const checkTreeNode = (checkedKeys, info) => {
-    checkedIds.value = []
-    info.checkedNodes.forEach(item=>{
-      checkedIds.value.push(item.id)
-    })
-    sessionStorage.setItem('checkedTreeNode', checkedIds.value);
-    emissionType.value = checkedIds.value.join(',')
-  }
-  // 新增/编辑树节点点击确定
-  const addTreeNode =ref()
-  const handleOk = (e: MouseEvent) => {
-    editTreeNode.value.emissionName = addTreeNode.value
-    http.post(carbonEmissionFactorLibrary.creat,editTreeNode.value).then(() => {
-      getOrgTree()
-      NsMessage.success('操作成功');
-      addTreeNode.value = ''
-      treeNodeAdd.value = false;
-    });
-  };
-  const handleCancel = () => {
-    addTreeNode.value = ''
-    treeNodeAdd.value = false;
-  };
-  // 获取排放分类树
-  const getOrgTree = (params?) => {
-    fetch(carbonEmissionFactorLibrary.getCarbonFactorTree, params).then((res) => {
-      gData.value = res.data
-      // 找到匹配的节点数据
-      const selectedNodes = [];
-      checkedTreeNodeKeys.value.forEach(key => {
-        const [parentId, childId] = key.split('-').map(Number);
-        if (parentId >= 0 && childId >= 0 && gData.value[parentId]?.children?.[childId]) {
-          selectedNodes.push(gData.value[parentId]);
-        }
-      });
-    });
-  };
-  getOrgTree();
-  // 被选中的树节点
-  const editTreeNode = ref({})
-  const onSelect = (selectedKeys: string[], info: any) => {
-    if(info.selected){
-      editTreeNode.value = {
-        id:info.selectedNodes[0].id,
-        level:info.selectedNodes[0].level,
-        dataNumber:info.selectedNodes[0].dataNumber,
-        sortNumber:info.selectedNodes[0].sortNumber,
-        parentEmissionId:info.selectedNodes[0].parentEmissionId,
-      }
-    }
-  };
-
-  const onSearch = () => {
-    console.log(searchValue.value);
-    getOrgTree({ orgName: searchValue.value, orgId });
-  };
-
-  const tableFetch = (params) => {
-    console.log(params, 'sdfasfasdfasdfasdf');
-
-    setTimeout(() => {
-      mainRef.value?.nsTableRef.reload();
-    }, 100);
-  };
-
-  const handleSelect = (selectedKeys: any, info: any) => {
-    fetch(carbonEmissionFactorLibrary.queryDeptTree, { orgId: info.node?.orgInfo.orgId }).then((res) => {
-      treeData2.value = res.data;
-    });
-    tableFetch({ orgId: info.node?.orgInfo.orgId });
-  };
-  const columns = [
-    {
-      title: 'Name',
-      dataIndex: 'name',
-    },
-    {
-      title: 'Cash Assets',
-      className: 'column-money',
-      dataIndex: 'money',
-    },
-    {
-      title: 'Address',
-      dataIndex: 'address',
-    },
-  ];
-
-  const tableData = [
-    {
-      key: '1',
-      name: 'John Brown',
-      money: '￥300,000.00',
-      address: 'New York No. 1 Lake Park',
-    },
-    {
-      key: '2',
-      name: 'Jim Green',
-      money: '￥1,256,000.00',
-      address: 'London No. 1 Lake Park',
-    },
-    {
-      key: '3',
-      name: 'Joe Black',
-      money: '￥120,000.00',
-      address: 'Sidney No. 1 Lake Park',
-    },
-  ];
-
-  const onClose = () => {
-    visible.value = false;
-    formData.value = {};
-    userAuthList.value.splice(0);
-  };
-
-  const onEdit = () => {
-    formRef.value?.triggerSubmit().then(() => {
-      console.log(formData.value, 'formData.value');
-      // if (!userAuthList.value.length) {
-      //   NsMessage.error('请添加用户权限');
-      //   return;
-      // }
-
-      opMap.value.fuc &&
-        opMap.value.fuc({ ...formData.value });
-    });
-  };
-</script>
-<style lang="less" scoped>
-  .main {
-    background-color: @ns-content-bg;
-    display: flex;
-    height: 100%;
-  }
-  .left {
-    width: 300px;
-    // max-height: calc(100vh - 96px);
-    margin-right: @ns-gap;
-    min-width: fit-content;
-    > div {
-      background-color: @white;
-      // box-shadow: @ns-content-box-shadow;
-      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;
-  }
-  ::v-deep .ant-table-container{
-    padding: 0px 16px;
-  }
-  .top {
-    overflow: auto;
-    // height: 50%;
-    // border-bottom: 5px solid rgb(229, 235, 240);
-    // overflow-y: auto;
-  }
-  .ns-form-title{
-    font-weight: bold;
-    user-select: text;
-    padding: 16px;
-    margin-bottom: 16px;
-    padding-bottom: 10px;
-    border-bottom: 1px solid #e9e9e9;
-  }
-</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 f9df2af..4c6d60c 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -17,19 +17,22 @@
           </div>
         </a-form>
         <a-tree
+          v-if="gData && gData.length > 0"
           :expanded-keys="expandedKeys"
           :auto-expand-parent="autoExpandParent"
           :tree-data="gData"
+          show-line
           @expand="onExpand"
+          @select="onSelect"
           style="padding: 0 16px !important;"
         >
-          <template #title="{ title }">
-            <span v-if="title.indexOf(searchValue) > -1">
-              {{ title.substring(0, title.indexOf(searchValue)) }}
+          <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>
-              {{ title.substring(title.indexOf(searchValue) + searchValue.length) }}
+              {{ data.energyType.substring(data.energyType.indexOf(searchValue) + searchValue.length) }}
             </span>
-            <span v-else>{{ title }}</span>
+            <span v-else>{{ data.energyType }}</span>
           </template>
         </a-tree>
       </div>
@@ -66,7 +69,7 @@
         @change="onChange" />
         <!-- 新增/编辑 -->
         <a-drawer
-          :width="500"
+          :width="700"
           :visible="visible"
           :body-style="{ paddingBottom: '80px' }"
           :footer-style="{ textAlign: 'right' }"
@@ -79,35 +82,34 @@
             :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="options" />
-            </a-form-item>
-            <a-form-item label="自动采集节点" name="collectionNode">
-              <a-tree-select
-                v-model:value="formState.collectionNode"
-                :tree-line="true"
-                :tree-data="treeData"
-                tree-node-filter-prop="title"
-              >
-              </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">
-              <a-select v-model:value="formState.emissionType" placeholder="请选择排放类型">
-                <a-select-option v-for="(item, index) in emissionTypeDic" :key="index" :value="item.cnValue">
-                  {{ item.cnValue }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
+          <a-row>
+            <a-col :span="12">
+              <a-form-item ref="name" label="能源种类" name="energyType">
+                <a-range-picker v-model:value="formState.energyType" picker="month" style="width:200px;" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item ref="name" label="排放因子" name="energyType">
+                <ns-input v-model:value="formState.emissionFactors" disabled />
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row>
+            <a-col :span="12">
+              <a-form-item ref="name" label="关键词">
+                <ns-input v-model:value="selectData" />
+              </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>
@@ -118,11 +120,12 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, watch } from 'vue';
+  import { ref, watch, toRaw } from 'vue';
   import type { TreeProps } from 'ant-design-vue';
-  import { Pagination } from 'ant-design-vue';
-  import { columns } from '../config';
+  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';
   defineOptions({
     energyType: 'quickCalculation', // 与页面路由name一致缓存才可生效
     components: {
@@ -203,6 +206,13 @@
     expandedKeys.value = keys;
     autoExpandParent.value = false;
   };
+  // 被选中的树节点
+  const onSelect = (selectedKeys: string[], info: any) => {
+    if(info.selected){
+      queryParams.value.energyType = info.node.id
+      getTableList()
+    }
+  };
 
   watch(searchValue, value => {
     const expanded = dataList
@@ -217,57 +227,113 @@
     searchValue.value = value;
     autoExpandParent.value = true;
   });
+  // 查询因子分类树数据
+  const onSearchTreeData = () => {
+  };
+  // 获取因子分类树数据
+  const getTreeData = () => {
+    fetch(quickCalculation.carbonQuickTree).then((res) => {
+      gData.value = res.data
+    });
+  };
+  getTreeData()
   // 列表数据
   const total = ref<number>()
   const queryParams = ref({
     pageNum: 1,
     pageSize: 10,
+    orgId: orgId.value,
   })
-  const tableData = [
-    {
-      key: '1',
-      name: 'John Brown',
-      money: '￥300,000.00',
-      address: 'New York No. 1 Lake Park',
-    },
-    {
-      key: '2',
-      name: 'Jim Green',
-      money: '￥1,256,000.00',
-      address: 'London No. 1 Lake Park',
-    },
-    {
-      key: '3',
-      name: 'Joe Black',
-      money: '￥120,000.00',
-      address: 'Sidney No. 1 Lake Park',
-    },
-  ];
+  const tableData = ref([]);
+  // 获取列表数据
+  const getTableList = () => {
+    fetch(quickCalculation.queryCarbonEmissionPage,queryParams.value).then((res) => {
+      tableData.value = res.data.records
+      total.value = res.data.total
+    });
+  };
+  getTableList()
   // 分页器
   const onChange = (pageNumber: number,size: number) => {
     queryParams.value.pageNum = pageNumber;
     queryParams.value.pageSize = size;
-    // getTableList()
+    getTableList()
   };
   // 新增/编辑
   const formRef = ref();
-  const labelCol = { span: 5 };
-  const wrapperCol = { span: 19 };
+  const labelCol = { span: 6 };
+  const wrapperCol = { span: 18 };
   const formState = ref({})
   const visible = ref(false);
   
   // 定义form表单的必填
   const rules: Record<string, Rule[]> = {
     energyType: [{ required: true, message: '请输入能源种类', trigger: 'change' }],
-    isComputeCarbon: [{ 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
+  };
+  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 editData = (record) =>{
     visible.value = true
   };
+  // 点击确定提交
+  const onSubmit = () => {
+    formRef.value
+      .validate()
+      .then(() => {
+        console.log('values', formState, toRaw(formState));
+        fetch(quickCalculation.creat,formState.value).then((res) => {
+          console.log(res);
+          
+        });
+      })
+      .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 = [];
     formRef.value.resetFields();
   };
 </script>

From d29c72492019e52d7d5720ea43044adccae953b4 Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Tue, 16 Jul 2024 15:42:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/router/alarmManagement.ts    |  20 ++
 .../energyAlarm/editConfigureEnergyAlarm.vue       |   6 +-
 .../equipmentAlarm/editConfigureDeviceAlarm.vue    |   5 +-
 .../alarmSettings/notificationManagement/index.vue | 166 +++-------
 .../notificationManagement/linkPeople/config.ts    |  22 ++
 .../notificationManagement/linkPeople/index.vue    | 347 +++++++++++++++++----
 .../view/alarmManagement/equipmentAlarm/index.vue  |  28 ++
 .../view/alarmManagement/equipmentAlarm/look.vue   | 283 +++++++++++++++++
 .../equipmentAlarm/notificationManagementMock.json | 108 +++++++
 .../view/alarmManagement/equipmentAlarm/status.vue |  39 +++
 .../alarmManagement/equipmentAlarm/ts/config.ts    | 164 ++++++++++
 11 files changed, 997 insertions(+), 191 deletions(-)
 create mode 100644 hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/config.ts
 create mode 100644 hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/index.vue
 create mode 100644 hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
 create mode 100644 hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/notificationManagementMock.json
 create mode 100644 hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
 create mode 100644 hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts

diff --git a/hx-ai-intelligent/src/router/alarmManagement.ts b/hx-ai-intelligent/src/router/alarmManagement.ts
index 6b8a490..dd930f3 100644
--- a/hx-ai-intelligent/src/router/alarmManagement.ts
+++ b/hx-ai-intelligent/src/router/alarmManagement.ts
@@ -26,6 +26,26 @@ const alarmManagement = {
       ],
     },
     {
+      path: 'equipmentAlarm ',
+      name: 'EquipmentAlarm',
+      meta: { title: '设备告警', hideChildren: true, icon: 'gaojingguanli' },
+      component: Base,
+      redirect: { name: 'equipmentAlarmIndex' },
+      children: [
+        {
+          path: 'index',
+          name: 'equipmentAlarmIndex',
+          // component: () => import('/nerv-lib/saas/view/menuManage/index.vue'),
+          component: () => import('/@/view/alarmManagement/equipmentAlarm/index.vue'),
+          meta: {
+            title: '设备告警',
+            keepAlive: true,
+            // backApi: [],
+          },
+        },
+      ],
+    },
+    {
       path: 'alarmSettings',
       name: 'AlarmSettings',
       meta: { title: '告警设置', hideChildren: true, icon: 'gaojingguanli' },
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
index 2043200..eb35977 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
@@ -229,7 +229,7 @@
         .post(device.queryDevicePage, {
           pageNum: 1,
           pageSize: 999,
-          energyType: selectedOptions[0].cnValue,
+          energyType: selectedOptions[0].dicKey,
           orgId: orgId.value,
         })
         .then((res) => {
@@ -241,7 +241,7 @@
         .post(group.queryDeviceGroupTree, {
           pageNum: 1,
           pageSize: 999,
-          energyType: selectedOptions[0].cnValue,
+          energyType: selectedOptions[0].dicKey,
           orgId: orgId.value,
         })
         .then((res) => {
@@ -502,7 +502,7 @@
   .grey-background.ant-switch .ant-switch-handle {
     background-color: grey !important;
   }
-  /deep/ .ant-form-item-label {
+  :deep(.ant-form-item-label) {
     z-index: 20;
     text-align: right;
     width: 23%;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
index 39920f9..2ccca11 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -146,7 +146,7 @@
 </template>
 <script lang="ts" setup>
   import { NsMessage } from '/nerv-lib/component';
-  import { ref, toRaw } from 'vue';
+  import { ref } from 'vue';
   import type { SelectProps } from 'ant-design-vue';
   import type { ShowSearchType } from 'ant-design-vue/es/cascader';
   import { device } from '/@/api/deviceManage';
@@ -154,7 +154,6 @@
 
   import { http } from '/nerv-lib/util';
 
-  import type { Rule } from 'ant-design-vue/es/form';
   import { async } from '@antv/x6/lib/registry/marker/async';
 
   const visible = ref(false);
@@ -505,7 +504,7 @@
   .grey-background.ant-switch .ant-switch-handle {
     background-color: grey !important;
   }
-  /deep/ .ant-form-item-label {
+  :deep(.ant-form-item-label) {
     z-index: 20;
     text-align: right;
     width: 23%;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
index cc564a3..fd33883 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
@@ -73,7 +73,11 @@
         </a-table>
       </div>
     </div>
-    <linkPeople v-show="visibleModel" ref="linkPeoples" @handleCancel="handleCancel" />
+    <linkPeople
+      v-show="visibleModel"
+      ref="linkPeoples"
+      @handleCancel="handleCancel"
+      @handleOk="handleOk" />
   </ns-drawer>
 </template>
 <script lang="ts" setup>
@@ -98,10 +102,10 @@
     },
     {
       title: '姓名',
-      dataIndex: 'name',
+      dataIndex: 'deviceName',
       width: 80,
       fixed: 'left',
-      key: 'name',
+      key: 'deviceName',
     },
     {
       title: '性别',
@@ -127,127 +131,7 @@
     },
   ];
   const visibleModel = ref(false);
-  const dataSource = ref([
-    {
-      id: 1,
-      name: '张三1',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 2,
-      name: '张三2',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 3,
-      name: '张三3',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 4,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 5,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 6,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 7,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 8,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 9,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 10,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 11,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 12,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 13,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 14,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 15,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 16,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-    {
-      id: 17,
-      name: '张三',
-      sex: '男',
-      site: '济阳站',
-      department: '济阳站/产品/产品经理',
-    },
-  ]);
+  const dataSource = ref([]);
   const visible = ref(false);
   const linkPeoples = ref(null);
   const handleChangePage = (current: number, pageSize: number) => {
@@ -269,12 +153,21 @@
   //点击联系人
   const chengUser = () => {
     visibleModel.value = true;
-    linkPeoples.value.getData();
+    let ids = [];
+    dataSource.value.forEach((item) => {
+      ids.push(item.id);
+    });
+    linkPeoples.value.getData({ id: ids, data: dataSource });
   };
   //取消弹窗
   const handleCancel = () => {
     visibleModel.value = false;
   };
+  //确定选择人
+  const handleOk = (data: any) => {
+    visibleModel.value = false;
+    dataSource.value = data.data;
+  };
   //表单数据
   const infoObject = ref({
     enableRules: 0,
@@ -306,10 +199,20 @@
   const toggle = (value: any) => {
     //判断 是新增 还是修改
     if (value) {
-      // infoObject.value = value;
+      // 获取接口
       infoObject.value = {
         enableRules: 0,
       };
+      // await http
+      //   .post(group.queryDeviceGroupTree, {
+      //     pageNum: 1,
+      //     pageSize: 999,
+      //     energyType: selectedOptions[0].dicKey,
+      //     orgId: orgId.value,
+      //   })
+      //   .then((res) => {
+      //     jdTreeData.value = res.data;
+      //   });
     } else {
       infoObject.value = {
         enableRules: 0,
@@ -328,6 +231,15 @@
   };
   const btnClick = () => {
     console.log(infoObject.value);
+    //发送请求数据
+    let obj = {};
+    obj.selectList = [];
+    dataSource.value.forEach((item) => {
+      obj.selectList.push({
+        people: item.id,
+      });
+    });
+    console.log(obj, '数据');
     //表单校验
     formRef.value.validate().then(() => {
       //调用接口
@@ -381,7 +293,7 @@
   .grey-background.ant-switch .ant-switch-handle {
     background-color: grey !important;
   }
-  /deep/ .ant-form-item-label {
+  :deep(.ant-form-item-label) {
     z-index: 20;
     text-align: left;
     width: 20%;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/config.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/config.ts
new file mode 100644
index 0000000..2202a5e
--- /dev/null
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/config.ts
@@ -0,0 +1,22 @@
+import { department } from '/@/api/origanizemanage';
+
+export const editTreeConfig = (orgId) => ({
+  selectedKeys: ['0-0'],
+  defaultExpandAll: true,
+  api: department.queryDeptTree,
+  params: { orgId },
+  resultField: 'data.orgInfos',
+  fieldNames: { title: 'orgName', key: 'orgId' },
+  formConfig: {
+    schemas: [
+      {
+        field: 'orgName',
+        component: 'NsInput',
+        autoSubmit: true,
+        componentProps: {
+          placeholder: '请输入企业名称',
+        },
+      },
+    ],
+  },
+});
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
index dfa6878..a496735 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
@@ -2,75 +2,63 @@
   <a-modal
     v-model:visible="show"
     width="1100px"
-    style="top: 50%; transform: translateY(-50%)"
+    style="top: 50%; transform: translateY(-50%); overflow-y: hidden"
     title="添加联系人"
     @ok="handleOk"
     @cancel="handleCancel">
-    <div style="width: 100%; height: 480px; display: flex">
-      <div style="width: 300px; height: 100%; overflow-y: auto; padding: 0, 12px; gap: 5px">
+    <div class="box">
+      <div class="box-left">
         <div style="width: 100%; display: flex; position: relative">
-          <div
-            style="
-              border-width: 0px;
-              position: absolute;
-              left: 0px;
-              top: 5px;
-              width: 5px;
-              height: 15px;
-              background: inherit;
-              background-color: rgba(251, 156, 67, 1);
-              border: none;
-              border-radius: 5px;
-              -moz-box-shadow: none;
-              -webkit-box-shadow: none;
-              box-shadow: none;
-            "></div>
+          <div class="border-card"></div>
           <span style="margin-left: 24px; color: #333333">联系人名单</span>
         </div>
         <img
-          style="width: 100%; margin-top: -10px"
+          style="width: 100%; height: 2px"
           src="https://files.axshare.com/gsc/4T0UQR/7e/5d/a2/7e5da2a277344db8af30521cefeb70cc/images/告警设置/u150.svg?pageId=1f58c1ba-b461-4fe8-a2b3-295f1e7b0aa0" />
         <a-input-search
           v-model:value="searchValue"
           style="margin-bottom: 8px"
           placeholder="请输入关键字" />
         <img
-          style="width: 100%; margin-top: -10px"
+          style="width: 100%; height: 2px"
           src="https://files.axshare.com/gsc/4T0UQR/7e/5d/a2/7e5da2a277344db8af30521cefeb70cc/images/告警设置/u150.svg?pageId=1f58c1ba-b461-4fe8-a2b3-295f1e7b0aa0" />
-        <a-tree
-          :expanded-keys="expandedKeys"
-          :auto-expand-parent="autoExpandParent"
-          :tree-data="gData"
-          @expand="onExpand">
-          <template #title="{ title }">
-            <span v-if="title.indexOf(searchValue) > -1">
-              {{ title.substr(0, title.indexOf(searchValue)) }}
-              <span style="color: #f50">{{ searchValue }}</span>
-              {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
-            </span>
-            <span v-else>{{ title }}</span>
-          </template>
-        </a-tree>
+        <div style="width: 100%; height: 370px; overflow-y: auto">
+          <a-tree
+            :expanded-keys="expandedKeys"
+            :auto-expand-parent="autoExpandParent"
+            :tree-data="gData"
+            @select="onSelect"
+            @expand="onExpand"
+        /></div>
+        <!-- <ns-tree-api v-bind="config" @select="treeSelect" /> -->
       </div>
-      <div style="width: calc(100% - 200px); height: 100%; padding: 0, 24px; overflow-y: auto">
+      <div class="box-right">
         <div style="width: 100%; display: flex; position: relative">
-          <div
-            style="
-              border-width: 0px;
-              position: absolute;
-              left: 0px;
-              top: 5px;
-              width: 5px;
-              height: 15px;
-              background: inherit;
-              background-color: rgba(251, 156, 67, 1);
-              border: none;
-              border-radius: 5px;
-              -moz-box-shadow: none;
-              -webkit-box-shadow: none;
-              box-shadow: none;
-            "></div>
-          <span style="margin-left: 24px; color: #333333">人员列表</span>
+          <div class="border-card"></div>
+          <span style="margin-left: 24px; color: #333333">人员列表 </span>
+          <a-input-search
+            v-model:value="name"
+            style="margin-bottom: 8px; width: 280px; position: absolute; right: 20px"
+            placeholder="请输入"
+            allowClear="true"
+            @search="onSearch" />
+        </div>
+        <img
+          style="width: 100%; height: 2px"
+          src="https://files.axshare.com/gsc/4T0UQR/7e/5d/a2/7e5da2a277344db8af30521cefeb70cc/images/告警设置/u150.svg?pageId=1f58c1ba-b461-4fe8-a2b3-295f1e7b0aa0" />
+        <div style="width: 100%; height: 450px; overflow-y: auto; padding: 12px 0">
+          <a-table
+            :row-selection="{
+              selectedRowKeys: selectedRowKey,
+              preserveSelectedRowKeys: true,
+              onChange: onSelectChange,
+            }"
+            :columns="columns"
+            :data-source="dataSource"
+            :rowKey="(record: any) => record.id"
+            :pagination="pagination"
+            :bordered="true"
+            :size="'middle'" />
         </div>
       </div>
     </div>
@@ -78,33 +66,276 @@
 </template>
 
 <script lang="ts">
-  import { ref } from 'vue';
+  import { ref, watch, computed } from 'vue';
   import { defineComponent } from 'vue';
+  import type { TreeProps } from 'ant-design-vue';
+  import { device } from '/@/api/deviceManage';
+  import { http } from '/nerv-lib/util';
+  // import { editTreeConfig } from './config';
+
+  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;
+  };
   export default defineComponent({
     setup(props, { emit }) {
+      // const config = computed(() => {
+      //   return editTreeConfig(result);
+      // });
+      //组织数
+      const orgId = ref('');
+      const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+      orgId.value = result;
+      const dataSource = ref([]);
+      const selectedRowKey = ref([]);
+      const selectedRow = ref([]);
+      const name = ref(null);
+      const onSearch = () => {
+        http
+          .post(device.queryDevicePage, {
+            pageNum: pagination.value.current,
+            pageSize: pagination.value.pageSize,
+            deviceName: name.value,
+            orgId: orgId.value,
+          })
+          .then((res) => {
+            dataSource.value = res.data.records;
+            pagination.value.total = res.data.total;
+          });
+      };
+      const onSelect = (selectedKeys: any, info: any) => {
+        console.log('selected', selectedKeys, info.node.dataRef);
+        pagination.value.current = 1;
+        onSearch();
+      };
+
+      const handleChangePage = (current: number, pageSize: number) => {
+        pagination.value.current = current;
+        pagination.value.pageSize = pageSize;
+        http
+          .post(device.queryDevicePage, {
+            pageNum: pagination.value.current,
+            pageSize: pagination.value.pageSize,
+            orgId: orgId.value,
+          })
+          .then((res) => {
+            dataSource.value = res.data.records;
+            pagination.value.total = res.data.total;
+          });
+        console.log(selectedRowKey.value, selectedRow.value);
+      };
+      const onSelectChange = (selectedRowKeys: any, selectedRows: any) => {
+        console.log(selectedRowKeys, selectedRows);
+        console.log(selectedRows, '数据');
+
+        selectedRowKey.value = selectedRowKeys;
+        selectedRow.value = selectedRows;
+      };
+      const pagination = ref({
+        total: 0,
+        size: 'small',
+        current: 1,
+        pageSize: 10,
+        showQuickJumper: true,
+        showLessItems: true,
+        // showSizeChanger: true,
+        showTotal: (total: number, range: any) =>
+          total && range ? `显示第${range[0]}到${range[1]}条记录,共 ${total} 条记录` : '',
+        onChange: handleChangePage,
+      });
+      const columns = [
+        {
+          title: '序号',
+          dataIndex: 'address',
+          customRender: (text: any) => {
+            return text.index + 1;
+          },
+        },
+        {
+          title: '姓名',
+          dataIndex: 'deviceName',
+        },
+        {
+          title: '性别',
+          dataIndex: 'sex',
+        },
+        {
+          title: '组织关系',
+          dataIndex: 'address',
+        },
+        {
+          title: '部门  ',
+          dataIndex: 'address',
+        },
+      ];
       const handleOk = () => {
         // 处理确定按钮的逻辑
-        console.log('点击了确定按钮');
+        emit('handleOk', { id: selectedRowKey.value, data: selectedRow.value });
+        show.value = false;
+        pagination.value.current = 1;
       };
-      const searchValue = ref<string>('');
-      const getData = () => {
+      const getData = (data: any) => {
+        selectedRow.value = data.data;
+        selectedRowKey.value = data.id;
         show.value = true;
+        http
+          .post(device.queryDevicePage, {
+            pageNum: pagination.value.current,
+            pageSize: pagination.value.pageSize,
+            orgId: orgId.value,
+          })
+          .then((res) => {
+            dataSource.value = res.data.records;
+            pagination.value.total = res.data.total;
+          });
       };
       const show = ref(false);
       const handleCancel = () => {
         // 处理取消按钮的逻辑
-        console.log('点击了取消按钮');
+        pagination.value.current = 1;
         emit('handleCancel', null);
         show.value = false;
       };
+      // 树方法
+      const expandedKeys = ref<(string | number)[]>([]);
+      const searchValue = ref<string>('');
+      const deviceName = ref<string>('');
+      const autoExpandParent = ref<boolean>(true);
+      const gData = ref<TreeProps['treeData']>(genData);
+
+      const onExpand = (keys: string[]) => {
+        expandedKeys.value = keys;
+        autoExpandParent.value = false;
+        console.log(keys, '数据');
+      };
+      watch(searchValue, (value) => {
+        console.log(gData.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;
+        console.log(expandedKeys.value, '数据');
+      });
       return {
+        columns,
+        name,
+        orgId,
+        // config,
+        onSearch,
+        dataSource,
+        onSelect,
+        gData,
+        onExpand,
+        selectedRow,
+        selectedRowKey,
+        autoExpandParent,
+        expandedKeys,
+        onSelectChange,
+        pagination,
         handleOk,
         show,
         getData,
         searchValue,
+        deviceName,
         handleCancel,
       };
     },
   });
 </script>
+<style scoped lang="less">
+  .border-card {
+    border-width: 0px;
+    position: absolute;
+    left: 0px;
+    top: 5px;
+    width: 5px;
+    height: 15px;
+    background: inherit;
+    background-color: rgba(251, 156, 67, 1);
+    border: none;
+    border-radius: 5px;
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+  .box {
+    width: 100%;
+    height: 500px;
+    display: flex;
+    .box-left {
+      width: 300px;
+      height: 100%;
+      overflow-y: auto;
+      padding: 0, 12px;
+      gap: 5px;
+    }
+    .box-right {
+      width: calc(100% - 200px);
+      height: 100%;
+      padding: 0 12px;
+      overflow-y: auto;
+    }
+  }
+</style>
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/index.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/index.vue
new file mode 100644
index 0000000..59d78bf
--- /dev/null
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/index.vue
@@ -0,0 +1,28 @@
+<template>
+  <ns-view-list-table v-bind="config" ref="mainRef" />
+  <!-- 详情页面 -->
+  <Look ref="look" />
+  <!-- 状态页面 -->
+  <Status ref="status" />
+</template>
+<script lang="ts">
+  import { notificationtableConfig } from './ts/config';
+  import Look from './look.vue';
+  import Status from './status.vue';
+  import { ref } from 'vue';
+
+  export default {
+    components: { Look, Status },
+
+    setup() {
+      const look = ref(null);
+      const status = ref(null);
+      const config = notificationtableConfig(look, status);
+      return {
+        config,
+        look,
+        status,
+      };
+    },
+  };
+</script>
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
new file mode 100644
index 0000000..62e9a31
--- /dev/null
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
@@ -0,0 +1,283 @@
+<template>
+  <ns-drawer
+    v-model:visible="visible"
+    width="520"
+    :title="' '"
+    :footer-style="{ textAlign: 'right' }"
+    :ok="btnClick"
+    :cancel="handleClose"
+    placement="right"
+    @close="handleClose">
+    <div style="width: 100%; height: 100%; overflow-y: auto">
+      <!-- top -->
+      <div
+        style="
+          width: 100%;
+          height: 35px;
+          display: flex;
+          position: relative;
+          font-size: 16px;
+          border-bottom: 1px solid rgb(255, 118, 2); /* 设置底部边框为1像素实线，并指定颜色 */
+        ">
+        <div class="card"></div>
+        <div style="left: 25px; position: absolute; height: 35px; line-height: 35px">
+          告警编号：20230310001
+        </div>
+        <div style="right: 20px; position: absolute; height: 35px; line-height: 35px">
+          15点08分
+        </div>
+      </div>
+      <!-- center -->
+      <div style="width: 100%; height: 300px; border: 1px solid red" ref="graphChart"></div>
+    </div>
+  </ns-drawer>
+</template>
+<script>
+  import { defineComponent } from 'vue';
+  import { ref } from 'vue';
+  import * as echarts from 'echarts';
+  export default defineComponent({
+    setup() {
+      let chartInstance = null;
+      const graphChart = ref(null);
+      const visible = ref(false);
+      const handleClose = () => {
+        visible.value = false;
+      };
+      const btnClick = () => {
+        console.log('btnClick');
+      };
+      const toggle = (data) => {
+        console.log(data, 'data');
+        visible.value = true;
+        getChatr();
+      };
+      const getChatr = () => {
+        let dayData = [];
+        let energyAlarm = [];
+        let wgAlarm = [];
+        let equipmentAlarm = [];
+        let total = [];
+
+        // Extend data for 30 days
+        for (let i = 1; i < 30; i++) {
+          dayData.push(`3/${i}`);
+          energyAlarm.push(Math.floor(Math.random() * 11)); // Assuming the same value for simplicity
+          wgAlarm.push(Math.floor(Math.random() * 11)); // Assuming the same value for simplicity
+          equipmentAlarm.push(Math.floor(Math.random() * 11)); // Assuming the same value for simplicity
+          total.push(0); // Assuming the same value for simplicity
+        }
+        if (chartInstance) {
+          chartInstance.dispose();
+        }
+        chartInstance = echarts.init(graphChart.value);
+        const option = {
+          title: {
+            text: '告警趋势/ 近30天',
+            textStyle: {
+              fontSize: 16,
+              fontWeight: 'normal',
+              color: '#aaaaaa',
+            },
+            left: '1%',
+            top: '2%',
+          },
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow',
+            },
+            formatter: function (params) {
+              let res =
+                params[0].axisValue +
+                '<br/>' +
+                params[0].marker +
+                '    ' +
+                params[0].seriesName +
+                '  :  ' +
+                params[0].data +
+                '<br/>' +
+                params[1].marker +
+                '    ' +
+                params[1].seriesName +
+                ' :  ' +
+                params[1].data +
+                '<br/>' +
+                params[2].marker +
+                '    ' +
+                params[2].seriesName +
+                '  :  ' +
+                params[2].data +
+                '<br/>';
+              return res;
+            },
+          },
+          grid: {
+            left: '2%', // 设置图表距离左边的距离
+            right: '2%', // 设置图表距离右边的距离
+            borderWidth: 0,
+            y2: 60, // 距离底边
+          },
+          legend: [
+            {
+              top: 5,
+              left: 'center', // 将图例居中显示
+              textStyle: {
+                color: 'rgb(89, 89, 89)',
+                fontSize: '14',
+                fontWeight: 'normal',
+              }, // 注意这里的颜色值要用引号括起来
+              data: ['设备告警', '网关告警', '能源告警'],
+              itemGap: 30, // 这里可以调整图例项之间的间距，单位为像素
+            },
+          ],
+          toolbox: {
+            show: true,
+            feature: {
+              restore: {},
+              saveAsImage: {},
+            },
+          },
+          calculable: true,
+          xAxis: [
+            {
+              type: 'category',
+              splitLine: {
+                show: false,
+              },
+              axisTick: {
+                show: false,
+              },
+              splitArea: {
+                show: false,
+              },
+              data: dayData,
+            },
+          ],
+          yAxis: [
+            {
+              type: 'value',
+              shwo: false,
+              splitLine: {
+                show: true,
+              },
+              axisLine: {
+                show: false,
+              },
+              axisTick: {
+                show: false,
+              },
+              splitArea: {
+                show: false,
+              },
+              axisLabel: {
+                show: false, // 不显示刻度值
+              },
+            },
+          ],
+          dataZoom: [
+            {
+              height: 12,
+              start: 0,
+              end: 100,
+              handleSize: '300%', // 设置滑块的大小
+              bottom: 15,
+            },
+          ],
+          series: [
+            {
+              name: '能源告警',
+              type: 'bar',
+              stack: '能源告警',
+              barMaxWidth: 40,
+              barGap: '10%',
+              itemStyle: {
+                normal: {
+                  barBorderRadius: 0,
+                  color: 'rgb(246, 189, 22)',
+                },
+              },
+              data: energyAlarm,
+            },
+            {
+              name: '网关告警',
+              type: 'bar',
+              stack: '能源告警',
+              barMaxWidth: 40,
+              barGap: '10%',
+              itemStyle: {
+                normal: {
+                  barBorderRadius: 0,
+                  color: 'rgb(91, 143, 249)',
+                },
+              },
+              data: wgAlarm,
+            },
+            {
+              name: '设备告警',
+              type: 'bar',
+              stack: '能源告警',
+              barMaxWidth: 40,
+              barGap: '10%',
+              itemStyle: {
+                normal: {
+                  barBorderRadius: 0,
+                  color: 'rgb(48, 191, 120)',
+                },
+              },
+              data: equipmentAlarm,
+            },
+            {
+              name: '总数',
+              type: 'bar',
+              stack: '能源告警',
+              barMaxWidth: 40,
+              barHight: 0,
+              itemStyle: {
+                normal: {
+                  barBorderRadius: 0,
+                  color: 'rgba(0,0,0,0)',
+                },
+              },
+              label: {
+                show: true,
+                color: '#000000',
+                position: 'top',
+                top: '10',
+                formatter: function (value) {
+                  return (
+                    Number(energyAlarm[value.dataIndex]) +
+                    Number(wgAlarm[value.dataIndex]) +
+                    Number(equipmentAlarm[value.dataIndex])
+                  );
+                },
+              },
+              data: total,
+            },
+          ],
+        };
+        chartInstance = echarts.init(graphChart.value);
+        chartInstance.setOption(option);
+      };
+      return {
+        btnClick,
+        visible,
+        chartInstance,
+        handleClose,
+        toggle,
+        graphChart,
+        getChatr,
+      };
+    },
+  });
+</script>
+<style scoped lang="less">
+  .card {
+    position: absolute;
+    left: 0px;
+    top: 0px;
+    width: 5px;
+    height: 35px;
+    background-color: rgb(254, 118, 2);
+  }
+</style>
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/notificationManagementMock.json b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/notificationManagementMock.json
new file mode 100644
index 0000000..6f442ed
--- /dev/null
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/notificationManagementMock.json
@@ -0,0 +1,108 @@
+{
+  "listData":[
+    {
+      "id": "d4",
+      "isDel": "0",
+      "officesId": "84",
+      "deviceCode": "37430200143",
+      "deviceName": "地听测试电表",
+      "category": "1",
+      "type": "1001",
+      "energyCount": "1",
+      "serialNumber": "69",
+      "pidCode": null,
+      "brand": "",
+      "types": "",
+      "manufacturer": "elit non in",
+      "contacts": "ad reprehenderit",
+      "phonenumber": "34",
+      "position": "in esse commodo1",
+      "activeState": "1",
+      "measurementDirection": "1",
+      "deviceMagnification": 62,
+      "deviceAccuracy": "89",
+      "frequency": "anim consequat irure",
+      "standardFrequency": "ut elit",
+      "deviceHead": "pariatur ex velit",
+      "constructor": "84566",
+      "voltageType": "cillum aliquip reprehenderit",
+      "pt": 61,
+      "ct": 64,
+      "communicationProtocol": "cupidatat nisi ea ad",
+      "ip": "",
+      "port": "",
+      "com": "",
+      "slaveAddress": "",
+      "dlt": "",
+      "conversionIdentifier": "48",
+      "multiplicationAdjustment": "1",
+      "accessMethod": "1",
+      "replacementFrequency": "0",
+      "dataDetail": "sit",
+      "insertTime": null,
+      "children": null,
+      "devicePointList": null,
+      "insertUser": null,
+      "priority": "1",
+      "alarmTitle": "电压异常告警",
+      "errorCode": "A001",
+      "monitorTime":"1",
+      "repetitions":"1",
+      "monitorTimeUnit": "分",
+      "enableRules": "1",
+      "isUse":true
+    }   , {
+      "id": "d5",
+      "isDel": "0",
+      "officesId": "84",
+      "deviceCode": "37430200143",
+      "deviceName": "地听测试电表",
+      "category": "1",
+      "type": "1001",
+      "energyCount": "1",
+      "serialNumber": "69",
+      "pidCode": null,
+      "brand": "",
+      "types": "",
+      "manufacturer": "elit non in",
+      "contacts": "ad reprehenderit",
+      "phonenumber": "34",
+      "position": "in esse commodo2",
+      "activeState": "1",
+      "measurementDirection": "1",
+      "deviceMagnification": 62,
+      "deviceAccuracy": "89",
+      "frequency": "anim consequat irure",
+      "standardFrequency": "ut elit",
+      "deviceHead": "pariatur ex velit",
+      "constructor": "84566",
+      "voltageType": "cillum aliquip reprehenderit",
+      "pt": 61,
+      "ct": 64,
+      "communicationProtocol": "cupidatat nisi ea ad",
+      "ip": "",
+      "port": "",
+      "com": "",
+      "slaveAddress": "",
+      "dlt": "",
+      "conversionIdentifier": "48",
+      "multiplicationAdjustment": "1",
+      "accessMethod": "1",
+      "replacementFrequency": "0",
+      "dataDetail": "sit",
+      "insertTime": null,
+      "children": null,
+      "devicePointList": null,
+      "insertUser": null,
+      "priority": "1",
+      "alarmTitle": "电压异常告警",
+      "errorCode": "A001",
+      "monitorTime":"1",
+      "repetitions":"1",
+      "monitorTimeUnit": "分",
+      "enableRules": "0",
+      "isUse":true
+    }
+  ]
+  
+}
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
new file mode 100644
index 0000000..d6cb122
--- /dev/null
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
@@ -0,0 +1,39 @@
+<template>
+  <ns-drawer
+    v-model:visible="visible"
+    width="520"
+    :title="' '"
+    :footer-style="{ textAlign: 'right' }"
+    :ok="btnClick"
+    :cancel="handleClose"
+    placement="right"
+    @close="handleClose">
+    状态
+  </ns-drawer>
+</template>
+<script>
+  import { defineComponent } from 'vue';
+  import { ref } from 'vue';
+
+  export default defineComponent({
+    setup() {
+      const visible = ref(false);
+      const handleClose = () => {
+        visible.value = false;
+      };
+      const btnClick = () => {
+        console.log('btnClick');
+      };
+      const toggle = (data) => {
+        console.log(data, 'data');
+        visible.value = true;
+      };
+      return {
+        btnClick,
+        visible,
+        handleClose,
+        toggle,
+      };
+    },
+  });
+</script>
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
new file mode 100644
index 0000000..8adc472
--- /dev/null
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
@@ -0,0 +1,164 @@
+import { dateUtil } from '/nerv-lib/util/date-util';
+import data from '../notificationManagementMock.json';
+import { http } from '/nerv-lib/util';
+import { ref } from 'vue';
+const tableKeyMap = [
+  {
+    title: '序号',
+    dataIndex: 'address',
+    customRender: (text: any) => {
+      return text.index + 1;
+    },
+  },
+  {
+    title: '告警编号',
+    dataIndex: 'id',
+  },
+  {
+    title: '告警描述',
+    dataIndex: 'deviceCode',
+  },
+  {
+    title: '优先级',
+    dataIndex: 'deviceName',
+  },
+  {
+    title: '状态',
+    dataIndex: 'position',
+  },
+  {
+    title: '错误码',
+    dataIndex: 'position',
+    textEllipsis: true,
+  },
+  {
+    title: '设备信息',
+    dataIndex: 'position',
+  },
+  {
+    title: '更新时间',
+    dataIndex: 'enableRules',
+  },
+  {
+    title: '重复次数',
+    dataIndex: 'enableRules',
+  },
+];
+const mockData = ref(data.listData);
+export const notificationtableConfig = (look: any, status: any) => {
+  return {
+    title: '告警记录',
+    // api: '/carbon_emission/device/getDeviceList',
+    value: mockData.value,
+    headerActions: [{}],
+    columns: tableKeyMap,
+    // rowSelection: null, 选择按钮
+    columnActions: {
+      title: '操作',
+      actions: [
+        {
+          label: '详情',
+          name: 'FeedBackDetail',
+          dynamicParams: ['uuid', 'appealType'],
+          handle: (data: any) => {
+            console.log(look.value);
+            look.value.toggle(data);
+          },
+        },
+        {
+          label: '状态',
+          name: 'FeedBackDetail',
+          dynamicParams: ['uuid', 'appealType'],
+          handle: (data: any) => {
+            status.value.toggle(data);
+          },
+        },
+      ],
+    },
+
+    formConfig: {
+      schemas: [
+        {
+          field: 'name',
+          label: '告警类型',
+          component: 'NsSelect',
+          componentProps: {
+            placeholder: '请选择告警优先级',
+            options: [
+              {
+                label: '紧急',
+                value: '1',
+              },
+              {
+                label: '重要',
+                value: '2',
+              },
+              {
+                label: '一般',
+                value: '3',
+              },
+            ],
+          },
+        },
+        {
+          field: 'provider',
+          label: '状态',
+          component: 'NsSelect',
+          componentProps: {
+            placeholder: '请选择状态',
+            options: [
+              {
+                label: '待处理',
+                value: '1',
+              },
+              {
+                label: '处理中',
+                value: '2',
+              },
+              {
+                label: '已完成',
+                value: '3',
+              },
+              {
+                label: '超时',
+                value: '4',
+              },
+              {
+                label: '关闭',
+                value: '5',
+              },
+            ],
+          },
+        },
+        {
+          field: 'provider',
+          label: '告警标题',
+          component: 'NsInput',
+          componentProps: {
+            placeholder: '请输入告警标题关键字',
+          },
+        },
+        {
+          field: 'provider',
+          label: '错误码',
+          component: 'NsInputApi',
+          componentProps: {
+            placeholder: '请输入告警错误码',
+          },
+        },
+        {
+          field: 'createTime',
+          label: '生产日期',
+          component: 'NsRangePicker',
+          fieldMap: ['manufactureBeginDate', 'manufactureEndDate'],
+          componentProps: {
+            valueFormat: 'YYYY-MM-DD',
+            placeholder: ['设备生产开始日期', '设备生产结束日期'],
+          },
+        },
+      ],
+    },
+    // pagination: { pageSizeOptions: false },
+    rowKey: 'id',
+  };
+};