Merge commit 'eee9780ecb7ec319c88b2c6fb6b147e98a518cfc' into gzb

# Conflicts:
#	public/iconfont/demo_index.html
#	public/iconfont/iconfont.css
#	public/iconfont/iconfont.ttf
#	public/iconfont/iconfont.woff
#	public/iconfont/iconfont.woff2

src/api/class.js

@@ -0,0 +1,6 @@
+import { setRequest } from "@/utils/httpRequest";
+
+/**
+ * 3.2.2用户--学校下班级列表
+ */
+export const class_list = (data) => setRequest("class/list", data);

src/api/device_manager.js

@@ -0,0 +1,32 @@
+import { setRequest } from "@/utils/httpRequest";
+
+/**
+ * 11.1.1设备管理--在线设备列表
+ */
+export const device_manager_list_od = (data) =>
+  setRequest("device_manager/list_od", data);
+/**
+ * 11.1.2设备管理--疑似托管设备列表
+ */
+export const device_manager_list_hd = (data) =>
+  setRequest("device_manager/list_hd", data);
+/**
+ * 11.1.3设备管理--违规设备列表
+ */
+export const device_manager_list_vd = (data) =>
+  setRequest("device_manager/list_vd", data);
+/**
+ * 11.1.4设备管理--设备管理列表
+ */
+export const device_manager_list_d = (data) =>
+  setRequest("device_manager/list_d", data);
+/**
+ * 11.1.4.2设备管理--设备导出列表
+ */
+export const device_manager_export_d = (data) =>
+  setRequest("device_manager/export_d", data);
+/**
+ * 11.1.4.3设备管理--安装应用导出列表
+ */
+export const device_manager_export_id = (data) =>
+  setRequest("device_manager/export_id", data);

src/utils/exportToExcel.js

@@ -59,13 +59,25 @@ const openDownloadDialog = (blob, fileName) => {
 };
 /**
  * 导出Excel表格
- * @param sheetListInfo {list:数组数据, name: sheet名称}
+ * @param sheetListInfo sheet列表信息 [{list:数组数据, name: sheet名称}]
  * @param excelName Excel表格名称
  */
 export const exportToExcel = (sheetListInfo, excelName) => {
   const wb = XLSX2.utils.book_new();
   for (const sheetItem of sheetListInfo) {
     const sheet = XLSX2.utils.json_to_sheet(sheetItem.list);
+    // 设置每个单元格的样式
+    let range = XLSX.utils.decode_range(sheet["!ref"]);
+    for (let R = range.s.r; R <= range.e.r; ++R) {
+      for (let C = range.s.c; C <= range.e.c; ++C) {
+        let cell_ref = XLSX.utils.encode_cell({ r: R, c: C });
+        let cell = sheet[cell_ref];
+        if (cell) {
+          if (!cell.s) cell.s = {};
+          cell.s.alignment = { horizontal: "center", vertical: "middle" };
+        }
+      }
+    }
     XLSX2.utils.book_append_sheet(wb, sheet, sheetItem.name);
   }
   const workbookBlob = workbook2blob(wb);

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">
@@ -40,6 +40,7 @@
 </template>
 
 <script>
+import { exportToExcel } from "@/utils/exportToExcel";
 import { logDeviceBind_list, logDeviceBind_list_all } from "@/api/log";
 export default {
   data() {
@@ -129,10 +130,29 @@ export default {
         }
       });
     },
-    toExport() {
-      logDeviceBind_list_all({}).then((data) => {
+    toExport(row) {
+      let form = {};
+      if (row) {
+        form.regionid = row.regionid;
+      }
+      logDeviceBind_list_all(form).then((data) => {
         if (data.code === 0) {
-          console.log("---logDeviceBind_list_all---->", data.obj);
+          exportToExcel(
+            [
+              {
+                list: data.obj.map((item) => {
+                  return {
+                    区域名称: item.regionName,
+                    学校数: item.schoolnum,
+                    用户数: item.usernum,
+                    设备数: item.snnum
+                  };
+                }),
+                name: "设备导出"
+              }
+            ],
+            `设备导出`
+          );
         } else {
           this.$Message.error(data.msg);
         }

src/views/schoolSection/deviceManage/breakRuleDevice.vue

@@ -1,14 +1,266 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <Select
+          v-model="searchForm.handled"
+          style="margin-right: 10px; width: 120px"
+          placeholder="关注状态"
+          @on-change="searchList()"
+        >
+          <Option :value="0">未处理</Option>
+          <Option :value="1">已处理</Option>
+        </Select>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入姓名、账号、设备号、型号"
+          search
+          @on-search="searchList()"
+          style="width: 260px"
+        />
+      </div>
+      <div class="search_right">
+        <Dropdown @on-click="dropdownSelected">
+          <div class="drop_btn">
+            其他操作<Icon type="ios-arrow-down" class="arrow_down" />
+          </div>
+          <DropdownMenu slot="list">
+            <DropdownItem name="1">恢复出厂设置</DropdownItem>
+            <DropdownItem name="2">发送消息</DropdownItem>
+            <DropdownItem name="3">解除限制</DropdownItem>
+            <DropdownItem name="4">限制使用</DropdownItem>
+            <DropdownItem name="5">更新策略</DropdownItem>
+            <DropdownItem name="6">重启设备</DropdownItem>
+            <DropdownItem name="7">合理处理</DropdownItem>
+          </DropdownMenu>
+        </Dropdown>
+      </div>
+    </div>
+    <div class="table_wrap">
+      <Table
+        :columns="columns"
+        :data="searchForm.list"
+        @on-selection-change="selectionChange"
+      >
+        <template slot-scope="{ row }" slot="actionSlot">
+          <div class="action_list">
+            <div @click="toDetail(row)">违规详情</div>
+            <div @click="toRestore(row)">恢复出厂</div>
+            <div @click="toHandle(row)">合规处理</div>
+          </div>
+        </template>
+      </Table>
+    </div>
+    <div class="page_wrap">
+      <Page
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { device_manager_list_vd } from "@/api/device_manager";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        name: "",
+        // 是否处理：0否 1是
+        handled: 0,
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      tableSelection: [],
+      columns: [
+        {
+          type: "selection",
+          width: 60,
+          align: "center"
+        },
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "登录账号",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "设备名称",
+          key: "device",
+          align: "center"
+        },
+        {
+          title: "设备型号",
+          key: "deviceModel",
+          align: "center"
+        },
+        {
+          title: "ID(IMEI/MEID/ESN)",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "Rom版本",
+          key: "romVersion",
+          align: "center"
+        },
+        {
+          title: "更新时间",
+          key: "lasttime",
+          width: 190,
+          align: "center"
+        },
+        {
+          title: "操作中",
+          key: "num",
+          width: 100,
+          align: "center"
+        },
+        {
+          title: "操作",
+          slot: "actionSlot",
+          width: 260,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      this.tableSelection = [];
+      device_manager_list_vd({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        schoolid: 4,
+        handled: this.searchForm.handled,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          // this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    // 违规详情
+    toDetail() {},
+    // 恢复出厂
+    toRestore() {},
+    // 合规处理
+    toHandle() {},
+    selectionChange(selection) {
+      this.tableSelection = selection;
+    },
+    // 其他操作
+    dropdownSelected(name) {
+      if (this.tableSelection.length === 0) {
+        this.$Message.error("请选择列表");
+        return;
+      }
+      if (name === "1") {
+        // 恢复出厂设置
+      } else if (name === "2") {
+        // 发送消息
+      } else if (name === "3") {
+        // 解除限制
+      } else if (name === "4") {
+        // 限制使用
+      } else if (name === "5") {
+        // 更新策略
+      } else if (name === "6") {
+        // 重启设备
+      } else if (name === "7") {
+        // 合理处理
+      }
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.main_root {
+  .search_header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 16px 16px;
+    .search_left {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+    }
+    .search_right {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      /deep/.ivu-dropdown {
+        &:hover {
+          .arrow_down {
+            transform: rotate(180deg);
+          }
+        }
+      }
+      .drop_btn {
+        padding: 0 6px 0 10px;
+        line-height: 30px;
+        border-radius: 8px;
+        border: 1px solid #d8dce9;
+        cursor: pointer;
+        .arrow_down {
+          margin: 4px;
+          color: #96acdf;
+          transition: all 0.2s ease-in-out;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/schoolSection/deviceManage/deviceManage.vue

@@ -1,14 +1,480 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">
+    <div class="main_left">
+      <div class="main_left_title">所有设备</div>
+      <div class="class_list">
+        <div
+          :class="['class_item', !searchForm.classid ? 'selceted' : '']"
+          @click="classChange(null)"
+        >
+          {{ schoolInfo.schoolname }}
+        </div>
+        <div
+          :class="[
+            'class_item',
+            searchForm.classid === classItem.id ? 'selceted' : ''
+          ]"
+          v-for="classItem in schoolInfo.classList"
+          :key="classItem.id"
+          @click="classChange(classItem.id)"
+        >
+          {{ classItem.name }}
+        </div>
+      </div>
+    </div>
+    <div class="main_right">
+      <div class="search_header">
+        <div class="search_left">
+          <Select
+            v-model="searchForm.atype"
+            style="margin-right: 10px; width: 120px"
+            placeholder="关注状态"
+            @on-change="searchList()"
+          >
+            <Option :value="0">全部</Option>
+            <Option :value="1">重点关注</Option>
+            <Option :value="2">不关注</Option>
+          </Select>
+          <Input
+            v-model="searchForm.name"
+            placeholder="请输入名姓名、登录名、设备名、型号"
+            search
+            @on-search="searchList()"
+            style="width: 280px"
+          />
+        </div>
+        <div class="search_right">
+          <Button
+            type="primary"
+            class="primary_btn"
+            style="margin-right: 10px"
+            @click="toDeviceExport()"
+            >设备导出</Button
+          >
+          <Button
+            type="primary"
+            class="primary_btn"
+            style="margin-right: 10px"
+            @click="toInstallingAppExport()"
+            >安装应用导出</Button
+          >
+          <Dropdown @on-click="dropdownSelected">
+            <div class="drop_btn">
+              其他操作<Icon type="ios-arrow-down" class="arrow_down" />
+            </div>
+            <DropdownMenu slot="list">
+              <DropdownItem name="1">恢复出厂设置</DropdownItem>
+              <DropdownItem name="2">发送消息</DropdownItem>
+              <DropdownItem name="3">整班发送消息</DropdownItem>
+              <DropdownItem name="4">解除限制</DropdownItem>
+              <DropdownItem name="5">限制使用</DropdownItem>
+              <DropdownItem name="6">更新策略</DropdownItem>
+              <DropdownItem name="7">重启设备</DropdownItem>
+            </DropdownMenu>
+          </Dropdown>
+        </div>
+      </div>
+      <div class="table_wrap">
+        <Table
+          :columns="columns"
+          :data="searchForm.list"
+          @on-selection-change="selectionChange"
+        >
+          <template slot-scope="{ row }" slot="onlineSlot">
+            <!-- 1在线2离线 -->
+            <div v-if="row.online === 1">在线</div>
+            <div v-else-if="row.online === 2">离线</div>
+          </template>
+          <template slot-scope="{ row }" slot="actionSlot">
+            <div class="action_list">
+              <div @click="toView(row)">查看</div>
+              <div @click="toStrategy(row)">策略</div>
+              <div @click="toPsw(row)">设备密码</div>
+            </div>
+          </template>
+        </Table>
+      </div>
+      <div class="page_wrap">
+        <Page
+          :transfer="true"
+          :total="searchForm.total"
+          :current="searchForm.page"
+          :page-size="searchForm.size"
+          :page-size-opts="[10, 20, 40, 60]"
+          @on-change="pageChange"
+          @on-page-size-change="pageSizeChange"
+          show-total
+          show-sizer
+        ></Page>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
+import { exportToExcel } from "@/utils/exportToExcel";
+import { class_list } from "@/api/class";
+import {
+  device_manager_list_d,
+  device_manager_export_d,
+  device_manager_export_id
+} from "@/api/device_manager";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        classid: null,
+        atype: 0,
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      tableSelection: [],
+      schoolInfo: {
+        schoolid: null,
+        schoolname: null,
+        classList: []
+      },
+      columns: [
+        {
+          type: "selection",
+          width: 60,
+          align: "center"
+        },
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "登录账号",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "在线状态",
+          slot: "onlineSlot",
+          align: "center"
+        },
+        {
+          title: "设备型号",
+          key: "deviceModel",
+          align: "center"
+        },
+        {
+          title: "ID(IMEI/MEID/ESN)",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "Rom版本",
+          key: "romVersion",
+          align: "center"
+        },
+        {
+          title: "更新时间",
+          key: "updatetime",
+          width: 190,
+          align: "center"
+        },
+        {
+          title: "操作",
+          slot: "actionSlot",
+          width: 200,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.getClassList();
+  },
+  methods: {
+    classChange(classid) {
+      this.searchForm.classid = classid;
+      this.searchList();
+    },
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取班级列表
+    getClassList() {
+      console.warn("class_list----");
+      class_list({
+        schoolid: 1
+      }).then((data) => {
+        if (data.code === 0) {
+          this.schoolInfo = {
+            schoolid: data.obj.id,
+            schoolname: data.obj.name,
+            classList: data.obj.children
+          };
+          this.searchList();
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    // 获取列表
+    getList() {
+      this.tableSelection = [];
+      device_manager_list_d({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        schoolid: this.schoolInfo.schoolid,
+        classid: this.searchForm.classid,
+        atype: this.searchForm.atype,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    // 设备导出
+    toDeviceExport() {
+      device_manager_export_d({
+        schoolid: this.schoolInfo.schoolid,
+        classid: this.searchForm.classid,
+        atype: this.searchForm.atype,
+        name: this.searchForm.name
+      }).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.map((item) => {
+                  return {
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    // 1在线2离线
+                    在线状态:
+                      item.online === 1
+                        ? "在线"
+                        : item.online === 2
+                        ? "离线"
+                        : "",
+                    设备型号: item.deviceModel,
+                    "ID(IMEI/MEID/ESN)": item.sn,
+                    Rom版本: item.romVersion,
+                    更新时间: item.updatetime
+                  };
+                }),
+                name: "设备导出"
+              }
+            ],
+            "设备导出"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    // 安装应用导出
+    toInstallingAppExport() {
+      device_manager_export_id({
+        schoolid: this.schoolInfo.schoolid,
+        classid: this.searchForm.classid
+      }).then((data) => {
+        if (data.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: data.obj.map((item) => {
+                  return {
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    班级: item.classname,
+                    应用名称: item.appName,
+                    包名: item.appPackage,
+                    版本名称: item.appVersion,
+                    MAC地址: item.mac,
+                    时间: item.createtime
+                  };
+                }),
+                name: "安装应用导出"
+              }
+            ],
+            "安装应用导出"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    // 查看
+    toView() {},
+    // 策略
+    toStrategy() {},
+    // 设备密码
+    toPsw() {},
+    selectionChange(selection) {
+      this.tableSelection = selection;
+    },
+    // 其他操作
+    dropdownSelected(name) {
+      if (name === "1") {
+        // 恢复出厂设置
+        if (this.tableSelection.length === 0) {
+          this.$Message.error("请选择列表");
+          return;
+        }
+      } else if (name === "2") {
+        // 发送消息
+        if (this.tableSelection.length === 0) {
+          this.$Message.error("请选择列表");
+          return;
+        }
+      } else if (name === "3") {
+        // 整班发送消息
+      } else if (name === "4") {
+        // 解除限制
+        if (this.tableSelection.length === 0) {
+          this.$Message.error("请选择列表");
+          return;
+        }
+      } else if (name === "5") {
+        // 限制使用
+        if (this.tableSelection.length === 0) {
+          this.$Message.error("请选择列表");
+          return;
+        }
+      } else if (name === "6") {
+        // 更新策略
+        if (this.tableSelection.length === 0) {
+          this.$Message.error("请选择列表");
+          return;
+        }
+      } else if (name === "7") {
+        // 重启设备
+        if (this.tableSelection.length === 0) {
+          this.$Message.error("请选择列表");
+          return;
+        }
+      }
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.main_root {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: calc(100% - 10px);
+  border-radius: 0;
+  border: none;
+  background-color: transparent;
+  .main_left {
+    margin-right: 10px;
+    width: 200px;
+    height: 100%;
+    border-radius: 15px;
+    border: 1px solid #e9f0f9;
+    background-color: #fff;
+    overflow: auto;
+    .main_left_title {
+      margin: 10px;
+      padding: 20px 0;
+      line-height: 20px;
+      font-size: 16px;
+      text-align: center;
+      color: #798cb5;
+      border-bottom: 1px solid #e9f0f9;
+    }
+    .class_list {
+      max-height: calc(100% - 82px);
+      font-size: 14px;
+      line-height: 32px;
+      text-align: center;
+      overflow: auto;
+      .class_item {
+        margin: 0 10px;
+        border-radius: 6px;
+        cursor: pointer;
+        &:hover,
+        &.selceted {
+          font-weight: bold;
+          color: #339dff;
+          background-color: #dbeeff;
+        }
+      }
+    }
+  }
+  .main_right {
+    width: calc(100% - 210px);
+    height: 100%;
+    border-radius: 15px;
+    border: 1px solid #e9f0f9;
+    background-color: #fff;
+    overflow: auto;
+    .search_header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 16px 16px;
+      .search_left {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+      }
+      .search_right {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        /deep/.ivu-dropdown {
+          &:hover {
+            .arrow_down {
+              transform: rotate(180deg);
+            }
+          }
+        }
+        .drop_btn {
+          padding: 0 6px 0 10px;
+          line-height: 30px;
+          border-radius: 8px;
+          border: 1px solid #d8dce9;
+          cursor: pointer;
+          .arrow_down {
+            margin: 4px;
+            color: #96acdf;
+            transition: all 0.2s ease-in-out;
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/views/schoolSection/deviceManage/inLineDevice.vue

@@ -1,14 +1,188 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <Select
+          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.doEvent"
+          style="margin-right: 10px; width: 150px"
+          @on-change="searchList()"
+        >
+          <Option :value="5">最近1小时</Option>
+          <Option :value="4">最近48小时</Option>
+          <Option :value="3">最近7天</Option>
+          <Option :value="2">最近14天</Option>
+          <Option :value="1">最近2个月</Option>
+        </Select>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入姓名、账号、设备号、型号"
+          search
+          @on-search="searchList()"
+          style="width: 260px"
+        />
+      </div>
+    </div>
+    <div class="table_wrap">
+      <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
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { device_manager_list_od } from "@/api/device_manager";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        // 1在线2离线
+        atype: 1,
+        // 1最近2个月 2最近14天 3最近7天 4最近48小时 5最近1小时
+        doEvent: 5,
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "登录账号",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "设备名称",
+          key: "device",
+          align: "center"
+        },
+        {
+          title: "管控状态",
+          slot: "controlSlot",
+          align: "center"
+        },
+        {
+          title: "设备型号",
+          key: "deviceModel",
+          align: "center"
+        },
+        {
+          title: "ID(IMEI/MEID/ESN)",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "Rom版本",
+          key: "romVersion",
+          align: "center"
+        },
+        {
+          title: "最后在线时间",
+          key: "lasttime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      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) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/schoolSection/deviceManage/outControlDevice.vue

@@ -1,14 +1,192 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <Select
+          v-model="searchForm.doEvent"
+          style="margin-right: 10px; width: 120px"
+          placeholder="事件"
+          @on-change="searchList()"
+        >
+          <!-- 1Token变化 2一周未通信 3安装可疑应用 -->
+          <Option :value="1">Token变化</Option>
+          <Option :value="2">一周未通信</Option>
+          <Option :value="3">安装可疑应用</Option>
+        </Select>
+        <Select
+          v-model="searchForm.atype"
+          style="margin-right: 10px; width: 120px"
+          placeholder="关注状态"
+          @on-change="searchList()"
+        >
+          <Option :value="0">全部</Option>
+          <Option :value="1">重点关注</Option>
+          <Option :value="2">不关注</Option>
+        </Select>
+        <Select
+          v-if="searchForm.doEvent === 3"
+          v-model="searchForm.handled"
+          style="margin-right: 10px; width: 120px"
+          placeholder="关注状态"
+          @on-change="searchList()"
+        >
+          <Option :value="0">未处理</Option>
+          <Option :value="1">已处理</Option>
+        </Select>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入姓名、账号、设备号、型号"
+          search
+          @on-search="searchList()"
+          style="width: 250px"
+        />
+      </div>
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list"></Table>
+    </div>
+    <div class="page_wrap">
+      <Page
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { device_manager_list_hd } from "@/api/device_manager";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        atype: 0,
+        doEvent: 1,
+        handled: 0,
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "登录账号",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "设备名称",
+          key: "device",
+          align: "center"
+        },
+        {
+          title: "设备型号",
+          key: "deviceModel",
+          align: "center"
+        },
+        {
+          title: "ID(IMEI/MEID/ESN)",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "Rom版本",
+          key: "updatename",
+          align: "center"
+        },
+        {
+          title: "Token更新时间",
+          key: "romVersion",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      device_manager_list_hd({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        schoolid: 4,
+        name: this.searchForm.name,
+        atype: this.searchForm.atype,
+        doEvent: this.searchForm.doEvent,
+        handled: this.searchForm.handled
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/schoolSection/deviceManage/parentControlDevice.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">不做</div>
 </template>
 
 <script>

src/views/schoolSection/deviceManage/removeControlDevice.vue

@@ -1,14 +1,166 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入姓名、账号、设备号、型号"
+          search
+          @on-search="searchList()"
+          style="width: 260px"
+        />
+      </div>
+    </div>
+    <div class="table_wrap">
+      <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
+        :transfer="true"
+        :total="searchForm.total"
+        :current="searchForm.page"
+        :page-size="searchForm.size"
+        :page-size-opts="[10, 20, 40, 60]"
+        @on-change="pageChange"
+        @on-page-size-change="pageSizeChange"
+        show-total
+        show-sizer
+      ></Page>
+    </div>
+  </div>
 </template>
 
 <script>
+import { device_manager_list_od } from "@/api/device_manager";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        pushType: 2,
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "登录账号",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "设备名称",
+          key: "device",
+          align: "center"
+        },
+        {
+          title: "管控状态",
+          slot: "controlSlot",
+          align: "center"
+        },
+        {
+          title: "设备型号",
+          key: "deviceModel",
+          align: "center"
+        },
+        {
+          title: "ID(IMEI/MEID/ESN)",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "Rom版本",
+          key: "romVersion",
+          align: "center"
+        },
+        {
+          title: "更新时间",
+          key: "updatetime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.searchList();
+  },
+  methods: {
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      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) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+  }
+}
+</style>

src/views/schoolSection/index.vue

@@ -99,13 +99,13 @@
               class="drop_down_list_item"
               >解除管控设备</router-link
             >
-            <router-link
+            <!-- <router-link
               @click.native="routeDropdownChange()"
               tag="div"
               to="/school/parentControlDevice"
               class="drop_down_list_item"
               >家长管控设备</router-link
-            >
+            > -->
             <router-link
               @click.native="routeDropdownChange()"
               tag="div"

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

@@ -2,13 +2,13 @@
   <div class="main_root">
     <div class="search_header">
       <div class="search_left">
-        <Input
+        <!-- <Input
           v-model="searchForm.name"
           placeholder="请输入名称"
           search
           @on-search="searchList()"
           style="width: 150px"
-        />
+        /> -->
       </div>
       <Button type="primary" class="primary_btn" @click="toExport()"
         >导出</Button
@@ -16,9 +16,11 @@
     </div>
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
-        <template slot-scope="{ row }" slot="actionSlot">
+        <template slot-scope="{ row }" slot="violatedSlot">
           <div class="action_list">
-            <div @click="toExport(row)">导出</div>
+            <!-- 0不违规1违规 -->
+            <div v-if="row.violated === 1" class="action_success">是</div>
+            <div v-else-if="row.violated === 0" class="action_error">否</div>
           </div>
         </template>
       </Table>
@@ -40,7 +42,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 +69,55 @@ export default {
           }
         },
         {
-          title: "区域名称",
-          key: "regionName",
+          title: "学校名称",
+          key: "schoolName",
           align: "center"
         },
         {
-          title: "学校数",
-          key: "schoolnum",
+          title: "班级",
+          key: "classname",
           align: "center"
         },
         {
-          title: "用户数",
-          key: "usernum",
+          title: "登录名",
+          key: "loginname",
           align: "center"
         },
         {
-          title: "设备数",
-          key: "snnum",
+          title: "姓名",
+          key: "username",
           align: "center"
         },
         {
-          title: "操作",
-          slot: "actionSlot",
-          width: 90,
+          title: "设备号码",
+          key: "deviceMac",
+          align: "center"
+        },
+        {
+          title: "设备型号",
+          key: "deviceModel",
+          align: "center"
+        },
+        {
+          title: "ID(IMEI/MEID/ESN)",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "Rom版本",
+          key: "romVersion",
+          align: "center"
+        },
+        {
+          title: "是否违规",
+          slot: "violatedSlot",
+          width: 100,
+          align: "center"
+        },
+        {
+          title: "更新时间",
+          key: "createtime",
+          width: 190,
           align: "center"
         }
       ]
@@ -116,7 +145,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 +160,47 @@ 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.schoolName,
+                    班级: item.classname,
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    设备号码: item.deviceMac,
+                    设备型号: item.deviceModel,
+                    "ID(IMEI/MEID/ESN)": item.sn,
+                    Rom版本: item.romVersion,
+                    是否违规:
+                      item.violated === 1
+                        ? "是"
+                        : item.violated === 2
+                        ? "否"
+                        : "",
+                    更新时间: item.createtime
+                  };
+                }),
+                name: "设备导出"
+              }
+            ],
+            "设备导出"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
   }
 };
 </script>

src/views/schoolSection/log/deviceInstallation.vue

@@ -46,6 +46,7 @@
 
 <script>
 import { dateFormat } from "@/utils";
+import { exportToExcel } from "@/utils/exportToExcel";
 import { logAppStart_list_install } from "@/api/log";
 export default {
   data() {
@@ -89,7 +90,7 @@ export default {
         },
         {
           title: "姓名",
-          key: "aname",
+          key: "username",
           align: "center"
         },
         {
@@ -112,11 +113,6 @@ export default {
           key: "versionName",
           align: "center"
         },
-        {
-          title: "版本号",
-          key: "versionNum",
-          align: "center"
-        },
         {
           title: "上报时间",
           key: "createtime",
@@ -153,6 +149,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,
@@ -167,7 +165,45 @@ 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;
+      logAppStart_list_install({
+        regionid: 1,
+        schoolid: 1,
+        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,
+                    应用名称: item.appName,
+                    应用包名: item.appPackage,
+                    版本名称: item.versionName,
+                    上报时间: item.createtime
+                  };
+                }),
+                name: "设备已安装应用"
+              }
+            ],
+            "设备已安装应用"
+          );
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
   }
 };
 </script>

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>