门口门禁-人行、车行记录支持分页查询

src/views/gatemachine/primarygatemanager/gatebaseinfo/components/equipment.vue

@@ -58,9 +58,9 @@
           </el-table-column>
           <el-table-column label="闸机类别">
             <template slot-scope="{row}">
-              <span v-if="row.GATE_CATEGORY==0">人行口门</span>
+              <span v-if="row.GATE_CATEGORY==1">人行口门</span>
-              <span v-if="row.GATE_CATEGORY==1">车行口门</span>
+              <span v-if="row.GATE_CATEGORY==2">车行口门</span>
-              <span v-if="row.GATE_CATEGORY==2">综合口门</span>
+              <span v-if="row.GATE_CATEGORY==3">综合口门</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="350px">
@@ -211,9 +211,9 @@ export default {
         { value: '2', label: '出' }
       ],
       gateCategoryList: [
-        { value: '0', label: '人行口门' },
+        { value: '1', label: '人行口门' },
-        { value: '1', label: '车行口门' },
+        { value: '2', label: '车行口门' },
-        { value: '2', label: '综合口门' }
+        { value: '3', label: '综合口门' }
       ],
       addDialog: {
         visible: false,

src/views/gatemachine/primarygatemanager/gaterecord/carrecord/components/carRecordList.vue

@@ -1,8 +1,38 @@
 <template>
   <div class="app-container">
     <div class="rightCont">
+      <el-form label-width="50px">
+        <el-col :span="5">
+          <el-form-item label="口门名称：" label-width="110px">
+            <el-input v-model="searchForm.KEYWORDS" style="width:206px" placeholder="请输入内容"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="口门状态" label-width="110px">
+            <el-select v-model="searchForm.GATE_STATUS" placeholder="请选择">
+              <el-option v-for="(item,index) in StatusList" :key="index" :label="item.label" :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="所属区域" label-width="110px">
+            <el-select v-model="searchForm.REGION_BIANMA" placeholder="请选择">
+              <el-option v-for="(item,index) in RegionList" :key="index" :label="item.NAME" :value="item.BIANMA"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-form>
       <div>
-        <span style="margin: 10px;">车行口门记录</span>
         <el-table
           v-loading="listLoading"
           ref="multipleTable"
@@ -13,6 +43,7 @@
           :cell-style="getPlateColor"
           style="width: 100%">
           <el-table-column type="index" label="序号" width="55" align="center"/>
+          <el-table-column prop="REGION_NAME" label="区域" width="100px" align="center"/>
           <el-table-column prop="vehicle_plate_number" label="车牌号" width="100px" align="center"/>
           <el-table-column prop="vehicle_category_name" label="车辆类型" width="150px" align="center"/>
           <el-table-column prop="vehicle_contact_name" label="车辆联系人" width="150ox" align="center"/>
@@ -51,6 +82,17 @@ export default {
         page: 1,
         limit: 20
       },
+      searchForm: {
+        KEYWORDS: '',
+        GATE_STATUS: '',
+        REGION_BIANMA: '',
+      },
+      RegionList: [],
+      StatusList: [
+        { value: '0', label: '停用' },
+        { value: '1', label: '正常' },
+        { value: '2', label: '暂时关闭' }
+      ],
       total: 0,
       KEYWORDS: '',
       varList: [],
@@ -94,6 +136,14 @@ export default {
     
     getQuery() {
       this.getList()
+      // this.hasButton()
+      this.getDict()
+    },
+    goKeyReset() {
+      this.searchForm.KEYWORDS = ''
+      this.searchForm.GATE_STATUS = ''
+      this.searchForm.REGION_BIANMA = ''
+      this.getList()
     },
     // 获取列表
     getList() {
@@ -102,7 +152,7 @@ export default {
       requestFN(
         '/mkmjGateLog/page?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-
+          ...this.searchForm 
         }
       ).then((data) => {
         this.listLoading = false
@@ -113,23 +163,14 @@ export default {
         this.listLoading = false
       })
     },
-
     getDict() {
-      requestFN(
-        '/corpinfo/getSelectByCorpInfo',
-        {
-        }
-      ).then((data) => {
-        this.corpList = JSON.parse(data.corpInfoJson)
-      }).catch((e) => {
-      })
       requestFN(
         'dictionaries/getLevels',
         {
-          DICTIONARIES_ID: '6bba977985f6427e9d0b52afe8884d1a'
+          DICTIONARIES_ID: '1c73fa2717f2835165104aee234caefe'
         }
       ).then((data) => {
-        this.typeData = data.list
+        this.RegionList = data.list
       })
         .catch((e) => {
           this.listLoading = false

src/views/gatemachine/primarygatemanager/gaterecord/peoplerecord/components/peopleRecordList.vue

@@ -1,8 +1,38 @@
 <template>
   <div class="app-container">
     <div class="rightCont">
+      <el-form label-width="50px">
+        <el-col :span="5">
+          <el-form-item label="口门名称：" label-width="110px">
+            <el-input v-model="searchForm.KEYWORDS" style="width:206px" placeholder="请输入内容"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="口门状态" label-width="110px">
+            <el-select v-model="searchForm.GATE_STATUS" placeholder="请选择">
+              <el-option v-for="(item,index) in StatusList" :key="index" :label="item.label" :value="item.value"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="所属区域" label-width="110px">
+            <el-select v-model="searchForm.REGION_BIANMA" placeholder="请选择">
+              <el-option v-for="(item,index) in RegionList" :key="index" :label="item.NAME" :value="item.BIANMA"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label-width="10px">
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-form>
       <div>
-        <span style="margin: 10px;" >人行口门记录</span>
         <el-table
           v-loading="listLoading"
           ref="multipleTable"
@@ -12,11 +42,11 @@
           tooltip-effect="dark"
           style="width: 100%">
           <el-table-column type="index" label="序号" width="55" align="center"/>
+          <el-table-column prop="REGION_NAME" label="区域" width="100px" align="center"/>
           <el-table-column prop="departmentName" label="公司" align="center"/>
           <el-table-column prop="personName" label="人员" width="100px" align="center"/>
           <el-table-column prop="sex" label="性别" width="50px"  align="center"/>
           <el-table-column prop="inOrOut" label="类型" width="50px" align="center"/>
-          <el-table-column prop="regionName" label="区域名称" width="80px" align="center"/>
           <el-table-column prop="channelName" label="通道名称" align="center"/>
           <el-table-column prop="personType" label="身份类别" width="150px" align="center"/>
           <el-table-column prop="cardNumber" label="卡号" width="100px" align="center"/>
@@ -50,6 +80,17 @@ export default {
         page: 1,
         limit: 20
       },
+      searchForm: {
+        KEYWORDS: '',
+        GATE_STATUS: '',
+        REGION_BIANMA: '',
+      },
+      RegionList: [],
+      StatusList: [
+        { value: '0', label: '停用' },
+        { value: '1', label: '正常' },
+        { value: '2', label: '暂时关闭' }
+      ],
       total: 0,
       KEYWORDS: '',
       varList: [],
@@ -67,6 +108,14 @@ export default {
     
     getQuery() {
       this.getList()
+      // this.hasButton()
+      this.getDict()
+    },
+    goKeyReset() {
+      this.searchForm.KEYWORDS = ''
+      this.searchForm.GATE_STATUS = ''
+      this.searchForm.REGION_BIANMA = ''
+      this.getList()
     },
     // 获取列表
     getList() {
@@ -75,7 +124,7 @@ export default {
       requestFN(
         '/mkmjGateLog/peoplePage?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-
+          ...this.searchForm 
         }
       ).then((data) => {
         this.listLoading = false
@@ -88,21 +137,13 @@ export default {
     },
 
     getDict() {
-      requestFN(
-        '/corpinfo/getSelectByCorpInfo',
-        {
-        }
-      ).then((data) => {
-        this.corpList = JSON.parse(data.corpInfoJson)
-      }).catch((e) => {
-      })
       requestFN(
         'dictionaries/getLevels',
         {
-          DICTIONARIES_ID: '6bba977985f6427e9d0b52afe8884d1a'
+          DICTIONARIES_ID: '1c73fa2717f2835165104aee234caefe'
         }
       ).then((data) => {
-        this.typeData = data.list
+        this.RegionList = data.list
       })
         .catch((e) => {
           this.listLoading = false