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 | 87 +++++++++++++++++--------------------------
1 files changed, 35 insertions(+), 52 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index af1e1bc..c3a01be 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -14,7 +14,11 @@
</div>
</el-col>
<el-col :span="24">
- <basic-container>
+ <basic-container
+ :class="[
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch' : '',
+ ]"
+ >
<avue-crud
:option="option"
:search.sync="search"
@@ -509,6 +513,7 @@
}
};
return {
+ nowCell: "", //空为手动，2为身份证设备读取
// 表格数据
defaults: {},
// 身份证设备数据
@@ -600,6 +605,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
+ ...this.$store.state.control.changePageSize,
},
roleId: "1412226235153731586",
deptId: "1413470343230877697",
@@ -608,6 +614,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
+ ...this.$store.state.control.changePageSize,
},
init: {
roleTree: [],
@@ -680,6 +687,7 @@
//dialogType: 'drawer',
dialogClickModal: false,
column: securityFormPageColumn,
+ ...this.$store.state.control.clearOtherBut,
group: [
{
label: "基础信息",
@@ -688,7 +696,7 @@
icon: "el-icon-user-solid",
column: [
{
- label: "所属保安公司",
+ label: "企业名称",
prop: "deptId",
type: "tree",
// dicUrl:
@@ -818,8 +826,8 @@
text: " ",
ratio: 0.1,
},
- action: "/api/blade-resource/oss/endpoint/put-files",
- tip: "上传二代身份证一寸近期彩色正面免冠图象， (358像素(宽) × 441像素(高)、分辨率350dpi)且不超过500kb",
+ action: "/api/blade-resource/oss/endpoint/put-file-user-avatar",
+ tip: "上传身份证一寸近期彩色正面免冠图象， (358像素(宽) × 441像素(高)、分辨率350dpi)且不超过500kb",
span: 12,
// row: true,
prop: "avatar",
@@ -1757,6 +1765,8 @@
}
const userMap = {
user: {
+ //是否是身份证自动识别进入
+ cell: this.nowCell,
//指纹↓
fingerprint: zhiwen.imgBMP, //图
myPicture: zhiwen.featuredata, //特征
@@ -1826,8 +1836,11 @@
row.fingerprint = zhiwen.imgBMP;
row.myPicture = zhiwen.featuredata;
}
- // console.log(row);
- // return;
+
+ //是否是身份证自动识别进入
+ if (row.cell != "2") {
+ row["cell"] = this.nowCell;
+ }
update(row).then(
() => {
this.initFlag = false;
@@ -2025,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)) {
@@ -2035,7 +2049,7 @@
}
},
olondSFZ() {
- console.log(123456);
+ // console.log(123456);
var that = this;
try {
// 开始连接设备
@@ -2051,7 +2065,9 @@
console.log("ok!");
}
} catch (e) {
- that.haveSEL = false;
+ // that.haveSEL = false;
+ that.haveSEL = true;
+ // console.log(e, 123);
return;
}
let result = CertCtl.readCert();
@@ -2086,7 +2102,10 @@
this.intTime = setInterval(function () {
if (!that.haveCardid) {
//定时读卡
+ // console.log(that.haveCardid);
let result = CertCtl.readCert();
+ // console.log(result);
+ // console.log("通过读取");
if (result == "") {
console.log("未启动读卡插件!");
that.closeSFZ();
@@ -2106,59 +2125,22 @@
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.obj = {
- // name: data.partyName,
- // national: data.nation,
- // certAddress: data.certAddress,
- // sex:
- // data.certType == 0
- // ? "未知"
- // : data.certType == 1
- // ? "男"
- // : data.certType == 2
- // ? "女"
- // : data.certType == 9
- // ? "未说明"
- // : "未能识别",
- // imgs: "data:image/bmp;base64," + data.identityPic,
- // yxqend:
- // data.expDate.slice(0, 4) +
- // "-" +
- // data.expDate.slice(4, 6) +
- // "-" +
- // data.expDate.slice(6, 8),
- // yxqstart:
- // data.effDate.slice(0, 4) +
- // "-" +
- // data.effDate.slice(4, 6) +
- // "-" +
- // data.effDate.slice(6, 8),
- // birthday:
- // data.bornDay.slice(0, 4) +
- // "-" +
- // data.bornDay.slice(4, 6) +
- // "-" +
- // data.bornDay.slice(6, 8),
- // id: data.certNumber,
- // qfjg: data.certOrg,
- // };
- // that.$store.commit("setCardInfor", that.obj);
- // that.$store.commit("setCardidState", true);
+ that.nowCell = "2";
} else if (resultObj.resultFlag == "-1") {
if (resultObj.errorMsg == "端口打开失败") {
console.log("读卡器未连接");
that.closeSFZ();
} else {
- // console.log(resultObj.errorMsg);
+ // console.log("无卡片提醒-1", resultObj.errorMsg);
//无卡片提醒
- that.closeSFZ();
+ // that.closeSFZ();
}
} else if (resultObj.resultFlag == "-2") {
- console.log(resultObj.errorMsg);
+ console.log("异常-2", resultObj.errorMsg);
that.closeSFZ();
}
}
@@ -2204,6 +2186,7 @@
//可以编辑
}
this.openClosegroup(false);
+ this.nowCell = "";
},
beforeOpen(done, type) {
var that = this;
--
Gitblit v1.9.3