From 137cbcae361e4cbcee770e0ea7e259ae95e789c4 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 23 Nov 2021 11:43:38 +0800
Subject: [PATCH] +
---
src/views/securityGuard/securityGuard.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index d7fb3ac..c3d40a4 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"
@@ -598,9 +602,10 @@
loading: true,
platformLoading: false,
page: {
- pageSize: 10,
+ pageSize: 15,
currentPage: 1,
total: 0,
+ pageSizes: [15, 30, 50, 100],
},
roleId: "1412226235153731586",
deptId: "1413470343230877697",
@@ -681,7 +686,7 @@
//dialogType: 'drawer',
dialogClickModal: false,
column: securityFormPageColumn,
- // ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut,
group: [
{
label: "基础信息",
@@ -820,8 +825,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",
@@ -2041,7 +2046,7 @@
}
},
olondSFZ() {
- console.log(123456);
+ // console.log(123456);
var that = this;
try {
// 开始连接设备
@@ -2126,12 +2131,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();
}
}
--
Gitblit v1.9.3