学校日志导出

src/views/platformSection/log/deviceExport.vue

@@ -10,9 +10,9 @@
           style="width: 150px"
         />
       </div>
-      <!-- <Button type="primary" class="primary_btn" @click="toExport()"
+      <Button type="primary" class="primary_btn" @click="toExport()"
         >导出</Button
-      > -->
+      >
     </div>
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
@@ -131,30 +131,57 @@ export default {
       });
     },
     toExport(row) {
-      logDeviceBind_list_all({
-        regionid: row.regionid
-      }).then((data) => {
-        if (data.code === 0) {
-          exportToExcel(
-            [
-              {
-                list: data.obj.map((item) => {
-                  return {
-                    区域名称: item.regionName,
-                    学校数: item.schoolnum,
-                    用户数: item.usernum,
-                    设备数: item.snnum
-                  };
-                }),
-                name: row.regionName
-              }
-            ],
-            "设备导出"
-          );
-        } else {
-          this.$Message.error(data.msg);
-        }
-      });
+      if (row) {
+        logDeviceBind_list_all({
+          regionid: row.regionid
+        }).then((data) => {
+          if (data.code === 0) {
+            exportToExcel(
+              [
+                {
+                  list: data.obj.map((item) => {
+                    return {
+                      区域名称: item.regionName,
+                      学校数: item.schoolnum,
+                      用户数: item.usernum,
+                      设备数: item.snnum
+                    };
+                  }),
+                  name: row.regionName
+                }
+              ],
+              `设备导出_${row.regionName}`
+            );
+          } else {
+            this.$Message.error(data.msg);
+          }
+        });
+      } else {
+        logDeviceBind_list({
+          name: this.searchForm.name
+        }).then((data) => {
+          if (data.code === 0) {
+            exportToExcel(
+              [
+                {
+                  list: data.obj.data.map((item) => {
+                    return {
+                      区域名称: item.regionName,
+                      学校数: item.schoolnum,
+                      用户数: item.usernum,
+                      设备数: item.snnum
+                    };
+                  }),
+                  name: "设备导出"
+                }
+              ],
+              "设备导出"
+            );
+          } else {
+            this.$Message.error(data.msg);
+          }
+        });
+      }
     }
   }
 };

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -25,8 +25,13 @@
             其他操作<Icon type="ios-arrow-down" class="arrow_down" />
           </div>
           <DropdownMenu slot="list">
-            <DropdownItem>恢复出厂</DropdownItem>
-            <DropdownItem>合规处理</DropdownItem>
+            <DropdownItem>恢复出厂设置</DropdownItem>
+            <DropdownItem>发送消息</DropdownItem>
+            <DropdownItem>解除限制</DropdownItem>
+            <DropdownItem>限制使用</DropdownItem>
+            <DropdownItem>更新策略</DropdownItem>
+            <DropdownItem>重启设备</DropdownItem>
+            <DropdownItem>合理处理</DropdownItem>
           </DropdownMenu>
         </Dropdown>
       </div>
@@ -128,7 +133,7 @@ export default {
           align: "center"
         },
         {
-          title: "违规详情",
+          title: "操作中",
           key: "num",
           width: 100,
           align: "center"

src/views/schoolSection/log/admin.vue

@@ -120,6 +120,8 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logOperate_list({
+        regionid: 1,
+        schoolid: 1,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,

src/views/schoolSection/log/appLaunch.vue

@@ -94,7 +94,7 @@ export default {
         },
         {
           title: "姓名",
-          key: "aname",
+          key: "username",
           align: "center"
         },
         {
@@ -110,6 +110,7 @@ export default {
         {
           title: "违规",
           slot: "violatedSlot",
+          width: 70,
           align: "center"
         },
         {
@@ -148,6 +149,8 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logAppStart_list_start({
+        regionid: 1,
+        schoolid: 1,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,

src/views/schoolSection/log/applicationDownload.vue

@@ -86,7 +86,7 @@ export default {
         },
         {
           title: "姓名",
-          key: "aname",
+          key: "username",
           align: "center"
         },
         {
@@ -140,6 +140,8 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logAppDown_list({
+        regionid: 1,
+        schoolid: 1,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,

src/views/schoolSection/log/deviceEvents.vue

@@ -72,6 +72,7 @@
 
 <script>
 import { dateFormat, doEventInfo } from "@/utils";
+import { exportToExcel } from "@/utils/exportToExcel";
 import { logdoperate_list_event } from "@/api/log";
 export default {
   data() {
@@ -138,6 +139,7 @@ export default {
         {
           title: "违规",
           slot: "violatedSlot",
+          width: 70,
           align: "center"
         },
         {
@@ -176,6 +178,8 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logdoperate_list_event({
+        regionid: 3,
+        schoolid: 1,
         page: this.searchForm.page,
         size: this.searchForm.size,
         doEvent: this.searchForm.doEvent,
@@ -191,7 +195,52 @@ export default {
         }
       });
     },
-    toExport() {}
+    toExport() {
+      let _begindate = this.searchForm.dataRange[0];
+      _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
+      let _enddate = this.searchForm.dataRange[1];
+      _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      logdoperate_list_event({
+        regionid: 3,
+        schoolid: 1,
+        doEvent: this.searchForm.doEvent,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.data.map((item) => {
+                  return {
+                    学校名称: item.schoolName,
+                    班级: item.classname,
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    设备号码: item.sn,
+                    事件: this.doEventInfo[item.doEvent],
+                    描述: item.comm,
+                    // 0不违规1违规
+                    违规:
+                      item.violated === 1
+                        ? "违规"
+                        : item.violated === 0
+                        ? "不违规"
+                        : "",
+                    时间: item.createtime
+                  };
+                }),
+                name: "设备事件日志"
+              }
+            ],
+            "设备事件日志"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
   }
 };
 </script>

src/views/schoolSection/log/deviceExport.vue

@@ -15,13 +15,7 @@
       >
     </div>
     <div class="table_wrap">
-      <Table :columns="columns" :data="searchForm.list">
-        <template slot-scope="{ row }" slot="actionSlot">
-          <div class="action_list">
-            <div @click="toExport(row)">导出</div>
-          </div>
-        </template>
-      </Table>
+      <Table :columns="columns" :data="searchForm.list"></Table>
     </div>
     <div class="page_wrap">
       <Page
@@ -40,7 +34,8 @@
 </template>
 
 <script>
-import { logDeviceBind_list } from "@/api/log";
+import { exportToExcel } from "@/utils/exportToExcel";
+import { logDeviceBind_list_school } from "@/api/log";
 export default {
   data() {
     return {
@@ -66,29 +61,39 @@ export default {
           }
         },
         {
-          title: "区域名称",
-          key: "regionName",
+          title: "设备号码",
+          key: "sn",
           align: "center"
         },
         {
-          title: "学校数",
-          key: "schoolnum",
+          title: "登录名",
+          key: "loginname",
           align: "center"
         },
         {
-          title: "用户数",
-          key: "usernum",
+          title: "姓名",
+          key: "username",
           align: "center"
         },
         {
-          title: "设备数",
-          key: "snnum",
+          title: "学校名称",
+          key: "schoolName",
           align: "center"
         },
         {
-          title: "操作",
-          slot: "actionSlot",
-          width: 90,
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "地址",
+          key: "deviceMac",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
           align: "center"
         }
       ]
@@ -116,7 +121,9 @@ export default {
     },
     // 获取列表
     getList() {
-      logDeviceBind_list({
+      logDeviceBind_list_school({
+        regionid: 1,
+        schoolid: 1,
         page: this.searchForm.page,
         size: this.searchForm.size,
         name: this.searchForm.name
@@ -129,7 +136,39 @@ export default {
         }
       });
     },
-    toExport() {}
+    toExport() {
+      logDeviceBind_list_school({
+        regionid: 1,
+        schoolid: 1,
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.data.map((item) => {
+                  return {
+                    设备号码: item.sn,
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    学校名称: item.schoolName,
+                    班级: item.classname,
+                    地址: item.deviceMac,
+                    时间: item.createtime
+                  };
+                }),
+                name: "设备导出"
+              }
+            ],
+            "设备导出"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
   }
 };
 </script>

src/views/schoolSection/log/deviceInstallation.vue

@@ -89,7 +89,7 @@ export default {
         },
         {
           title: "姓名",
-          key: "aname",
+          key: "username",
           align: "center"
         },
         {
@@ -112,11 +112,6 @@ export default {
           key: "versionName",
           align: "center"
         },
-        {
-          title: "版本号",
-          key: "versionNum",
-          align: "center"
-        },
         {
           title: "上报时间",
           key: "createtime",
@@ -153,6 +148,8 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logAppStart_list_install({
+        regionid: 1,
+        schoolid: 1,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,

src/views/schoolSection/log/deviceLocation.vue

@@ -46,6 +46,7 @@
 
 <script>
 import { dateFormat } from "@/utils";
+import { exportToExcel } from "@/utils/exportToExcel";
 import { logDeviceLogin_list } from "@/api/log";
 export default {
   data() {
@@ -138,6 +139,8 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logDeviceLogin_list({
+        regionid: 1,
+        schoolid: 1,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,
@@ -152,7 +155,41 @@ export default {
         }
       });
     },
-    toExport() {}
+    toExport() {
+      let _begindate = this.searchForm.dataRange[0];
+      _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
+      let _enddate = this.searchForm.dataRange[1];
+      _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      logDeviceLogin_list({
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.data.map((item) => {
+                  return {
+                    设备号码: item.sn,
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    学校名称: item.schoolName,
+                    班级: item.classname,
+                    地址: item.ipAddress,
+                    时间: item.createtime
+                  };
+                }),
+                name: "设备位置日志"
+              }
+            ],
+            "设备位置日志"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
   }
 };
 </script>

src/views/schoolSection/log/devicePush.vue

@@ -131,6 +131,8 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logPush_list({
+        regionid: 1,
+        schoolid: 1,
         page: this.searchForm.page,
         size: this.searchForm.size,
         begindate: _begindate,

src/views/schoolSection/log/violatingDevice.vue

@@ -100,6 +100,7 @@
 
 <script>
 import { dateFormat, doEventInfo } from "@/utils";
+import { exportToExcel } from "@/utils/exportToExcel";
 import { logdoperate_list_violate } from "@/api/log";
 export default {
   data() {
@@ -161,26 +162,31 @@ export default {
         {
           title: "通知",
           slot: "noticedSlot",
+          width: 70,
           align: "center"
         },
         {
           title: "锁定",
           slot: "lockedSlot",
+          width: 70,
           align: "center"
         },
         {
           title: "重置",
           slot: "resetedSlot",
+          width: 70,
           align: "center"
         },
         {
           title: "发邮件",
           slot: "emailedSlot",
+          width: 80,
           align: "center"
         },
         {
           title: "处理结果",
           slot: "handledSlot",
+          width: 100,
           align: "center"
         },
         {
@@ -219,6 +225,8 @@ export default {
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
       logdoperate_list_violate({
+        regionid: 1,
+        schoolid: 1,
         page: this.searchForm.page,
         size: this.searchForm.size,
         doEvent: this.searchForm.doEvent,
@@ -234,7 +242,51 @@ export default {
         }
       });
     },
-    toExport() {}
+    toExport() {
+      let _begindate = this.searchForm.dataRange[0];
+      _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
+      let _enddate = this.searchForm.dataRange[1];
+      _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      logdoperate_list_violate({
+        regionid: 1,
+        schoolid: 1,
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        doEvent: this.searchForm.doEvent,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.data.map((item) => {
+                  return {
+                    学校名称: item.schoolName,
+                    班级: item.classname,
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    设备号码: item.sn,
+                    事件: this.doEventInfo[item.doEvent],
+                    通知: item.noticed === 1 ? "是" : "否",
+                    锁定: item.locked === 1 ? "是" : "否",
+                    重置: item.reseted === 1 ? "是" : "否",
+                    发邮件: item.emailed === 1 ? "是" : "否",
+                    处理结果: item.handled === 1 ? "是" : "否",
+                    时间: item.createtime
+                  };
+                }),
+                name: "违规设备日志"
+              }
+            ],
+            "违规设备日志"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
   }
 };
 </script>