Merge commit '695dab1dc6b199de8ff853f2a83a89ba69b039f7' into gzb

src/api/device_manager.js

  */
 export const device_manager_export_id = (data) =>
   setRequest("device_manager/export_id", data);
+/**
+ * 11.1.4.4设备管理--查看
+ */
+export const device_manager_detail_d = (data) =>
+  setRequest("device_manager/detail_d", data);

src/views/schoolSection/deviceManage/breakRuleDevice.vue

         show: false,
         title: "",
         content: "",
-        list: []
+        snList: [],
+        useridList: []
       },
       rules: {
         title: [
         title: "提示",
         content: "确定对所选设备进行恢复出厂设置操作吗？",
         onOk: () => {
-          this.controlRestoreFactory([row.sn]);
+          this.controlRestoreFactory([row.sn], [row.userid]);
         },
         onCancel: () => {}
       });
         this.$Message.error("推送服务不可用");
         return;
       }
-      let snList = this.tableSelection
-        .filter((row) => row.sn)
-        .map((item) => item.sn);
+      let userList = this.tableSelection.filter((row) => row.sn);
+      let snList = [];
+      let useridList = [];
+      userList.forEach((item) => {
+        snList.push(item.sn);
+        useridList.push(item.userid);
+      });
       if (name === "1") {
         // 恢复出厂
         if (snList.length === 0) {
           title: "提示",
           content: "确定对所选设备进行恢复出厂设置操作吗？",
           onOk: () => {
-            this.controlRestoreFactory(snList);
+            this.controlRestoreFactory(snList, useridList);
           },
           onCancel: () => {}
         });
           show: true,
           title: "",
           content: "",
-          list: snList
+          snList,
+          useridList
         };
       } else if (name === "4") {
         // 解除限制
           title: "提示",
           content: "确定对所选设备进行解除限制操作吗？",
           onOk: () => {
-            this.controlRemoveLimit(snList);
+            this.controlRemoveLimit(snList, useridList);
           },
           onCancel: () => {}
         });
           title: "提示",
           content: "确定对所选设备进行限制使用操作吗？",
           onOk: () => {
-            this.controlLimitedUse(snList);
+            this.controlLimitedUse(snList, useridList);
           },
           onCancel: () => {}
         });
           title: "提示",
           content: "确定对所选设备进行更新策略操作吗？",
           onOk: () => {
-            this.controlUpdateStrategy(snList);
+            this.controlUpdateStrategy(snList, useridList);
           },
           onCancel: () => {}
         });
           title: "提示",
           content: "确定对所选设备进行重启设备操作吗？",
           onOk: () => {
-            this.controlRebootDevice(snList);
+            this.controlRebootDevice(snList, useridList);
           },
           onCancel: () => {}
         });
       }
     },
     // 恢复出厂设置
-    controlRestoreFactory(snList) {
+    controlRestoreFactory(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         pushObj: 1
       };
       if (snList.length > 1) {
-        form.userids = snList;
+        form.userids = useridList;
       } else {
-        form.pushObjid = snList[0];
+        form.pushObjid = useridList[0];
       }
       this.addPushLog(form);
     },
       this.$refs.sendMsgForm.validate((valid) => {
         if (valid) {
           this.controlMessageInfo.show = false;
-          let snList = this.controlMessageInfo.list;
+          let snList = this.controlMessageInfo.snList;
+          let useridList = this.controlMessageInfo.useridList;
           let controlWSMsg = new ControlWSMsg(
             controlWs.ws,
             this.userInfo.adminid,
             content: this.controlMessageInfo.content
           };
           if (snList.length > 1) {
-            form.userids = snList;
+            form.userids = useridList;
           } else {
-            form.pushObjid = snList[0];
+            form.pushObjid = useridList[0];
           }
           this.addPushLog(form);
         }
       });
     },
     // 解除限制
-    controlRemoveLimit(snList) {
+    controlRemoveLimit(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         pushObj: 1
       };
       if (snList.length > 1) {
-        form.userids = snList;
+        form.userids = useridList;
       } else {
-        form.pushObjid = snList[0];
+        form.pushObjid = useridList[0];
       }
       this.addPushLog(form);
     },
     // 限制使用
-    controlLimitedUse(snList) {
+    controlLimitedUse(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         pushObj: 1
       };
       if (snList.length > 1) {
-        form.userids = snList;
+        form.userids = useridList;
       } else {
-        form.pushObjid = snList[0];
+        form.pushObjid = useridList[0];
       }
       this.addPushLog(form);
     },
     // 更新策略
-    controlUpdateStrategy(snList) {
+    controlUpdateStrategy(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         pushObj: 1
       };
       if (snList.length > 1) {
-        form.userids = snList;
+        form.userids = useridList;
       } else {
-        form.pushObjid = snList[0];
+        form.pushObjid = useridList[0];
       }
       this.addPushLog(form);
     },
     // 重启设备
-    controlRebootDevice(snList) {
+    controlRebootDevice(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         pushObj: 1
       };
       if (snList.length > 1) {
-        form.userids = snList;
+        form.userids = useridList;
       } else {
-        form.pushObjid = snList[0];
+        form.pushObjid = useridList[0];
       }
       this.addPushLog(form);
     },

src/views/schoolSection/deviceManage/deviceManage.vue

           </template>
           <template slot-scope="{ row }" slot="actionSlot">
             <div class="action_list">
-              <div @click="toView(row)">查看</div>
+              <div v-if="row.sn" @click="toView(row)">查看</div>
               <div @click="toStrategy(row)">策略</div>
               <div v-if="row.sn" @click="toPsw(row)">设备密码</div>
             </div>
         <Button @click="strategyInfo.show = false">关闭</Button>
       </div>
     </Modal>
+    <Modal
+      class="modal2"
+      :mask-closable="false"
+      v-model="deviceDetailInfo.show"
+      :title="`查看【${deviceDetailInfo.username}】`"
+    >
+      <div class="section_title">基本信息</div>
+      <div class="section_item">
+        <div class="device_base">
+          <div class="device_base_left"></div>
+          <div class="device_base_right">
+            <Form :label-width="90">
+              <FormItem label="使用人">{{
+                deviceDetailInfo.detail.users[0] &&
+                deviceDetailInfo.detail.users[0].username
+              }}</FormItem>
+              <FormItem label="型号">{{
+                deviceDetailInfo.detail.deviceModel
+              }}</FormItem>
+              <FormItem label="OS版本">{{
+                deviceDetailInfo.detail.deviceVersion
+              }}</FormItem>
+              <FormItem label="设备名称">{{
+                deviceDetailInfo.detail.deviceName
+              }}</FormItem>
+              <FormItem label="是否root">{{
+                deviceDetailInfo.detail.root === 1 ? "是" : "否"
+              }}</FormItem>
+              <FormItem label="账号">{{
+                deviceDetailInfo.detail.users[0] &&
+                deviceDetailInfo.detail.users[0].loginname
+              }}</FormItem>
+            </Form>
+          </div>
+        </div>
+        <div class="device_users">
+          <Table
+            :columns="usersColumns"
+            :data="deviceDetailInfo.detail.users"
+          ></Table>
+        </div>
+      </div>
+      <div class="section_title">详细信息</div>
+      <div class="section_item">
+        <div class="detail_left">
+          <table class="my_table">
+            <tr>
+              <th style="width: 110px">设备号</th>
+              <td></td>
+            </tr>
+            <tr>
+              <th>SN/IMEI</th>
+              <td></td>
+            </tr>
+            <tr>
+              <th>WiFi/MAC</th>
+              <td></td>
+            </tr>
+            <tr>
+              <th>蓝牙MAC</th>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+        <div class="detail_center">
+          <table class="my_table">
+            <tr>
+              <th style="width: 110px">系统内核</th>
+              <td></td>
+            </tr>
+            <tr>
+              <th>Rom版本</th>
+              <td></td>
+            </tr>
+            <tr>
+              <th>SIM序列号</th>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+        <div class="detail_right"></div>
+        <div></div>
+      </div>
+      <div class="section_title">已安装应用</div>
+      <div class="section_table_wrap">
+        <Table
+          :columns="installsColumns"
+          :data="deviceDetailInfo.detail.installs"
+        ></Table>
+      </div>
+      <div class="section_title">地理位置</div>
+      <div class="section_title">应用使用统计</div>
+      <div class="section_table_wrap">
+        <Table :columns="usesColumns" :data="deviceDetailInfo.detail.uses">
+          <template slot-scope="{ row }" slot="durationSlot">
+            <div>{{ formatSeconds(row.duration) }}</div>
+          </template>
+        </Table>
+      </div>
+      <div class="section_title">设备日志</div>
+      <div class="section_table_wrap">
+        <Table :columns="logsColumns" :data="deviceDetailInfo.detail.logs">
+          <template slot-scope="{ row }" slot="doEventSlot">
+            <div>{{ doEventInfo[row.doEvent] }}</div>
+          </template>
+        </Table>
+      </div>
+      <div slot="footer" style="text-align: center">
+        <Button @click="deviceDetailInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
   </div>
 </template>
 
 import {
   device_manager_list_d,
   device_manager_export_d,
-  device_manager_export_id
+  device_manager_export_id,
+  device_manager_detail_d
 } 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";
+import {
+  weekDay,
+  padDeviceIcon,
+  padViolatesInfo,
+  doEventInfo,
+  formatSeconds
+} from "@/utils";
 export default {
   data() {
     return {
       weekDay,
       padDeviceIcon,
       padViolatesInfo,
+      doEventInfo,
+      formatSeconds,
       userInfo: {},
       // ws连接后回发信息
       wsEnterInfo: {
         title: "",
         content: "",
         classid: null,
-        list: []
+        snList: [],
+        useridList: []
       },
       rules: {
         title: [
           slot: "violationHandling",
           align: "center"
         }
+      ],
+      // 查看详情
+      deviceDetailInfo: {
+        show: false,
+        username: null,
+        detail: {
+          usedMemory: null,
+          createtime: null,
+          romVersion: null,
+          positions: [],
+          deviceVersion: null,
+          userid: null,
+          wifyMac: null,
+          deviceName: null,
+          users: [],
+          installs: [],
+          sysKernel: null,
+          totalMemory: null,
+          ddid: null,
+          regionid: null,
+          sim: null,
+          root: null,
+          blueMac: null,
+          deviceModel: null,
+          uses: [],
+          sn: null,
+          logs: []
+        }
+      },
+      usersColumns: [
+        {
+          title: "历史登录账号",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "设备使用人",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "操作时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ],
+      installsColumns: [
+        {
+          title: "应用名称",
+          key: "appName",
+          align: "center"
+        },
+        {
+          title: "版本名称",
+          key: "appVersion",
+          align: "center"
+        },
+        {
+          title: "版本号",
+          key: "appNum",
+          align: "center"
+        },
+        {
+          title: "包名",
+          key: "appPackage",
+          align: "center"
+        },
+        {
+          title: "创建时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ],
+      usesColumns: [
+        {
+          title: "应用名称",
+          key: "appName",
+          align: "center"
+        },
+        {
+          title: "使用时长",
+          slot: "durationSlot",
+          align: "center"
+        },
+        {
+          title: "启动次数",
+          key: "num",
+          align: "center"
+        }
+      ],
+      logsColumns: [
+        {
+          title: "设备使用人",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "事件",
+          slot: "doEventSlot",
+          align: "center"
+        },
+        {
+          title: "描述",
+          key: "comm",
+          align: "center"
+        },
+        {
+          title: "操作时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
       ]
     };
   },
       });
     },
     // 查看
-    toView() {},
+    toView(row) {
+      device_manager_detail_d({
+        name: row.sn
+      }).then((data) => {
+        if (data.code === 0) {
+          this.deviceDetailInfo.show = true;
+          this.deviceDetailInfo.username = row.username;
+          this.deviceDetailInfo.detail = data.obj;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
     // 策略
     toStrategy(row) {
       stPad_detail_web({ objectid: row.userid }).then((res) => {
         this.$Message.error("推送服务不可用");
         return;
       }
-      let snList = this.tableSelection
-        .filter((row) => row.sn)
-        .map((item) => item.sn);
+      let userList = this.tableSelection.filter((row) => row.sn);
+      let snList = [];
+      let useridList = [];
+      userList.forEach((item) => {
+        snList.push(item.sn);
+        useridList.push(item.userid);
+      });
       if (name === "1") {
         // 恢复出厂
         if (snList.length === 0) {
           title: "提示",
           content: "确定对所选设备进行恢复出厂设置操作吗？",
           onOk: () => {
-            this.controlRestoreFactory(snList);
+            this.controlRestoreFactory(snList, useridList);
           },
           onCancel: () => {}
         });
           title: "",
           content: "",
           classid: null,
-          list: snList
+          snList,
+          useridList
         };
       } else if (name === "3") {
         // 整班发送消息
               title: "",
               content: "",
               classid: this.searchForm.classid,
-              list: data.obj
+              snList: data.obj,
+              useridList: []
             };
           } else {
             this.$Message.error(data.msg);
           title: "提示",
           content: "确定对所选设备进行解除限制操作吗？",
           onOk: () => {
-            this.controlRemoveLimit(snList);
+            this.controlRemoveLimit(snList, useridList);
           },
           onCancel: () => {}
         });
           title: "提示",
           content: "确定对所选设备进行限制使用操作吗？",
           onOk: () => {
-            this.controlLimitedUse(snList);
+            this.controlLimitedUse(snList, useridList);
           },
           onCancel: () => {}
         });
           title: "提示",
           content: "确定对所选设备进行更新策略操作吗？",
           onOk: () => {
-            this.controlUpdateStrategy(snList);
+            this.controlUpdateStrategy(snList, useridList);
           },
           onCancel: () => {}
         });
           title: "提示",
           content: "确定对所选设备进行重启设备操作吗？",
           onOk: () => {
-            this.controlRebootDevice(snList);
+            this.controlRebootDevice(snList, useridList);
           },
           onCancel: () => {}
         });
       }
     },
     // 恢复出厂设置
-    controlRestoreFactory(snList) {
+    controlRestoreFactory(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         pushObj: 1
       };
       if (snList.length > 1) {
-        form.userids = snList;
+        form.userids = useridList;
       } else {
-        form.pushObjid = snList[0];
+        form.pushObjid = useridList[0];
       }
       this.addPushLog(form);
     },
       this.$refs.sendMsgForm.validate((valid) => {
         if (valid) {
           this.controlMessageInfo.show = false;
-          let snList = this.controlMessageInfo.list;
+          let snList = this.controlMessageInfo.snList;
+          let useridList = this.controlMessageInfo.useridList;
           let controlWSMsg = new ControlWSMsg(
             controlWs.ws,
             this.userInfo.adminid,
             form.pushObjid = this.controlMessageInfo.classid;
           } else {
             if (snList.length > 1) {
-              form.userids = snList;
+              form.userids = useridList;
             } else {
-              form.pushObjid = snList[0];
+              form.pushObjid = useridList[0];
             }
           }
           this.addPushLog(form);
       });
     },
     // 解除限制
-    controlRemoveLimit(snList) {
+    controlRemoveLimit(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         pushObj: 1
       };
       if (snList.length > 1) {
-        form.userids = snList;
+        form.userids = useridList;
       } else {
-        form.pushObjid = snList[0];
+        form.pushObjid = useridList[0];
       }
       this.addPushLog(form);
     },
     // 限制使用
-    controlLimitedUse(snList) {
+    controlLimitedUse(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         pushObj: 1
       };
       if (snList.length > 1) {
-        form.userids = snList;
+        form.userids = useridList;
       } else {
-        form.pushObjid = snList[0];
+        form.pushObjid = useridList[0];
       }
       this.addPushLog(form);
     },
     // 更新策略
-    controlUpdateStrategy(snList) {
+    controlUpdateStrategy(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         pushObj: 1
       };
       if (snList.length > 1) {
-        form.userids = snList;
+        form.userids = useridList;
       } else {
-        form.pushObjid = snList[0];
+        form.pushObjid = useridList[0];
       }
       this.addPushLog(form);
     },
     // 重启设备
-    controlRebootDevice(snList) {
+    controlRebootDevice(snList, useridList) {
       let controlWSMsg = new ControlWSMsg(
         controlWs.ws,
         this.userInfo.adminid,
         pushObj: 1
       };
       if (snList.length > 1) {
-        form.userids = snList;
+        form.userids = useridList;
       } else {
-        form.pushObjid = snList[0];
+        form.pushObjid = useridList[0];
       }
       this.addPushLog(form);
     },
     }
   }
 }
+.section_title {
+  padding-left: 10px;
+  font-size: 18px;
+  line-height: 20px;
+  font-weight: bold;
+  border-left: 4px solid #339dff;
+}
+.section_table_wrap {
+  margin: 16px 0;
+  border: 1px solid #ced9f2;
+  border-bottom: none;
+}
+.section_item {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin: 16px 0;
+  .device_base {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    margin: 16px 0;
+    width: 50%;
+    .device_base_left {
+      margin-left: 10px;
+      width: 120px;
+      height: 240px;
+      border-radius: 15px;
+      border: 3px solid #000;
+    }
+    .device_base_right {
+      width: calc(100% - 140px);
+      /deep/.ivu-form-item {
+        margin-bottom: 0;
+        .ivu-form-item-content {
+          line-height: 36px;
+          font-size: 16px;
+          font-weight: bold;
+          color: #253a70;
+        }
+      }
+    }
+  }
+  .device_users {
+    width: calc(50% - 10px);
+    border: 1px solid #ced9f2;
+    border-bottom: none;
+  }
+  .my_table {
+    width: 100%;
+    empty-cells: show;
+    border-collapse: collapse;
+    table-layout: fixed;
+    border: 1px solid #dcdee2;
+    border-spacing: 0;
+    box-sizing: border-box;
+    color: #253a70;
+    font-size: 16px;
+    th {
+      padding: 0;
+      line-height: 46px;
+      font-weight: normal;
+      text-align: center;
+      vertical-align: middle;
+      white-space: nowrap;
+      background-color: #edf3ff;
+      border: 1px solid #ced9f2;
+    }
+    td {
+      position: relative;
+      padding: 0;
+      line-height: 46px;
+      color: #798cb5;
+      text-align: center;
+      vertical-align: middle;
+      white-space: nowrap;
+      border: 1px solid #ced9f2;
+    }
+  }
+  .detail_left {
+    width: calc(33.33% - 30px);
+  }
+  .detail_center {
+    width: calc(33.33% - 20px);
+  }
+  .detail_right {
+    width: 33.33%;
+  }
+}
 </style>