From 842c1e94e0b31daa9a683bdd9f0717eb010973de Mon Sep 17 00:00:00 2001
From: chenpingsen <chenpingsen>
Date: Mon, 22 Jul 2024 15:25:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?add:=E7=85=A7=E6=98=8E=E7=B3=BB=E7=BB=9F=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3=20/=20=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=20/=20=E9=80=BB=E8=BE=91=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hx-ai-intelligent/src/api/index.ts                 | 28 ++--------
 .../equipmentControl/lightingManage/indexs.vue     |  8 ++-
 .../view/equipmentControl/lightingManage/tabs1.vue | 61 ++++++++++++++++------
 .../view/equipmentControl/lightingManage/tabs2.vue | 10 +++-
 4 files changed, 64 insertions(+), 43 deletions(-)

diff --git a/hx-ai-intelligent/src/api/index.ts b/hx-ai-intelligent/src/api/index.ts
index 9f32029..fa25e6e 100644
--- a/hx-ai-intelligent/src/api/index.ts
+++ b/hx-ai-intelligent/src/api/index.ts
@@ -45,19 +45,9 @@ export const dict = async ({
 export const getAllEnum = async ({
   api = `${BASE_URL}/operation/enum/getAllEnum`,
   params = {},
-  keyField = 'dicKey',
-  transform = (res: any) => res,
 }: dictHttpConfig) => {
-  const dictMap = JSON.parse(sessionStorage.getItem('dictMap') || '{}') as Object;
-  const key = get(params, keyField) as keyof typeof dictMap;
-
-  if (!dictMap.hasOwnProperty(key)) {
-    const res = await http.post(api, params);
-    const options = get(transform(res), `data.${key}`);
-    dictMap[key] = options;
-    sessionStorage.setItem('dictMap', JSON.stringify(dictMap));
-  }
-  return Promise.resolve({ data: { data: get(dictMap, key) } });
+  const res = await http.post(api, params);
+  return Promise.resolve(res);
 };
 
 
@@ -67,17 +57,7 @@ export const getAllEnum = async ({
 export const getEnum = async ({
   api = `${BASE_URL}/operation/enum/getEnum`,
   params = {},
-  keyField = 'dicKey',
-  transform = (res: any) => res,
 }: dictHttpConfig) => {
-  const dictMap = JSON.parse(sessionStorage.getItem('dictMap') || '{}') as Object;
-  const key = get(params, keyField) as keyof typeof dictMap;
-
-  if (!dictMap.hasOwnProperty(key)) {
-    const res = await http.post(api, params);
-    const options = get(transform(res), `data.${key}`);
-    dictMap[key] = options;
-    sessionStorage.setItem('dictMap', JSON.stringify(dictMap));
-  }
-  return Promise.resolve({ data: { data: get(dictMap, key) } });
+  const res = await http.post(api, params);
+  return Promise.resolve(res);
 };
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
index 4101051..cf3de9a 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue
@@ -49,7 +49,12 @@
         :maskStyle="{ 'background-color': 'rgba(0, 0, 0, 0)' }">
             <a-tabs v-model:activeKey="activeKey">
                 <a-tab-pane key="1" tab="控制面板">
-                    <tabs1 @changeArea="changeArea" @reset="reset" :treeData="treeData" :nowArea="nowArea"></tabs1>
+                    <tabs1 
+                    @changeArea="changeArea" 
+                    @reset="reset" 
+                    :treeData="treeData" 
+                    :nowArea="nowArea"
+                    ></tabs1>
                 </a-tab-pane>
                 <a-tab-pane key="2" tab="计划列表" force-render>
                     <tabs2></tabs2>
@@ -83,6 +88,7 @@ import {
 // 初始化 =======================================================
 
 onMounted(() => {
+    // 获得分区与线路的结构
     http.get(lightingManage.getArea, { projectId: 'HLlmTZp8' }).then(res => {
         const data = res.data
         floorData.value = data
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
index 3882694..c0fb56b 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
@@ -81,9 +81,10 @@
       </div>
       <!-- 控制模式按钮部分 -->
       <div class="control-mode-btn-area" v-show="showControlMode">
-        <button v-for="(button3, index) in controlType" :key="index"
-          :class="{ btn: true, selected: button3.type == thisButton.type }" @click="selectButton3(button3)">
-          {{ button3.name }}
+        <button v-for="(button3, index) in controlMode" :key="index"
+        class="btn"
+        :class="{ selected: thisButton.mode.value == button3.value }" @click="selectButton3(button3)">
+          {{ button3.label }}
         </button>
       </div>
     </div>
@@ -212,7 +213,6 @@
 
 <script setup lang="ts">
 import { ref, computed, onMounted, watch } from 'vue';
-import { controlType } from './treeData'
 import {
   DownOutlined,
   UpOutlined,
@@ -222,11 +222,15 @@ 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 setArea = () => {
@@ -402,8 +406,13 @@ const toggleSelection = (button: any) => {
   } else {
     // 未发生选中 或 多选被取消
     showControlMode.value = false
-    thisButton.value = { type: '0' }
+    thisButton.value = {
+      mode: {
+        value: '0'
+      }
+    }
   }
+  console.log(thisButton,'button')
 };
 
 // 照明回路所有按钮
@@ -417,16 +426,31 @@ const limitedButtons2 = computed(() => buttons2.value.slice(0, 8));
 
 // 决定该区域是否显示
 const showControlMode = ref(false);
-const thisButton = ref({ type: 0 })
+const thisButton = ref({
+  mode: {
+    value: '0'
+  }
+})
 // 控制模式 - 按钮切换
 const selectButton3 = (button3) => {
-  thisButton.value.type = button3.type
-  showControlScene.value = button3.name === '手动';
+  let checked = thisButton.value.mode.value
+  console.log(button3.value,'---', checked)
+  // 如果点击了相同的按钮，未作出修改
+  if (checked === button3.value) {
+    return
+  }
+  checked = button3.value
+  // 如果当前选项是手动模式
+  showControlScene.value = button3.label === '手动模式';
   selectedButton4.value = null; // 清空选中的控制场景按钮
 };
 
 // 控制场景业务 =====================================================================
 
+// 控制模式枚举
+const controlMode = ref([])
+// 场景枚举
+const controlScene = ref([])
 // 决定该区域是否显示
 const showControlScene = ref(false);
 // 控制场景 - 所有按钮
@@ -458,6 +482,8 @@ const handleRowClick = (index: any) => {
 
 // 内侧弹窗 ========================================================================
 
+// 需要向后端提交的修改内容
+const submitArray = ref([])
 const cxList = ref([
   {
     id: '1',
@@ -498,7 +524,7 @@ const cxList = ref([
 ]);
 //撤销
 const delBtn = (id: any) => {
-  cxList.value.pop(id);
+  cxList.value.pop();
   console.log(cxList.value.length);
 
   if (cxList.value.length === 0) {
@@ -514,14 +540,6 @@ const isLoading = ref(false)
 const initMenu = (tier: number) => {
   // 1 = 照明区域 - 切换时，重置以下所有菜单
   if (tier == 1) {
-    // 切换前，清除照明回路的选中状态
-    // buttons2.value.forEach(item => {
-    //   item.selected = false
-    // })
-    // // 切换后，清空所有选中状态
-    // props.treeData.forEach(item => {
-    //   item.selected = false
-    // })
     emit('reset')
     // 控制模式 隐藏
     showControlMode.value = false;
@@ -568,6 +586,15 @@ const changeConfirm = () => {
 const changeCancel = () => {
 
 }
+// 获得枚举，初始化
+const getEnum = (arr: any) => {
+    getAllEnum({ params: arr }).then(res => {
+        const data = res.data
+        controlMode.value = data.IlluminationMode
+        controlScene.value = data.IlluminationScene
+    })
+    console.log(controlMode, controlScene, '001')
+} 
 
 </script>
 <style lang="less" scoped>
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
index 6c73017..f118df6 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs2.vue
@@ -41,7 +41,14 @@
         </td>
         <td>
           <div class="tabReboot" @click="restartPlan(row.id)">重启</div>
-          <div class="tabDelete" @click="deletePlan(row.id)">删除</div>
+          <a-popconfirm
+          title="此操作将永久删除该条数据"
+          ok-text="确定"
+          cancel-text="取消"
+          @confirm="deletePlan(row.id)"
+          >
+            <div class="tabDelete">删除</div>
+          </a-popconfirm>
         </td>
       </tr>
     </tbody>
@@ -121,6 +128,7 @@ const addModal = () => {
   addVisible.value = true;
 };
 
+
 // 穿梭框部分 =======================================================
 
 // 穿梭框数据

From f4d01d65d0fca3b8aacdd89f3efe6d027e445a3f Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Mon, 22 Jul 2024 15:25:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=20=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/alarmManagement/equipmentAlarm.ts      |  1 +
 hx-ai-intelligent/src/components/ns-steps.vue      |  8 +--
 hx-ai-intelligent/src/icon/state-1.svg             |  6 +++
 hx-ai-intelligent/src/icon/state-2.svg             |  6 +++
 hx-ai-intelligent/src/icon/state-3.svg             |  6 +++
 hx-ai-intelligent/src/icon/state-4.svg             |  6 +++
 hx-ai-intelligent/src/icon/state-5.svg             |  6 +++
 hx-ai-intelligent/src/icon/status-1.svg            |  6 ---
 hx-ai-intelligent/src/icon/status-2.svg            |  6 ---
 hx-ai-intelligent/src/icon/status-3.svg            |  6 ---
 hx-ai-intelligent/src/icon/status-4.svg            |  6 ---
 hx-ai-intelligent/src/icon/status-5.svg            |  6 ---
 .../view/alarmManagement/equipmentAlarm/status.vue | 60 ++++++++++++++--------
 .../alarmManagement/equipmentAlarm/ts/config.ts    |  1 +
 14 files changed, 74 insertions(+), 56 deletions(-)
 create mode 100644 hx-ai-intelligent/src/icon/state-1.svg
 create mode 100644 hx-ai-intelligent/src/icon/state-2.svg
 create mode 100644 hx-ai-intelligent/src/icon/state-3.svg
 create mode 100644 hx-ai-intelligent/src/icon/state-4.svg
 create mode 100644 hx-ai-intelligent/src/icon/state-5.svg
 delete mode 100644 hx-ai-intelligent/src/icon/status-1.svg
 delete mode 100644 hx-ai-intelligent/src/icon/status-2.svg
 delete mode 100644 hx-ai-intelligent/src/icon/status-3.svg
 delete mode 100644 hx-ai-intelligent/src/icon/status-4.svg
 delete mode 100644 hx-ai-intelligent/src/icon/status-5.svg

diff --git a/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts b/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts
index b3f80fd..3be9a50 100644
--- a/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts
+++ b/hx-ai-intelligent/src/api/alarmManagement/equipmentAlarm.ts
@@ -1,4 +1,5 @@
 export enum equipmentAlarmApi {
   getTableList = '/carbon-smart/api/AlarmEquipmentLog/selectAlarmEquipmentLog', //设备告警 列表
   getCodeList = '/carbon-smart/api/AlarmEquipmentLog/selectErrorCodeList', //设备告警 列表
+  getSelectAlarmEquipmentLogStatusProcess = '/carbon-smart/api/AlarmEquipmentLogStatusProcess/selectAlarmEquipmentLogStatusProcess', //设备告警 状态 没有创建工单log接口
 }
diff --git a/hx-ai-intelligent/src/components/ns-steps.vue b/hx-ai-intelligent/src/components/ns-steps.vue
index 9903135..d164d0c 100644
--- a/hx-ai-intelligent/src/components/ns-steps.vue
+++ b/hx-ai-intelligent/src/components/ns-steps.vue
@@ -8,12 +8,12 @@
         <template #description>
           <div class="card">
             <div class="card-title">
-              <a-tag class="card-title-tag" :color="item.color">{{ item.statusName }}</a-tag>
-              <div class="name">{{ item.name }}</div>
-              <div class="time">{{ item.time }}</div>
+              <a-tag class="card-title-tag" :color="item.color">{{ item.stateName }}</a-tag>
+              <div class="name">{{ item.createName }}</div>
+              <div class="time">{{ item.createTime }}</div>
             </div>
             <div style="width: 100%; color: #3a3a3a; height: 25px; overflow: auto">
-              {{ item.desc }}</div
+              {{ item.remarks }}</div
             >
           </div>
         </template>
diff --git a/hx-ai-intelligent/src/icon/state-1.svg b/hx-ai-intelligent/src/icon/state-1.svg
new file mode 100644
index 0000000..d05487a
--- /dev/null
+++ b/hx-ai-intelligent/src/icon/state-1.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -305 -366 )">
+    <path d="M 8.03885714285714 0.641142857142857  L 8.03885714285714 0.64  C 12.1181901007502 0.64  15.4251428571429 3.94695275639267  15.4251428571429 8.02628571428571  C 15.4251430928625 8.02704758957974  15.4251432107223 8.02780946489393  15.4251432107223 8.02857134022442  C 15.4251432107223 12.1085354806887  12.117678779758 15.415999911653  8.03771463929375 15.415999911653  C 3.95775049882947 15.415999911653  0.650286067865178 12.1085354806887  0.650286067865178 8.02857134022442  C 0.650286067865178 3.94860719976014  3.95775049882947 0.64114276879585  8.03771463929375 0.64114276879585  C 8.03809547381657 0.64114276879585  8.03847630833888 0.641142798244853  8.03885714285714 0.641142857142857  Z M 8 6.85714285714286  C 7.36881742876481 6.85714285714286  6.85714285714286 7.36881742876481  6.85714285714286 8  C 6.85714285714286 8.63118257123519  7.36881742876481 9.14285714285714  8 9.14285714285714  C 8.63118257123519 9.14285714285714  9.14285714285714 8.63118257123519  9.14285714285714 8  C 9.14285714285714 7.36881742876481  8.63118257123519 6.85714285714286  8 6.85714285714286  Z M 11.4285714285714 6.85714285714286  C 10.7973888573362 6.85714285714286  10.2857142857143 7.36881742876481  10.2857142857143 8  C 10.2857142857143 8.63118257123519  10.7973888573362 9.14285714285714  11.4285714285714 9.14285714285714  C 12.0597539998066 9.14285714285714  12.5714285714286 8.63118257123519  12.5714285714286 8  C 12.5714285714286 7.36881742876481  12.0597539998066 6.85714285714286  11.4285714285714 6.85714285714286  Z M 4.57142857142857 6.85714285714286  C 3.94024600019338 6.85714285714286  3.42857142857143 7.36881742876481  3.42857142857143 8  C 3.42857142857143 8.63118257123519  3.94024600019338 9.14285714285714  4.57142857142857 9.14285714285714  C 5.20261114266376 9.14285714285714  5.71428571428571 8.63118257123519  5.71428571428571 8  C 5.71428571428571 7.36881742876481  5.20261114266376 6.85714285714286  4.57142857142857 6.85714285714286  Z " fill-rule="nonzero" fill="#ff7602" stroke="none" transform="matrix(1 0 0 1 305 366 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/icon/state-2.svg b/hx-ai-intelligent/src/icon/state-2.svg
new file mode 100644
index 0000000..7ded55c
--- /dev/null
+++ b/hx-ai-intelligent/src/icon/state-2.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -305 -340 )">
+    <path d="M 15.52 8  C 15.52 3.848  12.152 0.48  8 0.48  C 3.848 0.48  0.48 3.848  0.48 8  C 0.48 12.152  3.848 15.52  8 15.52  C 12.152 15.52  15.52 12.152  15.52 8  Z M 11.608 9.256  C 11.84 9.368  11.936 9.648  11.832 9.88  C 11.72 10.112  11.44 10.216  11.208 10.104  L 7.8 8.48  C 7.632 8.392  7.52 8.216  7.512 8.024  L 7.512 2.648  C 7.512 2.392  7.72 2.176  7.984 2.176  C 8.24 2.176  8.456 2.384  8.456 2.648  L 8.456 7.752  L 11.608 9.256  Z " fill-rule="nonzero" fill="#009de1" stroke="none" transform="matrix(1 0 0 1 305 340 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/icon/state-3.svg b/hx-ai-intelligent/src/icon/state-3.svg
new file mode 100644
index 0000000..5e24ea9
--- /dev/null
+++ b/hx-ai-intelligent/src/icon/state-3.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -305 -264 )">
+    <path d="M 12.8044865917969 12.8044945019531  C 15.7317833056641 9.87949759277344  15.7317833056641 5.12019596191406  12.8044865917969 2.19521370117188  C 11.3984961283515 0.787326048146557  9.48966705506673 -0.00260805552580251  7.4999560546875 3.046875E-05  C 5.50996955094545 -0.00406567496305449  3.60061659376305 0.786091774555939  2.19546946289063 2.19521370117188  C -0.731548930664062 5.12021061035156  -0.731548930664062 9.87951224121094  2.19546946289063 12.8044945019531  C 3.60067093003941 14.2135352022771  5.50998850312976 15.0036780086136  7.4999560546875 14.999677734375  C 9.49029165514025 15.0054765279533  11.4002873723065 14.2150596299848  12.8044865917969 12.8044945019531  Z M 11.9376369140625 5.54019552246094  L 6.89940004394531 10.9003754150391  C 6.87578802320076 10.9269018017654  6.84623229984903 10.9474623058395  6.81315013183594 10.9603753564453  C 6.78748609863281 10.9776751464844  6.77046462890625 10.9949895849609  6.73585041503906 11.003060859375  C 6.67362025830789 11.0304200226738  6.60651003916783 11.0449431326059  6.53853616699219 11.0457610107422  C 6.47426031328986 11.0436752198275  6.41062363711127 11.0323076485925  6.34960082519531 11.0120110400391  L 6.28960088378906 10.9773821777344  C 6.25364523541476 10.9604965742554  6.21927871922921 10.9404159360992  6.18691545410156 10.9173822363281  L 3.30259719726562 8.07866452148437  C 3.20194835437246 7.98256406662991  3.14591207112094 7.8488594603371  3.14796845214844 7.70971472167969  C 3.14796845214844 7.57240041503906  3.20046839355469 7.43510075683594  3.29421830566406 7.34076490722656  C 3.50055541080613 7.14332002945278  3.8257661663423 7.14332002945278  4.03210327148437 7.34076490722656  L 6.52210063476562 9.79326232910156  L 11.1824668212891 4.83721775390625  C 11.3839239859071 4.63706235688665  11.705600292055 4.62599539544477  11.9203371386719 4.81183204101562  C 12.0250169736047 4.90583460723342  12.0845359910269 5.04009087589488  12.0839014160156 5.18078184082031  C 12.0834323759743 5.31515796660418  12.0310295272497 5.44414958696638  11.9376515625 5.54078145996094  Z " fill-rule="nonzero" fill="#04d719" stroke="none" transform="matrix(1 0 0 1 305 264 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/icon/state-4.svg b/hx-ai-intelligent/src/icon/state-4.svg
new file mode 100644
index 0000000..3dcdc39
--- /dev/null
+++ b/hx-ai-intelligent/src/icon/state-4.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -305 -315 )">
+    <path d="M 15 7.5  C 15 3.358125  11.641875 0  7.5 0  C 3.358125 0  0 3.358125  0 7.5  C 0 11.641875  3.358125 15  7.5 15  C 11.641875 15  15 11.641875  15 7.5  Z M 6.96437500488281 8.4375  L 6.96437500488281 3.8840625  C 6.96454594411788 3.81021458429416  7.02427767945776 3.75034328445354  7.09812499511719 3.75  L 7.90187500488281 3.75  C 7.97572232054224 3.75034328445354  8.03545405588212 3.81021458429416  8.03562499511719 3.8840625  L 8.03562499511719 8.4375  C 8.03545405588212 8.51134791570584  7.97572232054224 8.57121921554647  7.90187500488281 8.5715625  L 7.09812499511719 8.5715625  C 7.02427767945776 8.57121921554647  6.96454594411788 8.51134791570584  6.96437500488281 8.4375  Z M 7.5 11.25  C 7.05616214821327 11.2499137187178  6.69640622993007 10.8900878577318  6.69640622993007 10.4462499975586  C 6.69640622993007 10.0023511201461  7.05625737014613 9.64249997993007  7.50015624755859 9.64249997993007  C 7.94415034690392 9.64258627639936  8.30390626518712 10.0024121373854  8.30390626518712 10.4462499975586  C 8.30390626518712 10.8901488749711  7.94405512497106 11.2500000151871  7.50015624755859 11.2500000151871  Z " fill-rule="nonzero" fill="#d8001b" stroke="none" transform="matrix(1 0 0 1 305 315 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/icon/state-5.svg b/hx-ai-intelligent/src/icon/state-5.svg
new file mode 100644
index 0000000..08e2ae4
--- /dev/null
+++ b/hx-ai-intelligent/src/icon/state-5.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -305 -289 )">
+    <path d="M 14.8828125 7.5  C 14.8828125 3.42891475341797  11.571085246582 0.1171875  7.5 0.1171875  C 3.42942502441406 0.1171875  0.1171875 3.42891475341797  0.1171875 7.5  C 0.1171875 11.571085246582  3.42891475341797 14.8828125  7.5 14.8828125  C 11.5705749755859 14.8828125  14.8828125 11.571085246582  14.8828125 7.5  Z M 8.24725339416504 7.50209775695801  L 10.5116636334229 9.77390681030273  C 10.717328404541 9.98062045166015  10.7167897888184 10.3139079473877  10.5106147631836 10.5195727185059  C 10.4077965582275 10.6218806689453  10.2733136187744 10.6735590710449  10.1383204248047 10.6735590710449  C 10.0027886151123 10.6735590710449  9.86779542114258 10.6218806524658  9.76494885498047 10.5185238317871  L 7.49736364379883 8.24407840576172  L 5.22240794677735 10.4947965600586  C 5.11958974182129 10.5960556237793  4.98561707336426 10.6471954266357  4.85167274963379 10.6471954266357  C 4.71563066894531 10.6471954266357  4.58009887573242 10.5949784088135  4.47674203857422 10.490572701416  C 4.27212613769531 10.2833204443359  4.27371362365723 9.9500329486084  4.4809658972168 9.74490679321289  L 6.75328522155762 7.49736362731933  L 4.4893852532959 5.22609317321777  C 4.28372048217773 5.01988978637695  4.28425909790039 4.68609203613281  4.49043412353516 4.48042726501465  C 4.69663751037598 4.27422387817383  5.02989664489746 4.27530110961914  5.23610003173828 4.4814761352539  L 7.50314662719727 6.75538294555664  L 9.77810232421875 4.50469313598633  C 9.98481596557617 4.29956698059082  10.319152331543 4.30166472106934  10.5237682324219 4.5089169946289  C 10.7288943878174 4.71616925170898  10.7267966473389 5.04996700195312  10.5195443737793 5.25458290283203  L 8.24725339416504 7.50209775695801  Z " fill-rule="nonzero" fill="#a6a6a6" stroke="none" transform="matrix(1 0 0 1 305 289 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/icon/status-1.svg b/hx-ai-intelligent/src/icon/status-1.svg
deleted file mode 100644
index d05487a..0000000
--- a/hx-ai-intelligent/src/icon/status-1.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1 0 0 1 -305 -366 )">
-    <path d="M 8.03885714285714 0.641142857142857  L 8.03885714285714 0.64  C 12.1181901007502 0.64  15.4251428571429 3.94695275639267  15.4251428571429 8.02628571428571  C 15.4251430928625 8.02704758957974  15.4251432107223 8.02780946489393  15.4251432107223 8.02857134022442  C 15.4251432107223 12.1085354806887  12.117678779758 15.415999911653  8.03771463929375 15.415999911653  C 3.95775049882947 15.415999911653  0.650286067865178 12.1085354806887  0.650286067865178 8.02857134022442  C 0.650286067865178 3.94860719976014  3.95775049882947 0.64114276879585  8.03771463929375 0.64114276879585  C 8.03809547381657 0.64114276879585  8.03847630833888 0.641142798244853  8.03885714285714 0.641142857142857  Z M 8 6.85714285714286  C 7.36881742876481 6.85714285714286  6.85714285714286 7.36881742876481  6.85714285714286 8  C 6.85714285714286 8.63118257123519  7.36881742876481 9.14285714285714  8 9.14285714285714  C 8.63118257123519 9.14285714285714  9.14285714285714 8.63118257123519  9.14285714285714 8  C 9.14285714285714 7.36881742876481  8.63118257123519 6.85714285714286  8 6.85714285714286  Z M 11.4285714285714 6.85714285714286  C 10.7973888573362 6.85714285714286  10.2857142857143 7.36881742876481  10.2857142857143 8  C 10.2857142857143 8.63118257123519  10.7973888573362 9.14285714285714  11.4285714285714 9.14285714285714  C 12.0597539998066 9.14285714285714  12.5714285714286 8.63118257123519  12.5714285714286 8  C 12.5714285714286 7.36881742876481  12.0597539998066 6.85714285714286  11.4285714285714 6.85714285714286  Z M 4.57142857142857 6.85714285714286  C 3.94024600019338 6.85714285714286  3.42857142857143 7.36881742876481  3.42857142857143 8  C 3.42857142857143 8.63118257123519  3.94024600019338 9.14285714285714  4.57142857142857 9.14285714285714  C 5.20261114266376 9.14285714285714  5.71428571428571 8.63118257123519  5.71428571428571 8  C 5.71428571428571 7.36881742876481  5.20261114266376 6.85714285714286  4.57142857142857 6.85714285714286  Z " fill-rule="nonzero" fill="#ff7602" stroke="none" transform="matrix(1 0 0 1 305 366 )" />
-  </g>
-</svg>
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/icon/status-2.svg b/hx-ai-intelligent/src/icon/status-2.svg
deleted file mode 100644
index 7ded55c..0000000
--- a/hx-ai-intelligent/src/icon/status-2.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1 0 0 1 -305 -340 )">
-    <path d="M 15.52 8  C 15.52 3.848  12.152 0.48  8 0.48  C 3.848 0.48  0.48 3.848  0.48 8  C 0.48 12.152  3.848 15.52  8 15.52  C 12.152 15.52  15.52 12.152  15.52 8  Z M 11.608 9.256  C 11.84 9.368  11.936 9.648  11.832 9.88  C 11.72 10.112  11.44 10.216  11.208 10.104  L 7.8 8.48  C 7.632 8.392  7.52 8.216  7.512 8.024  L 7.512 2.648  C 7.512 2.392  7.72 2.176  7.984 2.176  C 8.24 2.176  8.456 2.384  8.456 2.648  L 8.456 7.752  L 11.608 9.256  Z " fill-rule="nonzero" fill="#009de1" stroke="none" transform="matrix(1 0 0 1 305 340 )" />
-  </g>
-</svg>
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/icon/status-3.svg b/hx-ai-intelligent/src/icon/status-3.svg
deleted file mode 100644
index 5e24ea9..0000000
--- a/hx-ai-intelligent/src/icon/status-3.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1 0 0 1 -305 -264 )">
-    <path d="M 12.8044865917969 12.8044945019531  C 15.7317833056641 9.87949759277344  15.7317833056641 5.12019596191406  12.8044865917969 2.19521370117188  C 11.3984961283515 0.787326048146557  9.48966705506673 -0.00260805552580251  7.4999560546875 3.046875E-05  C 5.50996955094545 -0.00406567496305449  3.60061659376305 0.786091774555939  2.19546946289063 2.19521370117188  C -0.731548930664062 5.12021061035156  -0.731548930664062 9.87951224121094  2.19546946289063 12.8044945019531  C 3.60067093003941 14.2135352022771  5.50998850312976 15.0036780086136  7.4999560546875 14.999677734375  C 9.49029165514025 15.0054765279533  11.4002873723065 14.2150596299848  12.8044865917969 12.8044945019531  Z M 11.9376369140625 5.54019552246094  L 6.89940004394531 10.9003754150391  C 6.87578802320076 10.9269018017654  6.84623229984903 10.9474623058395  6.81315013183594 10.9603753564453  C 6.78748609863281 10.9776751464844  6.77046462890625 10.9949895849609  6.73585041503906 11.003060859375  C 6.67362025830789 11.0304200226738  6.60651003916783 11.0449431326059  6.53853616699219 11.0457610107422  C 6.47426031328986 11.0436752198275  6.41062363711127 11.0323076485925  6.34960082519531 11.0120110400391  L 6.28960088378906 10.9773821777344  C 6.25364523541476 10.9604965742554  6.21927871922921 10.9404159360992  6.18691545410156 10.9173822363281  L 3.30259719726562 8.07866452148437  C 3.20194835437246 7.98256406662991  3.14591207112094 7.8488594603371  3.14796845214844 7.70971472167969  C 3.14796845214844 7.57240041503906  3.20046839355469 7.43510075683594  3.29421830566406 7.34076490722656  C 3.50055541080613 7.14332002945278  3.8257661663423 7.14332002945278  4.03210327148437 7.34076490722656  L 6.52210063476562 9.79326232910156  L 11.1824668212891 4.83721775390625  C 11.3839239859071 4.63706235688665  11.705600292055 4.62599539544477  11.9203371386719 4.81183204101562  C 12.0250169736047 4.90583460723342  12.0845359910269 5.04009087589488  12.0839014160156 5.18078184082031  C 12.0834323759743 5.31515796660418  12.0310295272497 5.44414958696638  11.9376515625 5.54078145996094  Z " fill-rule="nonzero" fill="#04d719" stroke="none" transform="matrix(1 0 0 1 305 264 )" />
-  </g>
-</svg>
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/icon/status-4.svg b/hx-ai-intelligent/src/icon/status-4.svg
deleted file mode 100644
index 3dcdc39..0000000
--- a/hx-ai-intelligent/src/icon/status-4.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1 0 0 1 -305 -315 )">
-    <path d="M 15 7.5  C 15 3.358125  11.641875 0  7.5 0  C 3.358125 0  0 3.358125  0 7.5  C 0 11.641875  3.358125 15  7.5 15  C 11.641875 15  15 11.641875  15 7.5  Z M 6.96437500488281 8.4375  L 6.96437500488281 3.8840625  C 6.96454594411788 3.81021458429416  7.02427767945776 3.75034328445354  7.09812499511719 3.75  L 7.90187500488281 3.75  C 7.97572232054224 3.75034328445354  8.03545405588212 3.81021458429416  8.03562499511719 3.8840625  L 8.03562499511719 8.4375  C 8.03545405588212 8.51134791570584  7.97572232054224 8.57121921554647  7.90187500488281 8.5715625  L 7.09812499511719 8.5715625  C 7.02427767945776 8.57121921554647  6.96454594411788 8.51134791570584  6.96437500488281 8.4375  Z M 7.5 11.25  C 7.05616214821327 11.2499137187178  6.69640622993007 10.8900878577318  6.69640622993007 10.4462499975586  C 6.69640622993007 10.0023511201461  7.05625737014613 9.64249997993007  7.50015624755859 9.64249997993007  C 7.94415034690392 9.64258627639936  8.30390626518712 10.0024121373854  8.30390626518712 10.4462499975586  C 8.30390626518712 10.8901488749711  7.94405512497106 11.2500000151871  7.50015624755859 11.2500000151871  Z " fill-rule="nonzero" fill="#d8001b" stroke="none" transform="matrix(1 0 0 1 305 315 )" />
-  </g>
-</svg>
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/icon/status-5.svg b/hx-ai-intelligent/src/icon/status-5.svg
deleted file mode 100644
index 08e2ae4..0000000
--- a/hx-ai-intelligent/src/icon/status-5.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" xmlns="http://www.w3.org/2000/svg">
-  <g transform="matrix(1 0 0 1 -305 -289 )">
-    <path d="M 14.8828125 7.5  C 14.8828125 3.42891475341797  11.571085246582 0.1171875  7.5 0.1171875  C 3.42942502441406 0.1171875  0.1171875 3.42891475341797  0.1171875 7.5  C 0.1171875 11.571085246582  3.42891475341797 14.8828125  7.5 14.8828125  C 11.5705749755859 14.8828125  14.8828125 11.571085246582  14.8828125 7.5  Z M 8.24725339416504 7.50209775695801  L 10.5116636334229 9.77390681030273  C 10.717328404541 9.98062045166015  10.7167897888184 10.3139079473877  10.5106147631836 10.5195727185059  C 10.4077965582275 10.6218806689453  10.2733136187744 10.6735590710449  10.1383204248047 10.6735590710449  C 10.0027886151123 10.6735590710449  9.86779542114258 10.6218806524658  9.76494885498047 10.5185238317871  L 7.49736364379883 8.24407840576172  L 5.22240794677735 10.4947965600586  C 5.11958974182129 10.5960556237793  4.98561707336426 10.6471954266357  4.85167274963379 10.6471954266357  C 4.71563066894531 10.6471954266357  4.58009887573242 10.5949784088135  4.47674203857422 10.490572701416  C 4.27212613769531 10.2833204443359  4.27371362365723 9.9500329486084  4.4809658972168 9.74490679321289  L 6.75328522155762 7.49736362731933  L 4.4893852532959 5.22609317321777  C 4.28372048217773 5.01988978637695  4.28425909790039 4.68609203613281  4.49043412353516 4.48042726501465  C 4.69663751037598 4.27422387817383  5.02989664489746 4.27530110961914  5.23610003173828 4.4814761352539  L 7.50314662719727 6.75538294555664  L 9.77810232421875 4.50469313598633  C 9.98481596557617 4.29956698059082  10.319152331543 4.30166472106934  10.5237682324219 4.5089169946289  C 10.7288943878174 4.71616925170898  10.7267966473389 5.04996700195312  10.5195443737793 5.25458290283203  L 8.24725339416504 7.50209775695801  Z " fill-rule="nonzero" fill="#a6a6a6" stroke="none" transform="matrix(1 0 0 1 305 289 )" />
-  </g>
-</svg>
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
index 5c4755a..53c6a15 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
@@ -12,22 +12,22 @@
       <a-tab-pane key="1" tab="更新状态">
         <div style="width: 100%; padding: 24px">
           <a-form ref="formRef" :model="infoObject" :rules="rules">
-            <a-form-item ref="status" label="当前状态" name="status">
+            <a-form-item ref="state" label="当前状态" createName="state">
               <a-select
-                v-model:value="infoObject.status"
+                v-model:value="infoObject.state"
                 show-search
                 placeholder="请选择设备点位"
                 style="width: 85%"
-                :options="statusOptions"
+                :options="stateOptions"
                 :disabled="showEdit"
                 :filter-option="filterDevicePoint" />
               <ns-icon
                 size="20"
-                @click="() => (showEdit = !showEdit)"
+                @click="changeShowEdit"
                 style="margin-left: 20px"
-                :name="showEdit ? 'bianji' : 'baocun'" />
+                :createName="showEdit ? 'bianji' : 'baocun'" />
             </a-form-item>
-            <a-form-item label="备注" name="desc">
+            <a-form-item label="备注" createName="desc">
               <a-textarea
                 v-model:value="infoObject.desc"
                 placeholder="请输入异常描述"
@@ -55,6 +55,8 @@
   import { ref } from 'vue';
   import NsSteps from '/@/components/ns-steps.vue';
   import { NsMessage } from '/nerv-lib/component';
+  import { http } from '/nerv-lib/util';
+  import { equipmentAlarmApi } from '/@/api/alarmManagement/equipmentAlarm';
 
   export default defineComponent({
     components: { NsSteps },
@@ -64,33 +66,46 @@
       const showEdit = ref(true);
       const infoObject = ref({});
       const equipmentAlarm = ref({});
-      const statusOptions = ref();
+      const stateOptions = ref();
       const logList = ref([
-        { name: '李四', status: 3, time: '2024-03-10 10:00:00', desc: '完成' },
-        { name: '王五', status: 5, time: '2024-03-10 10:00:00' },
-        { name: '王五', status: 4, time: '2024-03-10 10:00:00' },
-        { name: '王五', status: 2, time: '2024-03-10 10:00:00', desc: '创建工单' },
-        { name: '赵六', status: 1, time: '2024-03-10 10:00:00' },
+        { createName: '李四', state: 3, createTime: '2024-03-10 10:00:00', desc: '完成' },
+        { createName: '王五', state: 5, createTime: '2024-03-10 10:00:00' },
+        { createName: '王五', state: 4, createTime: '2024-03-10 10:00:00' },
+        { createName: '王五', state: 2, createTime: '2024-03-10 10:00:00', desc: '创建工单' },
+        { createName: '赵六', state: 1, createTime: '2024-03-10 10:00:00' },
       ]);
       const config = ref({
         size: logList.value.length,
         dataSource: logList.value,
       });
       const handleClose = () => {
+        equipmentAlarm.value = P;
         visible.value = false;
       };
       const btnClick = () => {
         NsMessage.success('操作成功');
-        delete infoObject.value.time;
+        delete infoObject.value.createTime;
         console.log(infoObject.value, equipmentAlarm.value, '操作');
         console.log('btnClick');
       };
-      const toggle = (data) => {
-        console.log(data, '数据');
-        equipmentAlarm.value = data;
+      //修改状态
+      const changeShowEdit = () => {
+        if (equipmentAlarm.value.createWorkOrder === 1) {
+          showEdit.value = !showEdit.value;
+        }
+      };
+      const toggle = async (data) => {
+        equipmentAlarm.value = { ...data };
         infoObject.value = { ...logList.value[0] };
+        await http
+          .post(equipmentAlarmApi.getSelectAlarmEquipmentLogStatusProcess, {
+            id: data.id,
+          })
+          .then((res) => {
+            console.log(res);
+          });
         if (equipmentAlarm.value.createWorkOrder === 1) {
-          statusOptions.value = [
+          stateOptions.value = [
             { value: 1, label: '待处理' },
             { value: 2, label: '处理中' },
             { value: 3, label: '已完成' },
@@ -98,7 +113,7 @@
             { value: 5, label: '已关闭' },
           ];
         } else {
-          statusOptions.value = [
+          stateOptions.value = [
             { value: 1, label: '待处理' },
             { value: 2, label: '处理中' },
             { value: 3, label: '已完成' },
@@ -120,17 +135,18 @@
           5: '#a6a6a6',
         };
         logList.value.forEach((item) => {
-          item.statusName = statusMap[item.status];
-          item.color = colorMap[item.status];
-          item.src = 'status-' + item.status;
+          item.stateName = statusMap[item.state];
+          item.color = colorMap[item.state];
+          item.src = 'state-' + item.state;
         });
         visible.value = true;
       };
       return {
         infoObject,
+        changeShowEdit,
         showEdit,
         equipmentAlarm,
-        statusOptions,
+        stateOptions,
         btnClick,
         visible,
         logList,
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 35cfd8a..27ced80 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/ts/config.ts
@@ -8,6 +8,7 @@ const tableKeyMap = [
   {
     title: '序号',
     dataIndex: 'address',
+    width: 80,
     customRender: (text: any) => {
       return text.index + 1;
     },