Merge branch 'xy-ly' into fly

src/components/common/Header.vue

@@ -51,7 +51,7 @@ export default {
         case "loginout": //退出登录
           this.$message.success("退出成功");
           this.$store.commit("REMOVE_INFO");
-          this.$router.push("/");
+          this.$router.push("/login");
           break;
       }
     },

src/main.js

@@ -71,7 +71,6 @@ router.beforeEach((to, from, next) => {
   const role = localStorage.getItem("userName");
   const token = localStorage.getItem("token");
   if (!token && to.path !== "/login") {
-    alert("1111111111");
     next("/login");
   } else {
     next();

src/router/index.js

@@ -4,10 +4,10 @@ import VueRouter from "vue-router";
 Vue.use(VueRouter);
 
 const routes = [
-  {
+  // {
-    path: "/",
+  //   path: "/",
-    redirect: "/login",
+  //   redirect: "/login",
-  },
+  // },
   {
     path: "/",
     component: () =>

src/views/cameraChannel/index.vue

@@ -69,9 +69,10 @@
         <div class="pageNation">
           <el-pagination
             @current-change="handleCurrentChange"
+            @size-change="handleSizeChange"
             :current-page="page"
             :page-size="pageSize"
-            layout=" prev, pager, next, jumper,total"
+            layout="sizes, prev, pager, next, jumper,total"
             :total="total"
             background
           >
@@ -97,7 +98,7 @@ export default {
       deviceTableData: [],
       //multipleSelection: [], //获取当前选中
       page: 1, // 当前页数
-      pageSize: 10, // 每页数量
+      pageSize: 20, // 每页数量
       total: 0, //总条数
     };
   },
@@ -166,6 +167,11 @@ export default {
       this.page = val;
       this.deviceList();
     },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.deviceList();
+    },
   },
 };
 </script>

src/views/components/passwordDialog.vue

@@ -61,7 +61,7 @@ export default {
                 this.$message.success("修改成功,请重新登录");
                 this.isShow = false
                 this.$store.commit("REMOVE_INFO");
-                this.$router.push("/");
+                this.$router.push("/login");
               } else {
                 this.$message.error(res.msg);
               }

src/views/devicePhotoSchedule/index.vue

@@ -83,9 +83,10 @@
         <div class="pageNation">
           <el-pagination
             @current-change="handleCurrentChange"
+            @size-change="handleSizeChange"
             :current-page="page"
             :page-size="pageSize"
-            layout=" prev, pager, next, jumper,total"
+            layout="sizes, prev, pager, next, jumper,total"
             :total="total"
             background
           >
@@ -118,7 +119,7 @@ export default {
       deviceTableData: [],
       //multipleSelection: [], //获取当前选中
       page: 1, // 当前页数
-      pageSize: 10, // 每页数量
+      pageSize: 20, // 每页数量
       total: 0, //总条数
       loading: true,
     };
@@ -196,6 +197,11 @@ export default {
       this.page = val;
       this.deviceList();
     },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.deviceList();
+    },
   },
 };
 </script>

src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue

@@ -96,7 +96,7 @@ export default {
 
   data() {
     let validCmid = (rule, value, callback) => {
-      let reg = /^[0-9A-Za-z]{17}$/;
+      let reg = /^[0-9A-Za-z_/\\/-]{17}$/;
       if (!reg.test(value)) {
         callback(new Error("装置id为17位编码"));
       } else {

src/views/management/monitoringEquipment/photographicDevice/index.vue

@@ -147,9 +147,10 @@
         <div class="pageNation">
           <el-pagination
             @current-change="handleCurrentChange"
+            @size-change="handleSizeChange"
             :current-page="page"
             :page-size="pageSize"
-            layout=" prev, pager, next, jumper,total"
+            layout="sizes, prev, pager, next, jumper,total"
             :total="total"
             background
           >
@@ -192,7 +193,7 @@ export default {
       multipleSelection: [], //当前选中数组
       formphotoInfo: {}, //弹窗传值
       page: 1, // 当前页数
-      pageSize: 30, // 每页数量
+      pageSize: 20, // 每页数量
       total: 0, //总条数
       loading: true,
     };
@@ -380,6 +381,11 @@ export default {
       this.page = val;
       this.terminalList(); //刷新
     },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.terminalList();
+    },
   },
   created() {
     this.terminalList();

src/views/management/userEquipment/lineInformation/index.vue

@@ -71,9 +71,10 @@
         <div class="pageNation">
           <el-pagination
             @current-change="handleCurrentChange"
+            @size-change="handleSizeChange"
             :current-page="page"
             :page-size="pageSize"
-            layout=" prev, pager, next, jumper,total"
+            layout="sizes, prev, pager, next, jumper,total"
             :total="total"
             background
           >
@@ -105,7 +106,7 @@ export default {
       lineTableData: [],
       //multipleSelection: [], //获取当前选中
       page: 1, // 当前页数
-      pageSize: 10, // 每页数量
+      pageSize: 20, // 每页数量
       total: 0, //总条数
       loading: true,
     };
@@ -183,6 +184,11 @@ export default {
       this.page = val;
       this.lineList();
     },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.lineList();
+    },
   },
 };
 </script>

src/views/management/userEquipment/towerInformation/index.vue

@@ -66,9 +66,10 @@
         <div class="pageNation">
           <el-pagination
             @current-change="handleCurrentChange"
+            @size-change="handleSizeChange"
             :current-page="page"
             :page-size="pageSize"
-            layout=" prev, pager, next, jumper,total"
+            layout="sizes, prev, pager, next, jumper,total"
             :total="total"
             background
           >
@@ -94,7 +95,7 @@ export default {
       tableDate: [],
       //multipleSelection: [], //获取当前选中
       page: 1, // 当前页数
-      pageSize: 10, // 每页数量
+      pageSize: 20, // 每页数量
       total: 0, //总条数
       loading: true,
     };
@@ -171,6 +172,11 @@ export default {
       this.page = val;
       this.deviceList();
     },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.deviceList();
+    },
   },
 };
 </script>

src/views/system/userManagement.vue

@@ -2,10 +2,8 @@
   <div class="camerChannel">
     <div class="deviceBox">
       <div class="deviceBtnGroup">
-        <el-button
+        <h4>用户管理</h4>
-          type="primary"
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdddevice()"
-          icon="el-icon-plus"
-          @click.native.stop="handleAdddevice()"
           >新增</el-button
         >
       </div>
@@ -42,9 +40,10 @@
         <div class="pageNation">
           <el-pagination
             @current-change="handleCurrentChange"
+            @size-change="handleSizeChange"
             :current-page="page"
             :page-size="pageSize"
-            layout=" prev, pager, next, jumper,total"
+            layout="sizes, prev, pager, next, jumper,total"
             :total="total"
             background
           >
@@ -70,7 +69,7 @@ export default {
       deviceTableData: [],
       //multipleSelection: [], //获取当前选中
       page: 1, // 当前页数
-      pageSize: 10, // 每页数量
+      pageSize: 20, // 每页数量
       total: 0, //总条数
     };
   },
@@ -139,6 +138,11 @@ export default {
       this.page = val;
       this.deviceList();
     },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.deviceList();
+    },
   },
 };
 </script>
@@ -157,7 +161,8 @@ export default {
   }
   .deviceBtnGroup {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
+    align-items: center;
   }
 
   .deviceTable {