From 19e0b728e8cd41f9ddcd62eea6c15ebf769d9977 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 18:04:10 +0800
Subject: [PATCH] +解决和冲突合并，加上适应1366*768分辨率
---
src/views/licenseApproval/securityTraining.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index 17ccaae..5f778a6 100644
--- a/src/views/licenseApproval/securityTraining.vue
+++ b/src/views/licenseApproval/securityTraining.vue
@@ -1,15 +1,17 @@
-/*
- * @Author: liu
- * @Date: 2021-08-26 16:55:25
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-05 15:01:20
- */
-
+/* * @Author: liu * @Date: 2021-08-26 16:55:25 * @Last Modified by: liu * @Last
+Modified time: 2021-11-05 15:01:20 */
<template>
<div>
- <basic-container class="permit">
+ <basic-container
+ :class="[
+ 'permit',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : '',
+ ]"
+ >
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -244,6 +246,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
+ ...this.$store.state.control.changePageSize,
},
selectionList: [],
option: {
@@ -264,6 +267,7 @@
viewBtn: true,
selection: true,
dialogClickModal: false,
+ ...this.$store.state.control.clearOtherBut,
column: column,
},
data: [],
@@ -287,9 +291,10 @@
return ids.join(",");
},
},
- // mounted() {
- // console.log(this.userInfo.dept_id);
- // },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ // console.log(this.userInfo.dept_id);
+ },
methods: {
Print() {
this.$Print(this.$refs.licence);
--
Gitblit v1.9.3