diff --git a/components/ProParams/ProParams.vue b/components/ProParams/ProParams.vue new file mode 100644 index 0000000..11742ea --- /dev/null +++ b/components/ProParams/ProParams.vue @@ -0,0 +1,112 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index e06e62d..9289587 100644 --- a/pages.json +++ b/pages.json @@ -451,7 +451,13 @@ "path" : "pages/008A/HBY008A", "style" : { - "navigationBarTitleText" : "HBY008A" + "navigationStyle": "custom" + } + }, + { + "path": "pages/100Y/HBY100Y", + "style": { + "navigationBarTitleText": "" } } diff --git a/pages/008A/HBY008A.vue b/pages/008A/HBY008A.vue index 2dd2dc4..a6b2dd8 100644 --- a/pages/008A/HBY008A.vue +++ b/pages/008A/HBY008A.vue @@ -23,14 +23,14 @@ - + {{formData.battary}}% 电量 - + {{formData.xuhang}} 续航时间 @@ -43,10 +43,7 @@ 设备名称 {{device.deviceName}} - - 设备IMEI - {{device.deviceImei}} - + Mac地址 @@ -65,55 +62,10 @@ {{formData.sta_system}} - - 定位信息 - - - {{formData.Lon}} - - - - - {{formData.Lat}} - - - - - - - {{formData.address}} - - - - - - - + - - - - - - - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - - - - + + @@ -143,9 +95,9 @@ var eventChannel = null; var these = null; var ble = null; - var rec = null; + var recei = null; var mq = null; - + var pagePath="pages/008A/HBY008A"; export default { data() { @@ -163,7 +115,7 @@ src: '/static/images/common/shape.png' } ], - title: 'BJQ6075', + title: 'HBY008A', showBack: true, height: 90 }, @@ -241,9 +193,11 @@ onUnload() { console.log("页面卸载,释放资源"); let statusTopic = `A/${this.formData.imei?this.formData.imei:this.device.deviceImei}`; - + if(ble){ ble.removeAllCallback(pagePath); - ble.removeReceiveCallback(pagePath); + ble.removeReceiveCallback(pagePath); + } + if (mq) { mq.unsubscribe(statusTopic); mq.disconnect(); @@ -258,7 +212,8 @@ this.Status.pageHide = true; }, - onload() { + onLoad() { + these = this; recei = BleReceive.getBleReceive(); ble = BleTool.getBleTool(); @@ -270,7 +225,7 @@ ble.addDisposeCallback(these.deviceDispose, pagePath); ble.addRecoveryCallback(these.deviceRecovry, pagePath); - let eventChannel = this.getOpenerEventChannel(); + eventChannel = this.getOpenerEventChannel(); eventChannel.on('detailData', function(data) { @@ -493,23 +448,7 @@ }); }, - proDetail: function(pgetpe) { - debugger; - if (!this.permissions.includes('41') && this.Status.apiType !== 'listA') { - - MsgError("无操作权限", "确定", this); - - return; - } - let url = '/pages/common/' + pgetpe + '/index?id=' + (this.device.id ? this.device.id : 0); - - uni.navigateTo({ - url: url, - fail(ex) { - console.error(ex); - } - }); - }, + prevPage() { uni.navigateBack({ diff --git a/pages/018A/HBY018A.vue b/pages/018A/HBY018A.vue index a8a5ae1..2c38b37 100644 --- a/pages/018A/HBY018A.vue +++ b/pages/018A/HBY018A.vue @@ -93,34 +93,7 @@ - - - - - - - - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - - - - - - - - + @@ -675,31 +648,6 @@ },these); }, - proParam: function() { - - uni.navigateTo({ - url: '/pages/common/productDes/index?id=' + this.device.id, - success(ev) { - - } - }); - }, - handRemark: function() { - uni.navigateTo({ - url: '/pages/common/operatingInstruct/index?id=' + this.device.id, - success(ev) { - - } - }); - }, - handVideo: function() { - uni.navigateTo({ - url: '/pages/common/operationVideo/index?id=' + this.device.id, - success(ev) { - - } - }); - }, @@ -1071,47 +1019,7 @@ text-align: left; } - .proinfo .itemcontent { - display: flex; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - align-content: center; - justify-content: space-evenly; - } - - .proinfo .item { - width: 180rpx; - height: 180rpx; - box-sizing: border-box; - padding: 40rpx; - border-radius: 16rpx; - background: rgba(26, 26, 26, 1); - display: flex; - flex-direction: column; - flex-wrap: nowrap; - align-content: center; - justify-content: center; - align-items: center; - } - - .proinfo .item .img { - width: 50rpx; - height: 50rpx; - - - } - - .proinfo .item .txt { - color: rgba(255, 255, 255, 0.6); - font-family: PingFang SC; - font-size: 24rpx; - font-weight: 400; - margin-top: 20rpx; - letter-spacing: 0.07px; - text-align: left; - } - + .slider-container { padding: 0px; diff --git a/pages/100/HBY100.vue b/pages/100/HBY100.vue index a07fe3c..2e11bab 100644 --- a/pages/100/HBY100.vue +++ b/pages/100/HBY100.vue @@ -229,23 +229,7 @@ - - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - - - + @@ -1401,31 +1385,7 @@ onFreqChanging(e){ },these); }, - proParam: function() { - - uni.navigateTo({ - url: '/pages/common/productDes/index?id=' + this.device.id, - success(ev) { - - } - }); - }, - handRemark: function() { - uni.navigateTo({ - url: '/pages/common/operatingInstruct/index?id=' + this.device.id, - success(ev) { - - } - }); - }, - handVideo: function() { - uni.navigateTo({ - url: '/pages/common/operationVideo/index?id=' + this.device.id, - success(ev) { - - } - }); - }, + @@ -1795,46 +1755,7 @@ onFreqChanging(e){ text-align: left; } - .proinfo .itemcontent { - display: flex; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - align-content: center; - justify-content: space-evenly; - } - - .proinfo .item { - width: 180rpx; - height: 180rpx; - box-sizing: border-box; - padding: 40rpx; - border-radius: 16rpx; - background: rgba(26, 26, 26, 1); - display: flex; - flex-direction: column; - flex-wrap: nowrap; - align-content: center; - justify-content: center; - align-items: center; - } - - .proinfo .item .img { - width: 50rpx; - height: 50rpx; - - - } - - .proinfo .item .txt { - color: rgba(255, 255, 255, 0.6); - font-family: PingFang SC; - font-size: 24rpx; - font-weight: 400; - margin-top: 20rpx; - letter-spacing: 0.07px; - text-align: left; - } + .slider-container { diff --git a/pages/100J/HBY100-J.vue b/pages/100J/HBY100-J.vue index 0496367..ec3ff87 100644 --- a/pages/100J/HBY100-J.vue +++ b/pages/100J/HBY100-J.vue @@ -190,36 +190,9 @@ backgroundColor="#686767" block-size="20" block-color="#ffffffde" @change="onVolumeChanging" @changing="onVolumeChanging" class="custom-slider" /> - - 产品信息 - - - - - 产品参数 - - - - - 操作说明 - - - - - 操作视频 - - - - - + + @@ -231,7 +204,15 @@ showLoading, hideLoading, updateLoading - } from '@/utils/loading.js' + } from '@/utils/loading.js'; + import { + MsgSuccess, + MsgError, + MsgClose, + MsgWarning, + showPop, + MsgInfo + } from '@/utils/MsgPops.js'; import request, { baseURL } from '@/utils/request.js'; @@ -1460,29 +1441,7 @@ }, showBleUnConnect() {}, - proParam: function() { - uni.navigateTo({ - url: '/pages/common/productDes/index?id=' + this.deviceInfo.deviceId, - success(ev) {} - }); - }, - handRemark: function() { - uni.navigateTo({ - url: '/pages/common/operatingInstruct/index?id=' + this.deviceInfo.deviceId, - success(ev) { - - } - }); - }, - handVideo: function() { - uni.navigateTo({ - url: '/pages/common/operationVideo/index?id=' + this.deviceInfo.deviceId, - success(ev) { - - } - }); - }, - + closePop: function() { this.Status.Pop.showPop = false; @@ -1547,6 +1506,7 @@ option.buttonBgColor = '#BBE600'; } these.Status.Pop.showPop = true; + showPop(option,this); }, btnClick() { @@ -1920,44 +1880,7 @@ text-align: left; } - .proinfo .itemcontent { - display: flex; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - align-content: center; - justify-content: space-evenly; - } - - .proinfo .item { - width: 180rpx; - height: 180rpx; - box-sizing: border-box; - padding: 40rpx; - border-radius: 16rpx; - background: rgba(26, 26, 26, 1); - display: flex; - flex-direction: column; - flex-wrap: nowrap; - align-content: center; - justify-content: center; - align-items: center; - } - - .proinfo .item .img { - width: 50rpx; - height: 50rpx; - } - - .proinfo .item .txt { - color: rgba(255, 255, 255, 0.6); - font-family: PingFang SC; - font-size: 24rpx; - font-weight: 400; - margin-top: 20rpx; - letter-spacing: 0.07px; - text-align: left; - } + .slider-container { padding: 0px; diff --git a/pages/100Y/HBY100Y.vue b/pages/100Y/HBY100Y.vue new file mode 100644 index 0000000..cf619a7 --- /dev/null +++ b/pages/100Y/HBY100Y.vue @@ -0,0 +1,1213 @@ + + + + + \ No newline at end of file diff --git a/pages/102/HBY102.vue b/pages/102/HBY102.vue index 57d147c..113d0ed 100644 --- a/pages/102/HBY102.vue +++ b/pages/102/HBY102.vue @@ -148,29 +148,7 @@ - - - - - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - - - - - - + - - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - - - + @@ -2136,18 +2120,7 @@ }); }, - proDetail: function(pgetpe) { - - - let url = '/pages/common/' + pgetpe + '/index?id=' + (this.device.id ? this.device.id : 0); - - uni.navigateTo({ - url: url, - fail(ex) { - console.error(ex); - } - }); - }, + prevPage() { uni.navigateBack({ @@ -2552,47 +2525,7 @@ text-align: left; } - .proinfo .itemcontent { - display: flex; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - align-content: center; - justify-content: space-evenly; - } - - .proinfo .item { - width: 180rpx; - height: 180rpx; - box-sizing: border-box; - padding: 40rpx; - border-radius: 16rpx; - background: rgba(26, 26, 26, 1); - display: flex; - flex-direction: column; - flex-wrap: nowrap; - align-content: center; - justify-content: center; - align-items: center; - } - - .proinfo .item .img { - width: 50rpx; - height: 50rpx; - - - } - - .proinfo .item .txt { - color: rgba(255, 255, 255, 0.6); - font-family: PingFang SC; - font-size: 24rpx; - font-weight: 400; - margin-top: 20rpx; - letter-spacing: 0.07px; - text-align: left; - } - + .slider-container { padding: 0px; diff --git a/pages/6107/BJQ6107.vue b/pages/6107/BJQ6107.vue index 750fc1b..840d484 100644 --- a/pages/6107/BJQ6107.vue +++ b/pages/6107/BJQ6107.vue @@ -184,29 +184,7 @@ - - - - - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - - - - - - + - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - - - + + @@ -1861,27 +1846,7 @@ } } }, - // 操作说明 - operatingInst() { - let id = this.computedDeviceId - uni.navigateTo({ - url: `/pages/common/operatingInstruct/index?id=${id}` - }) - }, - // 产品参数 - productparams() { - let id = this.computedDeviceId - uni.navigateTo({ - url: `/pages/common/productDes/index?id=${id}` - }) - }, - // 操作视频 - operatingVideo() { - let id = this.computedDeviceId - uni.navigateTo({ - url: `/pages/common/operationVideo/index?id=${id}` - }) - }, + // 发送mqtt查询设备信息 queryDeviceStatus() { if (this.mqttClient && this.mqttClient.isConnected()) { diff --git a/pages/6331/BJQ6331.vue b/pages/6331/BJQ6331.vue index fe6ed7c..ed179ee 100644 --- a/pages/6331/BJQ6331.vue +++ b/pages/6331/BJQ6331.vue @@ -153,23 +153,7 @@ - - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - - - + - - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - - - + @@ -878,31 +862,7 @@ import request, { baseURL } from '@/utils/request.js'; this.formData.cMode = !this.formData.cMode; this.MainModeSetting(this.formData.cMode, "lamp"); }, - proParam: function() { - - uni.navigateTo({ - url: '/pages/common/productDes/index?id=' + this.device.id, - success(ev) { - - } - }); - }, - handRemark: function() { - uni.navigateTo({ - url: '/pages/common/operatingInstruct/index?id=' + this.device.id, - success(ev) { - - } - }); - }, - handVideo: function() { - uni.navigateTo({ - url: '/pages/common/operationVideo/index?id=' + this.device.id, - success(ev) { - - } - }); - }, + checkImgUpload: function(type, index) { console.log("123213213213"); let f = these.getDevice(); @@ -1961,47 +1921,7 @@ import request, { baseURL } from '@/utils/request.js'; text-align: left; } - .proinfo .itemcontent { - display: flex; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - align-content: center; - justify-content: space-evenly; - } - - .proinfo .item { - width: 180rpx; - height: 180rpx; - box-sizing: border-box; - padding: 40rpx; - border-radius: 16rpx; - background: rgba(26, 26, 26, 1); - display: flex; - flex-direction: column; - flex-wrap: nowrap; - align-content: center; - justify-content: center; - align-items: center; - } - - .proinfo .item .img { - width: 50rpx; - height: 50rpx; - - - } - - .proinfo .item .txt { - color: rgba(255, 255, 255, 0.6); - font-family: PingFang SC; - font-size: 24rpx; - font-weight: 400; - margin-top: 20rpx; - letter-spacing: 0.07px; - text-align: left; - } - + .slider-container { padding: 0px; diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue index a38d9fa..a76b342 100644 --- a/pages/670/HBY670.vue +++ b/pages/670/HBY670.vue @@ -252,23 +252,7 @@ - - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - - - + @@ -1697,26 +1681,7 @@ setTimeout(task, 0); }, - proDetail: function(type) { - if (!this.permissions.includes('41') && this.Status.apiType !== 'listA') { - - showPop({ - message: '无操作权限', - iconUrl: "/static/images/common/uploadErr.png", - borderColor: "#e034344d", - buttonBgColor: "#E03434", - okCallback: null, - buttonText: "确定" - },these) - return; - } - uni.navigateTo({ - url: '/pages/common/' + type + '/index?id=' + this.device.id, - success(ev) { - - } - }); - }, + checkImgUpload: function(type, index) { console.log("123213213213"); @@ -3031,46 +2996,7 @@ text-align: left; } - .proinfo .itemcontent { - display: flex; - display: flex; - flex-direction: row; - flex-wrap: nowrap; - align-content: center; - justify-content: space-evenly; - } - - .proinfo .item { - width: 180rpx; - height: 180rpx; - box-sizing: border-box; - padding: 40rpx; - border-radius: 16rpx; - background: rgba(26, 26, 26, 1); - display: flex; - flex-direction: column; - flex-wrap: nowrap; - align-content: center; - justify-content: center; - align-items: center; - } - - .proinfo .item .img { - width: 50rpx; - height: 50rpx; - - - } - - .proinfo .item .txt { - color: rgba(255, 255, 255, 0.6); - font-family: PingFang SC; - font-size: 24rpx; - font-weight: 400; - margin-top: 20rpx; - letter-spacing: 0.07px; - text-align: left; - } + .slider-container { diff --git a/pages/7305/BJQ7305.vue b/pages/7305/BJQ7305.vue index f6d93d5..a5f89ab 100644 --- a/pages/7305/BJQ7305.vue +++ b/pages/7305/BJQ7305.vue @@ -131,25 +131,7 @@ - - 产品信息 - - - - 产品参数 - - - - 操作说明 - - - - 操作视频 - - - - - +