平台-设备密码

src/api/setting.js

@@ -76,6 +76,11 @@ export const schoolSet_delete = (data) => setRequest("schoolSet/delete", data);
  */
 export const password_detail_userpwd = (data) =>
   setRequest("password/detail_userpwd", data);
+/**
+ * 8.3.6 设备设置--根据SN获取动态码
+ */
+export const password_detail_sn = (data) =>
+  setRequest("password/detail_sn", data);
 /**
  * 8.4.1 开机设置-详情
  */

src/assets/less/common.less

@@ -383,6 +383,7 @@ fieldset[disabled] .ivu-input,
   background-color: #fff;
 }
 // 表格
+.table_wrap_modal,
 .table_wrap {
   margin: 0 16px;
   border: 1px solid #e8eaec;
@@ -398,6 +399,9 @@ fieldset[disabled] .ivu-input,
     }
   }
 }
+.table_wrap_modal {
+  margin: 0;
+}
 .page_wrap {
   padding: 16px;
   text-align: right;

src/router/platform.js

@@ -90,6 +90,19 @@ export default {
         title: "平台管控-设备管理-设备导出"
       }
     },
+    {
+      path: "deviceManagePwd",
+      component: () =>
+        import(
+          "@/views/platformSection/deviceManage/deviceManagePwd/deviceManagePwd.vue"
+        ),
+      name: "deviceManagePwd",
+      meta: {
+        keepAlive: true,
+        isAuth: true,
+        title: "平台管控-设备管理-设备密码"
+      }
+    },
     {
       path: "logDeviceExport",
       component: () =>

src/views/platformSection/deviceManage/deviceManageExport/deviceManageExport.vue

@@ -2,13 +2,20 @@
   <div class="main_root">
     <div class="search_header">
       <div class="search_left">
-        <Input
-          v-model="searchForm.name"
-          placeholder="请输入名称"
-          search
-          @on-search="searchList()"
+        <Select
+          v-model="searchForm.regionid"
+          :transfer="true"
+          @on-change="searchList()"
           style="width: 150px"
-        />
+        >
+          <Option :value="0">所有区域</Option>
+          <Option
+            v-for="regionItem in searchForm.regionList"
+            :value="regionItem.regionid"
+            :key="regionItem.regionid"
+            >{{ regionItem.regionName }}</Option
+          >
+        </Select>
       </div>
       <Button type="primary" class="primary_btn" @click="toExport()"
         >导出</Button
@@ -16,9 +23,14 @@
     </div>
     <div class="table_wrap">
       <Table :columns="columns" :data="searchForm.list">
+        <template slot-scope="{ row }" slot="onlineSlot">
+          <!-- 1在线2离线 -->
+          <div v-if="row.online === 1">在线</div>
+          <div v-else-if="row.online === 2">离线</div>
+        </template>
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
-            <div @click="toExport(row)">导出</div>
+            <div @click="toView(row)">查看</div>
           </div>
         </template>
       </Table>
@@ -36,22 +48,81 @@
         show-sizer
       ></Page>
     </div>
+    <Modal
+      class="modal2"
+      :mask-closable="false"
+      v-model="viewInfo.show"
+      title="查看"
+    >
+      <div class="table_wrap_modal">
+        <Table :columns="viewInfo.columns" :data="viewInfo.list"></Table>
+      </div>
+      <div slot="footer" style="text-align: center">
+        <Button @click="viewInfo.show = false">关闭</Button>
+      </div>
+    </Modal>
   </div>
 </template>
 
 <script>
+import { region_list_sel_pt } from "@/api/region";
 import { exportToExcel } from "@/utils/exportToExcel";
 import { logDeviceBind_list, logDeviceBind_list_all } from "@/api/log";
 export default {
   data() {
     return {
       searchForm: {
-        name: "",
+        regionid: 0,
+        regionList: [],
         page: 1,
         size: 10,
         list: [],
         total: 0
       },
+      viewInfo: {
+        show: false,
+        list: [],
+        columns: [
+          {
+            title: "序号",
+            type: "index",
+            align: "center",
+            width: 70
+          },
+          {
+            title: "所属区域",
+            key: "regionName",
+            align: "center"
+          },
+          {
+            title: "学校名称",
+            key: "schoolName",
+            align: "center"
+          },
+          {
+            title: "班级",
+            key: "classname",
+            align: "center"
+          },
+          {
+            title: "姓名",
+            key: "username",
+            align: "center"
+          },
+          {
+            title: "绑定时间",
+            key: "snnum",
+            width: 190,
+            align: "center"
+          },
+          {
+            title: "解绑时间",
+            key: "snnum",
+            width: 190,
+            align: "center"
+          }
+        ]
+      },
       columns: [
         {
           title: "序号",
@@ -67,23 +138,46 @@ export default {
           }
         },
         {
-          title: "区域名称",
-          key: "regionName",
+          title: "学校名称",
+          key: "schoolName",
+          align: "center"
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center"
+        },
+        {
+          title: "设备号",
+          key: "sn",
           align: "center"
         },
         {
-          title: "学校数",
-          key: "schoolnum",
+          title: "设备型号",
+          key: "deviceModel",
           align: "center"
         },
         {
-          title: "用户数",
-          key: "usernum",
+          title: "状态",
+          slot: "onlineSlot",
+          width: 70,
           align: "center"
         },
         {
-          title: "设备数",
-          key: "snnum",
+          title: "首次激活时间",
+          key: "updatetime",
+          width: 190,
+          align: "center"
+        },
+        {
+          title: "末次解绑时间",
+          key: "updatetime",
+          width: 190,
           align: "center"
         },
         {
@@ -96,6 +190,7 @@ export default {
     };
   },
   created() {
+    this.getRegionList();
     this.searchList();
   },
   computed: {
@@ -104,6 +199,16 @@ export default {
     }
   },
   methods: {
+    // 获取搜索区域列表
+    getRegionList() {
+      region_list_sel_pt({}).then((data) => {
+        if (data.code === 0) {
+          this.searchForm.regionList = data.obj;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
     // 搜索
     searchList() {
       this.searchForm.page = 1;
@@ -137,6 +242,9 @@ export default {
         }
       });
     },
+    toView() {
+      this.viewInfo.show = true;
+    },
     toExport(row) {
       let form = {
         rtype: this.powerParams.rtype,

src/views/platformSection/deviceManage/deviceManagePwd/deviceManagePwd.vue

@@ -0,0 +1,114 @@
+<template>
+  <div class="main_root">
+    <div class="tip_bg">
+      <div class="require">输入设备号后，系统自动计算设备密码。</div>
+      <div class="require">密码为动态密码，每隔1小时变化一次。</div>
+    </div>
+    <div class="pwd_main">
+      <div class="pwd_main_input">
+        <Input
+          v-model="searchInfo.sn"
+          placeholder="请输入设备号"
+          @on-enter="getSnPwd()"
+          @on-change="searchInfo.data = ''"
+          style="width: 380px"
+          clearable
+        />
+        <Button type="primary" class="primary_btn" @click="getSnPwd()"
+          >查询</Button
+        >
+      </div>
+      <div class="pwd_main_info" v-if="searchInfo.data">
+        <div>查询结果</div>
+        <div class="pwd_main_data">{{ searchInfo.data }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { password_detail_sn } from "@/api/setting";
+export default {
+  data() {
+    return {
+      searchInfo: {
+        sn: "",
+        data: ""
+      }
+    };
+  },
+  computed: {
+    powerParams() {
+      return this.$store.getters.powerParams;
+    }
+  },
+  methods: {
+    getSnPwd() {
+      if (!this.searchInfo.sn) {
+        this.$Message.error("请输入设备号");
+        return;
+      }
+      password_detail_sn({
+        sn: this.searchInfo.sn
+      }).then((data) => {
+        if (data.code === 0) {
+          this.searchInfo.data = data.obj;
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+.tip_bg {
+  margin: 50px 100px;
+  border-radius: 8px;
+  border: 1px dashed #ced9f2;
+  background: #f1f6fc;
+  .require {
+    margin: 10px 20px;
+    font-size: 16px;
+    line-height: 1.6;
+    &::before {
+      content: "*" !important;
+      display: inline-block;
+      margin-right: 4px;
+      line-height: 1;
+      font-family: SimSun;
+      font-size: 14px;
+      color: #ed4014;
+    }
+  }
+}
+.pwd_main {
+  margin: 0 auto;
+  width: 480px;
+  .pwd_main_input {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .primary_btn {
+      width: 84px;
+    }
+  }
+  .pwd_main_info {
+    margin-top: 40px;
+    font-weight: bold;
+    font-size: 16px;
+    .pwd_main_data {
+      margin-top: 10px;
+      height: 36px;
+      line-height: 36px;
+      font-size: 18px;
+      text-align: center;
+      color: #339dff;
+      border-radius: 8px;
+      border: 0 solid #979797;
+      background: #ebf3ff;
+    }
+  }
+}
+</style>

src/views/platformSection/index.vue

@@ -71,6 +71,13 @@
               class="drop_down_list_item"
               >设备导出</router-link
             >
+            <router-link
+              @click.native="routeDropdownChange()"
+              tag="div"
+              to="/platform/deviceManagePwd"
+              class="drop_down_list_item"
+              >设备密码</router-link
+            >
           </div>
         </div>
         <div :class="['module_item drop_down', logSelected ? 'selected' : '']">
@@ -120,7 +127,8 @@ export default {
     deviceManageSelected() {
       return (
         this.$route.path.includes("/platform/deviceManageImport") ||
-        this.$route.path.includes("/platform/deviceManageExport")
+        this.$route.path.includes("/platform/deviceManageExport") ||
+        this.$route.path.includes("/platform/deviceManagePwd")
       );
     },
     // 日志路由选中

src/views/platformSection/regionManage/adminManage.vue

@@ -264,7 +264,9 @@ export default {
   data() {
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
-      if (!reg.test(this.adminInfo.loginpwd1)) {
+      if (!this.adminInfo.loginpwd1) {
+        return callback(new Error("请输入确认密码"));
+      } else if (!reg.test(this.adminInfo.loginpwd1)) {
         return callback(new Error("密码格式不正确。"));
       } else if (this.adminInfo.loginpwd != this.adminInfo.loginpwd1) {
         return callback(new Error("两次输入密码不一致！"));

src/views/platformSection/regionManage/regionManage.vue

@@ -59,7 +59,7 @@
         <FormItem label="区域码" prop="regionCode" style="width: 100%">
           <Input
             v-model="regionInfo.regionCode"
-            placeholder="请输入区域码"
+            placeholder="请输入6位区域码"
           ></Input>
         </FormItem>
         <FormItem
@@ -74,7 +74,7 @@
         </FormItem>
         <FormItem
           label="登录账号"
-          prop="loginname"
+          prop="admin.loginname"
           style="width: calc(50% - 10px)"
         >
           <Input
@@ -184,7 +184,7 @@
         <FormItem label="区域码" prop="regionCode" style="width: 100%">
           <Input
             v-model="modifyRegion.regionCode"
-            placeholder="请输入区域码"
+            placeholder="请输入6位区域码"
           ></Input>
         </FormItem>
         <FormItem label="地址" prop="address" style="width: 100%">
@@ -251,8 +251,10 @@ export default {
   data() {
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
-      if (!reg.test(this.regionInfo.admin.loginpwd1)) {
-        return callback(new Error("密码格式不正确。"));
+      if (!this.regionInfo.admin.loginpwd1) {
+        return callback(new Error("请输入确认密码"));
+      } else if (!reg.test(this.regionInfo.admin.loginpwd1)) {
+        return callback(new Error("密码格式不正确"));
       } else if (
         this.regionInfo.admin.loginpwd != this.regionInfo.admin.loginpwd1
       ) {
@@ -341,6 +343,8 @@ export default {
         regionCode: [
           {
             required: true,
+            min: 6,
+            max: 6,
             message: "请输入6位区域码",
             trigger: "blur"
           }
@@ -355,7 +359,7 @@ export default {
         "admin.loginname": [
           {
             required: true,
-            message: "请输入请输入登录账号",
+            message: "请输入登录账号",
             trigger: "blur"
           }
         ],
@@ -366,7 +370,7 @@ export default {
             trigger: "blur"
           }
         ],
-        loginpwd1: [
+        "admin.loginpwd1": [
           {
             required: true,
             validator: pwdAgainCheck,

src/views/schoolSection/applicationStrategy/appStrategyManage.vue

@@ -513,6 +513,7 @@ export default {
     justify-content: center;
     align-items: center;
     flex-wrap: wrap;
+    min-height: 30px;
     > span {
       margin: 4px 6px;
       line-height: 1;