学校应用策略

src/components/TimeStrategy/TimeStrategy.vue

@@ -135,9 +135,9 @@ export default {
           };
           for (let index = 0; index < _dayHalfHours.length; index++) {
             const _halfHour = _dayHalfHours[index];
-            let _time = `${Math.floor(_halfHour / 2)}:${
-              _halfHour % 2 === 0 ? "00" : "30"
-            }`;
+            let _bigTime = Math.floor(_halfHour / 2);
+            _bigTime = _bigTime > 9 ? _bigTime : `0${_bigTime}`;
+            let _time = `${_bigTime}:${_halfHour % 2 === 0 ? "00" : "30"}`;
             if (!_dayTimeInfo.starttime) {
               _dayTimeInfo.starttime = _time;
               _dayTimeInfo.stoptime = _time;
@@ -282,11 +282,11 @@ export default {
             let _yIndex =
               timeInfo.weekIndex - _mouseInfo.weekIndex >= 0
                 ? _mouseInfo.weekIndex + y
-                : _mouseInfo.weekIndex - y;
+                : timeInfo.weekIndex + y;
             let _xHalfHour =
               timeInfo.halfHour - _mouseInfo.halfHour >= 0
                 ? _mouseInfo.halfHour + x
-                : _mouseInfo.halfHour - x;
+                : timeInfo.halfHour + x;
             this.toSetTimeStrategy(_yIndex, _xHalfHour);
           }
         }

src/views/schoolSection/applicationStrategy/appStrategyTemplateAdd.vue

@@ -71,10 +71,10 @@
         <tr>
           <th colspan="7">
             <div class="table_header">
-              <div class="table_header_title">应用策略列表</div>
+              <div class="table_header_title">应用策略{{ groupIndex + 1 }}</div>
               <div class="table_header_action">
-                <div>编辑</div>
-                <div class="del">删除</div>
+                <div @click="toEditeGroupItem(groupItem, groupIndex)">编辑</div>
+                <div class="del" @click="toDelGroupItem(groupIndex)">删除</div>
               </div>
             </div>
           </th>
@@ -84,17 +84,35 @@
             {{ weekItem.label }}
           </td>
         </tr>
+        <tr>
+          <td v-for="weekItem in weekDay" :key="weekItem.value">
+            <div class="time_list">
+              <span
+                v-for="(timeItem, timeIndex) in appStrategyGroupInfo[
+                  groupIndex
+                ][weekItem.value]"
+                :key="timeIndex"
+                >{{ timeItem.starttime }} - {{ timeItem.stoptime }}</span
+              >
+            </div>
+          </td>
+        </tr>
         <tr>
           <td colspan="7">
             <div class="table_app_list">
               <div
                 class="table_app_item"
-                v-for="appItem in groupItem.apps"
-                :key="appItem.appid"
+                v-for="appid in groupItem.apps"
+                :key="appid"
               >
-                <div class="app_top"></div>
+                <div class="app_top">
+                  <img
+                    v-if="appsInfo[appid]"
+                    :src="$api.showImageUrl + appsInfo[appid].appIcon"
+                  />
+                </div>
                 <div class="app_name">
-                  {{ appsInfo[appItem.appid].appName }}
+                  {{ appsInfo[appid] && appsInfo[appid].appName }}
                 </div>
               </div>
             </div>
@@ -153,9 +171,37 @@ export default {
         info[item.appid] = item;
       });
       return info;
+    },
+    appStrategyGroupInfo() {
+      let info = [];
+      this.appStrategyInfo.groups.forEach((groupItem) => {
+        let groupTimes = {};
+        groupItem.times.forEach((timeItem) => {
+          if (!groupTimes[timeItem.week]) {
+            groupTimes[timeItem.week] = [];
+          }
+          groupTimes[timeItem.week].push(timeItem);
+        });
+        info.push(groupTimes);
+      });
+      return info;
     }
   },
   methods: {
+    toEditeGroupItem(groupItem, groupIndex) {
+      this.tempStrategyInfo = JSON.parse(JSON.stringify(groupItem));
+      this.appStrategyInfo.groups.splice(groupIndex, 1);
+    },
+    toDelGroupItem(groupIndex) {
+      this.$Modal.confirm({
+        title: "提示",
+        content: "您确定删除选中数据吗？",
+        onOk: () => {
+          this.appStrategyInfo.groups.splice(groupIndex, 1);
+        },
+        onCancel: () => {}
+      });
+    },
     appAllCheckChange(selected) {
       if (selected) {
         this.tempStrategyInfo.apps = this.appList.map(
@@ -207,6 +253,7 @@ export default {
         return;
       }
       this.appStrategyInfo.groups.push(_tempStrategyInfo);
+      this.toResetStrategy();
     }
   }
 };
@@ -378,13 +425,24 @@ export default {
         cursor: pointer;
         &:hover {
           color: #339dff;
-        }
-        &.del {
-          color: #f0153f;
+          &.del {
+            color: #f0153f;
+          }
         }
       }
     }
   }
+  .time_list {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-wrap: wrap;
+    > span {
+      margin: 4px 6px;
+      line-height: 1;
+      white-space: nowrap;
+    }
+  }
   .table_app_list {
     display: flex;
     justify-content: flex-start;
@@ -393,18 +451,25 @@ export default {
     .table_app_item {
       margin: 10px;
       .app_top {
+        display: flex;
+        justify-content: center;
+        align-items: center;
         margin: 0 auto;
         width: 56px;
         height: 56px;
         border-radius: 6px;
         border: 1px solid #e5e5e5;
         background: #ffffff;
+        img {
+          width: 38px;
+          height: 38px;
+        }
       }
       .app_name {
         margin-top: 10px;
         max-width: 100px;
         line-height: 1;
-        font-size: 14px;
+        font-size: 12px;
         text-align: center;
         overflow: hidden;
         text-overflow: ellipsis;