|
|
@@ -91,9 +91,6 @@ export default {
|
|
|
"/pagesA/deviceDetail/deviceDetail?devItem=" +
|
|
|
JSON.stringify(item),
|
|
|
});
|
|
|
- // uni.reLaunch({
|
|
|
- // url: "/pagesA/roomSetting/roomSetting?devId=" + item.devId,
|
|
|
- // });
|
|
|
},
|
|
|
forMateTime(inputTime) {
|
|
|
if (!inputTime) return "";
|
|
|
@@ -167,16 +164,23 @@ export default {
|
|
|
} else {
|
|
|
devs[i].wcTimes = 0;
|
|
|
}
|
|
|
- const signalTime = devs[i].signal_time;
|
|
|
+ const signalTimeStr = devs[i].lastTargetTime;
|
|
|
+ const signalTime = new Date(
|
|
|
+ signalTimeStr
|
|
|
+ ).getTime();
|
|
|
const currentTime = Date.now();
|
|
|
const diff = Math.abs(currentTime - signalTime);
|
|
|
- devs[i].judge = diff <= 10000;
|
|
|
+ if (diff <= 10000) {
|
|
|
+ devs[i].judge = true;
|
|
|
+ }
|
|
|
+ console.log(signalTime, diff);
|
|
|
devs[i].signal_time = common.timestampToTime(
|
|
|
devs[i].signal_time,
|
|
|
6
|
|
|
);
|
|
|
}
|
|
|
this.devs = devs;
|
|
|
+ console.log(this.devs, 99999);
|
|
|
} else {
|
|
|
uni.showModal({
|
|
|
content: res.data.message,
|
