diff --git a/pages.json b/pages.json
index 9289587..886b888 100644
--- a/pages.json
+++ b/pages.json
@@ -459,6 +459,13 @@
"style": {
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "pages/210/HBY210",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "HBY210"
+ }
}
],
diff --git a/pages/100J/HBY100-J.vue b/pages/100J/HBY100-J.vue
index ec3ff87..d9d23ac 100644
--- a/pages/100J/HBY100-J.vue
+++ b/pages/100J/HBY100-J.vue
@@ -58,6 +58,11 @@
{{ deviceInfo.onlineStatus === 0 ? '离线': '在线' }}
+
+ 充电状态
+ {{ deviceInfo.chargingStatus === 0 ? '未充电': '充电中' }}
+
定位信息
@@ -192,6 +197,16 @@
+
+
+
@@ -1506,7 +1521,7 @@
option.buttonBgColor = '#BBE600';
}
these.Status.Pop.showPop = true;
- showPop(option,this);
+
},
btnClick() {
diff --git a/pages/210/HBY210.vue b/pages/210/HBY210.vue
index 9b725c6..10c07f6 100644
--- a/pages/210/HBY210.vue
+++ b/pages/210/HBY210.vue
@@ -1,750 +1,671 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{formData.battary}}%
+ 电量
+
+
+
+
+
+ {{formData.xuhang}}
+ 续航时间
+
+
+
-
-
-
+
+
+ 设备名称
+ {{device.deviceName}}
+
+
+ 设备IMEI
+ {{device.deviceImei}}
+
-
-
-
-
-
-
-
-
-
-
- {{deviceInfo.batteryPercentage}}%
- 电量
-
-
-
-
-
- {{deviceInfo.batteryRemainingTime}}分钟
- 续航时间
-
-
-
-
-
-
-
-
-
-
- 设备状态
- 运行中
-
-
- 联机状态
- 联机
-
-
- 定位信息
-
- 114.72 30.28
-
-
- 深圳市龙华区富源晟
-
-
-
-
-
-
-
-
-
- {{ item }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
- {{ item.subTitle }}
-
-
-
-
-
-
-
-
-
- 人员信息登记
-
-
-
-
-
-
-
- 单位：
-
-
-
- 姓名：
-
-
-
- 职位：
-
-
-
- ID：
-
-
-
-
-
-
-
- 发送信息
-
-
-
-
-
-
-
-
-
-
+
+ Mac地址
+ {{device.deviceMac}}
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/210/HBY210Old.vue b/pages/210/HBY210Old.vue
new file mode 100644
index 0000000..1177a37
--- /dev/null
+++ b/pages/210/HBY210Old.vue
@@ -0,0 +1,1528 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{deviceInfo.batteryPercentage}}%
+ 电量
+
+
+
+
+
+ {{deviceInfo.batteryRemainingTime}}分钟
+ 续航时间
+
+
+
+
+
+
+
+
+
+
+ 设备状态
+ 运行中
+
+
+ 联机状态
+ 联机
+
+
+ 定位信息
+
+ 114.72 30.28
+
+
+ 深圳市龙华区富源晟
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+ {{ item.subTitle }}
+
+
+
+
+
+
+
+
+
+ 人员信息登记
+
+
+
+
+
+
+
+ 单位：
+
+
+
+ 姓名：
+
+
+
+ 职位：
+
+
+
+ ID：
+
+
+
+
+
+
+
+ 发送信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/utils/BleReceive.js b/utils/BleReceive.js
index c68768a..2e6ae17 100644
--- a/utils/BleReceive.js
+++ b/utils/BleReceive.js
@@ -27,7 +27,8 @@ class BleReceive {
'/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/6075J/BJQ6075J': this.Receive_6075.bind(this)
+ '/pages/6075J/BJQ6075J': this.Receive_6075.bind(this),
+ '/pages/210/HBY210':this.Receive_210.bind(this),
};
}
@@ -970,6 +971,34 @@ class BleReceive {
return receiveData;
}
+ Receive_210(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 && this.ref) {
+ if (receiveData.sta_PowerPercent <= 20 && (receiveData.sta_system != 3 || receiveData.sta_system !=1)) {
+
+ MsgError("设备'" + f.device.deviceName + "'电量低", '', this.ref, () => {
+ MsgClear(this.ref);
+ });
+
+ }
+ }
+
+ } catch (error) {
+ receiveData = {};
+ console.log("文本解析失败", error)
+ }
+ return receiveData;
+
+ }
}