兴安出门证申请

src/api/visCarryStuff/visCarryStuff.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询访客信息列表
+export function list(query) {
+  return request({
+    url: '/system/stuff/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询访客信息详细
+export function getInfo(id) {
+  return request({
+    url: '/system/stuff/' + id,
+    method: 'get'
+  })
+}

src/api/visCarryStuff/visStuffRecord.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 查询出门记录列表
+export function list(query) {
+  return request({
+    url: '/system/exitRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询访客信息详细
+export function getInfo(id) {
+  return request({
+    url: '/system/exitRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 删除访客信息
+export function deleteRecord(id) {
+  return request({
+    url: '/system/exitRecord/' + id,
+    method: 'delete'
+  })
+}
+

src/views/face/record/index.vue

@@ -177,8 +177,7 @@
           <el-col :span="12" >
             <el-form-item label="采集方式" prop="gatherWay">
               <el-select v-model="form.gatherWay" placeholder="请输入采集方式">
-                <el-option key="0" label="平台采集" value="0"></el-option>
+                ·
-                <el-option key="1" label="移动端采集" value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>

src/views/system/dkRecord/index.vue

@@ -441,8 +441,13 @@ export default {
       this.handleQuery();
     },
     dataChange(e){
+      if (e) {
         this.queryParams.showDateState = moment(e[0]).format('yyyy-MM-DD HH:mm');
         this.queryParams.showDateEnd = moment(e[1]).format('yyyy-MM-DD HH:mm');
+      } else {
+        delete this.queryParams.showDateState;
+        delete this.queryParams.showDateEnd;
+      }
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/visCarryStuff/record/index.vue

@@ -1,22 +1,43 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="姓名">
+      <el-form-item label="出货人">
         <el-input
-          v-model="queryParams.name"
+          v-model="queryParams.applyName"
-          placeholder="请输入来访人"
+          placeholder="请输入出货人"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="时间">
+      <el-form-item label="放行人">
-        <el-date-picker clearable
+        <el-input
-            v-model="showDate"
+          v-model="queryParams.userName"
-            type="datetimerange"
+          placeholder="请输入放行人"
-            range-separator="至"
+          clearable
-            start-placeholder="开始日期"
+          @keyup.enter.native="handleQuery"
-            end-placeholder="结束日期"
+        />
-            @change="dateChange"
+      </el-form-item>
+      <el-form-item label="申请日期" prop="visTime">
+        <el-date-picker
+          style="width: 300px"
+          clearable
+          v-model="visTimeRange"
+          @change="visTimeChange"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="出门时间">
+        <el-date-picker
+          clearable
+          v-model="showDate"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="dateChange"
         />
       </el-form-item>
       <el-form-item>
@@ -34,124 +55,23 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:peopleRecord:remove']"
+          v-hasPermi="['visitor:exitRecord:remove']"
         >删除</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:peopleRecord:export']"
-        >导出</el-button>
-      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="peopleRecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="姓名" align="center" prop="name"  min-width="100"></el-table-column>
+      <el-table-column label="出门证编号" align="center" prop="exitPermitNo"  min-width="100"/>
-      <el-table-column label="设备序列号" align="center" prop="sequence"  min-width="100" />
+      <el-table-column label="出货人" align="center" prop="applyName"  min-width="100"/>
-      <el-table-column label="被访人" align="center" prop="peopleName"  min-width="100" />
+      <el-table-column label="申请日期" align="center" prop="visTime"  min-width="100"/>
-      <el-table-column label="来访时间" align="center" prop="startTime"  min-width="100">
+      <el-table-column label="放行保安" align="center" prop="userName"  min-width="100" />
+      <el-table-column label="出门时间" align="center" prop="startTime"  min-width="100">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="离开时间" align="center" prop="endTime"  min-width="100">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="识别时间" align="center" prop="showDate"  min-width="100">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.showDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="识别主体姓名" align="center" prop="admitName"  min-width="100">
-        <template v-slot="scope">
-          {{ scope.row.admitName }}
-        </template>
-      </el-table-column>
-      <el-table-column label="设备序列号" align="center" prop="deviceNo"  min-width="100"/>
-      <el-table-column label="识别模式" align="center" prop="recMode"  min-width="100">
-        <template v-slot="scope">
-          <template v-if="scope.row.recMode=='1'">
-            人像识别
-          </template>
-          <template v-if="scope.row.recMode=='2'">
-            刷卡识别
-          </template>
-          <template v-if="scope.row.recMode=='3'">
-            人卡合一
-          </template>
-          <template v-if="scope.row.recMode=='4'">
-            人证比对
-          </template>
-          <template v-if="scope.row.recMode=='7'">
-            密码识别
-          </template>
-          <template v-if="scope.row.recMode=='8'">
-            二维码识别
-          </template>
-          <template v-if="scope.row.recMode=='10'">
-            二维码识别
-          </template>
-        </template>
-      </el-table-column>
-      <el-table-column label="现场照url" align="center" prop="filePath" >
-        <template v-slot="scope">
-          <el-image style="width: 80px; height: 80px" :src="scope.row.filePath" fit="cover"
-                    :preview-src-list="[scope.row.filePath]"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="人员比对结果" align="center" prop="type"  min-width="100">
-        <template v-slot="scope">
-          <template v-if="scope.row.type=='1'">
-            比对成功
-          </template>
-          <template v-if="scope.row.type=='2'">
-            比对失败
-          </template>
-        </template>
-      </el-table-column>
-      <el-table-column label="识别卡号" align="center" prop="cardNo" min-width="100"/>
-      <el-table-column label="设备名称" align="center" prop="deviceName" min-width="100">
-        <template v-slot="scope">
-          <template v-if="scope.row.equipment!=null" >
-            {{scope.row.equipment.name}}
-          </template>
-        </template>
-      </el-table-column>
-      <el-table-column label="有效日期" align="center" prop="permissionTimeType"  min-width="100">
-        <template v-slot="scope">
-          <template v-if="scope.row.passTimeType=='1'">
-            有效期内
-          </template>
-          <template v-if="scope.row.passTimeType=='2'">
-            有效期外
-          </template>
-          <template v-if="scope.row.passTimeType=='3'">
-            未进行有效期判断
-          </template>
-        </template>
-      </el-table-column>
-      <el-table-column label="有效时间段" align="center" prop="passTimeType"  min-width="100">
-        <template v-slot="scope">
-          <template v-if="scope.row.passTimeType=='1'">
-            时间段内
-          </template>
-          <template v-if="scope.row.passTimeType=='2'">
-            时间段外
-          </template>
-          <template v-if="scope.row.passTimeType=='3'">
-            未进行时间段判断
-          </template>
-        </template>
-      </el-table-column> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -159,7 +79,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:peopleRecord:remove']"
+            v-hasPermi="['visitor:exitRecord:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -172,85 +92,12 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改人员识别记录对话框 -->
-<!--    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="人员id" prop="peopleId">
-          <el-input v-model="form.peopleId" placeholder="请输入人员id" />
-        </el-form-item>
-        <el-form-item label="设备id" prop="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备id" />
-        </el-form-item>
-        <el-form-item label="设备内网ip" prop="deviceIp">
-          <el-input v-model="form.deviceIp" placeholder="请输入设备内网ip" />
-        </el-form-item>
-        <el-form-item label="人员guid 或者STRANGERBABY" prop="admitGuid">
-          <el-input v-model="form.admitGuid" placeholder="请输入人员guid 或者STRANGERBABY" />
-        </el-form-item>
-        <el-form-item label="识别模式,1:人像识别, 2:刷卡识别 ,3:人卡合一 4,人证比对 7:密码识别 8 二维码识别" prop="recMode">
-          <el-input v-model="form.recMode" placeholder="请输入识别模式,1:人像识别, 2:刷卡识别 ,3:人卡合一 4,人证比对 7:密码识别 8 二维码识别" />
-        </el-form-item>
-        <el-form-item label="现场照url" prop="filePath">
-          <el-input v-model="form.filePath" placeholder="请输入现场照url" />
-        </el-form-item>
-        <el-form-item label="识别记录时间戳" prop="showTime">
-          <el-input v-model="form.showTime" placeholder="请输入识别记录时间戳" />
-        </el-form-item>
-        <el-form-item label="识别记录时间" prop="showDate">
-          <el-date-picker clearable
-            v-model="form.showDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择识别记录时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="识别分数" prop="recScore">
-          <el-input v-model="form.recScore" placeholder="请输入识别分数" />
-        </el-form-item>
-        <el-form-item label="设备序列号" prop="deviceNo">
-          <el-input v-model="form.deviceNo" placeholder="请输入设备序列号" />
-        </el-form-item>
-        <el-form-item label="软件版本号" prop="deviceVersion">
-          <el-input v-model="form.deviceVersion" placeholder="请输入软件版本号" />
-        </el-form-item>
-        <el-form-item label="设备来源" prop="source">
-          <el-input v-model="form.source" placeholder="请输入设备来源" />
-        </el-form-item>
-        <el-form-item label="识别卡号" prop="cardNo">
-          <el-input v-model="form.cardNo" placeholder="请输入识别卡号" />
-        </el-form-item>
-        <el-form-item label="设备名称" prop="deviceName">
-          <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
-        </el-form-item>
-        <el-form-item label="结果" prop="result">
-          <el-input v-model="form.result" placeholder="请输入结果" />
-        </el-form-item>
-        <el-form-item label="保留字段" prop="storageId">
-          <el-input v-model="form.storageId" placeholder="请输入保留字段" />
-        </el-form-item>
-        <el-form-item label="当前时间戳" prop="timestamp">
-          <el-input v-model="form.timestamp" placeholder="请输入当前时间戳" />
-        </el-form-item>
-        <el-form-item label="识别主体姓名" prop="admitName">
-          <el-input v-model="form.admitName" placeholder="请输入识别主体姓名" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>-->
   </div>
 </template>
 
 <script>
-import { listPeopleRecord, getPeopleRecord, delPeopleRecord, addPeopleRecord, updatePeopleRecord,queryVisitorRecordList,deleteVisitorRecordList } from "@/api/system/peopleRecord";
+import {deleteRecord, list} from "@/api/visCarryStuff/visStuffRecord";
-import {alllistEquipment} from "@/api/system/equipment";
+import moment from "moment";
-import {listSysPeople} from "@/api/system/sysPeople";
 
 export default {
   name: "PeopleRecord",
@@ -258,6 +105,7 @@ export default {
     return {
       // 遮罩层
       showDate:[],
+      visTimeRange: [],
       loading: true,
       // 选中数组
       ids: [],
@@ -271,7 +119,6 @@ export default {
       total: 0,
       // 人员识别记录表格数据
       peopleRecordList: [],
-      equipmentOptions:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -280,31 +127,10 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        peopleId: null,
+        createTimeStr: null,
-        equipmentId: null,
+        createTimeEnd: null,
-        deviceIp: null,
+        visTimeStart: null,
-        admitGuid: null,
+        visTimeEnd: null,
-        recMode: null,
-        filePath: null,
-        showTime: null,
-        showDate: null,
-        aliveType: null,
-        recScore: null,
-        deviceNo: null,
-        deviceVersion: null,
-        source: null,
-        type: null,
-        cardNo: null,
-        deviceName: null,
-        recType: null,
-        result: null,
-        permissionTimeType: null,
-        passTimeType: null,
-        recModeType: null,
-        storageId: null,
-        timestamp: null,
-        admitName: null,
-        //flag:this.$route.query.flag,
       },
       queryParams1: {
         bigtype: 2,
@@ -320,64 +146,41 @@ export default {
   },
   created() {
     this.getList();
-    this.getOptions();
   },
   methods: {
     /** 查询选项列表 */
-    getOptions() {
+    dateChange(e){
-      this.equipmentOptions = []
+      if (e) {
-      alllistEquipment(this.queryParams1).then(response => {
+        this.queryParams.createTimeStr = this.parseTime(e[0], '{y}-{m}-{d} {h}:{i}:{s}');
-        this.equipmentOptions = response.data
+        this.queryParams.createTimeEnd = this.parseTime(e[1], '{y}-{m}-{d} {h}:{i}:{s}');
-      })
+      } else {
+        delete this.queryParams.createTimeStr;
+        delete this.queryParams.createTimeEnd;
+      }
     },
-    dateChange(e){;
-        this.queryParams.startTimeTxt = this.parseTime(e[0], '{y}-{m}-{d} {h}:{i}:{s}');
-        this.queryParams.endTimeTxt = this.parseTime(e[1], '{y}-{m}-{d} {h}:{i}:{s}');
 
+    visTimeChange(e){
+      if (e) {
+        this.queryParams.visTimeStart = moment(e[0]).format('yyyy-MM-DD HH:mm');
+        this.queryParams.visTimeEnd = moment(e[1]).format('yyyy-MM-DD HH:mm');
+      } else {
+        delete this.queryParams.visTimeStart;
+        delete this.queryParams.visTimeEnd;
+      }
     },
     /** 查询人员识别记录列表 */
     getList() {
       this.loading = true;
-      queryVisitorRecordList(this.queryParams).then(response => {
+      list(this.queryParams).then(response => {
         this.peopleRecordList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     // 表单重置
     reset() {
       this.form = {
         id: null,
-        peopleId: null,
-        equipmentId: null,
-        deviceIp: null,
-        admitGuid: null,
-        recMode: null,
-        filePath: null,
-        showTime: null,
-        showDate: null,
-        aliveType: null,
-        recScore: null,
-        deviceNo: null,
-        deviceVersion: null,
-        source: null,
-        type: null,
-        cardNo: null,
-        deviceName: null,
-        recType: null,
-        result: null,
-        permissionTimeType: null,
-        passTimeType: null,
-        recModeType: null,
-        storageId: null,
-        timestamp: null,
-        admitName: null,
-        remark: null,
         createBy: null,
         createTime: null,
         updateBy: null,
@@ -392,6 +195,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.showDate = [];
+      this.visTimeRange = [];
+      delete this.queryParams.visTimeStart;
+      delete this.queryParams.visTimeEnd;
+      delete this.queryParams.createTimeStr;
+      delete this.queryParams.createTimeEnd;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -401,47 +210,12 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
+
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加人员识别记录";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getPeopleRecord(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改人员识别记录";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updatePeopleRecord(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addPeopleRecord(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids.join(',');
-      this.$modal.confirm('是否确认删除人员识别记录编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除所选出门证记录').then(function() {
-        return deleteVisitorRecordList({ids:ids});
+        return deleteRecord(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");