From 2c41bb9bde06f279c41d3d2a4bdc65edc4be24b8 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 23 Nov 2021 16:23:43 +0800
Subject: [PATCH] +
---
src/views/securityGuard/securityGuard.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index c3d40a4..c3a01be 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -602,10 +602,10 @@
loading: true,
platformLoading: false,
page: {
- pageSize: 15,
+ pageSize: 10,
currentPage: 1,
total: 0,
- pageSizes: [15, 30, 50, 100],
+ ...this.$store.state.control.changePageSize,
},
roleId: "1412226235153731586",
deptId: "1413470343230877697",
@@ -614,6 +614,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
+ ...this.$store.state.control.changePageSize,
},
init: {
roleTree: [],
@@ -695,7 +696,7 @@
icon: "el-icon-user-solid",
column: [
{
- label: "所属保安公司",
+ label: "企业名称",
prop: "deptId",
type: "tree",
// dicUrl:
@@ -1835,10 +1836,11 @@
row.fingerprint = zhiwen.imgBMP;
row.myPicture = zhiwen.featuredata;
}
- // console.log(row);
- // return;
+
//是否是身份证自动识别进入
- row["cell"] = this.nowCell;
+ if (row.cell != "2") {
+ row["cell"] = this.nowCell;
+ }
update(row).then(
() => {
this.initFlag = false;
@@ -2036,7 +2038,8 @@
);
},
openClosegroup(val) {
- let ql = /realName|nation|cardid|registered|sex/;
+ // let ql = /realName|nation|cardid|registered|sex/;
+ let ql = /realName|nation|cardid|registered/;
for (let k in this.option.group) {
for (let i in this.option.group[k].column) {
if (ql.test(this.option.group[k].column[i].prop)) {
@@ -2099,10 +2102,10 @@
this.intTime = setInterval(function () {
if (!that.haveCardid) {
//定时读卡
- console.log(that.haveCardid);
+ // console.log(that.haveCardid);
let result = CertCtl.readCert();
// console.log(result);
- console.log("通过读取");
+ // console.log("通过读取");
if (result == "") {
console.log("未启动读卡插件!");
that.closeSFZ();
@@ -2122,7 +2125,8 @@
that.form.cardid = data.certNumber;
that.form.nation = data.nation;
that.form.registered = data.certAddress;
- that.form.sex = data.certType;
+ that.form.sex =
+ data.certType == 0 ? 2 : data.certType == 1 ? 1 : 3;
//禁止编辑
that.openClosegroup(true);
that.nowCell = "2";
@@ -2131,7 +2135,7 @@
console.log("读卡器未连接");
that.closeSFZ();
} else {
- console.log("无卡片提醒-1", resultObj.errorMsg);
+ // console.log("无卡片提醒-1", resultObj.errorMsg);
//无卡片提醒
// that.closeSFZ();
}
--
Gitblit v1.9.3