学校应用策略

src/views/platformSection/deviceImport/deviceImport.vue

@@ -279,6 +279,17 @@ export default {
           width: 190,
           align: "center"
         },
+        {
+          title: "操作人",
+          key: "updatename",
+          align: "center"
+        },
+        {
+          title: "操作时间",
+          key: "updatetime",
+          width: 190,
+          align: "center"
+        },
         {
           title: "操作",
           slot: "actionSlot",

src/views/schoolSection/applicationStrategy/appStrategyManageEdit.vue

@@ -39,25 +39,27 @@
           </div>
         </div>
         <div class="app_list">
-          <div
-            class="app_item"
-            :title="appItem.appName"
-            v-for="appItem in appList"
-            :key="appItem.appid"
-            @click="toSelectApp(appItem.appid)"
-          >
-            <div class="app_item_top">
-              <img :src="$api.showImageUrl + appItem.appIcon" />
-            </div>
-            <div class="app_item_name">
-              {{ appItem.appName }}
-            </div>
-            <div class="app_item_check">
-              <Checkbox
-                :value="tempStrategyInfo.apps.includes(appItem.appid)"
-              ></Checkbox>
+          <template v-for="appItem in appList">
+            <div
+              class="app_item"
+              :title="appItem.appName"
+              :key="appItem.appid"
+              v-if="!appStrategyGroupsSelected.includes(appItem.appid)"
+              @click="toSelectApp(appItem.appid)"
+            >
+              <div class="app_item_top">
+                <img :src="$api.showImageUrl + appItem.appIcon" />
+              </div>
+              <div class="app_item_name">
+                {{ appItem.appName }}
+              </div>
+              <div class="app_item_check">
+                <Checkbox
+                  :value="tempStrategyInfo.apps.includes(appItem.appid)"
+                ></Checkbox>
+              </div>
             </div>
-          </div>
+          </template>
         </div>
       </div>
     </div>
@@ -143,6 +145,7 @@ export default {
   data() {
     return {
       weekDay,
+      // 已选的需要隐藏
       appList: [],
       // 应用策略信息
       appStrategyInfo: {
@@ -197,6 +200,14 @@ export default {
         info.push(groupTimes);
       });
       return info;
+    },
+    // 分组已选Appid数组
+    appStrategyGroupsSelected() {
+      let info = [];
+      this.appStrategyInfo.groups.forEach((groupItem) => {
+        info.push(...groupItem.apps);
+      });
+      return info;
     }
   },
   methods: {

src/views/schoolSection/applicationStrategy/appStrategyTemplateAdd.vue

@@ -39,25 +39,27 @@
           </div>
         </div>
         <div class="app_list">
-          <div
-            class="app_item"
-            :title="appItem.appName"
-            v-for="appItem in appList"
-            :key="appItem.appid"
-            @click="toSelectApp(appItem.appid)"
-          >
-            <div class="app_item_top">
-              <img :src="$api.showImageUrl + appItem.appIcon" />
-            </div>
-            <div class="app_item_name">
-              {{ appItem.appName }}
-            </div>
-            <div class="app_item_check">
-              <Checkbox
-                :value="tempStrategyInfo.apps.includes(appItem.appid)"
-              ></Checkbox>
+          <template v-for="appItem in appList">
+            <div
+              class="app_item"
+              :title="appItem.appName"
+              :key="appItem.appid"
+              v-if="!appStrategyGroupsSelected.includes(appItem.appid)"
+              @click="toSelectApp(appItem.appid)"
+            >
+              <div class="app_item_top">
+                <img :src="$api.showImageUrl + appItem.appIcon" />
+              </div>
+              <div class="app_item_name">
+                {{ appItem.appName }}
+              </div>
+              <div class="app_item_check">
+                <Checkbox
+                  :value="tempStrategyInfo.apps.includes(appItem.appid)"
+                ></Checkbox>
+              </div>
             </div>
-          </div>
+          </template>
         </div>
       </div>
     </div>
@@ -143,6 +145,7 @@ export default {
   data() {
     return {
       weekDay,
+      // 已选的需要隐藏
       appList: [],
       // 应用策略信息
       appStrategyInfo: {
@@ -194,6 +197,14 @@ export default {
         info.push(groupTimes);
       });
       return info;
+    },
+    // 分组已选Appid数组
+    appStrategyGroupsSelected() {
+      let info = [];
+      this.appStrategyInfo.groups.forEach((groupItem) => {
+        info.push(...groupItem.apps);
+      });
+      return info;
     }
   },
   methods: {

src/views/schoolSection/applicationStrategy/appStrategyTemplateEdit.vue

@@ -39,25 +39,27 @@
           </div>
         </div>
         <div class="app_list">
-          <div
-            class="app_item"
-            :title="appItem.appName"
-            v-for="appItem in appList"
-            :key="appItem.appid"
-            @click="toSelectApp(appItem.appid)"
-          >
-            <div class="app_item_top">
-              <img :src="$api.showImageUrl + appItem.appIcon" />
-            </div>
-            <div class="app_item_name">
-              {{ appItem.appName }}
-            </div>
-            <div class="app_item_check">
-              <Checkbox
-                :value="tempStrategyInfo.apps.includes(appItem.appid)"
-              ></Checkbox>
+          <template v-for="appItem in appList">
+            <div
+              class="app_item"
+              :title="appItem.appName"
+              :key="appItem.appid"
+              v-if="!appStrategyGroupsSelected.includes(appItem.appid)"
+              @click="toSelectApp(appItem.appid)"
+            >
+              <div class="app_item_top">
+                <img :src="$api.showImageUrl + appItem.appIcon" />
+              </div>
+              <div class="app_item_name">
+                {{ appItem.appName }}
+              </div>
+              <div class="app_item_check">
+                <Checkbox
+                  :value="tempStrategyInfo.apps.includes(appItem.appid)"
+                ></Checkbox>
+              </div>
             </div>
-          </div>
+          </template>
         </div>
       </div>
     </div>
@@ -143,6 +145,7 @@ export default {
   data() {
     return {
       weekDay,
+      // 已选的需要隐藏
       appList: [],
       // 应用策略信息
       appStrategyInfo: {
@@ -197,6 +200,14 @@ export default {
         info.push(groupTimes);
       });
       return info;
+    },
+    // 分组已选Appid数组
+    appStrategyGroupsSelected() {
+      let info = [];
+      this.appStrategyInfo.groups.forEach((groupItem) => {
+        info.push(...groupItem.apps);
+      });
+      return info;
     }
   },
   methods: {