Merge remote-tracking branch 'origin/gzb' into wzl

src/views/schoolSection/strategy/publicStrategy.vue

@@ -46,13 +46,9 @@
         <div
           class="strategy_bottom"
           style="min-height: 160px"
-          v-if="strategyInfo.padApps.length > 0"
+          v-if="padApps.length > 0"
         >
-          <div
-            class="app_list"
-            v-for="item in strategyInfo.padApps"
-            :key="item.appid"
-          >
+          <div class="app_list" v-for="item in padApps" :key="item.appid">
             <img :src="$api.baseImageUrl + item.appIcon" />
             <div>{{ item.appName }}</div>
             <Checkbox
@@ -79,11 +75,7 @@
           <span>设备功能管理</span>
         </div>
         <div class="strategy_bottom" style="min-height: 160px">
-          <div
-            class="device_list"
-            v-for="item in strategyInfo.padDevices"
-            :key="item.id"
-          >
+          <div class="device_list" v-for="item in padDevices" :key="item.id">
             <div class="icon">
               <span :class="[item.icon]"></span>
             </div>
@@ -165,7 +157,7 @@
         v-if="strategyInfo.hasviolate"
         class="table"
         :columns="columns"
-        :data="strategyInfo.padViolates"
+        :data="padViolates"
       >
         <template slot-scope="{ row }" slot="violationEvents">
           <Checkbox
@@ -224,10 +216,11 @@ import {
   stApp_add,
   stApp_detail_obj,
   stApp_edit,
-  stPad_add, stPad_detail_obj,
+  stPad_add,
+  stPad_detail_obj,
   stPad_edit
 } from "@/api/stPad";
-import { app_list } from "@/api/appgroup";
+import { app_list, app_list_sel } from "@/api/appgroup";
 import TimeStrategy from "@/components/TimeStrategy/TimeStrategy";
 export default {
   components: {
@@ -244,98 +237,101 @@ export default {
         hasapp: true, //是否开启应用策略：0否 1是
         padApps: [], //appid集合
         hasdevice: true, //是否开启设备策略：0否 1是
-        padDevices: [
-          {
-            id: 1,
-            title: "摄像头",
-            enabled: 2,
-            icon: "ivu-icon iconfont icon-ball-camera"
-          },
-          {
-            id: 2,
-            title: "蓝牙",
-            enabled: 2,
-            icon: "ivu-icon iconfont icon-lanya"
-          },
-          {
-            id: 3,
-            title: "USB连接",
-            enabled: 2,
-            icon: "ivu-icon iconfont icon-USB"
-          },
-          {
-            id: 4,
-            title: "Wi-Fi开关",
-            enabled: 2,
-            icon: "ivu-icon iconfont icon-bx-wifi-2"
-          },
-          {
-            id: 5,
-            title: "电话短信",
-            enabled: 2,
-            icon: "ivu-icon iconfont icon-dianhuaduanxin_line"
-          },
-          {
-            id: 6,
-            title: "数据流量",
-            enabled: 2,
-            icon: "ivu-icon iconfont icon-liuliang"
-          },
-          {
-            id: 7,
-            title: "GPS",
-            enabled: 2,
-            icon: "ivu-icon iconfont icon-GPSxinxi"
-          },
-          {
-            id: 8,
-            title: "Wi-Fi高级选项",
-            enabled: 2,
-            icon: "ivu-icon iconfont icon-wifiguanbi"
-          },
-          {
-            id: 9,
-            title: "SD卡",
-            enabled: 2,
-            icon: "ivu-icon iconfont icon-sdka-09"
-          },
-          {
-            id: 10,
-            title: "SD卡",
-            enabled: 2,
-            icon: "ivu-icon iconfont icon-icon-OTG"
-          }
-        ], //授权应用
+        padDevices: [], //授权应用
         haswifi: true, //是否开启wifi白名单策略：0否 1是
         padWifis: ["xhkjedu"], //wifi白名单
         hasviolate: true, //是否开启违规通知：0否 1是
-        padViolates: [
-          {
-            title: "已ROOT",
-            violateType: 1,
-            checked: true,
-            handleMethod: ["通知管理员", "限制使用"]
-          },
-          {
-            title: "安装非商店应用",
-            violateType: 2,
-            checked: false,
-            handleMethod: []
-          },
-          {
-            title: "更换SIM卡",
-            violateType: 3,
-            checked: false,
-            handleMethod: []
-          },
-          {
-            title: "USB连接电脑",
-            violateType: 4,
-            checked: false,
-            handleMethod: []
-          }
-        ] //设备违规
+        padViolates: [] //设备违规
       },
+      padApps: [],
+      padDevices: [
+        {
+          id: 1,
+          title: "摄像头",
+          enabled: 2,
+          icon: "ivu-icon iconfont icon-ball-camera"
+        },
+        {
+          id: 2,
+          title: "蓝牙",
+          enabled: 2,
+          icon: "ivu-icon iconfont icon-lanya"
+        },
+        {
+          id: 3,
+          title: "USB连接",
+          enabled: 2,
+          icon: "ivu-icon iconfont icon-USB"
+        },
+        {
+          id: 4,
+          title: "Wi-Fi开关",
+          enabled: 2,
+          icon: "ivu-icon iconfont icon-bx-wifi-2"
+        },
+        {
+          id: 5,
+          title: "电话短信",
+          enabled: 2,
+          icon: "ivu-icon iconfont icon-dianhuaduanxin_line"
+        },
+        {
+          id: 6,
+          title: "数据流量",
+          enabled: 2,
+          icon: "ivu-icon iconfont icon-liuliang"
+        },
+        {
+          id: 7,
+          title: "GPS",
+          enabled: 2,
+          icon: "ivu-icon iconfont icon-GPSxinxi"
+        },
+        {
+          id: 8,
+          title: "Wi-Fi高级选项",
+          enabled: 2,
+          icon: "ivu-icon iconfont icon-wifiguanbi"
+        },
+        {
+          id: 9,
+          title: "SD卡",
+          enabled: 2,
+          icon: "ivu-icon iconfont icon-sdka-09"
+        },
+        {
+          id: 10,
+          title: "SD卡",
+          enabled: 2,
+          icon: "ivu-icon iconfont icon-icon-OTG"
+        }
+      ],
+      padViolates: [
+        {
+          title: "已ROOT",
+          violateType: 1,
+          checked: true,
+          handleMethod: ["通知管理员", "限制使用"]
+        },
+        {
+          title: "安装非商店应用",
+          violateType: 2,
+          checked: false,
+          handleMethod: []
+        },
+        {
+          title: "更换SIM卡",
+          violateType: 3,
+          checked: false,
+          handleMethod: []
+        },
+        {
+          title: "USB连接电脑",
+          violateType: 4,
+          checked: false,
+          handleMethod: []
+        }
+      ],
       columns: [
         {
           title: "违规事件",
@@ -382,14 +378,14 @@ export default {
         padViolates = [],
         padApps = [];
       //获取授权应用
-      for (let item of this.strategyInfo.padApps) {
+      for (let item of this.padApps) {
         if (item.checked) {
           padApps.push(item.appid);
         }
       }
       //获取设备
       let pdorder = 0;
-      for (let item of this.strategyInfo.padDevices) {
+      for (let item of this.padDevices) {
         if (item.enabled === 1) {
           pdorder++;
           padDevices.push({ pdtype: item.title, pdorder });
@@ -397,7 +393,7 @@ export default {
       }
 
       //获取违规处理
-      for (let item of this.strategyInfo.padViolates) {
+      for (let item of this.padViolates) {
         if (item.checked) {
           let handleMethod = item.handleMethod.join(";");
           padViolates.push({ violateType: item.violateType, handleMethod });
@@ -468,7 +464,7 @@ export default {
     },
     checkboxChange(row) {
       row.checked = row.handleMethod.length > 0 ? true : false;
-      this.strategyInfo.padViolates.forEach((item) => {
+      this.padViolates.forEach((item) => {
         if (item.violateType === row.violateType) {
           item.checked = row.handleMethod.length > 0 ? true : false;
           item.handleMethod = row.handleMethod;
@@ -477,7 +473,7 @@ export default {
     },
     //违规事件
     checkedChange(row) {
-      this.strategyInfo.padViolates.forEach((item) => {
+      this.padViolates.forEach((item) => {
         if (item.violateType === row.violateType) {
           if (!row.checked) {
             //清空违规处理
@@ -503,7 +499,7 @@ export default {
       );
       console.log(this.strategyInfo.padWifis);
     },
-    async detail(){
+    async detail() {
       this.showLoading = true;
       //获取学校/班级策略详情
       let res = await stPad_detail_obj({
@@ -514,30 +510,40 @@ export default {
       this.showLoading = false;
       if (res.code === 0) {
         this.hasSave = res.obj;
-        if(this.hasSave){
-
+        if (this.hasSave) {
+          //数据回显
+          this.strategyInfo = res.obj;
+          this.strategyInfo.hastime = this.strategyInfo.hastime ? true : false;
+          this.strategyInfo.hasapp = this.strategyInfo.hasapp ? true : false;
+          this.strategyInfo.hasdevice = this.strategyInfo.hasdevice
+            ? true
+            : false;
+          this.strategyInfo.haswifi = this.strategyInfo.haswifi ? true : false;
+          this.strategyInfo.hasviolate = this.strategyInfo.hasviolate
+            ? true
+            : false;
         }
-        console.log(this.hasSave);
+        console.log(this.strategyInfo);
       } else {
         this.$Message.error(res.msg);
       }
     },
     async init() {
-       await this.detail();
+      await this.detail();
       //获取应用列表
-      let res1 = await app_list({
+      this.showLoading = true;
+      let res1 = await app_list_sel({
         rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid,
-        appgroupid: 0,
-        page: 1,
-        size: 1000
+        objectid: this.powerParams.objectid
       });
+      this.showLoading = false;
       if (res1.code === 0) {
-        this.strategyInfo.padApps = res1.obj.data.map((v) => {
+        this.padApps = res1.obj.map((v) => {
           v.checked = false;
           return v;
         });
-        console.log(this.strategyInfo.padApps);
+
+        console.log(this.padApps);
       } else {
         this.$Message.error(res1.msg);
       }