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] =?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 +--
 .../src/icon/{status-1.svg => state-1.svg}    |  0
 .../src/icon/{status-2.svg => state-2.svg}    |  0
 .../src/icon/{status-3.svg => state-3.svg}    |  0
 .../src/icon/{status-4.svg => state-4.svg}    |  0
 .../src/icon/{status-5.svg => state-5.svg}    |  0
 .../alarmManagement/equipmentAlarm/status.vue | 62 ++++++++++++-------
 .../equipmentAlarm/ts/config.ts               |  1 +
 9 files changed, 45 insertions(+), 27 deletions(-)
 rename hx-ai-intelligent/src/icon/{status-1.svg => state-1.svg} (100%)
 rename hx-ai-intelligent/src/icon/{status-2.svg => state-2.svg} (100%)
 rename hx-ai-intelligent/src/icon/{status-3.svg => state-3.svg} (100%)
 rename hx-ai-intelligent/src/icon/{status-4.svg => state-4.svg} (100%)
 rename hx-ai-intelligent/src/icon/{status-5.svg => state-5.svg} (100%)

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/status-1.svg b/hx-ai-intelligent/src/icon/state-1.svg
similarity index 100%
rename from hx-ai-intelligent/src/icon/status-1.svg
rename to hx-ai-intelligent/src/icon/state-1.svg
diff --git a/hx-ai-intelligent/src/icon/status-2.svg b/hx-ai-intelligent/src/icon/state-2.svg
similarity index 100%
rename from hx-ai-intelligent/src/icon/status-2.svg
rename to hx-ai-intelligent/src/icon/state-2.svg
diff --git a/hx-ai-intelligent/src/icon/status-3.svg b/hx-ai-intelligent/src/icon/state-3.svg
similarity index 100%
rename from hx-ai-intelligent/src/icon/status-3.svg
rename to hx-ai-intelligent/src/icon/state-3.svg
diff --git a/hx-ai-intelligent/src/icon/status-4.svg b/hx-ai-intelligent/src/icon/state-4.svg
similarity index 100%
rename from hx-ai-intelligent/src/icon/status-4.svg
rename to hx-ai-intelligent/src/icon/state-4.svg
diff --git a/hx-ai-intelligent/src/icon/status-5.svg b/hx-ai-intelligent/src/icon/state-5.svg
similarity index 100%
rename from hx-ai-intelligent/src/icon/status-5.svg
rename to hx-ai-intelligent/src/icon/state-5.svg
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;
-        infoObject.value = { ...logList.value[0] };
+      //修改状态
+      const changeShowEdit = () => {
         if (equipmentAlarm.value.createWorkOrder === 1) {
-          statusOptions.value = [
+          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) {
+          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;
     },