From c15e7b4aad2cfd92222c9c0d9f3f92c3f826606d Mon Sep 17 00:00:00 2001 From: fengerli <528575642@qq.com> Date: Sat, 2 Aug 2025 16:32:48 +0800 Subject: [PATCH] =?UTF-8?q?6170=E5=A2=9E=E5=8A=A0=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/CustomPopup/CustomPopup.vue | 329 ++++++++++++------------ pages.json | 54 ++-- pages/210/deviceControl/index.vue | 118 +++++---- pages/210/onlineDevice/index.vue | 241 ++++++++++++++++++ pages/6170/callPolice/index.vue | 332 +++++++++++++++++++++++++ pages/6170/deviceControl/index.vue | 2 +- pages/common/index/index.vue | 19 +- pages/common/send/index.vue | 1 + static/images/6170/bj.png | Bin 0 -> 2936 bytes 9 files changed, 855 insertions(+), 241 deletions(-) create mode 100644 pages/210/onlineDevice/index.vue create mode 100644 pages/6170/callPolice/index.vue create mode 100644 static/images/6170/bj.png diff --git a/components/CustomPopup/CustomPopup.vue b/components/CustomPopup/CustomPopup.vue index e2ca6db..04265a0 100644 --- a/components/CustomPopup/CustomPopup.vue +++ b/components/CustomPopup/CustomPopup.vue @@ -1,182 +1,183 @@ \ No newline at end of file diff --git a/pages.json b/pages.json index b79a3a0..726fde2 100644 --- a/pages.json +++ b/pages.json @@ -1,6 +1,6 @@ { "pages": [ - + { "path": "pages/common/login/index", "style": { @@ -8,9 +8,9 @@ } }, - - - + + + { "path": "pages/common/index/index", "style": { @@ -65,6 +65,13 @@ "navigationStyle": "custom" } }, + { + "path": "pages/6170/callPolice/index", + "style": { + "navigationBarTitleText": "报警" + } + }, + { "path": "pages/210/deviceControl/index", "style": { @@ -98,31 +105,27 @@ } }, { - "path" : "pages/common/addBLE/addEquip", - "style" : - { - "navigationBarTitleText" : "添加设备" + "path": "pages/common/addBLE/addEquip", + "style": { + "navigationBarTitleText": "添加设备" } }, { - "path" : "pages/common/addBLE/LinkBle", - "style" : - { - "navigationBarTitleText" : "扫描到的设备" + "path": "pages/common/addBLE/LinkBle", + "style": { + "navigationBarTitleText": "扫描到的设备" } }, { - "path" : "pages/6155/deviceDetail", - "style" : - { - "navigationBarTitleText" : "HBY 6155" + "path": "pages/6155/deviceDetail", + "style": { + "navigationBarTitleText": "HBY 6155" } }, { - "path" : "pages/6155/ImgCrop", - "style" : - { - "navigationBarTitleText" : "图像裁剪", + "path": "pages/6155/ImgCrop", + "style": { + "navigationBarTitleText": "图像裁剪", "navigationStyle": "custom", "fullscreen": true } @@ -145,7 +148,7 @@ "navigationBarTitleText": "所有分享" } }, - + { "path": "pages/6170/share/index", "style": { @@ -163,8 +166,15 @@ "style": { "navigationBarTitleText": "分享管理" } + }, + { + "path": "pages/210/onlineDevice/index", + "style": { + "navigationBarTitleText": "联机设备" + } } - ], + + ], "tabBar": { "color": "#fff", "selectedColor": "#BBE600", diff --git a/pages/210/deviceControl/index.vue b/pages/210/deviceControl/index.vue index 708c64d..9ba6078 100644 --- a/pages/210/deviceControl/index.vue +++ b/pages/210/deviceControl/index.vue @@ -25,7 +25,7 @@ - 1小时 + {{deviceInfo.batteryRemainingTime}}分钟 续航时间 @@ -58,17 +58,24 @@ - + + + + {{ item }} + + + + - + - 灯光模式 - {{ currentMainMode }} + 联机设备 @@ -115,7 +122,7 @@ - + @@ -278,9 +285,7 @@ secondaryMode: 'string', navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight, navTitle: "", - lightModeA: false, - currentMainMode: '强光', lightModeB: false, lightModeC: false, //激光提示框 items: [], @@ -306,12 +311,9 @@ showUploadPopup: false, selectedImage: null, // 添加这个变量来存储选择的图片 file: '', - selectedItemIndex: 0 - } - }, - computed: { - popupTitle() { - return this.modeType === 'main' ? '灯光模式' : '激光模式'; + selectedItemIndex: 0, + radioList: ['M', 'S'], + radioSelected: 0, // -1表示未选中任何项 } }, methods: { @@ -321,48 +323,21 @@ this.lightModeB = false; this.lightModeC = false; }, + handleRadioSelect(index) { + this.radioSelected = index; + console.log('选中了单选选项:', this.radioList[index]); + }, // *******定位****** gpsPosition() { uni.navigateTo({ url: '/pages/common/map/index' }) }, - selectMode(type) { - this.modeType = type; - this.lightModeA = true; - if (type === 'main') { - this.items = [{ - text: '强光', - selected: this.currentMainMode === '强光', // 修正匹配条件 - image: '/static/images/sett.png', - instructValue: '1' - }, - { - text: '弱光', - selected: this.currentMainMode === '弱光', - image: '/static/images/rg.png', - instructValue: '2' - }, - { - text: '爆闪', - selected: this.currentMainMode === '爆闪', - image: '/static/images/bs.png', - instructValue: '3' - }, - { - text: '泛光', - selected: this.currentMainMode === '泛光', - image: '/static/images/settt.png', - instructValue: '4' - }, - { - text: '关闭', - selected: this.currentMainMode === '关闭', - image: '/static/images/close.png', - instructValue: '0' - }, - ]; - } + // 联机设备 + selectMode() { + uni.navigateTo({ + url:'/pages/210/onlineDevice/index' + }) }, // 人员信息登录 toggleForm() { @@ -488,7 +463,7 @@ // 显示上传中加载提示 uni.showLoading({ title: '上传中...', - mask: true + mask: true }); uni.uploadFile({ @@ -717,7 +692,7 @@ }); }); }); - this.fetchDeviceDetail(data.data.id) + this.fetchDeviceDetail(data.data.id) }); // 如果需要向调用页面返回数据,可以触发 'ack' 事件 @@ -857,6 +832,41 @@ padding-top: 10rpx; } + .radio-group { + display: flex; + gap: 12px; + align-items: center; + margin-bottom: 20rpx; + font-size:200rpx; + } + + .group-item { + background: rgba(26, 26, 26, 1); + width: 100%; + height: 136rpx; + border-radius: 72rpx; + text-align: center; + line-height:136rpx; + position: relative; + } + .radio-icon.selected { + background-color: rgba(174, 214, 0, 1); + transition: background-color 0.3s; + border-radius: 72rpx; + } + .radio-icon{ + font-size:50rpx; + } + .uni-border{ + border:4rpx solid rgba(26, 26, 26, 1); + width:96%; + height:123rpx; + position: absolute; + top:7rpx; + left:6rpx; + border-radius:72rpx; + } + .info-card { background-color: rgb(26, 26, 26); border-radius: 16rpx; @@ -885,10 +895,12 @@ color: rgba(255, 255, 255, 0.6); text-align: end; } - .status-greend{ + + .status-greend { color: rgba(174, 214, 0, 1); text-align: end; } + .light { position: absolute; /* top:10rpx; */ diff --git a/pages/210/onlineDevice/index.vue b/pages/210/onlineDevice/index.vue new file mode 100644 index 0000000..30dd0e9 --- /dev/null +++ b/pages/210/onlineDevice/index.vue @@ -0,0 +1,241 @@ + + + + + \ No newline at end of file diff --git a/pages/6170/callPolice/index.vue b/pages/6170/callPolice/index.vue new file mode 100644 index 0000000..70a2ff0 --- /dev/null +++ b/pages/6170/callPolice/index.vue @@ -0,0 +1,332 @@ + + + + + \ No newline at end of file diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue index e570ec8..dceb64d 100644 --- a/pages/6170/deviceControl/index.vue +++ b/pages/6170/deviceControl/index.vue @@ -144,7 +144,7 @@ - + diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue index 52acd6f..335afba 100644 --- a/pages/common/index/index.vue +++ b/pages/common/index/index.vue @@ -19,7 +19,7 @@ - + 报警 位置 发送信息 @@ -402,6 +402,23 @@ } }) }, + // 报警 + callpolice(){ + const currentTab = this.tabs[this.activeTab]; + const deviceType = currentTab.id || 'all'; + console.log(`跳转到发送信息页面\n当前设备类型: ${deviceType}\n设备类型名称: ${currentTab.typeName}`); + uni.navigateTo({ + url: '/pages/6170/callPolice/index', + events: { + ack: function(data) {} + }, + success: (res) => { + res.eventChannel.emit('devicePolice', { + data: deviceType + }); + } + }) + }, // 发生短信 handleSend() { const currentTab = this.tabs[this.activeTab]; diff --git a/pages/common/send/index.vue b/pages/common/send/index.vue index e98dd31..ef21f1e 100644 --- a/pages/common/send/index.vue +++ b/pages/common/send/index.vue @@ -165,6 +165,7 @@ display: flex; align-items: center; width: 95%; + margin-bottom: 20rpx; } .checkbox { diff --git a/static/images/6170/bj.png b/static/images/6170/bj.png new file mode 100644 index 0000000000000000000000000000000000000000..9078adb726c83a6a38455eb86cd925153bb7dcbd GIT binary patch literal 2936 zcmeHJT})eL7(S&^mNgwe21wS)m|&K;0oyKGhqbU-m?X&5s6>bD$YOg@pqt3r64C=A zSx1A}+=V0Es4-C!FQ}1JAgwttejEXIG$uCVXDt<54KjN;I@)pCRs$NpP2L6_UPt7h7_`a|!mBlb|S(WO<>n6df zUvQf^$yEZbMT?o%q2R;zvU4e%J@vp(}Up7-I^wY4ycR$E!A`p|9f-Az_&YmF^N z<7pCxto|%gvZgn#-L;Z|<1rZ)G@8DU4_zgLWqASOwsWz|{Aw>LFm+0!4e@jNaT_yt zvrQHlh4oZ$q(3xhE=GrHnFrE^k(F>m5^z^cH|0ZpzMy~uh(42u z)|?u^J2Y;)caq5=9{?PL&avjG%N;55yM_aUKEFtP=@5r2Pr#SHNoLQ8bm6v+KFL5L zgM+4TeU?tC>8U&bbkKE_n23$9ct-zbWbK?<>f_HKKynjIBo3qlEFs{{69!^b;@QLh zfRmR7<+2HPHy@;L8pv$e!B>;Rz6{H;FS`U8j)~?3HV~|!CD3xu-)ga^MfhR_89Z_U z-1;xL9dz_W4);e^u}KGpg6JN)+~&p^162(G%woq7 zGD9fO;4m}y4wDm}LpP2I(f^p$o4G|c=p_MFhX_hK$~6&o#8J@qJBP4iBHKBO_X8&G za73hR-Dd7wi8gW=nYr6A;-cKy6D{hGGzt>k_-Foq=mmr>wt$wz5P#%fdLun|-52Qg z{p?(v)t|H2@XOJCao4zB;G7k&Z>a^=egTn4{_4FS7;N{7%8{O{w{k$Tj^uhqC06`% zL5Tp8T(C=DENXw4V+N1>wL3AQQoTS0F}+) z#Q!-x5RhB-q>5G;;(mkyChos&J z5+lyV2?HQ1oA(eVbRxMg*px@y!jZNU9CptR?3*^VBe=)fYQ5wV(H%M5x5|%MRslVP zSx1gjmJWu>5jJMokTm&QB4lT>hsEhnHEuC&py#c?=YVS46J9FY*6lvOq^Vr-2^#Qh z>$aDg={A0Vv_W&jzvJx@UG02Vxw)TkHXLu+mI-l>pV{R1z;vSC