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

src/views/layout.vue

@@ -48,14 +48,125 @@
     <div class="layout_main">
       <router-view></router-view>
     </div>
+    <!-- 修改密码 -->
+    <Modal
+        class="modal1"
+        :mask-closable="false"
+        v-model="pwInfo.show"
+        title="修改密码"
+    >
+      <Form
+          v-if="pwInfo.show"
+          ref="pwInfo"
+          :model="pwInfo"
+          :rules="rules"
+          :label-width="110"
+      >
+        <FormItem label="原密码" prop="oldpwd">
+          <Input
+              v-model="pwInfo.oldpwd"
+              placeholder="请输入原密码"
+          ></Input>
+        </FormItem>
+        <FormItem
+            label="新密码"
+            prop="loginpwd"
+        >
+          <Input
+              v-model="pwInfo.loginpwd"
+              placeholder="请输入新密码"
+          ></Input>
+        </FormItem>
+        <FormItem
+            label="确认密码"
+            prop="loginpwd1"
+        >
+          <Input
+              v-model="pwInfo.loginpwd1"
+              placeholder="请输入确认密码"
+          ></Input>
+        </FormItem>
+      </Form>
+      <div
+          slot="footer"
+          style="
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+        "
+      >
+        <div style="color: #b50000">
+          注：密码必须包含大小写字母和数字的组合，长度在8-32之间。
+        </div>
+        <div>
+          <Button @click="pwInfo.show = false">取消</Button>
+          <Button @click="savepwInfo()" type="primary">保存</Button>
+        </div>
+      </div>
+    </Modal>
+    <Spin fix v-if="showLoading" style="background-color: transparent">
+      <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+      <div>加载中</div>
+    </Spin>
   </div>
 </template>
 
 <script>
+import {region_add} from "@/api/region";
+import {admin_detail, admin_edit_pwd} from "@/api/admin";
+
 export default {
   data() {
+    const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
+    // 密码验证
+    const pwdCheck = (rule, value, callback) => {
+      if (!reg.test(value)) {
+        return callback(new Error("密码格式不正确!"));
+      }
+      callback();
+    };
+    // 重复密码验证
+    const pwdAgainCheck = async (rule, value, callback) => {
+      if (!reg.test(value)) {
+        return callback(new Error("密码格式不正确!"));
+      }
+      if (this.pwInfo.loginpwd != value) {
+        return callback(new Error("两次输入密码不一致！"));
+      }
+      callback();
+    };
     return {
+      showLoading: false,
       userDropdown: false,
+      pwInfo: {
+        show: false,
+      },
+      phoneInfo: {
+        show: false
+      },
+      rules: {
+        oldpwd: [
+          {
+            required: true,
+            message: "请输入原密码",
+            trigger: "blur"
+          }
+        ],
+        loginpwd: [
+          {
+            required: true,
+            validator: pwdCheck,
+            trigger: "blur"
+          }
+        ],
+        loginpwd1: [
+          {
+            required: true,
+            validator: pwdAgainCheck,
+            trigger: "blur"
+          }
+        ]
+      },
       userInfo: {}
     };
   },
@@ -75,6 +186,30 @@ export default {
     }
   },
   methods: {
+    savepwInfo(){
+
+      this.$refs.pwInfo.validate((valid) => {
+        if (valid) {
+          console.log(this.pwInfo)
+          return
+          this.showLoading = true;
+          admin_edit_pwd({
+            adminid: this.pwInfo.adminid,
+            loginpwd: this.pwInfo.loginpwd,
+            oldpwd: this.pwInfo.oldpwd,
+            rversion: this.pwInfo.rversion
+            }).then((data) => {
+            this.showLoading = false;
+            if (data.code === 0) {
+              this.regionInfo.show = false;
+              this.$Message.success(data.msg);
+            } else {
+              this.$Message.error(data.msg);
+            }
+          });
+        }
+      });
+    },
     // 下拉菜单显示隐藏
     userDropdownVisibleChange(visible) {
       this.userDropdown = visible;
@@ -84,10 +219,22 @@ export default {
       if (name === "1") {
         // 个人中心
         this.$router.push("personal");
-      } else if (name === "2") {
-        // 修改密码
-      } else if (name === "3") {
-        // 更换手机号
+      } else if (name === "2" || name === "3") {
+        // 2修改密码 3更换手机号
+        admin_detail({ adminid: this.userInfo.adminid }).then((res) => {
+          if (res.code === 0) {
+            console.log(res.obj);
+            if(name === "2"){
+              this.pwInfo.show = true;
+              this.pwInfo.rversion = res.obj.rversion;
+            }else {
+              this.phoneInfo.show = true;
+              this.phoneInfo.rversion = res.obj.rversion;
+            }
+          } else {
+            this.$Message.error(res.msg);
+          }
+        });
       } else if (name === "4") {
         // 退出
         this.$Modal.confirm({

src/views/login/login.vue

@@ -313,8 +313,9 @@ export default {
     background: #ffffff;
     box-shadow: 0 0 18px 0 #deeaffe0;
     position: absolute;
-    right: 160px;
-    bottom: 160px;
+    top: 50%;
+    transform: translateY(-50%);
+    right: 16%;
     .welcome {
       height: 30px;
       color: #000000;

src/views/regionSection/applicationManage/applicationManage.vue

@@ -2012,6 +2012,7 @@ export default {
       margin-top: 10px;
       color: #96abdf;
       line-height: 30px;
+      text-align: center;
       &:hover {
         cursor: pointer;
         color: #339cff;

src/views/regionSection/personal.vue

@@ -3,7 +3,7 @@
     <div class="personal_list">
       <div class="personal_item" v-for="item in personal_list" :key="item.id">
         <div
-          @click="curmodel = item.id"
+          @click="toggle(item.id)"
           :class="[curmodel === item.id ? 'active' : '']"
         >
           {{ item.title }}
@@ -11,15 +11,104 @@
       </div>
     </div>
     <div class="contents" v-if="curmodel === 1">
-      <div class="user"></div>
-      <div class="comm"></div>
+      <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 class="content" v-else></div>
   </div>
 </template>
 
 <script>
-import { admin_detail } from "@/api/admin";
+import { admin_detail, admin_list_lr, admin_list_re } from "@/api/admin";
+import { dateFormat } from "@/utils";
 
 export default {
   data() {
@@ -39,7 +128,78 @@ export default {
         }
       ],
       curmodel: 1,
-      userInfo: {}
+      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: "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() {
@@ -54,9 +214,71 @@ export default {
     }
   },
   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() {
+      console.log(this.userInfo);
+      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;
+        console.log(this.searchForm.list);
+        this.searchForm.total = res.obj.total;
+      } else {
+        this.$Message.error(res.msg);
+      }
+    },
     getPersonal() {
-      admin_detail({ adminid: this.userInfo.user }).then((res) => {
+      console.log(this.userInfo);
+      admin_detail({ adminid: this.userInfo.adminid }).then((res) => {
         if (res.code === 0) {
+          this.personalInfo = res.obj;
           console.log(res.obj);
         } else {
           this.$Message.error(res.msg);
@@ -100,20 +322,85 @@ export default {
       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/search/allApps.vue

@@ -618,7 +618,7 @@ export default {
         {
           title: "状态",
           slot: "enabled",
-          width: 120,
+          width: 100,
           align: "center"
         },
         {
@@ -636,7 +636,7 @@ export default {
         {
           title: "操作时间",
           key: "updatetime",
-          width: 190,
+          width: 180,
           align: "center"
         },
         {
@@ -1057,6 +1057,7 @@ export default {
       margin-top: 10px;
       color: #96abdf;
       line-height: 30px;
+      text-align: center;
       &:hover {
         cursor: pointer;
         color: #339cff;

src/views/regionSection/search/deviceModel.vue

@@ -2,12 +2,12 @@
   <div class="main_root">
     <div class="search_header">
       <Input
-        v-model="searchForm.name"
+        v-model="searchForm.title"
         placeholder="请输入学校名称"
         style="width: 200px"
       />
       <Input
-        v-model="searchForm.title"
+        v-model="searchForm.name"
         placeholder="请输入设备型号、Rom版本"
         style="width: 200px; margin: 0 10px"
       />

src/views/schoolSection/applicationManage/applicationList.vue

@@ -1607,6 +1607,7 @@ export default {
       margin-top: 10px;
       color: #96abdf;
       line-height: 30px;
+      text-align: center;
       &:hover {
         cursor: pointer;
         color: #339cff;