From 3a6ae7ec0c0df9681b08efe4adca05a71afeb2b0 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 23 Nov 2021 15:17:40 +0800
Subject: [PATCH] +

---
 src/views/securityGuard/securityGuard.vue |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 22cd3ed..3342769 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,7 +513,7 @@
       }
     };
     return {
-      nowCell: "1", //1为手动，2为身份证设备读取
+      nowCell: "", //空为手动，2为身份证设备读取
       // 表格数据
       defaults: {},
       // 身份证设备数据
@@ -601,6 +605,7 @@
         pageSize: 10,
         currentPage: 1,
         total: 0,
+        ...this.$store.state.control.changePageSize,
       },
       roleId: "1412226235153731586",
       deptId: "1413470343230877697",
@@ -609,6 +614,7 @@
         pageSize: 10,
         currentPage: 1,
         total: 0,
+        ...this.$store.state.control.changePageSize,
       },
       init: {
         roleTree: [],
@@ -681,6 +687,7 @@
         //dialogType: 'drawer',
         dialogClickModal: false,
         column: securityFormPageColumn,
+        ...this.$store.state.control.clearOtherBut,
         group: [
           {
             label: "基础信息",
@@ -689,7 +696,7 @@
             icon: "el-icon-user-solid",
             column: [
               {
-                label: "所属保安公司",
+                label: "企业名称",
                 prop: "deptId",
                 type: "tree",
                 // dicUrl:
@@ -819,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",
@@ -2031,6 +2038,7 @@
     },
     openClosegroup(val) {
       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)) {
@@ -2040,7 +2048,7 @@
       }
     },
     olondSFZ() {
-      console.log(123456);
+      // console.log(123456);
       var that = this;
       try {
         // 开始连接设备
@@ -2116,7 +2124,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";
@@ -2125,12 +2134,12 @@
                 console.log("读卡器未连接");
                 that.closeSFZ();
               } else {
-                console.log(resultObj.errorMsg);
+                console.log("无卡片提醒-1", resultObj.errorMsg);
                 //无卡片提醒
                 // that.closeSFZ();
               }
             } else if (resultObj.resultFlag == "-2") {
-              console.log(resultObj.errorMsg);
+              console.log("异常-2", resultObj.errorMsg);
               that.closeSFZ();
             }
           }
@@ -2176,7 +2185,7 @@
         //可以编辑
       }
       this.openClosegroup(false);
-      this.nowCell = "1";
+      this.nowCell = "";
     },
     beforeOpen(done, type) {
       var that = this;

--
Gitblit v1.9.3