diff --git a/src/views/components/AddDialog/tab2.vue b/src/views/components/AddDialog/tab2.vue
index 5050e7e..4cc9690 100644
--- a/src/views/components/AddDialog/tab2.vue
+++ b/src/views/components/AddDialog/tab2.vue
@@ -132,16 +132,8 @@
-
-
+
+
@@ -334,8 +333,7 @@ export default {
title: "",
isDialogShow: false,
tableInfoData: [],
- tableHeight: 530,
-
+ tableHeight: 530,
};
},
components: {
@@ -347,8 +345,15 @@ export default {
created() {
this.queryParams.plannedYear = this.$moment(new Date()).format("yyyy");
this.getList();
-// 设置表格高度 100% 125%
- this.tableHeight = detectZoom == 100 ? 730 : 530;
+ // 设置表格高度 100% 125%
+ let screen = window.screen;
+ let screenWidth = window.screen.width;
+ let screenHeight = window.screen.height;
+ if (screenWidth == 1366) {
+ this.tableHeight = 500;
+ } else {
+ this.tableHeight = detectZoom == 100 ? 750 : 530;
+ }
if (JSON.parse(sessionStorage.getItem("USER_P_STATUS")) == 1) {
// 原始密码修改
this.resetPwd();
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index d5d381e..ab0266c 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -552,9 +552,9 @@ export default {
let screenWidth = window.screen.width;
let screenHeight = window.screen.height;
if (screenWidth == 1366) {
- this.tableHeight = 420;
+ this.tableHeight = 400;
} else {
- this.tableHeight = detectZoom == 100 ? 650 : 450;
+ this.tableHeight = detectZoom == 100 ? 600 : 450;
}
},
};
@@ -604,6 +604,7 @@ export default {
display: flex;
align-items: center;
justify-content: center;
+ white-space: nowrap;
.look,
.change,
.delete {
diff --git a/vue.config.js b/vue.config.js
index 51bcd80..0e71a39 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,7 +15,7 @@ const px2rem = require("postcss-px2rem"); //将项目中的px转成rem,以达到
// 配置基本大小
const postcss = px2rem({
// 基准大小 baseSize,需要和rem.js中相同
- remUnit: 16,
+ remUnit: 14,
});
// vue.config.js 配置说明