Merge remote-tracking branch 'origin/master'

pages/maintain/maintain.vue

@@ -107,41 +107,6 @@ export default {
     this.filter = options.filter
     this.searchType = options.searchType
     this.timeFlag = options.timeFlag
-
-    if (uni.getStorageSync('check-job-start-' + this.sbId)) {
-      this.startFlag = true
-      var oldTime = uni.getStorageSync('check-job-start-' + this.sbId)
-      // 设置计时：
-      var hour, minute, second // 时 分 秒
-      hour = minute = second = 0 // 初始化
-      var millisecond = 0 // 毫秒
-
-      var ms = Math.abs(new Date() - new Date(oldTime))
-      // 两个日期相减得到毫秒数  1s=1000ms
-      var s = ms / 1000 // 毫秒转为秒
-      console.log(s)
-      hour = Math.floor(s / 3600) // 小时
-      minute = Math.floor((s % 3600) / 60) // 分
-      second = Math.floor(s % 60) // 秒
-      console.log(hour, minute, second)
-      this.timer = setInterval(() => {
-        millisecond = millisecond + 50
-        if (millisecond >= 1000) {
-          millisecond = 0
-          second = second + 1
-        }
-        if (second >= 60) {
-          second = 0
-          minute = minute + 1
-        }
-        if (minute >= 60) {
-          minute = 0
-          hour = hour + 1
-        }
-        // console.log("-------"+hour+'时'+minute+'分'+second+'秒');
-        this.nums = hour + '时' + minute + '分' + second + '秒'
-      }, 50)
-    }
     this.periodMap = this.$DictCache.getLabelByValueMapByType(this.$DictCache.TYPE.CHECK_PLAN_PERIOD_TYPE)
     this.statusMap = this.$DictCache.getLabelByValueMapByType(this.$DictCache.TYPE.CHECK_JOB_STATUS)
     this.sbStatusMap = this.$DictCache.getLabelByValueMapByType(this.$DictCache.TYPE.CHECK_JOB_SB_STATUS)
@@ -149,6 +114,8 @@ export default {
     this.dict = this.$DictCache.COLOR.CHECK_JOB_STATUS
   },
   onShow() {
+    this.page = 1
+    this.loadMore = true
     this.listData = []
     this.initData()
   },