From 3f916119f349df5ef7e543e795064c82c47f878f Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Sat, 13 Jan 2024 21:58:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/AddDialog/tab2.vue | 13 +++----------
 src/views/yingji/enforcing.vue          |  9 +++++----
 src/views/yingji/enterprise.vue         |  8 +++++---
 src/views/yingji/home.vue               | 17 +++++++++++------
 src/views/yingji/planManage.vue         |  5 +++--
 vue.config.js                           |  2 +-
 6 files changed, 28 insertions(+), 26 deletions(-)

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 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column
-          label="安全风险等级"
-          align="center"
-          prop="riskLevel"
-        />
-        <el-table-column
-          label="标准化等级"
-          align="center"
-          prop="standLevel"
-        />
+        <el-table-column label="安全风险等级" align="center" prop="riskLevel" />
+        <el-table-column label="标准化等级" align="center" prop="standLevel" />
         <el-table-column
           label="上次检查时间"
           align="center"
@@ -781,6 +773,7 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
+        white-space: nowrap;
         .look {
           display: flex;
           align-items: center;
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
index c50b336..7a6683f 100644
--- a/src/views/yingji/enforcing.vue
+++ b/src/views/yingji/enforcing.vue
@@ -445,13 +445,13 @@ export default {
 
     this.getList();
     // 设置表格高度 100% 125%
-     let screen = window.screen;
+    let screen = window.screen;
     let screenWidth = window.screen.width;
     let screenHeight = window.screen.height;
     if (screenWidth == 1366) {
-      this.tableHeight = 440;
+      this.tableHeight = 420;
     } else {
-      this.tableHeight = detectZoom == 100 ? 700 : 480;
+      this.tableHeight = detectZoom == 100 ? 600 : 480;
     }
   },
   dicts: ["inspection_method", "check_source", "document_type"],
@@ -697,7 +697,8 @@ export default {
   .content {
     // padding: 15px 10px;
     .filtrate {
-      padding-bottom: 10px;
+      padding: 31px 0 12px 0;
+      // padding-bottom: 10px;
       .select-input {
         // margin-right: 10px;
         margin-top: 20px;
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index 0624ce3..6378e15 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -369,9 +369,9 @@ export default {
     let screenWidth = window.screen.width;
     let screenHeight = window.screen.height;
     if (screenWidth == 1366) {
-      this.tableHeight = 440;
+      this.tableHeight = 420;
     } else {
-      this.tableHeight = detectZoom == 100 ? 700 : 480;
+      this.tableHeight = detectZoom == 100 ? 600 : 480;
     }
   },
   methods: {
@@ -517,7 +517,9 @@ export default {
   padding: 0 20px;
   background-color: #fff;
   .filtrate {
-    padding-top: 10px;
+    // padding-top: 10px;
+    padding: 31px 0 12px 0;
+
     .btn-search {
       background: #2378ec;
       color: #ffffff;
diff --git a/src/views/yingji/home.vue b/src/views/yingji/home.vue
index 459f87b..12937db 100644
--- a/src/views/yingji/home.vue
+++ b/src/views/yingji/home.vue
@@ -92,8 +92,7 @@
           v-loading="load1"
           :data="tableData"
           style="width: 100%"
-                  :height="tableHeight"
-
+          :height="tableHeight"
           :border="false"
           :row-class-name="tableRowClassName"
         >
@@ -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 配置说明