日志 公告

src/views/regionSection/log/admin.vue

@@ -1,14 +1,159 @@
 <template>
-  <div class="main_root">管理员日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、事件"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </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 { dateFormat } from "@/utils";
+import { logOperate_list } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      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: "aname",
+          align: "center"
+        },
+        {
+          title: "事件",
+          key: "content",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+        localStorage.getItem("xh_control_userInfo")
+    ).content;
+    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() {
+      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;
+      logOperate_list({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </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/regionSection/log/appLaunch.vue

@@ -1,14 +1,186 @@
 <template>
-  <div class="main_root">应用启动日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、设备号"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="violatedSlot">
+          <div class="action_list">
+            <!-- 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>
+    </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 { dateFormat } from "@/utils";
+import { logAppStart_list_start } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "aname",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "应用名称",
+          key: "appName",
+          align: "center"
+        },
+        {
+          title: "违规",
+          slot: "violatedSlot",
+          align: "center"
+        },
+        {
+          title: "下载时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    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() {
+      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_start({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).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/regionSection/log/applicationDownload.vue

@@ -1,14 +1,178 @@
 <template>
-  <div class="main_root">应用下载日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、事件"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </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 { dateFormat } from "@/utils";
+import { logAppDown_list } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "aname",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "应用名称",
+          key: "appName",
+          align: "center"
+        },
+        {
+          title: "版本号",
+          key: "appVersion",
+          align: "center"
+        },
+        {
+          title: "下载时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    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() {
+      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;
+      logAppDown_list({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).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/regionSection/log/deviceEvents.vue

@@ -1,14 +1,216 @@
 <template>
-  <div class="main_root">设备事件日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Select
+          v-model="searchForm.doEvent"
+          :transfer="true"
+          style="margin-right: 10px; width: 150px"
+          @on-change="searchList()"
+        >
+          <Option :value="0">所有事件</Option>
+          <Option
+            v-for="(eventName, eventVal) in doEventInfo"
+            :value="Number(eventVal)"
+            :key="eventVal"
+            >{{ eventName }}</Option
+          >
+        </Select>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、设备号"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+      <Button type="primary" class="primary_btn" @click="toExport()"
+        >导出</Button
+      >
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="doEventSlot">
+          <!-- 1发送消息 2解除限制 3限制使用 4更新策略 5重启设备 6恢复出厂 -->
+          <div>{{ doEventInfo[row.doEvent] }}</div>
+        </template>
+        <template slot-scope="{ row }" slot="violatedSlot">
+          <div class="action_list">
+            <!-- 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>
+    </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 { dateFormat, doEventInfo } from "@/utils";
+import { logdoperate_list_event } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      doEventInfo,
+      searchForm: {
+        dataRange: [],
+        doEvent: 0,
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "事件",
+          slot: "doEventSlot",
+          align: "center"
+        },
+        {
+          title: "描述",
+          key: "comm",
+          align: "center"
+        },
+        {
+          title: "违规",
+          slot: "violatedSlot",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    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() {
+      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({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        doEvent: this.searchForm.doEvent,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </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/regionSection/log/deviceExport.vue

@@ -1,14 +1,154 @@
 <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: 150px"
+        />
+      </div>
+      <Button type="primary" class="primary_btn" @click="toExport()"
+        >导出</Button
+      >
+    </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>
+    </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 { logDeviceBind_list } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "区域名称",
+          key: "regionName",
+          align: "center"
+        },
+        {
+          title: "学校数",
+          key: "schoolnum",
+          align: "center"
+        },
+        {
+          title: "用户数",
+          key: "usernum",
+          align: "center"
+        },
+        {
+          title: "设备数",
+          key: "snnum",
+          align: "center"
+        },
+        {
+          title: "操作",
+          slot: "actionSlot",
+          width: 90,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    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() {
+      logDeviceBind_list({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </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/regionSection/log/deviceInstallation.vue

@@ -1,14 +1,192 @@
 <template>
-  <div class="main_root">设备已安装应用</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、设备号、应用"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+      <Button type="primary" class="primary_btn" @click="toExport()"
+        >导出</Button
+      >
+    </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 { dateFormat } from "@/utils";
+import { logAppStart_list_install } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "应用名称",
+          key: "appName",
+          align: "center"
+        },
+        {
+          title: "应用包名",
+          key: "appPackage",
+          align: "center"
+        },
+        {
+          title: "版本名称",
+          key: "versionName",
+          align: "center"
+        },
+        {
+          title: "版本号",
+          key: "versionNum",
+          align: "center"
+        },
+        {
+          title: "上报时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    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() {
+      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({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </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/regionSection/log/deviceLocation.vue

@@ -1,14 +1,177 @@
 <template>
-  <div class="main_root">设备位置日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+            v-model="searchForm.dataRange"
+            @on-change="searchList()"
+            :editable="false"
+            :transfer="true"
+            format="yyyy-MM-dd"
+            type="daterange"
+            placement="bottom-start"
+            placeholder="请选择日期范围"
+            style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+            v-model="searchForm.name"
+            placeholder="请输入登录名、事件"
+            search
+            @on-search="searchList()"
+            style="width: 180px"
+        />
+      </div>
+      <Button type="primary" class="primary_btn" @click="toExport()"
+      >导出</Button
+      >
+    </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 { dateFormat } from "@/utils";
+import { logDeviceLogin_list } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+                "span",
+                params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "地址",
+          key: "ipAddress",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+        localStorage.getItem("xh_control_userInfo")
+    ).content;
+    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() {
+      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({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </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/regionSection/log/devicePush.vue

@@ -1,14 +1,169 @@
 <template>
-  <div class="main_root">设备推送日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、事件"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="pushTypeSlot">
+          <!-- 1发送消息 2解除限制 3限制使用 4更新策略 5重启设备 6恢复出厂 -->
+          <div>{{ pushTypeInfo[row.pushType] }}</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 { dateFormat, pushTypeInfo } from "@/utils";
+import { logPush_list } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      pushTypeInfo,
+      searchForm: {
+        dataRange: [],
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      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: "aname",
+          align: "center"
+        },
+        {
+          title: "事件",
+          slot: "pushTypeSlot",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    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() {
+      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;
+      logPush_list({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).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/regionSection/log/violatingDevice.vue

@@ -1,14 +1,259 @@
 <template>
-  <div class="main_root">违规设备日志</div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+          v-model="searchForm.dataRange"
+          @on-change="searchList()"
+          :editable="false"
+          :transfer="true"
+          format="yyyy-MM-dd"
+          type="daterange"
+          placement="bottom-start"
+          placeholder="请选择日期范围"
+          style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Select
+          v-model="searchForm.doEvent"
+          :transfer="true"
+          style="margin-right: 10px; width: 150px"
+          @on-change="searchList()"
+        >
+          <Option :value="0">所有事件</Option>
+          <Option
+            v-for="(eventName, eventVal) in doEventInfo"
+            :value="Number(eventVal)"
+            :key="eventVal"
+            >{{ eventName }}</Option
+          >
+        </Select>
+        <Input
+          v-model="searchForm.name"
+          placeholder="请输入登录名、设备号"
+          search
+          @on-search="searchList()"
+          style="width: 180px"
+        />
+      </div>
+      <Button type="primary" class="primary_btn" @click="toExport()"
+        >导出</Button
+      >
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="doEventSlot">
+          <!-- 1发送消息 2解除限制 3限制使用 4更新策略 5重启设备 6恢复出厂 -->
+          <div>{{ doEventInfo[row.doEvent] }}</div>
+        </template>
+        <template slot-scope="{ row }" slot="noticedSlot">
+          <div class="action_list">
+            <!-- 是否通知：0否 1是 -->
+            <div v-if="row.noticed === 1" class="action_success">是</div>
+            <div v-else-if="row.noticed === 0" class="action_error">否</div>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="lockedSlot">
+          <div class="action_list">
+            <!-- 是否锁定：0否 1是 -->
+            <div v-if="row.locked === 1" class="action_success">是</div>
+            <div v-else-if="row.locked === 0" class="action_error">否</div>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="resetedSlot">
+          <div class="action_list">
+            <!-- 是否重置：0否 1是 -->
+            <div v-if="row.reseted === 1" class="action_success">是</div>
+            <div v-else-if="row.reseted === 0" class="action_error">否</div>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="emailedSlot">
+          <div class="action_list">
+            <!-- 是否发送邮件：0否 1是 -->
+            <div v-if="row.emailed === 1" class="action_success">是</div>
+            <div v-else-if="row.emailed === 0" class="action_error">否</div>
+          </div>
+        </template>
+        <template slot-scope="{ row }" slot="handledSlot">
+          <div class="action_list">
+            <!-- 是否处理：0否 1是 -->
+            <div v-if="row.handled === 1" class="action_success">是</div>
+            <div v-else-if="row.handled === 0" class="action_error">否</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 { dateFormat, doEventInfo } from "@/utils";
+import { logdoperate_list_violate } from "@/api/log";
 export default {
   data() {
-    return {};
+    return {
+      doEventInfo,
+      searchForm: {
+        dataRange: [],
+        doEvent: 0,
+        name: "",
+        page: 1,
+        size: 10,
+        list: [],
+        total: 0
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "设备号码",
+          key: "sn",
+          align: "center"
+        },
+        {
+          title: "事件",
+          slot: "doEventSlot",
+          align: "center"
+        },
+        {
+          title: "通知",
+          slot: "noticedSlot",
+          align: "center"
+        },
+        {
+          title: "锁定",
+          slot: "lockedSlot",
+          align: "center"
+        },
+        {
+          title: "重置",
+          slot: "resetedSlot",
+          align: "center"
+        },
+        {
+          title: "发邮件",
+          slot: "emailedSlot",
+          align: "center"
+        },
+        {
+          title: "处理结果",
+          slot: "handledSlot",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    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() {
+      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({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        doEvent: this.searchForm.doEvent,
+        begindate: _begindate,
+        enddate: _enddate,
+        name: this.searchForm.name,
+        regionid: this.userInfo.regionid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    toExport() {}
+  }
 };
 </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/regionSection/notice/index.vue

@@ -1,14 +1,250 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">
+    <div class="search_header">
+      <div class="search_left">
+        <DatePicker
+            v-model="searchForm.dataRange"
+            @on-change="searchList()"
+            :editable="false"
+            :transfer="true"
+            format="yyyy-MM-dd"
+            type="daterange"
+            placement="bottom-start"
+            placeholder="请选择日期范围"
+            style="margin-right: 10px; width: 220px"
+        ></DatePicker>
+        <Input
+            v-model="searchForm.title"
+            placeholder="请输入标题"
+            search
+            @on-search="searchList()"
+            style="width: 150px"
+        />
+      </div>
+    </div>
+    <div class="table_wrap">
+      <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="actionSlot">
+          <div class="action_list">
+            <div @click="toView(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>
+    <!-- 查看 -->
+    <Modal
+        class="modal1"
+        :mask-closable="false"
+        v-model="viewInfo.show"
+        title="查看"
+    >
+      <div class="notice_title">{{ viewInfo.noticeTitle }}</div>
+      <div class="notice_create">
+        <div>{{ viewInfo.createname }}</div>
+        <div>{{ viewInfo.updatetime }}</div>
+      </div>
+      <div class="notice_content" v-html="viewInfo.noticeContent"></div>
+      <div slot="footer" style="text-align: center">
+        <Button @click="viewInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
+  </div>
 </template>
 
 <script>
+import { notice_list_region, notice_detail_region } from "@/api/notice";
+import { dateFormat } from "@/utils";
 export default {
   data() {
-    return {};
+    return {
+      searchForm: {
+        title: "",
+        page: 1,
+        size: 10,
+        dataRange: [],
+        list: [],
+        total: 0
+      },
+      // 查看信息
+      viewInfo: {
+        show: false,
+        noticeTitle: null,
+        createname: null,
+        updatetime: null,
+        noticeContent: null,
+        noticeType: null,
+        regions: []
+      },
+      userInfo: {},
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+                "span",
+                params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "标题",
+          key: "noticeTitle",
+          align: "center"
+        },
+        {
+          title: "发布人",
+          key: "createname",
+          width: 140,
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "updatetime",
+          width: 190,
+          align: "center"
+        },
+        {
+          title: "操作",
+          slot: "actionSlot",
+          width: 90,
+          align: "center"
+        }
+      ]
+    };
   },
-  methods: {}
+  created() {
+    this.userInfo = JSON.parse(
+        localStorage.getItem("xh_control_userInfo")
+    ).content;
+    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() {
+      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;
+      notice_list_region({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        title: this.searchForm.title,
+        begindate: _begindate,
+        enddate: _enddate
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.list = data.obj.data;
+          this.searchForm.total = data.obj.total;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    // 查看
+    toView(row) {
+      notice_detail_region({
+        noticeid: row.noticeid
+      }).then((data) => {
+        if (data.code === 0) {
+          this.viewInfo = {
+            show: true,
+            noticeTitle: data.obj.noticeTitle,
+            createname: data.obj.createname,
+            updatetime: data.obj.updatetime,
+            noticeContent: data.obj.noticeContent,
+            noticeType: data.obj.noticeType,
+            regions: data.obj.noticeType === 1 ? [] : data.obj.regions
+          };
+          console.log(data.obj.noticeContent)
+        } 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;
+  }
+}
+.notice_title {
+  margin-bottom: 16px;
+  font-size: 18px;
+  font-weight: bold;
+  text-align: center;
+}
+.notice_create {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 16px;
+  font-size: 12px;
+  color: #afbcc7;
+  > div {
+    margin: 0 10px;
+  }
+}
+.notice_content {
+  font-size: 16px;
+  /deep/ img{
+    width: 100%;
+  }
+}
+.notice_regions {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  flex-wrap: wrap;
+  margin-top: 16px;
+  padding: 10px 16px;
+  font-size: 14px;
+  border-radius: 8px;
+  background: #f0f6fc;
+  > div {
+    margin: 10px 16px;
+  }
+}
+</style>