From 37f5047a46c6e1844a57ad1c1fbbd477feac6333 Mon Sep 17 00:00:00 2001 From: liub Date: Mon, 30 Mar 2026 13:17:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=906075J=E8=93=9D=E7=89=99?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .hbuilderx/launch.json | 2 +- App.vue | 5 +- components/TextToHex/TextToHexV1.vue | 6 +- pages/018A/HBY018A.vue | 4 +- pages/100/HBY100.vue | 10 +- pages/100J/HBY100-J.vue | 4 +- pages/102/HBY102.vue | 57 +-- pages/210/HBY210.vue | 4 +- pages/4877/BJQ4877.vue | 4 +- pages/4877/BJQ4877V1.vue | 4 +- pages/6075/BJQ6075.vue | 4 +- pages/6075J/BJQ6075J.vue | 403 ++++++++++++--------- pages/6107/BJQ6107.vue | 4 +- pages/6155/BJQ6155.vue | 4 +- pages/6155/deviceDetail.vue | 4 +- pages/6170/deviceControl/index.vue | 104 +++++- pages/6331/BJQ6331.vue | 4 +- pages/650/HBY650.vue | 4 +- pages/670/HBY670.vue | 4 +- pages/7305/BJQ7305.vue | 4 +- pages/common/addBLE/addEquip.vue | 11 +- pages/common/addScan/ScanEquip.vue | 5 +- pages/common/callPolice/index.vue | 2 +- pages/common/index/index.vue | 50 +-- pages/common/user/index.vue | 10 +- static/images/6155/DeviceDetail/battry.png | Bin 268 -> 0 bytes static/images/6155/DeviceDetail/time.png | Bin 321 -> 0 bytes static/images/common/dl.png | Bin 244 -> 0 bytes static/images/common/nz.png | Bin 382 -> 0 bytes utils/BleHelper.js | 2 +- utils/BleReceive.js | 32 +- utils/Common.js | 2 +- 32 files changed, 472 insertions(+), 281 deletions(-) delete mode 100644 static/images/6155/DeviceDetail/battry.png delete mode 100644 static/images/6155/DeviceDetail/time.png delete mode 100644 static/images/common/dl.png delete mode 100644 static/images/common/nz.png diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 95fb682..92f9bed 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -7,7 +7,7 @@ }, { "customPlaygroundType" : "local", - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" }, { diff --git a/App.vue b/App.vue index 7988fae..5f1c716 100644 --- a/App.vue +++ b/App.vue @@ -3,7 +3,7 @@ import upgrade from '@/utils/update.js'; // 延迟断开蓝牙：选择文件/录音等会触发 onHide，8 秒内返回则不断开 - const BLE_DISCONNECT_DELAY = 8000; + const BLE_DISCONNECT_DELAY = 30000; let _bleDisconnectTimer = null; export default { @@ -74,6 +74,9 @@ initOS(); } + + let system=uni.getSystemInfoSync(); + console.log("system=",system); // #endif }, onShow: function() { diff --git a/components/TextToHex/TextToHexV1.vue b/components/TextToHex/TextToHexV1.vue index d3237ad..36612d1 100644 --- a/components/TextToHex/TextToHexV1.vue +++ b/components/TextToHex/TextToHexV1.vue @@ -124,9 +124,10 @@ */ async drawAndGetPixels() { // 第一次调用时先预热画布（解决APP重新打开后第一次获取数据不完整的问题） - await this.warmupCanvas(); + // await this.warmupCanvas(); let convertCharToMatrix=function(imageData) { + debugger; // console.log("imgData=",imageData) let matrix = []; @@ -166,6 +167,7 @@ } let drawTxt=async (textLine)=> { + debugger; let result = {}; let ctx = this.ctx; @@ -226,7 +228,7 @@ let arr = []; // 循环处理每行文本 for (let i = 0; i < this.validTxts.length; i++) { - +debugger; let linePixls = []; let item = this.validTxts[i]; diff --git a/pages/018A/HBY018A.vue b/pages/018A/HBY018A.vue index 36fa6c6..176d060 100644 --- a/pages/018A/HBY018A.vue +++ b/pages/018A/HBY018A.vue @@ -7,14 +7,14 @@ - + {{formData.sta_PowerPercent}}% 电量 - + {{formData.sta_charge?dic.sta_charge[formData.sta_charge+'']:"未充电" }} diff --git a/pages/100/HBY100.vue b/pages/100/HBY100.vue index 6b11d7e..6820055 100644 --- a/pages/100/HBY100.vue +++ b/pages/100/HBY100.vue @@ -28,14 +28,14 @@ - + {{formData.sta_battery}}% 电量 - + {{formData.sta_system?dic.sta_system[formData.sta_system]:"" }} 设备状态 @@ -475,9 +475,9 @@ sta_system: { "0": '关机', - "1": '仅充电', - "2": '开机未充电', - "3": '开机且充电', + "1": '充电中',//仅充电 + "2": '未充电',//开机未充电 + "3": '充电中',//开机且充电 "": "" } diff --git a/pages/100J/HBY100-J.vue b/pages/100J/HBY100-J.vue index 97bac15..5083e56 100644 --- a/pages/100J/HBY100-J.vue +++ b/pages/100J/HBY100-J.vue @@ -11,7 +11,7 @@ - + {{ deviceInfo.batteryPercentage }}% @@ -20,7 +20,7 @@ - + {{ Math.floor((Number(deviceInfo.batteryRemainingTime) || 0) / 60) }}小时 diff --git a/pages/102/HBY102.vue b/pages/102/HBY102.vue index d7c368e..7f1adab 100644 --- a/pages/102/HBY102.vue +++ b/pages/102/HBY102.vue @@ -28,14 +28,14 @@ - + {{formData.sta_PowerPercent}}% 电量 - + {{formData.sta_charge?dic.sta_charge[formData.sta_charge+'']:"未充电" }} @@ -526,7 +526,7 @@ these.formData.bleStatu = true; }); } - + this.getWarns(); // this.getLinkedCnt(); }, computed: { @@ -673,7 +673,7 @@ } let warnKey = "102_" + these.device.id + "_warning"; - let linkKey = "102_" + these.device.id + "_linked"; + // let linkKey = "102_" + these.device.id + "_linked"; let p1 = new Promise((succ, err) => { uni.getStorage({ key: warnKey, @@ -690,33 +690,33 @@ }); }); - let p2 = new Promise((succ, err) => { - uni.getStorage({ - key: linkKey, - success(res) { - console.error("获取到联机数据", res); - let data = res.data; - let fs = data.filter(v => { - return !v.read - }); - console.error("未读联机数据", fs); - succ(fs); - }, - fail(ex) { - err(null); - } - }); - }); + // let p2 = new Promise((succ, err) => { + // uni.getStorage({ + // key: linkKey, + // success(res) { + // console.error("获取到联机数据", res); + // let data = res.data; + // let fs = data.filter(v => { + // return !v.read + // }); + // console.error("未读联机数据", fs); + // succ(fs); + // }, + // fail(ex) { + // err(null); + // } + // }); + // }); - Promise.allSettled([p1, p2]).then(results => { + Promise.allSettled([p1]).then(results => { let fs = []; if (results[0].status == 'fulfilled') { fs = fs.concat(results[0].value); } - if (results[1].status == 'fulfilled') { - fs = fs.concat(results[1].value); - } + // if (results[1].status == 'fulfilled') { + // fs = fs.concat(results[1].value); + // } console.error("获取到未读消息", fs); these.$set(these.Status.navbar.icons[0], "math", fs.length); }); @@ -945,7 +945,7 @@ sosSetting(item, isOk) { - +debugger; if (!this.permissions.includes('46') && this.Status.apiType !== 'listA') { this.showPop({ @@ -1034,7 +1034,8 @@ }); } else { - task(item.key); + let newval=this.formData.sta_LedType===item.key?'led_off':item.key; + task(newval); } } @@ -1155,7 +1156,7 @@ this.Status.BottomMenu.activeIndex = active; let msg = []; - if (json.sta_PowerPercent <= 20 && (json.sta_charge === 0 || json.sta_charge === '0')) { + if (json.sta_PowerPercent <= 20 && json.sta_PowerPercent!=this.formData.sta_PowerPercent && (json.sta_charge === 0 || json.sta_charge === '0')) { msg.push("设备电量低"); } diff --git a/pages/210/HBY210.vue b/pages/210/HBY210.vue index 9e6f65f..dc931a7 100644 --- a/pages/210/HBY210.vue +++ b/pages/210/HBY210.vue @@ -18,14 +18,14 @@ - + {{deviceInfo.batteryPercentage}}% 电量 - + {{deviceInfo.batteryRemainingTime}}分钟 续航时间 diff --git a/pages/4877/BJQ4877.vue b/pages/4877/BJQ4877.vue index 9cd023d..9c3c0c2 100644 --- a/pages/4877/BJQ4877.vue +++ b/pages/4877/BJQ4877.vue @@ -26,14 +26,14 @@ - + {{formData.sta_PowerPercent}}% 电量 - + + + + + @@ -405,7 +423,7 @@ Status: { pageHide: null }, - inteval: 120 + inteval: 1000 } }, computed: { @@ -461,8 +479,7 @@ }, getDevice: function() { if (ble) { - console.log("LinkedList=", ble.data.LinkedList); - console.log("this.device=", this.itemInfo); + let f = ble.data.LinkedList.find((v) => { if (v.macAddress == this.itemInfo.deviceMac) { if (!this.formData.deviceId) { @@ -926,6 +943,7 @@ }, + // 激光确认框提交 handleBtn() { @@ -1561,16 +1579,69 @@ // 强制报警（） handlePolice() { this.popupType = 'cancel'; - this.popupMessage = '确认要解除所选设备的报警状态'; + this.popupMessage = '确认解除报警状态'; this.showPopupFlag = true; + // this.popupConfirmText=""; }, + OpenWarn(val){//开启/解除强制报警 + const topic = `B/${this.itemInfo.deviceImei}`; + let message={"instruct":[7,val,0,0,0,0]}; + message=JSON.stringify(message); + + let flag=this.mqttClient.publish(topic, message, { + qos: 1 + }); + if(flag){ + this.itemInfo.alarmStatus=val; + } + + this.showPopupFlag = false; + }, + warnToggle(){ + if(this.itemInfo.alarmStatus==1){ + this.popupType = 'cancel'; + this.popupMessage = '确认解除报警状态'; + + }else{ + this.popupType = 'openWarn'; + this.popupMessage = '确认开启报警状态'; + + } + this.showPopupFlag = true; + // this.popupConfirmText="开启"; + // let val=1; + // let msg="确认开启强制报警？"; + // if(this.itemInfo.alarmStatus==1){ + // val=0; + // msg="确认解除强制报警？"; + // } + + // let mqSend=()=>{ + // const topic = `B/${this.itemInfo.deviceImei}`; + // let message={"instruct":[7,val,0,0,0,0]}; + // message=JSON.stringify(message); + + // let flag=this.mqttClient.publish(topic, message, { + // qos: 1 + // }); + // if(flag){ + // this.itemInfo.alarmStatus=val; + // } + + // } + + + + }, + // 解除报警逻辑 async onPopupConfirmPolice() { if (this.deviceInfo.onlineStatus !== 1) { - uni.showToast({ - title: '设备已离线', - icon: 'none' - }); + // uni.showToast({ + // title: '设备已离线', + // icon: 'none' + // }); + this.OpenWarn(0);//走mq直发 return; } this.isPolling = true; // 标记开始轮询 @@ -1595,8 +1666,10 @@ title: registerRes.msg, icon: 'none' }) + return } + this.itemInfo.alarmStatus=0; // 4. 获取设备状态FunctionAccessBatchStatusRule 批量 let deviceImei = this.itemInfo.deviceImei let typeName = this.itemInfo.typeName @@ -2210,6 +2283,11 @@ width: 47%; display: flex; text-align: center; + box-sizing: border-box; + border: 1rpx solid #00000000; + } + .mode-v1.active{ + border:1rpx solid #bbe600 !important; } .mode-v2 { diff --git a/pages/6331/BJQ6331.vue b/pages/6331/BJQ6331.vue index c372de2..0b52b2a 100644 --- a/pages/6331/BJQ6331.vue +++ b/pages/6331/BJQ6331.vue @@ -6,14 +6,14 @@ - + {{formData.battary}}% 电量 - + {{formData.xuhang}} 续航时间 diff --git a/pages/650/HBY650.vue b/pages/650/HBY650.vue index 081ac7e..dd3d34b 100644 --- a/pages/650/HBY650.vue +++ b/pages/650/HBY650.vue @@ -27,14 +27,14 @@ - + {{formData.battary}}% 电量 - + {{formData.xuhang}} 续航时间 diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue index 1187d22..1b9238b 100644 --- a/pages/670/HBY670.vue +++ b/pages/670/HBY670.vue @@ -22,14 +22,14 @@ - + {{formData.battary}}% 电量 - + {{formData.xuhang}} 续航时间 diff --git a/pages/7305/BJQ7305.vue b/pages/7305/BJQ7305.vue index 0fe2112..2940bbd 100644 --- a/pages/7305/BJQ7305.vue +++ b/pages/7305/BJQ7305.vue @@ -26,14 +26,14 @@ - + {{formData.battary}}% 电量 - + {{formData.xuhang}} 续航时间 diff --git a/pages/common/addBLE/addEquip.vue b/pages/common/addBLE/addEquip.vue index ac06bba..ba8ec17 100644 --- a/pages/common/addBLE/addEquip.vue +++ b/pages/common/addBLE/addEquip.vue @@ -530,7 +530,7 @@ ble.StartSearch().then(result => { // console.log("开始搜索成功", result); - + these.Status.BottomMenu.show=false; }).catch(err => { console.error("开始搜索失败:", err); if (err.code === 10001) { @@ -582,6 +582,9 @@ ble.showBlueSetting(false); }, DeviceVerdict(deviceId) { //判断是否是目标设备 + if (these.Status.isPageHidden) { + return; + } console.log("deviceid=", deviceId); console.log("these.device=", these.device) if (these.device) { //从设备详情过来的，回设备详情去 @@ -618,6 +621,9 @@ } //找到目标设备的处理方法 let deviceOK = () => { + if (these.Status.isPageHidden) { + return; + } hideLoading(these); eventChannel.emit('BindOver', these.device); @@ -779,6 +785,9 @@ execLink().then((res) => { console.log("res=", res); + if(this.Status.isPageHidden){ + return; + } linkCallback(res); }).catch(ex => { console.error("ex=", ex) diff --git a/pages/common/addScan/ScanEquip.vue b/pages/common/addScan/ScanEquip.vue index dc6bb27..ac99392 100644 --- a/pages/common/addScan/ScanEquip.vue +++ b/pages/common/addScan/ScanEquip.vue @@ -24,7 +24,7 @@ - + 对准二维码进行扫描 @@ -284,9 +284,10 @@ .btnOK { color: rgba(255, 255, 255, 0.6); font-family: 'PingFang SC'; - font-size: 30rpx; + font-size: 40rpx; font-weight: 400; letter-spacing: 5rpx; + margin-top: 20rpx; } .btnOK.active { diff --git a/pages/common/callPolice/index.vue b/pages/common/callPolice/index.vue index 920a09a..4df8bfc 100644 --- a/pages/common/callPolice/index.vue +++ b/pages/common/callPolice/index.vue @@ -363,7 +363,7 @@ } //统一通信协议方法 let CommonSend = () => { - let json=JSON.stringify({ins_ShakeBit:1}); + let json=JSON.stringify({ins_ShakeBit:isAlarming?1:0}); for (let i = 0; i < deviceImeiList.length; i++) { let imei = deviceImeiList[i]; mq.sendData("B/"+imei,json,false); diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue index a734c0d..1fbee95 100644 --- a/pages/common/index/index.vue +++ b/pages/common/index/index.vue @@ -18,13 +18,10 @@ - + 报警 位置 - 发送信息 + 发送信息 -1 + ShowSendmessage() { + return this.dic.showMsgTypes.indexOf(this.activeTabInfo.typeName) > -1 }, - showMap(){ - return this.dic.showMapTypes.indexOf(this.activeTabInfo.typeName)>-1 + showMap() { + return this.dic.showMapTypes.indexOf(this.activeTabInfo.typeName) > -1 }, - showWarn(){ - return this.dic.showCallPolice.indexOf(this.activeTabInfo.typeName)>-1 + showWarn() { + return this.dic.showCallPolice.indexOf(this.activeTabInfo.typeName) > -1 } }, data() { @@ -254,10 +251,15 @@ deviceName: "", //重命名 activeTabInfo: '', dic: { - showMsgTypes: ['BJQ6170', 'HBY210', 'HBY670', 'BJQ6075', 'BJQ6075J'],//需要发送消息的类型 - showMapTypes:['BJQ6170','HBY210','HBY670','BJQ6075','HBY018A','HBY100-J','BJQ6075J','HBY008A','HBY100-Y'],//需要显示地图的类型 - showCallPolice:['BJQ6170','HBY210','HBY670','BJQ6075','HBY018A','HBY100-J','BJQ6075J','HBY008A','HBY100-Y']//需要发送报警的类型 - } + showMsgTypes: ['BJQ6170', 'HBY210', 'HBY670', 'BJQ6075', 'BJQ6075J'], //需要发送消息的类型 + showMapTypes: ['BJQ6170', 'HBY210', 'HBY670', 'BJQ6075', 'HBY018A', 'HBY100-J', 'BJQ6075J', 'HBY008A', + 'HBY100-Y' + ], //需要显示地图的类型 + showCallPolice: ['BJQ6170', 'HBY210', 'HBY670', 'BJQ6075', 'HBY018A', 'HBY100-J', 'BJQ6075J', + 'HBY008A', 'HBY100-Y' + ] //需要发送报警的类型 + }, + isPageShow: true } }, methods: { @@ -299,8 +301,11 @@ this.updateBleStatu(); }, bleStateRecovery() { - console.log("蓝牙适配器恢复可用,重连断开的设备"); - ble.linkAllDevices(); + if (this.isPageShow) { + console.log("蓝牙适配器恢复可用,重连断开的设备"); + ble.linkAllDevices(); + } + }, bleBreak(res) { @@ -738,8 +743,11 @@ .filter(Boolean); }, }, + onHide() { + this.isPageShow = false; + }, onShow() { - + this.isPageShow = true; if (ble) { //因为vue视图只能后退不能隐藏后再显示 //所以回到首页后将其他所有页面的订阅都删除 diff --git a/pages/common/user/index.vue b/pages/common/user/index.vue index 74d9807..a18efb8 100644 --- a/pages/common/user/index.vue +++ b/pages/common/user/index.vue @@ -77,6 +77,8 @@ import { Logout } from '@/api/common/login.js' + import bleTool from '@/utils/BleHelper.js'; + var ble=null; export default { data() { return { @@ -87,6 +89,7 @@ }, onLoad() { var these=this; + ble=bleTool.getBleTool(); uni.getSystemInfo({ success(res) { if(res.uniPlatform=='app'){ @@ -139,7 +142,12 @@ uni.showToast({ title: '退出成功', icon: 'success' - }) + }); + if(ble){ + ble.StopSearch().catch(ex => {}); + ble.disconnectDevice().catch(ex => {}); + } + uni.reLaunch({ url: '/pages/common/login/index' }); diff --git a/static/images/6155/DeviceDetail/battry.png b/static/images/6155/DeviceDetail/battry.png deleted file mode 100644 index 7c812ac2627a9f8c2e01f4ea9bd092353763576c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^CLqkh3?$9N*lqwR#^NA%C&rs6b?Si}l>na*S0K&s zpMhaj8pFmUhV^L->rxrEWHM~dU|5sJusR)t)})`Fo!kdh##0jH7tFxOFQu#|C_VZA z$(Y$Ojz@vwb)GJcAr*6y6A}cBIFB-%>*8@Z(5A`A#Obgy=uOZ=3)99eosTAQr34&R z6+M#B<*ha2py>1v4raZX7cLxBxoRoQx<$!z;i)q*Rvt^r-XGJvYFQk@r6}5Ky?{+a z>!XU4^KW@wqr@tM^Vj1JC-ng6pgRovaNAdJ;x-*&?~O;dcq{}T98jXUHx3v IIVCg!0Q5~+X#fBK diff --git a/static/images/6155/DeviceDetail/time.png b/static/images/6155/DeviceDetail/time.png deleted file mode 100644 index 68a4826c51a3794c4e2468a61285dac913f240b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^8bGYY!VDyhC0Ig%6k~CayA$KhlREW44u618h%1o( ze>~v-alij3eE*;DlkI#V0Tf~_3GxeOaA?^7|C^}9H=w|IPZ!6KiaC2H-R3>4z~jnW z!VqN0u!zTDG0y~+_x8aXPj7y*Jm~6g*5muOIkNp&d?b16`^ipc)NcsPXE@EIura_j z$5XJxg}+Tsnbku(-s7aA;b|@x-VpU=6=5ugT~*(i3L1Lw@NCWh(9&z{f57jSfXH6! zpQ7d4&G*UL{f^w3Vz9HmHm%u4&EMYH@X&#PI^Or^%r&ywW<7W*b3X0&#I79sn!vh= z`QtH#u4N>LH)`48ngC99FMT|K_}xA@O#~lf8z2 RP6NHh;OXk;vd$@?2>@A*eh2^n diff --git a/static/images/common/dl.png b/static/images/common/dl.png deleted file mode 100644 index 1e17edb26b2492db831babfa58db87342ca72b30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^CLqkh3?$9N*lqwR=>VS)SB4d-KqkYgbcR)F3@cI? z)}%8m%>=Pmr|)Oz76eLhlmz(&t1+CMEEOZjzwvfy5>Twc)5S5w;&ifrh)8+D0S2Ac zrY4@IB%TOIr2wu)?7{ODn0bP0l+XkKGvQ1B diff --git a/static/images/common/nz.png b/static/images/common/nz.png deleted file mode 100644 index 8b99e567b289b69bc6e6222e40237c350a53281f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 382 zcmV-^0fGLBP) { //订阅消息 - // console.log("收到订阅消息", receive); + console.log("收到订阅消息", receive); let f = this.data.LinkedList.find((v) => { return v.deviceId == receive.deviceId; }) diff --git a/utils/BleReceive.js b/utils/BleReceive.js index 4793bb0..17341ae 100644 --- a/utils/BleReceive.js +++ b/utils/BleReceive.js @@ -14,7 +14,8 @@ class BleReceive { '/pages/100/HBY100': this.Receive_100.bind(this), '/pages/102/HBY102': this.Receive_102.bind(this), '/pages/6170/deviceControl/index':this.Receive_6170.bind(this), - '/pages/100J/HBY100-J': this.Receive_100J.bind(this) + '/pages/100J/HBY100-J': this.Receive_100J.bind(this), + '/pages/6075J/BJQ6075J':this.Receive_6075.bind(this) }; } @@ -893,7 +894,36 @@ Receive_6170(receive, f, path, recArr) { } + Receive_6075(receive,f,path,recArr){ + let receiveData = {}; + + try { + receiveData = JSON.parse(receive.str); + + let recCnt = recArr.find(v => { + return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl + .replace(/\//g, "").toLowerCase(); + }); + if (!recCnt) { + // if (receiveData.sta_PowerPercent <= 20) { + // uni.showModal({ + // title: "提示", + // content: "设备'" + f.device.deviceName + "'电量低", + // showCancel: false + // }); + // } + + + } + + } catch (error) { + receiveData = {}; + console.log("文本解析失败", error) + } + return receiveData; + + } } diff --git a/utils/Common.js b/utils/Common.js index 58f0695..5d501b9 100644 --- a/utils/Common.js +++ b/utils/Common.js @@ -282,7 +282,7 @@ export default { value: "46", label: "手动报警", checked: false, - type: ['210','102'] + type: ['210','102','6170'] }, { value: "47",