个人策略

src/api/stPad.js

@@ -47,6 +47,10 @@ export const stPad_list_user = (data) => setRequest("stPad/list_user", data);
  * 6.1.11 平板策略-平板用户
  */
 export const stPad_detail_pad = (data) => setRequest("stPad/detail_pad", data);
+/**
+ * 6.1.12 平板策略-引用
+ */
+export const stPad_add_quote = (data) => setRequest("stPad/add_quote", data);
 /**
  * 6.2.1 应用策略-公共策略列表
  */

src/views/schoolSection/strategy/personalStrategy.vue

@@ -3,14 +3,14 @@
     <div class="view_title">
       <Input
         v-model="searchForm.name"
-        placeholder="请输入名称"
+        placeholder="请输入姓名、登录名"
         search
         @on-search="searchList()"
-        style="width: 150px"
+        style="width: 220px"
       />
     </div>
     <div class="table_wrap" style="margin: 0">
-      <Table :columns="columns" :data="searchForm.list">
+      <Table :columns="columns0" :data="searchForm.list">
         <template slot-scope="{ row }" slot="operation">
           <div class="action_list">
             <div v-if="row.padid" @click="toView(row)">查看</div>
@@ -37,39 +37,43 @@
     </div>
     <!-- 编辑 -->
     <Modal
-        class="modal5"
-        :mask-closable="false"
-        v-model="strategyInfo.show"
-        title="编辑"
+      class="modal5"
+      :mask-closable="false"
+      v-model="strategyInfo.show"
+      :title="strategyInfo.model === 'see'?'查看':'编辑'"
     >
-      <div class="content">
-        <div class="operation">
-          <span @click="Reset">重置</span>
+      <div class="content" v-if="strategyInfo.show">
+        <div class="operation" v-if="strategyInfo.model === 'edit'">
+          <span  @click="Reset">重置</span>
           <span @click="getstPad_list">引用</span>
         </div>
         <div class="strategy_list">
           <div class="strategy_title">
             <div>
-          <span
-              style="font-size: 26px"
-              class="ivu-icon iconfont icon-shijian"
-          ></span
-          >时间限制策略
+              <span
+                style="font-size: 26px"
+                class="ivu-icon iconfont icon-shijian"
+              ></span
+              >时间限制策略
             </div>
             <div>
-              <Checkbox v-if="strategyInfo.model != 'see'" v-model="strategyInfo.hastime"
-              >启用</Checkbox
+              <Checkbox
+                v-if="strategyInfo.model != 'see'"
+                v-model="strategyInfo.hastime"
+                >启用</Checkbox
               >
             </div>
           </div>
           <div style="margin-bottom: 10px" v-if="strategyInfo.hastime">
             <TimeStrategy
-                v-if="strategyInfo.model != 'see'"
-                :times="strategyInfo.padTimes"
-                @timesChange="timesChange"
+              v-if="strategyInfo.model != 'see'"
+              :times="strategyInfo.padTimes"
+              @timesChange="timesChange"
             ></TimeStrategy>
             <div class="showtime" v-if="strategyInfo.model === 'see'">
-              <div style="line-height: 30px; font-size: 16px; margin-bottom: 10px">
+              <div
+                style="line-height: 30px; font-size: 16px; margin-bottom: 10px"
+              >
                 设备生效时间
               </div>
               <div class="week">
@@ -77,7 +81,9 @@
                   <div class="day_title">{{ item.title }}</div>
                   <div class="day_content">
                     <div class="time" v-for="sitem in getDay(item.id)">
-                      {{ getTime(sitem.starttime) }}-{{ getTime(sitem.stoptime) }}
+                      {{ getTime(sitem.starttime) }}-{{
+                        getTime(sitem.stoptime)
+                      }}
                     </div>
                   </div>
                 </div>
@@ -92,8 +98,10 @@
               <span class="ivu-icon iconfont icon-yingyongcelve"></span>应用策略
             </div>
             <div>
-              <Checkbox v-if="strategyInfo.model != 'see'" v-model="strategyInfo.hasapp"
-              >启用</Checkbox
+              <Checkbox
+                v-if="strategyInfo.model != 'see'"
+                v-model="strategyInfo.hasapp"
+                >启用</Checkbox
               >
             </div>
           </div>
@@ -102,17 +110,17 @@
               <span>授权应用</span>
             </div>
             <div
-                class="strategy_bottom"
-                style="min-height: 160px"
-                v-if="padApps.length > 0"
+              class="strategy_bottom"
+              style="min-height: 160px"
+              v-if="padApps.length > 0"
             >
               <div class="app_list" v-for="item in padApps" :key="item.appid">
                 <img :src="$api.baseImageUrl + item.appIcon" />
                 <div>{{ item.appName }}</div>
                 <Checkbox
-                    class="checked"
-                    :disabled="strategyInfo.model === 'see'"
-                    v-model="item.checked"
+                  class="checked"
+                  :disabled="strategyInfo.model === 'see'"
+                  v-model="item.checked"
                 ></Checkbox>
               </div>
             </div>
@@ -121,10 +129,14 @@
         </div>
         <div class="strategy_list">
           <div class="strategy_title">
-            <div><span class="ivu-icon iconfont icon-shezhi"></span>设备策略</div>
             <div>
-              <Checkbox v-if="strategyInfo.model != 'see'" v-model="strategyInfo.hasdevice"
-              >启用</Checkbox
+              <span class="ivu-icon iconfont icon-shezhi"></span>设备策略
+            </div>
+            <div>
+              <Checkbox
+                v-if="strategyInfo.model != 'see'"
+                v-model="strategyInfo.hasdevice"
+                >启用</Checkbox
               >
             </div>
           </div>
@@ -134,20 +146,20 @@
             </div>
             <div class="strategy_bottom" style="min-height: 160px">
               <div
-                  class="device_list"
-                  v-for="item in padDevices"
-                  :key="item.pdorder"
+                class="device_list"
+                v-for="item in padDevices"
+                :key="item.pdorder"
               >
                 <div class="icon">
                   <span :class="[item.icon]"></span>
                 </div>
                 <div class="title">{{ item.pdtype }}</div>
                 <i-switch
-                    size="large"
-                    v-model="item.enabled"
-                    :disabled="strategyInfo.model === 'see'"
-                    :true-value="1"
-                    :false-value="2"
+                  size="large"
+                  v-model="item.enabled"
+                  :disabled="strategyInfo.model === 'see'"
+                  :true-value="1"
+                  :false-value="2"
                 >
                   <span slot="open">开启</span>
                   <span slot="close">关闭</span>
@@ -160,15 +172,17 @@
         <div class="strategy_list">
           <div class="strategy_title">
             <div>
-          <span
-              style="font-size: 18px"
-              class="ivu-icon iconfont icon-wifi"
-          ></span
-          >Wifi白名单策略
+              <span
+                style="font-size: 18px"
+                class="ivu-icon iconfont icon-wifi"
+              ></span
+              >Wifi白名单策略
             </div>
             <div>
-              <Checkbox v-if="strategyInfo.model != 'see'" v-model="strategyInfo.haswifi"
-              >启用</Checkbox
+              <Checkbox
+                v-if="strategyInfo.model != 'see'"
+                v-model="strategyInfo.haswifi"
+                >启用</Checkbox
               >
             </div>
           </div>
@@ -176,28 +190,28 @@
             <div class="strategy_top">
               <span>SSID</span>
               <span v-if="strategyInfo.model != 'see'">
-            <Input
-                v-model.trim="ssidName"
-                placeholder="请输入SSID"
-                style="width: 260px; margin: 0 10px"
-            />
-            <Button type="primary" class="primary_btn" @click="AddWifi()"
-            >添加</Button
-            >
-          </span>
+                <Input
+                  v-model.trim="ssidName"
+                  placeholder="请输入SSID"
+                  style="width: 260px; margin: 0 10px"
+                />
+                <Button type="primary" class="primary_btn" @click="AddWifi()"
+                  >添加</Button
+                >
+              </span>
             </div>
             <div class="strategy_bottom" style="min-height: 76px">
               <div
-                  class="padWifis"
-                  v-for="(item, index) in strategyInfo.padWifis"
-                  :key="index"
+                class="padWifis"
+                v-for="(item, index) in strategyInfo.padWifis"
+                :key="index"
               >
                 <div class="title">{{ item }}</div>
                 <img
-                    v-if="strategyInfo.model != 'see'"
-                    @click="delWifi(item)"
-                    class="del"
-                    src="../../../assets/img/guanbi_red.png"
+                  v-if="strategyInfo.model != 'see'"
+                  @click="delWifi(item)"
+                  class="del"
+                  src="../../../assets/img/guanbi_red.png"
                 />
               </div>
             </div>
@@ -210,52 +224,85 @@
               <span class="ivu-icon iconfont icon-weiguiguanli"></span>违规处理
             </div>
             <div>
-              <Checkbox v-if="strategyInfo.model != 'see'" v-model="strategyInfo.hasviolate"
-              >启用</Checkbox
+              <Checkbox
+                v-if="strategyInfo.model != 'see'"
+                v-model="strategyInfo.hasviolate"
+                >启用</Checkbox
               >
             </div>
           </div>
           <Table
-              v-if="strategyInfo.hasviolate"
-              class="table"
-              :columns="columns1"
-              :data="padViolates"
+            v-if="strategyInfo.hasviolate"
+            class="table"
+            :columns="columns"
+            :data="padViolates"
           >
             <template slot-scope="{ row }" slot="violationEvents">
               <Checkbox
-                  :disabled="strategyInfo.model === 'see'"
-                  class="checked"
-                  @on-change="checkedChange(row)"
-                  v-model="row.checked"
+                :disabled="strategyInfo.model === 'see'"
+                class="checked"
+                @on-change="checkedChange(row)"
+                v-model="row.checked"
               ></Checkbox>
-              <span style="display: inline-block; width: 120px; text-align: left">{{
-                  row.title
-                }}</span>
+              <span
+                style="display: inline-block; width: 120px; text-align: left"
+                >{{ row.title }}</span
+              >
             </template>
             <template slot-scope="{ row }" slot="violationHandling">
               <CheckboxGroup
-                  @on-change="checkboxChange(row)"
-                  v-model="row.handleMethod"
+                @on-change="checkboxChange(row)"
+                v-model="row.handleMethod"
               >
-                <Checkbox :disabled="strategyInfo.model === 'see'" label="通知管理员"></Checkbox>
                 <Checkbox
-                    :disabled="strategyInfo.model === 'see'"
-                    style="margin: 0 40px"
-                    label="限制使用"
+                  :disabled="strategyInfo.model === 'see'"
+                  label="通知管理员"
                 ></Checkbox>
                 <Checkbox
-                    :disabled="strategyInfo.model === 'see'"
-                    label="恢复出厂设置"
+                  :disabled="strategyInfo.model === 'see'"
+                  style="margin: 0 40px"
+                  label="限制使用"
+                ></Checkbox>
+                <Checkbox
+                  :disabled="strategyInfo.model === 'see'"
+                  label="恢复出厂设置"
                 ></Checkbox>
               </CheckboxGroup>
             </template>
           </Table>
-          <div class="nodata" v-if="!strategyInfo.hasviolate">未设置违规处理</div>
+          <div class="nodata" v-if="!strategyInfo.hasviolate">
+            未设置违规处理
+          </div>
         </div>
       </div>
       <div slot="footer" style="text-align: right">
-        <Button style="margin-right: 10px" @click="strategyInfo.show = false">关闭</Button>
-        <Button type="primary" class="primary_btn" @click="save()"
+        <Button style="margin-right: 10px" @click="strategyInfo.show = false"
+          >关闭</Button
+        >
+        <Button type="primary" class="primary_btn" @click="save()">保存</Button>
+      </div>
+    </Modal>
+    <!-- 引用 -->
+    <Modal
+        class="modal1"
+        :mask-closable="false"
+        v-model="stPadInfo.show"
+        title="引用"
+    >
+      <Table
+          v-if="stPadInfo.show"
+          class="table"
+          :columns="columns1"
+          :data="stPadInfo.list"
+      >
+        <template slot-scope="{ row }" slot="active">
+          <Radio @on-change="stPadChange(row)" v-model="row.checked"></Radio>
+        </template>
+      </Table>
+
+      <div slot="footer" style="text-align: right">
+        <Button @click="stPadInfo.show = false">关闭</Button>
+        <Button type="primary" class="primary_btn" @click="saveStPadInfo()"
         >保存</Button
         >
       </div>
@@ -268,8 +315,15 @@
 </template>
 
 <script>
-import {app_list, app_list_sel} from "@/api/appgroup";
-import {stPad_add, stPad_delete, stPad_detail, stPad_edit, stPad_list, stPad_list_user} from "@/api/stPad";
+import { app_list, app_list_sel } from "@/api/appgroup";
+import {
+  stPad_add, stPad_add_quote,
+  stPad_delete,
+  stPad_detail,
+  stPad_edit,
+  stPad_list,
+  stPad_list_user
+} from "@/api/stPad";
 import TimeStrategy from "@/components/TimeStrategy/TimeStrategy";
 export default {
   components: {
@@ -279,6 +333,11 @@ export default {
   data() {
     return {
       showLoading: false,
+      stPadInfo: {
+        show: false,
+        stPad: {},
+        list: []
+      },
       strategyInfo: {
         model: "add", //add添加/edit编辑/see查看
         userid: null,
@@ -385,7 +444,7 @@ export default {
           handleMethod: []
         }
       ],
-      columns1: [
+      columns: [
         {
           title: "违规事件",
           slot: "violationEvents",
@@ -398,7 +457,7 @@ export default {
           align: "center"
         }
       ],
-      columns2: [
+      columns1: [
         {
           title: "操作",
           slot: "active",
@@ -454,7 +513,7 @@ export default {
         list: [],
         total: 0
       },
-      columns: [
+      columns0: [
         {
           title: "序号",
           align: "center",
@@ -530,26 +589,45 @@ export default {
         this.$Message.error("请选择引用策略!");
         return;
       }
+      //数据初始化
+      this.strategyInfo.padTimes = []; // 平板策略时间
+      this.strategyInfo.padApps = []; //appid集合
+      this.strategyInfo.padDevices = []; //授权应用
+      this.strategyInfo.padWifis = []; //wifi白名单
+      this.strategyInfo.padViolates = []; //设备违规
+      this.padDevices.forEach((item) => {
+        item.enabled = 2;
+      });
+      this.padViolates.forEach((item) => {
+        item.checked = false;
+        item.handleMethod = [];
+      });
       this.showLoading = true;
-      stPad_detail({ padid: obj.padid }).then((res) => {
+      stPad_add_quote({
+        sttype: 3,
+        objectid: this.strategyInfo.userid,
+        padid: obj.padid
+      }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
           //数据回显
-          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;
+          this.strategyInfo.model = "edit";
+          this.strategyInfo.padid = res.obj.padid;
+          this.strategyInfo.rversion = res.obj.rversion;
+          this.strategyInfo.hastime = res.obj.hastime ? true : false;
+          this.strategyInfo.hasapp = res.obj.hasapp ? true : false;
+          this.strategyInfo.hasdevice = res.obj.hasdevice
+            ? true
+            : false;
+          this.strategyInfo.haswifi = res.obj.haswifi ? true : false;
+          this.strategyInfo.hasviolate = res.obj.hasviolate
+            ? true
+            : false;
           if (this.strategyInfo.hasapp) {
             //回显应用策略
             this.padApps.forEach((item) => {
-              let ishas = this.strategyInfo.padApps.some((v) => {
-                return v.appid === item.appid;
+              let ishas = res.obj.padApps.some((v) => {
+                return v === item.appid;
               });
               item.checked = ishas ? true : false;
             });
@@ -557,7 +635,7 @@ export default {
           if (this.strategyInfo.hasdevice) {
             //回显设备策略
             this.padDevices.forEach((item) => {
-              let obj = this.strategyInfo.padDevices.filter((v) => {
+              let obj = res.obj.padDevices.filter((v) => {
                 return v.pdtype === item.pdtype;
               })[0] || { enabled: 2 };
               item.enabled = obj.enabled;
@@ -566,16 +644,18 @@ export default {
           if (this.strategyInfo.hasviolate) {
             //回显违规处理
             this.padViolates.forEach((item) => {
-              let arr = this.strategyInfo.padViolates.filter((v) => {
+              let arr = res.obj.padViolates.filter((v) => {
                 return v.violateType === item.violateType;
               });
               item.checked = arr.length > 0 ? true : false;
               item.handleMethod =
-                  arr.length > 0 ? arr[0].handleMethod.split(";") : [];
+                arr.length > 0 ? arr[0].handleMethod.split(";") : [];
             });
           }
-          this.curState = 2; //编辑状态
+          this.strategyInfo.padWifis = res.obj.padWifis || [];
+          this.strategyInfo.padTimes = res.obj.padTimes || [];
           this.stPadInfo.show = false;
+          console.log(this.strategyInfo)
         } else {
           this.$Message.error(res.msg);
         }
@@ -584,7 +664,7 @@ export default {
     getstPad_list() {
       this.showLoading = true;
       stPad_list({
-        schoolid: this.curClass.id
+        schoolid: this.curClass.schoolid
       }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
@@ -607,7 +687,7 @@ export default {
       this.$Modal.confirm({
         title: "提示",
         content:
-            "<div>确定要重置策略吗？</div><div style='color: #B50000;font-size: 12px'>注：重置后，所有应用都可以在任意时间内进行使用</div>",
+          "<div>确定要重置策略吗？</div><div style='color: #B50000;font-size: 12px'>注：重置后，所有应用都可以在任意时间内进行使用</div>",
         onOk: () => {
           this.showLoading = true;
           stPad_delete({
@@ -637,9 +717,19 @@ export default {
       this.strategyInfo.padTimes = times;
     },
     save() {
+      if (
+          !this.strategyInfo.hastime &&
+          !this.strategyInfo.hasapp &&
+          !this.strategyInfo.hasdevice &&
+          !this.strategyInfo.haswifi &&
+          !this.strategyInfo.hasviolate
+      ) {
+        this.$Message.error("请选择策略!");
+        return;
+      }
       let padDevices = [],
-          padViolates = [],
-          padApps = [];
+        padViolates = [],
+        padApps = [];
       //获取授权应用
       for (let item of this.padApps) {
         if (item.checked) {
@@ -654,7 +744,6 @@ export default {
           enabled: item.enabled
         });
       }
-
       //获取违规处理
       for (let item of this.padViolates) {
         if (item.checked) {
@@ -713,19 +802,19 @@ export default {
         padWifis: this.strategyInfo.haswifi ? this.strategyInfo.padWifis : [],
         padApps: this.strategyInfo.hasapp ? padApps : []
       };
-      if (this.strategyInfo.model === 'edit') {
+      if (this.strategyInfo.model === "edit") {
         //编辑
         form.padid = this.strategyInfo.padid;
         form.rversion = this.strategyInfo.rversion;
       }
-      let api = this.strategyInfo.model === 'edit' ? stPad_edit : stPad_add;
+      let api = this.strategyInfo.model === "edit" ? stPad_edit : stPad_add;
       console.log(form);
       api(form).then((res) => {
         if (res.code === 0) {
           this.$Message.success(res.msg);
           this.searchList();
           this.strategyInfo.show = false;
-          console.log(res.obj)
+          console.log(res.obj);
         } else {
           this.$Message.error(res.msg);
         }
@@ -754,7 +843,7 @@ export default {
     delWifi(val) {
       //删除wifi白名单
       this.strategyInfo.padWifis = this.strategyInfo.padWifis.filter(
-          (v) => v != val
+        (v) => v != val
       );
     },
     AddWifi() {
@@ -764,10 +853,10 @@ export default {
       }
       this.strategyInfo.padWifis.push(this.ssidName);
       this.strategyInfo.padWifis = Array.from(
-          new Set(this.strategyInfo.padWifis)
+        new Set(this.strategyInfo.padWifis)
       );
     },
-    async init(){
+    async init() {
       //获取应用列表
       this.showLoading = true;
       let res1 = await app_list_sel({
@@ -783,7 +872,7 @@ export default {
       } else {
         this.$Message.error(res1.msg);
       }
-     this.searchList();
+      this.searchList();
     },
     toView(row) {
       this.showLoading = true;
@@ -791,16 +880,19 @@ export default {
         this.showLoading = false;
         if (res.code === 0) {
           //数据回显
-          this.strategyInfo = res.obj;
+          this.strategyInfo.model = "see";
+          this.strategyInfo.userid = row.userid;
+          this.strategyInfo.padid = res.obj.padid;
+          this.strategyInfo.rversion = res.obj.rversion;
           this.strategyInfo.hastime = this.strategyInfo.hastime ? true : false;
           this.strategyInfo.hasapp = this.strategyInfo.hasapp ? true : false;
           this.strategyInfo.hasdevice = this.strategyInfo.hasdevice
-              ? true
-              : false;
+            ? true
+            : false;
           this.strategyInfo.haswifi = this.strategyInfo.haswifi ? true : false;
           this.strategyInfo.hasviolate = this.strategyInfo.hasviolate
-              ? true
-              : false;
+            ? true
+            : false;
           if (this.strategyInfo.hasapp) {
             //回显应用策略
             this.padApps.forEach((item) => {
@@ -827,16 +919,21 @@ export default {
               });
               item.checked = arr.length > 0 ? true : false;
               item.handleMethod =
-                  arr.length > 0 ? arr[0].handleMethod.split(";") : [];
+                arr.length > 0 ? arr[0].handleMethod.split(";") : [];
             });
           }
+          this.strategyInfo.padWifis = res.obj.padWifis || [];
+          this.strategyInfo.padTimes = res.obj.padTimes || [];
+          this.strategyInfo.show = true;
+          console.log(this.strategyInfo)
         } else {
           this.$Message.error(res.msg);
         }
       });
     },
     toEdit(row) {
-      if(!row.padid){
+      console.log(row)
+      if (!row.padid) {
         this.strategyInfo = {
           model: "add", //添加
           userid: row.userid,
@@ -853,28 +950,25 @@ export default {
           padWifis: [], //wifi白名单
           hasviolate: false, //是否开启违规通知：0否 1是
           padViolates: [] //设备违规
-        }
+        };
         return;
       }
       this.showLoading = true;
       stPad_detail({ padid: row.padid }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
-          console.log(res.obj)
+          console.log(res.obj);
           //数据回显
+          this.strategyInfo.model = "edit";
           this.strategyInfo.padid = res.obj.padid;
           this.strategyInfo.userid = row.userid;
           this.strategyInfo.rversion = res.obj.rversion;
           this.strategyInfo.hastime = res.obj.hastime ? true : false;
           this.strategyInfo.hasapp = res.obj.hasapp ? true : false;
-          this.strategyInfo.hasdevice = res.obj.hasdevice
-              ? true
-              : false;
+          this.strategyInfo.hasdevice = res.obj.hasdevice ? true : false;
           this.strategyInfo.haswifi = res.obj.haswifi ? true : false;
-          this.strategyInfo.hasviolate = res.obj.hasviolate
-              ? true
-              : false;
-          if(this.strategyInfo.hastime){
+          this.strategyInfo.hasviolate = res.obj.hasviolate ? true : false;
+          if (this.strategyInfo.hastime) {
             this.strategyInfo.padTimes = res.obj.padTimes;
           }
           if (this.strategyInfo.hasapp) {
@@ -895,7 +989,7 @@ export default {
               item.enabled = obj.enabled;
             });
           }
-          if(this.strategyInfo.hastime){
+          if (this.strategyInfo.hastime) {
             this.strategyInfo.padWifis = res.obj.padWifis;
           }
           if (this.strategyInfo.hasviolate) {
@@ -906,11 +1000,11 @@ export default {
               });
               item.checked = arr.length > 0 ? true : false;
               item.handleMethod =
-                  arr.length > 0 ? arr[0].handleMethod.split(";") : [];
+                arr.length > 0 ? arr[0].handleMethod.split(";") : [];
             });
           }
           this.strategyInfo.show = true;
-          console.log(this.strategyInfo)
+          console.log(this.strategyInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -928,7 +1022,7 @@ export default {
           }).then((res) => {
             this.showLoading = false;
             if (res.code === 0) {
-              this.detail();
+              this.searchList();
             } else {
               this.$Message.error(res.msg);
             }
@@ -957,7 +1051,7 @@ export default {
     getList() {
       this.showLoading = true;
       stPad_list_user({
-        schoolid: this.curClass.schoolid,
+        schoolid: this.curClass.schoolid || this.curClass.id,
         classid: this.curClass.id,
         page: this.searchForm.page,
         size: this.searchForm.size,
@@ -986,7 +1080,7 @@ export default {
     margin-bottom: 16px;
   }
 }
-.content{
+.content {
   .operation {
     text-align: right;
     span {
@@ -1097,7 +1191,7 @@ export default {
           height: 26px;
           margin: 0 20px 10px 0;
           position: relative;
-          .title{
+          .title {
             line-height: 14px;
           }
           img {

src/views/schoolSection/strategy/publicStrategy.vue

@@ -2,7 +2,9 @@
   <div class="index1">
     <div class="operation">
       <span @click="curState = 2">修改</span>
-      <span @click="Reset">重置</span>
+      <span v-if="curClass.type === strategyInfo.sttype" @click="Reset"
+        >重置</span
+      >
       <span @click="getstPad_list">引用</span>
     </div>
     <div class="strategy_list">
@@ -260,7 +262,7 @@
 import {
   stPad_add,
   stPad_delete,
-  stPad_detail,
+  stPad_add_quote,
   stPad_detail_obj,
   stPad_edit,
   stPad_list
@@ -282,6 +284,9 @@ export default {
       },
       curState: 1, //1查看/2编辑
       strategyInfo: {
+        sttype: null,
+        padid: null,
+        rversion: null,
         hastime: false, // 是否开启时间策略：0否 1是
         padTimes: [], // 平板策略时间
         hasapp: false, //是否开启应用策略：0否 1是
@@ -443,8 +448,7 @@ export default {
           id: 6
         }
       ],
-      ssidName: "",
-      hasSave: null
+      ssidName: ""
     };
   },
   watch: {
@@ -479,9 +483,16 @@ export default {
         return;
       }
       this.showLoading = true;
-      stPad_detail({ padid: obj.padid }).then((res) => {
+      stPad_add_quote({
+        sttype: this.curClass.type,
+        objectid: this.curClass.id,
+        padid: obj.padid
+      }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
+          if (document.querySelector(".user_list")) {
+            document.querySelector(".user_list").scrollTop = 0;
+          }
           //数据回显
           this.strategyInfo = res.obj;
           this.strategyInfo.hastime = this.strategyInfo.hastime ? true : false;
@@ -497,7 +508,7 @@ export default {
             //回显应用策略
             this.padApps.forEach((item) => {
               let ishas = this.strategyInfo.padApps.some((v) => {
-                return v.appid === item.appid;
+                return v === item.appid;
               });
               item.checked = ishas ? true : false;
             });
@@ -524,6 +535,7 @@ export default {
           }
           this.curState = 2; //编辑状态
           this.stPadInfo.show = false;
+          console.log(this.stPadInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -532,7 +544,7 @@ export default {
     getstPad_list() {
       this.showLoading = true;
       stPad_list({
-        schoolid: this.curClass.id
+        schoolid: this.curClass.schoolid
       }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
@@ -585,6 +597,16 @@ export default {
       this.strategyInfo.padTimes = times;
     },
     save() {
+      if (
+        !this.strategyInfo.hastime &&
+        !this.strategyInfo.hasapp &&
+        !this.strategyInfo.hasdevice &&
+        !this.strategyInfo.haswifi &&
+        !this.strategyInfo.hasviolate
+      ) {
+        this.$Message.error("请选择策略!");
+        return;
+      }
       let padDevices = [],
         padViolates = [],
         padApps = [];
@@ -661,16 +683,23 @@ export default {
         padWifis: this.strategyInfo.haswifi ? this.strategyInfo.padWifis : [],
         padApps: this.strategyInfo.hasapp ? padApps : []
       };
-      if (this.hasSave) {
+      //true是自身的策略即编辑
+      let hasSave =
+        this.curClass.type === this.strategyInfo.sttype ? true : false;
+      if (hasSave) {
         //编辑
         form.padid = this.strategyInfo.padid;
         form.rversion = this.strategyInfo.rversion;
       }
-      let api = this.hasSave ? stPad_edit : stPad_add;
-      console.log(form);
+      let api = hasSave ? stPad_edit : stPad_add;
+      console.log(hasSave, form);
       api(form).then((res) => {
         if (res.code === 0) {
           this.$Message.success(res.msg);
+          if (!hasSave) {
+            //刷新左侧树
+            this.$emit("refresh");
+          }
           this.detail();
         } else {
           this.$Message.error(res.msg);
@@ -723,8 +752,10 @@ export default {
       });
       this.showLoading = false;
       if (res.code === 0) {
-        this.hasSave = res.obj;
-        if (this.hasSave) {
+        if (document.querySelector(".user_list")) {
+          document.querySelector(".user_list").scrollTop = 0;
+        }
+        if (res.obj) {
           //数据回显
           this.strategyInfo = res.obj;
           this.strategyInfo.hastime = this.strategyInfo.hastime ? true : false;
@@ -779,6 +810,19 @@ export default {
       }
     },
     async init() {
+      //数据初始化
+      this.strategyInfo.padTimes = []; // 平板策略时间
+      this.strategyInfo.padApps = []; //appid集合
+      this.strategyInfo.padDevices = []; //授权应用
+      this.strategyInfo.padWifis = []; //wifi白名单
+      this.strategyInfo.padViolates = []; //设备违规
+      this.padDevices.forEach((item) => {
+        item.enabled = 2;
+      });
+      this.padViolates.forEach((item) => {
+        item.checked = false;
+        item.handleMethod = [];
+      });
       //获取应用列表
       this.showLoading = true;
       let res1 = await app_list_sel({