liubiao/dyf-vue-ui
1
0
Fork 0
forked from dyf/dyf-vue-ui
Code Pull Requests Activity

670控制中心问题调整

Browse Source
This commit is contained in:
liub
2025-09-23 14:27:11 +08:00
parent 5d073b47fb
commit ee795f3676
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/controlCenter/670/index.vue
View File

@ -2,7 +2,7 @@
<div class="device-page p-2"> <div class="device-page p-2">
<!-- 头部信息栏 --> <!-- 头部信息栏 -->
<div class="header-bar"> <div class="header-bar">
<div>设备名称：{{ deviceDetail.deviceName }}</div> <div>设备名称：{{ deviceDetail.deviceName }}，IMEI:{{deviceDetail.deviceImei }}</div>
<div>设备型号：{{ deviceDetail.typeName }}</div> <div>设备型号：{{ deviceDetail.typeName }}</div>
<div class="device-status"> <div class="device-status">
设备状态： 设备状态：
@ -373,7 +373,6 @@ const deviceDetail = ref<any>({
//模式设置 //模式设置
const handleModeClick = async (id: string, type: string) => { const handleModeClick = async (id: string, type: string) => {
if (Status[type] == id) { if (Status[type] == id) {
return; return;
} }
@ -407,7 +406,6 @@ const handleModeClick = async (id: string, type: string) => {
}; };
dic.promise.then((res) => { dic.promise.then((res) => {
if (res.code === 200) { if (res.code === 200) {
Status[type] = id; Status[type] = id;
ElMessage.closeAll(); ElMessage.closeAll();
@ -419,12 +417,13 @@ const handleModeClick = async (id: string, type: string) => {
callback(); callback();
} }
} else { } else {
proxy?.$modal.msgError(res.msg); proxy?.$modal.msgError(res.msg);
} }
}); });
}; };
if(type == 'sosMode' && Status.sosMode=== '1' && id==='0'){ if(type == 'sosMode' && Status.sosMode=== '1' && id==='0' && timer){
showClose(); showClose();
return; return;
} }
@ -444,7 +443,7 @@ const handleModeClick = async (id: string, type: string) => {
clearInterval(timer); clearInterval(timer);
timer = null; timer = null;
hideConfirm(); hideConfirm();
handleModeClick('sosMode','1'); handleModeClick('1','sosMode');
deviceDetail.value.staSOSGrade="0"; deviceDetail.value.staSOSGrade="0";
return; return;
} }
@ -563,11 +562,13 @@ function showClose() {
Status.confirm.Visible = true; Status.confirm.Visible = true;
Status.confirm.OkTxt = '关闭'; Status.confirm.OkTxt = '关闭';
Status.confirm.OkCallback=()=>{ Status.confirm.OkCallback=()=>{
handleModeClick('sosMode','0'); clearInterval(timer);
deviceDetail.value.staSOSGrade="0";
clearInterval(timer);
timer=null; timer=null;
handleModeClick('0','sosMode');
deviceDetail.value.staSOSGrade="0";
Status.timeOut=0; Status.timeOut=0;
hideConfirm(); hideConfirm();
} }
} }

5
src/views/equipmentManagement/devices/shareManage.vue
View File

@ -205,9 +205,12 @@ var dic = reactive({
'3': '开机画面', '3': '开机画面',
'4': '人员信息登记', '4': '人员信息登记',
'5': '发送信息', '5': '发送信息',
'6': '产品信息' '6': '产品信息',
'41':'静电探测',
'42':'SOS'
}); });
var power = computed(() => { var power = computed(() => {
let arr = []; let arr = [];
let keys = Object.keys(dic); let keys = Object.keys(dic);