日志导出

src/api/log.js

  */
 export const logDeviceLogin_list = (data) =>
   setRequest("logDeviceLogin/list", data);
+/**
+ * 7.3.2 设备位置日志-所有（导出）
+ */
+export const logDeviceLogin_list_all = (data) =>
+    setRequest("logDeviceLogin/list_all", data);
 /**
  * 7.4.1 设备事件日志-列表
  */
  * 7.4.2 设备事件日志-添加
  */
 export const logdoperate_add = (data) => setRequest("logdoperate/add", data);
+/**
+ * 7.4.3 设备事件日志-所有（导出）
+ */
+export const logdoperate_list_event_all = (data) => setRequest("logdoperate/list_event_all", data);
 /**
  * 7.5.1 设备违规日志-列表
  */
 export const logdoperate_list_violate = (data) =>
   setRequest("logdoperate/list_violate", data);
+/**
+ * 7.5.2 设备违规日志-所有（导出）
+ */
+export const logdoperate_list_violate_all = (data) =>
+    setRequest("logdoperate/list_violate_all", data);
 /**
  * 7.6.1 应用下载日志-列表
  */
 /**
  * 7.8.1 设备已安装应用-列表
  */
-export const logAppStart_list_install = (data) =>
-  setRequest("logAppStart/list_install", data);
+export const logAppDown_list_install = (data) =>
+  setRequest("logAppDown/list_install", data);
+/**
+ * 7.8.2 设备已安装应用-所有（导出）
+ */
+export const logAppDown_list_install_all = (data) =>
+    setRequest("logAppDown/list_install_all", data);
 /**
  * 7.9.1 设备导出-列表(平台、区域)
  */

src/api/school.js

  * 3.1.5学校--详情
  */
 export const school_detail = (data) => setRequest("school/detail", data);
+/**
+ * 3.1.6学校--区域下学校列表
+ */
+export const school_list_rs = (data) => setRequest("school/list_rs", data);
 /**
  * 3.2.0.1用户--账号登录
  */

src/views/regionSection/log/admin.vue

   },
   created() {
     this.userInfo = JSON.parse(
-        localStorage.getItem("xh_control_userInfo")
+      localStorage.getItem("xh_control_userInfo")
     ).content;
     this.searchList();
   },

src/views/regionSection/log/deviceEvents.vue

         show-sizer
       ></Page>
     </div>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
 <script>
 import { dateFormat, doEventInfo } from "@/utils";
-import { logdoperate_list_event } from "@/api/log";
+import { logdoperate_list_event, logdoperate_list_event_all } from "@/api/log";
 import { exportToExcel } from "@/utils/exportToExcel";
 export default {
   data() {
     return {
+      showLoading: false,
       doEventInfo,
       searchForm: {
         dataRange: [],
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      this.showLoading = true;
       logdoperate_list_event({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         enddate: _enddate,
         name: this.searchForm.name
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
       _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({
+      this.showLoading = true;
+      logdoperate_list_event_all({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: this.powerParams.objectid,
         enddate: _enddate,
         name: this.searchForm.name
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           exportToExcel(
             [
               {
-                list: data.obj.data.map((item) => {
+                list: data.obj.map((item) => {
                   return {
                     学校名称: item.schoolName,
                     班级: item.classname,

src/views/regionSection/log/deviceExport.vue

             ></Tree>
           </div>
         </div>
+        <Select
+          :transfer="true"
+          v-model="searchForm.schoolid"
+          @on-change="searchList()"
+          style="width: 180px; margin-left: 10px"
+        >
+          <template v-if="school_list.length > 0">
+            <Option :value="0">所有学校</Option>
+            <Option
+              v-for="item in school_list"
+              :value="item.schoolid"
+              :key="item.schoolid"
+              >{{ item.schoolName }}</Option
+            >
+          </template>
+        </Select>
       </div>
       <Button type="primary" class="primary_btn" @click="toExport()"
         >导出</Button
         show-sizer
       ></Page>
     </div>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
 <script>
-import { logDeviceBind_list_region } from "@/api/log";
+import { logDeviceBind_list_region, logDeviceBind_list_user } from "@/api/log";
 import { region_list_sel_tree } from "@/api/region";
+import { exportToExcel } from "@/utils/exportToExcel";
+import { school_list_rs } from "@/api/school";
 export default {
   data() {
     return {
+      showLoading: false,
       searchForm: {
         regionid: 0,
+        schoolid: 0,
         title: "所有区域",
         page: 1,
         size: 10,
       localStorage.getItem("xh_control_userInfo")
     ).content;
     this.init();
-    this.searchList();
   },
   mounted() {
     window.addEventListener("click", () => {
     headerTree() {
       //打开树形区域列表
       this.isshowtree = true;
+      console.log(this.isshowtree);
     },
-    getSelectedNodes(data) {
+    async getSelectedNodes(data) {
       this.searchForm.title = data[0].title;
       this.searchForm.regionid = data[0].regionid;
+      this.searchForm.schoolid = 0;
+      await this.getSchoolList();
       this.searchList();
     },
-    init() {
-      region_list_sel_tree({ regionid: this.powerParams.objectid }).then(
-        (res) => {
-          if (res.code === 0) {
-            this.setRegionList(res.obj[0]);
-            this.region_list = res.obj;
-            this.region_list.unshift({
-              title: "所有区域",
-              regionid: 0,
-              children: []
-            });
-
-            console.log(this.region_list);
-          } else {
-            this.$Message.error(res.msg);
-          }
-        }
-      );
+    async init() {
+      this.showLoading = true;
+      let res = await region_list_sel_tree({
+        regionid: this.powerParams.objectid
+      });
+      this.showLoading = false;
+      if (res.code === 0) {
+        this.setRegionList(res.obj[0]);
+        this.region_list = res.obj;
+        this.searchForm.regionid = this.region_list[0].regionid;
+        this.searchForm.title = this.region_list[0].title;
+      } else {
+        this.$Message.error(res.msg);
+      }
+      this.searchForm.schoolid = 0;
+      await this.getSchoolList();
+      this.searchList();
+    },
+    async getSchoolList() {
+      this.showLoading = true;
+      let res = await school_list_rs({ regionid: this.searchForm.regionid });
+      this.showLoading = false;
+      if (res.code === 0) {
+        this.school_list = res.obj;
+      } else {
+        this.$Message.error(res.msg);
+      }
     },
     setRegionList(node) {
       node.title = node.regionName;
     },
     // 获取列表
     getList() {
+      this.showLoading = true;
       logDeviceBind_list_region({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         page: this.searchForm.page,
         size: this.searchForm.size,
-        regionid: this.searchForm.regionid
+        regionid: this.searchForm.regionid,
+        schoolid: this.searchForm.schoolid
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
-          console.log(this.searchForm.list);
         } else {
           this.$Message.error(data.msg);
         }
       });
     },
-    toExport() {}
+    toExport() {
+      this.showLoading = true;
+      logDeviceBind_list_user({
+        regionid: this.searchForm.regionid,
+        schoolid: this.searchForm.schoolid
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          let name = "";
+          exportToExcel(
+            [
+              {
+                list: res.obj.map((item) => {
+                  return {
+                    学校名称: item.schoolName,
+                    班级: item.classname,
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    设备号码: item.sn,
+                    设备型号: item.deviceModel,
+                    Rom版本: item.romVersion,
+                    违规: item.violated === 1 ? "是" : "否",
+                    更新时间: item.createtime
+                  };
+                }),
+                name: "设备导出"
+              }
+            ],
+            "设备导出"
+          );
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    }
   }
 };
 </script>

src/views/regionSection/log/deviceInstallation.vue

         show-sizer
       ></Page>
     </div>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
 <script>
 import { dateFormat } from "@/utils";
-import { logAppStart_list_install } from "@/api/log";
+import {
+  logAppDown_list_install,
+  logAppDown_list_install_all,
+  logAppStart_list_install
+} from "@/api/log";
 import { exportToExcel } from "@/utils/exportToExcel";
 export default {
   data() {
         },
         {
           title: "版本名称",
-          key: "versionName",
+          key: "appVersion",
           align: "center"
         },
         {
           title: "版本号",
-          key: "versionNum",
+          key: "appNum",
           align: "center"
         },
         {
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
-      logAppStart_list_install({
+      this.showLoading = true;
+      logAppDown_list_install({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: this.powerParams.objectid,
         enddate: _enddate,
         name: this.searchForm.name
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
-      logAppStart_list_install({
+      this.showLoading = true;
+      logAppDown_list_install_all({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: this.powerParams.objectid,
         enddate: _enddate,
         name: this.searchForm.name
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           exportToExcel(
             [
               {
-                list: data.obj.data.map((item) => {
+                list: data.obj.map((item) => {
                   return {
                     学校名称: item.schoolName,
                     班级: item.classname,
                     姓名: item.username,
                     设备号码: item.sn,
                     应用名称: item.appName,
-                    应用包名: item.appPackage,
-                    版本名称: item.versionName,
-                    版本号: item.versionNum,
+                    应用包名: item.appPackage || "",
+                    版本名称: item.appVersion || "",
+                    版本号: item.appNum || "",
                     上报时间: item.createtime
                   };
                 }),

src/views/regionSection/log/deviceLocation.vue

         show-sizer
       ></Page>
     </div>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
 <script>
 import { dateFormat } from "@/utils";
-import { logDeviceLogin_list } from "@/api/log";
+import {logDeviceLogin_list, logDeviceLogin_list_all} from "@/api/log";
 import { exportToExcel } from "@/utils/exportToExcel";
 export default {
   data() {
     return {
+      showLoading: false,
       searchForm: {
         dataRange: [],
         name: "",
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      this.showLoading = true;
       logDeviceLogin_list({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         enddate: _enddate,
         name: this.searchForm.name
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
-      logDeviceLogin_list({
+      this.showLoading = true;
+      logDeviceLogin_list_all({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: this.powerParams.objectid,
         enddate: _enddate,
         name: this.searchForm.name
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           exportToExcel(
             [
               {
-                list: data.obj.data.map((item) => {
+                list: data.obj.map((item) => {
                   return {
                     设备号码: item.sn,
                     登录名: item.loginname,

src/views/regionSection/log/violatingDevice.vue

         show-sizer
       ></Page>
     </div>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
 <script>
 import { dateFormat, doEventInfo } from "@/utils";
-import { logdoperate_list_violate } from "@/api/log";
+import {
+  logdoperate_list_violate,
+  logdoperate_list_violate_all
+} from "@/api/log";
 import { exportToExcel } from "@/utils/exportToExcel";
 export default {
   data() {
     return {
+      showLoading: false,
       doEventInfo,
       searchForm: {
         dataRange: [],
       _begindate = _begindate ? dateFormat(_begindate, "yyyy-MM-dd") : null;
       let _enddate = this.searchForm.dataRange[1];
       _enddate = _enddate ? dateFormat(_enddate, "yyyy-MM-dd") : null;
+      this.showLoading = true;
       logdoperate_list_violate({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         enddate: _enddate,
         name: this.searchForm.name
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
           this.searchForm.total = data.obj.total;
       _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({
+      this.showLoading = true;
+      logdoperate_list_violate_all({
         rtype: this.powerParams.rtype,
         objectid: this.powerParams.objectid,
         regionid: this.powerParams.objectid,
         enddate: _enddate,
         name: this.searchForm.name
       }).then((data) => {
+        this.showLoading = false;
         if (data.code === 0) {
           exportToExcel(
             [
               {
-                list: data.obj.data.map((item) => {
+                list: data.obj.map((item) => {
                   return {
                     学校名称: item.schoolName,
                     班级: item.classname,