From a38281e697cde9f45926a6af0c88bec14501fec0 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Tue, 15 Feb 2022 11:06:34 +0800
Subject: [PATCH] 68个表格在1366*768下的适配，保安单位情况智能分析中的图表的适配以及其按钮会被遮住不能点击
---
src/views/accreditationRecords/accreditationRecordsPaper.vue | 212 +++++++++++++++++++++++++++--------------------------
1 files changed, 108 insertions(+), 104 deletions(-)
diff --git a/src/views/accreditationRecords/accreditationRecordsPaper.vue b/src/views/accreditationRecords/accreditationRecordsPaper.vue
index e35a4bd..140c76e 100644
--- a/src/views/accreditationRecords/accreditationRecordsPaper.vue
+++ b/src/views/accreditationRecords/accreditationRecordsPaper.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'desk1',
- $store.state.control.windowWidth >= 1024 ? 'tooRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -80,9 +82,9 @@
>批量审批
</el-button>
<!--图例 components-->
- <span>
- <Legend :datas="datalistLIU"></Legend>
- </span>
+ <span>
+ <Legend :datas="datalistLIU"></Legend>
+ </span>
</template>
<template slot-scope="{ row }" slot="category">
<el-tag>{{ row.categoryName }}</el-tag>
@@ -215,7 +217,7 @@
add,
getAccreditationRecords,
audit,
- batchAudit,
+ batchAudit
} from "@/api/accreditationRecords/accreditationRecords";
import { updatePaperTime } from "@/api/system/user";
import { getDept } from "@/api/system/dept";
@@ -226,7 +228,7 @@
import Legend from "@/components/liu-legend/Legend";
export default {
components: {
- Legend,
+ Legend
},
data() {
return {
@@ -238,21 +240,21 @@
realName: "",
securityNumber: "",
idCardNo: "",
- registered: "",
+ registered: ""
},
datalistLIU: [
{
color: "#29C093",
- text: "审核通过",
+ text: "审核通过"
},
{
color: "#F34A4A",
- text: "审核不通过",
+ text: "审核不通过"
},
{
color: "#F48F57",
- text: "待审核",
- },
+ text: "待审核"
+ }
],
Audit: {},
dialogFormVisible: false,
@@ -290,34 +292,34 @@
{
required: true,
message: "请选择审核类型",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
span: 24,
type: "textarea",
- prop: "auditDetail",
- },
- ],
+ prop: "auditDetail"
+ }
+ ]
},
batchAudit: {
- number: 0,
+ number: 0
},
optionBatchAudit: {
height: "auto",
@@ -343,7 +345,7 @@
span: 24,
value: 0,
disabled: true,
- labelWidth: 110,
+ labelWidth: 110
},
{
label: "审核状态",
@@ -359,31 +361,31 @@
{
required: true,
message: "请选择审核类型",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
span: 24,
type: "textarea",
- prop: "auditDetail",
- },
- ],
+ prop: "auditDetail"
+ }
+ ]
},
choiceList: [],
form: {},
@@ -400,7 +402,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -426,6 +428,7 @@
menuWidth: 180,
dialogClickModal: false,
...this.$store.state.control.clearOtherBut,
+ searchIndex: 5, //收缩展示数量
column: [
{
label: "申请时间",
@@ -444,9 +447,9 @@
{
required: true,
message: "请输入申请时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "姓名",
@@ -454,7 +457,7 @@
search: true,
searchSpan: 3,
width: 90,
- searchLabelWidth: 50,
+ searchLabelWidth: 50
// display: false,
},
// {
@@ -489,14 +492,14 @@
searchSpan: 5,
search: true,
overHidden: true,
- minWidth: 200,
+ minWidth: 200
},
{
label: "性别",
prop: "sex",
width: 60,
type: "select",
- display: false,
+ display: false
},
{
label: "身份证号码",
@@ -504,19 +507,19 @@
search: true,
searchLabelWidth: 90,
minWidth: 110,
- searchSpan: 5,
+ searchSpan: 5
},
{
label: "年龄",
prop: "age",
- width: 50,
+ width: 50
},
{
label: "照片",
prop: "avatar",
type: "upload",
listType: "picture-img",
- width:60,
+ width: 60
},
{
label: "保安证编号",
@@ -524,9 +527,9 @@
search: true,
searchLabelWidth: 90,
minWidth: 90,
- searchSpan: 5,
+ searchSpan: 4,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
{
@@ -537,7 +540,7 @@
width: 80,
// searchSpan: 4,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
{
@@ -548,7 +551,7 @@
minWidth: 160,
searchSpan: 5,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
{
@@ -559,7 +562,7 @@
minWidth: 105,
// searchSpan: 4,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
{
@@ -577,17 +580,17 @@
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
@@ -596,7 +599,7 @@
addDisplay: false,
editDisplay: false,
hide: false,
- display: false,
+ display: false
},
{
label: "是否制证",
@@ -611,17 +614,17 @@
dicData: [
{
label: "全部",
- value: 3,
+ value: 3
},
{
label: "已制证",
- value: 2,
+ value: 2
},
{
label: "未制证",
- value: 1,
- },
- ],
+ value: 1
+ }
+ ]
},
{
label: "有无照片",
@@ -638,21 +641,21 @@
dicData: [
{
label: "全部",
- value: 3,
+ value: 3
},
{
label: "有",
- value: 1,
+ value: 1
},
{
label: "无",
- value: 2,
- },
- ],
- },
- ],
+ value: 2
+ }
+ ]
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -665,22 +668,23 @@
false
),
delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
- }),
+ userInfo: state => state.user.userInfo
+ })
},
mounted() {
this.getDeptInfo(this.userInfo.dept_id);
+ this.$store.commit("setWindowSizeHeightAdd");
// if (this.userInfo.roleName == "办证管理员") {
// this.search["userType"] = 7;
// }
@@ -705,7 +709,7 @@
//获取当前用户部门信息
getDeptInfo(deptId) {
var that = this;
- getDept(deptId).then((res) => {
+ getDept(deptId).then(res => {
var deptCategory = res.data.data.deptCategory;
deptCategory == 1
? (that.deptCategory = true)
@@ -718,8 +722,8 @@
path: `/resource/uploadNotice`,
query: {
deptId: row.deptId,
- noticeId: row.id,
- },
+ noticeId: row.id
+ }
});
},
rowSave(row, done, loading) {
@@ -735,11 +739,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -783,7 +787,7 @@
onEnd: () => {
this.updateUserInfo();
// console.log('打印完成', Date.parse(new Date()));
- },
+ }
});
},
getNewTime() {
@@ -819,7 +823,7 @@
const data = {
id: this.certificateObj.userId,
userType: 6,
- paperTime: date,
+ paperTime: date
};
updatePaperTime(data);
this.onLoad(this.page);
@@ -840,7 +844,7 @@
type: 2,
auditStatus: row.auditStatus,
auditDetail: row.auditDetail,
- auditUser: this.userInfo.Id,
+ auditUser: this.userInfo.Id
};
//提交申请
batchAudit(data).then(
@@ -850,13 +854,13 @@
that.dialogBatchAudit = false;
this.$message({
type: "success",
- message: "操作成功",
+ message: "操作成功"
});
//清除选项
that.$refs.crud.toggleSelection();
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -874,11 +878,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -889,7 +893,7 @@
if (this.choiceList.length == 0) {
this.$message({
message: "未选择保安员",
- type: "warning",
+ type: "warning"
});
return;
}
@@ -900,7 +904,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -909,7 +913,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -926,10 +930,10 @@
submit(row, done, loading) {
const data = {
id: row.id,
- type:2,
+ type: 2,
auditStatus: row.auditStatus,
auditDetail: row.auditDetail,
- auditUser: this.userInfo.Id,
+ auditUser: this.userInfo.Id
};
audit(data).then(
@@ -938,11 +942,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -959,7 +963,7 @@
this.choiceList = [];
for (let k in list) {
this.choiceList.push({
- id: list[k].id,
+ id: list[k].id
});
}
},
@@ -976,7 +980,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -985,14 +989,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getAccreditationRecords(this.form.id).then((res) => {
+ getAccreditationRecords(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -1029,23 +1033,24 @@
params["jurisdiction"] = this.userInfo.jurisdiction;
}
let values = {
- ...params,
+ ...params
};
if (releaseTimeRange) {
values = {
...params,
startTime: releaseTimeRange[0],
endTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
values.releaseTimeRange = null;
}
this.loading = true;
- getList(page.currentPage, page.pageSize, values).then((res) => {
+ getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -1054,7 +1059,7 @@
this.$confirm("是否导出证书制证信息数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
//获取查询条件
const { releaseTimeRange } = this.questionBankSearch;
@@ -1073,7 +1078,7 @@
securityNumber: this.questionBankSearch.securityNumber,
startTime: this.questionBankSearch.startTime,
endTime: this.questionBankSearch.endTime,
- isAvatar: this.questionBankSearch.isAvatar,
+ isAvatar: this.questionBankSearch.isAvatar
};
// data['Blade-Auth'] = getToken;
//导出
@@ -1103,7 +1108,7 @@
this.$confirm("是否导出证书打印信息数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
//获取查询条件
const { releaseTimeRange } = this.questionBankSearch;
@@ -1122,7 +1127,7 @@
securityNumber: this.questionBankSearch.securityNumber,
startTime: this.questionBankSearch.startTime,
endTime: this.questionBankSearch.endTime,
- isAvatar: this.questionBankSearch.isAvatar,
+ isAvatar: this.questionBankSearch.isAvatar
};
//导出
if (this.userInfo.role_name == "保安公司管理员") {
@@ -1145,8 +1150,8 @@
}=${getToken()}&` + data
);
});
- },
- },
+ }
+ }
};
</script>
@@ -1357,7 +1362,6 @@
line-height: 40px;
letter-spacing: 2px;
}
-
.dtype {
width: 100%;
--
Gitblit v1.9.3