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

src/views/schoolSection/strategy/personalStrategy.vue

       class="modal5"
       :mask-closable="false"
       v-model="strategyInfo.show"
-      :title="strategyInfo.model === 'see'?'查看':'编辑'"
+      :title="
+        strategyInfo.model === 'see'
+          ? '查看【' + strategyInfo.username + '】'
+          : '编辑【' + strategyInfo.username + '】'
+      "
     >
       <div class="content" v-if="strategyInfo.show">
-        <div class="operation" v-if="strategyInfo.model === 'edit'">
-          <span  @click="Reset">重置</span>
+        <div class="operation" v-if="strategyInfo.model != 'see'">
+          <span v-if="strategyInfo.model === 'edit'" @click="Reset">重置</span>
           <span @click="getstPad_list">引用</span>
         </div>
         <div class="strategy_list">
         <Button style="margin-right: 10px" @click="strategyInfo.show = false"
           >关闭</Button
         >
-        <Button type="primary" class="primary_btn" @click="save()">保存</Button>
+        <Button
+          v-if="strategyInfo.model != 'see'"
+          type="primary"
+          class="primary_btn"
+          @click="save()"
+          >保存</Button
+        >
       </div>
     </Modal>
     <!-- 引用 -->
     <Modal
-        class="modal1"
-        :mask-closable="false"
-        v-model="stPadInfo.show"
-        title="引用"
+      class="modal1"
+      :mask-closable="false"
+      v-model="stPadInfo.show"
+      title="引用"
     >
       <Table
-          v-if="stPadInfo.show"
-          class="table"
-          :columns="columns1"
-          :data="stPadInfo.list"
+        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>
       <div slot="footer" style="text-align: right">
         <Button @click="stPadInfo.show = false">关闭</Button>
         <Button type="primary" class="primary_btn" @click="saveStPadInfo()"
-        >保存</Button
+          >保存</Button
         >
       </div>
     </Modal>
 </template>
 
 <script>
-import { app_list, app_list_sel } from "@/api/appgroup";
+import { app_list_sel } from "@/api/appgroup";
 import {
-  stPad_add, stPad_add_quote,
+  stPad_add,
+  stPad_add_quote,
   stPad_delete,
   stPad_detail,
   stPad_edit,
       },
       strategyInfo: {
         model: "add", //add添加/edit编辑/see查看
+        username: null,
         userid: null,
         rversion: null,
         padid: null,
         },
         {
           pdorder: 10,
-          pdtype: "SD卡",
+          pdtype: "OTG",
           enabled: 2,
           icon: "ivu-icon iconfont icon-icon-OTG"
         }
         item.checked = item.padid === row.padid ? true : false;
       });
     },
-    saveStPadInfo() {
-      //保存引用策略
-      let obj = this.stPadInfo.list.filter((v) => v.checked)[0] || null;
-      if (!obj) {
-        this.$Message.error("请选择引用策略!");
-        return;
-      }
+    initData() {
       //数据初始化
       this.strategyInfo.padTimes = []; // 平板策略时间
       this.strategyInfo.padApps = []; //appid集合
         item.checked = false;
         item.handleMethod = [];
       });
+      this.padApps.forEach((item) => {
+        item.checked = false;
+      });
+    },
+    saveStPadInfo() {
+      //保存引用策略
+      let obj = this.stPadInfo.list.filter((v) => v.checked)[0] || null;
+      if (!obj) {
+        this.$Message.error("请选择引用策略!");
+        return;
+      }
+      this.initData();
       this.showLoading = true;
       stPad_add_quote({
         sttype: 3,
           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;
+          this.strategyInfo.hasviolate = res.obj.hasviolate ? true : false;
           if (this.strategyInfo.hasapp) {
             //回显应用策略
             this.padApps.forEach((item) => {
           this.strategyInfo.padWifis = res.obj.padWifis || [];
           this.strategyInfo.padTimes = res.obj.padTimes || [];
           this.stPadInfo.show = false;
-          console.log(this.strategyInfo)
+          console.log(this.strategyInfo);
         } else {
           this.$Message.error(res.msg);
         }
     },
     save() {
       if (
-          !this.strategyInfo.hastime &&
-          !this.strategyInfo.hasapp &&
-          !this.strategyInfo.hasdevice &&
-          !this.strategyInfo.haswifi &&
-          !this.strategyInfo.hasviolate
+        !this.strategyInfo.hastime &&
+        !this.strategyInfo.hasapp &&
+        !this.strategyInfo.hasdevice &&
+        !this.strategyInfo.haswifi &&
+        !this.strategyInfo.hasviolate
       ) {
         this.$Message.error("请选择策略!");
         return;
       this.searchList();
     },
     toView(row) {
+      this.initData();
       this.showLoading = true;
       stPad_detail({ padid: row.padid }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
           //数据回显
           this.strategyInfo.model = "see";
+          this.strategyInfo.username = row.username;
           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;
-          this.strategyInfo.haswifi = this.strategyInfo.haswifi ? true : false;
-          this.strategyInfo.hasviolate = this.strategyInfo.hasviolate
-            ? true
-            : false;
+          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) => {
+              let ishas = res.obj.padApps.some((v) => {
                 return v.appid === item.appid;
               });
               item.checked = ishas ? true : false;
           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;
           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;
           this.strategyInfo.padWifis = res.obj.padWifis || [];
           this.strategyInfo.padTimes = res.obj.padTimes || [];
           this.strategyInfo.show = true;
-          console.log(this.strategyInfo)
+          console.log(this.strategyInfo);
         } else {
           this.$Message.error(res.msg);
         }
       });
     },
     toEdit(row) {
-      console.log(row)
+      this.initData();
+      console.log(row);
       if (!row.padid) {
         this.strategyInfo = {
           model: "add", //添加
           userid: row.userid,
+          username: row.username,
           padid: null,
           rversion: null,
           show: true,
           console.log(res.obj);
           //数据回显
           this.strategyInfo.model = "edit";
+          this.strategyInfo.username = row.username;
           this.strategyInfo.padid = res.obj.padid;
           this.strategyInfo.userid = row.userid;
           this.strategyInfo.rversion = res.obj.rversion;

src/views/schoolSection/strategy/publicStrategy.vue

         },
         {
           pdorder: 10,
-          pdtype: "SD卡",
+          pdtype: "OTG",
           enabled: 2,
           icon: "ivu-icon iconfont icon-icon-OTG"
         }
           }).then((res) => {
             this.showLoading = false;
             if (res.code === 0) {
+              //刷新左侧树
+              this.$emit("refresh");
               this.detail();
             } else {
               this.$Message.error(res.msg);
       api(form).then((res) => {
         if (res.code === 0) {
           this.$Message.success(res.msg);
-          if (!hasSave) {
-            //刷新左侧树
-            this.$emit("refresh");
-          }
+          //刷新左侧树
+          this.$emit("refresh");
           this.detail();
         } else {
           this.$Message.error(res.msg);

src/views/schoolSection/strategy/strategyManage.vue

   <div class="main_root">
     <div class="schoolInfo">
       <div
-        @click="curClass = schoolInfo"
+        @click="selectClass(schoolInfo)"
         :class="[
           'schoolname',
           curClass.id === schoolInfo.id && curClass.type === schoolInfo.type
         ]"
       >
         {{ schoolInfo.name }}
-        <span v-if="schoolInfo.hasst" class="ivu-icon iconfont icon-ding-mianxing"></span>
+        <span
+          v-if="schoolInfo.hasst"
+          class="ivu-icon iconfont icon-ding-mianxing"
+        ></span>
       </div>
       <div class="class_list">
         <div v-for="item in schoolInfo.children" :key="item.id">
             @click="selectClass(item)"
           >
             {{ item.name }}
-            <span v-if="item.hasst" class="ivu-icon iconfont icon-ding-mianxing"></span>
+            <span
+              v-if="item.hasst"
+              class="ivu-icon iconfont icon-ding-mianxing"
+            ></span>
           </div>
         </div>
       </div>
     </div>
     <div class="user_list">
       <div class="login_type">
-        <div @click="strategy = 1" :class="[strategy == 1 ? 'active' : '']">
+        <div @click="toggle(1)" :class="[strategy == 1 ? 'active' : '']">
           公共策略
         </div>
-        <div @click="strategy = 2" :class="[strategy == 2 ? 'active' : '']">
+        <div @click="toggle(2)" :class="[strategy == 2 ? 'active' : '']">
           个人策略
         </div>
       </div>
       <PublicStrategy
         :curClass="curClass"
         v-if="strategy === 1"
+        @refresh="init()"
       ></PublicStrategy>
       <PersonalStrategy
         :curClass="curClass"
 </template>
 
 <script>
-import { class_list } from "@/api/school";
 import PublicStrategy from "./publicStrategy.vue";
 import PersonalStrategy from "./personalStrategy";
-import {class_list_strategy} from "@/api/stPad";
+import { class_list_strategy } from "@/api/stPad";
 export default {
   components: {
     PublicStrategy,
   methods: {
     selectClass(item) {
       this.curClass = item;
-      console.log(this.curClass);
+    },
+    toggle(type) {
+      this.strategy = type;
     },
     init() {
       this.showLoading = true;
-      class_list_strategy({ schoolid: this.powerParams.objectid,
-        st:"pad"}).then((res) => {
+      class_list_strategy({
+        schoolid: this.powerParams.objectid,
+        st: "pad"
+      }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
           this.schoolInfo = res.obj;
-          if (this.schoolInfo.children.length > 0) {
+          this.curClass = this.schoolInfo;
+          if (this.schoolInfo.children.length > 0 && !this.curClass.id) {
             this.schoolInfo.children.forEach((item) => {
               item.schoolid = this.schoolInfo.id;
             });
-            this.curClass = this.schoolInfo.children[0];
           }
-          this.strategy = 1; //渲染页面
-          console.log(this.schoolInfo)
+          this.strategy = this.strategy ? this.strategy : 1; //渲染页面
         } else {
           this.$Message.error(res.msg);
         }

src/views/schoolSection/strategy/strategyTemplate.vue

       <Table :columns="columns" :data="searchForm.list">
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
-            <div @click="toView(row)">查看</div>
-            <div @click="toEdit(row)">编辑</div>
+            <div @click="toEdit(row, 1)">查看</div>
+            <div @click="toEdit(row, 2)">编辑</div>
             <div class="action_del" @click="toDel(row)">删除</div>
             <div @click="toEmpower(row)">授权</div>
           </div>
     </Modal>
     <!-- 编辑 -->
     <Modal
-        class="modal5"
-        :mask-closable="false"
-        v-model="strategyInfo.show"
-        title="编辑"
+      class="modal5"
+      :mask-closable="false"
+      v-model="strategyInfo.show"
+      :title="strategyInfo.model"
     >
-      <div class="content">
+      <div class="content" v-if="strategyInfo.show">
+        <div class="titles">
+          <div class="require">策略名称</div>
+          <Input
+            v-model.trim="strategyInfo.name"
+            :disabled="strategyInfo.model === '查看'"
+            style="width: 400px"
+            placeholder="请输入策略名称"
+          ></Input>
+        </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 != '查看'"
+                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 != '查看'"
+              :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 class="showtime" v-if="strategyInfo.model === '查看'">
+              <div
+                style="line-height: 30px; font-size: 16px; margin-bottom: 10px"
+              >
                 设备生效时间
               </div>
               <div class="week">
                   <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>
               <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 != '查看'"
+                v-model="strategyInfo.hasapp"
+                >启用</Checkbox
               >
             </div>
           </div>
               <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 === '查看'"
+                  v-model="item.checked"
                 ></Checkbox>
               </div>
             </div>
         </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 != '查看'"
+                v-model="strategyInfo.hasdevice"
+                >启用</Checkbox
               >
             </div>
           </div>
             </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 === '查看'"
+                  :true-value="1"
+                  :false-value="2"
                 >
                   <span slot="open">开启</span>
                   <span slot="close">关闭</span>
         <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 != '查看'"
+                v-model="strategyInfo.haswifi"
+                >启用</Checkbox
               >
             </div>
           </div>
           <div class="strategy_content" v-if="strategyInfo.haswifi">
             <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>
+              <span v-if="strategyInfo.model != '查看'">
+                <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 != '查看'"
+                  @click="delWifi(item)"
+                  class="del"
+                  src="../../../assets/img/guanbi_red.png"
                 />
               </div>
             </div>
               <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 != '查看'"
+                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="columns1"
+            :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 === '查看'"
+                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 === '查看'"
+                  label="通知管理员"
+                ></Checkbox>
+                <Checkbox
+                  :disabled="strategyInfo.model === '查看'"
+                  style="margin: 0 40px"
+                  label="限制使用"
                 ></Checkbox>
                 <Checkbox
-                    :disabled="strategyInfo.model === 'see'"
-                    label="恢复出厂设置"
+                  :disabled="strategyInfo.model === '查看'"
+                  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
+        <Button @click="strategyInfo.show = false">关闭</Button>
+        <Button
+          v-if="strategyInfo.model != '查看'"
+          style="margin-left: 10px"
+          type="primary"
+          class="primary_btn"
+          @click="save()"
+          >保存</Button
         >
       </div>
     </Modal>
 <script>
 import {
   class_list_strategy,
-  stApp_add_empower, stPad_add,
-  stPad_delete, stPad_detail, stPad_edit,
+  stPad_add,
+  stPad_add_empower,
+  stPad_delete,
+  stPad_detail,
+  stPad_edit,
   stPad_list
 } from "@/api/stPad";
-import {app_list_sel} from "@/api/appgroup";
+import { app_list_sel } from "@/api/appgroup";
 
 import TimeStrategy from "@/components/TimeStrategy/TimeStrategy";
 export default {
         list: [],
         total: 0
       },
-      rules: {
-        name: [
-          {
-            required: true,
-            message: "请输入名称",
-            trigger: "change"
-          }
-        ]
-      },
       empowerInfo: {
         show: false,
         name: "",
         checked: false,
-        stappid: null,
+        padid: null,
         schoolid: null,
         classids: [],
         schoolInfo: {}
       },
       strategyInfo: {
         model: "add", //add添加/edit编辑/see查看
+        name: null,
         userid: null,
         rversion: null,
         padid: null,
         },
         {
           pdorder: 10,
-          pdtype: "SD卡",
+          pdtype: "OTG",
           enabled: 2,
           icon: "ivu-icon iconfont icon-icon-OTG"
         }
         item.checked = item.padid === row.padid ? true : false;
       });
     },
-    saveStPadInfo() {
-      //保存引用策略
-      let obj = this.stPadInfo.list.filter((v) => v.checked)[0] || null;
-      if (!obj) {
-        this.$Message.error("请选择引用策略!");
-        return;
-      }
-      this.showLoading = true;
-      stPad_detail({ 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;
-          if (this.strategyInfo.hasapp) {
-            //回显应用策略
-            this.padApps.forEach((item) => {
-              let ishas = this.strategyInfo.padApps.some((v) => {
-                return v.appid === item.appid;
-              });
-              item.checked = ishas ? true : false;
-            });
-          }
-          if (this.strategyInfo.hasdevice) {
-            //回显设备策略
-            this.padDevices.forEach((item) => {
-              let obj = this.strategyInfo.padDevices.filter((v) => {
-                return v.pdtype === item.pdtype;
-              })[0] || { enabled: 2 };
-              item.enabled = obj.enabled;
-            });
-          }
-          if (this.strategyInfo.hasviolate) {
-            //回显违规处理
-            this.padViolates.forEach((item) => {
-              let arr = this.strategyInfo.padViolates.filter((v) => {
-                return v.violateType === item.violateType;
-              });
-              item.checked = arr.length > 0 ? true : false;
-              item.handleMethod =
-                  arr.length > 0 ? arr[0].handleMethod.split(";") : [];
-            });
-          }
-          this.curState = 2; //编辑状态
-          this.stPadInfo.show = false;
-        } else {
-          this.$Message.error(res.msg);
-        }
-      });
-    },
     getTime(time) {
       return time;
     },
       this.strategyInfo.padTimes = times;
     },
     save() {
+      if (!this.strategyInfo.name) {
+        this.$Message.error("请输入策略名称!");
+        return;
+      }
+      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) {
         }
       }
       let form = {
-        sttype: 3, //1学校策略 2班级策略 3个人策略
-        objectid: this.strategyInfo.userid,
+        name: this.strategyInfo.name,
+        sttype: 0, //0公共 1学校策略 2班级策略 3个人策略
+        objectid: this.powerParams.objectid,
         hastime: this.strategyInfo.hastime ? 1 : 0,
         hasapp: this.strategyInfo.hasapp ? 1 : 0,
         hasdevice: this.strategyInfo.hasdevice ? 1 : 0,
         padWifis: this.strategyInfo.haswifi ? this.strategyInfo.padWifis : [],
         padApps: this.strategyInfo.hasapp ? padApps : []
       };
-      if (this.strategyInfo.model === 'edit') {
+      if (this.strategyInfo.model === "编辑") {
         //编辑
         form.padid = this.strategyInfo.padid;
         form.rversion = this.strategyInfo.rversion;
       }
-      let api = this.strategyInfo.model === 'edit' ? stPad_edit : stPad_add;
-      console.log(form);
+      let api = this.strategyInfo.model === "编辑" ? stPad_edit : stPad_add;
       api(form).then((res) => {
         if (res.code === 0) {
           this.$Message.success(res.msg);
           this.searchList();
           this.strategyInfo.show = false;
-          console.log(res.obj)
         } else {
           this.$Message.error(res.msg);
         }
     delWifi(val) {
       //删除wifi白名单
       this.strategyInfo.padWifis = this.strategyInfo.padWifis.filter(
-          (v) => v != val
+        (v) => v != val
       );
     },
     AddWifi() {
       }
       this.strategyInfo.padWifis.push(this.ssidName);
       this.strategyInfo.padWifis = Array.from(
-          new Set(this.strategyInfo.padWifis)
+        new Set(this.strategyInfo.padWifis)
       );
     },
     saveEmpowerInfo() {
       //保存授权
-      console.log(this.empowerInfo);
       if (this.empowerInfo.classids.length === 0 && !this.empowerInfo.checked) {
         this.$Message.error("请选择学校/班级!");
         return;
       }
       let form = {
-        stappid: this.empowerInfo.stappid
+        padid: this.empowerInfo.padid
       };
       if (this.empowerInfo.checked) {
         form.schoolid = this.empowerInfo.schoolid;
       if (this.empowerInfo.classids.length > 0) {
         form.classids = this.empowerInfo.classids;
       }
-      console.log(form);
       this.empowerInfo.show = true;
-      stApp_add_empower(form).then((data) => {
+      stPad_add_empower(form).then((data) => {
         if (data.code === 0) {
           this.empowerInfo.show = false;
           this.$Message.success(data.msg);
       this.searchForm.page = 1;
       this.getList();
     },
+    initData() {
+      //数据初始化
+      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.padApps.forEach((item) => {
+        item.checked = false;
+      });
+    },
     // 获取列表
     getList() {
       this.showLoading = true;
-      stPad_list({ schoolid: this.powerParams.objectid }).then((res) => {
+      stPad_list({
+        size: this.searchForm.size,
+        page: this.searchForm.page,
+        schoolid: this.powerParams.objectid
+      }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
-          this.searchForm.list = res.obj;
+          this.searchForm.list = res.obj.data;
           this.searchForm.total = res.total;
-          console.log(res.obj);
         } else {
           this.$Message.error(res.msg);
         }
     // 新建
     async toAdd() {
       await this.getAppList();
+      this.initData();
       this.strategyInfo = {
-        model: "add", //添加
+        model: "新建", //添加
+        name: null,
         padid: null,
         rversion: null,
         show: true,
         padWifis: [], //wifi白名单
         hasviolate: false, //是否开启违规通知：0否 1是
         padViolates: [] //设备违规
-      }
-      console.log(this.strategyInfo)
+      };
     },
-    async getAppList(){
+    async getAppList() {
       //获取应用列表
       this.showLoading = true;
-       let res = await app_list_sel({
+      let res = await app_list_sel({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid
       });
           v.checked = false;
           return v;
         });
-        console.log(this.padApps)
       } else {
         this.$Message.error(res.msg);
       }
     },
-    // 保存新建
-    saveAddInfo() {},
-    // 查看
-    toView(row) {},
     // 编辑
-    toEdit(row) {},
+    async toEdit(row, type) {
+      //type 1查看 2编辑
+      await this.getAppList();
+      this.initData();
+      this.showLoading = true;
+      stPad_detail({ padid: row.padid }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          //数据回显
+          this.strategyInfo.model = type === 1 ? "查看" : "编辑";
+          this.strategyInfo.name = res.obj.name;
+          this.strategyInfo.username = row.username;
+          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.haswifi = res.obj.haswifi ? true : false;
+          this.strategyInfo.hasviolate = res.obj.hasviolate ? true : false;
+          if (this.strategyInfo.hastime) {
+            this.strategyInfo.padTimes = res.obj.padTimes;
+          }
+          if (this.strategyInfo.hasapp) {
+            //回显应用策略
+            this.padApps.forEach((item) => {
+              let ishas = res.obj.padApps.some((v) => {
+                return v.appid === item.appid;
+              });
+              item.checked = ishas ? true : false;
+            });
+          }
+          if (this.strategyInfo.hasdevice) {
+            //回显设备策略
+            this.padDevices.forEach((item) => {
+              let obj = res.obj.padDevices.filter((v) => {
+                return v.pdtype === item.pdtype;
+              })[0] || { enabled: 2 };
+              item.enabled = obj.enabled;
+            });
+          }
+          if (this.strategyInfo.hastime) {
+            this.strategyInfo.padWifis = res.obj.padWifis;
+          }
+          if (this.strategyInfo.hasviolate) {
+            //回显违规处理
+            this.padViolates.forEach((item) => {
+              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(";") : [];
+            });
+          }
+          this.strategyInfo.show = true;
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
     // 删除
     toDel(row) {
       this.$Modal.confirm({
             name: row.name,
             schoolInfo: res.obj,
             checked: false,
-            stappid: row.padid,
+            padid: row.padid,
             schoolid: res.obj.id,
             classids: []
           };
-          console.log(this.empowerInfo);
         } else {
           this.$Message.error(res.msg);
         }
     }
   }
 }
-.content{
+.content {
+  .titles {
+    height: 40px;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+    .require {
+      width: 80px;
+      color: #253a70;
+      font-size: 16px;
+      font-weight: 400;
+      font-family: "SourceHanSansCN";
+      margin-right: 10px;
+      &::before {
+        content: "*" !important;
+        display: inline-block;
+        margin-right: 4px;
+        line-height: 1;
+        font-family: SimSun;
+        font-size: 14px;
+        color: #ed4014;
+      }
+    }
+  }
   .strategy_list {
     font-family: "SourceHanSansCN";
     .strategy_title {
           height: 26px;
           margin: 0 20px 10px 0;
           position: relative;
-          .title{
+          .title {
             line-height: 14px;
           }
           img {