From ab29f9152de2df439ce323a3517978ef69de93d5 Mon Sep 17 00:00:00 2001
From: chenpingsen <chenpingsen>
Date: Thu, 25 Jul 2024 11:54:47 +0800
Subject: [PATCH 1/9] =?UTF-8?q?add:=E7=85=A7=E6=98=8E=E7=B3=BB=E7=BB=9F=20?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/api/IlluminationInfo.ts      |   7 +
 .../equipmentControl/lightingManage/indexs.vue     |  25 ++-
 .../view/equipmentControl/lightingManage/tabs1.vue | 227 ++++++++++++---------
 3 files changed, 157 insertions(+), 102 deletions(-)

diff --git a/hx-ai-intelligent/src/api/IlluminationInfo.ts b/hx-ai-intelligent/src/api/IlluminationInfo.ts
index 3b1d32c..0a8015e 100644
--- a/hx-ai-intelligent/src/api/IlluminationInfo.ts
+++ b/hx-ai-intelligent/src/api/IlluminationInfo.ts
@@ -9,6 +9,13 @@ export enum lightingManage {
   // 修改线路的可用/禁用状态
   setDisable = '/carbon-smart/IlluminationInfo/revisePanel',
 
+  // 控制面板tab页 ================================================
+
+  // 获取当前修改的内容对比数据
+  getChangeList = '/carbon-smart/IlluminationInfo/getLightSceneChangeInfo',
+  // 提交当前修改
+  submitChangeList = '/carbon-smart/IlluminationInfo/changeLightScene',
+
   // 计划列表tab页 ================================================
 
   // 获得计划列表tab页的表格数据
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
index adb4b68..1297d9d 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
@@ -42,6 +42,7 @@
         v-model:visible="visible"
         class="drawer-item"
         width="496"
+        :forceRender="preload"
         placement="right"
         :body-style="{ background: 'rgba(0, 0, 0)', opacity: 0.8 }"
         :closable="false"
@@ -54,7 +55,6 @@
                     @changeArea="changeArea" 
                     @reset="reset" 
                     :treeData="treeData" 
-                    :nowArea="nowArea"
                     ></tabs1>
                 </a-tab-pane>
                 <a-tab-pane key="2" tab="计划列表" force-render>
@@ -93,6 +93,10 @@ onMounted(() => {
     getAllArea()
 })
 
+// 预加载flag，获得分区数据后，预加载抽屉，防止获取ref报错
+const preload = ref(false)
+
+
 // 分层业务 =====================================================
 
 // 所有楼层的数据
@@ -109,13 +113,12 @@ const changeFloor = (area: any) => {
     treeData.value[0].selected = true
 }
 
+
 // 分区业务 =====================================================
 
 // 分区结构树
 const treeData = ref([])
-// 当前选中的分区id
-const nowArea = ref('1')
-// 当前选中的分区序号 - 用于样式渲染
+// 当前选中的分区序列 - 用于样式渲染
 const area = ref(['1'])
 // 线路内小灯泡 - 此处位置需前端写死
 const bulbs = ref([
@@ -182,15 +185,18 @@ const changeArea = (result: any) => {
 }
 // 由当前组件控制的分区切换
 const changeThisArea = (result: any) => {
-    tabs1Ref.value.changeCancel()
     console.log(result, 'changeThisArea')
     // 修改前，将所有选项置空
     reset()
     let level1 = result[0];
     area.value.length = 0
+    // 只选择了分区
     if (result.length === 1) {
         result[0].selected = true
         area.value.push(result[0].id)
+        // 控制子组件按钮区
+        tabs1Ref.value.changeArea(result[0])
+    // 选择了分区 + 线路
     } else if (result.length === 2) {
         // 如果没有分区，默认选择第一个
         if (!level1) {
@@ -199,8 +205,10 @@ const changeThisArea = (result: any) => {
         // 选中状态都设为true
         level1.selected = result[1].selected  = true
         area.value.splice(0, 0, level1.id, result[1].id)
+        // 控制子组件按钮区
+        tabs1Ref.value.changeArea(result[0])
+        tabs1Ref.value.changeLine(result[1])
     }
-    nowArea.value = level1.id
 }
 // 重置分区树所有当前选项
 const reset = () => {
@@ -220,6 +228,7 @@ const computedClass = (string: string) => {
     }
 }
 
+// 获得所有分区
 const getAllArea = () => {
     http.get(lightingManage.getArea, { projectId: 'HLlmTZp8' }).then(res => {
         const data = res.data
@@ -242,7 +251,10 @@ const getAllArea = () => {
                 })
             })
         })
+        // 默认展示 线路 1-1
         treeData.value = data[0].childList
+        // 开始预加载
+        preload.value = true
     })
 }
 
@@ -256,6 +268,7 @@ let visible = ref(false);
 const toggleDrawer = () => {
     visible.value = !visible.value;
 };
+// 抽屉tab1组件的引用
 const tabs1Ref = ref()
 
 </script>
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
index 9cd93e4..0ae9d57 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
@@ -13,7 +13,7 @@
       <div class="area">
         <template v-if="!showAllButtonsArea">
           <button v-for="(button, index) in limitedButtons1" :key="index"
-            :class="{ btn: true, selected: button.selected }" @click="selectButton(button)">
+            :class="{ btn: true, selected: button.selected }" @click="changeArea(button)">
             {{ button.name }}
           </button>
           <div style="margin-top: 10px">
@@ -22,7 +22,7 @@
         </template>
         <template v-else>
           <button v-for="(button, index) in props.treeData" :key="index" :class="{ btn: true, selected: button.selected }"
-            @click="selectButton(button)">
+            @click="changeArea(button)">
             {{ button.name }}
           </button>
           <div style="margin-top: 10px">
@@ -53,7 +53,7 @@
       <div class="btnArea">
         <template v-if="!showAllButtons">
           <button v-for="(button, index) in limitedButtons2" :key="index"
-            :class="{ btn: true, selected: button.selected }" class="zmhlbtn" @click="toggleSelection(button)">
+            :class="{ btn: true, selected: button.selected }" class="zmhlbtn" @click="changeLine(button)">
             <stop-outlined v-if="button.ctrlStatus" />
             {{ button.name }}
           </button>
@@ -63,7 +63,7 @@
         </template>
         <template v-else>
           <button v-for="(button, index) in buttons2" :key="index" 
-          :class="{ btn: true, selected: button.selected }" class="zmhlbtn" @click="toggleSelection(button)">
+          :class="{ btn: true, selected: button.selected }" class="zmhlbtn" @click="changeLine(button)">
             <stop-outlined v-if="button.ctrlStatus" />
             {{ button.name }}
           </button>
@@ -91,26 +91,26 @@
     </div>
     <!-- 控制场景部分 -->
     <div>
-      <div class="control-scene-area" v-show="thisButton2.mode.value == '3'">
+      <div class="control-scene-area" v-show="thisButton2.mode.value == 3">
         <div class="control-scene-tab"></div>
         <span class="control-scene-text"> 控制场景 </span>
       </div>
       <!-- 控制场景按钮部分 -->
-      <div class="control-scene-btn-area" v-show="thisButton2.mode.value == '3'">
+      <div class="control-scene-btn-area" v-show="thisButton2.mode.value == 3">
         <button v-for="(button4, index) in controlScene" :key="index"
-          :class="{ btn: true, selected: thisButton2.mode.value == button4.value }" @click="selectButton4(button4)">
+          :class="{ btn: true, selected: thisButton2.scene.value == button4.value }" @click="selectButton4(button4)">
           {{ button4.label }}
         </button>
       </div>
     </div>
     <!-- 底部按钮区 -->
     <div class="bottom">
-        <a-popconfirm
-        title="刷新将会取消已作出的修改"
-        ok-text="确定"
-        cancel-text="取消"
-        @confirm="changeConfirm"
-        @cancel="changeCancel"
+      <a-popconfirm
+      title="刷新将会取消已作出的修改"
+      ok-text="确定"
+      cancel-text="取消"
+      @confirm="changeConfirm"
+      @cancel="changeCancel"
       >
         <button class="flushed">刷新</button>
       </a-popconfirm>
@@ -186,7 +186,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, watch } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import {
   DownOutlined,
   UpOutlined,
@@ -201,47 +201,25 @@ import { getAllEnum } from '/@/api/index'
 // 初始化  =========================================================================
 
 onMounted(() => {
-  // 设置分区
-  setArea(0)
+  // 默认选项
+  setArea()
   // 获得枚举
   getEnum(['IlluminationMode', 'IlluminationScene'])
 })
-
-// 获得枚举，初始化
+// 获得枚举
 const getEnum = (arr: any) => {
   getAllEnum({ params: arr }).then(res => {
-      const data = res.data
-      controlMode.value = data.IlluminationMode
-      controlScene.value = data.IlluminationScene
+    const data = res.data
+    // 控制模式
+    controlMode.value = data.IlluminationMode
+    // 控制场景
+    controlScene.value = data.IlluminationScene
   })
 }
-// 父组件点击俯视图切换分区时，子组件切换线路
-const setArea = (isHandle: number) => {
-  const data = props.treeData.find((item: any) => {
-    return item.id == props.nowArea
-  })
-  // 默认选中第一个分区
-  data.selected = true
-  // 修改当前选中的分区
-  selectedButton.value = props.nowArea
-  // 设置当前显示的回路
+// 以 1-1 作为默认线路
+const setArea = () => {
+  const data = props.treeData[0]
   buttons2.value = data.childList
-
-  // 如果非初始化触发（点击俯视图）
-  if (isHandle) {
-    // 如果选中了线路则children中的某个selected为true
-    const button2 = data.childList.find((item: any) => {
-      return item.selected == true
-    })
-    // 如果选中了线路
-    if (button2) {
-      thisButton2.value = button2;
-      console.log(button2,'2222222222')
-
-    } else {
-      resetMode()
-    }
-  }
 }
 
 // 与父组件的交互  ===================================================================
@@ -251,10 +229,6 @@ const props = defineProps({
   treeData: {
     type: Array,
     default: []
-  },
-  // 父组件选中的分区ID
-  nowArea: {
-    type: String,
   }
 });
 // 向上传递修改选择样式
@@ -263,12 +237,6 @@ const props = defineProps({
  * @method reset 用于重置按钮区
  */
 const emit = defineEmits(['changeArea','reset']);
-// 监听父组件选中的分区，并实时修改分区
-watch(() => props.nowArea, () => {
-  setArea(1)
-  // 分区产生了切换， 线路的选中状态置空
-  handleButton.value = ''
-})
 
 // 照明区域业务 =======================================================================
 
@@ -283,15 +251,22 @@ const togglePlan = () => {
 const showAllButtonsArea = ref(false);
 // 被选中的分区  默认为1
 const selectedButton = ref<string | undefined>('1');
-// 区域切换（按钮点击-单选）事件
-const selectButton = (button: any) => {
+
+// 分区切换
+const changeArea = (button: any) => {
   // 当前选中按钮
   selectedButton.value = button.id;
-  initMenu(1)
-  button.selected = true
+  // 设置当前选中的线路
   buttons2.value = button.childList
+  // 重置按钮状态
+  emit('reset')
+  // 设置选中按钮状态
+  button.selected = true
+  // 改变俯视图样式
   emit('changeArea', button.id);
+  // 当前选中线路 - 置空
   resetMode()
+  // 最近交互过的按钮 - 置空
   handleButton.value = ''
 };
 // 默认最多展示8个按钮
@@ -335,7 +310,9 @@ const selectAll = () => {
     button.selected = false;
   });
   singleSelection.value = !singleSelection.value;
+  // 当前选中线路 - 置空
   resetMode()
+  // 改变俯视图样式
   emit('changeArea', [selectedButton.value])
 };
 
@@ -346,7 +323,11 @@ const toggleAllSelection = () => {
   let arr = [selectedButton.value]
   // 全选
   if (selectAllCheckbox.value) {
-    buttons2.value.forEach((item) => {
+    buttons2.value.forEach((item, index) => {
+      // 全选时，默认展示第一条线路的模式-场景按钮
+      if (index == 0) {
+        thisButton2.value = item
+      }
       item.selected = true;
       arr.push(item.id)
     });
@@ -355,12 +336,24 @@ const toggleAllSelection = () => {
     buttons2.value.forEach((item) => {
       item.selected = false;
     });
+    // 全不选时，隐藏模式-场景按钮
+    resetMode()
   }
   emit('changeArea', arr)
 };
 
+// 储存当前选中的线路
+const thisButton2 = ref({
+  code: '',
+  mode: {
+    value: -1
+  },
+  scene: {
+    value: -1
+  }
+})
 // 照明回路的按钮切换
-const toggleSelection = (button: any) => {
+const changeLine = (button: any) => {
   // 存储一次按钮ID，用于禁用/启用交互
   handleButton.value = button.id
   // 根据按钮状态，展示禁用/启用按钮文本
@@ -373,13 +366,13 @@ const toggleSelection = (button: any) => {
   // 选择时反控俯视图
   let level1 = selectedButton.value
   let level2 = button.id
-  // 单选模式，需将所有按钮设为false
+  // 单选模式，需将所有其他按钮设为false
   if (singleSelection.value) {
     buttons2.value.forEach(item => {
       item.selected = false;
     });
-    emit('changeArea', [level1, level2])
     button.selected = !button.selected;
+    emit('changeArea', [level1, level2])
   } else {
     // 多选模式传值
     button.selected = !button.selected;
@@ -396,7 +389,7 @@ const toggleSelection = (button: any) => {
     // 发生了选中事件
     thisButton2.value = button
   } else {
-    // 未发生选中 或 多选被取消
+    // 未发生选中 或 多选的其中一个按钮被取消
     resetMode()
   }
   console.log(thisButton2,'button')
@@ -411,28 +404,17 @@ const limitedButtons2 = computed(() => buttons2.value.slice(0, 8));
 
 // 控制模式业务 ====================================================================
 
-const thisButton2 = ref({
-  code: '',
-  mode: {
-    value: '0'
-  }
-})
 // 控制模式 - 按钮切换
 const selectButton3 = (button3) => {
   let checked = thisButton2.value.mode
   console.log(button3.value,'---', checked.value)
-  // 如果点击了相同的按钮，未作出修改
+  // 如果点击了相同的按钮，则未作出修改
   if (checked.value === button3.value) {
     return
   }
   checked.value = button3.value
-  selectedButton4.value = null; // 清空选中的控制场景按钮
 };
 
-const diff = () => {
-  console.log(thisButton2)
-} 
-
 // 控制场景业务 =====================================================================
 
 // 控制模式枚举
@@ -443,13 +425,63 @@ const controlScene = ref([])
 const selectedButton4 = ref(null);
 // 控制场景 - 按钮切换
 const selectButton4 = (button4) => {
-  selectedButton4.value = button4.label;
+  // 当前选中的线路数据
+  const data = thisButton2.value
+  // 修改前的数据
+  let before = data.scene.value
+  // 修改后的数据
+  let after = button4.value
+  // 如果没有产生实质性的修改（修改前后相同，则跳出）
+  if (before === after) {
+    return
+  // 产生了修改
+  } else {
+    thisButton2.value.scene.value = after
+    // 查询之前是否修改过
+    const result = changeList.value.find((item, index) => {
+      item.index = index
+      return item.deviceGroup == data.code
+    })
+    // 如果已产生过修改
+    if (result) {
+      // 改回了原有的值，则从数组中移除
+      if (after == result.before) {
+        changeList.value.splice(result.index, 1)
+      // 修改为新值，则只修改after
+      } else {
+        result.scene = after
+        // 临时flag，用后移除
+        delete result.index
+      }
+    // 如果未产生过修改
+    } else {
+      changeList.value.push({
+        // 线路
+        deviceGroup: data.code,
+        deviceGroupName: data.name,
+        // 分区
+        region: data.pcode,
+        regionName: '',
+        // 修改前
+        before: before,
+        // 修改后
+        scene: after
+      })
+    }
+    console.log(changeList.value, 'changeList')
+  }
+  
+  thisButton2.value.scene.value = after
+  console.log(thisButton2,'222222')
+  console.log(button4,'44444')
 };
 
 // 内侧弹窗 ========================================================================
 
+// 需要修改的内容
+const changeList: any = ref([])
 // 需要向后端提交的修改内容
-const submitArray = ref([])
+const submitList = ref([])
 const cxList = ref([
   {
     id: '1',
@@ -489,7 +521,7 @@ const cxList = ref([
   },
 ]);
 //撤销
-const delBtn = (id: any) => {
+const delBtn = () => {
   cxList.value.pop();
   console.log(cxList.value.length);
 
@@ -501,19 +533,6 @@ const delBtn = (id: any) => {
 // 其他业务 ========================================================================
 
 const isLoading = ref(false)
-
-// 用于初始化5级联动的菜单
-const initMenu = (tier: number) => {
-  // 1 = 照明区域 - 切换时，重置以下所有菜单
-  if (tier == 1) {
-    emit('reset')
-    // 灯具参数 隐藏
-    selectedButton4.value = null;
-  } else if (tier == 2) {
-    // 灯具参数 隐藏
-    selectedButton4.value = null;
-  }
-}
 // 刷新
 const refresh = () => {
   // 关闭执行弹窗
@@ -532,7 +551,16 @@ const refresh = () => {
 // 执行确认
 const executeVisible = ref<boolean>(false);
 const showModal = () => {
+  http.post(lightingManage.getChangeList, { infoList: changeList.value, projectId: 'HLlmTZp8' }).then(res => {
+    if (res.msg === 'success') {
+      isLoading.value = true
+      console.log(res)
+    } else {
+      isLoading.value = false
+    }
+  })
   executeVisible.value = true;
+
 };
 
 // 确定
@@ -549,13 +577,20 @@ const resetMode = () => {
   thisButton2.value = {
     code: '',
     mode: {
-      value: '0'
+      value: -1
+    },
+    scene: {
+      value: -1
     }
   }
 } 
 
+// 暴露
 defineExpose({
-  changeCancel
+  // 分区切换
+  changeArea,
+  // 线路切换
+  changeLine
 });
 
 </script>

From b8b6a46e7e5a4ff31bf3428aa16a1fc1a1746800 Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Thu, 25 Jul 2024 11:55:32 +0800
Subject: [PATCH 2/9] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=BE=E5=A4=87=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/components/ns-steps.vue      |  2 +-
 .../view/alarmManagement/alarmOverview/index.vue   |  2 +-
 .../energyAlarm/configureEnergyAlarms.vue          |  2 +-
 .../energyAlarm/editConfigureEnergyAlarm.vue       |  3 ++
 .../alarmSettings/energyAlarm/editeEnergyAlarm.vue |  9 ++++
 .../equipmentAlarm/configureDeviceAlarms.vue       |  2 +-
 .../equipmentAlarm/editConfigureDeviceAlarm.vue    |  3 ++
 .../equipmentAlarm/editeEquipmentAlarm.vue         |  7 +++
 .../alarmSettings/ts/energyAlarmConfig.ts          |  5 ++
 .../alarmSettings/ts/equipmentAlarmConfig.ts       |  6 +++
 .../ts/notificationManagementConfig.ts             |  5 ++
 .../src/view/alarmManagement/energyAlarm/look.vue  |  4 +-
 .../view/alarmManagement/energyAlarm/status.vue    | 55 +++++++++++++++-------
 .../view/alarmManagement/energyAlarm/ts/config.ts  |  5 ++
 .../view/alarmManagement/equipmentAlarm/status.vue | 35 ++++++++------
 .../alarmManagement/equipmentAlarm/ts/config.ts    | 12 +++++
 .../view/alarmManagement/gatewayAlarm/status.vue   | 10 ++--
 .../view/alarmManagement/gatewayAlarm/ts/config.ts |  6 +++
 18 files changed, 131 insertions(+), 42 deletions(-)

diff --git a/hx-ai-intelligent/src/components/ns-steps.vue b/hx-ai-intelligent/src/components/ns-steps.vue
index d164d0c..54c8ce3 100644
--- a/hx-ai-intelligent/src/components/ns-steps.vue
+++ b/hx-ai-intelligent/src/components/ns-steps.vue
@@ -9,7 +9,7 @@
           <div class="card">
             <div class="card-title">
               <a-tag class="card-title-tag" :color="item.color">{{ item.stateName }}</a-tag>
-              <div class="name">{{ item.createName }}</div>
+              <div class="name">{{ item.realName }}</div>
               <div class="time">{{ item.createTime }}</div>
             </div>
             <div style="width: 100%; color: #3a3a3a; height: 25px; overflow: auto">
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue
index 9e05fda..b4a2cc2 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue
@@ -20,7 +20,7 @@
             </div>
           </div>
           <div class="item-box-right">
-            <img width="54px" height="54px" src="../../../../src/icon/gaojingtonglan.svg" />
+            <img width="48px" height="48px" src="../../../../src/icon/gaojingtonglan.svg" />
           </div>
         </div>
       </div>
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
index 8ff8e1e..ffab04e 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
@@ -288,7 +288,7 @@
               },
             ],
           },
-          params: { energyConsumptionAlarmId: value.id },
+          params: { energyConsumptionAlarmId: value.id, orgId: orgId.value },
           // pagination: { pageSizeOptions: false },
           rowKey: 'id',
         };
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 d5f1fad..efe9f92 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
@@ -394,6 +394,9 @@
     formRef.value.validate().then(() => {
       //处理数据
       let data = { ...infoObject.value };
+      if (!data.orgId) {
+        data.orgId = orgId.value;
+      }
       //关联能耗告警id
       data.energyConsumptionAlarmId = energyAlarm.value.id;
       data.errorCode = energyAlarm.value.errorCode;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
index 4fca329..9d20d37 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
@@ -87,6 +87,11 @@
       infoObject.value.intervalDurationUnit = 1;
     }
   };
+  //组织id
+  const orgId = ref('');
+  const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+  orgId.value = result;
+
   //表单数据
   const infoObject = ref({
     alarmTitle: null,
@@ -94,6 +99,7 @@
     priority: null,
     monitorFrequency: null,
     createWorkOrder: null,
+    orgId: null,
     enableRules: 0,
   });
   const formRef = ref();
@@ -245,6 +251,9 @@
     //表单校验
     formRef.value.validate().then(() => {
       let data = { ...infoObject.value };
+      if (!data.orgId) {
+        data.orgId = orgId.value;
+      }
       data.createWorkOrder = Number(data.createWorkOrder);
       if (data.alarmFrequency !== 2) {
         data.repetitions = null;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
index cdf021e..e8fcf98 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
@@ -279,7 +279,7 @@
               },
             ],
           },
-          params: { equipmentAlarmId: value.id },
+          params: { equipmentAlarmId: value.id, orgId: orgId.value },
           // pagination: { pageSizeOptions: false },
           rowKey: 'id',
         };
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 cd66023..4818fab 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -412,6 +412,9 @@
     //数据是否验证通过
     formRef.value.validate().then(() => {
       let data = { ...infoObject.value };
+      if (!data.orgId) {
+        data.orgId = orgId.value;
+      }
       // 配置关联id
       data.equipmentAlarmId = equipmentAlarm.value.id;
       // 逻辑列表
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
index 5bef45f..cb947bb 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
@@ -87,6 +87,10 @@
   import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms';
 
   const visible = ref(false);
+  //组织id
+  const orgId = ref('');
+  const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+  orgId.value = result;
   //表单数据
   const infoObject = ref({
     id: null,
@@ -316,6 +320,9 @@
         data.intervalDuration = null;
         data.intervalDurationUnit = null;
       }
+      if (!data.orgId) {
+        data.orgId = orgId.value;
+      }
       http.post(deviceAlarms.addOrUpNewData, data).then(() => {
         if (infoObject.value.id) {
           NsMessage.success('告警编辑成功');
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
index d1e199d..037d9c6 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
@@ -1,7 +1,11 @@
 import { http } from '/nerv-lib/util';
 import { NsMessage } from '/nerv-lib/component';
 import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm';
+import { ref } from 'vue';
 
+const orgId = ref('');
+const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+orgId.value = result;
 const tableKeyMap = [
   {
     title: '序号',
@@ -214,6 +218,7 @@ export const energyAlarmConfigs = (
         },
       ],
     },
+    params: { orgId: orgId.value },
     // pagination: { pageSizeOptions: false },
     rowKey: 'id',
   };
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
index 656c80b..6bb6bc2 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
@@ -1,6 +1,11 @@
 import { http } from '/nerv-lib/util';
 import { NsMessage } from '/nerv-lib/component';
 import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms';
+import { ref } from 'vue';
+
+const orgId = ref('');
+const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+orgId.value = result;
 const tableKeyMap = [
   {
     title: '序号',
@@ -212,6 +217,7 @@ export const equipmentAlarmTableConfig = (
         },
       ],
     },
+    params: { orgId: orgId.value },
     // pagination: { pageSizeOptions: false },
     rowKey: 'id',
   };
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts
index 4060707..838cdfc 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts
@@ -1,5 +1,9 @@
 import { notificationManagementApi } from '/@/api/alarmManagement/alarmSettings/notificationManagements';
+import { ref } from 'vue';
 
+const orgId = ref('');
+const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+orgId.value = result;
 const tableKeyMap = [
   {
     title: '序号',
@@ -146,6 +150,7 @@ export const notificationtableConfig = (notificationManagements: any) => {
         },
       ],
     },
+    params: { orgId: orgId.value },
     // pagination: { pageSizeOptions: false },
     rowKey: 'id',
   };
diff --git a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue
index 884fa63..3f9300f 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue
@@ -67,7 +67,7 @@
     errorCode: null,
     alarmTitle: null,
     abnormalDescription: null,
-    deviceInfo: null,
+    monitoringPoints: null,
     alarmRepetitions: null,
     updateTime: null,
   });
@@ -84,7 +84,7 @@
       errorCode: null,
       alarmTitle: null,
       abnormalDescription: null,
-      deviceInfo: null,
+      monitoringPoints: null,
       alarmRepetitions: null,
       updateTime: null,
     };
diff --git a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue
index 0ee7b22..d27a439 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue
@@ -11,7 +11,7 @@
     <a-tabs>
       <a-tab-pane key="1" tab="更新状态">
         <div style="width: 100%; padding: 24px">
-          <a-form ref="formRef" :model="infoObject">
+          <a-form ref="formRef" :model="infoObject" :rules="rules">
             <a-form-item ref="state" label="当前状态" name="state">
               <a-select
                 v-model:value="infoObject.state"
@@ -67,31 +67,53 @@
       const energyAlarm = ref({});
       const stateOptions = ref();
       const logList = ref([]);
+      const formRef = ref();
       const config = ref({
         size: logList.value.length,
         dataSource: logList.value,
       });
+      // 表单校验
+      const rules = {
+        remarks: [
+          {
+            required: true,
+            message: '请输入备注',
+            trigger: 'change',
+            validator: (rules, remarks, cbfn) => {
+              if (remarks && remarks.trim() !== '') {
+                cbfn();
+              } else {
+                cbfn('备注不能为空');
+              }
+            },
+          },
+        ],
+        state: [{ required: true, message: '请选择当前状态', trigger: 'change' }],
+      };
       const handleClose = () => {
         showEdit.value = true;
         energyAlarm.value = {};
         infoObject.value = {};
         visible.value = false;
+        config.value.dataSource = [];
       };
       const btnClick = () => {
-        delete infoObject.value.createTime;
-        infoObject.value.alarmEnergyConsumptionLogId = energyAlarm.value.id;
-        if (energyAlarm.value.createWorkOrder === 0) {
-          http.post(energyAlarmApi.noCreatOrUpdateLog, infoObject.value).then((res) => {
-            if (res.msg === 'success') {
-              NsMessage.success('操作成功');
-              showEdit.value = true;
-              energyAlarm.value = {};
-              infoObject.value = {};
-              visible.value = false;
-              emit('logAdd', null);
-            }
-          });
-        }
+        formRef.value.validate().then(() => {
+          delete infoObject.value.createTime;
+          infoObject.value.alarmEnergyConsumptionLogId = energyAlarm.value.id;
+          if (energyAlarm.value.createWorkOrder === 0) {
+            http.post(energyAlarmApi.noCreatOrUpdateLog, infoObject.value).then((res) => {
+              if (res.msg === 'success') {
+                NsMessage.success('操作成功');
+                showEdit.value = true;
+                energyAlarm.value = {};
+                infoObject.value = {};
+                visible.value = false;
+                emit('logAdd', null);
+              }
+            });
+          }
+        });
       };
       //修改状态
       const changeShowEdit = () => {
@@ -119,7 +141,6 @@
             { value: 5, label: '已关闭' },
           ];
         }
-        console.log(data, 'data');
         await http
           .post(energyAlarmApi.getSelectAlarmEnergyConsumptionLogStatusProcess, {
             alarmEnergyConsumptionLogId: data.id,
@@ -149,6 +170,8 @@
         infoObject,
         changeShowEdit,
         showEdit,
+        rules,
+        formRef,
         energyAlarm,
         stateOptions,
         btnClick,
diff --git a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/ts/config.ts
index 890cebd..dda6037 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/ts/config.ts
@@ -1,6 +1,10 @@
 import { energyAlarmApi } from '/@/api/alarmManagement/energyAlarm';
 import { dict } from '/@/api';
+import { ref } from 'vue';
 
+const orgId = ref('');
+const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+orgId.value = result;
 const tableKeyMap = [
   {
     title: '序号',
@@ -181,6 +185,7 @@ export const notificationtableConfig = (look: any, status: any) => {
         },
       ],
     },
+    params: { orgId: orgId.value },
     // pagination: { pageSizeOptions: false },
     rowKey: 'id',
   };
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
index f945045..d29f9e2 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
@@ -67,6 +67,7 @@
       const equipmentAlarm = ref({});
       const stateOptions = ref();
       const logList = ref([]);
+      const formRef = ref();
       const config = ref({
         size: logList.value.length,
         dataSource: logList.value,
@@ -94,22 +95,26 @@
         equipmentAlarm.value = {};
         infoObject.value = {};
         visible.value = false;
+        config.value.dataSource = [];
+        logList.value = [];
       };
       const btnClick = () => {
-        delete infoObject.value.createTime;
-        infoObject.value.alarmEquipmentLogId = equipmentAlarm.value.id;
-        if (equipmentAlarm.value.createWorkOrder === 0) {
-          http.post(equipmentAlarmApi.noCreatOrUpdateLog, infoObject.value).then((res) => {
-            if (res.msg === 'success') {
-              NsMessage.success('操作成功');
-              showEdit.value = true;
-              equipmentAlarm.value = {};
-              infoObject.value = {};
-              visible.value = false;
-              emit('logAdd', null);
-            }
-          });
-        }
+        formRef.value.validate().then(() => {
+          delete infoObject.value.createTime;
+          infoObject.value.alarmEquipmentLogId = equipmentAlarm.value.id;
+          if (equipmentAlarm.value.createWorkOrder === 0) {
+            http.post(equipmentAlarmApi.noCreatOrUpdateLog, infoObject.value).then((res) => {
+              if (res.msg === 'success') {
+                NsMessage.success('操作成功');
+                showEdit.value = true;
+                equipmentAlarm.value = {};
+                infoObject.value = {};
+                visible.value = false;
+                emit('logAdd', null);
+              }
+            });
+          }
+        });
       };
       //修改状态
       const changeShowEdit = () => {
@@ -137,7 +142,6 @@
             { value: 5, label: '已关闭' },
           ];
         }
-        console.log(data, 'data');
         await http
           .post(equipmentAlarmApi.getSelectAlarmEquipmentLogStatusProcess, {
             alarmEquipmentLogId: data.id,
@@ -166,6 +170,7 @@
       return {
         infoObject,
         rules,
+        formRef,
         changeShowEdit,
         showEdit,
         equipmentAlarm,
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
index 3eb8c9e..45adaec 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
@@ -1,4 +1,9 @@
 import { equipmentAlarmApi } from '/@/api/alarmManagement/equipmentAlarm';
+import { ref } from 'vue';
+
+const orgId = ref('');
+const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+orgId.value = result;
 
 const tableKeyMap = [
   {
@@ -20,18 +25,23 @@ const tableKeyMap = [
   {
     title: '优先级',
     dataIndex: 'priority',
+    width: 80,
   },
   {
     title: '状态',
     dataIndex: 'alarmLogState',
+    width: 100,
   },
   {
     title: '错误码',
     dataIndex: 'errorCode',
+    width: 100,
   },
   {
     title: '设备信息',
     dataIndex: 'deviceInfo',
+    width: 400,
+    // textEllipsis: true,
   },
   {
     title: '更新时间',
@@ -40,6 +50,7 @@ const tableKeyMap = [
   {
     title: '重复次数',
     dataIndex: 'alarmRepetitions',
+    width: 80,
   },
 ];
 export const notificationtableConfig = (look: any, status: any) => {
@@ -155,6 +166,7 @@ export const notificationtableConfig = (look: any, status: any) => {
         },
       ],
     },
+    params: { orgId: orgId.value },
     // pagination: { pageSizeOptions: false },
     rowKey: 'id',
   };
diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue
index 6664644..49dfa8e 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue
@@ -62,11 +62,11 @@
         { value: 5, label: '已关闭' },
       ]);
       const logList = ref([
-        { createName: '李四', state: 3, time: '2024-03-10 10:00:00', desc: '完成' },
-        { createName: '王五', state: 5, time: '2024-03-10 10:00:00' },
-        { createName: '王五', state: 4, time: '2024-03-10 10:00:00' },
-        { createName: '王五', state: 2, time: '2024-03-10 10:00:00', desc: '创建工单' },
-        { createName: '赵六', state: 1, time: '2024-03-10 10:00:00' },
+        { realName: '李四', state: 3, createTime: '2024-03-10 10:00:00', remarks: '完成' },
+        { realName: '王五', state: 5, createTime: '2024-03-10 10:00:00' },
+        { realName: '王五', state: 4, createTime: '2024-03-10 10:00:00' },
+        { realName: '王五', state: 2, createTime: '2024-03-10 10:00:00', remarks: '创建工单' },
+        { realName: '赵六', state: 1, createTime: '2024-03-10 10:00:00' },
       ]);
       const config = ref({
         size: logList.value.length,
diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts
index 8e3b134..854974d 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts
@@ -1,4 +1,9 @@
 import { gatewayAlarmApi } from '/@/api/alarmManagement/gatewayAlarm';
+import { ref } from 'vue';
+
+const orgId = ref('');
+const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+orgId.value = result;
 const tableKeyMap = [
   {
     title: '序号',
@@ -139,6 +144,7 @@ export const notificationtableConfig = (look: any, status: any) => {
         },
       ],
     },
+    params: { orgId: orgId.value },
     // pagination: { pageSizeOptions: false },
     rowKey: 'id',
   };

From a9e69984305b6aa8d3738a4b890cd5d9d1dd2b85 Mon Sep 17 00:00:00 2001
From: chenpingsen <chenpingsen>
Date: Thu, 25 Jul 2024 14:14:55 +0800
Subject: [PATCH 3/9] =?UTF-8?q?fix:=E7=94=B5=E6=A2=AF=E7=B3=BB=E7=BB=9F/?=
 =?UTF-8?q?=E7=85=A7=E6=98=8E=E7=B3=BB=E7=BB=9F=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/view/equipmentControl/liftSystem/index.vue |  68 +-
 .../view/equipmentControl/liftSystem/liftInfo.vue  | 171 ++--
 .../equipmentControl/lightingManage/indexs.vue     | 450 +++++------
 .../view/equipmentControl/lightingManage/light.vue | 239 +++---
 .../view/equipmentControl/lightingManage/tabs1.vue | 891 +++++++++++----------
 .../view/equipmentControl/lightingManage/tabs2.vue | 329 ++++----
 .../view/equipmentControl/lightingManage/tabs3.vue | 330 ++++----
 7 files changed, 1242 insertions(+), 1236 deletions(-)

diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
index b9b21c4..c6705cc 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
@@ -1,53 +1,47 @@
 <template>
   <div class="map-box">
     <div class="map">
-      <liftInfo></liftInfo>
+      <liftInfo />
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
-import liftInfo from './liftInfo.vue'
-// 请求
-import { message } from 'ant-design-vue';
+  import { ref, onMounted } from 'vue';
+  import liftInfo from './liftInfo.vue';
+  // 请求
 
-// 初始化 ===========================================================
+  // 初始化 ===========================================================
 
-onMounted(() => {
-
-})
-
-// tab页部分 ========================================================
-
-// 表格数据
-const dataSource = ref([]);
+  onMounted(() => {});
 
+  // tab页部分 ========================================================
 
+  // 表格数据
+  const dataSource = ref([]);
 </script>
 <style lang="less" scoped>
-.map-box {
-  // 颜色变量，用于区别颜色
-
-  // 正常 - 开启 - 上行 -下行 
-  --on: #0DFFA4;
-  // 关闭
-  --off: #BFCDE2;
-  // 暂停 - 维修
-  --pause: #FFBC46;
-  // 告警 - 急停
-  --stop: #F36163;
-  // 故障
-  --fault: #FF7636;
-  // 未知
-  --unknown: #A742FF; 
-  width: 100%;
-  height: 100%;
-  .map {
-    width: 1280px;
-    height: 720px;
-    background-image: url(../image/bg.jpg);
+  .map-box {
+    // 颜色变量，用于区别颜色
+
+    // 正常 - 开启 - 上行 -下行
+    --on: #0dffa4;
+    // 关闭
+    --off: #bfcde2;
+    // 暂停 - 维修
+    --pause: #ffbc46;
+    // 告警 - 急停
+    --stop: #f36163;
+    // 故障
+    --fault: #ff7636;
+    // 未知
+    --unknown: #a742ff;
+    width: 100%;
+    height: 100%;
+    .map {
+      width: 1280px;
+      height: 720px;
+      background-image: url(../image/bg.jpg);
+    }
   }
-}
-
 </style>
diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
index 3b63442..d6e50fd 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
@@ -10,7 +10,7 @@
         <div class="item-box">
           <div class="icon">
             <div class="icon-item">
-              <img src="../image/liftState/lift-normal.svg" alt="">
+              <img src="../image/liftState/lift-normal.svg" alt="" />
             </div>
           </div>
         </div>
@@ -21,7 +21,7 @@
         <div class="item-box">
           <div class="icon">
             <div class="icon-item">
-              <img src="../image/liftState/lift-normal.svg" alt="">
+              <img src="../image/liftState/lift-normal.svg" alt="" />
             </div>
           </div>
         </div>
@@ -32,7 +32,7 @@
         <div class="item-box">
           <div class="icon">
             <div class="icon-item">
-              <img src="../image/liftState/lift-normal.svg" alt="">
+              <img src="../image/liftState/lift-normal.svg" alt="" />
             </div>
           </div>
         </div>
@@ -43,109 +43,104 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
+  import { ref, onMounted } from 'vue';
 
-// 请求
+  // 请求
 
-// 初始化 ===========================================================
+  // 初始化 ===========================================================
 
-onMounted(() => {
-
-})
-
-// tab页部分 ========================================================
-
-// 运行状态
-const runState = ref('1');
-// 电梯状态
-const liftState = ref('2');
+  onMounted(() => {});
 
+  // tab页部分 ========================================================
 
+  // 运行状态
+  const runState = ref('1');
+  // 电梯状态
+  const liftState = ref('2');
 </script>
 <style lang="less" scoped>
-// 面板
-.info-box {
-  // 字体颜色变量
-  --text: rgb(20, 255, 255);
+  // 面板
+  .info-box {
+    // 字体颜色变量
+    --text: rgb(20, 255, 255);
 
-  width: 240px;
-  height: 130px;
-  display: flex;
-  gap: 5px;
-  flex-direction: column;
-  background: rgb(17, 44, 86, 0.9);
-  border-radius: 8px;
-  box-sizing: border-box;
-  padding: 8px;
-  border: 3px solid var(--text);
-  // 面板标题
-  .box-title {
-    height: auto;
-    color: var(--text);
-    // 标题前小方块
-    .dot {
-      display: inline-block;
-      width: 2px;
-      height: 16px;
-      vertical-align: middle;
-      background: var(--text);
-    }
-    // 标题
-    span {
-      padding-left: 8px;
-    }
-  }
-  // 下半部分
-  .box-inner {
-    flex: 1;
+    width: 240px;
+    height: 130px;
     display: flex;
-    padding: 0 10px;
-    // 单个盒子（3盒子）
-    .item {
+    gap: 5px;
+    flex-direction: column;
+    background: rgb(17, 44, 86, 0.9);
+    border-radius: 8px;
+    box-sizing: border-box;
+    padding: 8px;
+    border: 3px solid var(--text);
+    // 面板标题
+    .box-title {
+      height: auto;
+      color: var(--text);
+      // 标题前小方块
+      .dot {
+        display: inline-block;
+        width: 2px;
+        height: 16px;
+        vertical-align: middle;
+        background: var(--text);
+      }
+      // 标题
+      span {
+        padding-left: 8px;
+      }
+    }
+    // 下半部分
+    .box-inner {
       flex: 1;
       display: flex;
-      flex-direction: column;
-      // 盒子中放置图片的容器
-      .item-box {
+      padding: 0 10px;
+      // 单个盒子（3盒子）
+      .item {
         flex: 1;
         display: flex;
-        align-items: center;
-        justify-content: center;
-        // border: 1px solid red;
-        .icon {
-          width: 55px;
-          height: 55px;
-          background-image: url(../image/box.svg);
-          background-size: 130% 130%;
-          background-repeat: no-repeat;
-          background-position: left -8px top -8px;
+        flex-direction: column;
+        // 盒子中放置图片的容器
+        .item-box {
+          flex: 1;
+          display: flex;
+          align-items: center;
+          justify-content: center;
           // border: 1px solid red;
-          position: relative;
-          .icon-item {
-            position: absolute;
-            width: 20px;
-            height: 20px;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            top: 0;
-            margin: auto;
-            img {
-              width: 100%;
-              height: 100%;
+          .icon {
+            width: 55px;
+            height: 55px;
+            background-image: url(../image/box.svg);
+            background-size: 130% 130%;
+            background-repeat: no-repeat;
+            background-position: left -8px top -8px;
+            // border: 1px solid red;
+            position: relative;
+            .icon-item {
+              position: absolute;
+              width: 20px;
+              height: 20px;
+              left: 0;
+              right: 0;
+              bottom: 0;
+              top: 0;
+              margin: auto;
+              img {
+                width: 100%;
+                height: 100%;
+              }
             }
           }
         }
-      }
-      .item-text {
-        height: 20px;
-        text-align: center;
-        font-size: 12px;
-        color: white;
-        user-select: none;
+        .item-text {
+          height: 20px;
+          text-align: center;
+          font-size: 12px;
+          color: white;
+          user-select: none;
+        }
       }
     }
   }
-}
-
 </style>
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
index 1297d9d..e03748d 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
@@ -1,286 +1,276 @@
 <template>
-    <div class="lighting-box">
-        <div class="lighting-img-box">
-            <!-- 左上角，区域切换 -->
-            <div class="btn-box">
-                <button v-for="item in floorData" class="btn-item" @click=changeFloor(item.childList)>{{ item.name }}</button>
+  <div class="lighting-box">
+    <div class="lighting-img-box">
+      <!-- 左上角，区域切换 -->
+      <div class="btn-box">
+        <button v-for="item in floorData" class="btn-item" @click="changeFloor(item.childList)">{{
+          item.name
+        }}</button>
+      </div>
+      <!-- 楼层区域 -->
+      <div class="area">
+        <div
+          v-for="(item, index) in treeData"
+          :class="computedClass(item.id)"
+          @click="changeThisArea([item])"
+          :key="index">
+          <div v-for="(v, i) in item.childList" :key="i" class="light-group">
+            <div class="group-shadow" @click.stop="changeThisArea([item, v])">
+              <div :class="computedClass(v.id)" class="shadow-box"></div>
             </div>
-            <!-- 楼层区域 -->
-            <div class="area">
-                <div 
-                v-for="(item, index) in treeData" 
-                :class="computedClass(item.id)"
-                @click="changeThisArea([item])"
-                :key="index">
-                    <div v-for="(v, i) in item.childList" :key="i" class="light-group">
-                        <div class="group-shadow" @click.stop="changeThisArea([item, v])">
-                            <div :class="computedClass(v.id)" class="shadow-box"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!-- 照明设备 -->
-            <div class="lights">
-                <light v-for="(item, index) in bulbs" 
-                :key="index" 
-                :styleObject="item.styleText" 
-                :type="item.type" 
-                :visible="item.visible">
-                </light>
-            </div>
-        </div>
-        <!-- 右侧抽屉的触发按钮 -->
-        <div class="drawer-box-in" v-if="!visible" @click="toggleDrawer">
-            <double-left-outlined class="drawer-icon" style="color: white" />
-        </div>
-        <!-- 左侧抽屉的关闭按钮 -->
-        <div class="drawer-box-out" v-if="visible" @click="toggleDrawer">
-            <double-right-outlined class="drawer-icon" style="color: white;" />
+          </div>
         </div>
-        <!-- 右侧抽屉 -->
-        <a-drawer
-        v-model:visible="visible"
-        class="drawer-item"
-        width="496"
-        :forceRender="preload"
-        placement="right"
-        :body-style="{ background: 'rgba(0, 0, 0)', opacity: 0.8 }"
-        :closable="false"
-        id="drawer"
-        :maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }">
-            <a-tabs v-model:activeKey="activeKey">
-                <a-tab-pane key="1" tab="控制面板">
-                    <tabs1 
-                    ref="tabs1Ref"
-                    @changeArea="changeArea" 
-                    @reset="reset" 
-                    :treeData="treeData" 
-                    ></tabs1>
-                </a-tab-pane>
-                <a-tab-pane key="2" tab="计划列表" force-render>
-                    <tabs2></tabs2>
-                </a-tab-pane>
-                <a-tab-pane key="3" tab="日志">
-                    <tabs3></tabs3>
-                </a-tab-pane>
-            </a-tabs>
-        </a-drawer>
+      </div>
+      <!-- 照明设备 -->
+      <div class="lights">
+        <light
+          v-for="(item, index) in bulbs"
+          :key="index"
+          :styleObject="item.styleText"
+          :type="item.type"
+          :visible="item.visible" />
+      </div>
     </div>
+    <!-- 右侧抽屉的触发按钮 -->
+    <div class="drawer-box-in" v-if="!visible" @click="toggleDrawer">
+      <double-left-outlined class="drawer-icon" style="color: white" />
+    </div>
+    <!-- 左侧抽屉的关闭按钮 -->
+    <div class="drawer-box-out" v-if="visible" @click="toggleDrawer">
+      <double-right-outlined class="drawer-icon" style="color: white" />
+    </div>
+    <!-- 右侧抽屉 -->
+    <a-drawer
+      v-model:visible="visible"
+      class="drawer-item"
+      width="496"
+      :forceRender="preload"
+      placement="right"
+      :body-style="{ background: 'rgba(0, 0, 0)', opacity: 0.8 }"
+      :closable="false"
+      id="drawer"
+      :maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }">
+      <a-tabs v-model:activeKey="activeKey">
+        <a-tab-pane key="1" tab="控制面板">
+          <tabs1 ref="tabs1Ref" @changeArea="changeArea" @reset="reset" :treeData="treeData" />
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="计划列表" force-render>
+          <tabs2 />
+        </a-tab-pane>
+        <a-tab-pane key="3" tab="日志">
+          <tabs3 />
+        </a-tab-pane>
+      </a-tabs>
+    </a-drawer>
+  </div>
 </template>
-  
-<script setup lang="ts">
-
-import { ref, onMounted } from 'vue';
-// 组件
-import light from './light.vue';
-import tabs1 from './tabs1.vue'
-import tabs2 from './tabs2.vue'
-import tabs3 from './tabs3.vue'
-// 请求
-import { http } from '/nerv-lib/util/http';
-import { lightingManage } from '/@/api/IlluminationInfo';
-// ICON
-import {
-    DoubleLeftOutlined,
-    DoubleRightOutlined
-} from '@ant-design/icons-vue';
 
+<script setup lang="ts">
+  import { ref, onMounted } from 'vue';
+  // 组件
+  import light from './light.vue';
+  import tabs1 from './tabs1.vue';
+  import tabs2 from './tabs2.vue';
+  import tabs3 from './tabs3.vue';
+  // 请求
+  import { http } from '/nerv-lib/util/http';
+  import { lightingManage } from '/@/api/IlluminationInfo';
+  // ICON
+  import { DoubleLeftOutlined, DoubleRightOutlined } from '@ant-design/icons-vue';
 
-// 初始化 =======================================================
+  // 初始化 =======================================================
 
-onMounted(() => {
+  onMounted(() => {
     // 获得分区与线路的结构
-    getAllArea()
-})
-
-// 预加载flag，获得分区数据后，预加载抽屉，防止获取ref报错
-const preload = ref(false)
+    getAllArea();
+  });
 
+  // 预加载flag，获得分区数据后，预加载抽屉，防止获取ref报错
+  const preload = ref(false);
 
-// 分层业务 =====================================================
+  // 分层业务 =====================================================
 
-// 所有楼层的数据
-const floorData = ref([])
-// 左上角分层切换
-const changeFloor = (area: any) => {
+  // 所有楼层的数据
+  const floorData = ref([]);
+  // 左上角分层切换
+  const changeFloor = (area: any) => {
     // 重置数据
-    reset()
+    reset();
     // 重置视图
-    changeArea(['1'])
+    changeArea(['1']);
     // 切换楼层数据
-    treeData.value = area
+    treeData.value = area;
     // 默认选择第一项
-    treeData.value[0].selected = true
-}
+    treeData.value[0].selected = true;
+  };
 
+  // 分区业务 =====================================================
 
-// 分区业务 =====================================================
-
-// 分区结构树
-const treeData = ref([])
-// 当前选中的分区序列 - 用于样式渲染
-const area = ref(['1'])
-// 线路内小灯泡 - 此处位置需前端写死
-const bulbs = ref([
+  // 分区结构树
+  const treeData = ref([]);
+  // 当前选中的分区序列 - 用于样式渲染
+  const area = ref(['1']);
+  // 线路内小灯泡 - 此处位置需前端写死
+  const bulbs = ref([
     {
-        styleText: { left: '180px', bottom: '200px' },
-        area: 1,
-        type: 1,
-        visible: true
+      styleText: { left: '180px', bottom: '200px' },
+      area: 1,
+      type: 1,
+      visible: true,
     },
     {
-        styleText: { left: '230px', bottom: '125px' },
-        area: 1,
-        type: 2,
-        visible: true
+      styleText: { left: '230px', bottom: '125px' },
+      area: 1,
+      type: 2,
+      visible: true,
     },
     {
-        styleText: { left: '320px', bottom: '140px' },
-        area: 1,
-        type: 3,
-        visible: true
+      styleText: { left: '320px', bottom: '140px' },
+      area: 1,
+      type: 3,
+      visible: true,
     },
     {
-        styleText: { left: '245px', bottom: '230px' },
-        area: 1,
-        type: 3,
-        visible: true
+      styleText: { left: '245px', bottom: '230px' },
+      area: 1,
+      type: 3,
+      visible: true,
     },
     {
-        styleText: { left: '405px', bottom: '230px' },
-        area: 2,
-        type: 3,
-        visible: true
+      styleText: { left: '405px', bottom: '230px' },
+      area: 2,
+      type: 3,
+      visible: true,
     },
     {
-        styleText: { left: '460px', bottom: '180px' },
-        area: 2,
-        type: 3,
-        visible: true
+      styleText: { left: '460px', bottom: '180px' },
+      area: 2,
+      type: 3,
+      visible: true,
     },
     {
-        styleText: { left: '360px', bottom: '275px' },
-        area: 2,
-        type: 3,
-        visible: true
+      styleText: { left: '360px', bottom: '275px' },
+      area: 2,
+      type: 3,
+      visible: true,
     },
     {
-        styleText: { left: '715px', bottom: '320px' },
-        area: 3,
-        type: 1,
-        visible: true
+      styleText: { left: '715px', bottom: '320px' },
+      area: 3,
+      type: 1,
+      visible: true,
     },
-])
-// 由子组件控制的分区与线路切换
-const changeArea = (result: any) => {
-    console.log(result,'changeArea')
+  ]);
+  // 由子组件控制的分区与线路切换
+  const changeArea = (result: any) => {
+    console.log(result, 'changeArea');
     // 数组
     if (Array.isArray(result)) {
-        area.value = result
-    // 不是数组
+      area.value = result;
+      // 不是数组
     } else {
-        area.value.length = 0
-        area.value[0] = String(result)
-    } 
-}
-// 由当前组件控制的分区切换
-const changeThisArea = (result: any) => {
-    console.log(result, 'changeThisArea')
+      area.value.length = 0;
+      area.value[0] = String(result);
+    }
+  };
+  // 由当前组件控制的分区切换
+  const changeThisArea = (result: any) => {
+    console.log(result, 'changeThisArea');
     // 修改前，将所有选项置空
-    reset()
+    reset();
     let level1 = result[0];
-    area.value.length = 0
+    area.value.length = 0;
     // 只选择了分区
     if (result.length === 1) {
-        result[0].selected = true
-        area.value.push(result[0].id)
-        // 控制子组件按钮区
-        tabs1Ref.value.changeArea(result[0])
-    // 选择了分区 + 线路
+      result[0].selected = true;
+      area.value.push(result[0].id);
+      // 控制子组件按钮区
+      tabs1Ref.value.changeArea(result[0]);
+      // 选择了分区 + 线路
     } else if (result.length === 2) {
-        // 如果没有分区，默认选择第一个
-        if (!level1) {
-            level1 = treeData.value[0]
-        }
-        // 选中状态都设为true
-        level1.selected = result[1].selected  = true
-        area.value.splice(0, 0, level1.id, result[1].id)
-        // 控制子组件按钮区
-        tabs1Ref.value.changeArea(result[0])
-        tabs1Ref.value.changeLine(result[1])
+      // 如果没有分区，默认选择第一个
+      if (!level1) {
+        level1 = treeData.value[0];
+      }
+      // 选中状态都设为true
+      level1.selected = result[1].selected = true;
+      area.value.splice(0, 0, level1.id, result[1].id);
+      // 控制子组件按钮区
+      tabs1Ref.value.changeArea(result[0]);
+      tabs1Ref.value.changeLine(result[1]);
     }
-}
-// 重置分区树所有当前选项
-const reset = () => {
+  };
+  // 重置分区树所有当前选项
+  const reset = () => {
     treeData.value.forEach((item: any) => {
-        item.selected = false
-        item.childList.forEach((i: any) => {
-            i.selected = false
-        })
-    })
-}
-// 俯视图分区选中计算函数
-const computedClass = (string: string) => {
+      item.selected = false;
+      item.childList.forEach((i: any) => {
+        i.selected = false;
+      });
+    });
+  };
+  // 俯视图分区选中计算函数
+  const computedClass = (string: string) => {
     if (area.value.indexOf(string) != -1) {
-        return `isActive area-item area${string}`
+      return `isActive area-item area${string}`;
     } else {
-        return `area-item area${string}`
+      return `area-item area${string}`;
     }
-}
+  };
 
-// 获得所有分区
-const getAllArea = () => {
-    http.get(lightingManage.getArea, { projectId: 'HLlmTZp8' }).then(res => {
-        const data = res.data
-        floorData.value = data
-        /** 只在前端使用的变量
-         * @param id 用于判断样式和层级的前端属性
-         * @param selected 用于表示是否选中的前端属性
-         */
-        data.forEach((floor: any) => {
-            floor.childList.forEach((item: any, index: number) => {
-                if (index == 0) {
-                    item.selected = true
-                } else {
-                    item.selected = false
-                }
-                item.id = String(index + 1)
-                item.childList.forEach((v: any, i: number) => {
-                    v.selected = false
-                    v.id = (index + 1) + '-' + (i + 1)
-                })
-            })
-        })
-        // 默认展示 线路 1-1
-        treeData.value = data[0].childList
-        // 开始预加载
-        preload.value = true
-    })
-}
+  // 获得所有分区
+  const getAllArea = () => {
+    http.get(lightingManage.getArea, { projectId: 'HLlmTZp8' }).then((res) => {
+      const data = res.data;
+      floorData.value = data;
+      /** 只在前端使用的变量
+       * @param id 用于判断样式和层级的前端属性
+       * @param selected 用于表示是否选中的前端属性
+       */
+      data.forEach((floor: any) => {
+        floor.childList.forEach((item: any, index: number) => {
+          if (index == 0) {
+            item.selected = true;
+          } else {
+            item.selected = false;
+          }
+          item.id = String(index + 1);
+          item.childList.forEach((v: any, i: number) => {
+            v.selected = false;
+            v.id = index + 1 + '-' + (i + 1);
+          });
+        });
+      });
+      // 默认展示 线路 1-1
+      treeData.value = data[0].childList;
+      // 开始预加载
+      preload.value = true;
+    });
+  };
 
-// 抽屉业务 =====================================================
+  // 抽屉业务 =====================================================
 
-// 抽屉 - 当前选择的tab
-let activeKey = ref('1');
-// 抽屉 - 打开状态
-let visible = ref(false);
-// 抽屉 - 开关事件
-const toggleDrawer = () => {
+  // 抽屉 - 当前选择的tab
+  let activeKey = ref('1');
+  // 抽屉 - 打开状态
+  let visible = ref(false);
+  // 抽屉 - 开关事件
+  const toggleDrawer = () => {
     visible.value = !visible.value;
-};
-// 抽屉tab1组件的引用
-const tabs1Ref = ref()
-
+  };
+  // 抽屉tab1组件的引用
+  const tabs1Ref = ref();
 </script>
 <style lang="less" scoped>
-@import "./index.less";
-// 当前选中分区的样式
-.isActive {
+  @import './index.less';
+
+  // 当前选中分区的样式
+  .isActive {
     border: 3px solid white !important;
-}
-// 抽屉顶部tab按钮样式
-:deep(.ant-tabs-tab-btn) {
+  }
+
+  // 抽屉顶部tab按钮样式
+  :deep(.ant-tabs-tab-btn) {
     color: white;
-}
+  }
 </style>
-  
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
index c9f361a..1f941b4 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
@@ -1,59 +1,59 @@
 <template>
-    <a-popover color="rgba(0, 0, 0, 0.8)">
-        <template #content>
-            <div class="light-tag">
-                <div class="light-tag-tit">
-                    <div>
-                        <img src="/asset/image//bulbLogo/21962.png" alt="" />
-                        <span class="tag-text">{{ result.name }}</span>
-                    </div>
-                    <button class="right-button">{{ type == 1 ? '正常' : '关闭' }}</button>
-                </div>
-                <div class="light-tag-box">
-                    <div class="tag-box-item">
-                        <img src="/asset/image//bulbLogo/22496.png" alt="" />
-                        <span class="title">控制模式</span>
-                        <span class="result">自动</span>
-                    </div>
-                    <div class="tag-box-item">
-                        <img src="/asset/image//bulbLogo/22496.png" alt="" />
-                        <span class="title">亮度</span>
-                        <span class="result">{{ result.brightness }}</span>
-                    </div>
-                    <div class="tag-box-item">
-                        <img src="/asset/image//bulbLogo/22496.png" alt="" />
-                        <span class="title">控制场景</span>
-                        <span class="result">{{ result.automatic2 }}</span>
-                    </div>
-                    <div class="tag-box-item">
-                        <img src="/asset/image//bulbLogo/22496.png" alt="" />
-                        <span class="title">色温</span>
-                        <span class="result">{{ result.brightness3 }}</span>
-                    </div>
-                </div>
-            </div>
-        </template>
-        <div class="icon-box" :style="styleObject" v-show="visible">
-            <img v-if="type == 1" class="icon-item" src="/asset/image/bulbLogo/22394.png" alt="">
-            <img v-if="type == 2" class="icon-item" src="/asset/image/bulbLogo/22396.png" alt="">
-            <img v-if="type == 3" class="icon-item" src="/asset/image/bulbLogo/22400.png" alt="">
+  <a-popover color="rgba(0, 0, 0, 0.8)">
+    <template #content>
+      <div class="light-tag">
+        <div class="light-tag-tit">
+          <div>
+            <img src="/asset/image//bulbLogo/21962.png" alt="" />
+            <span class="tag-text">{{ result.name }}</span>
+          </div>
+          <button class="right-button">{{ type == 1 ? '正常' : '关闭' }}</button>
         </div>
-    </a-popover>
+        <div class="light-tag-box">
+          <div class="tag-box-item">
+            <img src="/asset/image//bulbLogo/22496.png" alt="" />
+            <span class="title">控制模式</span>
+            <span class="result">自动</span>
+          </div>
+          <div class="tag-box-item">
+            <img src="/asset/image//bulbLogo/22496.png" alt="" />
+            <span class="title">亮度</span>
+            <span class="result">{{ result.brightness }}</span>
+          </div>
+          <div class="tag-box-item">
+            <img src="/asset/image//bulbLogo/22496.png" alt="" />
+            <span class="title">控制场景</span>
+            <span class="result">{{ result.automatic2 }}</span>
+          </div>
+          <div class="tag-box-item">
+            <img src="/asset/image//bulbLogo/22496.png" alt="" />
+            <span class="title">色温</span>
+            <span class="result">{{ result.brightness3 }}</span>
+          </div>
+        </div>
+      </div>
+    </template>
+    <div class="icon-box" :style="styleObject" v-show="visible">
+      <img v-if="type == 1" class="icon-item" src="/asset/image/bulbLogo/22394.png" alt="" />
+      <img v-if="type == 2" class="icon-item" src="/asset/image/bulbLogo/22396.png" alt="" />
+      <img v-if="type == 3" class="icon-item" src="/asset/image/bulbLogo/22400.png" alt="" />
+    </div>
+  </a-popover>
 </template>
-  
+
 <script setup lang="ts">
-import { ref } from 'vue';
+  import { ref } from 'vue';
 
-defineProps({
+  defineProps({
     styleObject: Object,
     type: Number,
     visible: {
-        type: Boolean,
-        default: false
-    }
-});
+      type: Boolean,
+      default: false,
+    },
+  });
 
-const result = ref({
+  const result = ref({
     id: '1',
     name: '站厅照明  1区',
     manual: '手动',
@@ -64,77 +64,86 @@ const result = ref({
     automatic2: '舒适',
     brightness3: '4000k',
     brightness4: '3800k',
-});
-
+  });
 </script>
 <style lang="less" scoped>
-    .icon-box {
-        width: 25px;
-        height: 25px;
-        position: absolute;
-        .icon-item {
-            width: 25px;
-            cursor: pointer;
-            transition: all ease 0.1s;
-        }
-        .icon-item:active {
-            transform: scale(1.2);
-        }
+  .icon-box {
+    width: 25px;
+    height: 25px;
+    position: absolute;
+
+    .icon-item {
+      width: 25px;
+      cursor: pointer;
+      transition: all ease 0.1s;
+    }
+
+    .icon-item:active {
+      transform: scale(1.2);
     }
-    // 悬浮窗外部
-    .light-tag {
-        display: flex;
-        flex-direction: column;
-        gap: 10px;
-        // 悬浮窗标题
-        .light-tag-tit {
-            display: flex;
-            justify-content: space-between;
-            vertical-align: middle;
-            height: 30px;
-            .tag-text {
-                font-size: 16px;
-                font-weight: 700;
-                color: white;
-                padding-left: 10px;
-            }
-            .right-button {
-                width: 50px;
-                height: 26px;
-                background: rgba(57, 215, 187, 0.1);
-                border: 1px solid rgba(57, 215, 187, 1);
-                font-size: 12px;
-                color: rgba(57, 215, 187, 1);
-            }
-        }
+  }
+
+  // 悬浮窗外部
+  .light-tag {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+
+    // 悬浮窗标题
+    .light-tag-tit {
+      display: flex;
+      justify-content: space-between;
+      vertical-align: middle;
+      height: 30px;
+
+      .tag-text {
+        font-size: 16px;
+        font-weight: 700;
+        color: white;
+        padding-left: 10px;
+      }
+
+      .right-button {
+        width: 50px;
+        height: 26px;
+        background: rgba(57, 215, 187, 0.1);
+        border: 1px solid rgba(57, 215, 187, 1);
+        font-size: 12px;
+        color: rgba(57, 215, 187, 1);
+      }
     }
-    // 悬浮窗底部4格子
-    .light-tag-box {
-        display: grid;
-        grid-template-columns: 1fr 1fr;
-        grid-template-rows: 1fr 1fr;
-        grid-gap: 10px;
-        .tag-box-item {
-            position: relative;
-            display: flex;
-            justify-content: space-between;
-            img {
-                width: 120px;
-                vertical-align: middle;
-            }
-            .title {
-                position: absolute;
-                left: 60px;
-                top: 13px;
-                color: rgba(64, 255, 252, 1);
-            }
-            .result {
-                line-height: 50px;
-                font-size: 16px;
-                font-weight: 700;
-                color: white;
-            };
-        }
+  }
+
+  // 悬浮窗底部4格子
+  .light-tag-box {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-template-rows: 1fr 1fr;
+    grid-gap: 10px;
+
+    .tag-box-item {
+      position: relative;
+      display: flex;
+      justify-content: space-between;
+
+      img {
+        width: 120px;
+        vertical-align: middle;
+      }
+
+      .title {
+        position: absolute;
+        left: 60px;
+        top: 13px;
+        color: rgba(64, 255, 252, 1);
+      }
+
+      .result {
+        line-height: 50px;
+        font-size: 16px;
+        font-weight: 700;
+        color: white;
+      }
     }
+  }
 </style>
-  
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
index 0ae9d57..a370239 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
@@ -5,15 +5,21 @@
       <div class="light-area">
         <div class="light-area-tab"></div>
         <span class="light-area-text"> 照明区域 </span>
-        <button class="plan" :class="{ enabled: isPlanEnabled, disabled: !isPlanEnabled }" @click="togglePlan">
+        <button
+          class="plan"
+          :class="{ enabled: isPlanEnabled, disabled: !isPlanEnabled }"
+          @click="togglePlan">
           {{ isPlanEnabled ? '计划启用' : '计划禁用' }}
         </button>
       </div>
       <!-- 照明区域按钮部分 -->
       <div class="area">
         <template v-if="!showAllButtonsArea">
-          <button v-for="(button, index) in limitedButtons1" :key="index"
-            :class="{ btn: true, selected: button.selected }" @click="changeArea(button)">
+          <button
+            v-for="(button, index) in limitedButtons1"
+            :key="index"
+            :class="{ btn: true, selected: button.selected }"
+            @click="changeArea(button)">
             {{ button.name }}
           </button>
           <div style="margin-top: 10px">
@@ -21,7 +27,10 @@
           </div>
         </template>
         <template v-else>
-          <button v-for="(button, index) in props.treeData" :key="index" :class="{ btn: true, selected: button.selected }"
+          <button
+            v-for="(button, index) in props.treeData"
+            :key="index"
+            :class="{ btn: true, selected: button.selected }"
             @click="changeArea(button)">
             {{ button.name }}
           </button>
@@ -37,13 +46,20 @@
         <div class="circuit-tab"></div>
         <span class="circuit-text">照明回路</span>
         <div class="btn2">
-          <button class="openPlan" :class="{ enabled2: isPlanEnabled2, disabled2: !isPlanEnabled2 }" @click="togglePlan2">
+          <button
+            class="openPlan"
+            :class="{ enabled2: isPlanEnabled2, disabled2: !isPlanEnabled2 }"
+            @click="togglePlan2">
             {{ isPlanEnabled2 ? '启用面板' : '禁用面板' }}
           </button>
-          <a-switch v-model:checked="selectAllCheckbox" :disabled="singleSelection" :class="{
-          'blue-background': selectAllCheckbox,
-          'grey-background': !selectAllCheckbox,
-        }" @change="toggleAllSelection" />
+          <a-switch
+            v-model:checked="selectAllCheckbox"
+            :disabled="singleSelection"
+            :class="{
+              'blue-background': selectAllCheckbox,
+              'grey-background': !selectAllCheckbox,
+            }"
+            @change="toggleAllSelection" />
           <button class="allBtn">全选</button>
           <button class="both" @click="selectAll">
             {{ singleSelection ? '多选' : '单选' }}
@@ -52,8 +68,12 @@
       </div>
       <div class="btnArea">
         <template v-if="!showAllButtons">
-          <button v-for="(button, index) in limitedButtons2" :key="index"
-            :class="{ btn: true, selected: button.selected }" class="zmhlbtn" @click="changeLine(button)">
+          <button
+            v-for="(button, index) in limitedButtons2"
+            :key="index"
+            :class="{ btn: true, selected: button.selected }"
+            class="zmhlbtn"
+            @click="changeLine(button)">
             <stop-outlined v-if="button.ctrlStatus" />
             {{ button.name }}
           </button>
@@ -62,8 +82,12 @@
           </div>
         </template>
         <template v-else>
-          <button v-for="(button, index) in buttons2" :key="index" 
-          :class="{ btn: true, selected: button.selected }" class="zmhlbtn" @click="changeLine(button)">
+          <button
+            v-for="(button, index) in buttons2"
+            :key="index"
+            :class="{ btn: true, selected: button.selected }"
+            class="zmhlbtn"
+            @click="changeLine(button)">
             <stop-outlined v-if="button.ctrlStatus" />
             {{ button.name }}
           </button>
@@ -81,10 +105,13 @@
       </div>
       <!-- 控制模式按钮部分 -->
       <div class="control-mode-btn-area" v-show="thisButton2.code">
-        <button v-for="(button3, index) in controlMode" :key="index"
-        class="btn"
-        :disabled="button3.value!= 3"
-        :class="{ selected: thisButton2.mode.value == button3.value }" @click="selectButton3(button3)">
+        <button
+          v-for="(button3, index) in controlMode"
+          :key="index"
+          class="btn"
+          :disabled="button3.value != 3"
+          :class="{ selected: thisButton2.mode.value == button3.value }"
+          @click="selectButton3(button3)">
           {{ button3.label }}
         </button>
       </div>
@@ -97,8 +124,11 @@
       </div>
       <!-- 控制场景按钮部分 -->
       <div class="control-scene-btn-area" v-show="thisButton2.mode.value == 3">
-        <button v-for="(button4, index) in controlScene" :key="index"
-          :class="{ btn: true, selected: thisButton2.scene.value == button4.value }" @click="selectButton4(button4)">
+        <button
+          v-for="(button4, index) in controlScene"
+          :key="index"
+          :class="{ btn: true, selected: thisButton2.scene.value == button4.value }"
+          @click="selectButton4(button4)">
           {{ button4.label }}
         </button>
       </div>
@@ -106,12 +136,11 @@
     <!-- 底部按钮区 -->
     <div class="bottom">
       <a-popconfirm
-      title="刷新将会取消已作出的修改"
-      ok-text="确定"
-      cancel-text="取消"
-      @confirm="changeConfirm"
-      @cancel="changeCancel"
-      >
+        title="刷新将会取消已作出的修改"
+        ok-text="确定"
+        cancel-text="取消"
+        @confirm="changeConfirm"
+        @cancel="changeCancel">
         <button class="flushed">刷新</button>
       </a-popconfirm>
       <button class="execute" @click="showModal">执行</button>
@@ -129,7 +158,11 @@
             <div class="imgText">
               <div class="zjzm">
                 <img class="title-img" src="/asset/image//bulbLogo/21961.png" alt="" />&nbsp;
-                <span class="title-text" style="font-size: 20px; font-weight: 500; color: rgba(255, 255, 255, 1)">{{ item.name }}</span>
+                <span
+                  class="title-text"
+                  style="font-size: 20px; font-weight: 500; color: rgba(255, 255, 255, 1)"
+                  >{{ item.name }}</span
+                >
               </div>
               <button class="cxbtn" @click="delBtn(item.id)">撤销</button>
             </div>
@@ -143,9 +176,7 @@
                 </div>
               </div>
               <div class="btn-item">
-                <div class="left">
-                  亮度
-                </div>
+                <div class="left"> 亮度 </div>
                 <div class="right">
                   <span>100lux</span>
                   <img src="/asset/image/bulbLogo/22406.png" alt="" />
@@ -153,9 +184,7 @@
                 </div>
               </div>
               <div class="btn-item">
-                <div class="left">
-                  控制场景
-                </div>
+                <div class="left"> 控制场景 </div>
                 <div class="right">
                   <span>手动</span>
                   <img src="/asset/image/bulbLogo/22406.png" alt="" />
@@ -163,9 +192,7 @@
                 </div>
               </div>
               <div class="btn-item">
-                <div class="left">
-                  色温
-                </div>
+                <div class="left"> 色温 </div>
                 <div class="right">
                   <span>4000k</span>
                   <img src="/asset/image/bulbLogo/22406.png" alt="" />
@@ -176,7 +203,7 @@
           </div>
         </div>
       </div>
-      <div style="width: 100%; height: 60px;"></div>
+      <div style="width: 100%; height: 60px"></div>
       <div class="button-box">
         <button class="cancel" @click="executeVisible = false">取消</button>
         <button class="execute">执行</button>
@@ -186,415 +213,415 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue';
-import {
-  DownOutlined,
-  UpOutlined,
-  StopOutlined,
-} from '@ant-design/icons-vue';
-import { message } from 'ant-design-vue';
-// 请求
-import { http } from '/nerv-lib/util/http';
-import { lightingManage } from '/@/api/IlluminationInfo';
-import { getAllEnum } from '/@/api/index'
-
-// 初始化  =========================================================================
-
-onMounted(() => {
-  // 默认选项
-  setArea()
-  // 获得枚举
-  getEnum(['IlluminationMode', 'IlluminationScene'])
-})
-// 获得枚举
-const getEnum = (arr: any) => {
-  getAllEnum({ params: arr }).then(res => {
-    const data = res.data
-    // 控制模式
-    controlMode.value = data.IlluminationMode
-    // 控制场景
-    controlScene.value = data.IlluminationScene
-  })
-}
-// 以 1-1 作为默认线路
-const setArea = () => {
-  const data = props.treeData[0]
-  buttons2.value = data.childList
-}
-
-// 与父组件的交互  ===================================================================
-
-const props = defineProps({
-  // 分区结构（照明区域 > 照明回路）
-  treeData: {
-    type: Array,
-    default: []
-  }
-});
-// 向上传递修改选择样式
-/** 
- * @method changeArea 用于控制俯视图的选中状态
- * @method reset 用于重置按钮区
- */
-const emit = defineEmits(['changeArea','reset']);
-
-// 照明区域业务 =======================================================================
-
-// 计划启用状态
-const isPlanEnabled = ref(false);
-// 计划启用切换事件
-const togglePlan = () => {
-  isPlanEnabled.value = !isPlanEnabled.value;
-};
-
-// 按钮区展开与收起状态
-const showAllButtonsArea = ref(false);
-// 被选中的分区  默认为1
-const selectedButton = ref<string | undefined>('1');
-
-// 分区切换
-const changeArea = (button: any) => {
-  // 当前选中按钮
-  selectedButton.value = button.id;
-  // 设置当前选中的线路
-  buttons2.value = button.childList
-  // 重置按钮状态
-  emit('reset')
-  // 设置选中按钮状态
-  button.selected = true
-  // 改变俯视图样式
-  emit('changeArea', button.id);
-  // 当前选中线路 - 置空
-  resetMode()
-  // 最近交互过的按钮 - 置空
-  handleButton.value = ''
-};
-// 默认最多展示8个按钮
-const limitedButtons1 = computed(() => props.treeData.slice(0, 8));
-
-// 照明回路业务 ======================================================================
-
-// 最近交互过的按钮id，用于禁用和启用
-const handleButton = ref('');
-
-// 面板启用/禁用状态
-const isPlanEnabled2 = ref(true);
-// 面板启用/禁用切换事件
-const togglePlan2 = () => {
-  // 如果未交互任何按钮
-  if (handleButton.value == '') {
-    return message.info('请选择照明回路');
-  }
-  // 获取最近交互过的按钮
-  const btn: any = buttons2.value.find((button) => button.id === handleButton.value)
-  let panel = +(!btn.ctrlStatus)
-  isLoading.value = true
-  http.get(lightingManage.setDisable, { deviceGroup: btn.code, panel }).then(res => {
-    if (res.msg === 'success') {
-      // 确认成功后 - 按钮文本取反 - 按钮布尔值修改 - 关闭loading
-      isPlanEnabled2.value = !isPlanEnabled2.value;
-      btn.ctrlStatus = panel
-      isLoading.value = false
-    } else {
-      isLoading.value = false
-    }
-  }).catch(() => { isLoading.value = false })
-};
-
-// 是否单选，状态
-let singleSelection = ref(true);
-// 多选与单选切换事件
-const selectAll = () => {
-  selectAllCheckbox.value = false
-  buttons2.value.forEach((button) => {
-    button.selected = false;
+  import { ref, computed, onMounted } from 'vue';
+  import { DownOutlined, UpOutlined, StopOutlined } from '@ant-design/icons-vue';
+  import { message } from 'ant-design-vue';
+  // 请求
+  import { http } from '/nerv-lib/util/http';
+  import { lightingManage } from '/@/api/IlluminationInfo';
+  import { getAllEnum } from '/@/api/index';
+
+  // 初始化  =========================================================================
+
+  onMounted(() => {
+    // 默认选项
+    setArea();
+    // 获得枚举
+    getEnum(['IlluminationMode', 'IlluminationScene']);
   });
-  singleSelection.value = !singleSelection.value;
-  // 当前选中线路 - 置空
-  resetMode()
-  // 改变俯视图样式
-  emit('changeArea', [selectedButton.value])
-};
-
-// 全选状态
-const selectAllCheckbox = ref(false);
-// 全选切换事件（switch）
-const toggleAllSelection = () => {
-  let arr = [selectedButton.value]
-  // 全选
-  if (selectAllCheckbox.value) {
-    buttons2.value.forEach((item, index) => {
-      // 全选时，默认展示第一条线路的模式-场景按钮
-      if (index == 0) {
-        thisButton2.value = item
-      }
-      item.selected = true;
-      arr.push(item.id)
-    });
-  // 全不选
-  } else {
-    buttons2.value.forEach((item) => {
-      item.selected = false;
-    });
-    // 全不选时，隐藏模式-场景按钮
-    resetMode()
-  }
-  emit('changeArea', arr)
-};
-
-// 储存当前选中的线路
-const thisButton2 = ref({
-  code: '',
-  mode: {
-    value: -1
-  },
-  scene: {
-    value: -1
-  }
-})
-// 照明回路的按钮切换
-const changeLine = (button: any) => {
-  // 存储一次按钮ID，用于禁用/启用交互
-  handleButton.value = button.id
-  // 根据按钮状态，展示禁用/启用按钮文本
-  if (button.ctrlStatus) {
-    isPlanEnabled2.value = true
-  } else {
-    isPlanEnabled2.value = false
-  }
-
-  // 选择时反控俯视图
-  let level1 = selectedButton.value
-  let level2 = button.id
-  // 单选模式，需将所有其他按钮设为false
-  if (singleSelection.value) {
-    buttons2.value.forEach(item => {
-      item.selected = false;
-    });
-    button.selected = !button.selected;
-    emit('changeArea', [level1, level2])
-  } else {
-    // 多选模式传值
-    button.selected = !button.selected;
-    const arr = [level1]
-    buttons2.value.forEach(item => {
-      if (item.selected) {
-        arr.push(item.id)
-      }
+  // 获得枚举
+  const getEnum = (arr: any) => {
+    getAllEnum({ params: arr }).then((res) => {
+      const data = res.data;
+      // 控制模式
+      controlMode.value = data.IlluminationMode;
+      // 控制场景
+      controlScene.value = data.IlluminationScene;
     });
-    emit('changeArea', arr)
-  }
-  // 用于展示控制模式
-  if (button.selected) {
-    // 发生了选中事件
-    thisButton2.value = button
-  } else {
-    // 未发生选中 或 多选的其中一个按钮被取消
-    resetMode()
-  }
-  console.log(thisButton2,'button')
-};
-
-// 照明回路所有按钮
-const buttons2 = ref([]);
-// 按钮区展开与收起状态
-const showAllButtons = ref(false);
-// 默认最多展示8个按钮
-const limitedButtons2 = computed(() => buttons2.value.slice(0, 8));
-
-// 控制模式业务 ====================================================================
-
-// 控制模式 - 按钮切换
-const selectButton3 = (button3) => {
-  let checked = thisButton2.value.mode
-  console.log(button3.value,'---', checked.value)
-  // 如果点击了相同的按钮，则未作出修改
-  if (checked.value === button3.value) {
-    return
-  }
-  checked.value = button3.value
-};
-
-// 控制场景业务 =====================================================================
-
-// 控制模式枚举
-const controlMode = ref([])
-// 场景枚举
-const controlScene = ref([])
-// 控制场景 - 当前选择按钮
-const selectedButton4 = ref(null);
-// 控制场景 - 按钮切换
-const selectButton4 = (button4) => {
-  // 当前选中的线路数据
-  const data = thisButton2.value
-  // 修改前的数据
-  let before = data.scene.value
-  // 修改后的数据
-  let after = button4.value
-  // 如果没有产生实质性的修改（修改前后相同，则跳出）
-  if (before === after) {
-    return
-  // 产生了修改
-  } else {
-    thisButton2.value.scene.value = after
-    // 查询之前是否修改过
-    const result = changeList.value.find((item, index) => {
-      item.index = index
-      return item.deviceGroup == data.code
-    })
-    // 如果已产生过修改
-    if (result) {
-      // 改回了原有的值，则从数组中移除
-      if (after == result.before) {
-        changeList.value.splice(result.index, 1)
-      // 修改为新值，则只修改after
-      } else {
-        result.scene = after
-        // 临时flag，用后移除
-        delete result.index
-      }
-    // 如果未产生过修改
-    } else {
-      changeList.value.push({
-        // 线路
-        deviceGroup: data.code,
-        deviceGroupName: data.name,
-        // 分区
-        region: data.pcode,
-        regionName: '',
-        // 修改前
-        before: before,
-        // 修改后
-        scene: after
-      })
+  };
+  // 以 1-1 作为默认线路
+  const setArea = () => {
+    const data = props.treeData[0];
+    buttons2.value = data.childList;
+  };
+
+  // 与父组件的交互  ===================================================================
+
+  const props = defineProps({
+    // 分区结构（照明区域 > 照明回路）
+    treeData: {
+      type: Array,
+      default: [],
+    },
+  });
+  // 向上传递修改选择样式
+  /**
+   * @method changeArea 用于控制俯视图的选中状态
+   * @method reset 用于重置按钮区
+   */
+  const emit = defineEmits(['changeArea', 'reset']);
+
+  // 照明区域业务 =======================================================================
+
+  // 计划启用状态
+  const isPlanEnabled = ref(false);
+  // 计划启用切换事件
+  const togglePlan = () => {
+    isPlanEnabled.value = !isPlanEnabled.value;
+  };
+
+  // 按钮区展开与收起状态
+  const showAllButtonsArea = ref(false);
+  // 被选中的分区  默认为1
+  const selectedButton = ref<string | undefined>('1');
+
+  // 分区切换
+  const changeArea = (button: any) => {
+    // 当前选中按钮
+    selectedButton.value = button.id;
+    // 设置当前选中的线路
+    buttons2.value = button.childList;
+    // 重置按钮状态
+    emit('reset');
+    // 设置选中按钮状态
+    button.selected = true;
+    // 改变俯视图样式
+    emit('changeArea', button.id);
+    // 当前选中线路 - 置空
+    resetMode();
+    // 最近交互过的按钮 - 置空
+    handleButton.value = '';
+  };
+  // 默认最多展示8个按钮
+  const limitedButtons1 = computed(() => props.treeData.slice(0, 8));
+
+  // 照明回路业务 ======================================================================
+
+  // 最近交互过的按钮id，用于禁用和启用
+  const handleButton = ref('');
+
+  // 面板启用/禁用状态
+  const isPlanEnabled2 = ref(true);
+  // 面板启用/禁用切换事件
+  const togglePlan2 = () => {
+    // 如果未交互任何按钮
+    if (handleButton.value == '') {
+      return message.info('请选择照明回路');
     }
-    console.log(changeList.value, 'changeList')
-  }
-  
-  thisButton2.value.scene.value = after
-  console.log(thisButton2,'222222')
-  console.log(button4,'44444')
-};
-
-// 内侧弹窗 ========================================================================
-
-// 需要修改的内容
-const changeList: any = ref([])
-// 需要向后端提交的修改内容
-const submitList = ref([])
-const cxList = ref([
-  {
-    id: '1',
-    name: '站厅照明  1区',
-    manual: '手动',
-    automatic: '自动',
-    brightness: '100lux',
-    brightness2: '30lux',
-    manual2: '手动',
-    automatic2: '自动',
-    brightness3: '4000k',
-    brightness4: '3800k',
-  },
-  {
-    id: '2',
-    name: '站厅照明  2区',
-    manual: '手动',
-    automatic: '自动',
-    brightness: '100lux',
-    brightness2: '30lux',
-    manual2: '手动',
-    automatic2: '自动',
-    brightness3: '4000k',
-    brightness4: '3800k',
-  },
-  {
-    id: '3',
-    name: '站厅照明  3区',
-    manual: '手动',
-    automatic: '自动',
-    brightness: '100lux',
-    brightness2: '30lux',
-    manual2: '手动',
-    automatic2: '自动',
-    brightness3: '4000k',
-    brightness4: '3800k',
-  },
-]);
-//撤销
-const delBtn = () => {
-  cxList.value.pop();
-  console.log(cxList.value.length);
-
-  if (cxList.value.length === 0) {
-    executeVisible.value = false;
-  }
-};
-
-// 其他业务 ========================================================================
-
-const isLoading = ref(false)
-// 刷新
-const refresh = () => {
-  // 关闭执行弹窗
-  executeVisible.value = false
-  // 设置当前选中的序列
-  selectedButton.value = '1';
-  emit('changeArea', ['1']);
-  emit('reset')
-  let data = props.treeData[0]
-  // 默认选中
-  data.selected = true
-  buttons2.value = data.childList
-  selectedButton4.value = null;
-  resetMode()
-};
-// 执行确认
-const executeVisible = ref<boolean>(false);
-const showModal = () => {
-  http.post(lightingManage.getChangeList, { infoList: changeList.value, projectId: 'HLlmTZp8' }).then(res => {
-    if (res.msg === 'success') {
-      isLoading.value = true
-      console.log(res)
+    // 获取最近交互过的按钮
+    const btn: any = buttons2.value.find((button) => button.id === handleButton.value);
+    let panel = +!btn.ctrlStatus;
+    isLoading.value = true;
+    http
+      .get(lightingManage.setDisable, { deviceGroup: btn.code, panel })
+      .then((res) => {
+        if (res.msg === 'success') {
+          // 确认成功后 - 按钮文本取反 - 按钮布尔值修改 - 关闭loading
+          isPlanEnabled2.value = !isPlanEnabled2.value;
+          btn.ctrlStatus = panel;
+          isLoading.value = false;
+        } else {
+          isLoading.value = false;
+        }
+      })
+      .catch(() => {
+        isLoading.value = false;
+      });
+  };
+
+  // 是否单选，状态
+  let singleSelection = ref(true);
+  // 多选与单选切换事件
+  const selectAll = () => {
+    selectAllCheckbox.value = false;
+    buttons2.value.forEach((button) => {
+      button.selected = false;
+    });
+    singleSelection.value = !singleSelection.value;
+    // 当前选中线路 - 置空
+    resetMode();
+    // 改变俯视图样式
+    emit('changeArea', [selectedButton.value]);
+  };
+
+  // 全选状态
+  const selectAllCheckbox = ref(false);
+  // 全选切换事件（switch）
+  const toggleAllSelection = () => {
+    let arr = [selectedButton.value];
+    // 全选
+    if (selectAllCheckbox.value) {
+      buttons2.value.forEach((item, index) => {
+        // 全选时，默认展示第一条线路的模式-场景按钮
+        if (index == 0) {
+          thisButton2.value = item;
+        }
+        item.selected = true;
+        arr.push(item.id);
+      });
+      // 全不选
     } else {
-      isLoading.value = false
+      buttons2.value.forEach((item) => {
+        item.selected = false;
+      });
+      // 全不选时，隐藏模式-场景按钮
+      resetMode();
     }
-  })
-  executeVisible.value = true;
+    emit('changeArea', arr);
+  };
 
-};
-
-// 确定
-const changeConfirm = () => {
-  refresh()
-}
-
-// 取消
-const changeCancel = () => {
-}
-
-// 将当前选择的线路置空
-const resetMode = () => {
-  thisButton2.value = {
+  // 储存当前选中的线路
+  const thisButton2 = ref({
     code: '',
     mode: {
-      value: -1
+      value: -1,
     },
     scene: {
-      value: -1
+      value: -1,
+    },
+  });
+  // 照明回路的按钮切换
+  const changeLine = (button: any) => {
+    // 存储一次按钮ID，用于禁用/启用交互
+    handleButton.value = button.id;
+    // 根据按钮状态，展示禁用/启用按钮文本
+    if (button.ctrlStatus) {
+      isPlanEnabled2.value = true;
+    } else {
+      isPlanEnabled2.value = false;
     }
-  }
-} 
 
-// 暴露
-defineExpose({
-  // 分区切换
-  changeArea,
-  // 线路切换
-  changeLine
-});
+    // 选择时反控俯视图
+    let level1 = selectedButton.value;
+    let level2 = button.id;
+    // 单选模式，需将所有其他按钮设为false
+    if (singleSelection.value) {
+      buttons2.value.forEach((item) => {
+        item.selected = false;
+      });
+      button.selected = !button.selected;
+      emit('changeArea', [level1, level2]);
+    } else {
+      // 多选模式传值
+      button.selected = !button.selected;
+      const arr = [level1];
+      buttons2.value.forEach((item) => {
+        if (item.selected) {
+          arr.push(item.id);
+        }
+      });
+      emit('changeArea', arr);
+    }
+    // 用于展示控制模式
+    if (button.selected) {
+      // 发生了选中事件
+      thisButton2.value = button;
+    } else {
+      // 未发生选中 或 多选的其中一个按钮被取消
+      resetMode();
+    }
+    console.log(thisButton2, 'button');
+  };
+
+  // 照明回路所有按钮
+  const buttons2 = ref([]);
+  // 按钮区展开与收起状态
+  const showAllButtons = ref(false);
+  // 默认最多展示8个按钮
+  const limitedButtons2 = computed(() => buttons2.value.slice(0, 8));
+
+  // 控制模式业务 ====================================================================
+
+  // 控制模式 - 按钮切换
+  const selectButton3 = (button3) => {
+    let checked = thisButton2.value.mode;
+    console.log(button3.value, '---', checked.value);
+    // 如果点击了相同的按钮，则未作出修改
+    if (checked.value === button3.value) {
+      return;
+    }
+    checked.value = button3.value;
+  };
+
+  // 控制场景业务 =====================================================================
+
+  // 控制模式枚举
+  const controlMode = ref([]);
+  // 场景枚举
+  const controlScene = ref([]);
+  // 控制场景 - 当前选择按钮
+  const selectedButton4 = ref(null);
+  // 控制场景 - 按钮切换
+  const selectButton4 = (button4) => {
+    // 当前选中的线路数据
+    const data = thisButton2.value;
+    // 修改前的数据
+    let before = data.scene.value;
+    // 修改后的数据
+    let after = button4.value;
+    // 如果没有产生实质性的修改（修改前后相同，则跳出）
+    if (before === after) {
+      return;
+      // 产生了修改
+    } else {
+      thisButton2.value.scene.value = after;
+      // 查询之前是否修改过
+      const result = changeList.value.find((item, index) => {
+        item.index = index;
+        return item.deviceGroup == data.code;
+      });
+      // 如果已产生过修改
+      if (result) {
+        // 改回了原有的值，则从数组中移除
+        if (after == result.before) {
+          changeList.value.splice(result.index, 1);
+          // 修改为新值，则只修改after
+        } else {
+          result.scene = after;
+          // 临时flag，用后移除
+          delete result.index;
+        }
+        // 如果未产生过修改
+      } else {
+        changeList.value.push({
+          // 线路
+          deviceGroup: data.code,
+          deviceGroupName: data.name,
+          // 分区
+          region: data.pcode,
+          regionName: '',
+          // 修改前
+          before: before,
+          // 修改后
+          scene: after,
+        });
+      }
+      console.log(changeList.value, 'changeList');
+    }
+
+    thisButton2.value.scene.value = after;
+    console.log(thisButton2, '222222');
+    console.log(button4, '44444');
+  };
+
+  // 内侧弹窗 ========================================================================
+
+  // 需要修改的内容
+  const changeList: any = ref([]);
+  // 需要向后端提交的修改内容
+  const submitList = ref([]);
+  const cxList = ref([
+    {
+      id: '1',
+      name: '站厅照明  1区',
+      manual: '手动',
+      automatic: '自动',
+      brightness: '100lux',
+      brightness2: '30lux',
+      manual2: '手动',
+      automatic2: '自动',
+      brightness3: '4000k',
+      brightness4: '3800k',
+    },
+    {
+      id: '2',
+      name: '站厅照明  2区',
+      manual: '手动',
+      automatic: '自动',
+      brightness: '100lux',
+      brightness2: '30lux',
+      manual2: '手动',
+      automatic2: '自动',
+      brightness3: '4000k',
+      brightness4: '3800k',
+    },
+    {
+      id: '3',
+      name: '站厅照明  3区',
+      manual: '手动',
+      automatic: '自动',
+      brightness: '100lux',
+      brightness2: '30lux',
+      manual2: '手动',
+      automatic2: '自动',
+      brightness3: '4000k',
+      brightness4: '3800k',
+    },
+  ]);
+  //撤销
+  const delBtn = () => {
+    cxList.value.pop();
+    console.log(cxList.value.length);
+
+    if (cxList.value.length === 0) {
+      executeVisible.value = false;
+    }
+  };
 
+  // 其他业务 ========================================================================
+
+  const isLoading = ref(false);
+  // 刷新
+  const refresh = () => {
+    // 关闭执行弹窗
+    executeVisible.value = false;
+    // 设置当前选中的序列
+    selectedButton.value = '1';
+    emit('changeArea', ['1']);
+    emit('reset');
+    let data = props.treeData[0];
+    // 默认选中
+    data.selected = true;
+    buttons2.value = data.childList;
+    selectedButton4.value = null;
+    resetMode();
+  };
+  // 执行确认
+  const executeVisible = ref<boolean>(false);
+  const showModal = () => {
+    http
+      .post(lightingManage.getChangeList, { infoList: changeList.value, projectId: 'HLlmTZp8' })
+      .then((res) => {
+        if (res.msg === 'success') {
+          isLoading.value = true;
+          console.log(res);
+        } else {
+          isLoading.value = false;
+        }
+      });
+    executeVisible.value = true;
+  };
+
+  // 确定
+  const changeConfirm = () => {
+    refresh();
+  };
+
+  // 取消
+  const changeCancel = () => {};
+
+  // 将当前选择的线路置空
+  const resetMode = () => {
+    thisButton2.value = {
+      code: '',
+      mode: {
+        value: -1,
+      },
+      scene: {
+        value: -1,
+      },
+    };
+  };
+
+  // 暴露
+  defineExpose({
+    // 分区切换
+    changeArea,
+    // 线路切换
+    changeLine,
+  });
 </script>
 <style lang="less" scoped>
-@import "./dialogStyle.less";
-@import "./tabs1.less";
+  @import './dialogStyle.less';
+  @import './tabs1.less';
 </style>
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
index 8f33ad3..05bb3c6 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
@@ -20,10 +20,10 @@
         <td v-if="row.planStatus == '2'">
           <button
             style="
-            font-size: 12px;
-            background: rgba(57, 215, 187, 0.1);
-            color: rgb(57, 215, 187);
-            border: 1px solid rgb(57, 215, 187);
+              font-size: 12px;
+              background: rgba(57, 215, 187, 0.1);
+              color: rgb(57, 215, 187);
+              border: 1px solid rgb(57, 215, 187);
             ">
             已执行
           </button>
@@ -31,10 +31,10 @@
         <td v-if="row.planStatus == '1'">
           <button
             style="
-            font-size: 12px;
-            background: rgba(243, 97, 99, 0.1);
-            border: 1px solid rgba(243, 97, 99);
-            color: rgba(243, 97, 99);
+              font-size: 12px;
+              background: rgba(243, 97, 99, 0.1);
+              border: 1px solid rgba(243, 97, 99);
+              color: rgba(243, 97, 99);
             ">
             待执行
           </button>
@@ -42,11 +42,10 @@
         <td>
           <div class="tabReboot" @click="restartPlan(row.id)">重启</div>
           <a-popconfirm
-          title="此操作将永久删除该条数据"
-          ok-text="确定"
-          cancel-text="取消"
-          @confirm="deletePlan(row.id)"
-          >
+            title="此操作将永久删除该条数据"
+            ok-text="确定"
+            cancel-text="取消"
+            @confirm="deletePlan(row.id)">
             <div class="tabDelete">删除</div>
           </a-popconfirm>
         </td>
@@ -70,7 +69,7 @@
         @search="handleSearch"
         :listStyle="{ border: '2px solid rgba(25,74,125,1)', height: 'calc(100vh - 200px)' }" />
     </div>
-    <div style="width: 100%; height: 60px;"></div>
+    <div style="width: 100%; height: 60px"></div>
     <div class="button-box">
       <button class="cancel" @click="addVisible = false">取消</button>
       <button class="execute" @click="sendPlan">确定</button>
@@ -79,175 +78,171 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
-// 请求
-import { http } from '/nerv-lib/util/http';
-import { lightingManage } from '/@/api/IlluminationInfo';
-import { message } from 'ant-design-vue';
+  import { ref, onMounted } from 'vue';
+  // 请求
+  import { http } from '/nerv-lib/util/http';
+  import { lightingManage } from '/@/api/IlluminationInfo';
+  import { message } from 'ant-design-vue';
 
-// 初始化 ===========================================================
+  // 初始化 ===========================================================
 
-onMounted(() => {
-  // 计划表格
-  getTable()
-  // 穿梭框原始数据
-  getLeftPlan()
-})
+  onMounted(() => {
+    // 计划表格
+    getTable();
+    // 穿梭框原始数据
+    getLeftPlan();
+  });
 
-// tab页部分 ========================================================
+  // tab页部分 ========================================================
 
-// 表格数据
-const dataSource = ref([]);
-// 获得表格数据
-const getTable = () => {
-  http.get(lightingManage.getPlanTable, {}).then(res => {
-    dataSource.value = res.data
-  })
-}
-// 删除表格中的计划
-const deletePlan = (id: String) => {
-  http.delete(lightingManage.deletePlan, [id]).then(() => {
-    message.success('操作成功')
-    getTable()
-  })
-}
-// 重启表格中的计划
-const restartPlan = (id: String) => {
-  http.post(lightingManage.restartPlan, { planId: id }).then(() => {
-    message.success('操作成功')
-    getTable()
-  })
-}
+  // 表格数据
+  const dataSource = ref([]);
+  // 获得表格数据
+  const getTable = () => {
+    http.get(lightingManage.getPlanTable, {}).then((res) => {
+      dataSource.value = res.data;
+    });
+  };
+  // 删除表格中的计划
+  const deletePlan = (id: String) => {
+    http.delete(lightingManage.deletePlan, [id]).then(() => {
+      message.success('操作成功');
+      getTable();
+    });
+  };
+  // 重启表格中的计划
+  const restartPlan = (id: String) => {
+    http.post(lightingManage.restartPlan, { planId: id }).then(() => {
+      message.success('操作成功');
+      getTable();
+    });
+  };
 
-// tab页弹窗部分 ====================================================
+  // tab页弹窗部分 ====================================================
 
-// 添加弹窗控制变量
-const addVisible = ref(false);
-// 打开弹窗
-const addModal = () => {
-  addVisible.value = true;
-};
+  // 添加弹窗控制变量
+  const addVisible = ref(false);
+  // 打开弹窗
+  const addModal = () => {
+    addVisible.value = true;
+  };
 
-// 穿梭框部分 =======================================================
+  // 穿梭框部分 =======================================================
 
-// 穿梭框数据
-const transferData = ref([]) as any;
-// 获得穿梭框原始数据
-const getLeftPlan = () => {
-  http.get(lightingManage.getLeftPlan, {}).then(res => {
-    let arr = []
-    res.data.forEach((item: any) => {
-      arr.push({
-        key: item.id,
-        title: item.planName
-      })
-    })
-    transferData.value = arr
-  })
-}
-
-const handleChange = (keys: string[], direction: string, moveKeys: string[]) => {
-  console.log(keys, direction, moveKeys);
-};
-const handleSearch = (dir: string, value: string) => {
-  console.log('search:', dir, value);
-};
-// 穿梭框选中数据
-const targetKeys = ref<string[]>([]);
-// 将穿梭框选中的计划提交
-const sendPlan = () => {
-  if (targetKeys.value.length < 1) {
-    return message.info('没有选择任何计划');
-  }
-  http.post(lightingManage.submitLeftPlan, targetKeys.value).then(() => {
-    message.success('添加成功')
-    // 如果发送成功，则刷新表格
-    getTable()
-    getLeftPlan()
-  })
-}
-
-const filterOption = (inputValue: string, option: any) => {
-  return option.description.indexOf(inputValue) > -1;
-};
+  // 穿梭框数据
+  const transferData = ref([]) as any;
+  // 获得穿梭框原始数据
+  const getLeftPlan = () => {
+    http.get(lightingManage.getLeftPlan, {}).then((res) => {
+      let arr = [];
+      res.data.forEach((item: any) => {
+        arr.push({
+          key: item.id,
+          title: item.planName,
+        });
+      });
+      transferData.value = arr;
+    });
+  };
 
+  const handleChange = (keys: string[], direction: string, moveKeys: string[]) => {
+    console.log(keys, direction, moveKeys);
+  };
+  const handleSearch = (dir: string, value: string) => {
+    console.log('search:', dir, value);
+  };
+  // 穿梭框选中数据
+  const targetKeys = ref<string[]>([]);
+  // 将穿梭框选中的计划提交
+  const sendPlan = () => {
+    if (targetKeys.value.length < 1) {
+      return message.info('没有选择任何计划');
+    }
+    http.post(lightingManage.submitLeftPlan, targetKeys.value).then(() => {
+      message.success('添加成功');
+      // 如果发送成功，则刷新表格
+      getTable();
+      getLeftPlan();
+    });
+  };
 
+  const filterOption = (inputValue: string, option: any) => {
+    return option.description.indexOf(inputValue) > -1;
+  };
 </script>
 <style lang="less" scoped>
-@import "./dialogStyle.less";
+  @import './dialogStyle.less';
 
-// 右下角添加按钮
-.div-add {
-  height: 64px;
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  position: fixed;
-  bottom: 0;
-  right: 0;
-  margin-right: 20px;
-  .add {
-    width: 74px;
-    height: 40px;
-    opacity: 1;
-    border-radius: 4px;
-    background: rgba(67, 136, 251, 1);
-    border: rgba(67, 136, 251, 1);
-    font-size: 14px;
-    font-weight: 400;
-    color: rgba(255, 255, 255, 1);
-    cursor: pointer;
+  // 右下角添加按钮
+  .div-add {
+    height: 64px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    position: fixed;
+    bottom: 0;
+    right: 0;
+    margin-right: 20px;
+    .add {
+      width: 74px;
+      height: 40px;
+      opacity: 1;
+      border-radius: 4px;
+      background: rgba(67, 136, 251, 1);
+      border: rgba(67, 136, 251, 1);
+      font-size: 14px;
+      font-weight: 400;
+      color: rgba(255, 255, 255, 1);
+      cursor: pointer;
+    }
   }
-}
-// 表格
-.custom-table {
-  border-collapse: collapse;
-  width: 416px;
-  height: 60px;
-  color: rgba(255, 255, 255, 1);
-}
-.custom-table th,
-.custom-table td {
-  border: 1px solid rgba(163, 192, 243, 1);
-  text-align: left;
-  padding: 8px;
-  text-align: center;
-}
-.table1 {
-  margin-top: 20px;
-  width: 100%;
-  border: 1px solid rgba(255, 255, 255);
-  border-radius: 5px;
-  background: rgba(255, 255, 255, 0.1);
-  // 表格中的操作按钮
-  .tabReboot,
-  .tabDelete {
-    border: none;
-    display: inline-block;
-    background-color: rgba(0, 0, 0, 0);
-    font-size: 14px;
-    font-weight: 400;
-    letter-spacing: 0;
-    line-height: 20px;
-    color: rgba(67, 136, 251, 1);
-    cursor: pointer;
-  }
-  .tabReboot {
-    margin-right: 8px;
+  // 表格
+  .custom-table {
+    border-collapse: collapse;
+    width: 416px;
+    height: 60px;
+    color: rgba(255, 255, 255, 1);
   }
-  .tabReboot::active {
-    color: white !important;
+  .custom-table th,
+  .custom-table td {
+    border: 1px solid rgba(163, 192, 243, 1);
+    text-align: left;
+    padding: 8px;
+    text-align: center;
   }
-  .tabDelete::active {
-    color: white;
+  .table1 {
+    margin-top: 20px;
+    width: 100%;
+    border: 1px solid rgba(255, 255, 255);
+    border-radius: 5px;
+    background: rgba(255, 255, 255, 0.1);
+    // 表格中的操作按钮
+    .tabReboot,
+    .tabDelete {
+      border: none;
+      display: inline-block;
+      background-color: rgba(0, 0, 0, 0);
+      font-size: 14px;
+      font-weight: 400;
+      letter-spacing: 0;
+      line-height: 20px;
+      color: rgba(67, 136, 251, 1);
+      cursor: pointer;
+    }
+    .tabReboot {
+      margin-right: 8px;
+    }
+    .tabReboot::active {
+      color: white !important;
+    }
+    .tabDelete::active {
+      color: white;
+    }
   }
-}
-::v-deep(.ant-transfer) {
-  // 屏蔽自带的hover效果
-  .ant-transfer-list-content-item:hover {
-    background: black;
+  ::v-deep(.ant-transfer) {
+    // 屏蔽自带的hover效果
+    .ant-transfer-list-content-item:hover {
+      background: black;
+    }
   }
-}
-  
-
 </style>
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue
index ec1de0e..347920a 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue
@@ -9,7 +9,10 @@
       </tr>
     </thead>
     <tbody>
-      <tr v-for="(row, index) in dataSource1" :key="index" @click="handleRowClick(row.key)"
+      <tr
+        v-for="(row, index) in dataSource1"
+        :key="index"
+        @click="handleRowClick(row.key)"
         :class="row.key === trIndex ? 'isTrIndex' : ''">
         <td>{{ row.key }}</td>
         <td>{{ row.data }}</td>
@@ -19,7 +22,7 @@
     </tbody>
   </table>
 
-  <div class="out-dialog" :class="{ 'showDialog' : logModalVisible }" v-if="logModalVisible">
+  <div class="out-dialog" :class="{ showDialog: logModalVisible }" v-if="logModalVisible">
     <div class="content" v-if="logModalVisible">
       <div>
         <div class="div-operation"></div>
@@ -30,7 +33,11 @@
           <div class="imgText">
             <div class="zjzm">
               <img class="title-img" src="/asset/image//bulbLogo/21961.png" alt="" />&nbsp;
-              <span class="title-text" style="font-size: 20px; font-weight: 500; color: rgba(255, 255, 255, 1)">{{ item.name }}</span>
+              <span
+                class="title-text"
+                style="font-size: 20px; font-weight: 500; color: rgba(255, 255, 255, 1)"
+                >{{ item.name }}</span
+              >
             </div>
           </div>
           <div class="btn-box">
@@ -43,9 +50,7 @@
               </div>
             </div>
             <div class="btn-item">
-              <div class="left">
-                亮度
-              </div>
+              <div class="left"> 亮度 </div>
               <div class="right">
                 <span>100lux</span>
                 <img src="/asset/image/bulbLogo/22406.png" alt="" />
@@ -53,9 +58,7 @@
               </div>
             </div>
             <div class="btn-item">
-              <div class="left">
-                控制场景
-              </div>
+              <div class="left"> 控制场景 </div>
               <div class="right">
                 <span>手动</span>
                 <img src="/asset/image/bulbLogo/22406.png" alt="" />
@@ -63,9 +66,7 @@
               </div>
             </div>
             <div class="btn-item">
-              <div class="left">
-                色温
-              </div>
+              <div class="left"> 色温 </div>
               <div class="right">
                 <span>4000k</span>
                 <img src="/asset/image/bulbLogo/22406.png" alt="" />
@@ -76,7 +77,7 @@
         </div>
       </div>
     </div>
-    <div style="height: 60px;"></div>
+    <div style="height: 60px"></div>
     <div class="button-box">
       <button class="cancel" @click="logModalVisible = false">取消</button>
     </div>
@@ -87,169 +88,164 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
-
-// 初始化
-onMounted(() => {
-
-})
-
-// 与父组件的交互  ===================================================================
-const props = defineProps({
-  // 分区结构（照明区域 > 照明回路）
-  treeData: {
-    type: Array
-  },
-});
-const emit = defineEmits(['changeArea']);
-
-// 表格数据
-const dataSource1 = ref([
-  {
-    key: '1',
-    data: '2024-05-01',
-    planName: '计划再开',
-    status: '张三111',
-  },
-  {
-    key: '2',
-    data: '2024-05-01',
-    planName: '检修模式',
-    status: '李四12',
-  },
-  {
-    key: '3',
-    data: '2024-05-01',
-    planName: '设备变更',
-    status: '王五33',
-  },
-]);
-const cxList = ref([
-  {
-    id: '1',
-    name: '站厅照明  1区',
-    manual: '手动',
-    automatic: '自动',
-    brightness: '100lux',
-    brightness2: '30lux',
-    manual2: '手动',
-    automatic2: '自动',
-    brightness3: '4000k',
-    brightness4: '3800k',
-  },
-  {
-    id: '2',
-    name: '站厅照明  2区',
-    manual: '手动',
-    automatic: '自动',
-    brightness: '100lux',
-    brightness2: '30lux',
-    manual2: '手动',
-    automatic2: '自动',
-    brightness3: '4000k',
-    brightness4: '3800k',
-  },
-  {
-    id: '3',
-    name: '站厅照明  3区',
-    manual: '手动',
-    automatic: '自动',
-    brightness: '100lux',
-    brightness2: '30lux',
-    manual2: '手动',
-    automatic2: '自动',
-    brightness3: '4000k',
-    brightness4: '3800k',
-  },
-]);
-let trIndex = ref('-1');
-const logModalVisible = ref(false);
-const handleRowClick = (index: any) => {
-  trIndex.value = index;
-  if (index === trIndex.value) {
-    console.log('tri');
-  }
-  // 显示模态框
-  logModalVisible.value = true;
-};
-
-
+  import { ref, onMounted } from 'vue';
+
+  // 初始化
+  onMounted(() => {});
+
+  // 与父组件的交互  ===================================================================
+  const props = defineProps({
+    // 分区结构（照明区域 > 照明回路）
+    treeData: {
+      type: Array,
+    },
+  });
+  const emit = defineEmits(['changeArea']);
+
+  // 表格数据
+  const dataSource1 = ref([
+    {
+      key: '1',
+      data: '2024-05-01',
+      planName: '计划再开',
+      status: '张三111',
+    },
+    {
+      key: '2',
+      data: '2024-05-01',
+      planName: '检修模式',
+      status: '李四12',
+    },
+    {
+      key: '3',
+      data: '2024-05-01',
+      planName: '设备变更',
+      status: '王五33',
+    },
+  ]);
+  const cxList = ref([
+    {
+      id: '1',
+      name: '站厅照明  1区',
+      manual: '手动',
+      automatic: '自动',
+      brightness: '100lux',
+      brightness2: '30lux',
+      manual2: '手动',
+      automatic2: '自动',
+      brightness3: '4000k',
+      brightness4: '3800k',
+    },
+    {
+      id: '2',
+      name: '站厅照明  2区',
+      manual: '手动',
+      automatic: '自动',
+      brightness: '100lux',
+      brightness2: '30lux',
+      manual2: '手动',
+      automatic2: '自动',
+      brightness3: '4000k',
+      brightness4: '3800k',
+    },
+    {
+      id: '3',
+      name: '站厅照明  3区',
+      manual: '手动',
+      automatic: '自动',
+      brightness: '100lux',
+      brightness2: '30lux',
+      manual2: '手动',
+      automatic2: '自动',
+      brightness3: '4000k',
+      brightness4: '3800k',
+    },
+  ]);
+  let trIndex = ref('-1');
+  const logModalVisible = ref(false);
+  const handleRowClick = (index: any) => {
+    trIndex.value = index;
+    if (index === trIndex.value) {
+      console.log('tri');
+    }
+    // 显示模态框
+    logModalVisible.value = true;
+  };
 </script>
 <style lang="less" scoped>
-@import "./dialogStyle.less";
-
-// 右下角添加按钮
-.div-add {
-  height: 64px;
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  position: fixed;
-  bottom: 0;
-  right: 0;
-  margin-right: 20px;
-  .add {
-    width: 74px;
-    height: 40px;
-    opacity: 1;
-    border-radius: 4px;
-    background: rgba(67, 136, 251, 1);
-    border: rgba(67, 136, 251, 1);
-    font-size: 14px;
-    font-weight: 400;
-    color: rgba(255, 255, 255, 1);
-    cursor: pointer;
+  @import './dialogStyle.less';
+
+  // 右下角添加按钮
+  .div-add {
+    height: 64px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    position: fixed;
+    bottom: 0;
+    right: 0;
+    margin-right: 20px;
+    .add {
+      width: 74px;
+      height: 40px;
+      opacity: 1;
+      border-radius: 4px;
+      background: rgba(67, 136, 251, 1);
+      border: rgba(67, 136, 251, 1);
+      font-size: 14px;
+      font-weight: 400;
+      color: rgba(255, 255, 255, 1);
+      cursor: pointer;
+    }
   }
-}
-
-// 表格
-.custom-table {
-  border-collapse: collapse;
-  width: 416px;
-  height: 60px;
-  color: rgba(255, 255, 255, 1);
-}
 
-.custom-table th,
-.custom-table td {
-  border: 1px solid rgba(163, 192, 243, 1);
-  text-align: left;
-  padding: 8px;
-  text-align: center;
-}
-
-.table1 {
-  margin-top: 20px;
-  width: 100%;
-  border: 1px solid rgba(255, 255, 255);
-  border-radius: 5px;
-  background: rgba(255, 255, 255, 0.1);
-
-  .tabReboot,
-  .tabDelete {
-    border: none;
-    background-color: rgba(0, 0, 0, 0);
-    font-size: 14px;
-    font-weight: 400;
-    letter-spacing: 0;
-    line-height: 20px;
-    color: rgba(67, 136, 251, 1);
+  // 表格
+  .custom-table {
+    border-collapse: collapse;
+    width: 416px;
+    height: 60px;
+    color: rgba(255, 255, 255, 1);
   }
 
-  .tabReboot {
-    margin-right: 8px;
+  .custom-table th,
+  .custom-table td {
+    border: 1px solid rgba(163, 192, 243, 1);
+    text-align: left;
+    padding: 8px;
+    text-align: center;
   }
 
-  .isTrIndex {
-    background: rgba(67, 136, 251, 1);
+  .table1 {
+    margin-top: 20px;
+    width: 100%;
+    border: 1px solid rgba(255, 255, 255);
+    border-radius: 5px;
+    background: rgba(255, 255, 255, 0.1);
+
+    .tabReboot,
+    .tabDelete {
+      border: none;
+      background-color: rgba(0, 0, 0, 0);
+      font-size: 14px;
+      font-weight: 400;
+      letter-spacing: 0;
+      line-height: 20px;
+      color: rgba(67, 136, 251, 1);
+    }
+
+    .tabReboot {
+      margin-right: 8px;
+    }
+
+    .isTrIndex {
+      background: rgba(67, 136, 251, 1);
+    }
   }
-}
-
-::v-deep(.ant-transfer) {
 
-  // 屏蔽自带的hover效果
-  .ant-transfer-list-content-item:hover {
-    background: black;
+  ::v-deep(.ant-transfer) {
+    // 屏蔽自带的hover效果
+    .ant-transfer-list-content-item:hover {
+      background: black;
+    }
   }
-}
 </style>

From dd7c417f814a91f47d4b93faf488e50a0bbf4071 Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Thu, 25 Jul 2024 14:18:37 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E7=A2=B3=E6=8E=92=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/carbonEmissionFactorLibrary.ts         |    4 +-
 .../src/router/carbonEmissionManage.ts             |   20 +
 .../carbonEmissionFactorLibrary/config.ts          |    2 +-
 .../carbonEmissionFactorLibrary/index.vue          |  411 ++++----
 .../carbonEmissions/index.vue                      |   56 +-
 .../carbonEmissionStatistics/index.vue             |    1 -
 .../quickCalculation/index.vue                     |  239 ++---
 .../carbonInventoryCheck/fillInPage/index.vue      | 1021 +++++++++++---------
 8 files changed, 948 insertions(+), 806 deletions(-)

diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
index dcbbfa9..2d5f06f 100644
--- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
+++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
@@ -55,4 +55,6 @@ export enum carbonInventoryCheck {
   findUnitById = '/carbon-smartapi/carbon/inventory/findById',
   getDetailsList = '/carbon-smart/api/carbon/inventory/details/getDetailsList',
   updateTable = '/carbon-smart/api/carbon/inventory/details/update',
-}
\ No newline at end of file
+  // 排放统计接口
+  emissionStatistic = '/carbon-smart/api/carbon/inventory/emissionStatistic',
+}
diff --git a/hx-ai-intelligent/src/router/carbonEmissionManage.ts b/hx-ai-intelligent/src/router/carbonEmissionManage.ts
index 1ce91af..2d0e6d4 100644
--- a/hx-ai-intelligent/src/router/carbonEmissionManage.ts
+++ b/hx-ai-intelligent/src/router/carbonEmissionManage.ts
@@ -65,6 +65,26 @@ const equipment = {
         },
       ],
     },
+    {
+      path: 'carbonInventoryCheck',
+      name: 'CarbonInventoryCheck',
+      meta: { title: '碳资产', hideChildren: true, icon: 'tanpaiguanli' },
+      component: Base,
+      redirect: { name: 'CarbonInventoryCheckIndex' },
+      children: [
+        {
+          path: 'index',
+          name: 'CarbonInventoryCheckIndex',
+          // component: () => import('/nerv-lib/saas/view/menuManage/index.vue'),
+          component: () => import('/@/view/carbonEmissionManage/carbonInventoryCheck/index.vue'),
+          meta: {
+            title: '碳资产',
+            keepAlive: false,
+            // backApi: [],
+          },
+        },
+      ],
+    },
   ],
 };
 export default equipment;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
index aa2df7e..7eaf1ae 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
@@ -196,7 +196,7 @@ export const formConfig = (disabled) => {
             componentProps: {
               placeholder: '请输入参考文献',
               maxLength: 300,
-              showCount:true
+              showCount: true,
             },
           },
         ],
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index bd5c776..a110e3f 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -4,16 +4,15 @@
   <div class="main">
     <div class="left">
       <div class="top">
-        <a-form style="width: 100%;margin: 0 auto;">
+        <a-form style="width: 100%; margin: 0 auto">
           <div class="ns-form-title"><div class="title">排放分类</div></div>
-          <div style="padding: 0 16px !important;width: 100%;">
+          <div style="padding: 0 16px !important; width: 100%">
             <a-row>
-              <a-col :span="24" style="margin-bottom: 16px;">
+              <a-col :span="24" style="margin-bottom: 16px">
                 <a-input-search
                   v-model:value="selectTreeDataValue"
                   placeholder="请输入关键词"
-                  @search="onSearchTreeData"
-                />
+                  @search="onSearchTreeData" />
               </a-col>
             </a-row>
           </div>
@@ -21,7 +20,7 @@
         <a-tree
           v-if="gData && gData.length > 0"
           class="draggable-tree"
-          style="padding: 0 16px !important;"
+          style="padding: 0 16px !important"
           draggable
           show-line
           checkable
@@ -39,10 +38,21 @@
           <template #title="data">
             <div class="treeRow">
               <div>
-                <span v-if="data.emissionName && selectTreeDataValue && data.emissionName.indexOf(selectTreeDataValue) > -1">
-                {{ data.emissionName.substring(0, data.emissionName.indexOf(selectTreeDataValue)) }}
-                <span style="color: #f50" >{{ selectTreeDataValue }}</span>
-                {{ data.emissionName.substring(data.emissionName.indexOf(selectTreeDataValue) + selectTreeDataValue.length) }}
+                <span
+                  v-if="
+                    data.emissionName &&
+                    selectTreeDataValue &&
+                    data.emissionName.indexOf(selectTreeDataValue) > -1
+                  ">
+                  {{
+                    data.emissionName.substring(0, data.emissionName.indexOf(selectTreeDataValue))
+                  }}
+                  <span style="color: #f50">{{ selectTreeDataValue }}</span>
+                  {{
+                    data.emissionName.substring(
+                      data.emissionName.indexOf(selectTreeDataValue) + selectTreeDataValue.length,
+                    )
+                  }}
                 </span>
                 <span v-else>{{ data.emissionName }}</span>
               </div>
@@ -62,12 +72,12 @@
           </template>
         </a-tree>
         <div class="addTreeNode">
-          <a-button type="primary" style="width:100%;" @click="addTreeNodeData">新增</a-button>
+          <a-button type="primary" style="width: 100%" @click="addTreeNodeData">新增</a-button>
         </div>
       </div>
     </div>
     <div class="right">
-      <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 2000}">
+      <ns-view-list-table v-bind="tableConfig" :model="data" ref="mainRef" :scroll="{ x: 2000 }">
         <template #bodyCell="{ record, column }">
           <template v-if="column.dataIndex === 'emissionGas'">
             {{ record.emissionGas.label }}
@@ -77,10 +87,7 @@
     </div>
     <!-- 新增树节点 -->
     <ns-modal :visible="treeNodeAdd" :title="operationTree" @ok="handleOk" @cancel="handleCancel">
-      <ns-input
-        v-model:value="addTreeNode"
-        class="input"
-        placeholder="请输入排放类型"/>
+      <ns-input v-model:value="addTreeNode" class="input" placeholder="请输入排放类型" />
     </ns-modal>
     <!-- 新增数据库数据 -->
     <a-drawer
@@ -117,15 +124,21 @@
         <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;">
+        <div
+          style="
+            width: 100%;
+            height: 7%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          ">
           <a-select
             ref="select"
             :value="unitTreeParams.id"
             allowClear
             style="width: 96%"
             placeholder="选择分组"
-            @change="handleChange"
-          >
+            @change="handleChange">
             <a-select-option v-for="(item, index) in groupData" :key="index" :value="item.id">
               {{ item.cnValue }}
             </a-select-option>
@@ -146,8 +159,11 @@
               <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)" />
+                <MinusCircleOutlined style="margin-left: 6px" @click="delUnit(data)" />
+                <PlusCircleOutlined
+                  v-if="!data.parentId"
+                  style="margin-left: 6px"
+                  @click="addUnit(data)" />
               </div>
             </div>
           </template>
@@ -158,31 +174,32 @@
       </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"
-      >
+    <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"
-      >
+    <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
+            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>
@@ -193,12 +210,17 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { MoreOutlined,ExclamationCircleOutlined,EditOutlined,PlusCircleOutlined,MinusCircleOutlined } from '@ant-design/icons-vue';
+  import {
+    ExclamationCircleOutlined,
+    EditOutlined,
+    PlusCircleOutlined,
+    MinusCircleOutlined,
+  } from '@ant-design/icons-vue';
   import { Modal } from 'ant-design-vue';
-  import { computed, createVNode, defineComponent, reactive, ref, watchEffect,watch,toRaw } from 'vue';
+  import { computed, createVNode, 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';
+  import { NsMessage } from '/nerv-lib/component';
+  import { formConfig } from './config';
   import { carbonEmissionFactorLibrary } from '/@/api/carbonEmissionFactorLibrary';
   import type {
     AntTreeNodeDragEnterEvent,
@@ -220,7 +242,7 @@
   const disabled = ref(false);
   const treeNodeAdd = ref<boolean>(false);
   const operationTree = ref<string>('新增');
-  const showOperation = ref(false)
+  const showOperation = ref(false);
 
   const opMap: any = ref({
     type: 'add',
@@ -358,7 +380,7 @@
     for (let i = 0; i < tree.length; i++) {
       const node = tree[i];
       if (node.children) {
-        if (node.children.some(item => item.key === key)) {
+        if (node.children.some((item) => item.key === key)) {
           parentKey = node.key;
         } else if (getParentKey(key, node.children)) {
           parentKey = getParentKey(key, node.children);
@@ -374,7 +396,7 @@
     expandedKeys.value = keys;
     autoExpandParent.value = false;
   };
-  watch(selectTreeDataValue, value => {
+  watch(selectTreeDataValue, (value) => {
     const expanded = dataList
       .map((item: TreeProps['treeData'][number]) => {
         if (item.title.indexOf(value) > -1) {
@@ -393,70 +415,70 @@
     console.log('or use this.value', value.value);
   };
   // 点击数据点的复选框
-  const checkedIds = ref([])
-  const emissionType = ref()
+  const checkedIds = ref([]);
+  const emissionType = ref();
   const checkTreeNode = (checkedKeys, info) => {
-    checkedTreeNodeKeys.value = checkedKeys
-    checkedIds.value = []
-    info.checkedNodes.forEach(item=>{
-      checkedIds.value.push(item.id)
-    })
+    checkedTreeNodeKeys.value = checkedKeys;
+    checkedIds.value = [];
+    info.checkedNodes.forEach((item) => {
+      checkedIds.value.push(item.id);
+    });
     sessionStorage.setItem('checkedTreeNode', checkedIds.value);
-    emissionType.value = checkedIds.value.join(',')
+    emissionType.value = checkedIds.value.join(',');
     mainRef.value?.nsTableRef.reload();
-  }
+  };
   // 点击新增树节点
   const addTreeNodeData = () => {
-    operationTree.value='新增'
+    operationTree.value = '新增';
     treeNodeAdd.value = true;
-    editTreeNode.value.type = 'create'
+    editTreeNode.value.type = 'create';
   };
   // 编辑树节点
   const editTreeNodeData = (data) => {
-    operationTree.value='编辑'
+    operationTree.value = '编辑';
     treeNodeAdd.value = true;
-    editTreeNode.value.type = 'update'
-    addTreeNode.value = data.emissionName
-  }
+    editTreeNode.value.type = 'update';
+    addTreeNode.value = data.emissionName;
+  };
   // 删除树节点
   const deleteTreeNode = () => {
     Modal.confirm({
-    title: '警告',
-    icon: createVNode(ExclamationCircleOutlined),
-    content: '确定要删除么？',
-    okText: '确认',
-    okType: 'primary',
-    cancelText: '取消',
-    onOk() {
-      http.post(carbonEmissionFactorLibrary.delTreeNode,editTreeNode.value).then(() => {
-        getOrgTree()
-        NsMessage.success('操作成功');
-      });
-    },
-    onCancel() {
-      console.log('Cancel');
-    },
-  });
-  }
+      title: '警告',
+      icon: createVNode(ExclamationCircleOutlined),
+      content: '确定要删除么？',
+      okText: '确认',
+      okType: 'primary',
+      cancelText: '取消',
+      onOk() {
+        http.post(carbonEmissionFactorLibrary.delTreeNode, editTreeNode.value).then(() => {
+          getOrgTree();
+          NsMessage.success('操作成功');
+        });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
   // 新增/编辑树节点点击确定
-  const addTreeNode =ref()
+  const addTreeNode = ref();
   const handleOk = (e: MouseEvent) => {
-    editTreeNode.value.emissionName = addTreeNode.value
-    http.post(carbonEmissionFactorLibrary.creat,editTreeNode.value).then(() => {
-      getOrgTree()
+    editTreeNode.value.emissionName = addTreeNode.value;
+    http.post(carbonEmissionFactorLibrary.creat, editTreeNode.value).then(() => {
+      getOrgTree();
       NsMessage.success('操作成功');
-      addTreeNode.value = ''
+      addTreeNode.value = '';
       treeNodeAdd.value = false;
     });
   };
   const handleCancel = () => {
-    addTreeNode.value = ''
+    addTreeNode.value = '';
     treeNodeAdd.value = false;
   };
   // 获取排放分类树
   const getOrgTree = (params?) => {
     fetch(carbonEmissionFactorLibrary.getCarbonFactorTree, params).then((res) => {
-      gData.value = res.data
+      gData.value = res.data;
       // 找到匹配的节点数据
       // const selectedNodes = [];
       // checkedTreeNodeKeys.value.forEach(key => {
@@ -469,31 +491,31 @@
       // getDefaultIds(selectedNodes)
     });
   };
-  const defaultIds = ref([])
+  const defaultIds = ref([]);
   const getDefaultIds = (selectedNodes) => {
-    selectedNodes.forEach(items => {
-      defaultIds.value.push(items.id)
-      if(items.children){
-        getDefaultIds(items.children)
+    selectedNodes.forEach((items) => {
+      defaultIds.value.push(items.id);
+      if (items.children) {
+        getDefaultIds(items.children);
       }
-    })
-    emissionType.value = defaultIds.value.join(',')
-    checkedIds.value = defaultIds.value
+    });
+    emissionType.value = defaultIds.value.join(',');
+    checkedIds.value = defaultIds.value;
     sessionStorage.setItem('checkedTreeNode', checkedIds.value);
-  }
+  };
   getOrgTree();
   // 被选中的树节点
-  const editTreeNode = ref({})
+  const editTreeNode = ref({});
   const onSelect = (selectedKeys: string[], info: any) => {
-    if(info.selected){
-      showOperation.value = true
+    if (info.selected) {
+      showOperation.value = true;
       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,
-      }
+        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,
+      };
     }
   };
 
@@ -516,13 +538,14 @@
   };
 
   const handleSelect = (selectedKeys: any, info: any) => {
-    fetch(carbonEmissionFactorLibrary.queryDeptTree, { orgId: info.node?.orgInfo.orgId }).then((res) => {
-      treeData2.value = res.data;
-    });
+    fetch(carbonEmissionFactorLibrary.queryDeptTree, { orgId: info.node?.orgInfo.orgId }).then(
+      (res) => {
+        treeData2.value = res.data;
+      },
+    );
     tableFetch({ orgId: info.node?.orgInfo.orgId });
   };
 
-
   const onClose = () => {
     visible.value = false;
     formData.value = {};
@@ -530,8 +553,8 @@
   };
   const closeUnitManag = () => {
     unitTreeParams.value = {
-      grp: 'MEASUREMENT_UNIT'
-    }
+      grp: 'MEASUREMENT_UNIT',
+    };
     unitManagement.value = false;
   };
   const onEdit = () => {
@@ -542,8 +565,7 @@
       //   return;
       // }
 
-      opMap.value.fuc &&
-        opMap.value.fuc({ ...formData.value });
+      opMap.value.fuc && opMap.value.fuc({ ...formData.value });
     });
   };
   const tableConfig = ref({
@@ -551,7 +573,7 @@
     api: carbonEmissionFactorLibrary.getTableList,
     params: {
       orgId,
-      emissionType
+      emissionType,
     },
     headerActions: [
       {
@@ -562,13 +584,13 @@
           opMap.value.type = 'add';
           setTimeout(() => {
             formData.value = {
-              carbonEmissionPrefix:'t',
-              numberOfReferences:'10'
+              carbonEmissionPrefix: 't',
+              numberOfReferences: '10',
             };
             userAuthList.value.splice(0);
           });
           opMap.value.fuc = (formData: any) => {
-            formData.emissionType = formData.emissionType[formData.emissionType.length - 1]
+            formData.emissionType = formData.emissionType[formData.emissionType.length - 1];
             return http.post(carbonEmissionFactorLibrary.creatOrUpdate, formData).then(() => {
               mainRef.value?.nsTableRef.reload();
               visible.value = false;
@@ -607,11 +629,13 @@
         type: 'primary',
         name: 'userAdd',
         handle: () => {
-          unitManagement.value = true,
-          fetch(carbonEmissionFactorLibrary.findOutermost,{grp:'MEASUREMENT_UNIT'}).then((res) => {
-            groupData.value = res.data
-          });
-          getUnitTree()
+          (unitManagement.value = true),
+            fetch(carbonEmissionFactorLibrary.findOutermost, { grp: 'MEASUREMENT_UNIT' }).then(
+              (res) => {
+                groupData.value = res.data;
+              },
+            );
+          getUnitTree();
         },
       },
     ],
@@ -672,14 +696,14 @@
           handle: (record: any) => {
             userAuthList.value.splice(0);
             setTimeout(() => {
-              const measurementUnit = ref([])
-              http.post(carbonEmissionFactorLibrary.getCarbonFactorTree,{}).then((res) => {
-                measurementUnit.value = res.data
-                http.post(carbonEmissionFactorLibrary.findById,{ id: record.id } ).then((res) => {
+              const measurementUnit = ref([]);
+              http.post(carbonEmissionFactorLibrary.getCarbonFactorTree, {}).then((res) => {
+                measurementUnit.value = res.data;
+                http.post(carbonEmissionFactorLibrary.findById, { id: record.id }).then((res) => {
                   if (res.data.emissionType) {
                     let selectDevice = ref([Number(res.data.emissionType)]);
                     findParentIds(measurementUnit.value, res.data.emissionType, selectDevice.value);
-                    res.data.emissionType = selectDevice
+                    res.data.emissionType = selectDevice;
                   }
                   formData.value = res.data;
                 });
@@ -687,9 +711,9 @@
             }, 10);
             opMap.value.type = 'edit';
             opMap.value.fuc = (formData: any) => {
-              formData.emissionType = formData.emissionType[formData.emissionType.length - 1]
-              if(formData.emissionGas.value){
-                formData.emissionGas = formData.emissionGas.value
+              formData.emissionType = formData.emissionType[formData.emissionType.length - 1];
+              if (formData.emissionGas.value) {
+                formData.emissionGas = formData.emissionGas.value;
               }
               return http.post(carbonEmissionFactorLibrary.creatOrUpdate, formData).then(() => {
                 mainRef.value?.nsTableRef.reload();
@@ -756,7 +780,7 @@
               },
               {
                 label: 'SF6',
-                value:3,
+                value: 3,
               },
               {
                 label: 'CH4',
@@ -815,9 +839,9 @@
           result.unshift(item.id); // 将当前节点的id添加到结果数组的最前面
           findParentIds(tree, item.id, result); // 递归查找父级节点的id
           break; // 找到后可以退出循环
-        }else{
-          for(let childsItem of item.children){
-            if(childsItem.children && childsItem.children.length > 0){
+        } else {
+          for (let childsItem of item.children) {
+            if (childsItem.children && childsItem.children.length > 0) {
               if (childsItem.children.some((child: any) => child.id === Number(targetId))) {
                 result.unshift(childsItem.id); // 将当前节点的id添加到结果数组的最前面
                 findParentIds(tree, childsItem.id, result); // 递归查找父级节点的id
@@ -829,24 +853,26 @@
       }
     }
   }
-  
+
   // 单位管理
   const unitExpandedKeys = ref<string[]>();
   const unitSelectedKeys = ref<string[]>([]);
-  const unitTreeParams  = ref({
-    grp: 'MEASUREMENT_UNIT'
-  })
-  const groupData = ref([])
+  const unitTreeParams = ref({
+    grp: 'MEASUREMENT_UNIT',
+  });
+  const groupData = ref([]);
   const unitTreeData = ref<TreeProps['treeData']>(genData);
   const handleChange = (value: string) => {
-    unitTreeParams.value.id = value
-    getUnitTree()
+    unitTreeParams.value.id = value;
+    getUnitTree();
   };
   const getUnitTree = () => {
-    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, unitTreeParams.value).then((res) => {
-      unitTreeData.value = res.data
-    });
-  }
+    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, unitTreeParams.value).then(
+      (res) => {
+        unitTreeData.value = res.data;
+      },
+    );
+  };
   // 新增单位管理
   const labelCol = { span: 5 };
   const wrapperCol = { span: 19 };
@@ -857,100 +883,100 @@
   const formState = ref({
     grp: 'MEASUREMENT_UNIT',
     grpDesc: '计量单位',
-  })
+  });
   const addGroupTitle = ref<string>('新增分组');
   const addUnitTitle = ref<string>('新增单位');
   const addGroup = () => {
-    addGroupTitle.value = '新增分组'
-    addGroupManage.value = true
+    addGroupTitle.value = '新增分组';
+    addGroupManage.value = true;
   };
   const editGroup = (data) => {
-    addGroupTitle.value = '编辑分组'
-    addGroupManage.value = true
-    formState.value.id = data.id
-    formState.value.cnValue = data.cnValue
+    addGroupTitle.value = '编辑分组';
+    addGroupManage.value = true;
+    formState.value.id = data.id;
+    formState.value.cnValue = data.cnValue;
   };
   const groupCancel = () => {
-    addGroupManage.value = false
+    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
+    if (data.id) {
+      canSelect.value = true;
+      formState.value.parentId = data.id;
+    } else {
+      canSelect.value = false;
     }
     fetch(carbonEmissionFactorLibrary.findOutermost).then((res) => {
-      groupData.value = res.data
+      groupData.value = res.data;
     });
-    addUnitTitle.value = '新增单位'
-    addUnitManage.value = true
+    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
+    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
+    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){
+        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
+            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()
+            };
+            getUnitTree();
           });
-        }else{
+        } else {
           fetch(carbonEmissionFactorLibrary.createDictionary, formState.value).then((res) => {
-            unitTreeData.value = res.data
-            if(formState.value.parentId){
-              addUnitManage.value = false
-            }else{
-              addGroupManage.value = false
+            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()
+            };
+            getUnitTree();
           });
         }
       })
-      .catch(error => {
+      .catch((error) => {
         console.log('error', error);
       });
   };
   // 删除单位管理的树节点
   const delUnit = (data) => {
-    formState.value.id = data.id
+    formState.value.id = data.id;
     Modal.confirm({
       title: '警告',
       content: '确定要删除吗?',
@@ -958,9 +984,9 @@
       okType: 'primary',
       cancelText: '取消',
       onOk() {
-        fetch(carbonEmissionFactorLibrary.delDictionary , formState.value).then((res) => {
+        fetch(carbonEmissionFactorLibrary.delDictionary, formState.value).then((res) => {
           message.success('操作成功！');
-          getUnitTree()
+          getUnitTree();
         });
       },
       onCancel() {
@@ -968,7 +994,6 @@
       },
     });
   };
-
 </script>
 <style lang="less" scoped>
   .main {
@@ -988,9 +1013,9 @@
     }
     display: flex;
     flex-direction: column;
-    .top{
+    .top {
       position: relative;
-      .addTreeNode{
+      .addTreeNode {
         width: 100%;
         padding: 16px;
         position: absolute;
@@ -1008,7 +1033,7 @@
     // border-bottom: 5px solid rgb(229, 235, 240);
     // overflow-y: auto;
   }
-  .ns-form-title{
+  .ns-form-title {
     font-weight: bold;
     user-select: text;
     padding: 16px;
@@ -1016,7 +1041,7 @@
     padding-bottom: 10px;
     border-bottom: 1px solid #e9e9e9;
   }
-  .title{
+  .title {
     text-align: left;
     height: 32px;
     line-height: 32px;
@@ -1034,21 +1059,21 @@
     height: 13px;
     width: 3px;
     border-radius: 1px;
-    background-color: #2778FF;
+    background-color: #2778ff;
   }
   .treeRow {
     display: flex;
     justify-content: space-between;
     align-items: center;
   }
-  .addButton{
+  .addButton {
     width: 70%;
     height: 5vh;
     display: flex;
     align-items: center;
     justify-content: space-evenly;
   }
-  .treePart{
+  .treePart {
     width: 70%;
     height: 100%;
     display: flex;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
index 652f433..181b588 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -1,20 +1,24 @@
 <template>
   <div>
-    <a-table 
-      :columns="column" 
-      :data-source="data" 
+    <a-table
+      :columns="column"
+      :data-source="data"
       bordered
       :pagination="false"
-      :scroll="{ x: 2000,y:480 }">
+      :scroll="{ x: 2000, y: 480 }">
       <template #title>
-        <a-date-picker v-model:value="selectYear" picker="year" @change="changeYearData" valueFormat="YYYY" />
+        <a-date-picker
+          v-model:value="selectYear"
+          picker="year"
+          @change="changeYearData"
+          valueFormat="YYYY" />
       </template>
     </a-table>
-    <a-pagination 
+    <a-pagination
       :current="queryParams.pageNum"
       :total="total"
       :page-size="queryParams.pageSize"
-      style="display: flex;justify-content: center;margin-top: 16px;"
+      style="display: flex; justify-content: center; margin-top: 16px"
       :show-size-changer="true"
       :show-quick-jumper="true"
       @change="onChange" />
@@ -35,26 +39,26 @@
   const orgId = ref('');
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
   orgId.value = result;
-  const fetch = (api, params = { orgId } ) => {
+  const fetch = (api, params = { orgId }) => {
     return http.post(api, params);
   };
   const data = ref([]);
-  const selectYear = ref<Dayjs>(dayjs( new Date().getFullYear().toString()));
-  const total = ref<number>()
+  const selectYear = ref<Dayjs>(dayjs(new Date().getFullYear().toString()));
+  const total = ref<number>();
   const queryParams = ref({
     pageNum: 1,
     pageSize: 10,
     year: selectYear.value.format('YYYY'),
-    orgId: orgId.value
-  })
-  
+    orgId: orgId.value,
+  });
+
   // 年份选择改变触发
   const changeYearData = () => {
-    queryParams.value.year = selectYear.value
-    getTableList()
-  }
+    queryParams.value.year = selectYear.value;
+    getTableList();
+  };
   // 表头
-  const column: TableColumnsType [] = [
+  const column: TableColumnsType[] = [
     {
       title: '排放类型',
       dataIndex: 'cnValue',
@@ -163,24 +167,24 @@
   };
   // 获取表格数据
   const getTableList = () => {
-    fetch(carbonEmission.carbonEmissionStatistics , queryParams.value).then((res) => {
-      data.value = res.data
-      total.value = res.data.length
+    fetch(carbonEmission.carbonEmissionStatistics, queryParams.value).then((res) => {
+      data.value = res.data;
+      total.value = res.data.length;
     });
   };
-  getTableList()
+  getTableList();
   // 分页器
-  const onChange = (pageNumber: number,size: number) => {
+  const onChange = (pageNumber: number, size: number) => {
     queryParams.value.pageNum = pageNumber;
     queryParams.value.pageSize = size;
-    getTableList()
+    getTableList();
   };
 </script>
 <style scoped lang="less">
-  :deep(.ant-table-title){
+  :deep(.ant-table-title) {
     display: flex;
   }
-  :deep(.ant-table-container){
+  :deep(.ant-table-container) {
     padding: 0px 16px;
   }
 </style>
@@ -189,4 +193,4 @@
   td.column-money {
     text-align: right !important;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue
index 831f1b2..f39242a 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue
@@ -31,4 +31,3 @@
     // }
   };
 </script>
-
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 08059aa..200e900 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -2,16 +2,15 @@
   <div class="main">
     <div class="left">
       <div class="top">
-        <a-form style="width: 100%;margin: 0 auto;">
+        <a-form style="width: 100%; margin: 0 auto">
           <div class="ns-form-title"><div class="title">因子分类</div></div>
-          <div style="padding: 0 16px !important;width: 100%;">
+          <div style="padding: 0 16px !important; width: 100%">
             <a-row>
-              <a-col :span="24" style="margin-bottom: 16px;">
+              <a-col :span="24" style="margin-bottom: 16px">
                 <a-input-search
                   v-model:value="searchValue"
                   placeholder="请输入关键词"
-                  @search="onSearchTreeData"
-                />
+                  @search="onSearchTreeData" />
               </a-col>
             </a-row>
           </div>
@@ -25,13 +24,15 @@
           show-line
           @expand="onExpand"
           @select="onSelect"
-          style="padding: 0 16px !important;"
-        >
+          style="padding: 0 16px !important">
           <template #title="data">
-            <span v-if="data.energyType && searchValue && data.energyType.indexOf(searchValue) > -1">
+            <span
+              v-if="data.energyType && searchValue && data.energyType.indexOf(searchValue) > -1">
               {{ data.energyType.substring(0, data.energyType.indexOf(searchValue)) }}
               <span style="color: #f50">{{ searchValue }}</span>
-              {{ data.energyType.substring(data.energyType.indexOf(searchValue) + searchValue.length) }}
+              {{
+                data.energyType.substring(data.energyType.indexOf(searchValue) + searchValue.length)
+              }}
             </span>
             <span v-else>{{ data.energyType }}</span>
           </template>
@@ -61,33 +62,35 @@
         </template>
       </a-table> -->
       <ns-view-list-table v-bind="tableConfig" :model="tableData" ref="mainRef" />
-      <a-pagination 
+      <a-pagination
         :current="queryParams.pageNum"
         :total="total"
         :page-size="queryParams.pageSize"
-        style="display: flex;justify-content: center;margin-top: 16px;"
+        style="display: flex; justify-content: center; margin-top: 16px"
         :show-size-changer="true"
         :show-quick-jumper="true"
         @change="onChange" />
-        <!-- 新增/编辑 -->
-        <a-drawer
-          :width="700"
-          :visible="visible"
-          :body-style="{ paddingBottom: '80px' }"
-          :footer-style="{ textAlign: 'right' }"
-          destroyOnClose
-          @close="onClose">
-          <a-form
-            ref="formRef"
-            :model="formState"
-            :rules="rules"
-            :label-col="labelCol"
-            :wrapper-col="wrapperCol"
-          >
+      <!-- 新增/编辑 -->
+      <a-drawer
+        :width="700"
+        :visible="visible"
+        :body-style="{ paddingBottom: '80px' }"
+        :footer-style="{ textAlign: 'right' }"
+        destroyOnClose
+        @close="onClose">
+        <a-form
+          ref="formRef"
+          :model="formState"
+          :rules="rules"
+          :label-col="labelCol"
+          :wrapper-col="wrapperCol">
           <a-row>
             <a-col :span="12">
               <a-form-item ref="name" label="日期范围" name="dateRange">
-                <a-range-picker v-model:value="formState.dateRange" picker="month" valueFormat="YYYY-MM" />
+                <a-range-picker
+                  v-model:value="formState.dateRange"
+                  picker="month"
+                  valueFormat="YYYY-MM" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -103,20 +106,24 @@
               </a-form-item>
             </a-col>
           </a-row>
-          </a-form>
-          <a-table 
-            :columns="drawerColumns" 
-            :data-source="newTableData" 
-            bordered
-            rowKey="id"
-            :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectionChange, type: 'radio' }"
-            :pagination="false">
-          </a-table>
-          <template #footer>
-            <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
-            <a-button type="primary" @click="onSubmit">确定</a-button>
-          </template>
-        </a-drawer>
+        </a-form>
+        <a-table
+          :columns="drawerColumns"
+          :data-source="newTableData"
+          bordered
+          rowKey="id"
+          :rowSelection="{
+            selectedRowKeys: selectedRowKeys,
+            onChange: onSelectionChange,
+            type: 'radio',
+          }"
+          :pagination="false">
+        </a-table>
+        <template #footer>
+          <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
+          <a-button type="primary" @click="onSubmit">确定</a-button>
+        </template>
+      </a-drawer>
     </div>
   </div>
 </template>
@@ -124,10 +131,13 @@
 <script lang="ts" setup>
   import { ref, watch, toRaw } from 'vue';
   import type { TreeProps } from 'ant-design-vue';
-  import { Pagination,Modal } from 'ant-design-vue';
-  import { columns,drawerColumns } 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';
+  import {
+    quickCalculation,
+    carbonEmissionFactorLibrary,
+  } from '/@/api/carbonEmissionFactorLibrary';
   defineOptions({
     energyType: 'quickCalculation', // 与页面路由name一致缓存才可生效
     components: {
@@ -137,7 +147,7 @@
   const orgId = ref('');
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
   orgId.value = result;
-  const fetch = (api, params = { orgId } ) => {
+  const fetch = (api, params = { orgId }) => {
     return http.post(api, params);
   };
   const mainRef = ref();
@@ -191,7 +201,7 @@
     for (let i = 0; i < tree.length; i++) {
       const node = tree[i];
       if (node.children) {
-        if (node.children.some(item => item.key === key)) {
+        if (node.children.some((item) => item.key === key)) {
           parentKey = node.key;
         } else if (getParentKey(key, node.children)) {
           parentKey = getParentKey(key, node.children);
@@ -211,17 +221,17 @@
     autoExpandParent.value = false;
   };
   // 被选中的树节点
-  const energyType = ref()
+  const energyType = ref();
   const onSelect = (selectedKey: string[], info: any) => {
-    selectedKeys.value = selectedKey; 
-    if(info.selected){
-      energyType.value = info.node.id
-      statsId.value = info.node.id
+    selectedKeys.value = selectedKey;
+    if (info.selected) {
+      energyType.value = info.node.id;
+      statsId.value = info.node.id;
       mainRef.value?.nsTableRef.reload();
     }
   };
 
-  watch(searchValue, value => {
+  watch(searchValue, (value) => {
     const expanded = dataList
       .map((item: TreeProps['treeData'][number]) => {
         if (item.title.indexOf(value) > -1) {
@@ -235,34 +245,33 @@
     autoExpandParent.value = true;
   });
   // 查询因子分类树数据
-  const onSearchTreeData = () => {
-  };
-  const statsId = ref()
+  const onSearchTreeData = () => {};
+  const statsId = ref();
   // 获取因子分类树数据
   const getTreeData = () => {
     fetch(quickCalculation.carbonQuickTree).then((res) => {
-      gData.value = res.data
-      energyType.value = gData.value[0].children[0].id
-      statsId.value = gData.value[0].children[0].id
+      gData.value = res.data;
+      energyType.value = gData.value[0].children[0].id;
+      statsId.value = gData.value[0].children[0].id;
       mainRef.value?.nsTableRef.reload();
     });
   };
-  getTreeData()
+  getTreeData();
   // 列表数据
-  const total = ref<number>()
+  const total = ref<number>();
   const queryParams = ref({
     pageNum: 1,
     pageSize: 10,
-    orgId: orgId.value
-  })
+    orgId: orgId.value,
+  });
   const tableData = ref([]);
-  
+
   const tableConfig = ref({
     title: '排放因子库',
     api: quickCalculation.queryCarbonEmissionPage,
     params: {
       orgId,
-      energyType
+      energyType,
     },
     headerActions: [
       {
@@ -270,8 +279,8 @@
         name: 'userAdd',
         type: 'primary',
         handle: () => {
-          visible.value = true
-          getNewTable()
+          visible.value = true;
+          getNewTable();
         },
       },
     ],
@@ -320,12 +329,12 @@
           name: 'userEdit',
           handle: (record: any) => {
             selectedRowKeys.value = [record.factorId];
-            formState.value.id = record.id
-            formState.value.emissionFactors = record.emissionFactors
+            formState.value.id = record.id;
+            formState.value.emissionFactors = record.emissionFactors;
             formState.value.dateRange = [record.startTime, record.endTime];
-            formState.value.factorId = record.factorId
-            visible.value = true
-            getNewTable()
+            formState.value.factorId = record.factorId;
+            visible.value = true;
+            getNewTable();
           },
         },
         {
@@ -342,13 +351,13 @@
   });
   // 获取列表数据
   const getTableList = () => {
-    fetch(quickCalculation.queryCarbonEmissionPage,queryParams.value).then((res) => {
-      tableData.value = res.data.records
-      total.value = res.data.total
+    fetch(quickCalculation.queryCarbonEmissionPage, queryParams.value).then((res) => {
+      tableData.value = res.data.records;
+      total.value = res.data.total;
     });
   };
   // 分页器
-  const onChange = (pageNumber: number,size: number) => {
+  const onChange = (pageNumber: number, size: number) => {
     queryParams.value.pageNum = pageNumber;
     queryParams.value.pageSize = size;
     mainRef.value?.nsTableRef.reload();
@@ -357,9 +366,9 @@
   const formRef = ref();
   const labelCol = { span: 6 };
   const wrapperCol = { span: 18 };
-  const formState = ref({})
+  const formState = ref({});
   const visible = ref(false);
-  
+
   // 定义form表单的必填
   const rules: Record<string, Rule[]> = {
     dateRange: [{ required: true, message: '请选择日期范围', trigger: 'change' }],
@@ -367,65 +376,65 @@
   };
   // 点击新增按钮
   const addNewData = () => {
-    visible.value = true
-    getNewTable()
+    visible.value = true;
+    getNewTable();
   };
   // 获取新增页面的列表
   const selectedRowKeys = ref([]);
   const onSelectionChange = (selectedKeys, selectedRows) => {
     selectedRowKeys.value = selectedKeys;
-    formState.value.emissionFactors = selectedRows[0].emissionFactors
-    formState.value.factorId = selectedRows[0].id
+    formState.value.emissionFactors = selectedRows[0].emissionFactors;
+    formState.value.factorId = selectedRows[0].id;
   };
   const queryData = ref({
     orgId: orgId.value,
     pageNum: 1,
-    pageSize: 999
-  })
-  const newTableData = ref([])
+    pageSize: 999,
+  });
+  const newTableData = ref([]);
   const getNewTable = () => {
-    fetch(carbonEmissionFactorLibrary.getTableList,queryData.value).then((res) => {
-      newTableData.value = res.data.records
+    fetch(carbonEmissionFactorLibrary.getTableList, queryData.value).then((res) => {
+      newTableData.value = res.data.records;
     });
   };
   // 点击编辑按钮
-  const editData = (record) =>{
+  const editData = (record) => {
     selectedRowKeys.value = [record.factorId];
-    formState.value.id = record.id
-    formState.value.emissionFactors = record.emissionFactors
+    formState.value.id = record.id;
+    formState.value.emissionFactors = record.emissionFactors;
     formState.value.dateRange = [record.startTime, record.endTime];
-    formState.value.factorId = record.factorId
-    visible.value = true
-    getNewTable()
+    formState.value.factorId = record.factorId;
+    visible.value = true;
+    getNewTable();
   };
   // 点击确定提交
   const onSubmit = () => {
     formRef.value
       .validate()
       .then(() => {
-        formState.value.statsId = statsId.value
-        formState.value.startTime = formState.value.dateRange[0]
-        formState.value.endTime = formState.value.dateRange[1]
+        formState.value.statsId = statsId.value;
+        formState.value.startTime = formState.value.dateRange[0];
+        formState.value.endTime = formState.value.dateRange[1];
         console.log('values', formState, toRaw(formState));
-        if(formState.value.id){
-          fetch(quickCalculation.update,formState.value).then((res) => {
-            visible.value = false
+        if (formState.value.id) {
+          fetch(quickCalculation.update, formState.value).then((res) => {
+            visible.value = false;
             selectedRowKeys.value = [];
-            formState.value = {}
+            formState.value = {};
             formRef.value.resetFields();
             mainRef.value?.nsTableRef.reload();
           });
-        }else{
-          fetch(quickCalculation.creat,formState.value).then((res) => {
-            visible.value = false
+        } else {
+          fetch(quickCalculation.creat, formState.value).then((res) => {
+            visible.value = false;
             selectedRowKeys.value = [];
-            formState.value = {}
+            formState.value = {};
             formRef.value.resetFields();
             mainRef.value?.nsTableRef.reload();
           });
         }
       })
-      .catch(error => {
+      .catch((error) => {
         console.log('error', error);
       });
   };
@@ -438,9 +447,9 @@
       okType: 'primary',
       cancelText: '取消',
       onOk() {
-        fetch(quickCalculation.del , {id : record.id }).then((res) => {
+        fetch(quickCalculation.del, { id: record.id }).then((res) => {
           message.success('操作成功！');
-          getTableList()
+          getTableList();
         });
       },
       onCancel() {
@@ -452,7 +461,7 @@
   const onClose = () => {
     visible.value = false;
     selectedRowKeys.value = [];
-    formState.value = {}
+    formState.value = {};
     formRef.value.resetFields();
   };
 </script>
@@ -474,9 +483,9 @@
 
     display: flex;
     flex-direction: column;
-    .top{
+    .top {
       position: relative;
-      .addTreeNode{
+      .addTreeNode {
         width: 100%;
         padding: 16px;
         position: absolute;
@@ -499,7 +508,7 @@
   .top {
     overflow: auto;
   }
-  .ns-form-title{
+  .ns-form-title {
     font-weight: bold;
     user-select: text;
     padding: 16px;
@@ -507,7 +516,7 @@
     padding-bottom: 10px;
     border-bottom: 1px solid #e9e9e9;
   }
-  .title{
+  .title {
     text-align: left;
     height: 32px;
     line-height: 32px;
@@ -525,17 +534,17 @@
     height: 13px;
     width: 3px;
     border-radius: 1px;
-    background-color: #2778FF;
+    background-color: #2778ff;
   }
   :deep(.ant-table-title) {
     display: flex;
     height: 100%;
     align-items: center;
   }
-  .ns-table-title{
+  .ns-table-title {
     font-weight: bold;
   }
-  .buttonGroup{
+  .buttonGroup {
     margin-left: 1vw;
     width: 5vw;
     display: flex;
@@ -547,4 +556,4 @@
   td.column-money {
     text-align: right !important;
   }
-</style>
\ No newline at end of file
+</style>
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
index 9fb4af0..ba6809f 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -2,18 +2,23 @@
   <div class="main">
     <div class="left">
       <div class="top">
-        <a-form style="width: 100%;margin: 0 auto;">
-            <div class="ns-form-title">
-              <div class="title">{{props.year}}年济阳站碳盘查报告</div>
-              <div class="standard">
-                <span>适用标准：ISO 14064-1</span>
-                <a-button type="primary" style="margin-left: 12px;" @click="openCategoryConfig">类别配置</a-button>
-              </div>
+        <a-form style="width: 100%; margin: 0 auto">
+          <div class="ns-form-title">
+            <div class="title">{{ props.year }}年济阳站碳盘查报告</div>
+            <div class="standard">
+              <span>适用标准：ISO 14064-1</span>
+              <a-button type="primary" style="margin-left: 12px" @click="openCategoryConfig"
+                >类别配置</a-button
+              >
             </div>
-          <div style="padding: 0 16px !important;width: 100%;">
+          </div>
+          <div style="padding: 0 16px !important; width: 100%">
             <a-row>
-              <a-col :span="24" style="margin-bottom: 16px;">
-                <a-input-search v-model:value="searchValue" style="margin-bottom: 8px" placeholder="请输入关键词" />
+              <a-col :span="24" style="margin-bottom: 16px">
+                <a-input-search
+                  v-model:value="searchValue"
+                  style="margin-bottom: 8px"
+                  placeholder="请输入关键词" />
               </a-col>
             </a-row>
           </div>
@@ -26,13 +31,12 @@
           v-if="gData && gData.length > 0"
           :height="233"
           show-line
-          style="padding: 0 16px !important;"
+          style="padding: 0 16px !important"
           @expand="onExpandL"
           @select="onSelectL"
-          block-node
-        >
+          block-node>
           <template #title="{ cnValue }">
-              <span v-if="cnValue && searchValue && cnValue.indexOf(searchValue) > -1">
+            <span v-if="cnValue && searchValue && cnValue.indexOf(searchValue) > -1">
               {{ cnValue.substring(0, cnValue.indexOf(searchValue)) }}
               <span style="color: #f50">{{ searchValue }}</span>
               {{ cnValue.substring(cnValue.indexOf(searchValue) + searchValue.length) }}
@@ -41,22 +45,22 @@
           </template>
         </a-tree>
       </div>
-       <div class="bottom">
-        <a-form style="width: 100%;margin: 0 auto;">
+      <div class="bottom">
+        <a-form style="width: 100%; margin: 0 auto">
           <div class="ns-form-title"><div class="title">报告相关</div></div>
-          <div class="button" style="padding: 0 16px !important;">
-            <div :class="{ 'pftj': isClickedPftj }" @click="showPftj">排放统计</div>
-            <div :class="{ 'tplx': isClickedTplx }" @click="showTplx">碳排流向</div>
+          <div class="button" style="padding: 0 16px !important">
+            <div :class="{ pftj: isClickedPftj }" @click="showPftj">排放统计</div>
+            <div :class="{ tplx: isClickedTplx }" @click="showTplx">碳排流向</div>
           </div>
         </a-form>
       </div>
     </div>
     <div class="right">
-      <div style="display:flex;">
+      <div style="display: flex">
         <div class="ns-table-title ns-title-extra-box">排放源</div>
-        <a-button type="primary" style="margin-left: 12px;" @click="changeParentData">返回</a-button>
+        <a-button type="primary" style="margin-left: 12px" @click="changeParentData">返回</a-button>
       </div>
-      <div style="display: flex;" v-if="fillInPage">
+      <div style="display: flex" v-if="fillInPage">
         <div class="mainLeft">
           <a-tree
             :expandedKeys="expandedKeysR"
@@ -64,8 +68,7 @@
             :checkedKeys="checkedKeys"
             :tree-data="treeData"
             @select="onSelectR"
-            block-node
-          >
+            block-node>
             <template #title="data">
               <div class="treeRow">
                 <div>
@@ -73,13 +76,13 @@
                 </div>
                 <div class="actionMore">
                   <EditOutlined @click="editUnit(data)" />
-                  <MinusCircleOutlined style="margin-left: 6px;" @click="delUnit(data)" />
+                  <MinusCircleOutlined style="margin-left: 6px" @click="delUnit(data)" />
                 </div>
               </div>
             </template>
           </a-tree>
           <div class="addTreeNode">
-            <a-button type="primary" style="width:100%;" @click="addTreeNodeData">新增</a-button>
+            <a-button type="primary" style="width: 100%" @click="addTreeNodeData">新增</a-button>
           </div>
         </div>
         <div class="mainRight">
@@ -89,8 +92,7 @@
             :pagination="false"
             bordered
             size="middle"
-            :scroll="{ y: 480 }"
-          >
+            :scroll="{ y: 480 }">
             <template #title>
               <a-button type="primary" @click="downLoadVoucher">凭证</a-button>
             </template>
@@ -111,12 +113,15 @@
         </div>
       </div>
       <div v-if="isClickedPftj">
-        <a-table 
-          :columns="pftjColumn" 
-          :data-source="pftjData" 
+        <a-table
+          :columns="pftjColumn"
+          :data-source="pftjData"
           bordered
           :pagination="false"
           :scroll="{ x: 2000 }">
+          <template #bodyCell="{ column, text, record }">
+            {{ text || '-' }}
+          </template>
         </a-table>
       </div>
       <div v-if="isClickedTplx" style="width: 100%; height: 100%">
@@ -138,8 +143,7 @@
           v-model:value="searchcategoryConfig"
           placeholder="请输入类别名称"
           style="width: 250px"
-          @search="onSearch"
-        />
+          @search="onSearch" />
       </div>
       <div class="treePart">
         <a-tree
@@ -179,8 +183,7 @@
         :model="formState"
         :rules="rules"
         :label-col="labelCol"
-        :wrapper-col="wrapperCol"
-      >
+        :wrapper-col="wrapperCol">
         <a-form-item ref="name" label="排放源" name="emissionSource">
           <a-input v-model:value="formState.emissionSource" placeholder="请输入排放源" />
         </a-form-item>
@@ -188,10 +191,7 @@
           <a-cascader v-model:value="formState.unitId" :options="measurementUnit" />
         </a-form-item>
         <a-form-item ref="name" label="温室气体" name="greenhouseGases">
-          <a-select
-            ref="select"
-            v-model:value="formState.greenhouseGases"
-          >
+          <a-select ref="select" v-model:value="formState.greenhouseGases">
             <a-select-option v-for="(item, index) in groupData" :key="index" :value="item.id">
               {{ item.cnValue }}
             </a-select-option>
@@ -220,8 +220,7 @@
       :body-style="{ paddingBottom: '80px' }"
       :footer-style="{ textAlign: 'right' }"
       destroyOnClose
-      @close="onCloseVoucher"
-    >
+      @close="onCloseVoucher">
       <a-table
         :columns="voucherColumns"
         :data-source="voucherData"
@@ -245,74 +244,76 @@
       :body-style="{ paddingBottom: '80px' }"
       :footer-style="{ textAlign: 'right' }"
       destroyOnClose
-      @close="onCloseEditData"
-    > 
+      @close="onCloseEditData">
       <a-form
         ref="editFormRef"
         :model="editFormState"
         :label-col="labelCol"
-        :wrapper-col="wrapperCol"
-      >
-      <a-row>
-        <a-col :span="12">
-          <a-form-item ref="name" label="数据来源" name="dataSources">
-            <a-select
-              ref="select"
-              v-model:value="editFormState.dataSources"
-              @change="changeSelect"
-            >
-              <a-select-option value="1">自行推估</a-select-option>
-              <a-select-option value="2">定期量测</a-select-option>
-              <a-select-option value="3">自动测量</a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item ref="name" label="消耗量" name="consumption">
-            <ns-input v-model:value="editFormState.consumption" :disabled="canEdit" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row v-if="automatic">
-        <a-col :span="12">
-          <a-form-item ref="name" label="采集节点" name="collectionNode">
-            <a-tree-select
-              v-model:value="editFormState.collectionNode"
-              :tree-line="true"
-              :tree-data="collectingNodes"
-            >
-            </a-tree-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row>
-        <a-col :span="12">
-          <a-form-item ref="name" label="因子值" name="factorId">
-            <ns-input v-model:value="editFormState.factorId" disabled />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item ref="name" label="关键字" name="emissionFactors">
-            <a-input-search v-model:value="editFormState.emissionFactors" placeholder="请输入关键字" />
-          </a-form-item>
-        </a-col>
-      </a-row>
+        :wrapper-col="wrapperCol">
+        <a-row>
+          <a-col :span="12">
+            <a-form-item ref="name" label="数据来源" name="dataSources">
+              <a-select
+                ref="select"
+                v-model:value="editFormState.dataSources"
+                @change="changeSelect">
+                <a-select-option value="1">自行推估</a-select-option>
+                <a-select-option value="2">定期量测</a-select-option>
+                <a-select-option value="3">自动测量</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item ref="name" label="消耗量" name="consumption">
+              <ns-input v-model:value="editFormState.consumption" :disabled="canEdit" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row v-if="automatic">
+          <a-col :span="12">
+            <a-form-item ref="name" label="采集节点" name="collectionNode">
+              <a-tree-select
+                v-model:value="editFormState.collectionNode"
+                :tree-line="true"
+                :tree-data="collectingNodes">
+              </a-tree-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="12">
+            <a-form-item ref="name" label="因子值" name="factorId">
+              <ns-input v-model:value="editFormState.factorId" disabled />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item ref="name" label="关键字" name="emissionFactors">
+              <a-input-search
+                v-model:value="editFormState.emissionFactors"
+                placeholder="请输入关键字" />
+            </a-form-item>
+          </a-col>
+        </a-row>
       </a-form>
-      <a-table 
-        :columns="drawerColumns" 
-        :data-source="newTableData" 
+      <a-table
+        :columns="drawerColumns"
+        :data-source="newTableData"
         bordered
         rowKey="id"
         :scroll="{ y: 400 }"
-        style="margin-bottom: 10px;"
-        :rowSelection="{ selectedRowKeys: selectedRowKeysEdit, onChange: onSelectionChangeEdit, type: 'radio' }"
+        style="margin-bottom: 10px"
+        :rowSelection="{
+          selectedRowKeys: selectedRowKeysEdit,
+          onChange: onSelectionChangeEdit,
+          type: 'radio',
+        }"
         :pagination="false">
       </a-table>
-      <a-pagination 
+      <a-pagination
         :current="queryParams.pageNum"
         :total="total"
         :page-size="queryParams.pageSize"
-        style="display: flex;justify-content: center;margin-top: 16px;"
+        style="display: flex; justify-content: center; margin-top: 16px"
         :show-size-changer="true"
         :show-quick-jumper="true"
         @change="onChange" />
@@ -321,8 +322,7 @@
         name="file"
         action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
         :headers="headers"
-        @change="handleChange"
-      >
+        @change="handleChange">
         <a-button>
           <upload-outlined></upload-outlined>
           点击上传凭证
@@ -333,20 +333,29 @@
         <a-button type="primary" @click="submitEditData">确定</a-button>
       </template>
     </a-drawer>
-
   </div>
 </template>
 
 <script lang="ts" setup>
-  import { ref, watch, toRaw, defineEmits  } from 'vue';
+  import { ref, watch, toRaw, defineEmits } from 'vue';
   import { http } from '/nerv-lib/util/http';
-  import { Pagination, Modal, message  } from 'ant-design-vue';
-  import type { TreeProps,TableColumnsType,UploadChangeParam  } from 'ant-design-vue';
-  import { EditOutlined,PlusCircleOutlined,MinusCircleOutlined,UploadOutlined  } from '@ant-design/icons-vue';
+  import { Pagination, Modal, message } from 'ant-design-vue';
+  import type { TreeProps, TableColumnsType, UploadChangeParam } from 'ant-design-vue';
+  import {
+    EditOutlined,
+    PlusCircleOutlined,
+    MinusCircleOutlined,
+    UploadOutlined,
+  } from '@ant-design/icons-vue';
   import * as echarts from 'echarts';
-  import { voucherColumns,drawerColumns } from '../config';
-  import { energyConsumption,carbonEmissionFactorLibrary,carbonInventoryCheck } from '/@/api/carbonEmissionFactorLibrary';
+  import { voucherColumns, drawerColumns } from '../config';
+  import {
+    energyConsumption,
+    carbonEmissionFactorLibrary,
+    carbonInventoryCheck,
+  } from '/@/api/carbonEmissionFactorLibrary';
   import { group } from '/@/api/deviceManage';
+  import { debug } from 'node:console';
   defineOptions({
     energyType: 'fillInPage', // 与页面路由name一致缓存才可生效
     components: {
@@ -356,18 +365,18 @@
   // 父组件id和年份
   const props = defineProps({
     reportId: {
-        type: Number
-      },
+      type: Number,
+    },
     year: {
-        type: String
-      }
-  })
-  console.log(props,'xxy');
-  
+      type: String,
+    },
+  });
+  console.log(props, 'xxy');
+
   const orgId = ref('');
   const result = JSON.parse(sessionStorage.getItem('ORGID')!);
   orgId.value = result;
-  const fetch = (api, params = { orgId:orgId.value } ) => {
+  const fetch = (api, params = { orgId: orgId.value }) => {
     return http.post(api, params);
   };
   // 左侧树结构
@@ -420,7 +429,7 @@
     for (let i = 0; i < tree.length; i++) {
       const node = tree[i];
       if (node.children) {
-        if (node.children.some(item => item.key === key)) {
+        if (node.children.some((item) => item.key === key)) {
           parentKey = node.key;
         } else if (getParentKey(key, node.children)) {
           parentKey = getParentKey(key, node.children);
@@ -429,8 +438,8 @@
     }
     return parentKey;
   };
-  const expandedKeysL = ref<(string | number)[]>([]);
-  const selectedKeysL = ref<string[]>(['0-0']);
+  const expandedKeysL = ref<(string | number)[]>(['0-0']);
+  const selectedKeysL = ref<string[]>(['0-0-0']);
   const searchValue = ref<string>('');
   const autoExpandParent = ref<boolean>(true);
   const gData = ref<TreeProps['treeData']>(genData);
@@ -440,7 +449,7 @@
     autoExpandParent.value = false;
   };
 
-  watch(searchValue, value => {
+  watch(searchValue, (value) => {
     const expanded = dataList
       .map((item: TreeProps['treeData'][number]) => {
         if (item.title.indexOf(value) > -1) {
@@ -454,21 +463,31 @@
     autoExpandParent.value = true;
   });
   // 被选中的树节点
-  const categoryId = ref()
+  const categoryId = ref();
   const onSelectL = (selectedKey: string[], info: any) => {
     selectedKeysL.value = selectedKey;
-    categoryId.value = info.node.conId
-    formState.value.categoryId = categoryId.value
-    getEmissionSourceTree()
+    categoryId.value = info.node.conId;
+    formState.value.categoryId = categoryId.value;
+    if (fillInPage.value) {
+      getEmissionSourceTree();
+    } else if (isClickedPftj.value) {
+      queryEmissionData.value.categoryId = info.node.conId;
+      getEmissionStatistic();
+    } else if (isClickedTplx.value) {
+    }
   };
   // 获取碳盘查报告树
   const selectedIds = ref([]);
   const getReportTree = () => {
-    fetch(carbonInventoryCheck.getCategoryTree,{reportId:props.reportId,orgId:orgId.value}).then((res) => {
-      gData.value = res.data
-      if(res.data.length > 0){
-        categoryId.value = res.data[0].conId
-        formState.value.categoryId = categoryId.value
+    fetch(carbonInventoryCheck.getCategoryTree, {
+      reportId: props.reportId,
+      orgId: orgId.value,
+    }).then((res) => {
+      gData.value = res.data;
+      if (res.data.length > 0) {
+        categoryId.value = res.data[0].children[0].conId;
+        formState.value.categoryId = categoryId.value;
+        queryEmissionData.value.categoryId = categoryId.value;
         selectedIds.value = getAllIds(gData.value);
       }
       getEmissionSourceTree();
@@ -476,41 +495,58 @@
   };
   getReportTree();
   const getAllIds = (nodes: TreeNode[]): number[] => {
-    return nodes.flatMap(node => [node.id, ...(node.children ? getAllIds(node.children) : [])]);
+    return nodes.flatMap((node) => [node.id, ...(node.children ? getAllIds(node.children) : [])]);
   };
   // 右侧树数据
   const treeData = ref<TreeProps['treeData']>(genData);
   // 获取数据
-  const getTableId = ref()
+  const getTableId = ref();
+  const changeSelectedKeys = ref(false);
   const getEmissionSourceTree = () => {
     fetch(carbonInventoryCheck.getInventoryTree, { categoryId: categoryId.value }).then((res) => {
-      treeData.value = res.data
-      getTableId.value = res.data[0].id
-      if(res.data.length != 0){
-        getPFYTableList(getTableId.value)
-        getTableHeardUnit(getTableId.value)
-      }else{
-        data.value = []
-        columns.value[1].title = '消耗量'
-        columns.value[2].title = '碳排因子'
-        columns.value[3].title = '排放量'
+      treeData.value = res.data;
+      if (changeSelectedKeys.value) {
+        selectedKeysR.value = [`0-${treeData.value.length - 1}`];
+        changeSelectedKeys.value = false;
+        getTableId.value = res.data[res.data.length - 1].id;
+        if (res.data.length != 0) {
+          getPFYTableList(getTableId.value);
+          getTableHeardUnit(getTableId.value);
+        } else {
+          data.value = [];
+          columns.value[1].title = '消耗量';
+          columns.value[2].title = '碳排因子';
+          columns.value[3].title = '排放量';
+        }
+      } else {
+        selectedKeysR.value = ['0-0'];
+        getTableId.value = res.data[0].id;
+        if (res.data.length != 0) {
+          getPFYTableList(getTableId.value);
+          getTableHeardUnit(getTableId.value);
+        } else {
+          data.value = [];
+          columns.value[1].title = '消耗量';
+          columns.value[2].title = '碳排因子';
+          columns.value[3].title = '排放量';
+        }
       }
     });
   };
   // 排放源树中被选中的树节点
   const onSelectR = (selectedKey: string[], info: any) => {
     selectedKeysR.value = selectedKey;
-    getTableId.value = info.selectedNodes[0].id
-    getPFYTableList(getTableId.value)
-    getTableHeardUnit(getTableId.value)
+    getTableId.value = info.selectedNodes[0].id;
+    getPFYTableList(getTableId.value);
+    getTableHeardUnit(getTableId.value);
   };
   // 获取表头单位
   const getTableHeardUnit = (id) => {
     fetch(carbonInventoryCheck.findUnitById, { id: id }).then((res) => {
       if (res.data) {
-        columns.value[1].title = '消耗量【' + res.data.unit + '】'
-        columns.value[2].title = '碳排因子【' + res.data.carbonEmission + '】'
-        columns.value[3].title = '排放量【' + res.data.carbonUnits + '】'
+        columns.value[1].title = '消耗量【' + res.data.unit + '】';
+        columns.value[2].title = '碳排因子【' + res.data.carbonEmission + '】';
+        columns.value[3].title = '排放量【' + res.data.carbonUnits + '】';
       }
     });
   };
@@ -527,28 +563,30 @@
     console.log('checkedKeys', checkedKeys);
   });
   // 类别配置
-  const categoryConfig = ref(false)
-  const searchcategoryConfig = ref()
+  const categoryConfig = ref(false);
+  const searchcategoryConfig = ref();
   const categoryTreeData = ref<TreeProps['treeData']>(genData);
   const categoryExpandedKeys = ref<string[]>();
   const categorySelectedKeys = ref<string[]>([]);
   const categoryCheckedKeys = ref<string[]>([]);
-  
+
   const checkTreeNode = (checkedKeys, info) => {
-    categoryCheckedKeys.value = checkedKeys
-    queryConfigure.value.dictionaryIdList = categoryCheckedKeys.value
-  }
+    categoryCheckedKeys.value = checkedKeys;
+    queryConfigure.value.dictionaryIdList = categoryCheckedKeys.value;
+  };
   const getUnitTree = () => {
-    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement,{grp:'CATEGORY_CONFIGURATION'}).then((res) => {
-      categoryTreeData.value = res.data
-      categoryCheckedKeys.value = selectedIds.value.map(id => String(id));
+    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, {
+      grp: 'CATEGORY_CONFIGURATION',
+    }).then((res) => {
+      categoryTreeData.value = res.data;
+      categoryCheckedKeys.value = selectedIds.value.map((id) => String(id));
       // 格式化树节点数据并设置 key
       categoryTreeData.value = formatTreeData(categoryTreeData.value);
     });
-  }
+  };
 
   const formatTreeData = (treeData) => {
-    return treeData.map(node => {
+    return treeData.map((node) => {
       const newNode = { ...node };
       newNode.key = String(node.id); // 将 id 转换为字符串作为 key
       if (node.children) {
@@ -559,14 +597,14 @@
   };
   const openCategoryConfig = () => {
     categoryConfig.value = true;
-    getUnitTree()
+    getUnitTree();
   };
   // 类别配置树点击确定
   const queryConfigure = ref({
-    orgId:orgId.value
-  })
+    orgId: orgId.value,
+  });
   const submitCategory = () => {
-    fetch(carbonInventoryCheck.updateCategoryTree,queryConfigure.value).then((res) => {
+    fetch(carbonInventoryCheck.updateCategoryTree, queryConfigure.value).then((res) => {
       categoryConfig.value = false;
       getReportTree();
     });
@@ -575,20 +613,20 @@
     categoryConfig.value = false;
   };
   // 新增/编辑排放源树节点
-  const addTreeNodeVisible = ref(false)
+  const addTreeNodeVisible = ref(false);
   const formRef = ref();
   const labelCol = { span: 5 };
   const wrapperCol = { span: 19 };
   const formState = ref({
     orgId: orgId.value,
-    year: props.year
-  })
+    year: props.year,
+  });
   // 计量单位的变量
-  const measurementUnit = ref([])
+  const measurementUnit = ref([]);
   // 碳排单位变量
-  const CarbonUnit = ref([])
+  const CarbonUnit = ref([]);
   // 温室气体变量
-  const groupData = ref([])
+  const groupData = ref([]);
   // 定义form表单的必填
   const rules: Record<string, Rule[]> = {
     emissionSource: [{ required: true, message: '请输入排放源', trigger: 'change' }],
@@ -598,37 +636,45 @@
   };
   const addTreeNodeData = () => {
     addTreeNodeVisible.value = true;
-    getDictData()
+    getDictData();
   };
   // 获取字典值
   const getDictData = () => {
     // 获取计量单位的数据
-    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, { grp: 'MEASUREMENT_UNIT'}).then((res) => {
-      measurementUnit.value = res.data
-      measurementUnit.value = measurementUnit.value.map(item => ({
-        value: item.id,
-        label: item.cnValue,
-        children: item.children ? item.children.map(child => ({
-            value: child.id,
-            label: child.cnValue
-        })) : []
-      }));
-    });
+    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, { grp: 'MEASUREMENT_UNIT' }).then(
+      (res) => {
+        measurementUnit.value = res.data;
+        measurementUnit.value = measurementUnit.value.map((item) => ({
+          value: item.id,
+          label: item.cnValue,
+          children: item.children
+            ? item.children.map((child) => ({
+                value: child.id,
+                label: child.cnValue,
+              }))
+            : [],
+        }));
+      },
+    );
     // 获取碳排单位的数据
-    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, { grp: 'GREENHOUSE_GASES'}).then((res) => {
-      CarbonUnit.value = res.data
-      CarbonUnit.value = CarbonUnit.value.map(item => ({
-        value: item.id,
-        label: item.cnValue,
-        children: item.children ? item.children.map(child => ({
-            value: child.id,
-            label: child.cnValue
-        })) : []
-      }));
-    });
+    fetch(carbonEmissionFactorLibrary.dictionaryUnitManagement, { grp: 'GREENHOUSE_GASES' }).then(
+      (res) => {
+        CarbonUnit.value = res.data;
+        CarbonUnit.value = CarbonUnit.value.map((item) => ({
+          value: item.id,
+          label: item.cnValue,
+          children: item.children
+            ? item.children.map((child) => ({
+                value: child.id,
+                label: child.cnValue,
+              }))
+            : [],
+        }));
+      },
+    );
     // 获取温室气体数据
-    fetch(carbonEmissionFactorLibrary.findOutermost,{grp:'GREENHOUSE_GASES'}).then((res) => {
-      groupData.value = res.data
+    fetch(carbonEmissionFactorLibrary.findOutermost, { grp: 'GREENHOUSE_GASES' }).then((res) => {
+      groupData.value = res.data;
     });
   };
   const onSubmit = () => {
@@ -636,39 +682,42 @@
       .validate()
       .then(() => {
         console.log('values', formState, toRaw(formState));
-        if(formState.value.unitId){
-          formState.value.unitId = formState.value.unitId.join(',').split(',')[1]
+        if (formState.value.unitId) {
+          formState.value.unitId = formState.value.unitId.join(',').split(',')[1];
         }
-        if(formState.value.carbonEmissionUnits){
-          formState.value.carbonEmissionUnits = formState.value.carbonEmissionUnits.join(',').split(',')[1]
+        if (formState.value.carbonEmissionUnits) {
+          formState.value.carbonEmissionUnits = formState.value.carbonEmissionUnits
+            .join(',')
+            .split(',')[1];
         }
-        if(formState.value.id){
-          fetch(carbonInventoryCheck.update , formState.value).then((res) => {
-            addTreeNodeVisible.value = false
+        if (formState.value.id) {
+          fetch(carbonInventoryCheck.update, formState.value).then((res) => {
+            addTreeNodeVisible.value = false;
             formState.value = {
               orgId: orgId.value,
-            }
+            };
             message.success('操作成功！');
             getEmissionSourceTree();
           });
-        }else{
-          fetch(carbonInventoryCheck.create , formState.value).then((res) => {
-            addTreeNodeVisible.value = false
+        } else {
+          fetch(carbonInventoryCheck.create, formState.value).then((res) => {
+            addTreeNodeVisible.value = false;
             formState.value = {
               orgId: orgId.value,
-            }
+            };
             message.success('操作成功！');
+            changeSelectedKeys.value = true;
             getEmissionSourceTree();
-            getPFYTableList(res.data.id)
+            getPFYTableList(res.data.id);
           });
         }
       })
-      .catch(error => {
+      .catch((error) => {
         console.log('error', error);
       });
   };
   // 填报表格数据
-  const data = ref([])
+  const data = ref([]);
   // 填报页表头
   const columns = ref([
     {
@@ -718,29 +767,29 @@
       key: 'action',
       width: 80,
       fixed: 'right',
-    }
+    },
   ]);
   // 获取table数据
   const getPFYTableList = (id) => {
-    fetch(carbonInventoryCheck.getDetailsList , {inventoryId:id}).then((res) => {
-      data.value = res.data
+    fetch(carbonInventoryCheck.getDetailsList, { inventoryId: id }).then((res) => {
+      data.value = res.data;
     });
   };
   const editUnit = (data) => {
-    getDictData()
+    getDictData();
     addTreeNodeVisible.value = true;
-    
+
     setTimeout(() => {
       let selectDevice = ref([Number(data.unitId)]);
       findParentIds(measurementUnit.value, data.unitId, selectDevice.value);
-      data.unitId = selectDevice
-      
+      data.unitId = selectDevice;
+
       let selectDeviceC = ref([Number(data.carbonEmissionUnits)]);
       findParentIds(CarbonUnit.value, data.carbonEmissionUnits, selectDeviceC.value);
-      data.carbonEmissionUnits = selectDeviceC
-      
-      formState.value.id = data.id
-      formState.value = data
+      data.carbonEmissionUnits = selectDeviceC;
+
+      formState.value.id = data.id;
+      formState.value = data;
     }, 500);
   };
   // 定义一个递归函数来查找每一级的id 设备类型回显 层级方法
@@ -764,7 +813,7 @@
       okType: 'primary',
       cancelText: '取消',
       onOk() {
-        fetch(carbonInventoryCheck.del , {id:data.id}).then((res) => {
+        fetch(carbonInventoryCheck.del, { id: data.id }).then((res) => {
           message.success('操作成功！');
           getEmissionSourceTree();
         });
@@ -778,7 +827,7 @@
     addTreeNodeVisible.value = false;
     formState.value = {
       orgId: orgId.value,
-    }
+    };
     formRef.value.resetFields();
   };
   // 点击凭证弹出框
@@ -822,64 +871,69 @@
   const editFormRef = ref();
   const editFormState = ref({
     orgId: orgId.value,
-  })
-  const newTableData = ref([])
-  const total = ref<number>()
+  });
+  const newTableData = ref([]);
+  const total = ref<number>();
   const selectedRowKeysEdit = ref([]);
   const onSelectionChangeEdit = (selectedKeys, selectedRows) => {
     selectedRowKeysEdit.value = selectedKeys;
-    editFormState.value.factorId = selectedKeys
+    editFormState.value.factorId = selectedKeys;
   };
   const queryParams = ref({
     pageNum: 1,
     pageSize: 10,
-    orgId: orgId.value
-  })
+    orgId: orgId.value,
+  });
   const queryData = ref({
     orgId: orgId.value,
     pageNum: 1,
-    pageSize: 999
-  })
+    pageSize: 999,
+  });
   const edit = (record) => {
-    getDictList()
-    getNewTable()
-    editFormState.value.id = record.id
-    editFormState.value.dataSources = record.dataSources.value
-    editFormState.value.consumption = record.emissions
-    editFormState.value.collectionNode = record.carbonSource.value
-    editFormState.value.factorId = record.emissionFactors
-    editData.value = true
+    getDictList();
+    getNewTable();
+    editFormState.value.id = record.id;
+    editFormState.value.dataSources = record.dataSources;
+    editFormState.value.consumption = record.emissions;
+    editFormState.value.collectionNode = record.carbonSource;
+    editFormState.value.factorId = record.factorId;
+    selectedRowKeysEdit.value = [record.factorId];
+    editData.value = true;
   };
   const getNewTable = () => {
-    fetch(carbonEmissionFactorLibrary.getTableList,queryData.value).then((res) => {
-      newTableData.value = res.data.records
-      total.value = res.data.total
+    fetch(carbonEmissionFactorLibrary.getTableList, queryData.value).then((res) => {
+      newTableData.value = res.data.records;
+      total.value = res.data.total;
     });
   };
   // 数据来源选择框改变
   const canEdit = ref(false);
   const automatic = ref(false);
   const changeSelect = (value) => {
-    if(value === '3'){
-      canEdit.value = true
-      automatic.value = true
+    if (value === '3') {
+      canEdit.value = true;
+      automatic.value = true;
     }
   };
   // 定义采集节点数的变量
   const collectingNodes = ref<TreeSelectProps['treeData']>([]);
   const getDictList = () => {
     // 获取自动采集节点的数据
-    fetch(group.queryDeviceGroupTree, { energyType: 'ELECTRICITY_USAGE',orgId: orgId.value }).then((res) => {
-      collectingNodes.value = res.data
-      collectingNodes.value = collectingNodes.value.map(item => ({
-        value: item.id,
-        label: item.pointName,
-        children: item.children ? item.children.map(child => ({
-            value: child.id,
-            label: child.pointName
-        })) : []
-      }));
-    });
+    fetch(group.queryDeviceGroupTree, { energyType: 'ELECTRICITY_USAGE', orgId: orgId.value }).then(
+      (res) => {
+        collectingNodes.value = res.data;
+        collectingNodes.value = collectingNodes.value.map((item) => ({
+          value: item.id,
+          label: item.pointName,
+          children: item.children
+            ? item.children.map((child) => ({
+                value: child.id,
+                label: child.pointName,
+              }))
+            : [],
+        }));
+      },
+    );
   };
   // 上传附件
   const handleChange = (info: UploadChangeParam) => {
@@ -903,30 +957,33 @@
       .validate()
       .then(() => {
         console.log('values', editFormState, toRaw(editFormState));
-        editFormState.value.factorId = editFormState.value.factorId.join(',')
+        editFormState.value.factorId = editFormState.value.factorId.join(',');
+        if (editFormState.value.collectionNode.value) {
+          editFormState.value.collectionNode = editFormState.value.collectionNode.value;
+        }
         fetch(carbonInventoryCheck.updateTable, editFormState.value).then((res) => {
-          editData.value = false
-          getPFYTableList(getTableId.value)
-        })
+          editData.value = false;
+          getPFYTableList(getTableId.value);
+        });
       })
-      .catch(error => {
+      .catch((error) => {
         console.log('error', error);
       });
   };
   const onCloseEditData = () => {
-    editData.value = false
+    editData.value = false;
     editFormState.value = {
       orgId: orgId.value,
-    }
-    selectedRowKeysEdit.value = []
-    canEdit.value = false
-    automatic.value = false
+    };
+    selectedRowKeysEdit.value = [];
+    canEdit.value = false;
+    automatic.value = false;
   };
   // 分页器
-  const onChange = (pageNumber: number,size: number) => {
+  const onChange = (pageNumber: number, size: number) => {
     queryParams.value.pageNum = pageNumber;
     queryParams.value.pageSize = size;
-    getNewTable()
+    getNewTable();
   };
   // 点击切换排放统计/碳排流向
   const fillInPage = ref(true);
@@ -934,77 +991,106 @@
   const isClickedTplx = ref(false);
   const pftjData = ref([]);
   const showPftj = () => {
-    fillInPage.value = false
-    isClickedPftj.value = true
-    isClickedTplx.value = false
+    fillInPage.value = false;
+    isClickedPftj.value = true;
+    isClickedTplx.value = false;
+    getEmissionStatistic();
   };
   const showTplx = () => {
-    fillInPage.value = false
-    isClickedPftj.value = false
-    isClickedTplx.value = true
+    fillInPage.value = false;
+    isClickedPftj.value = false;
+    isClickedTplx.value = true;
     setTimeout(() => {
       drawEcharts();
     }, 500);
   };
+  // 获取排放统计数据
+  const queryEmissionData = ref({
+    orgId: orgId.value,
+    reportId: props.reportId,
+    year: props.year,
+    categoryId: categoryId.value,
+  });
+  const tableHeader = ref([]);
+  const getEmissionStatistic = () => {
+    fetch(carbonInventoryCheck.emissionStatistic, queryEmissionData.value).then((res) => {
+      pftjData.value = res.data.body;
+      const data = res.data.title;
+      // 将数据转换为 DataItem 数组
+      tableHeader.value = [];
+      pftjColumn.value = [
+        {
+          title: '排放分类',
+          dataIndex: 'emissionCategory',
+          customCell: (record, rowIndex) => {
+            if (rowIndex == undefined) {
+              return {
+                rowSpan: 0,
+                colSpan: 0,
+              };
+            }
+            const rowSpan = getRowSpan('emissionCategory', record, pftjData.value);
+            if (
+              rowIndex != 0 &&
+              pftjData.value[rowIndex - 1].emissionCategory == record.emissionCategory
+            ) {
+              return {
+                rowSpan: 0,
+                colSpan: 0,
+              };
+            }
+            return {
+              rowSpan: rowSpan,
+            };
+          },
+        },
+        {
+          title: '运行边界',
+          dataIndex: 'operatingBoundary',
+          customCell: (record, rowIndex) => {
+            if (rowIndex == undefined) {
+              return {
+                rowSpan: 0,
+                colSpan: 0,
+              };
+            }
+            const rowSpan = getRowSpan('operatingBoundary', record, pftjData.value);
+            if (
+              rowIndex != 0 &&
+              pftjData.value[rowIndex - 1].operatingBoundary == record.operatingBoundary
+            ) {
+              return {
+                rowSpan: 0,
+                colSpan: 0,
+              };
+            }
+            return {
+              rowSpan: rowSpan,
+            };
+          },
+        },
+        {
+          title: '排放类别',
+          dataIndex: 'emissionCategory',
+        },
+        {
+          title: '排放源',
+          dataIndex: 'emissionSources',
+        },
+        {
+          title: '温室气体',
+          dataIndex: 'greenhouseGases',
+        },
+      ];
+      tableHeader.value = Object.keys(data).map((key) => ({
+        title: data[key],
+        dataIndex: key,
+      }));
+      pftjColumn.value = pftjColumn.value.concat(tableHeader.value);
+    });
+  };
   // 排放统计表头
-  const pftjColumn = [
-    {
-      title: '排放分类',
-      dataIndex: 'cnValue',
-      customCell: (record, rowIndex) => {
-        if (rowIndex == undefined) {
-          return {
-            rowSpan: 0,
-            colSpan: 0,
-          };
-        }
-        const rowSpan = getRowSpan('cnValue', record, pftjData.value);
-        if (rowIndex != 0 && pftjData.value[rowIndex - 1].name == record.name) {
-          return {
-            rowSpan: 0,
-            colSpan: 0,
-          };
-        }
-        return {
-          rowSpan: rowSpan,
-        };
-      },
-    },
-    {
-      title: '运行边界',
-      dataIndex: 'cnValue',
-      customCell: (record, rowIndex) => {
-        if (rowIndex == undefined) {
-          return {
-            rowSpan: 0,
-            colSpan: 0,
-          };
-        }
-        const rowSpan = getRowSpan('cnValue', record, pftjData.value);
-        if (rowIndex != 0 && pftjData.value[rowIndex - 1].name == record.name) {
-          return {
-            rowSpan: 0,
-            colSpan: 0,
-          };
-        }
-        return {
-          rowSpan: rowSpan,
-        };
-      },
-    },
-    {
-      title: '排放类别',
-      dataIndex: 'energyType',
-    },
-    {
-      title: '排放源',
-      dataIndex: 'unitName',
-    },
-    {
-      title: '温室气体',
-      dataIndex: 'averageFactorValue',
-    },
-  ];
+  const pftjColumn = ref([]);
   // 合并单元格
   const getRowSpan = (dataIndex: string, record: any, data: any, dependents: string[] = []) => {
     let rowSpan = 1;
@@ -1031,184 +1117,184 @@
     chartInstance = echarts.init(tplxChart.value);
     let datalist = [
       {
-        name: "公共平台",
+        name: '公共平台',
       },
       {
-        name: "系统0000",
+        name: '系统0000',
       },
       {
-        name: "系统0011",
+        name: '系统0011',
       },
       {
-        name: "系统0022",
+        name: '系统0022',
       },
       {
-        name: "系统0033",
+        name: '系统0033',
       },
       {
-        name: "系统0044",
+        name: '系统0044',
       },
       {
-        name: "系统0055",
+        name: '系统0055',
       },
       {
-        name: "系统11",
+        name: '系统11',
       },
       {
-        name: "系统22",
+        name: '系统22',
       },
       {
-        name: "系统33",
+        name: '系统33',
       },
       {
-        name: "系统44",
+        name: '系统44',
       },
       {
-        name: "系统55",
+        name: '系统55',
       },
       {
-        name: "系统66",
+        name: '系统66',
       },
       {
-        name: "系统77",
+        name: '系统77',
       },
       {
-        name: "系统88",
+        name: '系统88',
       },
       {
-        name: "系统99",
+        name: '系统99',
       },
     ];
     let linksData = [
       {
-        source: "公共平台",
-        target: "系统0000",
+        source: '公共平台',
+        target: '系统0000',
         value: 1044305,
       },
       {
-        source: "公共平台",
-        target: "系统0011",
+        source: '公共平台',
+        target: '系统0011',
         value: 651527,
       },
       {
-        source: "公共平台",
-        target: "系统0022",
+        source: '公共平台',
+        target: '系统0022',
         value: 651527,
       },
       {
-        source: "公共平台",
-        target: "系统0033",
+        source: '公共平台',
+        target: '系统0033',
         value: 486710,
       },
       {
-        source: "公共平台",
-        target: "系统0044",
+        source: '公共平台',
+        target: '系统0044',
         value: 212670,
       },
       {
-        source: "公共平台",
-        target: "系统0055",
+        source: '公共平台',
+        target: '系统0055',
         value: 210400,
       },
       {
-        source: "系统0011",
-        target: "系统11",
+        source: '系统0011',
+        target: '系统11',
         value: 645246,
       },
       {
-        source: "系统0022",
-        target: "系统22",
+        source: '系统0022',
+        target: '系统22',
         value: 513275,
       },
       {
-        source: "系统0011",
-        target: "系统33",
+        source: '系统0011',
+        target: '系统33',
         value: 282986,
       },
       {
-        source: "系统0011",
-        target: "系统44",
+        source: '系统0011',
+        target: '系统44',
         value: 118655,
       },
       {
-        source: "系统0022",
-        target: "系统55",
+        source: '系统0022',
+        target: '系统55',
         value: 105989,
       },
       {
-        source: "系统0022",
-        target: "系统66",
+        source: '系统0022',
+        target: '系统66',
         value: 95100,
       },
       {
-        source: "系统0033",
-        target: "系统77",
+        source: '系统0033',
+        target: '系统77',
         value: 87796,
       },
       {
-        source: "系统0044",
-        target: "系统88",
+        source: '系统0044',
+        target: '系统88',
         value: 47658,
       },
       {
-        source: "系统0055",
-        target: "系统99",
+        source: '系统0055',
+        target: '系统99',
         value: 243660,
       },
     ];
     let Color = [
-      "#61FEFF",
-      "#937FE6",
-      "#2B56D3",
-      "#87E7AA",
-      "#937FE6",
-      "#FF9B97",
-      "#8f23f5",
-      "#0576ea",
-      "#2cb8cf",
-      "#8A7EE0",
-      "#2cb8cf",
-      "#4e70f0",
-      "#1fa3de",
-      "#bbc951",
-      "#FFC14B",
-      "#b785a6",
+      '#61FEFF',
+      '#937FE6',
+      '#2B56D3',
+      '#87E7AA',
+      '#937FE6',
+      '#FF9B97',
+      '#8f23f5',
+      '#0576ea',
+      '#2cb8cf',
+      '#8A7EE0',
+      '#2cb8cf',
+      '#4e70f0',
+      '#1fa3de',
+      '#bbc951',
+      '#FFC14B',
+      '#b785a6',
     ];
     let Color1 = [
-      "#04E0F3",
-      "#682EFC",
-      "#35A7FE",
-      "#0DC09F",
-      "#682EFC",
-      "#ED6663",
-      "#8f23f5",
-      "#0576ea",
-      "#2cb8cf",
-      "#8A7EE0",
-      "#2cb8cf",
-      "#4e70f0",
-      "#1fa3de",
-      "#bbc951",
-      "#FFC14B",
-      "#b785a6",
+      '#04E0F3',
+      '#682EFC',
+      '#35A7FE',
+      '#0DC09F',
+      '#682EFC',
+      '#ED6663',
+      '#8f23f5',
+      '#0576ea',
+      '#2cb8cf',
+      '#8A7EE0',
+      '#2cb8cf',
+      '#4e70f0',
+      '#1fa3de',
+      '#bbc951',
+      '#FFC14B',
+      '#b785a6',
     ];
     let sourceLabel = [
-      "right",
-      "left",
-      "left",
-      "left",
-      "left",
-      "left",
-      "left",
-      "left",
-      "left",
-      "left",
-      "left",
-      "left",
-      "left",
-      "left",
-      "left",
-      "left",
+      'right',
+      'left',
+      'left',
+      'left',
+      'left',
+      'left',
+      'left',
+      'left',
+      'left',
+      'left',
+      'left',
+      'left',
+      'left',
+      'left',
+      'left',
+      'left',
     ];
     let itemStyleColor = [];
     let labelSource = [];
@@ -1225,7 +1311,7 @@
         normal: {
           // color: Color[d]
           color: {
-            type: "linear",
+            type: 'linear',
             x: 0,
             y: 1,
             x2: 0,
@@ -1247,56 +1333,53 @@
       itemStyleColor.push(datalist[d]);
     }
     const option = {
-      backgroundColor: "transparent",
+      backgroundColor: 'transparent',
       tooltip: {
-        trigger: "item",
-        triggerOn: "mousemove",
+        trigger: 'item',
+        triggerOn: 'mousemove',
         formatter: function (params) {
-          if (params.name == "公共平台") {
-            return " 公共平台 ";
+          if (params.name == '公共平台') {
+            return ' 公共平台 ';
           } else {
             let value = params.data.value;
             if (!value && value !== 0) return 0;
             let str = value.toString();
-            let reg =
-              str.indexOf(".") > -1
-                ? /(\d)(?=(\d{3})+\.)/g
-                : /(\d)(?=(?:\d{3})+$)/g;
-            if (params.data.source == "公共平台") {
-              return params.data.target + " : " + str.replace(reg, "$1,");
+            let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g;
+            if (params.data.source == '公共平台') {
+              return params.data.target + ' : ' + str.replace(reg, '$1,');
             } else {
-              return params.data.source + " : " + str.replace(reg, "$1,");
+              return params.data.source + ' : ' + str.replace(reg, '$1,');
             }
           }
         },
       },
       series: [
         {
-          type: "sankey",
-          layout: "none",
-          top: "4%",
-          bottom: "12%",
-          left: "20",
-          right: "20",
+          type: 'sankey',
+          layout: 'none',
+          top: '4%',
+          bottom: '12%',
+          left: '20',
+          right: '20',
           nodeGap: 15,
           nodeWidth: 25,
-          focusNodeAdjacency: "allEdges",
+          focusNodeAdjacency: 'allEdges',
           data: itemStyleColor,
           links: linksData,
           label: {
             normal: {
-              color: "#fff",
+              color: '#fff',
               fontSize: 14,
               formatter: function (params) {
-                if (params.data.name == "公共平台") {
-                  let strs = params.data.name.split(""); //字符串数组
-                  let str = "";
+                if (params.data.name == '公共平台') {
+                  let strs = params.data.name.split(''); //字符串数组
+                  let str = '';
                   for (let i = 0, s; (s = strs[i++]); ) {
                     //遍历字符串数组
                     str += s;
-                    if (!(i % 1)) str += "\n"; //按需要求余
+                    if (!(i % 1)) str += '\n'; //按需要求余
                   }
-                  return "{white|" + str + "}";
+                  return '{white|' + str + '}';
                 } else {
                   return params.data.name;
                 }
@@ -1313,14 +1396,14 @@
           lineStyle: {
             normal: {
               opacity: 0.4,
-              color: "source",
+              color: 'source',
               curveness: 0.5,
             },
           },
           itemStyle: {
             normal: {
               borderWidth: 1,
-              borderColor: "transparent",
+              borderColor: 'transparent',
             },
           },
         },
@@ -1330,9 +1413,9 @@
     chartInstance.setOption(option);
   };
   // 点击返回
-  const emit = defineEmits(['change-data'])
+  const emit = defineEmits(['change-data']);
   const changeParentData = () => {
-    emit('change-data', true,false);
+    emit('change-data', true, false);
   };
 </script>
 
@@ -1353,11 +1436,11 @@
 
     display: flex;
     flex-direction: column;
-    .top{
+    .top {
       position: relative;
       height: 80%;
       margin-bottom: 20px;
-      .ns-form-title{
+      .ns-form-title {
         font-weight: bold;
         user-select: text;
         padding: 16px;
@@ -1365,7 +1448,7 @@
         padding-bottom: 10px;
         border-bottom: 1px solid #e9e9e9;
       }
-      .title{
+      .title {
         text-align: left;
         height: 32px;
         line-height: 32px;
@@ -1383,13 +1466,13 @@
         height: 13px;
         width: 3px;
         border-radius: 1px;
-        background-color: #2778FF;
+        background-color: #2778ff;
       }
     }
-    .bottom{
+    .bottom {
       position: relative;
       height: 20%;
-      .ns-form-title{
+      .ns-form-title {
         font-weight: bold;
         user-select: text;
         padding: 16px;
@@ -1397,7 +1480,7 @@
         padding-bottom: 10px;
         border-bottom: 1px solid #e9e9e9;
       }
-      .title{
+      .title {
         text-align: left;
         height: 32px;
         line-height: 32px;
@@ -1415,17 +1498,17 @@
         height: 13px;
         width: 3px;
         border-radius: 1px;
-        background-color: #2778FF;
+        background-color: #2778ff;
       }
-      .button>div{
+      .button > div {
         height: 3vh;
         display: flex;
         align-items: center;
       }
-      .pftj{
+      .pftj {
         background: #c9e4ff;
       }
-      .tplx{
+      .tplx {
         background: #c9e4ff;
       }
     }
@@ -1446,7 +1529,7 @@
       width: 92%;
       margin-bottom: @ns-gap;
     }
-    .mainLeft{
+    .mainLeft {
       width: 19%;
       margin-right: 1%;
       border-right: 1px solid #f2f2f2;
@@ -1466,26 +1549,26 @@
           }
         }
       }
-      .addTreeNode{
+      .addTreeNode {
         width: 100%;
         padding: 16px;
         position: absolute;
         bottom: 0;
       }
     }
-    .mainRight{
+    .mainRight {
       width: 80%;
     }
   }
-  
-  .search{
+
+  .search {
     width: 70%;
     height: 5vh;
     display: flex;
     align-items: center;
     margin-left: 10%;
   }
-  .treePart{
+  .treePart {
     width: 70%;
     height: 100%;
     display: flex;
@@ -1493,4 +1576,4 @@
     margin-left: 10%;
     flex-direction: column;
   }
-</style>
\ No newline at end of file
+</style>

From a1b3ee2c8c1f6c961d8aef93e31a20d7cab61823 Mon Sep 17 00:00:00 2001
From: chenpingsen <chenpingsen>
Date: Thu, 25 Jul 2024 14:33:49 +0800
Subject: [PATCH 5/9] =?UTF-8?q?fix:=E5=85=A8=E5=B1=80=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/api/index.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/hx-ai-intelligent/src/api/index.ts b/hx-ai-intelligent/src/api/index.ts
index fa25e6e..487df1a 100644
--- a/hx-ai-intelligent/src/api/index.ts
+++ b/hx-ai-intelligent/src/api/index.ts
@@ -46,18 +46,17 @@ export const getAllEnum = async ({
   api = `${BASE_URL}/operation/enum/getAllEnum`,
   params = {},
 }: dictHttpConfig) => {
-  const res = await http.post(api, params);
+  const res = await http.get(api, params);
   return Promise.resolve(res);
 };
 
-
 /**
- * 获取单个枚举(需传参，参数 enumType) 
+ * 获取单个枚举(需传参，参数 enumType)
  */
 export const getEnum = async ({
   api = `${BASE_URL}/operation/enum/getEnum`,
   params = {},
 }: dictHttpConfig) => {
-  const res = await http.post(api, params);
+  const res = await http.get(api, params);
   return Promise.resolve(res);
-};
\ No newline at end of file
+};

From 6478070bd86af294606cbebb7f7a8733a528ea41 Mon Sep 17 00:00:00 2001
From: chenpingsen <chenpingsen>
Date: Thu, 25 Jul 2024 14:35:34 +0800
Subject: [PATCH 6/9] =?UTF-8?q?fix:=E8=8E=B7=E5=BE=97=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=96=B9=E6=B3=95=E7=9A=84=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/api/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hx-ai-intelligent/src/api/index.ts b/hx-ai-intelligent/src/api/index.ts
index 487df1a..cab3c80 100644
--- a/hx-ai-intelligent/src/api/index.ts
+++ b/hx-ai-intelligent/src/api/index.ts
@@ -46,7 +46,7 @@ export const getAllEnum = async ({
   api = `${BASE_URL}/operation/enum/getAllEnum`,
   params = {},
 }: dictHttpConfig) => {
-  const res = await http.get(api, params);
+  const res = await http.post(api, params);
   return Promise.resolve(res);
 };
 

From 61dcbfeacd7b796cccd5e77cb831da6888b8be3c Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Thu, 25 Jul 2024 15:19:41 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carbonEmissionFactorLibrary/index.vue          | 26 ++++-----
 .../energyConsumption/index.vue                    |  9 ++--
 .../quickCalculation/index.vue                     |  7 ++-
 .../carbonInventoryCheck/fillInPage/index.vue      |  2 +-
 .../carbonInventoryCheck/index.vue                 | 61 +++++++++++-----------
 5 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index a110e3f..49a4221 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -230,10 +230,21 @@
   import { log } from 'node:console';
 
   defineOptions({ name: 'OrderListIndex' });
+  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 selectTreeDataValue = ref<string>('');
   const mainRef = ref();
   const data = reactive({});
-  let formData = ref({});
+  let formData = ref({
+    orgId: orgId.value,
+  });
   const formRef = ref();
   const visible = ref(false);
   const unitManagement = ref(false);
@@ -256,15 +267,6 @@
   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;
@@ -476,8 +478,8 @@
     treeNodeAdd.value = false;
   };
   // 获取排放分类树
-  const getOrgTree = (params?) => {
-    fetch(carbonEmissionFactorLibrary.getCarbonFactorTree, params).then((res) => {
+  const getOrgTree = () => {
+    fetch(carbonEmissionFactorLibrary.getCarbonFactorTree, { orgId: orgId.value }).then((res) => {
       gData.value = res.data;
       // 找到匹配的节点数据
       // const selectedNodes = [];
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 eeaadb1..cf76d73 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -165,19 +165,16 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref,reactive, toRaw } from 'vue';
-  import type { UnwrapRef } from 'vue';
+  import { ref, toRaw } from 'vue';
   import type { Rule } from 'ant-design-vue/es/form';
-  import { Pagination,message,Modal   } from 'ant-design-vue';
-  import { InboxOutlined } from '@ant-design/icons-vue';
-  import type { CascaderProps,TreeSelectProps,UploadChangeParam } from 'ant-design-vue';
+  import { Pagination,message,Modal } from 'ant-design-vue';
+  import type { TreeSelectProps,UploadChangeParam } from 'ant-design-vue';
   import { NsMessage } from '/nerv-lib/component';
   import dayjs, { Dayjs } from 'dayjs';
   import { http } from '/nerv-lib/util/http';
   import { tableColumns } from '../config';
   import { energyConsumption,carbonEmissionFactorLibrary } from '/@/api/carbonEmissionFactorLibrary';
   import { group } from '/@/api/deviceManage';
-  import { dict } from '/@/api';
   defineOptions({
     energyType: 'EnergyConsumption', // 与页面路由name一致缓存才可生效
     components: {
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 200e900..242995d 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -138,6 +138,7 @@
     quickCalculation,
     carbonEmissionFactorLibrary,
   } from '/@/api/carbonEmissionFactorLibrary';
+  import { or } from '@vueuse/core';
   defineOptions({
     energyType: 'quickCalculation', // 与页面路由name一致缓存才可生效
     components: {
@@ -249,7 +250,7 @@
   const statsId = ref();
   // 获取因子分类树数据
   const getTreeData = () => {
-    fetch(quickCalculation.carbonQuickTree).then((res) => {
+    fetch(quickCalculation.carbonQuickTree, { orgId: orgId.value }).then((res) => {
       gData.value = res.data;
       energyType.value = gData.value[0].children[0].id;
       statsId.value = gData.value[0].children[0].id;
@@ -366,7 +367,9 @@
   const formRef = ref();
   const labelCol = { span: 6 };
   const wrapperCol = { span: 18 };
-  const formState = ref({});
+  const formState = ref({
+    orgId: orgId.value,
+  });
   const visible = ref(false);
 
   // 定义form表单的必填
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
index ba6809f..92e2c41 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -340,7 +340,7 @@
   import { ref, watch, toRaw, defineEmits } from 'vue';
   import { http } from '/nerv-lib/util/http';
   import { Pagination, Modal, message } from 'ant-design-vue';
-  import type { TreeProps, TableColumnsType, UploadChangeParam } from 'ant-design-vue';
+  import type { TreeProps, UploadChangeParam } from 'ant-design-vue';
   import {
     EditOutlined,
     PlusCircleOutlined,
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
index dd346e1..a58a17e 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/index.vue
@@ -20,8 +20,7 @@
       :model="formState"
       :rules="rules"
       :label-col="labelCol"
-      :wrapper-col="wrapperCol"
-    >
+      :wrapper-col="wrapperCol">
       <a-form-item ref="name" label="报告名称" name="reportName">
         <a-input v-model:value="formState.reportName" placeholder="请输入报告名称" />
       </a-form-item>
@@ -38,7 +37,10 @@
         </a-select>
       </a-form-item>
       <a-form-item ref="name" label="报告范围" name="reportScope">
-        <a-range-picker v-model:value="formState.reportScope" picker="month" valueFormat="YYYY-MM" />
+        <a-range-picker
+          v-model:value="formState.reportScope"
+          picker="month"
+          valueFormat="YYYY-MM" />
       </a-form-item>
     </a-form>
     <template #footer>
@@ -49,7 +51,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref,toRaw } from 'vue';
+  import { ref, toRaw } from 'vue';
   import { http } from '/nerv-lib/util/http';
   import { carbonInventoryCheck } from '/@/api/carbonEmissionFactorLibrary';
   import fillIn from './fillInPage/index.vue';
@@ -65,7 +67,7 @@
   const fillInPage = ref(false);
   // 新增相关数据
   const visible = ref(false);
-  const formState = ref({})
+  const formState = ref({});
   const formRef = ref();
   const labelCol = { span: 5 };
   const wrapperCol = { span: 19 };
@@ -80,7 +82,7 @@
   // 关闭新增抽屉
   const onClose = () => {
     visible.value = false;
-    formState.value = {}
+    formState.value = {};
     formRef.value.resetFields();
   };
   // 点击确定提交
@@ -89,15 +91,15 @@
       .validate()
       .then(() => {
         console.log('values', formState, toRaw(formState));
-        formState.value.enterpriseOrgId = orgId.value
-        formState.value.startTime = formState.value.reportScope[0]
-        formState.value.endTime = formState.value.reportScope[1]
-        fetch(carbonInventoryCheck.createOrUpdate,formState.value).then((res) => {
-          visible.value = false
+        formState.value.enterpriseOrgId = orgId.value;
+        formState.value.startTime = formState.value.reportScope[0];
+        formState.value.endTime = formState.value.reportScope[1];
+        fetch(carbonInventoryCheck.createOrUpdate, formState.value).then((res) => {
+          visible.value = false;
           mainRef.value?.nsTableRef.reload();
         });
       })
-      .catch(error => {
+      .catch((error) => {
         console.log('error', error);
       });
   };
@@ -110,7 +112,7 @@
     title: '数据库',
     api: carbonInventoryCheck.carbonInventoryList,
     params: {
-      orgId
+      orgId,
     },
     headerActions: [
       {
@@ -118,7 +120,7 @@
         name: 'userAdd',
         type: 'primary',
         handle: () => {
-          visible.value = true
+          visible.value = true;
         },
       },
     ],
@@ -161,10 +163,10 @@
           label: '编辑',
           name: 'userEdit',
           handle: (record: any) => {
-            visible.value = true
-            fetch(carbonInventoryCheck.findById,{id:record.id}).then((res) => {
-              formState.value = res.data
-              formState.value.reportScope = [res.data.startTime,res.data.endTime]
+            visible.value = true;
+            fetch(carbonInventoryCheck.findById, { id: record.id }).then((res) => {
+              formState.value = res.data;
+              formState.value.reportScope = [res.data.startTime, res.data.endTime];
             });
           },
         },
@@ -172,17 +174,16 @@
           label: '填报',
           name: 'fillIn',
           handle: (record: any) => {
-            isMainPage.value = false
-            fillInPage.value = true
-            reportId.value = record.id
-            year.value = record.reportYear
+            isMainPage.value = false;
+            fillInPage.value = true;
+            reportId.value = record.id;
+            year.value = record.reportYear;
           },
         },
         {
           label: '下载',
           name: 'download',
-          handle: (record: any) => {
-          },
+          handle: (record: any) => {},
         },
         {
           label: '删除',
@@ -213,7 +214,7 @@
           componentProps: {
             valueFormat: 'YYYY',
             placeholder: ['报告年度', '报告年度'],
-            picker:"year" 
+            picker: 'year',
           },
         },
       ],
@@ -222,12 +223,10 @@
     rowKey: 'id',
   });
   // 填报页点击返回
-  const updateData = (newDataOne,newDataTwo) => {
-    isMainPage.value = newDataOne
-    fillInPage.value = newDataTwo
+  const updateData = (newDataOne, newDataTwo) => {
+    isMainPage.value = newDataOne;
+    fillInPage.value = newDataTwo;
   };
 </script>
 
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>

From 7aa949bdcf3b516c5f4aad0676873755949e7d0a Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Thu, 25 Jul 2024 15:39:32 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../energyAlarm/editConfigureEnergyAlarm.vue       | 14 ++--
 .../alarmSettings/energyAlarm/editeEnergyAlarm.vue | 93 ++++++----------------
 .../equipmentAlarm/editConfigureDeviceAlarm.vue    | 26 +++---
 .../equipmentAlarm/editeEquipmentAlarm.vue         | 85 ++++++--------------
 .../alarmSettings/ts/energyAlarmConfig.ts          | 32 ++++----
 .../alarmSettings/ts/equipmentAlarmConfig.ts       | 32 ++++----
 .../ts/notificationManagementConfig.ts             | 32 ++++----
 .../view/alarmManagement/energyAlarm/status.vue    | 20 ++---
 .../view/alarmManagement/energyAlarm/ts/config.ts  | 73 ++++++++---------
 .../view/alarmManagement/equipmentAlarm/status.vue | 20 ++---
 .../alarmManagement/equipmentAlarm/ts/config.ts    | 71 ++++++++---------
 .../view/alarmManagement/gatewayAlarm/status.vue   | 13 ++-
 .../view/alarmManagement/gatewayAlarm/ts/config.ts | 40 ++++------
 13 files changed, 210 insertions(+), 341 deletions(-)

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 efe9f92..1d2e2e9 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
@@ -96,7 +96,7 @@
             <a-select
               v-model:value="infoObject.alarmList[index - 1].logic"
               style="width: 70px; margin-left: 12px"
-              :options="ljOptions" />
+              :options="logicEnum" />
             <span style="line-height: 32px; margin-left: 32px">{{ `数值${index}:` }}</span>
             <a-input
               style="width: 65px; margin-left: 6px"
@@ -139,7 +139,7 @@
   import { device, group } from '/@/api/deviceManage';
   import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm';
   import { http } from '/nerv-lib/util';
-  import { dict } from '/@/api';
+  import { dict, getEnum } from '/@/api';
 
   const visible = ref(false);
   //父级数据
@@ -256,13 +256,7 @@
     );
   };
   //逻辑
-  const ljOptions = ref<SelectProps['options']>([
-    { value: 0, label: '≥' },
-    { value: 1, label: '>' },
-    { value: 2, label: '≤' },
-    { value: 3, label: '<' },
-    { value: 4, label: '=' },
-  ]);
+  const logicEnum = ref<SelectProps['options']>([]);
   //开关
   const clickSwitch = () => {
     if (infoObject.value.enableRules === 1) {
@@ -273,6 +267,8 @@
   };
   //父调子 页面显示方法
   const toggle = async (value: any, info: any) => {
+    let menu = await getEnum({ params: { enumType: 'LogicEnum' } });
+    logicEnum.value = menu.data;
     // 数据来源
     let energyType = await dict({ params: { dicKey: 'ENERGY_TYPE' } });
     if (energyType.data.data) {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
index 9d20d37..abedc99 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
@@ -18,7 +18,7 @@
           placeholder="请选择告警频率"
           style="width: 100%"
           allowClear
-          :options="alarmFrequencyData"
+          :options="AlarmFrequencyEnum"
           @change="handleChangeAlarmFrequency" />
       </a-form-item>
       <a-form-item v-if="infoObject.alarmFrequency === 2" name="repetitions" label="重复次数">
@@ -45,7 +45,7 @@
           placeholder="请选择优先级"
           style="width: 100%"
           allowClear
-          :options="priorityData" />
+          :options="PriorityEnum" />
       </a-form-item>
       <a-form-item label="监测频率" name="monitorFrequency">
         <a-select
@@ -53,7 +53,7 @@
           placeholder="请选择监测频率"
           style="width: 100%"
           allowClear
-          :options="monitorFrequencyData" />
+          :options="MonitorFrequencyEnumm" />
       </a-form-item>
       <a-form-item label="启用规则">
         <a-switch
@@ -79,6 +79,7 @@
   import { NsMessage } from '/nerv-lib/component';
   import { http } from '/nerv-lib/util';
   import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm';
+  import { getAllEnum } from '/@/api';
 
   const visible = ref(false);
   // 间隔单位 默认值
@@ -104,70 +105,11 @@
   });
   const formRef = ref();
   const emit = defineEmits(['editObject']);
-  const alarmFrequencyData = ref([
-    {
-      label: '单次',
-      value: 1,
-    },
-    {
-      label: '重复',
-      value: 2,
-    },
-    {
-      label: '累计',
-      value: 3,
-    },
-  ]);
-  const priorityData = ref([
-    {
-      label: '紧急',
-      value: 1,
-    },
-    {
-      label: '重要',
-      value: 2,
-    },
-    {
-      label: '一般',
-      value: 3,
-    },
-  ]);
-  const intervalDurationUnitData = ref([
-    {
-      label: '分',
-      value: 1,
-    },
-    {
-      label: '时',
-      value: 2,
-    },
-    {
-      label: '天',
-      value: 3,
-    },
-  ]);
-  const monitorFrequencyData = ref([
-    {
-      label: '小时',
-      value: 1,
-    },
-    {
-      label: '每日',
-      value: 2,
-    },
-    {
-      label: '每周',
-      value: 3,
-    },
-    {
-      label: '月度',
-      value: 4,
-    },
-    {
-      label: '年度',
-      value: 5,
-    },
-  ]);
+  //告警频率 优先级 监测频率
+  const AlarmFrequencyEnum = ref([]);
+  const PriorityEnum = ref([]);
+  const intervalDurationUnitData = ref([]);
+  const MonitorFrequencyEnumm = ref([]);
   const rules = {
     alarmTitle: [
       {
@@ -220,12 +162,29 @@
     priority: [{ required: true, message: '请选择优先级', trigger: 'change' }],
     monitorTimeUnit: [{ required: true, message: '请选择监测时长单位', trigger: 'change' }],
   };
+  const getMenu = async () => {
+    let menu = await getAllEnum({
+      params: [
+        'PriorityEnum',
+        'MonitorFrequencyEnumm',
+        'AlarmFrequencyEnum',
+        'IntervalDurationUnitEnum',
+      ],
+    });
+    PriorityEnum.value = menu.data.PriorityEnum;
+    MonitorFrequencyEnumm.value = menu.data.MonitorFrequencyEnumm;
+    AlarmFrequencyEnum.value = menu.data.AlarmFrequencyEnum;
+    intervalDurationUnitData.value = menu.data.IntervalDurationUnitEnum;
+  };
   const toggle = (value: any) => {
+    //获取枚举 回显
+    getMenu();
     //判断 是新增 还是修改
     if (value) {
       infoObject.value = value;
     } else {
       infoObject.value = {
+        orgId: null,
         alarmTitle: null,
         alarmFrequency: null,
         priority: null,
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 4818fab..cad52e1 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -84,7 +84,7 @@
             placeholder="请选择取值类型"
             allow-clear
             style="width: 100%"
-            :options="qzOptions" />
+            :options="valueTypeEnum" />
         </a-form-item>
         <a-form-item label="异常描述" name="abnormalDescription">
           <a-textarea
@@ -114,7 +114,7 @@
             <a-select
               v-model:value="infoObject.alarmList[index - 1].logic"
               style="width: 70px; margin-left: 12px"
-              :options="ljOptions" />
+              :options="logicEnum" />
             <span style="line-height: 32px; margin-left: 32px">{{ `数值${index}:` }}</span>
             <a-input
               style="width: 65px; margin-left: 6px"
@@ -158,6 +158,7 @@
   import { device } from '/@/api/deviceManage';
   import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms';
   import { http } from '/nerv-lib/util';
+  import { getAllEnum } from '/@/api';
 
   const visible = ref(false);
   // 父级数据
@@ -241,18 +242,9 @@
     );
   };
   //取值类型
-  const qzOptions = ref<SelectProps['options']>([
-    { value: 1, label: '实时值' },
-    { value: 2, label: '平均值' },
-  ]);
+  const valueTypeEnum = ref<SelectProps['options']>();
   //逻辑
-  const ljOptions = ref<SelectProps['options']>([
-    { value: 0, label: '≥' },
-    { value: 1, label: '>' },
-    { value: 2, label: '≤' },
-    { value: 3, label: '<' },
-    { value: 4, label: '=' },
-  ]);
+  const logicEnum = ref<SelectProps['options']>([]);
 
   //开关
   const clickSwitch = () => {
@@ -299,10 +291,16 @@
     }
     return null; // 没有找到目标节点，返回 null
   };
+  const getMenu = async () => {
+    let menu = await getAllEnum({ params: ['LogicEnum', 'ValueTypeEnum'] });
+    logicEnum.value = menu.data.LogicEnum;
+    valueTypeEnum.value = menu.data.ValueTypeEnum;
+  };
   //父调子 页面显示方法
   const toggle = async (value: any, info: any) => {
     equipmentAlarm.value = info;
-
+    //获取枚举 回显
+    getMenu();
     //获取设备类型
     await http
       .post(device.queryDeviceTree, { orgId: orgId.value, pageNum: 1, pageSize: 10 })
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
index cb947bb..24a2ce1 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
@@ -24,7 +24,7 @@
           placeholder="请选择监测时长单位"
           style="width: 100%"
           allowClear
-          :options="monitorTimeUnitData" />
+          :options="MonitorTimeUnitEnum" />
       </a-form-item>
       <a-form-item label="告警频率" name="alarmFrequency">
         <a-select
@@ -32,7 +32,7 @@
           placeholder="请选择告警频率"
           style="width: 100%"
           allowClear
-          :options="alarmFrequencyData"
+          :options="AlarmFrequencyEnum"
           @change="handleChangeAlarmFrequency" />
       </a-form-item>
       <a-form-item v-if="infoObject.alarmFrequency === 2" name="repetitions" label="重复次数">
@@ -49,7 +49,7 @@
               placeholder="请选择间隔时长单位"
               style="width: 80px"
               allowClear
-              :options="intervalDurationUnitData" />
+              :options="IntervalDurationUnitEnum" />
           </template>
         </ns-input-number>
       </a-form-item>
@@ -59,7 +59,7 @@
           placeholder="请选择优先级"
           style="width: 100%"
           allowClear
-          :options="priorityData" />
+          :options="PriorityEnum" />
       </a-form-item>
       <a-form-item label="启用规则">
         <a-switch
@@ -85,6 +85,7 @@
   import { NsMessage } from '/nerv-lib/component';
   import { http } from '/nerv-lib/util';
   import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms';
+  import { getAllEnum } from '/@/api';
 
   const visible = ref(false);
   //组织id
@@ -107,63 +108,27 @@
   });
   const formRef = ref();
   const emit = defineEmits(['editObject']);
-  const alarmFrequencyData = ref([
-    {
-      label: '单次',
-      value: 1,
-    },
-    {
-      label: '重复',
-      value: 2,
-    },
-    {
-      label: '累计',
-      value: 3,
-    },
-  ]);
-  const monitorTimeUnitData = ref([
-    {
-      label: '分',
-      value: 1,
-    },
-    {
-      label: '时',
-      value: 2,
-    },
-    {
-      label: '天',
-      value: 3,
-    },
-  ]);
-  const intervalDurationUnitData = ref([
-    {
-      label: '分',
-      value: 1,
-    },
-    {
-      label: '时',
-      value: 2,
-    },
-    {
-      label: '天',
-      value: 3,
-    },
-  ]);
-  const priorityData = ref([
-    {
-      label: '紧急',
-      value: 1,
-    },
-    {
-      label: '重要',
-      value: 2,
-    },
-    {
-      label: '一般',
-      value: 3,
-    },
-  ]);
+  const AlarmFrequencyEnum = ref([]);
+  const MonitorTimeUnitEnum = ref([]);
+  const IntervalDurationUnitEnum = ref([]);
+  const PriorityEnum = ref([]);
+  const getMenu = async () => {
+    let menu = await getAllEnum({
+      params: [
+        'PriorityEnum',
+        'MonitorTimeUnitEnum',
+        'AlarmFrequencyEnum',
+        'IntervalDurationUnitEnum',
+      ],
+    });
+    PriorityEnum.value = menu.data.PriorityEnum;
+    MonitorTimeUnitEnum.value = menu.data.MonitorTimeUnitEnum;
+    AlarmFrequencyEnum.value = menu.data.AlarmFrequencyEnum;
+    IntervalDurationUnitEnum.value = menu.data.IntervalDurationUnitEnum;
+  };
   const toggle = (value: any) => {
+    //获取枚举 回显
+    getMenu();
     //判断 是新增 还是修改
     if (value) {
       infoObject.value = value;
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
index 037d9c6..83e9d3a 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts
@@ -2,6 +2,7 @@ import { http } from '/nerv-lib/util';
 import { NsMessage } from '/nerv-lib/component';
 import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm';
 import { ref } from 'vue';
+import { getEnum } from '/@/api';
 
 const orgId = ref('');
 const result = JSON.parse(sessionStorage.getItem('ORGID')!);
@@ -159,24 +160,23 @@ export const energyAlarmConfigs = (
         {
           field: 'priority',
           label: '告警优先级',
-          component: 'NsSelect',
+          component: 'nsSelectApi',
+          // dynamicParams: {
+          //   id: 'deviceName', //帮定上级联动数据
+          // },
           componentProps: {
-            placeholder: '请选择告警优先级',
+            api: () => getEnum({ params: { enumType: 'PriorityEnum' } }),
+            immediate: true,
             allowClear: true,
-            options: [
-              {
-                label: '紧急',
-                value: 1,
-              },
-              {
-                label: '重要',
-                value: 2,
-              },
-              {
-                label: '一般',
-                value: 3,
-              },
-            ],
+            resultField: 'data',
+            labelField: 'label',
+            valueField: 'value',
+            placeholder: '请选择告警优先级',
+            showSearch: true,
+            filterOption: (input: string, option: any) => {
+              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+            },
+            // autoSelectFirst: true,
           },
         },
         {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
index 6bb6bc2..92eef89 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts
@@ -2,6 +2,7 @@ import { http } from '/nerv-lib/util';
 import { NsMessage } from '/nerv-lib/component';
 import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms';
 import { ref } from 'vue';
+import { getEnum } from '/@/api';
 
 const orgId = ref('');
 const result = JSON.parse(sessionStorage.getItem('ORGID')!);
@@ -158,24 +159,23 @@ export const equipmentAlarmTableConfig = (
         {
           field: 'priority',
           label: '告警优先级',
-          component: 'NsSelect',
+          component: 'nsSelectApi',
+          // dynamicParams: {
+          //   id: 'deviceName', //帮定上级联动数据
+          // },
           componentProps: {
-            placeholder: '请选择告警优先级',
+            api: () => getEnum({ params: { enumType: 'PriorityEnum' } }),
+            immediate: true,
             allowClear: true,
-            options: [
-              {
-                label: '紧急',
-                value: 1,
-              },
-              {
-                label: '重要',
-                value: 2,
-              },
-              {
-                label: '一般',
-                value: 3,
-              },
-            ],
+            resultField: 'data',
+            labelField: 'label',
+            valueField: 'value',
+            placeholder: '请选择告警优先级',
+            showSearch: true,
+            filterOption: (input: string, option: any) => {
+              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+            },
+            // autoSelectFirst: true,
           },
         },
         {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts
index 838cdfc..710f779 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/notificationManagementConfig.ts
@@ -1,5 +1,6 @@
 import { notificationManagementApi } from '/@/api/alarmManagement/alarmSettings/notificationManagements';
 import { ref } from 'vue';
+import { getEnum } from '/@/api';
 
 const orgId = ref('');
 const result = JSON.parse(sessionStorage.getItem('ORGID')!);
@@ -91,24 +92,23 @@ export const notificationtableConfig = (notificationManagements: any) => {
         {
           field: 'priority',
           label: '告警优先级',
-          component: 'NsSelect',
+          component: 'nsSelectApi',
+          // dynamicParams: {
+          //   id: 'deviceName', //帮定上级联动数据
+          // },
           componentProps: {
-            placeholder: '请选择告警优先级',
+            api: () => getEnum({ params: { enumType: 'PriorityEnum' } }),
+            immediate: true,
             allowClear: true,
-            options: [
-              {
-                label: '紧急',
-                value: 1,
-              },
-              {
-                label: '重要',
-                value: 2,
-              },
-              {
-                label: '一般',
-                value: 3,
-              },
-            ],
+            resultField: 'data',
+            labelField: 'label',
+            valueField: 'value',
+            placeholder: '请选择告警优先级',
+            showSearch: true,
+            filterOption: (input: string, option: any) => {
+              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+            },
+            // autoSelectFirst: true,
           },
         },
         {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue
index d27a439..404781c 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue
@@ -56,6 +56,7 @@
   import { NsMessage } from '/nerv-lib/component';
   import { http } from '/nerv-lib/util';
   import { energyAlarmApi } from '/@/api/alarmManagement/energyAlarm';
+  import { getEnum } from '/@/api';
 
   export default defineComponent({
     components: { NsSteps },
@@ -125,21 +126,10 @@
       const toggle = async (data) => {
         energyAlarm.value = { ...data };
         visible.value = true;
-        if (energyAlarm.value.createWorkOrder === 1) {
-          stateOptions.value = [
-            { value: 1, label: '待处理' },
-            { value: 2, label: '处理中' },
-            { value: 3, label: '已完成' },
-            { value: 4, label: '超时' },
-            { value: 5, label: '已关闭' },
-          ];
-        } else {
-          stateOptions.value = [
-            { value: 1, label: '待处理' },
-            { value: 2, label: '处理中' },
-            { value: 3, label: '已完成' },
-            { value: 5, label: '已关闭' },
-          ];
+        let states = await getEnum({ params: { enumType: 'AlarmLogStateEnum' } });
+        stateOptions.value = states.data;
+        if (energyAlarm.value.createWorkOrder !== 1) {
+          stateOptions.value = stateOptions.value.filter((item) => item.value !== 4);
         }
         await http
           .post(energyAlarmApi.getSelectAlarmEnergyConsumptionLogStatusProcess, {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/ts/config.ts
index dda6037..9984202 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/ts/config.ts
@@ -1,6 +1,7 @@
 import { energyAlarmApi } from '/@/api/alarmManagement/energyAlarm';
 import { dict } from '/@/api';
 import { ref } from 'vue';
+import { getEnum } from '/@/api';
 
 const orgId = ref('');
 const result = JSON.parse(sessionStorage.getItem('ORGID')!);
@@ -24,7 +25,7 @@ const tableKeyMap = [
   },
   {
     title: '类型',
-    dataIndex: 'priority',
+    dataIndex: 'dataSourcesTypeName',
   },
   {
     title: '优先级',
@@ -107,55 +108,45 @@ export const notificationtableConfig = (look: any, status: any) => {
         {
           field: 'priority',
           label: '优先级',
-          component: 'NsSelect',
+          component: 'nsSelectApi',
+          // dynamicParams: {
+          //   id: 'deviceName', //帮定上级联动数据
+          // },
           componentProps: {
-            placeholder: '请选择告警优先级',
+            api: () => getEnum({ params: { enumType: 'PriorityEnum' } }),
+            immediate: true,
             allowClear: true,
-            options: [
-              {
-                label: '紧急',
-                value: 1,
-              },
-              {
-                label: '重要',
-                value: 2,
-              },
-              {
-                label: '一般',
-                value: 3,
-              },
-            ],
+            resultField: 'data',
+            labelField: 'label',
+            valueField: 'value',
+            placeholder: '请选择告警优先级',
+            showSearch: true,
+            filterOption: (input: string, option: any) => {
+              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+            },
+            // autoSelectFirst: true,
           },
         },
         {
           field: 'alarmLogState',
           label: '状态',
-          component: 'NsSelect',
+          component: 'nsSelectApi',
+          // dynamicParams: {
+          //   id: 'deviceName', //帮定上级联动数据
+          // },
           componentProps: {
-            placeholder: '请选择状态',
+            api: () => getEnum({ params: { enumType: 'AlarmLogStateEnum' } }),
+            immediate: true,
             allowClear: true,
-            options: [
-              {
-                label: '待处理',
-                value: 1,
-              },
-              {
-                label: '处理中',
-                value: 2,
-              },
-              {
-                label: '已完成',
-                value: 3,
-              },
-              {
-                label: '超时',
-                value: 4,
-              },
-              {
-                label: '关闭',
-                value: 5,
-              },
-            ],
+            resultField: 'data',
+            labelField: 'label',
+            valueField: 'value',
+            placeholder: '请选择状态',
+            showSearch: true,
+            filterOption: (input: string, option: any) => {
+              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+            },
+            // autoSelectFirst: true,
           },
         },
         {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
index d29f9e2..92a2a7f 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
@@ -56,6 +56,7 @@
   import { NsMessage } from '/nerv-lib/component';
   import { http } from '/nerv-lib/util';
   import { equipmentAlarmApi } from '/@/api/alarmManagement/equipmentAlarm';
+  import { getEnum } from '/@/api';
 
   export default defineComponent({
     components: { NsSteps },
@@ -126,21 +127,10 @@
       const toggle = async (data) => {
         equipmentAlarm.value = { ...data };
         visible.value = true;
-        if (equipmentAlarm.value.createWorkOrder === 1) {
-          stateOptions.value = [
-            { value: 1, label: '待处理' },
-            { value: 2, label: '处理中' },
-            { value: 3, label: '已完成' },
-            { value: 4, label: '超时' },
-            { value: 5, label: '已关闭' },
-          ];
-        } else {
-          stateOptions.value = [
-            { value: 1, label: '待处理' },
-            { value: 2, label: '处理中' },
-            { value: 3, label: '已完成' },
-            { value: 5, label: '已关闭' },
-          ];
+        let states = await getEnum({ params: { enumType: 'AlarmLogStateEnum' } });
+        stateOptions.value = states.data;
+        if (equipmentAlarm.value.createWorkOrder !== 1) {
+          stateOptions.value = stateOptions.value.filter((item) => item.value !== 4);
         }
         await http
           .post(equipmentAlarmApi.getSelectAlarmEquipmentLogStatusProcess, {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
index 45adaec..8da093c 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
@@ -1,5 +1,6 @@
 import { equipmentAlarmApi } from '/@/api/alarmManagement/equipmentAlarm';
 import { ref } from 'vue';
+import { getEnum } from '/@/api';
 
 const orgId = ref('');
 const result = JSON.parse(sessionStorage.getItem('ORGID')!);
@@ -88,55 +89,45 @@ export const notificationtableConfig = (look: any, status: any) => {
         {
           field: 'priority',
           label: '优先级',
-          component: 'NsSelect',
+          component: 'nsSelectApi',
+          // dynamicParams: {
+          //   id: 'deviceName', //帮定上级联动数据
+          // },
           componentProps: {
-            placeholder: '请选择告警优先级',
+            api: () => getEnum({ params: { enumType: 'PriorityEnum' } }),
+            immediate: true,
             allowClear: true,
-            options: [
-              {
-                label: '紧急',
-                value: 1,
-              },
-              {
-                label: '重要',
-                value: 2,
-              },
-              {
-                label: '一般',
-                value: 3,
-              },
-            ],
+            resultField: 'data',
+            labelField: 'label',
+            valueField: 'value',
+            placeholder: '请选择告警优先级',
+            showSearch: true,
+            filterOption: (input: string, option: any) => {
+              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+            },
+            // autoSelectFirst: true,
           },
         },
         {
           field: 'alarmLogState',
           label: '状态',
-          component: 'NsSelect',
+          component: 'nsSelectApi',
+          // dynamicParams: {
+          //   id: 'deviceName', //帮定上级联动数据
+          // },
           componentProps: {
-            placeholder: '请选择状态',
+            api: () => getEnum({ params: { enumType: 'AlarmLogStateEnum' } }),
+            immediate: true,
             allowClear: true,
-            options: [
-              {
-                label: '待处理',
-                value: 1,
-              },
-              {
-                label: '处理中',
-                value: 2,
-              },
-              {
-                label: '已完成',
-                value: 3,
-              },
-              {
-                label: '超时',
-                value: 4,
-              },
-              {
-                label: '关闭',
-                value: 5,
-              },
-            ],
+            resultField: 'data',
+            labelField: 'label',
+            valueField: 'value',
+            placeholder: '请选择状态',
+            showSearch: true,
+            filterOption: (input: string, option: any) => {
+              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+            },
+            // autoSelectFirst: true,
           },
         },
         {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue
index 49dfa8e..1c4b3ab 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue
@@ -47,6 +47,7 @@
   import { defineComponent } from 'vue';
   import { ref } from 'vue';
   import NsSteps from '/@/components/ns-steps.vue';
+  import { getEnum } from '/@/api';
 
   export default defineComponent({
     components: { NsSteps },
@@ -54,13 +55,7 @@
     setup() {
       const visible = ref(false);
       const infoObject = ref({});
-      const stateOptions = ref([
-        { value: 1, label: '待处理' },
-        { value: 2, label: '处理中' },
-        { value: 3, label: '已完成' },
-        { value: 4, label: '超时' },
-        { value: 5, label: '已关闭' },
-      ]);
+      const stateOptions = ref();
       const logList = ref([
         { realName: '李四', state: 3, createTime: '2024-03-10 10:00:00', remarks: '完成' },
         { realName: '王五', state: 5, createTime: '2024-03-10 10:00:00' },
@@ -78,7 +73,9 @@
       const btnClick = () => {
         visible.value = false;
       };
-      const toggle = (data) => {
+      const toggle = async (data) => {
+        let states = await getEnum({ params: { enumType: 'AlarmLogStateEnum' } });
+        stateOptions.value = states.data;
         infoObject.value = { ...logList.value[0] };
         let stateMap = {
           1: '待处理',
diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts
index 854974d..3f72552 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts
@@ -1,5 +1,6 @@
 import { gatewayAlarmApi } from '/@/api/alarmManagement/gatewayAlarm';
 import { ref } from 'vue';
+import { getEnum } from '/@/api';
 
 const orgId = ref('');
 const result = JSON.parse(sessionStorage.getItem('ORGID')!);
@@ -104,32 +105,23 @@ export const notificationtableConfig = (look: any, status: any) => {
         {
           field: 'alarmLogState',
           label: '状态',
-          component: 'NsSelect',
+          component: 'nsSelectApi',
+          // dynamicParams: {
+          //   id: 'deviceName', //帮定上级联动数据
+          // },
           componentProps: {
-            placeholder: '请选择状态',
+            api: () => getEnum({ params: { enumType: 'AlarmLogStateEnum' } }),
+            immediate: true,
             allowClear: true,
-            options: [
-              {
-                label: '待处理',
-                value: 1,
-              },
-              {
-                label: '处理中',
-                value: 2,
-              },
-              {
-                label: '已完成',
-                value: 3,
-              },
-              {
-                label: '超时',
-                value: 4,
-              },
-              {
-                label: '关闭',
-                value: 5,
-              },
-            ],
+            resultField: 'data',
+            labelField: 'label',
+            valueField: 'value',
+            placeholder: '请选择状态',
+            showSearch: true,
+            filterOption: (input: string, option: any) => {
+              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+            },
+            // autoSelectFirst: true,
           },
         },
         {

From 1790db4595ee0b3a3a64f0ff8a8ed7221a3a8a7c Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Thu, 25 Jul 2024 15:42:46 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue     |  4 ++--
 .../alarmSettings/energyAlarm/editeEnergyAlarm.vue             | 10 +++++-----
 .../alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue  |  6 +++---
 .../alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue       | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

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 1d2e2e9..305c88d 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
@@ -267,8 +267,8 @@
   };
   //父调子 页面显示方法
   const toggle = async (value: any, info: any) => {
-    let menu = await getEnum({ params: { enumType: 'LogicEnum' } });
-    logicEnum.value = menu.data;
+    let enumData = await getEnum({ params: { enumType: 'LogicEnum' } });
+    logicEnum.value = enumData.data;
     // 数据来源
     let energyType = await dict({ params: { dicKey: 'ENERGY_TYPE' } });
     if (energyType.data.data) {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
index abedc99..9fc566c 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue
@@ -163,7 +163,7 @@
     monitorTimeUnit: [{ required: true, message: '请选择监测时长单位', trigger: 'change' }],
   };
   const getMenu = async () => {
-    let menu = await getAllEnum({
+    let enumData = await getAllEnum({
       params: [
         'PriorityEnum',
         'MonitorFrequencyEnumm',
@@ -171,10 +171,10 @@
         'IntervalDurationUnitEnum',
       ],
     });
-    PriorityEnum.value = menu.data.PriorityEnum;
-    MonitorFrequencyEnumm.value = menu.data.MonitorFrequencyEnumm;
-    AlarmFrequencyEnum.value = menu.data.AlarmFrequencyEnum;
-    intervalDurationUnitData.value = menu.data.IntervalDurationUnitEnum;
+    PriorityEnum.value = enumData.data.PriorityEnum;
+    MonitorFrequencyEnumm.value = enumData.data.MonitorFrequencyEnumm;
+    AlarmFrequencyEnum.value = enumData.data.AlarmFrequencyEnum;
+    intervalDurationUnitData.value = enumData.data.IntervalDurationUnitEnum;
   };
   const toggle = (value: any) => {
     //获取枚举 回显
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 cad52e1..dfd3dd6 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -292,9 +292,9 @@
     return null; // 没有找到目标节点，返回 null
   };
   const getMenu = async () => {
-    let menu = await getAllEnum({ params: ['LogicEnum', 'ValueTypeEnum'] });
-    logicEnum.value = menu.data.LogicEnum;
-    valueTypeEnum.value = menu.data.ValueTypeEnum;
+    let enumData = await getAllEnum({ params: ['LogicEnum', 'ValueTypeEnum'] });
+    logicEnum.value = enumData.data.LogicEnum;
+    valueTypeEnum.value = enumData.data.ValueTypeEnum;
   };
   //父调子 页面显示方法
   const toggle = async (value: any, info: any) => {
diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
index 24a2ce1..3f64da7 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue
@@ -113,7 +113,7 @@
   const IntervalDurationUnitEnum = ref([]);
   const PriorityEnum = ref([]);
   const getMenu = async () => {
-    let menu = await getAllEnum({
+    let enumData = await getAllEnum({
       params: [
         'PriorityEnum',
         'MonitorTimeUnitEnum',
@@ -121,10 +121,10 @@
         'IntervalDurationUnitEnum',
       ],
     });
-    PriorityEnum.value = menu.data.PriorityEnum;
-    MonitorTimeUnitEnum.value = menu.data.MonitorTimeUnitEnum;
-    AlarmFrequencyEnum.value = menu.data.AlarmFrequencyEnum;
-    IntervalDurationUnitEnum.value = menu.data.IntervalDurationUnitEnum;
+    PriorityEnum.value = enumData.data.PriorityEnum;
+    MonitorTimeUnitEnum.value = enumData.data.MonitorTimeUnitEnum;
+    AlarmFrequencyEnum.value = enumData.data.AlarmFrequencyEnum;
+    IntervalDurationUnitEnum.value = enumData.data.IntervalDurationUnitEnum;
   };
   const toggle = (value: any) => {
     //获取枚举 回显