Merge commit 'b49fa493f5849997957acc30e7c91019b2aaabf1' into gzb

src/api/device_manager.js

@@ -15,6 +15,11 @@ export const device_manager_list_hd = (data) =>
  */
 export const device_manager_list_vd = (data) =>
   setRequest("device_manager/list_vd", data);
+/**
+ * 11.1.3.2违规设备--违规详情
+ */
+export const device_manager_detail_vd = (data) =>
+  setRequest("device_manager/detail_vd", data);
 /**
  * 11.1.4设备管理--设备管理列表
  */

src/api/log.js

@@ -77,3 +77,8 @@ export const logDeviceBind_list_user = (data) =>
  */
 export const logDeviceBind_list_school = (data) =>
   setRequest("logDeviceBind/list_school", data);
+/**
+ * 7.10.3 违规设备--合规处理
+ */
+export const logdoperate_edit_handled = (data) =>
+  setRequest("logdoperate/edit_handled", data);

src/api/school.js

@@ -109,3 +109,7 @@ export const user_delete = (data) => setRequest("user/delete", data);
  * 3.2.5用户--导入
  */
 export const user_import = (data) => setRequest("user/import", data);
+/**
+ * 3.2.6用户--获取班级sn
+ */
+export const user_list_cs = (data) => setRequest("user/list_cs", data);

src/api/setting.js

@@ -71,6 +71,11 @@ export const deviceSet_edit = (data) => setRequest("deviceSet/edit", data);
  * 8.3.2.3 设备设置管理-重置
  */
 export const deviceSet_delete = (data) => setRequest("deviceSet/delete", data);
+/**
+ * 8.3.3 设备管理-获取
+ */
+export const password_detail_userpwd = (data) =>
+  setRequest("password/detail_userpwd", data);
 /**
  * 8.4.1 开机设置-详情
  */

src/api/stPad.js

@@ -43,6 +43,10 @@ export const stPad_detail_obj = (data) => setRequest("stPad/detail_obj", data);
  * 6.1.10 平板策略-个人策略
  */
 export const stPad_list_user = (data) => setRequest("stPad/list_user", data);
+/**
+ * 平板策略-个人策略（网页端）
+ */
+export const stPad_detail_web = (data) => setRequest("stPad/detail_web", data);
 /**
  * 6.1.11 平板策略-平板用户
  */

src/store/index.js

@@ -33,7 +33,7 @@ export default new Vuex.Store({
       } else if (state.userPower.atype === 3) {
         state.userPower.regionids = [info.regionid];
         state.userPower.schoolid = info.schoolid;
-        state.userPower.belong = [info.regionName, info.schoolname];
+        state.userPower.belong = [info.regionName, info.schoolName];
       }
       localStorage.setItem(
         "xh_control_userInfo",

src/utils/ControlWSMsg.js

@@ -24,10 +24,10 @@ class ControlWSMsg {
     this.body = body;
   }
   // 发送消息
-  msgContent(body) {
+  msgContent(msg) {
     this.code = 2001;
-    // {userid, username, msg}
-    this.body = body;
+    // {msg}
+    this.body = { msg };
   }
   // 限制使用
   limitedUse() {
@@ -65,7 +65,7 @@ class ControlWSMsg {
     let ws = this.ws;
     if (ws && ws.readyState === 1) {
       let msg = this.toJSONString();
-      console.log("发送消息", msg);
+      // console.log("发送消息", msg);
       ws.send(msg);
       cb && cb(true);
     } else {

src/utils/ControlWs.js

@@ -79,7 +79,7 @@ class ControlWs {
     this.ws.onmessage = (event) => {
       //如果获取到消息，心跳检测重置
       if (event.data && JSON.parse(event.data)) {
-        console.info("接收到消息", event.data);
+        // console.info("接收到消息", event.data);
         this.myevent.$emit("ws_getmsg", JSON.parse(event.data));
       } else {
         console.error(event.data);

src/utils/index.js

@@ -588,18 +588,18 @@ export const dateRangeToSecond = ([beginDate, endDate]) => {
   };
 };
 export const doEventInfo = {
-  1: "更换SIM卡",
-  2: "违规开启蓝牙",
-  3: "USB连接电脑",
-  4: "USB拔出电脑",
-  5: "插入SD卡",
-  6: "拔出SD卡",
-  7: "账号登录",
-  8: "账号退出",
-  9: "安装应用",
-  10: "卸载应用",
-  11: "启动应用",
-  12: "首次使用"
+  101: "更换SIM卡",
+  102: "违规开启蓝牙",
+  103: "USB连接电脑",
+  104: "USB拔出电脑",
+  105: "插入SD卡",
+  106: "拔出SD卡",
+  201: "账号登录",
+  202: "首次使用",
+  203: "账号退出",
+  211: "安装应用（安装了非应用商店应用违规）",
+  212: "卸载应用（卸载强制安装应用违规）",
+  213: "启动应用"
 };
 export const pushTypeInfo = {
   1: "发送消息",
@@ -609,3 +609,63 @@ export const pushTypeInfo = {
   5: "重启设备",
   6: "恢复出厂"
 };
+export const padDeviceIcon = [
+  {
+    pdtype: "摄像头",
+    icon: "ivu-icon iconfont icon-ball-camera"
+  },
+  {
+    pdtype: "蓝牙",
+    icon: "ivu-icon iconfont icon-lanya"
+  },
+  {
+    pdtype: "USB连接",
+    icon: "ivu-icon iconfont icon-USB"
+  },
+  {
+    pdtype: "Wi-Fi开关",
+    icon: "ivu-icon iconfont icon-bx-wifi-2"
+  },
+  {
+    pdtype: "电话短信",
+    icon: "ivu-icon iconfont icon-dianhuaduanxin_line"
+  },
+  {
+    pdtype: "数据流量",
+    icon: "ivu-icon iconfont icon-liuliang"
+  },
+  {
+    pdtype: "GPS",
+    icon: "ivu-icon iconfont icon-GPSxinxi"
+  },
+  {
+    pdtype: "Wi-Fi高级选项",
+    icon: "ivu-icon iconfont icon-wifiguanbi"
+  },
+  {
+    pdtype: "SD卡",
+    icon: "ivu-icon iconfont icon-sdka-09"
+  },
+  {
+    pdtype: "OTG",
+    icon: "ivu-icon iconfont icon-icon-OTG"
+  }
+];
+export const padViolatesInfo = [
+  {
+    title: "已ROOT",
+    violateType: 1
+  },
+  {
+    title: "安装非商店应用",
+    violateType: 2
+  },
+  {
+    title: "更换SIM卡",
+    violateType: 3
+  },
+  {
+    title: "USB连接电脑",
+    violateType: 4
+  }
+];

src/views/layout.vue

@@ -2,7 +2,11 @@
   <div class="layout_wrap">
     <div class="layout_header">
       <div class="header_left">
-        <img src="@/assets/img/setting/LOGO.png" />
+        <img
+          v-if="userInfo.logoPath"
+          :src="$api.showImageUrl + userInfo.logoPath"
+        />
+        <img v-else src="@/assets/img/setting/LOGO.png" />
       </div>
       <div class="header_right">
         <div style="margin-right: 10px" v-if="powerParams.rtype === 2">

src/views/schoolSection/applicationStrategy/appStrategyManage.vue

@@ -35,9 +35,7 @@
     <div class="main_right">
       <div class="right_header">
         <div class="header_left">
-          <span v-if="appStrategyInfo.stappid"
-            >已引用“{{ appStrategyInfo.name }}”的应用策略</span
-          >
+          <span v-if="appStrategyInfo.stappid">{{ appStrategyInfo.name }}</span>
         </div>
         <div class="header_right">
           <div
@@ -436,7 +434,6 @@ export default {
       font-size: 16px;
       .header_left {
         font-weight: bold;
-        color: #f0153f;
       }
       .header_right {
         display: flex;

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -28,11 +28,11 @@
           <DropdownMenu slot="list">
             <DropdownItem name="1">恢复出厂</DropdownItem>
             <DropdownItem name="2">发送消息</DropdownItem>
-            <DropdownItem name="3">解除限制</DropdownItem>
-            <DropdownItem name="4">限制使用</DropdownItem>
-            <DropdownItem name="5">更新策略</DropdownItem>
-            <DropdownItem name="6">重启设备</DropdownItem>
-            <DropdownItem name="7">合规处理</DropdownItem>
+            <DropdownItem name="4">解除限制</DropdownItem>
+            <DropdownItem name="5">限制使用</DropdownItem>
+            <DropdownItem name="6">更新策略</DropdownItem>
+            <DropdownItem name="7">重启设备</DropdownItem>
+            <DropdownItem name="8">合规处理</DropdownItem>
           </DropdownMenu>
         </Dropdown>
       </div>
@@ -45,9 +45,11 @@
       >
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
-            <div @click="toDetail(row)">违规详情</div>
-            <div @click="toRestore(row)">恢复出厂</div>
-            <div @click="toHandle(row)">合规处理</div>
+            <div v-if="row.sn && row.num > 0" @click="toDetail(row)">
+              违规详情
+            </div>
+            <div v-if="row.sn" @click="toRestore(row)">恢复出厂</div>
+            <div v-if="row.sn" @click="toLogHandle([row.sn])">合规处理</div>
           </div>
         </template>
       </Table>
@@ -65,14 +67,85 @@
         show-sizer
       ></Page>
     </div>
+    <Modal
+      class="modal1"
+      :mask-closable="false"
+      v-model="controlMessageInfo.show"
+      title="发送消息"
+    >
+      <Form
+        v-if="controlMessageInfo.show"
+        ref="sendMsgForm"
+        :model="controlMessageInfo"
+        :rules="rules"
+        :label-width="60"
+      >
+        <FormItem label="标题" prop="title">
+          <Input
+            v-model="controlMessageInfo.title"
+            :maxlength="32"
+            show-word-limit
+            placeholder="请输入标题，不超过32个字符"
+          ></Input>
+        </FormItem>
+        <FormItem label="内容" prop="content">
+          <Input
+            type="textarea"
+            v-model="controlMessageInfo.content"
+            :maxlength="255"
+            show-word-limit
+            placeholder="请输入内容"
+          ></Input>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button @click="controlMessageInfo.show = false">取消</Button>
+        <Button @click="controlSendMessage()" type="primary" class="primary_btn"
+          >保存</Button
+        >
+      </div>
+    </Modal>
+    <Modal
+      class="modal1"
+      :mask-closable="false"
+      v-model="logDetailInfo.show"
+      title="违规详情"
+    >
+      <div class="table_wrap">
+        <Table :columns="detailColumns" :data="logDetailInfo.list">
+          <template slot-scope="{ row }" slot="doEventSlot">
+            <div>{{ doEventInfo[row.doEvent] }}</div>
+          </template>
+        </Table>
+      </div>
+      <div slot="footer" style="text-align: center">
+        <Button @click="logDetailInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
   </div>
 </template>
 
 <script>
-import { device_manager_list_vd } from "@/api/device_manager";
+import { doEventInfo } from "@/utils";
+import controlWs from "@/utils/ControlWs";
+import ControlWSMsg from "@/utils/ControlWSMsg";
+import { logPush_add, logdoperate_edit_handled } from "@/api/log";
+import {
+  device_manager_list_vd,
+  device_manager_detail_vd
+} from "@/api/device_manager";
 export default {
   data() {
     return {
+      doEventInfo,
+      userInfo: {},
+      // ws连接后回发信息
+      wsEnterInfo: {
+        // 消息ID
+        mid: null,
+        // 是否进入
+        isEnter: false
+      },
       searchForm: {
         name: "",
         // 是否处理：0否 1是
@@ -82,7 +155,33 @@ export default {
         list: [],
         total: 0
       },
+      logDetailInfo: {
+        show: false,
+        list: []
+      },
       tableSelection: [],
+      controlMessageInfo: {
+        show: false,
+        title: "",
+        content: "",
+        list: []
+      },
+      rules: {
+        title: [
+          {
+            required: true,
+            message: "请输入标题",
+            trigger: "blur"
+          }
+        ],
+        content: [
+          {
+            required: true,
+            message: "请选择内容",
+            trigger: "blur"
+          }
+        ]
+      },
       columns: [
         {
           type: "selection",
@@ -123,7 +222,7 @@ export default {
           align: "center"
         },
         {
-          title: "ID(IMEI/MEID/ESN)",
+          title: "SN",
           key: "sn",
           align: "center"
         },
@@ -134,14 +233,13 @@ export default {
         },
         {
           title: "更新时间",
-          key: "lasttime",
+          key: "updatetime",
           width: 190,
           align: "center"
         },
         {
-          title: "操作中",
+          title: "违规详情",
           key: "num",
-          width: 100,
           align: "center"
         },
         {
@@ -150,18 +248,90 @@ export default {
           width: 260,
           align: "center"
         }
+      ],
+      detailColumns: [
+        {
+          title: "序号",
+          type: "index",
+          align: "center",
+          width: 70
+        },
+        {
+          title: "设备使用人",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "违规事件",
+          slot: "doEventSlot",
+          align: "center"
+        },
+        {
+          title: "违规时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
       ]
     };
   },
   created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
     this.searchList();
+    this.initMonitorWS();
   },
   computed: {
     powerParams() {
       return this.$store.getters.powerParams;
     }
   },
+  beforeDestroy() {
+    controlWs.myevent.$off("ws_error");
+    controlWs.myevent.$off("ws_open");
+    controlWs.myevent.$off("ws_getmsg");
+    controlWs.closeWs();
+  },
   methods: {
+    initMonitorWS() {
+      controlWs.setWs();
+      this.getWSEventInfo();
+    },
+    getWSEventInfo() {
+      controlWs.myevent.$on("ws_error", () => {
+        this.$Message.error("网络异常，请检查网络");
+      });
+      controlWs.myevent.$on("ws_open", () => {
+        this.sendAfterConnection();
+      });
+      controlWs.myevent.$on("ws_getmsg", (data) => {
+        if (data.code === 666) {
+          if (this.wsEnterInfo.mid === data.mid) {
+            this.wsEnterInfo.isEnter = true;
+          }
+        }
+        if (!this.wsEnterInfo.isEnter) {
+          return;
+        }
+      });
+    },
+    // 连接后回发(需确认)
+    sendAfterConnection() {
+      this.wsEnterInfo.isEnter = false;
+      let controlWSMsg = new ControlWSMsg(controlWs.ws, this.userInfo.adminid);
+      controlWSMsg.afterConnection({
+        userid: String(this.userInfo.adminid),
+        username: this.userInfo.aname,
+        schoolid: this.powerParams.objectid,
+        usertype: 1
+      });
+      controlWSMsg.send((isSend) => {
+        if (isSend) {
+          this.wsEnterInfo.mid = controlWSMsg.mid;
+        }
+      });
+    },
     // 搜索
     searchList() {
       this.searchForm.page = 1;
@@ -198,35 +368,298 @@ export default {
       });
     },
     // 违规详情
-    toDetail() {},
+    toDetail(row) {
+      device_manager_detail_vd({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        size: 20,
+        name: row.sn
+      }).then((data) => {
+        if (data.code === 0) {
+          this.logDetailInfo = {
+            show: true,
+            list: data.obj
+          };
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
     // 恢复出厂
-    toRestore() {},
+    toRestore(row) {
+      if (!row.sn) {
+        this.$Message.error("设备不存在");
+        return;
+      }
+      this.$Modal.confirm({
+        title: "提示",
+        content: "确定对所选设备进行恢复出厂设置操作吗？",
+        onOk: () => {
+          this.controlRestoreFactory([row.sn]);
+        },
+        onCancel: () => {}
+      });
+    },
     // 合规处理
-    toHandle() {},
+    toLogHandle(snList) {
+      this.$Modal.confirm({
+        title: "提示",
+        content: "确定对所选设备进行合规处理操作吗？",
+        onOk: () => {
+          logdoperate_edit_handled({
+            sn: snList
+          }).then((data) => {
+            if (data.code === 0) {
+              this.$Message.success(data.msg);
+              this.searchList();
+            } else {
+              this.$Message.error(data.msg);
+            }
+          });
+        },
+        onCancel: () => {}
+      });
+    },
     selectionChange(selection) {
       this.tableSelection = selection;
     },
     // 其他操作
     dropdownSelected(name) {
-      if (this.tableSelection.length === 0) {
-        this.$Message.error("请选择列表");
+      if (!this.wsEnterInfo.isEnter) {
+        this.$Message.error("推送服务不可用");
         return;
       }
+      let snList = this.tableSelection
+        .filter((row) => row.sn)
+        .map((item) => item.sn);
       if (name === "1") {
-        // 恢复出厂设置
+        // 恢复出厂
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行恢复出厂设置操作吗？",
+          onOk: () => {
+            this.controlRestoreFactory(snList);
+          },
+          onCancel: () => {}
+        });
       } else if (name === "2") {
         // 发送消息
-      } else if (name === "3") {
-        // 解除限制
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.controlMessageInfo = {
+          show: true,
+          title: "",
+          content: "",
+          list: snList
+        };
       } else if (name === "4") {
-        // 限制使用
+        // 解除限制
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行解除限制操作吗？",
+          onOk: () => {
+            this.controlRemoveLimit(snList);
+          },
+          onCancel: () => {}
+        });
       } else if (name === "5") {
-        // 更新策略
+        // 限制使用
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行限制使用操作吗？",
+          onOk: () => {
+            this.controlLimitedUse(snList);
+          },
+          onCancel: () => {}
+        });
       } else if (name === "6") {
-        // 重启设备
+        // 更新策略
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行更新策略操作吗？",
+          onOk: () => {
+            this.controlUpdateStrategy(snList);
+          },
+          onCancel: () => {}
+        });
       } else if (name === "7") {
-        // 合理处理
+        // 重启设备
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行重启设备操作吗？",
+          onOk: () => {
+            this.controlRebootDevice(snList);
+          },
+          onCancel: () => {}
+        });
+      } else if (name === "8") {
+        // 合规处理
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
+          return;
+        }
+        this.toLogHandle(snList);
+      }
+    },
+    // 恢复出厂设置
+    controlRestoreFactory(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.restoreFactory();
+      controlWSMsg.send();
+      let form = {
+        pushType: 6,
+        pushObj: 1
+      };
+      if (snList.length > 1) {
+        form.userids = snList;
+      } else {
+        form.pushObjid = snList[0];
+      }
+      this.addPushLog(form);
+    },
+    // 发送消息
+    controlSendMessage() {
+      this.$refs.sendMsgForm.validate((valid) => {
+        if (valid) {
+          this.controlMessageInfo.show = false;
+          let snList = this.controlMessageInfo.list;
+          let controlWSMsg = new ControlWSMsg(
+            controlWs.ws,
+            this.userInfo.adminid,
+            snList
+          );
+          controlWSMsg.msgContent(this.controlMessageInfo.content);
+          controlWSMsg.send();
+          let form = {
+            pushType: 1,
+            pushObj: 1,
+            content: this.controlMessageInfo.content
+          };
+          if (snList.length > 1) {
+            form.userids = snList;
+          } else {
+            form.pushObjid = snList[0];
+          }
+          this.addPushLog(form);
+        }
+      });
+    },
+    // 解除限制
+    controlRemoveLimit(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.removeLimit();
+      controlWSMsg.send();
+      let form = {
+        pushType: 2,
+        pushObj: 1
+      };
+      if (snList.length > 1) {
+        form.userids = snList;
+      } else {
+        form.pushObjid = snList[0];
+      }
+      this.addPushLog(form);
+    },
+    // 限制使用
+    controlLimitedUse(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.limitedUse();
+      controlWSMsg.send();
+      let form = {
+        pushType: 3,
+        pushObj: 1
+      };
+      if (snList.length > 1) {
+        form.userids = snList;
+      } else {
+        form.pushObjid = snList[0];
+      }
+      this.addPushLog(form);
+    },
+    // 更新策略
+    controlUpdateStrategy(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.updateStrategy();
+      controlWSMsg.send();
+      let form = {
+        pushType: 4,
+        pushObj: 1
+      };
+      if (snList.length > 1) {
+        form.userids = snList;
+      } else {
+        form.pushObjid = snList[0];
       }
+      this.addPushLog(form);
+    },
+    // 重启设备
+    controlRebootDevice(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.rebootDevice();
+      controlWSMsg.send();
+      let form = {
+        pushType: 4,
+        pushObj: 1
+      };
+      if (snList.length > 1) {
+        form.userids = snList;
+      } else {
+        form.pushObjid = snList[0];
+      }
+      this.addPushLog(form);
+    },
+    // 添加推送日志
+    addPushLog(form) {
+      logPush_add(form).then((data) => {
+        if (data.code === 0) {
+          this.$refs.deviceTable.selectAll(false);
+          this.$Message.success(data.msg);
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
     }
   }
 };

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -78,6 +78,7 @@
       </div>
       <div class="table_wrap">
         <Table
+          ref="deviceTable"
           :columns="columns"
           :data="searchForm.list"
           @on-selection-change="selectionChange"
@@ -91,7 +92,7 @@
             <div class="action_list">
               <div @click="toView(row)">查看</div>
               <div @click="toStrategy(row)">策略</div>
-              <div @click="toPsw(row)">设备密码</div>
+              <div v-if="row.sn" @click="toPsw(row)">设备密码</div>
             </div>
           </template>
         </Table>
@@ -110,6 +111,244 @@
         ></Page>
       </div>
     </div>
+    <Modal
+      class="modal1"
+      :mask-closable="false"
+      v-model="controlMessageInfo.show"
+      :title="controlMessageInfo.classid ? '整班发送消息' : '发送消息'"
+    >
+      <Form
+        v-if="controlMessageInfo.show"
+        ref="sendMsgForm"
+        :model="controlMessageInfo"
+        :rules="rules"
+        :label-width="60"
+      >
+        <FormItem label="标题" prop="title">
+          <Input
+            v-model="controlMessageInfo.title"
+            :maxlength="32"
+            show-word-limit
+            placeholder="请输入标题，不超过32个字符"
+          ></Input>
+        </FormItem>
+        <FormItem label="内容" prop="content">
+          <Input
+            type="textarea"
+            v-model="controlMessageInfo.content"
+            :maxlength="255"
+            show-word-limit
+            placeholder="请输入内容"
+          ></Input>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button @click="controlMessageInfo.show = false">取消</Button>
+        <Button @click="controlSendMessage()" type="primary" class="primary_btn"
+          >保存</Button
+        >
+      </div>
+    </Modal>
+    <Modal
+      class="modal4"
+      :mask-closable="false"
+      v-model="devicePswInfo.show"
+      title="设备密码"
+    >
+      <div class="device_psw">
+        <div class="device_psw_title">设备密码</div>
+        <div class="device_psw_num">{{ devicePswInfo.controlPwd }}</div>
+        <div class="device_psw_title">注销密码</div>
+        <div class="device_psw_num">{{ devicePswInfo.logoutPwd }}</div>
+      </div>
+      <div slot="footer" style="text-align: center">
+        <Button @click="devicePswInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
+    <Modal
+      class="modal5"
+      :mask-closable="false"
+      v-model="strategyInfo.show"
+      :title="`策略【${strategyInfo.username}】`"
+    >
+      <div class="content" v-if="strategyInfo.show">
+        <div class="strategy_list">
+          <div class="strategy_title">
+            <div>
+              <span
+                style="font-size: 26px"
+                class="ivu-icon iconfont icon-shijian"
+              ></span
+              >时间限制策略
+            </div>
+          </div>
+          <div style="margin-bottom: 10px" v-if="strategyInfo.hastime">
+            <div class="showtime">
+              <div
+                style="line-height: 30px; font-size: 16px; margin-bottom: 10px"
+              >
+                设备生效时间
+              </div>
+              <div class="week">
+                <div class="day" v-for="item in weekDay" :key="item.value">
+                  <div class="day_title">{{ item.alias }}</div>
+                  <div class="day_content">
+                    <div
+                      class="time"
+                      v-for="(sItem, sIndex) in strategyPadTimes(item.value)"
+                      :key="sIndex"
+                    >
+                      {{ sItem.starttime }} - {{ sItem.stoptime }}
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="nodata" v-else>未设置时间限制策略</div>
+        </div>
+        <div class="strategy_list">
+          <div class="strategy_title">
+            <div>
+              <span class="ivu-icon iconfont icon-yingyongcelve"></span>应用策略
+            </div>
+          </div>
+          <div class="strategy_content" v-if="strategyInfo.hasapp">
+            <div class="strategy_top">
+              <span>授权应用</span>
+            </div>
+            <div
+              class="strategy_bottom"
+              style="min-height: 160px"
+              v-if="strategyInfo.padApps.length > 0"
+            >
+              <div
+                class="app_list"
+                v-for="item in strategyInfo.padApps"
+                :key="item.appid"
+              >
+                <img :src="$api.baseImageUrl + item.appIcon" />
+                <div>{{ item.appName }}</div>
+              </div>
+            </div>
+          </div>
+          <div class="nodata" v-else>未设置应用策略</div>
+        </div>
+        <div class="strategy_list">
+          <div class="strategy_title">
+            <div>
+              <span class="ivu-icon iconfont icon-shezhi"></span>设备策略
+            </div>
+          </div>
+          <div class="strategy_content" v-if="strategyInfo.hasdevice">
+            <div class="strategy_top">
+              <span>设备功能管理</span>
+            </div>
+            <div class="strategy_bottom" style="min-height: 160px">
+              <div
+                class="device_list"
+                v-for="item in padDeviceIcon"
+                :key="item.pdtype"
+              >
+                <div class="icon">
+                  <span :class="[item.icon]"></span>
+                </div>
+                <div class="title">{{ item.pdtype }}</div>
+                <i-switch
+                  size="large"
+                  :value="strategyInfo.pdtypeInfo[item.pdtype]"
+                  :disabled="true"
+                  :true-value="1"
+                  :false-value="2"
+                >
+                  <span slot="open">开启</span>
+                  <span slot="close">关闭</span>
+                </i-switch>
+              </div>
+            </div>
+          </div>
+          <div class="nodata" v-else>未设置设备策略</div>
+        </div>
+        <div class="strategy_list">
+          <div class="strategy_title">
+            <div>
+              <span
+                style="font-size: 18px"
+                class="ivu-icon iconfont icon-wifi"
+              ></span
+              >Wifi白名单策略
+            </div>
+          </div>
+          <div class="strategy_content" v-if="strategyInfo.haswifi">
+            <div class="strategy_top">
+              <span>SSID</span>
+            </div>
+            <div class="strategy_bottom" style="min-height: 76px">
+              <div
+                class="padWifis"
+                v-for="(item, index) in strategyInfo.padWifis"
+                :key="index"
+              >
+                <div class="title">{{ item }}</div>
+              </div>
+            </div>
+          </div>
+          <div class="nodata" v-else>未设置Wifi白名单</div>
+        </div>
+        <div class="strategy_list">
+          <div class="strategy_title">
+            <div>
+              <span class="ivu-icon iconfont icon-weiguiguanli"></span>违规处理
+            </div>
+          </div>
+          <div style="border: 1px solid #ced9f2; border-bottom: none">
+            <Table
+              v-if="strategyInfo.hasviolate"
+              class="table"
+              :columns="violationColumns"
+              :data="padViolatesInfo"
+            >
+              <template slot-scope="{ row }" slot="violationEvents">
+                <Checkbox
+                  :disabled="true"
+                  class="checked"
+                  :value="
+                    strategyInfo.violatesInfo[row.violateType] &&
+                    strategyInfo.violatesInfo[row.violateType].length > 0
+                  "
+                ></Checkbox>
+                <span
+                  style="display: inline-block; width: 120px; text-align: left"
+                  >{{ row.title }}</span
+                >
+              </template>
+              <template slot-scope="{ row }" slot="violationHandling">
+                <CheckboxGroup
+                  :value="
+                    strategyInfo.violatesInfo[row.violateType] &&
+                    strategyInfo.violatesInfo[row.violateType]
+                  "
+                >
+                  <Checkbox :disabled="true" label="通知管理员"></Checkbox>
+                  <Checkbox
+                    :disabled="true"
+                    style="margin: 0 40px"
+                    label="限制使用"
+                  ></Checkbox>
+                  <Checkbox :disabled="true" label="恢复出厂设置"></Checkbox>
+                </CheckboxGroup>
+              </template>
+            </Table>
+          </div>
+          <div class="nodata" v-if="!strategyInfo.hasviolate">
+            未设置违规处理
+          </div>
+        </div>
+      </div>
+      <div slot="footer" style="text-align: center">
+        <Button @click="strategyInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
   </div>
 </template>
 
@@ -117,15 +356,22 @@
 import controlWs from "@/utils/ControlWs";
 import ControlWSMsg from "@/utils/ControlWSMsg";
 import { exportToExcel } from "@/utils/exportToExcel";
-import { class_list } from "@/api/school";
+import { class_list, user_list_cs } from "@/api/school";
 import {
   device_manager_list_d,
   device_manager_export_d,
   device_manager_export_id
 } from "@/api/device_manager";
+import { password_detail_userpwd } from "@/api/setting";
+import { stPad_detail_web } from "@/api/stPad";
+import { logPush_add } from "@/api/log";
+import { weekDay, padDeviceIcon, padViolatesInfo } from "@/utils";
 export default {
   data() {
     return {
+      weekDay,
+      padDeviceIcon,
+      padViolatesInfo,
       userInfo: {},
       // ws连接后回发信息
       wsEnterInfo: {
@@ -143,7 +389,35 @@ export default {
         list: [],
         total: 0
       },
+      devicePswInfo: {
+        show: false,
+        controlPwd: null,
+        logoutPwd: null
+      },
       tableSelection: [],
+      controlMessageInfo: {
+        show: false,
+        title: "",
+        content: "",
+        classid: null,
+        list: []
+      },
+      rules: {
+        title: [
+          {
+            required: true,
+            message: "请输入标题",
+            trigger: "blur"
+          }
+        ],
+        content: [
+          {
+            required: true,
+            message: "请选择内容",
+            trigger: "blur"
+          }
+        ]
+      },
       schoolInfo: {
         schoolid: null,
         schoolname: null,
@@ -189,7 +463,7 @@ export default {
           align: "center"
         },
         {
-          title: "ID(IMEI/MEID/ESN)",
+          title: "SN",
           key: "sn",
           align: "center"
         },
@@ -210,6 +484,37 @@ export default {
           width: 200,
           align: "center"
         }
+      ],
+      strategyInfo: {
+        username: null,
+        userid: null,
+        rversion: null,
+        padid: null,
+        show: false,
+        hastime: false, // 是否开启时间策略：0否 1是
+        padTimes: [], // 平板策略时间
+        hasapp: false, //是否开启应用策略：0否 1是
+        padApps: [], //appid集合
+        hasdevice: false, //是否开启设备策略：0否 1是
+        padDevices: [], //授权应用
+        pdtypeInfo: {},
+        haswifi: false, //是否开启wifi白名单策略：0否 1是
+        padWifis: [], //wifi白名单
+        hasviolate: false, //是否开启违规通知：0否 1是
+        padViolates: [] //设备违规
+      },
+      violationColumns: [
+        {
+          title: "违规事件",
+          slot: "violationEvents",
+          align: "center",
+          width: 260
+        },
+        {
+          title: "违规处理",
+          slot: "violationHandling",
+          align: "center"
+        }
       ]
     };
   },
@@ -356,7 +661,7 @@ export default {
                         ? "离线"
                         : "",
                     设备型号: item.deviceModel,
-                    "ID(IMEI/MEID/ESN)": item.sn,
+                    SN: item.sn,
                     Rom版本: item.romVersion,
                     更新时间: item.updatetime
                   };
@@ -408,9 +713,58 @@ export default {
     // 查看
     toView() {},
     // 策略
-    toStrategy() {},
+    toStrategy(row) {
+      stPad_detail_web({ objectid: row.userid }).then((res) => {
+        if (res.code === 0) {
+          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 = 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;
+          this.strategyInfo.padApps = res.obj.padApps || [];
+          this.strategyInfo.padWifis = res.obj.padWifis || [];
+          this.strategyInfo.padTimes = res.obj.padTimes || [];
+          let pdtypeInfo = {};
+          this.strategyInfo.padDevices = res.obj.padDevices;
+          this.strategyInfo.padDevices.forEach((item) => {
+            pdtypeInfo[item.pdtype] = item.enabled;
+          });
+          this.strategyInfo.pdtypeInfo = pdtypeInfo;
+          let violatesInfo = {};
+          this.strategyInfo.padViolates = res.obj.padViolates;
+          this.strategyInfo.padViolates.forEach((item) => {
+            violatesInfo[item.violateType] =
+              item.handle_method && item.handle_method.split("；");
+          });
+          this.strategyInfo.violatesInfo = violatesInfo;
+          this.strategyInfo.show = true;
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
     // 设备密码
-    toPsw() {},
+    toPsw(row) {
+      password_detail_userpwd({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid,
+        sn: row.sn
+      }).then((data) => {
+        if (data.code === 0) {
+          this.devicePswInfo = {
+            show: true,
+            controlPwd: data.obj.controlPwd,
+            logoutPwd: data.obj.logoutPwd
+          };
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
     selectionChange(selection) {
       this.tableSelection = selection;
     },
@@ -420,53 +774,259 @@ export default {
         this.$Message.error("推送服务不可用");
         return;
       }
-      let snList = this.tableSelection.map((row) => row.sn).filter(Boolean);
+      let snList = this.tableSelection
+        .filter((row) => row.sn)
+        .map((item) => item.sn);
       if (name === "1") {
-        // 恢复出厂设置
-        if (this.tableSelection.length === 0) {
-          this.$Message.error("请选择列表");
+        // 恢复出厂
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
           return;
         }
-        let controlWSMsg = new ControlWSMsg(
-          controlWs.ws,
-          this.userInfo.adminid,
-          snList
-        );
-        controlWSMsg.restoreFactory();
-        controlWSMsg.send();
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行恢复出厂设置操作吗？",
+          onOk: () => {
+            this.controlRestoreFactory(snList);
+          },
+          onCancel: () => {}
+        });
       } else if (name === "2") {
         // 发送消息
-        if (this.tableSelection.length === 0) {
-          this.$Message.error("请选择列表");
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
           return;
         }
+        this.controlMessageInfo = {
+          show: true,
+          title: "",
+          content: "",
+          classid: null,
+          list: snList
+        };
       } else if (name === "3") {
         // 整班发送消息
+        user_list_cs({
+          classid: this.searchForm.classid
+        }).then((data) => {
+          if (data.code === 0) {
+            if (data.obj.length === 0) {
+              this.$Message.error("当前班级没有设备");
+              return;
+            }
+            this.controlMessageInfo = {
+              show: true,
+              title: "",
+              content: "",
+              classid: this.searchForm.classid,
+              list: data.obj
+            };
+          } else {
+            this.$Message.error(data.msg);
+          }
+        });
       } else if (name === "4") {
         // 解除限制
-        if (this.tableSelection.length === 0) {
-          this.$Message.error("请选择列表");
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
           return;
         }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行解除限制操作吗？",
+          onOk: () => {
+            this.controlRemoveLimit(snList);
+          },
+          onCancel: () => {}
+        });
       } else if (name === "5") {
         // 限制使用
-        if (this.tableSelection.length === 0) {
-          this.$Message.error("请选择列表");
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
           return;
         }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行限制使用操作吗？",
+          onOk: () => {
+            this.controlLimitedUse(snList);
+          },
+          onCancel: () => {}
+        });
       } else if (name === "6") {
         // 更新策略
-        if (this.tableSelection.length === 0) {
-          this.$Message.error("请选择列表");
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
           return;
         }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行更新策略操作吗？",
+          onOk: () => {
+            this.controlUpdateStrategy(snList);
+          },
+          onCancel: () => {}
+        });
       } else if (name === "7") {
         // 重启设备
-        if (this.tableSelection.length === 0) {
-          this.$Message.error("请选择列表");
+        if (snList.length === 0) {
+          this.$Message.error("请勾选至少一个设备。");
           return;
         }
+        this.$Modal.confirm({
+          title: "提示",
+          content: "确定对所选设备进行重启设备操作吗？",
+          onOk: () => {
+            this.controlRebootDevice(snList);
+          },
+          onCancel: () => {}
+        });
+      }
+    },
+    // 恢复出厂设置
+    controlRestoreFactory(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.restoreFactory();
+      controlWSMsg.send();
+      let form = {
+        pushType: 6,
+        pushObj: 1
+      };
+      if (snList.length > 1) {
+        form.userids = snList;
+      } else {
+        form.pushObjid = snList[0];
+      }
+      this.addPushLog(form);
+    },
+    // 发送消息
+    controlSendMessage() {
+      this.$refs.sendMsgForm.validate((valid) => {
+        if (valid) {
+          this.controlMessageInfo.show = false;
+          let snList = this.controlMessageInfo.list;
+          let controlWSMsg = new ControlWSMsg(
+            controlWs.ws,
+            this.userInfo.adminid,
+            snList
+          );
+          controlWSMsg.msgContent(this.controlMessageInfo.content);
+          controlWSMsg.send();
+          let form = {
+            pushType: 1,
+            pushObj: this.controlMessageInfo.classid ? 2 : 1,
+            content: this.controlMessageInfo.content
+          };
+          if (this.controlMessageInfo.classid) {
+            form.pushObjid = this.controlMessageInfo.classid;
+          } else {
+            if (snList.length > 1) {
+              form.userids = snList;
+            } else {
+              form.pushObjid = snList[0];
+            }
+          }
+          this.addPushLog(form);
+        }
+      });
+    },
+    // 解除限制
+    controlRemoveLimit(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.removeLimit();
+      controlWSMsg.send();
+      let form = {
+        pushType: 2,
+        pushObj: 1
+      };
+      if (snList.length > 1) {
+        form.userids = snList;
+      } else {
+        form.pushObjid = snList[0];
+      }
+      this.addPushLog(form);
+    },
+    // 限制使用
+    controlLimitedUse(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.limitedUse();
+      controlWSMsg.send();
+      let form = {
+        pushType: 3,
+        pushObj: 1
+      };
+      if (snList.length > 1) {
+        form.userids = snList;
+      } else {
+        form.pushObjid = snList[0];
+      }
+      this.addPushLog(form);
+    },
+    // 更新策略
+    controlUpdateStrategy(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.updateStrategy();
+      controlWSMsg.send();
+      let form = {
+        pushType: 4,
+        pushObj: 1
+      };
+      if (snList.length > 1) {
+        form.userids = snList;
+      } else {
+        form.pushObjid = snList[0];
+      }
+      this.addPushLog(form);
+    },
+    // 重启设备
+    controlRebootDevice(snList) {
+      let controlWSMsg = new ControlWSMsg(
+        controlWs.ws,
+        this.userInfo.adminid,
+        snList
+      );
+      controlWSMsg.rebootDevice();
+      controlWSMsg.send();
+      let form = {
+        pushType: 4,
+        pushObj: 1
+      };
+      if (snList.length > 1) {
+        form.userids = snList;
+      } else {
+        form.pushObjid = snList[0];
       }
+      this.addPushLog(form);
+    },
+    // 添加推送日志
+    addPushLog(form) {
+      logPush_add(form).then((data) => {
+        if (data.code === 0) {
+          this.$refs.deviceTable.selectAll(false);
+          this.$Message.success(data.msg);
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    strategyPadTimes(id) {
+      return this.strategyInfo.padTimes.filter((v) => v.week === id);
     }
   }
 };
@@ -561,4 +1121,180 @@ export default {
     }
   }
 }
+.device_psw {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .device_psw_title {
+    margin: 0 16px;
+    font-size: 16px;
+  }
+  .device_psw_num {
+    padding: 0 10px;
+    font-size: 24px;
+    line-height: 32px;
+    font-weight: bold;
+    border-radius: 8px;
+    border: 1px solid #ced9f2;
+    background: #f3f4fc;
+  }
+}
+.content {
+  .strategy_list {
+    font-family: "SourceHanSansCN";
+    .strategy_title {
+      height: 40px;
+      font-size: 16px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      div:first-of-type {
+        font-weight: bold;
+        span {
+          font-size: 22px;
+          color: #339dff;
+          margin-right: 4px;
+        }
+      }
+    }
+    .strategy_content {
+      border-radius: 6px 6px 0 0;
+      border: 1px solid #ced9f2;
+      .strategy_top {
+        display: flex;
+        height: 46px;
+        align-items: center;
+        background: #edf3ff;
+        padding-left: 20px;
+        border-bottom: 1px solid #ced9f2;
+        span {
+          font-size: 16px;
+          color: #253a70;
+          font-weight: 400;
+          font-family: "SourceHanSansCN";
+        }
+      }
+      .strategy_bottom {
+        display: flex;
+        flex-wrap: wrap;
+        padding: 20px;
+        .app_list {
+          margin: 0 16px 16px 0;
+          width: 100px;
+          height: 110px;
+          border-radius: 10px;
+          border: 1px solid #798cb51a;
+          background: #ffffff;
+          text-align: center;
+          position: relative;
+          img {
+            margin: 16px 0;
+            width: 40px;
+            height: 40px;
+            object-fit: cover;
+          }
+          .checked {
+            position: absolute;
+            right: 2px;
+            top: 8px;
+            /deep/ .ivu-checkbox-inner {
+              border-radius: 50%;
+            }
+          }
+          &:hover {
+            cursor: pointer;
+            box-shadow: 10px 10px 20px 0 #339dff26;
+          }
+        }
+        .device_list {
+          display: flex;
+          height: 80px;
+          align-items: center;
+          margin-right: 40px;
+          .icon {
+            width: 56px;
+            height: 56px;
+            border-radius: 6px;
+            border: 1px solid #e5e5e5;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            span {
+              font-size: 28px;
+              color: #339dff;
+            }
+          }
+          .title {
+            width: 92px;
+            margin: 0 10px;
+          }
+        }
+        .padWifis {
+          border-radius: 5px;
+          border: 1px solid #339dff;
+          background: #eaf5ff;
+          padding: 4px 20px 4px 16px;
+          height: 26px;
+          margin: 0 20px 10px 0;
+          position: relative;
+          .title {
+            line-height: 14px;
+          }
+          img {
+            width: 16px;
+            height: 16px;
+            object-fit: cover;
+            position: absolute;
+            right: -4px;
+            top: -8px;
+            cursor: pointer;
+          }
+        }
+      }
+    }
+    .nodata {
+      color: #798cb5;
+      font-size: 16px;
+      line-height: 30px;
+    }
+  }
+  .showtime {
+    .week {
+      display: flex;
+      width: 100%;
+      .day {
+        width: 14.2%;
+        border: 1px solid #ced9f2;
+        border-right: none;
+        &:last-of-type {
+          border-right: 1px solid #ced9f2;
+        }
+        .day_title {
+          width: 100%;
+          height: 40px;
+          line-height: 40px;
+          background: #edf3ff;
+          border-bottom: 1px solid #ced9f2;
+          text-align: center;
+        }
+        .day_content {
+          min-height: 50px;
+          padding: 10px;
+          .time {
+            height: 30px;
+            line-height: 30px;
+            border-radius: 6px;
+            background: #dbeeff;
+            text-align: center;
+            color: #339dff;
+            font-size: 14px;
+            font-weight: 500;
+            margin-top: 10px;
+            font-family: "SourceHanSansCN";
+          }
+        }
+      }
+    }
+  }
+}
 </style>

src/views/schoolSection/deviceManage/inLineDevice.vue

@@ -114,7 +114,7 @@ export default {
           align: "center"
         },
         {
-          title: "ID(IMEI/MEID/ESN)",
+          title: "SN",
           key: "sn",
           align: "center"
         },

src/views/schoolSection/deviceManage/outControlDevice.vue

@@ -116,18 +116,18 @@ export default {
           align: "center"
         },
         {
-          title: "ID(IMEI/MEID/ESN)",
+          title: "SN",
           key: "sn",
           align: "center"
         },
         {
           title: "Rom版本",
-          key: "updatename",
+          key: "romVersion",
           align: "center"
         },
         {
           title: "Token更新时间",
-          key: "romVersion",
+          key: "lasttime",
           width: 190,
           align: "center"
         }

src/views/schoolSection/deviceManage/removeControlDevice.vue

@@ -91,7 +91,7 @@ export default {
           align: "center"
         },
         {
-          title: "ID(IMEI/MEID/ESN)",
+          title: "SN",
           key: "sn",
           align: "center"
         },

src/views/schoolSection/log/deviceExport.vue

@@ -99,7 +99,7 @@ export default {
           align: "center"
         },
         {
-          title: "ID(IMEI/MEID/ESN)",
+          title: "SN",
           key: "sn",
           align: "center"
         },
@@ -193,7 +193,7 @@ export default {
                     姓名: item.username,
                     设备号码: item.deviceMac,
                     设备型号: item.deviceModel,
-                    "ID(IMEI/MEID/ESN)": item.sn,
+                    SN: item.sn,
                     Rom版本: item.romVersion,
                     是否违规:
                       item.violated === 1

src/views/schoolSection/setting/deviceSetting.vue

@@ -50,11 +50,12 @@
             <Radio :label="0">否</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="管理密码">
+        <FormItem label="管理密码" v-if="menuInfo.pswDetail.trend !== 1">
           <Input
             v-model="menuInfo.pswDetail.password"
             placeholder="请输入管理密码"
           ></Input>
+          <div style="color: #f0153f">管理密码必须是8位数字或空</div>
         </FormItem>
       </Form>
     </div>
@@ -66,24 +67,24 @@
             <Radio :label="0">否</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="启动SD卡功能">
+        <!-- <FormItem label="启动SD卡功能">
           <RadioGroup v-model="menuInfo.setDetail.sdcard">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
-        </FormItem>
+        </FormItem> -->
         <FormItem label="启用电话短信">
           <RadioGroup v-model="menuInfo.setDetail.simcard">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="启用数据流量">
+        <!-- <FormItem label="启用数据流量">
           <RadioGroup v-model="menuInfo.setDetail.dataFlow">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
-        </FormItem>
+        </FormItem> -->
         <FormItem label="是否禁用注销">
           <RadioGroup v-model="menuInfo.setDetail.logout">
             <Radio :label="1">是</Radio>
@@ -102,30 +103,30 @@
             <Radio :label="0">否</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="开启手势密码">
+        <!-- <FormItem label="开启手势密码">
           <RadioGroup v-model="menuInfo.setDetail.gesturePwd">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
-        </FormItem>
-        <FormItem label="启用wifi高级选项">
+        </FormItem> -->
+        <!-- <FormItem label="启用wifi高级选项">
           <RadioGroup v-model="menuInfo.setDetail.wifiAdvanced">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
-        </FormItem>
+        </FormItem> -->
         <FormItem label="启用截屏">
           <RadioGroup v-model="menuInfo.setDetail.screenshots">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="启用客户端管理员">
+        <!-- <FormItem label="启用客户端管理员">
           <RadioGroup v-model="menuInfo.setDetail.clientAdmin">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
-        </FormItem>
+        </FormItem> -->
         <FormItem label="隐藏自动旋转">
           <RadioGroup v-model="menuInfo.setDetail.rotateSetting">
             <Radio :label="1">是</Radio>
@@ -147,12 +148,12 @@
             v-model="menuInfo.setDetail.duration"
           ></InputNumber>
         </FormItem>
-        <FormItem label="启用OTG功能">
+        <!-- <FormItem label="启用OTG功能">
           <RadioGroup v-model="menuInfo.setDetail.otg">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
-        </FormItem>
+        </FormItem> -->
       </Form>
       <Form :label-width="200">
         <FormItem label="隐藏图库">
@@ -173,7 +174,7 @@
             <Radio :label="0">否</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="隐藏日志">
+        <FormItem label="隐藏日历">
           <RadioGroup v-model="menuInfo.setDetail.calendar">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
@@ -185,36 +186,36 @@
             <Radio :label="0">否</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="限制安装来源">
+        <!-- <FormItem label="限制安装来源">
           <RadioGroup v-model="menuInfo.setDetail.installStore">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
-        </FormItem>
+        </FormItem> -->
         <FormItem label="允许用户改密码">
           <RadioGroup v-model="menuInfo.setDetail.changePwd">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="组织部门显示">
+        <FormItem label="学校班级展示">
           <RadioGroup v-model="menuInfo.setDetail.schoolClass">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="启用GPS">
+        <!-- <FormItem label="启用GPS">
           <RadioGroup v-model="menuInfo.setDetail.gps">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
-        </FormItem>
-        <FormItem label="显示隐私声明">
+        </FormItem> -->
+        <!-- <FormItem label="显示隐私声明">
           <RadioGroup v-model="menuInfo.setDetail.privacyStatement">
             <Radio :label="1">是</Radio>
             <Radio :label="0">否</Radio>
           </RadioGroup>
-        </FormItem>
+        </FormItem> -->
       </Form>
     </div>
     <div class="bottom_btns">
@@ -258,30 +259,30 @@ export default {
           dsid: null,
           rversion: null,
           forceBind: 1,
-          sdcard: 1,
+          // sdcard: 1,
           simcard: 1,
-          dataFlow: 1,
+          // dataFlow: 1,
           logout: 1,
           cleanup: 1,
           accelerate: 1,
-          gesturePwd: 1,
-          wifiAdvanced: 1,
+          // gesturePwd: 1,
+          // wifiAdvanced: 1,
           screenshots: 1,
-          clientAdmin: 1,
+          // clientAdmin: 1,
           rotateSetting: 1,
           gallery: 1,
           camera: 1,
           alarmClock: 1,
           calendar: 1,
           protectedEyes: 1,
-          installStore: 1,
+          // installStore: 1,
           changePwd: 1,
           schoolClass: 1,
-          gps: 1,
-          privacyStatement: 1,
+          // gps: 1,
+          // privacyStatement: 1,
           remindDuration: 1,
-          duration: 30,
-          otg: 1
+          duration: 30
+          // otg: 1
         }
       }
     };
@@ -376,30 +377,30 @@ export default {
               dsid: null,
               rversion: null,
               forceBind: 1,
-              sdcard: 1,
+              // sdcard: 1,
               simcard: 1,
-              dataFlow: 1,
+              // dataFlow: 1,
               logout: 1,
               cleanup: 1,
               accelerate: 1,
-              gesturePwd: 1,
-              wifiAdvanced: 1,
+              // gesturePwd: 1,
+              // wifiAdvanced: 1,
               screenshots: 1,
-              clientAdmin: 1,
+              // clientAdmin: 1,
               rotateSetting: 1,
               gallery: 1,
               camera: 1,
               alarmClock: 1,
               calendar: 1,
               protectedEyes: 1,
-              installStore: 1,
+              // installStore: 1,
               changePwd: 1,
               schoolClass: 1,
-              gps: 1,
-              privacyStatement: 1,
+              // gps: 1,
+              // privacyStatement: 1,
               remindDuration: 1,
-              duration: 30,
-              otg: 1
+              duration: 30
+              // otg: 1
             };
           }
         } else {
@@ -415,12 +416,23 @@ export default {
       }
     },
     savePswDetail() {
+      if (
+        this.menuInfo.pswDetail.trend !== 1 &&
+        this.menuInfo.pswDetail.password &&
+        !/^\d{8}$/.test(this.menuInfo.pswDetail.password)
+      ) {
+        this.$Message.error("密码格式不正确");
+        return;
+      }
       password_edit({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         schoolid: this.powerParams.objectid,
         trend: this.menuInfo.pswDetail.trend,
-        password: this.menuInfo.pswDetail.password,
+        password:
+          this.menuInfo.pswDetail.trend !== 1
+            ? this.menuInfo.pswDetail.password
+            : null,
         pwid: this.menuInfo.pswDetail.pwid,
         rversion: this.menuInfo.pswDetail.rversion
       }).then((data) => {
@@ -440,30 +452,30 @@ export default {
         dsid: this.menuInfo.setDetail.dsid,
         rversion: this.menuInfo.setDetail.rversion,
         forceBind: this.menuInfo.setDetail.forceBind,
-        sdcard: this.menuInfo.setDetail.sdcard,
+        // sdcard: this.menuInfo.setDetail.sdcard,
         simcard: this.menuInfo.setDetail.simcard,
-        dataFlow: this.menuInfo.setDetail.dataFlow,
+        // dataFlow: this.menuInfo.setDetail.dataFlow,
         logout: this.menuInfo.setDetail.logout,
         cleanup: this.menuInfo.setDetail.cleanup,
         accelerate: this.menuInfo.setDetail.accelerate,
-        gesturePwd: this.menuInfo.setDetail.gesturePwd,
-        wifiAdvanced: this.menuInfo.setDetail.wifiAdvanced,
+        // gesturePwd: this.menuInfo.setDetail.gesturePwd,
+        // wifiAdvanced: this.menuInfo.setDetail.wifiAdvanced,
         screenshots: this.menuInfo.setDetail.screenshots,
-        clientAdmin: this.menuInfo.setDetail.clientAdmin,
+        // clientAdmin: this.menuInfo.setDetail.clientAdmin,
         rotateSetting: this.menuInfo.setDetail.rotateSetting,
         gallery: this.menuInfo.setDetail.gallery,
         camera: this.menuInfo.setDetail.camera,
         alarmClock: this.menuInfo.setDetail.alarmClock,
         calendar: this.menuInfo.setDetail.calendar,
         protectedEyes: this.menuInfo.setDetail.protectedEyes,
-        installStore: this.menuInfo.setDetail.installStore,
+        // installStore: this.menuInfo.setDetail.installStore,
         changePwd: this.menuInfo.setDetail.changePwd,
         schoolClass: this.menuInfo.setDetail.schoolClass,
-        gps: this.menuInfo.setDetail.gps,
-        privacyStatement: this.menuInfo.setDetail.privacyStatement,
+        // gps: this.menuInfo.setDetail.gps,
+        // privacyStatement: this.menuInfo.setDetail.privacyStatement,
         remindDuration: this.menuInfo.setDetail.remindDuration,
-        duration: this.menuInfo.setDetail.duration,
-        otg: this.menuInfo.setDetail.otg
+        duration: this.menuInfo.setDetail.duration
+        // otg: this.menuInfo.setDetail.otg
       }).then((data) => {
         if (data.code === 0) {
           this.$Message.success(data.msg);