优化处理时间方法

src/main.js

@@ -13,6 +13,39 @@ Vue.component('alarModel', alarModel);
 Vue.component('tenMinutes', tenMinutes);
 
 Vue.prototype.$http = http;
+
+// 挂载处理时间的方法
+function timestampToTime(value, type = 0) {
+    var time = new Date(value);
+    var year = time.getFullYear();
+    var month = time.getMonth() + 1;
+    var date = time.getDate();
+    var hour = time.getHours();
+    var minute = time.getMinutes();
+    var second = time.getSeconds();
+
+    // 补零
+    month = month < 10 ? "0" + month : month;
+    date = date < 10 ? "0" + date : date;
+    hour = hour < 10 ? "0" + hour : hour;
+    minute = minute < 10 ? "0" + minute : minute;
+    second = second < 10 ? "0" + second : second;
+
+    var arr = [
+        year + "-" + month + "-" + date,
+        year + "-" + month + "-" + date + " " + hour + ":" + minute + ":" + second,
+        year + "年" + month + "月" + date + "日",
+        year + "年" + month + "月" + date + " " + hour + ":" + minute + ":" + second,
+        hour + ":" + minute + ":" + second,
+        year + "-" + month + "-" + date + " " + hour + ":" + minute,
+        month + "月" + date + "日" + hour + ":" + minute,
+    ]
+    return arr[type];
+}
+
+Vue.prototype.$time = timestampToTime;
+
+
 Vue.config.productionTip = false;
 if (__wxConfig.envVersion == 'develop') {
     Vue.prototype.uploadimg = 'https://api.radar-power.asia:4443';

src/pagesA/OTA/OTA.vue

@@ -74,7 +74,6 @@
 </template>
 
 <script>
-import common from "../../utils/common.js";
 export default {
     data() {
         return {
@@ -111,12 +110,6 @@ export default {
                             }
                             const signalTime = devs[i].signal_time;
                             const currentTime = Date.now();
-                            const diff = Math.abs(currentTime - signalTime);
-                            devs[i].judge = diff <= 10000;
-                            devs[i].signal_time = common.timestampToTime(
-                                devs[i].signal_time,
-                                6
-                            );
                         }
                         this.devs = devs;
                         this.devsClientId = this.devs.map(

src/pagesA/deviceDetail/deviceDetail.vue

@@ -608,21 +608,20 @@ export default {
         },
         getFrequency(devId) {
             let now = new Date();
-            let startDate = this.timestampToTime(
+            let startDate = this.$time(
                 new Date(
                     now.getFullYear(),
                     now.getMonth(),
                     now.getDate() - 1
                 ).getTime()
             );
-            let endDate = this.timestampToTime(
+            let endDate = this.$time(
                 new Date(
                     now.getFullYear(),
                     now.getMonth(),
                     now.getDate()
                 ).getTime()
             );
-
             this.$http
                 .post(`wap/device/getUsedInfo`, {
                     devId: devId,
@@ -679,50 +678,50 @@ export default {
             });
         },
         // 循环播放进出
-        timestampToTime(value, type = 0) {
-            var time = new Date(value);
-            var year = time.getFullYear();
-            var month = time.getMonth() + 1;
-            var date = time.getDate();
-            var hour = time.getHours();
-            var minute = time.getMinutes();
-            var second = time.getSeconds();
-            month = month < 10 ? "0" + month : month;
-            date = date < 10 ? "0" + date : date;
-            hour = hour < 10 ? "0" + hour : hour;
-            minute = minute < 10 ? "0" + minute : minute;
-            second = second < 10 ? "0" + second : second;
-            var arr = [
-                year + "-" + month + "-" + date,
-                year +
-                    "-" +
-                    month +
-                    "-" +
-                    date +
-                    " " +
-                    hour +
-                    ":" +
-                    minute +
-                    ":" +
-                    second,
-                year + "年" + month + "月" + date + "日",
-                year +
-                    "年" +
-                    month +
-                    "月" +
-                    date +
-                    " " +
-                    hour +
-                    ":" +
-                    minute +
-                    ":" +
-                    second,
-                hour + ":" + minute + ":" + second,
-                year + "-" + month + "-" + date + " " + hour + ":" + minute,
-                month + "月" + date + "日" + hour + ":" + minute,
-            ];
-            return arr[type];
-        },
+        // timestampToTime(value, type = 0) {
+        //     var time = new Date(value);
+        //     var year = time.getFullYear();
+        //     var month = time.getMonth() + 1;
+        //     var date = time.getDate();
+        //     var hour = time.getHours();
+        //     var minute = time.getMinutes();
+        //     var second = time.getSeconds();
+        //     month = month < 10 ? "0" + month : month;
+        //     date = date < 10 ? "0" + date : date;
+        //     hour = hour < 10 ? "0" + hour : hour;
+        //     minute = minute < 10 ? "0" + minute : minute;
+        //     second = second < 10 ? "0" + second : second;
+        //     var arr = [
+        //         year + "-" + month + "-" + date,
+        //         year +
+        //             "-" +
+        //             month +
+        //             "-" +
+        //             date +
+        //             " " +
+        //             hour +
+        //             ":" +
+        //             minute +
+        //             ":" +
+        //             second,
+        //         year + "年" + month + "月" + date + "日",
+        //         year +
+        //             "年" +
+        //             month +
+        //             "月" +
+        //             date +
+        //             " " +
+        //             hour +
+        //             ":" +
+        //             minute +
+        //             ":" +
+        //             second,
+        //         hour + ":" + minute + ":" + second,
+        //         year + "-" + month + "-" + date + " " + hour + ":" + minute,
+        //         month + "月" + date + "日" + hour + ":" + minute,
+        //     ];
+        //     return arr[type];
+        // },
         onSwiperChange(event) {
             const current = event.detail.current;
             const totalItems = this.endArr.length;

src/pagesA/devices/devices.vue

@@ -65,8 +65,6 @@
 </template>
 
 <script>
-import common from "../../utils/common.js";
-
 export default {
     data() {
         return {
@@ -156,10 +154,6 @@ export default {
                                     devs[i].judge = diff <= 5000; // 10秒内为 true
                                 }
                             }
-                            // devs[i].signalTime = common.timestampToTime(
-                            //     devs[i].signalTime,
-                            //     6
-                            // );
                         }
                         this.devs = devs;
                     }

src/utils/common.js

@@ -1,27 +0,0 @@
-function timestampToTime(value, type = 0) {
-    var time = new Date(value);
-    var year = time.getFullYear();
-    var month = time.getMonth() + 1;
-    var date = time.getDate();
-    var hour = time.getHours();
-    var minute = time.getMinutes();
-    var second = time.getSeconds();
-    month = month < 10 ? "0" + month : month;
-    date = date < 10 ? "0" + date : date;
-    hour = hour < 10 ? "0" + hour : hour;
-    minute = minute < 10 ? "0" + minute : minute;
-    second = second < 10 ? "0" + second : second;
-    var arr = [
-        year + "-" + month + "-" + date,
-        year + "-" + month + "-" + date + " " + hour + ":" + minute + ":" + second,
-        year + "年" + month + "月" + date + "日",
-        year + "年" + month + "月" + date + " " + hour + ":" + minute + ":" + second,
-        hour + ":" + minute + ":" + second,
-        year + "-" + month + "-" + date + " " + hour + ":" + minute,
-        month + "月" + date + "日" + hour + ":" + minute,
-    ]
-    return arr[type];
-}
-export default {
-    timestampToTime: timestampToTime,
-}