平台-设备导出

src/api/device_manager.js

@@ -82,3 +82,18 @@ export const deviceAuth_list_sn = (data) =>
  */
 export const deviceAuth_delete_db = (data) =>
   setRequest("deviceAuth/delete_db", data);
+/**
+ * 11.4.1设备导出--列表
+ */
+export const deviceAuth_list_export = (data) =>
+  setRequest("deviceAuth/list_export", data);
+/**
+ * 11.4.2设备导出--导出
+ */
+export const deviceAuth_export = (data) =>
+  setRequest("deviceAuth/export", data);
+/**
+ * 11.4.3设备导出--查看
+ */
+export const deviceAuth_edetail = (data) =>
+  setRequest("deviceAuth/edetail", data);

src/views/platformSection/deviceManage/deviceManageExport/deviceManageExport.vue

@@ -23,14 +23,16 @@
     </div>
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
-        <template slot-scope="{ row }" slot="onlineSlot">
-          <!-- 1在线2离线 -->
-          <div v-if="row.online === 1">在线</div>
-          <div v-else-if="row.online === 2">离线</div>
+        <template slot-scope="{ row }" slot="lockStateSlot">
+          <!-- 锁定状态0未锁定1已锁定 -->
+          <div class="action_list">
+            <div class="action_success" v-if="row.lockState === 0">正常</div>
+            <div class="action_error" v-else-if="row.lockState === 1">锁定</div>
+          </div>
         </template>
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
-            <div @click="toView(row)">查看</div>
+            <div v-if="row.sn" @click="toView(row.sn)">查看</div>
           </div>
         </template>
       </Table>
@@ -67,7 +69,11 @@
 <script>
 import { region_list_sel_pt } from "@/api/region";
 import { exportToExcel } from "@/utils/exportToExcel";
-import { logDeviceBind_list, logDeviceBind_list_all } from "@/api/log";
+import {
+  deviceAuth_list_export,
+  deviceAuth_export,
+  deviceAuth_edetail
+} from "@/api/device_manager";
 export default {
   data() {
     return {
@@ -111,13 +117,13 @@ export default {
           },
           {
             title: "绑定时间",
-            key: "snnum",
+            key: "createtime",
             width: 190,
             align: "center"
           },
           {
             title: "解绑时间",
-            key: "snnum",
+            key: "unbindtime",
             width: 190,
             align: "center"
           }
@@ -164,19 +170,19 @@ export default {
         },
         {
           title: "状态",
-          slot: "onlineSlot",
-          width: 70,
+          slot: "lockStateSlot",
+          width: 90,
           align: "center"
         },
         {
           title: "首次激活时间",
-          key: "updatetime",
+          key: "firsttime",
           width: 190,
           align: "center"
         },
         {
           title: "末次解绑时间",
-          key: "updatetime",
+          key: "lasttime",
           width: 190,
           align: "center"
         },
@@ -227,12 +233,11 @@ export default {
     },
     // 获取列表
     getList() {
-      logDeviceBind_list({
+      deviceAuth_list_export({
         rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid,
+        regionid: this.searchForm.regionid,
         page: this.searchForm.page,
-        size: this.searchForm.size,
-        name: this.searchForm.name
+        size: this.searchForm.size
       }).then((data) => {
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
@@ -242,28 +247,40 @@ export default {
         }
       });
     },
-    toView() {
+    toView(sn) {
+      deviceAuth_edetail({ sn }).then((data) => {
+        if (data.code === 0) {
+          this.viewInfo.list = data.obj;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
       this.viewInfo.show = true;
     },
-    toExport(row) {
-      let form = {
+    toExport() {
+      deviceAuth_export({
         rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid
-      };
-      if (row) {
-        form.regionid = row.regionid;
-      }
-      logDeviceBind_list_all(form).then((data) => {
+        regionid: this.searchForm.regionid
+      }).then((data) => {
         if (data.code === 0) {
           exportToExcel(
             [
               {
                 list: data.obj.map((item) => {
                   return {
-                    区域名称: item.regionName,
-                    学校数: item.schoolnum,
-                    用户数: item.usernum,
-                    设备数: item.snnum
+                    学校名称: item.schoolName,
+                    班级: item.classname,
+                    姓名: item.username,
+                    设备号: item.sn,
+                    设备型号: item.deviceModel,
+                    状态:
+                      item.lockState === 1
+                        ? "锁定"
+                        : item.lockState === 0
+                        ? "正常"
+                        : "",
+                    首次激活时间: item.firsttime,
+                    末次解绑时间: item.lasttime
                   };
                 }),
                 name: "设备导出"

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -86,8 +86,10 @@
         >
           <template slot-scope="{ row }" slot="onlineSlot">
             <!-- 1在线2离线 -->
-            <div v-if="row.online === 1">在线</div>
-            <div v-else-if="row.online === 2">离线</div>
+            <div class="action_list">
+              <div class="action_success" v-if="row.online === 1">在线</div>
+              <div class="action_error" v-else-if="row.online === 2">离线</div>
+            </div>
           </template>
           <template slot-scope="{ row }" slot="actionSlot">
             <div class="action_list">