时间策略优化；

src/components/TimeStrategy/TimeStrategy.vue

@@ -116,9 +116,13 @@ export default {
         if (Number(_stoptimeArr[1]) === 30) {
           _stopHalfHour++;
         }
-        while (_startHalfHour <= _stopHalfHour) {
-          _timeInfo[timeItem.week].push(_startHalfHour);
-          _startHalfHour++;
+        if (_stopHalfHour === _startHalfHour + 1) {
+          _timeInfo[timeItem.week].push(_stopHalfHour);
+        } else {
+          while (_startHalfHour < _stopHalfHour) {
+            _startHalfHour++;
+            _timeInfo[timeItem.week].push(_startHalfHour);
+          }
         }
       }
       this.timeInfo = _timeInfo;
@@ -137,12 +141,19 @@ export default {
             prevHalfHour: null
           };
           for (let index = 0; index < _dayHalfHours.length; index++) {
-            const _halfHour = _dayHalfHours[index];
+            let _halfHour = _dayHalfHours[index];
             let _bigTime = Math.floor(_halfHour / 2);
             _bigTime = _bigTime > 9 ? _bigTime : `0${_bigTime}`;
             let _time = `${_bigTime}:${_halfHour % 2 === 0 ? "00" : "30"}`;
+            let _startHalfHour = _halfHour - 1;
+            let _startBigTime = Math.floor((_halfHour - 1) / 2);
+            _startBigTime =
+              _startBigTime > 9 ? _startBigTime : `0${_startBigTime}`;
+            let _startTime = `${_startBigTime}:${
+              _startHalfHour % 2 === 0 ? "00" : "30"
+            }`;
             if (!_dayTimeInfo.starttime) {
-              _dayTimeInfo.starttime = _time;
+              _dayTimeInfo.starttime = _startTime;
               _dayTimeInfo.stoptime = _time;
               _dayTimeInfo.prevHalfHour = _halfHour;
             } else {
@@ -150,9 +161,12 @@ export default {
                 _times.push({
                   week: weekValue,
                   starttime: _dayTimeInfo.starttime,
-                  stoptime: _dayTimeInfo.stoptime
+                  stoptime:
+                    _dayTimeInfo.stoptime === "24:00"
+                      ? "23:59"
+                      : _dayTimeInfo.stoptime
                 });
-                _dayTimeInfo.starttime = _time;
+                _dayTimeInfo.starttime = _startTime;
                 _dayTimeInfo.stoptime = _time;
                 _dayTimeInfo.prevHalfHour = _halfHour;
               } else {
@@ -175,13 +189,26 @@ export default {
     },
     // 显示每个单元格标题
     getTimeTitle(weekItemLabel, halfHour) {
+      let _startTime = "";
+      let _endTime = "";
+      let _startHalfHour = parseInt((halfHour - 1) / 2);
+      _startHalfHour =
+        _startHalfHour > 9 ? _startHalfHour : `0${_startHalfHour}`;
+      let _startMinute = (halfHour - 1) % 2 === 0 ? "00" : "30";
+      if (_startHalfHour === 24 && _startMinute === "00") {
+        _startTime = "23:59";
+      } else {
+        _startTime = `${_startHalfHour}:${_startMinute}`;
+      }
       let _hour = parseInt(halfHour / 2);
       _hour = _hour > 9 ? _hour : `0${_hour}`;
       let _minute = halfHour % 2 === 0 ? "00" : "30";
       if (_hour === 24 && _minute === "00") {
-        return `${weekItemLabel} 23:59`;
+        _endTime = "23:59";
+      } else {
+        _endTime = `${_hour}:${_minute}`;
       }
-      return `${weekItemLabel} ${_hour}:${_minute}`;
+      return `${weekItemLabel} ${_startTime}-${_endTime}`;
     },
     // 设置时间策略
     toSetTimeStrategy(weekIndex, halfHour) {

src/views/schoolSection/applicationStrategy/appStrategyManage.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="main_root">
     <div class="main_left">
-      <div class="main_left_title">用户组</div>
+      <div class="main_left_title">按班级</div>
       <div class="class_list">
         <div
           :class="['class_item', !searchForm.classid ? 'selceted' : '']"
           @click="classChange(null, schoolInfo.hasst)"
           :title="schoolInfo.schoolname"
         >
-          {{ schoolInfo.schoolname }}
+          全部班级
           <Icon
             v-if="schoolInfo.hasst === 1"
             class="ivu-icon iconfont icon-ding-mianxing st_icon"

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -152,7 +152,7 @@ export default {
       searchForm: {
         name: "",
         // 是否处理：0否 1是
-        handled: -1,
+        handled: 0,
         page: 1,
         size: 10,
         list: [],

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="main_root">
     <div class="main_left">
-      <div class="main_left_title">所有设备</div>
+      <div class="main_left_title">按班级</div>
       <div class="class_list">
         <div
           :class="['class_item', !searchForm.classid ? 'selceted' : '']"
           @click="classChange(null)"
         >
-          {{ schoolInfo.schoolname }}
+          全部班级
         </div>
         <div
           :class="[

src/views/schoolSection/home/index.vue

@@ -643,21 +643,21 @@ export default {
           this.initOnlineEcharts({
             domId: "onlineEcharts1",
             onlineNum: this.onlineDeviceList[0].num,
-            onlineTatalNum: this.onlineDeviceList[0].tatalnum,
+            onlineTatalNum: this.onlineDeviceList[0].tatalnum || 1,
             onlineColor: ["#ABD5FF", "#339CFF", "#E2EEFE"],
             subtext: "最近1小时"
           });
           this.initOnlineEcharts({
             domId: "onlineEcharts2",
             onlineNum: this.onlineDeviceList[1].num,
-            onlineTatalNum: this.onlineDeviceList[1].tatalnum,
+            onlineTatalNum: this.onlineDeviceList[1].tatalnum || 1,
             onlineColor: ["#D3F6C1", "#52C41A", "#E9FFDE"],
             subtext: "最近48小时"
           });
           this.initOnlineEcharts({
             domId: "onlineEcharts3",
             onlineNum: this.onlineDeviceList[2].num,
-            onlineTatalNum: this.onlineDeviceList[2].tatalnum,
+            onlineTatalNum: this.onlineDeviceList[2].tatalnum || 1,
             onlineColor: ["#FCC9E3", "#ED4A99", "#FFE0EF"],
             subtext: "最近7天"
           });