|
@@ -16,7 +16,7 @@
|
|
|
<input
|
|
|
type="text"
|
|
|
placeholder="输入设备全称或简称"
|
|
|
- v-model="keyword"
|
|
|
+ v-model="keyWord"
|
|
|
placeholder-class="placeholder-style"
|
|
|
/>
|
|
|
</view>
|
|
@@ -69,7 +69,7 @@ import common from "../../utils/common.js";
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
- keyword: "",
|
|
|
+ keyWord: "",
|
|
|
option: ["全部", "在线", "离线", "报警"],
|
|
|
selectValue: 0,
|
|
|
devs: [],
|
|
@@ -149,7 +149,7 @@ export default {
|
|
|
this.$http
|
|
|
.post("wap/device/deviceList", {
|
|
|
userId: uni.getStorageSync("userId"),
|
|
|
- keyword: this.keyword,
|
|
|
+ keyWord: this.keyWord,
|
|
|
status: status,
|
|
|
})
|
|
|
.then((res) => {
|
|
@@ -164,18 +164,22 @@ export default {
|
|
|
} else {
|
|
|
devs[i].wcTimes = 0;
|
|
|
}
|
|
|
- const signalTimeStr = devs[i].lastTargetTime;
|
|
|
+ const signalTimeStr = devs[
|
|
|
+ i
|
|
|
+ ].lastTargetTime.replace(/-/g, "/");
|
|
|
const signalTime = new Date(
|
|
|
signalTimeStr
|
|
|
).getTime();
|
|
|
- const currentTime = Date.now();
|
|
|
- const diff = Math.abs(currentTime - signalTime);
|
|
|
- if (diff <= 10000) {
|
|
|
- devs[i].judge = true;
|
|
|
+
|
|
|
+ if (isNaN(signalTime)) {
|
|
|
+ devs[i].judge = false;
|
|
|
+ } else {
|
|
|
+ const currentTime = Date.now();
|
|
|
+ const diff = Math.abs(currentTime - signalTime);
|
|
|
+ devs[i].judge = diff <= 10000; // 10秒内为 true
|
|
|
}
|
|
|
- console.log(signalTime, diff);
|
|
|
- devs[i].signal_time = common.timestampToTime(
|
|
|
- devs[i].signal_time,
|
|
|
+ devs[i].signalTime = common.timestampToTime(
|
|
|
+ devs[i].signalTime,
|
|
|
6
|
|
|
);
|
|
|
}
|