学校-在线设备、解除管控

src/views/schoolSection/deviceManage/inLineDevice.vue

@@ -3,21 +3,23 @@
     <div class="search_header">
       <div class="search_left">
         <Select
-          v-model="searchForm.online"
+          v-model="searchForm.atype"
           style="margin-right: 10px; width: 150px"
+          @on-change="searchList()"
         >
           <Option :value="1">在线设备</Option>
           <Option :value="0">离线设备</Option>
         </Select>
         <Select
-          v-model="searchForm.time"
+          v-model="searchForm.doEvent"
           style="margin-right: 10px; width: 150px"
+          @on-change="searchList()"
         >
-          <Option :value="1">最近1小时</Option>
-          <Option :value="2">最近48小时</Option>
+          <Option :value="5">最近1小时</Option>
+          <Option :value="4">最近48小时</Option>
           <Option :value="3">最近7天</Option>
-          <Option :value="4">最近14天</Option>
-          <Option :value="5">最近1个月</Option>
+          <Option :value="2">最近14天</Option>
+          <Option :value="1">最近2个月</Option>
         </Select>
         <Input
           v-model="searchForm.name"
@@ -29,7 +31,15 @@
       </div>
     </div>
     <div class="table_wrap">
-      <Table :columns="columns" :data="searchForm.list"></Table>
+      <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="controlSlot">
+          <div>
+            {{
+              row.control === 1 ? "管控中" : row.control === 2 ? "解除管控" : ""
+            }}
+          </div>
+        </template>
+      </Table>
     </div>
     <div class="page_wrap">
       <Page
@@ -48,12 +58,15 @@
 </template>
 
 <script>
+import { device_manager_list_od } from "@/api/device_manager";
 export default {
   data() {
     return {
       searchForm: {
-        online: 1,
-        time: 2,
+        // 1在线2离线
+        atype: 1,
+        // 1最近2个月 2最近14天 3最近7天 4最近48小时 5最近1小时
+        doEvent: 5,
         name: "",
         page: 1,
         size: 10,
@@ -76,43 +89,42 @@ export default {
         },
         {
           title: "登录账号",
-          key: "versionName",
+          key: "loginname",
           align: "center"
         },
         {
           title: "姓名",
-          key: "website",
-          width: 140,
+          key: "username",
           align: "center"
         },
         {
           title: "设备名称",
-          key: "updatename",
+          key: "device",
           align: "center"
         },
         {
           title: "管控状态",
-          key: "updatename",
+          slot: "controlSlot",
           align: "center"
         },
         {
           title: "设备型号",
-          key: "updatename",
+          key: "deviceModel",
           align: "center"
         },
         {
           title: "ID(IMEI/MEID/ESN)",
-          key: "updatename",
+          key: "sn",
           align: "center"
         },
         {
           title: "Rom版本",
-          key: "updatename",
+          key: "romVersion",
           align: "center"
         },
         {
           title: "最后在线时间",
-          key: "updatetime",
+          key: "lasttime",
           width: 190,
           align: "center"
         }
@@ -141,9 +153,12 @@ export default {
     },
     // 获取列表
     getList() {
-      /* whiteLibrary_list({
+      device_manager_list_od({
         page: this.searchForm.page,
         size: this.searchForm.size,
+        schoolid: 4,
+        atype: this.searchForm.atype,
+        doEvent: this.searchForm.doEvent,
         name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
@@ -152,7 +167,7 @@ export default {
         } else {
           this.$Message.error(data.msg);
         }
-      }); */
+      });
     }
   }
 };

src/views/schoolSection/deviceManage/removeControlDevice.vue

@@ -4,15 +4,23 @@
       <div class="search_left">
         <Input
           v-model="searchForm.name"
-          placeholder="请输入名称"
+          placeholder="请输入姓名、账号、设备号、型号"
           search
           @on-search="searchList()"
-          style="width: 150px"
+          style="width: 260px"
         />
       </div>
     </div>
     <div class="table_wrap">
-      <Table :columns="columns" :data="searchForm.list"></Table>
+      <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="controlSlot">
+          <div>
+            {{
+              row.control === 1 ? "管控中" : row.control === 2 ? "解除管控" : ""
+            }}
+          </div>
+        </template>
+      </Table>
     </div>
     <div class="page_wrap">
       <Page
@@ -31,10 +39,12 @@
 </template>
 
 <script>
+import { device_manager_list_od } from "@/api/device_manager";
 export default {
   data() {
     return {
       searchForm: {
+        pushType: 2,
         name: "",
         page: 1,
         size: 10,
@@ -57,38 +67,37 @@ export default {
         },
         {
           title: "登录账号",
-          key: "versionName",
+          key: "loginname",
           align: "center"
         },
         {
           title: "姓名",
-          key: "website",
-          width: 140,
+          key: "username",
           align: "center"
         },
         {
           title: "设备名称",
-          key: "updatename",
+          key: "device",
           align: "center"
         },
         {
           title: "管控状态",
-          key: "updatename",
+          slot: "controlSlot",
           align: "center"
         },
         {
           title: "设备型号",
-          key: "updatename",
+          key: "deviceModel",
           align: "center"
         },
         {
           title: "ID(IMEI/MEID/ESN)",
-          key: "updatename",
+          key: "sn",
           align: "center"
         },
         {
           title: "Rom版本",
-          key: "updatename",
+          key: "romVersion",
           align: "center"
         },
         {
@@ -122,9 +131,12 @@ export default {
     },
     // 获取列表
     getList() {
-      /* whiteLibrary_list({
+      device_manager_list_od({
         page: this.searchForm.page,
         size: this.searchForm.size,
+        schoolid: 4,
+        atype: this.searchForm.atype,
+        doEvent: this.searchForm.doEvent,
         name: this.searchForm.name
       }).then((data) => {
         if (data.code === 0) {
@@ -133,7 +145,7 @@ export default {
         } else {
           this.$Message.error(data.msg);
         }
-      }); */
+      });
     }
   }
 };