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

src/router/platform.js

@@ -21,6 +21,16 @@ export default {
         title: "平台管控-首页"
       }
     },
+    {
+      path: "personal",
+      component: () => import("@/views/regionSection/personal.vue"),
+      name: "personal",
+      meta: {
+        keepAlive: true,
+        isAuth: true,
+        title: "平台管控-个人中心"
+      }
+    },
     {
       path: "regionManage",
       component: () =>

src/router/region.js

@@ -21,6 +21,16 @@ export default {
         title: "区域管控-个人中心"
       }
     },
+    {
+      path: "logdoperatemsg",
+      component: () => import("@/views/regionSection/logdoperatemsg.vue"),
+      name: "logdoperatemsg",
+      meta: {
+        keepAlive: true,
+        isAuth: true,
+        title: "区域管控-消息"
+      }
+    },
     {
       path: "home",
       component: () => import("@/views/regionSection/home/index.vue"),

src/router/school.js

@@ -21,6 +21,26 @@ export default {
         title: "学校管控-首页"
       }
     },
+    {
+      path: "personal",
+      component: () => import("@/views/regionSection/personal.vue"),
+      name: "personal",
+      meta: {
+        keepAlive: true,
+        isAuth: true,
+        title: "学校管控-个人中心"
+      }
+    },
+    {
+      path: "logdoperatemsg",
+      component: () => import("@/views/regionSection/logdoperatemsg.vue"),
+      name: "logdoperatemsg",
+      meta: {
+        keepAlive: true,
+        isAuth: true,
+        title: "学校管控-消息"
+      }
+    },
     {
       path: "applicationList",
       component: () =>

src/views/layout.vue

@@ -15,10 +15,11 @@
         <div style="margin-right: 10px" v-else-if="powerParams.rtype === 3">
           所属学校【{{ belongName }}】
         </div>
-        <div class="dope" v-if="powerParams.rtype != 1">
-          <img @click="headerDope" class="img1" src="../assets/img/dope.png" />
-          <img class="img2" src="../assets/img/Ellipse.png" />
-          <span class="dopenum">99</span>
+        <div class="dope" @click="headerDope" v-if="powerParams.rtype != 1">
+          <img class="img1" src="../assets/img/dope.png" />
+          <div class="img2">
+            {{ nreadNum }}
+          </div>
         </div>
         <Dropdown
           :transfer="true"
@@ -159,6 +160,7 @@
 <script>
 import { admin_detail, admin_edit_phone, admin_edit_pwd } from "@/api/admin";
 import { login_msg_code } from "@/api/login";
+import { logdoperatemsg_get_nrn } from "@/api/log";
 
 export default {
   data() {
@@ -183,6 +185,7 @@ export default {
     return {
       showLoading: false,
       userDropdown: false,
+      nreadNum: 0,
       pwInfo: {
         show: false,
         adminid: "",
@@ -230,6 +233,7 @@ export default {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
     ).content;
+    this.init();
   },
   computed: {
     // 所属名称
@@ -242,8 +246,20 @@ export default {
     }
   },
   methods: {
-    headerDope(){
-
+    init() {
+      logdoperatemsg_get_nrn({
+        rtype: this.powerParams.rtype,
+        objectid: this.powerParams.objectid
+      }).then((res) => {
+        if (res.code === 0) {
+          this.nreadNum = res.obj >= 100 ? 99 : res.obj;
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    headerDope() {
+      this.$router.push("logdoperatemsg");
     },
     // 获取短信验证码
     getMsgCode() {
@@ -448,6 +464,12 @@ export default {
         position: absolute;
         right: -1px;
         top: -4px;
+        text-align: center;
+        line-height: 18px;
+        font-size: 12px;
+        color: white;
+        background: url("../assets/img/Ellipse.png") no-repeat;
+        background-size: 100% 100%;
       }
       .dopenum {
         color: white;

src/views/platformSection/personal.vue

@@ -0,0 +1,413 @@
+<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/logdoperatemsg.vue

@@ -0,0 +1,262 @@
+<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/regionSection/personal.vue

@@ -61,7 +61,7 @@
           ></DatePicker>
           <Input
             v-model="searchForm.name"
-            placeholder="请输入事件、名称"
+            placeholder="请输入事件名称"
             search
             @on-search="searchList()"
             style="width: 180px"
@@ -69,7 +69,8 @@
         </div>
       </div>
       <div class="table_wrap">
-        <Table :columns="columns" :data="searchForm.list"></Table>
+        <Table :columns="columns" :data="searchForm.list">
+        </Table>
       </div>
       <div class="page_wrap">
         <Page
@@ -158,7 +159,17 @@ export default {
           align: "center"
         },
         {
-          title: "事件",
+          title: "所属模块",
+          key: "logmodel",
+          align: "center"
+        },
+        {
+          title: "模块操作",
+          key: "logaction",
+          align: "center"
+        },
+        {
+          title: "日志内容",
           key: "content",
           align: "center"
         },

src/views/schoolSection/logdoperatemsg.vue

@@ -0,0 +1,262 @@
+<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

@@ -0,0 +1,413 @@
+<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>