diff --git a/et --hard id b/et --hard id deleted file mode 100644 index ef19f9c..0000000 --- a/et --hard id +++ /dev/null @@ -1,268 +0,0 @@ -commit c14da42ce5e3a1ce49d73681df28e66982dedba2 (HEAD -> main) -Author: fengerli <528575642@qq.com> -Date: Mon Nov 17 08:55:48 2025 +0800 - - 210页面开发 - -commit dadad6ed194f88dceff90dcaa6c20d6513bf0282 (origin/main, origin/HEAD) -Author: fengerli <528575642@qq.com> -Date: Wed Nov 12 09:51:35 2025 +0800 - - 添加token过期，跳转到登录页 - -commit 426fdeddee783a8a551d683fb88d6ce2d6a9b9a1 -Merge: 968d7a6 f835e25 -Author: fengerli <528575642@qq.com> -Date: Sat Nov 8 10:33:20 2025 +0800 - - Merge branch 'main' of http://47.107.152.87:3000/dyf/APP - -commit 968d7a613dfa6c8be53520c99c01d1a889110b13 -Author: fengerli <528575642@qq.com> -Date: Sat Nov 8 10:33:00 2025 +0800 - - 6075页面功能开发 - -commit f835e25bbb7497f6545713cade4b032de17e11d1 -Merge: b8ce162 012eca6 -Author: dyf <974332738@qq.com> -Date: Sat Nov 8 10:32:38 2025 +0800 - - Merge pull request 'new-20250827 一些小优化' (#22) from liubiao/APP:new-20250827 into main - - Reviewed-on: http://47.107.152.87:3000/dyf/APP/pulls/22 - -commit 012eca69853acd92a2bab85721ed99c85e0b7969 -Merge: 623a474 b8ce162 -Author: liub -Date: Fri Nov 7 13:08:05 2025 +0800 - - Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827 - - # Conflicts: - # pages.json - # pages/100/HBY100.vue - # pages/6075/BJQ6075.vue - # pages/7305/BJQ7305.vue - # utils/BleReceive.js - -commit 623a47466a6fef7c3fe40cfe5c1d52f85ac8d478 -Author: liub -Date: Fri Nov 7 12:16:10 2025 +0800 - - 合并线上代码 - -commit 2493bb7113fd21e64836ed912ff9ff72ed0fcd1e -Author: liub -Date: Fri Nov 7 11:57:35 2025 +0800 - - 完成100 - -commit b8ce1621b45e40c3ff14d5d0ddaed3b362526d58 -Merge: c81a4d1 27d212e -Author: fengerli <528575642@qq.com> -Date: Thu Nov 6 08:47:45 2025 +0800 - - Merge branch 'main' of http://47.107.152.87:3000/dyf/APP - -commit c81a4d1903eb32ed784b97e33d29076e46fb1531 -Author: fengerli <528575642@qq.com> -Date: Thu Nov 6 08:46:27 2025 +0800 - - 6075设备控制页 - -commit 27d212e7dc9dcf61f361bd633482d5f26cde4886 -Author: 微微一笑 <709648985@qq.com> -Date: Wed Nov 5 19:18:05 2025 +0800 - - 继续优化7305 - -commit 9037ef6ac31cfdcbe273c47ed79b75bfccbf2877 -Merge: a30a631 2b72cc1 -Author: 微微一笑 <709648985@qq.com> -Date: Wed Nov 5 11:17:11 2025 +0800 - - Merge branch 'main' of http://47.107.152.87:3000/dyf/APP - -commit a30a631ea647b0a0615e0c78d06de90f872d4990 -Author: 微微一笑 <709648985@qq.com> -Date: Wed Nov 5 11:17:08 2025 +0800 - - 改成13*13符合设备端 - -commit 2b72cc1a5cbe2a9e5923a262ea6cafe0413cbc1c -Merge: 77be45f a0c883f -Author: fengerli <528575642@qq.com> -Date: Wed Nov 5 11:13:35 2025 +0800 - - Merge branch 'main' of http://47.107.152.87:3000/dyf/APP - -commit 77be45f1f3bf43dd7c5184a6ba196da7d5a92a02 -Author: fengerli <528575642@qq.com> -Date: Wed Nov 5 11:13:32 2025 +0800 - - 6075 - -commit a0c883f4e3dfafa6805090eaebaffec811f50aec -Author: 微微一笑 <709648985@qq.com> -Date: Wed Nov 5 10:22:17 2025 +0800 - - 优化蓝牙连接7305同步状态 - -commit 9313ec01060e32c7160f61e6a557ed53a4277e86 -Merge: ca6345e d06cd6c -Author: fengerli <528575642@qq.com> -Date: Wed Nov 5 08:48:15 2025 +0800 - - Merge branch 'main' of http://47.107.152.87:3000/dyf/APP - -commit ca6345ee3e8572415e1c3454f4fe9f696da8c303 -Author: fengerli <528575642@qq.com> -Date: Wed Nov 5 08:48:13 2025 +0800 - - 6075页面开发 - -commit d06cd6cdfdf94321f5257891a85516b066ff8014 -Author: 微微一笑 <709648985@qq.com> -Date: Tue Nov 4 19:30:47 2025 +0800 - - 修复复杂字体渲染设备端乱序问题 - -commit 2218ca06501de44ad9ffdb7fbbb09d0733a5ba9e -Author: 微微一笑 <709648985@qq.com> -Date: Sat Nov 1 17:32:03 2025 +0800 - - 修改输入框文本 - -commit 500b461bdd86a7c352e11af1e4827f9f1bb33ebb -Author: 微微一笑 <709648985@qq.com> -Date: Sat Nov 1 17:21:45 2025 +0800 - - 修复7305设备上报问题 - -commit 3526f28d067bbcfb1f91bd2f86faa478f5f23794 -Author: 微微一笑 <709648985@qq.com> -Date: Fri Oct 31 15:35:03 2025 +0800 - - 修复蓝牙传输数据 - -commit 3eeffdb62c82e61a3de86766e4ac1c075bf28287 -Merge: 317c762 bd56ca9 -Author: fengerli <528575642@qq.com> -Date: Fri Oct 31 11:15:39 2025 +0800 - - Merge branch 'liubiao-new-20250827' - -commit 317c762edc62551c2045415b0f4e598b0772a622 -Author: fengerli <528575642@qq.com> -Date: Fri Oct 31 11:13:07 2025 +0800 - - 7305文件报错 - -commit c39cbcb34d1929b2abb177f59538aaaae34dd292 -Author: liub -Date: Thu Oct 30 11:10:57 2025 +0800 - - 蓝牙开始、结束搜索添加状态判定 - -commit bd56ca997bb95078cf9b1ff7e32791af34dc3670 (liubiao-new-20250827) -Author: liub -Date: Mon Oct 27 13:00:34 2025 +0800 - - 修复7305标签未闭合问题 - -commit cf60414d7686194f35f41e6f1cf1dfe8f6e89765 -Author: liub -Date: Mon Oct 27 11:51:38 2025 +0800 - - 蓝牙断开连接变成异步操作 - -commit 61ed91695f15decff77a9fec9d7af3f7fae0226a -Author: liub -Date: Mon Oct 27 10:52:17 2025 +0800 - - 蓝牙模块添加在web平台默认成功方便调试功能,4877功能完成 - -commit d37ccfeabc9324872b686eb581ce33246fc1bb5d -Author: liub -Date: Fri Oct 24 17:21:18 2025 +0800 - - 完成BJQ4877功能开发 - -commit 0909d9f023c6e3db7d65c025954b2626d6f1615f -Merge: 1d8b3b4 b20a93d -Author: liubiao <3909916335@qq.com> -Date: Fri Oct 24 11:46:02 2025 +0800 - - merge upstream - -commit b20a93dd2854fef472eca51fd2a2934cba43ec59 -Author: 微微一笑 <709648985@qq.com> -Date: Fri Oct 24 11:42:56 2025 +0800 - - 修复传输时序问题 - -commit 1d8b3b4a9a7ed1030ce97b1ebb9121e1ceed365a -Merge: a5c6faa fa64e7f -Author: liub -Date: Fri Oct 24 11:08:32 2025 +0800 - - 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 - - # Conflicts: - # pages/7305/BJQ7305.vue - -commit a5c6faa9dac8cadbaf6ea9d745e43bca9d48395c -Author: liub -Date: Fri Oct 24 11:04:36 2025 +0800 - - * 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 - - * 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 - - * 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 - - * 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 - - * 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 - - * 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 - - * 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 - - * 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 - - 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 - -commit 15ba241317a9ecc46bbb7022b4ec3638bfa00a4e -Author: liub -Date: Fri Oct 24 11:00:35 2025 +0800 - - 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题 - -commit fa64e7f1fc9eb4b24e9bf6eab269e718299aabce -Merge: 0033649 1de958d -Author: liubiao <3909916335@qq.com> -Date: Fri Oct 24 10:57:08 2025 +0800 - - merge upstream - -commit 45328120c1b552b483b325cad2511ab274305006 -Author: liub -Date: Fri Oct 24 10:56:37 2025 +0800 - - 修复6155/7305全局订阅与详情订阅重复弹窗 - -commit 1de958df20014e6a858d1a0da9e277766518c96c -Author: 微微一笑 <709648985@qq.com> -Date: Fri Oct 24 10:29:46 2025 +0800 - - 修复优化7305设备屏幕点阵取模兼容设备端填坑 - -commit 0033649677964eb94ea930ba76f5f1a9020cffa3 -Author: liub -Date: Thu Oct 23 16:36:48 2025 +0800 - - 修改蓝牙接收数据处理逻辑，改成配置式，避免if无限增多 - -commit 738ce209a60 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7fccadd..9a059e7 100644 --- a/manifest.json +++ b/manifest.json @@ -95,18 +95,12 @@ "unipush" : { "version" : "2", "offline" : true, - "honor" : {}, - "meizu" : {}, - "mi" : {}, - "vivo" : {}, - "oppo" : {}, "hms" : {}, - "icons" : { - "small" : { - "xxhdpi" : "", - "xhdpi" : "" - } - } + "oppo" : {}, + "vivo" : {}, + "mi" : {}, + "meizu" : {}, + "honor" : {} } } }, diff --git a/pages/102/HBY102.vue b/pages/102/HBY102.vue index 50dbec5..61704d5 100644 --- a/pages/102/HBY102.vue +++ b/pages/102/HBY102.vue @@ -761,7 +761,7 @@ keys.forEach(key => { if (key in this.formData) { - console.log("key=",key+",value=",json[key]); + // console.log("key=",key+",value=",json[key]); this.formData[key] = json[key] ; } }); diff --git a/pages/4877/BJQ4877.vue b/pages/4877/BJQ4877.vue index 8da16ab..4beeee4 100644 --- a/pages/4877/BJQ4877.vue +++ b/pages/4877/BJQ4877.vue @@ -610,23 +610,23 @@ showUnWarn(val) { - this.showPop({ - message: '确定解除声光报警模式?', - iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png", - borderColor: "#e034344d", - buttonBgColor: "#E03434", - okCallback: () => { + // this.showPop({ + // message: '确定解除声光报警模式?', + // iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png", + // borderColor: "#e034344d", + // buttonBgColor: "#E03434", + // okCallback: () => { clearInterval(interval); this.sosSetting({ val: val }); - }, - buttonText: "解除", - showCancel: true, - buttonCancelText: '取消' + // }, + // buttonText: "解除", + // showCancel: true, + // buttonCancelText: '取消' - }); + // }); }, groupSetting(item, index) { if (this.formData.sta_SOSType === 'sos') { @@ -694,7 +694,9 @@ }); } - if (item.val === 'sos') { + + + let confirmTask=()=>{ this.showPop({ message: '确定' + (this.formData.sta_SOSType === 'sos' ? '关闭' : '开启') + '声光报警模式?', iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png", @@ -705,9 +707,19 @@ showCancel: true, buttonCancelText: '取消' }); + } + if (item.val === 'sos') { + confirmTask(); } else if (item.val === 'sos_off') { - task(); + + if(this.formData.sta_SOSType === 'sos'){ + confirmTask(); + }else{ + task(); + } + + } else { if (this.formData.sta_SOSType === 'sos') {