闸机管理

src/router/routes.js

@@ -7,6 +7,7 @@ import CameraManagement from '../views/deviceManagement/CameraManagement.vue'
 import SubDeviceAdmin from '../views/deviceManagement/SubDeviceAdmin.vue'
 /* 区域管理 */
 import AreaInfo from '../views/areaManagement/AreaInfo.vue'
+import AreaQuery from '../views/areaManagement/AreaQuery.vue'
 /* 闸机管理 */
 import EnterOut from '../views/gateMachineManagement/EnterOut.vue'
 /* 消息管理 */
@@ -73,6 +74,11 @@ export default [
 				name: 'areaInfo',
 				component: AreaInfo
 			},
+			{
+				path: '/areaQuery',
+				name: 'areaQuery',
+				component: AreaQuery
+			},
 			// 闸机管理
 			{
 				path: '/enterOut',

src/views/Home/Home.vue

@@ -141,7 +141,6 @@ export default {
         },
         // 点击菜单项
         onClickMenu(item) {
-            console.log(item)
             let _this = this;
             // 如果要跳转的路由和当前路由一致就 return
             if (this.$router.history.current.name == item.routerName) return;

src/views/Home/mencCofig.js

@@ -55,8 +55,8 @@ export const menuData = [
             },
             {
                 optionName: '区域查询',
-                index: '2-1',
-                routerName: "areaInfo"
+                index: '2-2',
+                routerName: "areaQuery"
             }
         ]
     },

src/views/areaManagement/AreaQuery.vue

@@ -0,0 +1,43 @@
+<template>
+    <div class="AreaQuery">
+        AreaQuery
+    </div>
+</template>
+
+<script>
+import { mapActions } from "vuex";
+
+export default {
+    name: "AreaQuery",
+    data() {
+        return {
+           
+        };
+    },
+    created() {
+        
+    },
+    methods: {
+        ...mapActions(["fetch"]),
+         get() {
+            this.fetch({
+                api: "aaa",
+                method: "GET",
+                data: {},
+                success: res => {
+                    console.log(res);
+                },
+                fail: err => {
+                    console.log(err);
+                    if (err.errMsg) this.$message.error(err.errMsg);
+                    else this.$message.error("服务器发生异常");
+                }
+            });
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/gateMachineManagement/EnterOut.vue

@@ -8,12 +8,12 @@
         </header>
         <section class="section">
             <el-table :data="EnterOutList">
-                <el-table-column prop="id" label="序号" width="120px"></el-table-column>
-                <el-table-column prop="recordInfo.name" label="机器名字"></el-table-column>
+                <el-table-column prop="recordInfo.id" label="序号" width="120px"></el-table-column>
+                <el-table-column prop="deviceInfo.description" label="机器名字"></el-table-column>
                 <el-table-column prop="useInfo.name" label="出入者"></el-table-column>
-                <el-table-column prop="useInfo.idNumber" label="出入者身份证号"></el-table-column>
+                <el-table-column prop="useInfo.idCardNum" label="出入者身份证号"></el-table-column>
                 <el-table-column prop="useInfo.name" label="出入者"></el-table-column>
-                <el-table-column prop="updated" label="进出时间"></el-table-column>
+                <el-table-column prop="recordInfo.updated" label="进出时间"></el-table-column>
                 <el-table-column fixed="right" label="操作" width="200">
                     <template slot-scope="scope">
                         <el-button
@@ -36,11 +36,7 @@
             </el-row>
 
             <el-dialog title="提示" center :visible.sync="showDialog" width="30%">
-                <img
-                    class="img"
-                    src="http://121.36.134.218:88/10123_0bbced8b3c7a418bbb52ff58469eee1c.jpg"
-                    alt="没有照片"
-                />
+                <img class="img" :src="userImgUrl" alt="没有照片" />
                 <span slot="footer">
                     <el-button @click="showDialog = false">取 消</el-button>
                     <el-button type="primary" @click="showDialog = false">确 定</el-button>
@@ -55,6 +51,8 @@ import { mapActions } from "vuex";
 
 // 每页数据条数
 const pageSize = 10;
+// 照片根地址
+const userImgUrlBase = "http://121.36.134.218:88/";
 
 export default {
     name: "EnterOut",
@@ -68,7 +66,9 @@ export default {
             page: 1
         };
     },
-    created() {},
+    created() {
+        this.getEnterOutList();
+    },
     methods: {
         ...mapActions(["fetch"]),
         getEnterOutList() {
@@ -85,6 +85,7 @@ export default {
                 data,
                 success: res => {
                     console.log(res);
+                    this.EnterOutList = res;
                 },
                 fail: err => {
                     console.log(err);
@@ -112,7 +113,7 @@ export default {
         // 查看出入者照片
         look(imgUrl) {
             console.log(imgUrl);
-            this.userImgUrl = imgUrl;
+            this.userImgUrl = userImgUrlBase + imgUrl;
             this.showDialog = true;
         }
     }