Merge remote-tracking branch 'origin/gzb' into wzl

src/router/platform.js

@@ -23,7 +23,7 @@ export default {
     },
     {
       path: "personal",
-      component: () => import("@/views/regionSection/personal.vue"),
+      component: () => import("@/views/personal/personal.vue"),
       name: "personal",
       meta: {
         keepAlive: true,

src/router/region.js

@@ -13,7 +13,7 @@ export default {
   children: [
     {
       path: "personal",
-      component: () => import("@/views/regionSection/personal.vue"),
+      component: () => import("@/views/personal/personal.vue"),
       name: "personal",
       meta: {
         keepAlive: true,
@@ -22,9 +22,9 @@ export default {
       }
     },
     {
-      path: "logdoperatemsg",
-      component: () => import("@/views/regionSection/logdoperatemsg.vue"),
-      name: "logdoperatemsg",
+      path: "dope",
+      component: () => import("@/views/dope/dope.vue"),
+      name: "dope",
       meta: {
         keepAlive: true,
         isAuth: true,

src/router/school.js

@@ -23,7 +23,7 @@ export default {
     },
     {
       path: "personal",
-      component: () => import("@/views/regionSection/personal.vue"),
+      component: () => import("@/views/personal/personal.vue"),
       name: "personal",
       meta: {
         keepAlive: true,
@@ -32,9 +32,9 @@ export default {
       }
     },
     {
-      path: "logdoperatemsg",
-      component: () => import("@/views/regionSection/logdoperatemsg.vue"),
-      name: "logdoperatemsg",
+      path: "dope",
+      component: () => import("@/views/dope/dope.vue"),
+      name: "dope",
       meta: {
         keepAlive: true,
         isAuth: true,

src/views/layout.vue

@@ -259,7 +259,7 @@ export default {
       });
     },
     headerDope() {
-      this.$router.push("logdoperatemsg");
+      this.$router.push("dope");
     },
     // 获取短信验证码
     getMsgCode() {

src/views/personal/personal.vue

@@ -1,14 +1,413 @@
 <template>
-  <div></div>
+  <div class="main_root">
+    <div class="personal_list">
+      <div class="personal_item" v-for="item in personal_list" :key="item.id">
+        <div
+          @click="toggle(item.id)"
+          :class="[curmodel === item.id ? 'active' : '']"
+        >
+          {{ item.title }}
+        </div>
+      </div>
+    </div>
+    <div class="contents" v-if="curmodel === 1">
+      <div class="user">
+        <div class="head">
+          <img src="../../assets/img/user.png" />
+        </div>
+        <div class="username">
+          <p>{{ personalInfo.aname }}</p>
+          <div>
+            登录名<span>{{ personalInfo.loginname }}</span> 角色<span>{{
+              personalInfo.atype === 1
+                ? "平台管理员"
+                : personalInfo.atype === 2
+                ? "区域管理员"
+                : "学校管理员"
+            }}</span>
+            手机号<span>{{ personalInfo.phone }}</span>
+          </div>
+        </div>
+      </div>
+      <div class="comm">
+        <div class="com">
+          <span>创建时间</span>{{ personalInfo.createtime }}
+          <span style="margin-left: 20px">更新时间</span
+          >{{ personalInfo.updatetime }}
+        </div>
+        <div class="com">
+          <span>最后登录时间</span>{{ personalInfo.lasttime }}
+          <span style="margin-left: 20px">最后登录IP</span
+          >{{ personalInfo.lastip }}
+        </div>
+        <div class="com">
+          <span style="width: 50px">描述</span>{{ personalInfo.comm }}
+        </div>
+      </div>
+    </div>
+    <div class="content" v-else-if="curmodel === 2">
+      <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>
+    <div class="content" style="padding-top: 16px" v-else>
+      <div class="table_wrap">
+        <Table :columns="columns1" :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>
+  </div>
 </template>
 
 <script>
+import { admin_detail, admin_list_lr, admin_list_re } from "@/api/admin";
+import { dateFormat } from "@/utils";
+
 export default {
   data() {
-    return {};
+    return {
+      personal_list: [
+        {
+          id: 1,
+          title: "个人信息"
+        },
+        {
+          id: 2,
+          title: "最近事件"
+        },
+        {
+          id: 3,
+          title: "历史登录"
+        }
+      ],
+      curmodel: 1,
+      personalInfo: {},
+      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: "logmodel",
+          align: "center"
+        },
+        {
+          title: "模块操作",
+          key: "logaction",
+          align: "center"
+        },
+        {
+          title: "日志内容",
+          key: "content",
+          align: "center"
+        },
+        {
+          title: "时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ],
+      columns1: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "登录IP",
+          key: "ip",
+          align: "center"
+        },
+        {
+          title: "地址",
+          key: "ipAddress",
+          align: "center"
+        },
+        {
+          title: "登录时间",
+          key: "createtime",
+          width: 190,
+          align: "center"
+        }
+      ]
+    };
+  },
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    this.getPersonal();
   },
-  methods: {}
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
+  methods: {
+    toggle(type) {
+      this.curmodel = type;
+      if (type === 1) {
+        this.getPersonal();
+      } else {
+        this.searchForm.size = 10;
+        this.searchForm.page = 1;
+        this.searchList();
+      }
+    },
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getEvent();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getEvent();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getEvent();
+    },
+    async getEvent() {
+      let res = {
+        code: null
+      };
+      if (this.curmodel === 2) {
+        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;
+        res = await admin_list_re({
+          objectid: this.userInfo.adminid,
+          begindate: _begindate,
+          enddate: _enddate,
+          name: this.searchForm.name,
+          page: this.searchForm.page,
+          size: this.searchForm.size
+        });
+      } else {
+        res = await admin_list_lr({
+          objectid: this.userInfo.adminid,
+          page: this.searchForm.page,
+          size: this.searchForm.size
+        });
+      }
+
+      if (res.code === 0) {
+        this.searchForm.list = res.obj.data;
+        this.searchForm.total = res.obj.total;
+      } else {
+        this.$Message.error(res.msg);
+      }
+    },
+    getPersonal() {
+      admin_detail({ adminid: this.userInfo.adminid }).then((res) => {
+        if (res.code === 0) {
+          this.personalInfo = res.obj;
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.main_root {
+  background-color: transparent;
+  border: navajowhite;
+  height: calc(100% - 20px);
+  display: flex;
+  .personal_list {
+    width: 200px;
+    height: 100%;
+    border-radius: 15px;
+    padding: 20px 10px;
+    border: 1px solid #e9f0f9;
+    background: #ffffff;
+    margin-right: 20px;
+    .personal_item {
+      line-height: 30px;
+      text-align: center;
+      cursor: pointer;
+    }
+    .active {
+      border-radius: 6px;
+      background: #339dff;
+      color: white;
+    }
+  }
+  .contents {
+    width: calc(100% - 220px);
+    height: 100%;
+    .user {
+      height: 200px;
+      border-radius: 15px;
+      background: white;
+      margin-bottom: 20px;
+      display: flex;
+      align-items: center;
+      .head {
+        width: 100px;
+        height: 100px;
+        margin: 0 40px;
+        border-radius: 16px;
+        overflow: hidden;
+        border: 2px solid #ffffff;
+        box-shadow: 0 6px 14px 0 #dce0e880;
+        img {
+          width: 100%;
+          height: 100%;
+          object-fit: cover;
+        }
+      }
+      .username {
+        p {
+          color: #253a70;
+          font-size: 20px;
+          font-weight: 500;
+          font-family: "SourceHanSansCN";
+          text-align: left;
+          line-height: 50px;
+        }
+        div {
+          color: #7c8db5;
+          font-size: 16px;
+          font-weight: 400;
+          font-family: "SourceHanSansCN";
+          line-height: 50px;
+          span {
+            color: #253a70;
+            display: inline-block;
+            margin: 0 20px;
+          }
+        }
+      }
+    }
+    .comm {
+      height: calc(100% - 220px);
+      border-radius: 15px;
+      background: white;
+      margin-bottom: 20px;
+      padding: 40px;
+      .com {
+        line-height: 30px;
+        color: #253a70;
+        font-size: 16px;
+        font-weight: 400;
+        margin-bottom: 10px;
+        font-family: "SourceHanSansCN";
+        span {
+          color: #7c8db5;
+          display: inline-block;
+          width: 100px;
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+  .content {
+    width: calc(100% - 220px);
+    height: 100%;
+    overflow-y: auto;
+    border-radius: 15px;
+    border: 1px solid #e9f0f9;
+    background: #ffffff;
+    .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/platformSection/personal.vue

@@ -1,413 +0,0 @@
-<template>
-  <div class="main_root">
-    <div class="personal_list">
-      <div class="personal_item" v-for="item in personal_list" :key="item.id">
-        <div
-          @click="toggle(item.id)"
-          :class="[curmodel === item.id ? 'active' : '']"
-        >
-          {{ item.title }}
-        </div>
-      </div>
-    </div>
-    <div class="contents" v-if="curmodel === 1">
-      <div class="user">
-        <div class="head">
-          <img src="../../assets/img/user.png" />
-        </div>
-        <div class="username">
-          <p>{{ personalInfo.aname }}</p>
-          <div>
-            登录名<span>{{ personalInfo.loginname }}</span> 角色<span>{{
-              personalInfo.atype === 1
-                ? "平台管理员"
-                : personalInfo.atype === 2
-                ? "区域管理员"
-                : "学校管理员"
-            }}</span>
-            手机号<span>{{ personalInfo.phone }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="comm">
-        <div class="com">
-          <span>创建时间</span>{{ personalInfo.createtime }}
-          <span style="margin-left: 20px">更新时间</span
-          >{{ personalInfo.updatetime }}
-        </div>
-        <div class="com">
-          <span>最后登录时间</span>{{ personalInfo.lasttime }}
-          <span style="margin-left: 20px">最后登录IP</span
-          >{{ personalInfo.lastip }}
-        </div>
-        <div class="com">
-          <span style="width: 50px">描述</span>{{ personalInfo.comm }}
-        </div>
-      </div>
-    </div>
-    <div class="content" v-else-if="curmodel === 2">
-      <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>
-    <div class="content" style="padding-top: 16px" v-else>
-      <div class="table_wrap">
-        <Table :columns="columns1" :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>
-  </div>
-</template>
-
-<script>
-import { admin_detail, admin_list_lr, admin_list_re } from "@/api/admin";
-import { dateFormat } from "@/utils";
-
-export default {
-  data() {
-    return {
-      personal_list: [
-        {
-          id: 1,
-          title: "个人信息"
-        },
-        {
-          id: 2,
-          title: "最近事件"
-        },
-        {
-          id: 3,
-          title: "历史登录"
-        }
-      ],
-      curmodel: 1,
-      personalInfo: {},
-      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: "logmodel",
-          align: "center"
-        },
-        {
-          title: "模块操作",
-          key: "logaction",
-          align: "center"
-        },
-        {
-          title: "日志内容",
-          key: "content",
-          align: "center"
-        },
-        {
-          title: "时间",
-          key: "createtime",
-          width: 190,
-          align: "center"
-        }
-      ],
-      columns1: [
-        {
-          title: "序号",
-          align: "center",
-          width: 70,
-          render: (h, params) => {
-            return h(
-              "span",
-              params.index +
-                (this.searchForm.page - 1) * this.searchForm.size +
-                1
-            );
-          }
-        },
-        {
-          title: "登录IP",
-          key: "ip",
-          align: "center"
-        },
-        {
-          title: "地址",
-          key: "ipAddress",
-          align: "center"
-        },
-        {
-          title: "登录时间",
-          key: "createtime",
-          width: 190,
-          align: "center"
-        }
-      ]
-    };
-  },
-  created() {
-    this.userInfo = JSON.parse(
-      localStorage.getItem("xh_control_userInfo")
-    ).content;
-    this.getPersonal();
-  },
-  computed: {
-    powerParams() {
-      return this.$store.getters.powerParams;
-    }
-  },
-  methods: {
-    toggle(type) {
-      this.curmodel = type;
-      if (type === 1) {
-        this.getPersonal();
-      } else {
-        this.searchForm.size = 10;
-        this.searchForm.page = 1;
-        this.searchList();
-      }
-    },
-    // 搜索
-    searchList() {
-      this.searchForm.page = 1;
-      this.getEvent();
-    },
-    // 页码改变
-    pageChange(page) {
-      this.searchForm.page = page;
-      this.getEvent();
-    },
-    // 每页显示数量改变
-    pageSizeChange(size) {
-      this.searchForm.size = size;
-      this.searchForm.page = 1;
-      this.getEvent();
-    },
-    async getEvent() {
-      let res = {
-        code: null
-      };
-      if (this.curmodel === 2) {
-        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;
-        res = await admin_list_re({
-          objectid: this.userInfo.adminid,
-          begindate: _begindate,
-          enddate: _enddate,
-          name: this.searchForm.name,
-          page: this.searchForm.page,
-          size: this.searchForm.size
-        });
-      } else {
-        res = await admin_list_lr({
-          objectid: this.userInfo.adminid,
-          page: this.searchForm.page,
-          size: this.searchForm.size
-        });
-      }
-
-      if (res.code === 0) {
-        this.searchForm.list = res.obj.data;
-        this.searchForm.total = res.obj.total;
-      } else {
-        this.$Message.error(res.msg);
-      }
-    },
-    getPersonal() {
-      admin_detail({ adminid: this.userInfo.adminid }).then((res) => {
-        if (res.code === 0) {
-          this.personalInfo = res.obj;
-        } else {
-          this.$Message.error(res.msg);
-        }
-      });
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-.main_root {
-  background-color: transparent;
-  border: navajowhite;
-  height: calc(100% - 20px);
-  display: flex;
-  .personal_list {
-    width: 200px;
-    height: 100%;
-    border-radius: 15px;
-    padding: 20px 10px;
-    border: 1px solid #e9f0f9;
-    background: #ffffff;
-    margin-right: 20px;
-    .personal_item {
-      line-height: 30px;
-      text-align: center;
-      cursor: pointer;
-    }
-    .active {
-      border-radius: 6px;
-      background: #339dff;
-      color: white;
-    }
-  }
-  .contents {
-    width: calc(100% - 220px);
-    height: 100%;
-    .user {
-      height: 200px;
-      border-radius: 15px;
-      background: white;
-      margin-bottom: 20px;
-      display: flex;
-      align-items: center;
-      .head {
-        width: 100px;
-        height: 100px;
-        margin: 0 40px;
-        border-radius: 16px;
-        overflow: hidden;
-        border: 2px solid #ffffff;
-        box-shadow: 0 6px 14px 0 #dce0e880;
-        img {
-          width: 100%;
-          height: 100%;
-          object-fit: cover;
-        }
-      }
-      .username {
-        p {
-          color: #253a70;
-          font-size: 20px;
-          font-weight: 500;
-          font-family: "SourceHanSansCN";
-          text-align: left;
-          line-height: 50px;
-        }
-        div {
-          color: #7c8db5;
-          font-size: 16px;
-          font-weight: 400;
-          font-family: "SourceHanSansCN";
-          line-height: 50px;
-          span {
-            color: #253a70;
-            display: inline-block;
-            margin: 0 20px;
-          }
-        }
-      }
-    }
-    .comm {
-      height: calc(100% - 220px);
-      border-radius: 15px;
-      background: white;
-      margin-bottom: 20px;
-      padding: 40px;
-      .com {
-        line-height: 30px;
-        color: #253a70;
-        font-size: 16px;
-        font-weight: 400;
-        margin-bottom: 10px;
-        font-family: "SourceHanSansCN";
-        span {
-          color: #7c8db5;
-          display: inline-block;
-          width: 100px;
-          margin-right: 20px;
-        }
-      }
-    }
-  }
-  .content {
-    width: calc(100% - 220px);
-    height: 100%;
-    overflow-y: auto;
-    border-radius: 15px;
-    border: 1px solid #e9f0f9;
-    background: #ffffff;
-    .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/personal.vue

@@ -1,413 +0,0 @@
-<template>
-  <div class="main_root">
-    <div class="personal_list">
-      <div class="personal_item" v-for="item in personal_list" :key="item.id">
-        <div
-          @click="toggle(item.id)"
-          :class="[curmodel === item.id ? 'active' : '']"
-        >
-          {{ item.title }}
-        </div>
-      </div>
-    </div>
-    <div class="contents" v-if="curmodel === 1">
-      <div class="user">
-        <div class="head">
-          <img src="../../assets/img/user.png" />
-        </div>
-        <div class="username">
-          <p>{{ personalInfo.aname }}</p>
-          <div>
-            登录名<span>{{ personalInfo.loginname }}</span> 角色<span>{{
-              personalInfo.atype === 1
-                ? "平台管理员"
-                : personalInfo.atype === 2
-                ? "区域管理员"
-                : "学校管理员"
-            }}</span>
-            手机号<span>{{ personalInfo.phone }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="comm">
-        <div class="com">
-          <span>创建时间</span>{{ personalInfo.createtime }}
-          <span style="margin-left: 20px">更新时间</span
-          >{{ personalInfo.updatetime }}
-        </div>
-        <div class="com">
-          <span>最后登录时间</span>{{ personalInfo.lasttime }}
-          <span style="margin-left: 20px">最后登录IP</span
-          >{{ personalInfo.lastip }}
-        </div>
-        <div class="com">
-          <span style="width: 50px">描述</span>{{ personalInfo.comm }}
-        </div>
-      </div>
-    </div>
-    <div class="content" v-else-if="curmodel === 2">
-      <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>
-    <div class="content" style="padding-top: 16px" v-else>
-      <div class="table_wrap">
-        <Table :columns="columns1" :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>
-  </div>
-</template>
-
-<script>
-import { admin_detail, admin_list_lr, admin_list_re } from "@/api/admin";
-import { dateFormat } from "@/utils";
-
-export default {
-  data() {
-    return {
-      personal_list: [
-        {
-          id: 1,
-          title: "个人信息"
-        },
-        {
-          id: 2,
-          title: "最近事件"
-        },
-        {
-          id: 3,
-          title: "历史登录"
-        }
-      ],
-      curmodel: 1,
-      personalInfo: {},
-      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: "logmodel",
-          align: "center"
-        },
-        {
-          title: "模块操作",
-          key: "logaction",
-          align: "center"
-        },
-        {
-          title: "日志内容",
-          key: "content",
-          align: "center"
-        },
-        {
-          title: "时间",
-          key: "createtime",
-          width: 190,
-          align: "center"
-        }
-      ],
-      columns1: [
-        {
-          title: "序号",
-          align: "center",
-          width: 70,
-          render: (h, params) => {
-            return h(
-              "span",
-              params.index +
-                (this.searchForm.page - 1) * this.searchForm.size +
-                1
-            );
-          }
-        },
-        {
-          title: "登录IP",
-          key: "ip",
-          align: "center"
-        },
-        {
-          title: "地址",
-          key: "ipAddress",
-          align: "center"
-        },
-        {
-          title: "登录时间",
-          key: "createtime",
-          width: 190,
-          align: "center"
-        }
-      ]
-    };
-  },
-  created() {
-    this.userInfo = JSON.parse(
-      localStorage.getItem("xh_control_userInfo")
-    ).content;
-    this.getPersonal();
-  },
-  computed: {
-    powerParams() {
-      return this.$store.getters.powerParams;
-    }
-  },
-  methods: {
-    toggle(type) {
-      this.curmodel = type;
-      if (type === 1) {
-        this.getPersonal();
-      } else {
-        this.searchForm.size = 10;
-        this.searchForm.page = 1;
-        this.searchList();
-      }
-    },
-    // 搜索
-    searchList() {
-      this.searchForm.page = 1;
-      this.getEvent();
-    },
-    // 页码改变
-    pageChange(page) {
-      this.searchForm.page = page;
-      this.getEvent();
-    },
-    // 每页显示数量改变
-    pageSizeChange(size) {
-      this.searchForm.size = size;
-      this.searchForm.page = 1;
-      this.getEvent();
-    },
-    async getEvent() {
-      let res = {
-        code: null
-      };
-      if (this.curmodel === 2) {
-        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;
-        res = await admin_list_re({
-          objectid: this.userInfo.adminid,
-          begindate: _begindate,
-          enddate: _enddate,
-          name: this.searchForm.name,
-          page: this.searchForm.page,
-          size: this.searchForm.size
-        });
-      } else {
-        res = await admin_list_lr({
-          objectid: this.userInfo.adminid,
-          page: this.searchForm.page,
-          size: this.searchForm.size
-        });
-      }
-
-      if (res.code === 0) {
-        this.searchForm.list = res.obj.data;
-        this.searchForm.total = res.obj.total;
-      } else {
-        this.$Message.error(res.msg);
-      }
-    },
-    getPersonal() {
-      admin_detail({ adminid: this.userInfo.adminid }).then((res) => {
-        if (res.code === 0) {
-          this.personalInfo = res.obj;
-        } else {
-          this.$Message.error(res.msg);
-        }
-      });
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-.main_root {
-  background-color: transparent;
-  border: navajowhite;
-  height: calc(100% - 20px);
-  display: flex;
-  .personal_list {
-    width: 200px;
-    height: 100%;
-    border-radius: 15px;
-    padding: 20px 10px;
-    border: 1px solid #e9f0f9;
-    background: #ffffff;
-    margin-right: 20px;
-    .personal_item {
-      line-height: 30px;
-      text-align: center;
-      cursor: pointer;
-    }
-    .active {
-      border-radius: 6px;
-      background: #339dff;
-      color: white;
-    }
-  }
-  .contents {
-    width: calc(100% - 220px);
-    height: 100%;
-    .user {
-      height: 200px;
-      border-radius: 15px;
-      background: white;
-      margin-bottom: 20px;
-      display: flex;
-      align-items: center;
-      .head {
-        width: 100px;
-        height: 100px;
-        margin: 0 40px;
-        border-radius: 16px;
-        overflow: hidden;
-        border: 2px solid #ffffff;
-        box-shadow: 0 6px 14px 0 #dce0e880;
-        img {
-          width: 100%;
-          height: 100%;
-          object-fit: cover;
-        }
-      }
-      .username {
-        p {
-          color: #253a70;
-          font-size: 20px;
-          font-weight: 500;
-          font-family: "SourceHanSansCN";
-          text-align: left;
-          line-height: 50px;
-        }
-        div {
-          color: #7c8db5;
-          font-size: 16px;
-          font-weight: 400;
-          font-family: "SourceHanSansCN";
-          line-height: 50px;
-          span {
-            color: #253a70;
-            display: inline-block;
-            margin: 0 20px;
-          }
-        }
-      }
-    }
-    .comm {
-      height: calc(100% - 220px);
-      border-radius: 15px;
-      background: white;
-      margin-bottom: 20px;
-      padding: 40px;
-      .com {
-        line-height: 30px;
-        color: #253a70;
-        font-size: 16px;
-        font-weight: 400;
-        margin-bottom: 10px;
-        font-family: "SourceHanSansCN";
-        span {
-          color: #7c8db5;
-          display: inline-block;
-          width: 100px;
-          margin-right: 20px;
-        }
-      }
-    }
-  }
-  .content {
-    width: calc(100% - 220px);
-    height: 100%;
-    overflow-y: auto;
-    border-radius: 15px;
-    border: 1px solid #e9f0f9;
-    background: #ffffff;
-    .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/regionManage/adminManage.vue

@@ -168,7 +168,26 @@
             <Radio :label="2">禁用</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="所属区域" prop="regionid" style="width: 100%">
+        <FormItem label="地址" style="width: 100%">
+          <Input
+              v-model="adminInfo.address"
+              placeholder="请输入地址"
+          ></Input>
+        </FormItem>
+        <FormItem label="描述信息" style="width: 100%">
+          <Input
+              type="textarea"
+              v-model="adminInfo.comm"
+              placeholder="请输入描述信息"
+          ></Input>
+        </FormItem>
+        <FormItem label="账号类型" style="width: 100%">
+          <RadioGroup v-model="adminInfo.userType">
+            <Radio :label="1">区域管理员</Radio>
+            <Radio :label="2">学校管理员</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem v-if="adminInfo.userType === 1" label="所属区域" prop="regionid" style="width: 100%">
           <Select
             :transfer="true"
             v-model="adminInfo.regionid"
@@ -182,6 +201,20 @@
             >
           </Select>
         </FormItem>
+        <FormItem v-if="adminInfo.userType === 2" label="选择学校" class="require" style="width: 100%">
+          <Select
+              :transfer="true"
+              v-model="adminInfo.schoolid"
+              style="width: 180px"
+          >
+            <Option
+                v-for="item in searchForm.schoolList"
+                :value="item.schoolid"
+                :key="item.schoolid"
+            >{{ item.schoolName }}</Option
+            >
+          </Select>
+        </FormItem>
       </Form>
       <div
         slot="footer"
@@ -350,6 +383,9 @@ export default {
         loginpwd1: "",
         phone: "",
         msgcode: "",
+        address: "",
+        comm: "",
+        userType: 1,
         enabled: 1,
         regionid: null
       },
@@ -511,6 +547,9 @@ export default {
         phone: "",
         msgcode: "",
         enabled: 1,
+        address: "",
+        comm: "",
+        userType: 1,
         regionid: null
       };
     },
@@ -595,7 +634,9 @@ export default {
             phone: this.adminInfo.phone,
             msgcode: this.adminInfo.msgcode,
             enabled: this.adminInfo.enabled,
-            regionid: this.adminInfo.regionid
+            regionid: this.adminInfo.regionid,
+            address: this.adminInfo.address,
+            comm: this.adminInfo.comm
           };
           //编辑
           if (this.adminInfo.adminid) {

src/views/regionSection/regionManage/regionManage.vue

@@ -125,6 +125,19 @@
             }}
           </div>
         </FormItem>
+        <FormItem label="地址" style="width: 100%">
+          <Input
+              v-model="regionInfo.admin.address"
+              placeholder="请输入地址"
+          ></Input>
+        </FormItem>
+        <FormItem label="描述信息" style="width: 100%">
+          <Input
+              type="textarea"
+              v-model="regionInfo.admin.comm"
+              placeholder="请输入描述信息"
+          ></Input>
+        </FormItem>
       </Form>
       <div
         slot="footer"
@@ -326,7 +339,9 @@ export default {
           loginpwd: "",
           loginpwd1: "",
           phone: "",
-          msgcode: ""
+          msgcode: "",
+          address: "",
+          comm: ""
         }
       },
       // 编辑
@@ -335,7 +350,9 @@ export default {
         regionid: null,
         regionName: "",
         regionCode: "",
-        rversion: null
+        rversion: null,
+        address: "",
+        comm: ""
       },
       // 查看
       viewInfo: {
@@ -717,7 +734,9 @@ export default {
           loginpwd: generateRandomString(8),
           loginpwd1: "",
           phone: "",
-          msgcode: ""
+          msgcode: "",
+          address: "",
+          comm: ""
         }
       };
     },
@@ -785,7 +804,9 @@ export default {
               loginname: this.regionInfo.admin.loginname,
               loginpwd: this.regionInfo.admin.loginpwd,
               phone: this.regionInfo.admin.phone,
-              msgcode: this.regionInfo.admin.msgcode
+              msgcode: this.regionInfo.admin.msgcode,
+              address: this.regionInfo.admin.address,
+              comm: this.regionInfo.admin.comm
             }
           }).then((data) => {
             this.showLoading = false;

src/views/regionSection/search/allApps.vue

@@ -682,7 +682,6 @@ export default {
             appName: res.obj.appName,
             devices: res.obj.devices
           };
-          console.log(this.deviceInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -708,7 +707,6 @@ export default {
     },
     installChange() {
       //安装统计切换版本
-      console.log(this.installInfo.versionName);
       let obj = this.installInfo.apphistorys.filter(
         (v) => v.versionName === this.installInfo.versionName
       )[0];
@@ -721,7 +719,6 @@ export default {
       }).then((res) => {
         this.showLoading = false;
         if (res.code === 0) {
-          console.log(res.obj);
           this.installInfo.list = res.obj;
         } else {
           this.$Message.error(res.msg);
@@ -749,13 +746,11 @@ export default {
           });
           qrcode._el.title = "";
         });
-        console.log(this.downloadInfo);
       } else if (type === 2) {
         //获取历史版本
         this.showLoading = true;
         let res = await app_detail_history({ appid: row.appid });
-        if (res.code === 0) {
-        } else {
+        if (res.code != 0) {
           this.$Message.error(res.msg);
         }
         //安装统计
@@ -767,7 +762,6 @@ export default {
         });
         this.showLoading = false;
         if (res1.code === 0) {
-          console.log(res1.obj);
           this.installInfo = {
             show: true,
             appName: row.appName,
@@ -818,7 +812,6 @@ export default {
       let obj = this.viewInfo.apphistorys.filter(
         (v) => v.versionName === this.viewInfo.versionName
       )[0];
-      console.log(obj);
       this.viewInfo.apkPath = obj.apkPath;
       this.viewInfo.appAbbr = obj.appAbbr;
       this.viewInfo.appDeveloper = obj.appDeveloper;
@@ -866,7 +859,6 @@ export default {
             devices: res.obj.devices,
             schools: res.obj.schools
           };
-          console.log(this.viewInfo);
         } else {
           this.$Message.error(res.msg);
         }
@@ -927,7 +919,6 @@ export default {
         this.showLoading = false;
         if (data.code === 0) {
           this.searchForm.list = data.obj.data;
-          console.log(this.searchForm.list);
           this.searchForm.total = data.obj.total;
         } else {
           this.$Message.error(data.msg);
@@ -955,7 +946,7 @@ export default {
     display: flex;
     margin: 16px 0;
     .app_logo {
-      flex-wrap: none;
+      flex: none;
       width: 56px;
       height: 56px;
       border-radius: 20px;

src/views/schoolSection/logdoperatemsg.vue

@@ -1,262 +0,0 @@
-<template>
-  <div class="main_root">
-    <div class="search_header">
-      <div class="search_left">
-        <Input
-          v-model="searchForm.name"
-          placeholder="请输入姓名、账号、设备号"
-          search
-          @on-search="searchList()"
-          style="width: 240px; margin-right: 20px"
-        />
-        <Checkbox @on-change="showReadChange" v-model="searchForm.showRead"
-          >只显示未读</Checkbox
-        >
-      </div>
-    </div>
-    <div class="table_wrap">
-      <div class="log_list" v-for="item in searchForm.list" :key="item.doid">
-        <div class="username" @click="headleView(item)">
-          {{ item.classname }} 【{{ item.username }}】<span
-            :class="[item.hasread === 1 ? 'active' : '']"
-            >{{ item.hasread === 1 ? "已读" : "未读" }}</span
-          >
-        </div>
-        <div class="comm">{{ item.comm }}</div>
-        <div class="school">
-          学校：<span>{{ item.schoolName }}</span> 设备号：<span>{{
-            item.sn
-          }}</span>
-          时间：<span>{{ item.createtime }}</span>
-        </div>
-      </div>
-      <div class="nodeta" v-if="searchForm.list.length === 0">暂无数据</div>
-    </div>
-    <div class="page_wrap" v-if="searchForm.list.length > 0">
-      <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>
-        <div class="username">
-          {{ viewInfo.classname }} 【{{ viewInfo.username }}】
-        </div>
-        <div class="school">
-          学校：<span style="margin-right: 20px">{{
-            viewInfo.schoolName
-          }}</span>
-          时间：{{ viewInfo.createtime }}
-        </div>
-        <div class="comm">{{ viewInfo.comm }}</div>
-        <div class="comm">设备号：{{ viewInfo.sn }}</div>
-      </div>
-      <div slot="footer" style="text-align: center">
-        <div>
-          <Button @click="viewInfo.show = false">关闭</Button>
-        </div>
-      </div>
-    </Modal>
-  </div>
-</template>
-
-<script>
-import { logdoperatemsg_edit_read, logdoperatemsg_list } from "@/api/log";
-
-export default {
-  data() {
-    return {
-      searchForm: {
-        showRead: 0,
-        name: "",
-        page: 1,
-        size: 10,
-        list: [],
-        total: 0
-      },
-      viewInfo: {
-        show: false
-      },
-      userInfo: {}
-    };
-  },
-  created() {
-    this.userInfo = JSON.parse(
-      localStorage.getItem("xh_control_userInfo")
-    ).content;
-    this.searchList();
-  },
-  computed: {
-    powerParams() {
-      return this.$store.getters.powerParams;
-    }
-  },
-  methods: {
-    headleView(item) {
-      logdoperatemsg_edit_read({ ldomid: item.ldomid }).then((res) => {
-        if (res.code === 0) {
-          this.searchForm.list.forEach((v) => {
-            if (item.ldomid === v.ldomid) {
-              //改状态为已读
-              v.hasread = 1;
-            }
-          });
-          this.viewInfo = {
-            show: true,
-            classname: item.classname,
-            username: item.username,
-            schoolName: item.schoolName,
-            createtime: item.createtime,
-            comm: item.comm,
-            sn: item.sn
-          };
-        } else {
-          this.$Message.error(res.msg);
-        }
-      });
-    },
-    showReadChange() {
-      this.searchForm.showRead = this.searchForm.showRead ? 1 : 0;
-      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();
-    },
-    getList() {
-      logdoperatemsg_list({
-        rtype: this.powerParams.rtype,
-        objectid: this.powerParams.objectid,
-        name: this.searchForm.name,
-        page: this.searchForm.page,
-        size: this.searchForm.size,
-        showRead: this.searchForm.showRead
-      }).then((res) => {
-        if (res.code === 0) {
-          this.searchForm.list = res.obj.data;
-          this.searchForm.total = res.obj.total;
-        } else {
-          this.$Message.error(res.msg);
-        }
-      });
-    }
-  }
-};
-</script>
-
-<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;
-  }
-}
-.table_wrap {
-  border: none;
-  .log_list {
-    border-radius: 8px;
-    border: 1px solid #ced9f2;
-    padding: 16px;
-    margin-bottom: 10px;
-    font-family: "SourceHanSansCN";
-    .username {
-      color: #253a70;
-      font-size: 16px;
-      font-weight: 700;
-      line-height: 30px;
-      margin-bottom: 10px;
-      cursor: pointer;
-      span {
-        display: inline-block;
-        border-radius: 11px;
-        background: #95abdf1a;
-        color: #95abdf;
-        font-size: 14px;
-        line-height: 14px;
-        font-weight: 400;
-        padding: 4px 10px;
-      }
-      .active {
-        background: #ebf3ff;
-        color: #339dff;
-      }
-    }
-    .comm {
-      color: #253a70;
-      font-size: 16px;
-      font-weight: 400;
-      line-height: 30px;
-    }
-    .school {
-      color: #798cb5;
-      font-size: 16px;
-      font-weight: 400;
-      line-height: 30px;
-      span {
-        margin-right: 20px;
-      }
-    }
-  }
-}
-.modal1 {
-  font-family: "SourceHanSansCN";
-
-  .username {
-    color: #253a70;
-    font-size: 18px;
-    font-weight: 500;
-    line-height: 30px;
-    text-align: center;
-  }
-  .school {
-    color: #afbcc7;
-    font-size: 12px;
-    font-weight: 400;
-    text-align: center;
-    line-height: 26px;
-    margin: 10px 0;
-  }
-  .comm {
-    color: #253a70;
-    font-size: 16px;
-    font-weight: 400;
-    line-height: 30px;
-  }
-}
-.nodeta {
-  min-height: 300px;
-  line-height: 300px;
-  text-align: center;
-}
-</style>

src/views/schoolSection/personal.vue

@@ -1,413 +0,0 @@
-<template>
-  <div class="main_root">
-    <div class="personal_list">
-      <div class="personal_item" v-for="item in personal_list" :key="item.id">
-        <div
-          @click="toggle(item.id)"
-          :class="[curmodel === item.id ? 'active' : '']"
-        >
-          {{ item.title }}
-        </div>
-      </div>
-    </div>
-    <div class="contents" v-if="curmodel === 1">
-      <div class="user">
-        <div class="head">
-          <img src="../../assets/img/user.png" />
-        </div>
-        <div class="username">
-          <p>{{ personalInfo.aname }}</p>
-          <div>
-            登录名<span>{{ personalInfo.loginname }}</span> 角色<span>{{
-              personalInfo.atype === 1
-                ? "平台管理员"
-                : personalInfo.atype === 2
-                ? "区域管理员"
-                : "学校管理员"
-            }}</span>
-            手机号<span>{{ personalInfo.phone }}</span>
-          </div>
-        </div>
-      </div>
-      <div class="comm">
-        <div class="com">
-          <span>创建时间</span>{{ personalInfo.createtime }}
-          <span style="margin-left: 20px">更新时间</span
-          >{{ personalInfo.updatetime }}
-        </div>
-        <div class="com">
-          <span>最后登录时间</span>{{ personalInfo.lasttime }}
-          <span style="margin-left: 20px">最后登录IP</span
-          >{{ personalInfo.lastip }}
-        </div>
-        <div class="com">
-          <span style="width: 50px">描述</span>{{ personalInfo.comm }}
-        </div>
-      </div>
-    </div>
-    <div class="content" v-else-if="curmodel === 2">
-      <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>
-    <div class="content" style="padding-top: 16px" v-else>
-      <div class="table_wrap">
-        <Table :columns="columns1" :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>
-  </div>
-</template>
-
-<script>
-import { admin_detail, admin_list_lr, admin_list_re } from "@/api/admin";
-import { dateFormat } from "@/utils";
-
-export default {
-  data() {
-    return {
-      personal_list: [
-        {
-          id: 1,
-          title: "个人信息"
-        },
-        {
-          id: 2,
-          title: "最近事件"
-        },
-        {
-          id: 3,
-          title: "历史登录"
-        }
-      ],
-      curmodel: 1,
-      personalInfo: {},
-      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: "logmodel",
-          align: "center"
-        },
-        {
-          title: "模块操作",
-          key: "logaction",
-          align: "center"
-        },
-        {
-          title: "日志内容",
-          key: "content",
-          align: "center"
-        },
-        {
-          title: "时间",
-          key: "createtime",
-          width: 190,
-          align: "center"
-        }
-      ],
-      columns1: [
-        {
-          title: "序号",
-          align: "center",
-          width: 70,
-          render: (h, params) => {
-            return h(
-              "span",
-              params.index +
-                (this.searchForm.page - 1) * this.searchForm.size +
-                1
-            );
-          }
-        },
-        {
-          title: "登录IP",
-          key: "ip",
-          align: "center"
-        },
-        {
-          title: "地址",
-          key: "ipAddress",
-          align: "center"
-        },
-        {
-          title: "登录时间",
-          key: "createtime",
-          width: 190,
-          align: "center"
-        }
-      ]
-    };
-  },
-  created() {
-    this.userInfo = JSON.parse(
-      localStorage.getItem("xh_control_userInfo")
-    ).content;
-    this.getPersonal();
-  },
-  computed: {
-    powerParams() {
-      return this.$store.getters.powerParams;
-    }
-  },
-  methods: {
-    toggle(type) {
-      this.curmodel = type;
-      if (type === 1) {
-        this.getPersonal();
-      } else {
-        this.searchForm.size = 10;
-        this.searchForm.page = 1;
-        this.searchList();
-      }
-    },
-    // 搜索
-    searchList() {
-      this.searchForm.page = 1;
-      this.getEvent();
-    },
-    // 页码改变
-    pageChange(page) {
-      this.searchForm.page = page;
-      this.getEvent();
-    },
-    // 每页显示数量改变
-    pageSizeChange(size) {
-      this.searchForm.size = size;
-      this.searchForm.page = 1;
-      this.getEvent();
-    },
-    async getEvent() {
-      let res = {
-        code: null
-      };
-      if (this.curmodel === 2) {
-        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;
-        res = await admin_list_re({
-          objectid: this.userInfo.adminid,
-          begindate: _begindate,
-          enddate: _enddate,
-          name: this.searchForm.name,
-          page: this.searchForm.page,
-          size: this.searchForm.size
-        });
-      } else {
-        res = await admin_list_lr({
-          objectid: this.userInfo.adminid,
-          page: this.searchForm.page,
-          size: this.searchForm.size
-        });
-      }
-
-      if (res.code === 0) {
-        this.searchForm.list = res.obj.data;
-        this.searchForm.total = res.obj.total;
-      } else {
-        this.$Message.error(res.msg);
-      }
-    },
-    getPersonal() {
-      admin_detail({ adminid: this.userInfo.adminid }).then((res) => {
-        if (res.code === 0) {
-          this.personalInfo = res.obj;
-        } else {
-          this.$Message.error(res.msg);
-        }
-      });
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-.main_root {
-  background-color: transparent;
-  border: navajowhite;
-  height: calc(100% - 20px);
-  display: flex;
-  .personal_list {
-    width: 200px;
-    height: 100%;
-    border-radius: 15px;
-    padding: 20px 10px;
-    border: 1px solid #e9f0f9;
-    background: #ffffff;
-    margin-right: 20px;
-    .personal_item {
-      line-height: 30px;
-      text-align: center;
-      cursor: pointer;
-    }
-    .active {
-      border-radius: 6px;
-      background: #339dff;
-      color: white;
-    }
-  }
-  .contents {
-    width: calc(100% - 220px);
-    height: 100%;
-    .user {
-      height: 200px;
-      border-radius: 15px;
-      background: white;
-      margin-bottom: 20px;
-      display: flex;
-      align-items: center;
-      .head {
-        width: 100px;
-        height: 100px;
-        margin: 0 40px;
-        border-radius: 16px;
-        overflow: hidden;
-        border: 2px solid #ffffff;
-        box-shadow: 0 6px 14px 0 #dce0e880;
-        img {
-          width: 100%;
-          height: 100%;
-          object-fit: cover;
-        }
-      }
-      .username {
-        p {
-          color: #253a70;
-          font-size: 20px;
-          font-weight: 500;
-          font-family: "SourceHanSansCN";
-          text-align: left;
-          line-height: 50px;
-        }
-        div {
-          color: #7c8db5;
-          font-size: 16px;
-          font-weight: 400;
-          font-family: "SourceHanSansCN";
-          line-height: 50px;
-          span {
-            color: #253a70;
-            display: inline-block;
-            margin: 0 20px;
-          }
-        }
-      }
-    }
-    .comm {
-      height: calc(100% - 220px);
-      border-radius: 15px;
-      background: white;
-      margin-bottom: 20px;
-      padding: 40px;
-      .com {
-        line-height: 30px;
-        color: #253a70;
-        font-size: 16px;
-        font-weight: 400;
-        margin-bottom: 10px;
-        font-family: "SourceHanSansCN";
-        span {
-          color: #7c8db5;
-          display: inline-block;
-          width: 100px;
-          margin-right: 20px;
-        }
-      }
-    }
-  }
-  .content {
-    width: calc(100% - 220px);
-    height: 100%;
-    overflow-y: auto;
-    border-radius: 15px;
-    border: 1px solid #e9f0f9;
-    background: #ffffff;
-    .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>