From 34c828bef353a3ba3d302512643fcd257a8f2b9b Mon Sep 17 00:00:00 2001 From: liub Date: Thu, 18 Sep 2025 11:22:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=8A=A0=E5=85=A5670=E7=9A=84=E6=93=8D=E4=BD=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +- src/api/controlCenter/controlPanel/670.ts | 66 ++ src/views/controlCenter/670/index.vue | 1036 +++++++++++++++++ .../controlCenter/controlPanel/index.vue | 4 +- 4 files changed, 1108 insertions(+), 4 deletions(-) create mode 100644 src/api/controlCenter/controlPanel/670.ts create mode 100644 src/views/controlCenter/670/index.vue diff --git a/.env.development b/.env.development index c6f3ed1..2d60cf6 100644 --- a/.env.development +++ b/.env.development @@ -5,11 +5,11 @@ VITE_APP_TITLE = 云平台管理系统 VITE_APP_ENV = 'development' # 开发环境 - VITE_APP_BASE_API = 'http://47.120.79.150/backend' - #VITE_APP_BASE_API = 'http://192.168.2.23:8000' +# VITE_APP_BASE_API = 'http://47.120.79.150/backend' + VITE_APP_BASE_API = 'http://192.168.110.56:8000' #代永飞接口 -#VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689' +# VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689' # 应用访问路径 例如使用前缀 /admin/ diff --git a/src/api/controlCenter/controlPanel/670.ts b/src/api/controlCenter/controlPanel/670.ts new file mode 100644 index 0000000..1b4d552 --- /dev/null +++ b/src/api/controlCenter/controlPanel/670.ts @@ -0,0 +1,66 @@ +import request from '@/utils/request'; + +// 人员信息发送 +function SendUser (data: any) { + return request({ + url: `/api/xinghan/device/registerPersonInfo`, + method: 'post', + data: data + }); +}; + +// 灯光模式 +function lightModeSettings (data: any) { + return request({ + url: `/api/xinghan/device/LightGradeSettings`, + method: 'post', + data: data + }); +}; + +// 强制报警 +function SosSetting (data: any) { + return request({ + url: `/api/xinghan/device/SOSGradeSettings`, + method: 'post', + data: data + }); +}; + +//静电探测档位控制 +function staticPowerSetting (data: any) { + return request({ + url: `/api/xinghan/device/DetectGradeSettings`, + method: 'post', + data: data + }); +}; + +// 获取设备实时状态 +function deviceRealTimeStatus (id: any) { + return request({ + url: `/api/xinghan/device/`+id, + method: 'get' + }); +}; + +// 发送信息 +function SendMessage (data: any) { + return request({ + url: `/api/xinghan/device/sendAlarmMessage`, + method: 'post', + data: data + }); +}; + + + + +export default { + SendUser:SendUser, + lightModeSettings:lightModeSettings, + SosSetting:SosSetting, + staticPowerSetting:staticPowerSetting, + deviceRealTimeStatus:deviceRealTimeStatus, + SendMessage:SendMessage +}; \ No newline at end of file diff --git a/src/views/controlCenter/670/index.vue b/src/views/controlCenter/670/index.vue new file mode 100644 index 0000000..2bbcc1e --- /dev/null +++ b/src/views/controlCenter/670/index.vue @@ -0,0 +1,1036 @@ + + + diff --git a/src/views/controlCenter/controlPanel/index.vue b/src/views/controlCenter/controlPanel/index.vue index e3950c4..99968be 100644 --- a/src/views/controlCenter/controlPanel/index.vue +++ b/src/views/controlCenter/controlPanel/index.vue @@ -37,7 +37,7 @@ - + @@ -306,6 +306,7 @@ const handleControl = (row: any) => { const detailPageUrl = row.detailPageUrl; const basePath = detailPageUrl.replace(/\/index$/, ''); const dynamicPath = `/${basePath}/${deviceId}`; + debugger; router.push(dynamicPath); // 跳转路由 }; @@ -336,6 +337,7 @@ onMounted(() => { const getList = async () => { loading.value = false; const res = await api.deviceControlCenterList(queryParams.value); + loading.value = false; deviceList.value = res.rows; total.value = res.total; From f249ff496f69d999e40dcc3c785713baefa5ec1a Mon Sep 17 00:00:00 2001 From: liub Date: Thu, 18 Sep 2025 11:26:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?670=E6=8E=A7=E5=88=B6=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/controlCenter/670/index.vue | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/views/controlCenter/670/index.vue b/src/views/controlCenter/670/index.vue index 2bbcc1e..e4f9e9d 100644 --- a/src/views/controlCenter/670/index.vue +++ b/src/views/controlCenter/670/index.vue @@ -381,8 +381,9 @@ const handleModeClick = async (id: string, type: string) => { let json = { 'deviceId': route.params.deviceId, 'deviceImei': deviceDetail.value.deviceImei, 'instructValue': id }; let dic = { promise: null, callback: null, key: '' }; - - dic.promise = Promise.resolve({ code: 200, msg: '操作成功' });//测试时默认成功 + + //测试环境假装成功 + dic.promise = Promise.resolve({ code: 200, msg: '操作成功' }); let arr = []; if (type == 'lightMode') { @@ -423,8 +424,11 @@ const handleModeClick = async (id: string, type: string) => { } }); }; - - if (type == 'sosMode' && id === '1') { + if(type == 'sosMode' && Status.sosMode=== '1' && id==='0'){ + showClose(); + return; + } + else if (type == 'sosMode' && id === '1') { ShowConfirm({ title: '提示', text: '您确认开启180秒强制报警', @@ -434,7 +438,7 @@ const handleModeClick = async (id: string, type: string) => { Status.confirm.Visible = false; deviceDetail.value.staSOSGrade="1"; - Status.timeOut = 50; + Status.timeOut = 180; timer = setInterval(() => { if (Status.timeOut === 0) { clearInterval(timer); @@ -445,7 +449,7 @@ const handleModeClick = async (id: string, type: string) => { return; } - Status.timeOut = Status.timeOut - 10; + Status.timeOut = Status.timeOut - 1; Status.confirm.text = '设备强制报警中:' + Status.timeOut; }, 1000); }); From 2bee644444adf646b292f6a0bc6bd708fc893a18 Mon Sep 17 00:00:00 2001 From: liub Date: Thu, 18 Sep 2025 11:28:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=8F=E4=BD=93=E9=AA=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/controlCenter/delivery/index.vue | 2 +- src/views/controlCenter/historyjectory/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/controlCenter/delivery/index.vue b/src/views/controlCenter/delivery/index.vue index 79608a6..f27f841 100644 --- a/src/views/controlCenter/delivery/index.vue +++ b/src/views/controlCenter/delivery/index.vue @@ -26,7 +26,7 @@ - + diff --git a/src/views/controlCenter/historyjectory/index.vue b/src/views/controlCenter/historyjectory/index.vue index f55af50..40be5c9 100644 --- a/src/views/controlCenter/historyjectory/index.vue +++ b/src/views/controlCenter/historyjectory/index.vue @@ -26,7 +26,7 @@ - + From dbf39c55383106d689fed7787d9a8d659ff4d6f0 Mon Sep 17 00:00:00 2001 From: liub Date: Mon, 22 Sep 2025 10:26:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?670=E6=8E=A7=E5=88=B6=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/controlCenter/670/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/controlCenter/670/index.vue b/src/views/controlCenter/670/index.vue index e4f9e9d..4fb780f 100644 --- a/src/views/controlCenter/670/index.vue +++ b/src/views/controlCenter/670/index.vue @@ -568,6 +568,7 @@ function showClose() { clearInterval(timer); timer=null; Status.timeOut=0; + hideConfirm(); } } // 处理设备消息