第一版

.env.production

@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/'
+# VUE_APP_BASE_API = '/'
 

src/api/accessrecords.js

@@ -16,3 +16,11 @@ export function searchList(query) {
   })
 }
 
+export function fetchGroupList(query) {
+  return request({
+    url: '/ncjtEntranceGuard/getDevicePageList',
+    method: 'get',
+    params: query
+  })
+}
+

src/api/index.js

@@ -10,7 +10,7 @@ export function fetchList(query) {
 
 export function searchList(query) {
   return request({
-    url: '/vue-element-admin/article/list',
+    url: '/ncjtEntranceGuard/getTrafficRecordCountById',
     method: 'get',
     params: query
   })

src/router/index.js

@@ -117,7 +117,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/userManagement/index'),
         name: 'userManagement',
-        meta: { title: '用户管理', icon: 'table', noCache: true }
+        meta: { title: '用户管理', icon: '用户管理', noCache: true }
       }
     ]
   },
@@ -130,7 +130,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/devicewithGroup/index'),
         name: 'devicewithGroup',
-        meta: { title: '设备与组绑定', icon: 'tree', noCache: true }
+        meta: { title: '设备与组绑定', icon: '设备与组绑定', noCache: true }
       }
     ]
   },
@@ -143,7 +143,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/deviceWithStatus/index'),
         name: 'deviceWithStatus',
-        meta: { title: '设备与身份绑定', icon: 'tab', noCache: true }
+        meta: { title: '设备与身份绑定', icon: '设备与身份绑定', noCache: true }
       }
     ]
   },
@@ -156,7 +156,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/userWithGroup/index'),
         name: 'userWithGroup',
-        meta: { title: '用户与组绑定', icon: 'table', noCache: true }
+        meta: { title: '用户与组绑定', icon: '用户与组绑定', noCache: true }
       }
     ]
   },
@@ -169,7 +169,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/accessRecords/index'),
         name: 'accessRecords',
-        meta: { title: '通行记录', icon: 'people', noCache: true }
+        meta: { title: '通行记录', icon: '通行记录', noCache: true }
       }
     ]
   },
@@ -182,7 +182,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/user/index'),
         name: 'user',
-        meta: { title: '账号管理', icon: 'peoples', noCache: true }
+        meta: { title: '账号管理', icon: '账号管理', noCache: true }
       }
     ]
   },

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: 'Vue Element Admin',
+  title: '门禁设备管理平台',
 
   /**
    * @type {boolean} true | false

src/utils/get-page-title.js

@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || 'Vue Element Admin'
+const title = defaultSettings.title || '门禁设备管理平台'
 
 export default function getPageTitle(pageTitle) {
   if (pageTitle) {

src/utils/request.js

@@ -10,7 +10,8 @@ import {
 
 // create an axios instance
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+  // baseURL: "https://chtech.ncjti.edu.cn/access-control/", // 打包使用的URL
+  baseURL: process.env.VUE_APP_BASE_API, // 本机开发使用的URL url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 5000 // request timeout
 })

src/views/accessRecords/index.vue

@@ -8,14 +8,14 @@
           v-model="listQuery.deviceName"
           size="mini"
           clearable
-          @clear="getList"
+          @clear="handleChangeFilter"
           placeholder="请选择设备名称"
         >
           <el-option
-            v-for="item in list"
+            v-for="item in groupList"
             :key="item.id"
-            :label="item.deviceName"
-            :value="item.deviceName"
+            :label="item.name"
+            :value="item.name"
           >
           </el-option>
         </el-select>
@@ -28,7 +28,7 @@
           size="mini"
           placeholder="请输入卡号"
           clearable
-          @clear="getList"
+          @clear="handleChangeFilter"
           @keyup.enter.native="handleFilter"
         >
         </el-input>
@@ -41,7 +41,7 @@
           size="mini"
           placeholder="请输入姓名"
           clearable
-          @clear="getList"
+          @clear="handleChangeFilter"
           @keyup.enter.native="handleFilter"
         >
         </el-input>
@@ -55,6 +55,7 @@
         start-placeholder="开始时间"
         end-placeholder="结束时间"
         value-format="timestamp"
+        @change="handleChangeFilter($event)"
       >
       </el-date-picker>
 
@@ -130,7 +131,7 @@
             :total="total"
             :page.sync="listQuery.page"
             :limit.sync="listQuery.limit"
-            @pagination="getListTotalPage"
+            @pagination="getList"
           />
         </template>
       </div>
@@ -140,7 +141,7 @@
 
 <script>
 import Pagination from "@/components/Pagination";
-import { fetchList, searchList } from "@/api/accessrecords";
+import { fetchList, searchList, fetchGroupList } from "@/api/accessrecords";
 export default {
   components: {
     Pagination,
@@ -148,6 +149,7 @@ export default {
   data() {
     return {
       list: [],
+      groupList: [],
       total: 0, //数据的总数//
       listQuery: {
         page: 1,
@@ -164,48 +166,93 @@ export default {
   },
   created() {
     this.getList();
+    this.getgroupList();
   },
   methods: {
     getList() {
-      fetchList({
-        page: this.listQuery.page,
-        limit: this.listQuery.limit,
-      }).then((response) => {
-        this.list = response.data;
-        this.total = response.total;
-      });
-    },
-    getListTotalPage() {
-      //获取分页数据
       if (
+        this.listQuery.cardNumber ||
         this.listQuery.deviceName ||
         this.listQuery.userName ||
-        this.listQuery.cardNumber ||
         this.listQuery.time
       ) {
-        this.handleFilter();
+        searchList(this.listQuery).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
       } else {
-        this.getList();
+        fetchList({
+          page: this.listQuery.page,
+          limit: this.listQuery.limit,
+        }).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
       }
     },
+    getgroupList() {
+      fetchGroupList({ page: this.listQuery.page, limit: "999" }).then(
+        (response) => {
+          this.groupList = response.data;
+        }
+      );
+    },
     refreshGetList() {
       //刷新页面
       this.$router.go(0);
     },
+    handleChangeFilter(e) {
+      if (e == null) {
+        // 清空时间
+        if (
+          !this.listQuery.userName &&
+          !this.listQuery.cardNumber &&
+          !this.listQuery.deviceName &&
+          !this.listQuery.time
+        ) {
+          this.getList();
+        } else {
+          searchList({
+            page: this.listQuery.page,
+            limit: this.listQuery.limit,
+            cardNumber: this.listQuery.cardNumber,
+            deviceName: this.listQuery.deviceName,
+            time1: this.listQuery.time === null ? null : this.listQuery.time[0],
+            time2: this.listQuery.time === null ? null : this.listQuery.time[1],
+            userName: this.listQuery.userName,
+          }).then((response) => {
+            this.list = response.data;
+            this.total = response.total;
+          });
+        }
+      } else {
+        // 设置时间
+      }
+    },
     handleFilter() {
       //搜索数据
-      searchList({
-        page: this.listQuery.page,
-        limit: this.listQuery.limit,
-        cardNumber: this.listQuery.cardNumber,
-        deviceName: this.listQuery.deviceName,
-        time1: this.listQuery.time[0],
-        time2: this.listQuery.time[1],
-        userName: this.listQuery.userName,
-      }).then((response) => {
-        this.list = response.data;
-        this.total = response.total;
-      });
+      if (
+        !this.listQuery.userName &&
+        !this.listQuery.cardNumber &&
+        !this.listQuery.deviceName &&
+        !this.listQuery.time
+      ) {
+        alert("请输入搜索条件");
+      } else {
+        searchList({
+          page: 1,
+          limit: this.listQuery.limit,
+          cardNumber: this.listQuery.cardNumber,
+          deviceName: this.listQuery.deviceName,
+          time1: this.listQuery.time === null ? null : this.listQuery.time[0],
+          time2: this.listQuery.time === null ? null : this.listQuery.time[1],
+          userName: this.listQuery.userName,
+        }).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
+        this.listQuery.page = 1;
+      }
     },
     timestampToTime(time) {
       //格式化时间
@@ -243,30 +290,30 @@ export default {
 <style lang="scss" scoped>
 .form-head {
   margin: 0 40px;
-  width: 1504px;
+  width: 1380px;
   line-height: 118px;
   font-size: 9px;
 
   .input {
     display: inline-block;
-    margin-right: 30px;
+    margin-right: 10px;
     width: 210px;
   }
 
   .input-select {
     display: inline-block;
-    margin-right: 29px;
+    margin-right: 10px;
     width: 148px;
   }
 
   .button {
-    margin-left: 41px;
+    margin-left: 10px;
   }
 }
 
 .form {
   margin-left: 40px;
-  width: 1480px;
+  width: 1400px;
 
   .button-img {
     img {

src/views/deviceManagement/index.vue

@@ -62,7 +62,8 @@
               inactive-color="#CCCCCC"
               :active-value="1"
               :inactive-value="0"
-              @change="changeSwitch(scope.row)"
+              disabled
+              @click.native="changeSwitch(scope.row)"
             >
             </el-switch>
           </template>
@@ -339,11 +340,12 @@ export default {
     },
     changeSwitch(row) {
       this.temp = Object.assign({}, row);
-      if (this.temp.status == 1) {
+      if (this.temp.status == 0) {
         if (confirm("确定开启设备吗？")) {
           updateDevice({ id: this.temp.id, status: this.temp.status }).then(
             () => {
               const index = this.list.findIndex((v) => v.id === this.temp.id);
+              this.temp.status = 1;
               this.list.splice(index, 1, this.temp);
             }
           );
@@ -352,13 +354,13 @@ export default {
             type: "success",
             duration: 1500,
           });
-          this.value = 1;
         }
       } else {
         if (confirm("确定关闭设备吗？")) {
           updateDevice({ id: this.temp.id, status: this.temp.status }).then(
             () => {
               const index = this.list.findIndex((v) => v.id === this.temp.id);
+              this.temp.status = 0;
               this.list.splice(index, 1, this.temp);
             }
           );
@@ -424,16 +426,13 @@ export default {
     margin-left: 40px;
     width: 1380px;
 
-    .button-img {
-      img {
-        width: 53.5px;
+    .el-switch.is-disabled {
+      opacity: 1;
+      ::v-deep .el-switch__core {
+        cursor: pointer;
       }
     }
 
-    .button-info {
-      margin-top: 39px;
-    }
-
     .button {
       color: red;
     }
@@ -446,11 +445,8 @@ export default {
     .block {
       float: right;
     }
-
-    .foot-button {
-      margin-top: 53px;
-    }
   }
+
   .switch-button-item {
     margin-left: 120px;
     margin-top: 32px;

src/views/deviceWithStatus/index.vue

@@ -17,7 +17,7 @@
           v-model="listQuery.serialNumber"
           placeholder="请输入序列号"
           clearable
-          @clear="getList"
+          @clear="handleChangeFilter"
           @keyup.enter.native="handleFilter"
         >
         </el-input>
@@ -29,7 +29,7 @@
           v-model="listQuery.name"
           placeholder="请输入设备名称"
           clearable
-          @clear="getList"
+          @clear="handleChangeFilter"
           @keyup.enter.native="handleFilter"
         >
         </el-input>
@@ -227,22 +227,24 @@ export default {
   },
   created() {
     this.getList();
-    // this.getgroupList();
   },
   methods: {
     getList() {
-      fetchList(this.listQuery).then((response) => {
-        this.list = response.data;
-        this.total = response.total;
-      });
+      if (this.listQuery.name || this.listQuery.serialNumber) {
+        searchList(this.listQuery).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
+      } else {
+        fetchList({
+          page: this.listQuery.page,
+          limit: this.listQuery.limit,
+        }).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
+      }
     },
-    // getgroupList() {
-    //   fetchGroupList({ page: this.listQuery.page, limit: "999" }).then(
-    //     (response) => {
-    //       this.groupList = response.data;
-    //     }
-    //   );
-    // },
     checkPower(row) {
       this.temp = Object.assign({}, row);
       checkPowers({ deviceId: row.id }).then((response) => {
@@ -299,14 +301,27 @@ export default {
         });
       }
     },
+    handleChangeFilter() {
+      if (!this.listQuery.name && !this.listQuery.serialNumber) {
+        this.getList();
+      } else {
+        searchList(this.listQuery).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
+      }
+    },
     handleFilter() {
-      if (!this.listQuery.name) {
+      if (!this.listQuery.name && !this.listQuery.serialNumber) {
         alert("请输入搜索条件");
       } else {
-        searchList(this.listQuery).then((response) => {
+        let temp = Object.assign({}, this.listQuery);
+        temp.page = 1;
+        searchList(temp).then((response) => {
           this.list = response.data;
           this.total = response.total;
         });
+        this.listQuery.page = 1;
       }
     },
   },

src/views/devicewithGroup/index.vue

@@ -17,7 +17,7 @@
           v-model="listQuery.serialNumber"
           placeholder="请输入序列号"
           clearable
-          @clear="getList"
+          @clear="handleChangeFilter"
           @keyup.enter.native="handleFilter"
         >
         </el-input>
@@ -29,7 +29,7 @@
           v-model="listQuery.name"
           placeholder="请输入设备名称"
           clearable
-          @clear="getList"
+          @clear="handleChangeFilter"
           @keyup.enter.native="handleFilter"
         >
         </el-input>
@@ -228,13 +228,20 @@ export default {
   },
   methods: {
     getList() {
-      fetchList({
-        page: this.listQuery.page,
-        limit: this.listQuery.limit,
-      }).then((response) => {
-        this.list = response.data;
-        this.total = response.total;
-      });
+      if (this.listQuery.name || this.listQuery.serialNumber) {
+        searchList(this.listQuery).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
+      } else {
+        fetchList({
+          page: this.listQuery.page,
+          limit: this.listQuery.limit,
+        }).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
+      }
     },
     getgroupList() {
       fetchGroupList({ page: this.listQuery.page, limit: "999" }).then(
@@ -284,7 +291,6 @@ export default {
       this.dialogUnbindGroup = true;
     },
     deleteGroup(row, index) {
-      console.log(row, index);
       if (confirm("确定解绑吗？")) {
         deleteGroups({
           id: this.temp.id,
@@ -300,14 +306,27 @@ export default {
         });
       }
     },
+    handleChangeFilter() {
+      if (!this.listQuery.name && !this.listQuery.serialNumber) {
+        this.getList();
+      } else {
+        searchList(this.listQuery).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
+      }
+    },
     handleFilter() {
       if (!this.listQuery.name && !this.listQuery.serialNumber) {
         alert("请输入搜索条件");
       } else {
-        searchList(this.listQuery).then((response) => {
+        let temp = Object.assign({}, this.listQuery);
+        temp.page = 1;
+        searchList(temp).then((response) => {
           this.list = response.data;
           this.total = response.total;
         });
+        this.listQuery.page = 1;
       }
     },
   },

src/views/index/index.vue

@@ -10,12 +10,19 @@
     <div class="user">
       条件：
       <div class="input">
-        <el-select v-model="value" size="mini" placeholder="请选择设备">
+        <el-select
+          v-model="listQuery.id"
+          filterable
+          clearable
+          @clear="handleFilter"
+          size="mini"
+          placeholder="请选择设备"
+        >
           <el-option
             v-for="item in list"
             :key="item.id"
             :label="item.name"
-            :value="item.deviceName"
+            :value="item.id"
           >
           </el-option>
         </el-select>
@@ -61,19 +68,13 @@ export default {
   data() {
     return {
       list: [],
+      searchList: [],
       total: 0, //数据的总数//
       listQuery: {
         page: 1,
         limit: 999,
-        cardNumber: "",
-        deviceName: "",
-        groupName: "",
-        identityName: "",
-        message: "",
-        time: "",
-        userName: "",
+        id: "",
       },
-      value: "",
     };
   },
   created() {
@@ -83,14 +84,19 @@ export default {
     getList() {
       fetchList(this.listQuery).then((response) => {
         this.list = response.data;
-        this.total = response.total;
       });
     },
     handleFilter() {
-      searchList({ deviceName: this.listQuery.deviceName }).then((response) => {
-        this.list = response.data;
-        this.total = response.total;
-      });
+      if (!this.listQuery.id) {
+        this.total = 0;
+      } else {
+        searchList({
+          deviceId: this.listQuery.id,
+        }).then((response) => {
+          this.searchList = response.data;
+          this.total = response.total;
+        });
+      }
     },
   },
 };

src/views/userWithGroup/index.vue

@@ -17,7 +17,7 @@
           v-model="listQuery.name"
           placeholder="请输入姓名"
           clearable
-          @clear="getUserList"
+          @clear="handleChangeFilter"
           @keyup.enter.native="handleFilter"
         >
         </el-input>
@@ -29,7 +29,7 @@
           v-model="listQuery.cardNumber"
           placeholder="请输入卡号"
           clearable
-          @clear="getUserList"
+          @clear="handleChangeFilter"
           @keyup.enter.native="handleFilter"
         >
         </el-input>
@@ -229,13 +229,20 @@ export default {
   },
   methods: {
     getUserList() {
-      fetchUserList({
-        page: this.listQuery.page,
-        limit: this.listQuery.limit,
-      }).then((response) => {
-        this.list = response.data;
-        this.total = response.total;
-      });
+      if (this.listQuery.name || this.listQuery.cardNumber) {
+        searchList(this.listQuery).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
+      } else {
+        fetchUserList({
+          page: this.listQuery.page,
+          limit: this.listQuery.limit,
+        }).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
+      }
     },
     getgroupList() {
       fetchGroupList({ page: this.listQuery.page, limit: "999" }).then(
@@ -299,14 +306,27 @@ export default {
         });
       }
     },
+    handleChangeFilter() {
+      if (!this.listQuery.name && !this.listQuery.cardNumber) {
+        this.getUserList();
+      } else {
+        searchList(this.listQuery).then((response) => {
+          this.list = response.data;
+          this.total = response.total;
+        });
+      }
+    },
     handleFilter() {
       if (!this.listQuery.name && !this.listQuery.cardNumber) {
         alert("请输入搜索条件");
       } else {
-        searchList(this.listQuery).then((response) => {
+        let temp = Object.assign({}, this.listQuery);
+        temp.page = 1;
+        searchList(temp).then((response) => {
           this.list = response.data;
           this.total = response.total;
         });
+        this.listQuery.page = 1;
       }
     },
   },

vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || 'vue Element Admin' // page title
+const name = defaultSettings.title || '门禁设备管理平台' // page title
 
 // If your port is set to 80,
 // use administrator privileges to execute the command line.