From 940eb94dadeba498ddc201ec8a8de9985ba6a2a8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 16 Nov 2021 10:14:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityGuard/securityGuard.vue | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 0c479bc..d563510 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -75,6 +75,15 @@
@click="handleSecurityPaperApply"
>证书制证申请
</el-button>
+ <el-button
+ type="primary"
+ size="small"
+ plain
+ v-if="permission.securityGuard_escort_personnel_import"
+ icon="el-icon-collection-tag"
+ @click="handleEscortPersonnelImport"
+ >押运人员批量导入
+ </el-button>
<el-button
type="danger"
@@ -1226,7 +1235,6 @@
created() {
console.log(this.userInfo, 9999);
if (this.userInfo.role_name == "办证管理员") {
- console.log(this.userInfo.role_name, 5555225);
this.search["userType"] = 7;
this.search["hold"] = "1";
}
@@ -2296,7 +2304,7 @@
// 抬头名字
.security_m_l_titleName {
position: absolute;
- top: 35px;
+ top: 38px;
left: 121px;
right: 0;
line-height: 45px;
@@ -2304,7 +2312,7 @@
}
//发证时间
-$timeTop: 310px; //整体高度
+$timeTop: 315px; //整体高度
//年
.security_m_l_titlepaperTimenian {
position: absolute;
@@ -2341,7 +2349,7 @@
$centerLeft: 458px;
.security_m_r_o_right {
position: absolute;
- top: $downTop + $lineHigeht * 0-12px;
+ top: $downTop + $lineHigeht * 0+18px;
left: $centerLeft;
// width: $rightWidth;
}
@@ -2349,7 +2357,7 @@
// 生日
.security_m_r_o_rightbirthday {
position: absolute;
- top: $downTop + $lineHigeht * 1-14px;
+ top: $downTop + $lineHigeht * 1+0px;
left: $centerLeft;
// width: $rightWidth;
}
@@ -2357,7 +2365,7 @@
// 地址
.security_m_r_o_rightaddress {
position: absolute;
- top: $downTop + $lineHigeht * 2 -16px;
+ top: $downTop + $lineHigeht * 2+0px;
left: $centerLeft;
width: 185px;
}
@@ -2365,7 +2373,7 @@
// 身份证
.security_m_r_o_rightcardid {
position: absolute;
- top: $downTop + $lineHigeht * 4 +0px;
+ top: $downTop + $lineHigeht * 4 +10px;
left: $centerLeft;
// width: $rightWidth;
}
--
Gitblit v1.9.3