From ee795f367688cec600fef706de6c848c8ed3543a Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Tue, 23 Sep 2025 14:27:11 +0800
Subject: [PATCH] =?UTF-8?q?670=E6=8E=A7=E5=88=B6=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/controlCenter/670/index.vue         | 21 ++++++++++---------
 .../devices/shareManage.vue                   |  5 ++++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/views/controlCenter/670/index.vue b/src/views/controlCenter/670/index.vue
index 4fb780f..9e8c2f8 100644
--- a/src/views/controlCenter/670/index.vue
+++ b/src/views/controlCenter/670/index.vue
@@ -2,7 +2,7 @@
   <div class="device-page p-2">
     <!-- 头部信息栏 -->
     <div class="header-bar">
-      <div>设备名称：{{ deviceDetail.deviceName }}</div>
+      <div>设备名称：{{ deviceDetail.deviceName }}，IMEI:{{deviceDetail.deviceImei  }}</div>
       <div>设备型号：{{ deviceDetail.typeName }}</div>
       <div class="device-status">
         设备状态：
@@ -372,8 +372,7 @@ const deviceDetail = ref<any>({
 });
 
 //模式设置
-const handleModeClick = async (id: string, type: string) => {
-  
+const handleModeClick = async (id: string, type: string) => {  
   if (Status[type] == id) {
     return;
   }
@@ -406,8 +405,7 @@ const handleModeClick = async (id: string, type: string) => {
       });
     };
 
-    dic.promise.then((res) => {
-  
+    dic.promise.then((res) => {  
       if (res.code === 200) {
         Status[type] = id;
         ElMessage.closeAll();
@@ -419,12 +417,13 @@ const handleModeClick = async (id: string, type: string) => {
           
           callback();
         }
+
       } else {
         proxy?.$modal.msgError(res.msg);
       }
     });
   };
-  if(type == 'sosMode' && Status.sosMode=== '1' && id==='0'){
+  if(type == 'sosMode' && Status.sosMode=== '1' && id==='0' && timer){
     showClose();
     return;
   }
@@ -444,7 +443,7 @@ const handleModeClick = async (id: string, type: string) => {
               clearInterval(timer);
               timer = null;
               hideConfirm();
-              handleModeClick('sosMode','1');
+              handleModeClick('1','sosMode');
              deviceDetail.value.staSOSGrade="0";
               return;
             }
@@ -563,11 +562,13 @@ function showClose() {
   Status.confirm.Visible = true;
   Status.confirm.OkTxt = '关闭';
   Status.confirm.OkCallback=()=>{
-    handleModeClick('sosMode','0');
-    deviceDetail.value.staSOSGrade="0";
-    clearInterval(timer);
+      clearInterval(timer);
     timer=null;
+    handleModeClick('0','sosMode');
+    deviceDetail.value.staSOSGrade="0";
+  
     Status.timeOut=0;
+    
     hideConfirm();
   }
 }
diff --git a/src/views/equipmentManagement/devices/shareManage.vue b/src/views/equipmentManagement/devices/shareManage.vue
index 7a530a2..23d0407 100644
--- a/src/views/equipmentManagement/devices/shareManage.vue
+++ b/src/views/equipmentManagement/devices/shareManage.vue
@@ -205,9 +205,12 @@ var dic = reactive({
   '3': '开机画面',
   '4': '人员信息登记',
   '5': '发送信息',
-  '6': '产品信息'
+  '6': '产品信息',
+  '41':'静电探测',
+  '42':'SOS'
 });
 
+
 var power = computed(() => {
   let arr = [];
   let keys = Object.keys(dic);