From dad2da11362672c4402a89a55d5c2551e23290c3 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Wed, 6 Sep 2023 16:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=AE=A1=E5=88=92=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/dialog/index.vue |  6 +-
 src/views/yingji/enforcing.vue        | 21 +++----
 src/views/yingji/enterprise.vue       | 18 +++---
 src/views/yingji/planManage.vue       | 82 +++++++++++++--------------
 4 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index 3605197..fe5ff9d 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -179,7 +179,7 @@
       </div>
       <div class="next">
         <div class="selected">已选择<span>{{ selected }}</span>家企业</div>
-        <div class="btn" @click="next" ref="next">{{ nextText }}</div>
+        <div class="btn" :class="nextStep ? 'selectBtn':''" @click="next" ref="next">{{ nextText }}</div>
       </div>
     </div>
   </div>
@@ -555,6 +555,10 @@ export default {
         color: #2378EC;
         cursor: pointer;
       }
+      .selectBtn {
+        background-color: #2378EC;
+        color: #FFFFFF;
+      }
     }
   }
 }
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
index 8ff4e48..7671e90 100644
--- a/src/views/yingji/enforcing.vue
+++ b/src/views/yingji/enforcing.vue
@@ -45,11 +45,11 @@
           <span>导出excel</span>
         </div>
       </div>
-      <div class="tables" :style="main">
+      <div class="tables">
         <el-table
           :data="tableData"
           style="width: 100%"
-          height="100%"
+          :height="484"
           :border="false"
           :row-class-name="tableRowClassName"
           :cell-style="columnStyle"
@@ -175,9 +175,6 @@
         },
         checkList: ['全部'],
         checkListTwo: [],
-        main:{
-          height:'',
-        }
       };
     },
     // watch: {
@@ -232,13 +229,13 @@
     },
     mounted() {
       this.checkListTwo = this.checkList;
-      this.$nextTick(()=>{
-        let dom = document.getElementsByClassName('tables');
-        let height = dom[0].getBoundingClientRect();
-        let windowHeight = window.innerHeight;
-        let relativeHeight = windowHeight - height.top
-        this.main.height = relativeHeight - 80 + 'px'
-      })
+      // this.$nextTick(()=>{
+      //   let dom = document.getElementsByClassName('tables');
+      //   let height = dom[0].getBoundingClientRect();
+      //   let windowHeight = window.innerHeight;
+      //   let relativeHeight = windowHeight - height.top
+      //   this.main.height = relativeHeight - 80
+      // })
     },
   };
   </script>
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index 8e9fc36..45310e2 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -79,11 +79,11 @@
           <div class="select-btn">搜索</div>
         </div>
       </div>
-      <div class="tables" :style="main">
+      <div class="tables">
         <el-table
           :data="tableData"
           style="width: 100%"
-          height="100%"
+          :height="497"
           :border="false"
           :row-class-name="tableRowClassName"
         >
@@ -212,13 +212,13 @@
     },
     mounted() {
       this.checkListTwo = this.checkList;
-      this.$nextTick(()=>{
-        let dom = document.getElementsByClassName('tables');
-        let height = dom[0].getBoundingClientRect();
-        let windowHeight = window.innerHeight;
-        let relativeHeight = windowHeight - height.top
-        this.main.height = relativeHeight - 50 + 'px'
-      })
+      // this.$nextTick(()=>{
+      //   let dom = document.getElementsByClassName('tables');
+      //   let height = dom[0].getBoundingClientRect();
+      //   let windowHeight = window.innerHeight;
+      //   let relativeHeight = windowHeight - height.top
+      //   this.main.height = relativeHeight - 50
+      // })
     },
   };
   </script>
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 7396676..b6fbdaf 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-06 11:07:50
+ * @LastEditTime: 2023-09-06 15:59:41
 -->
 <template>
     <div class="plan-management">
@@ -45,11 +45,11 @@
         </div>
       </div>
       <div class="plan-bottomBox">
-        <div class="tables" :style="main">
+        <div class="tables">
           <el-table
             :data="tableData"
             :border="false"
-            height="100%"
+            :height="484"
             @selection-change="handleSelectionChange"
             :row-class-name="tableRowClassName"
           >
@@ -181,9 +181,6 @@
             address: '上海市普陀区金沙江路 1518 弄'
         }],
         multipleSelection: [],
-        main:{
-          height:'',
-        }
       }
     },
     methods:{
@@ -237,15 +234,16 @@
         return '';
       },
     },
-    mounted() {
+    created() {
       this.checkListTwo = this.checkList;
-      this.$nextTick(()=>{
-        let dom = document.getElementsByClassName('tables');
-        let height = dom[0].getBoundingClientRect();
-        let windowHeight = window.innerHeight;
-        let relativeHeight = windowHeight - height.top
-        this.main.height = relativeHeight - 80 + 'px'
-      })
+      // this.$nextTick(()=>{
+        // let dom = document.getElementsByClassName('tables');
+        // let height = dom[0].getBoundingClientRect();
+        // let windowHeight = window.innerHeight;
+        // let relativeHeight = windowHeight - height.top
+        // this.main.height = relativeHeight - 80
+        // console.log(this.main.height)
+      // })
     },
   }
   </script>
@@ -339,40 +337,13 @@
     .plan-bottomBox {
       margin-top: 10px;
       .tables {
-        background-color: #EAF2FD;
-        .tabs-btns {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          .look,.change,.delete {
-            display: flex;
-            align-items: center;
-            margin-right: 30px;
-            cursor: pointer;
-            img {
-              width: 20px;
-              margin-right: 5px;
-            }
-            span {
-              font-size: 15px;
-              font-family: Alibaba PuHuiTi;
-              font-weight: 400;
-              color: #045FFD;
-            }
-          }
-          .delete {
-            margin-right: 0;
-            span {
-              color: #F71052;
-            }
-          }
-        }
         ::v-deep .el-table {
           .success-row {
             background-color: rgba(234, 242, 253, 0.25);
           }
           td {
             height: 42px;
+            box-sizing: border-box;
             text-align: center;
             font-size: 14px;
             font-family: 'Alibaba PuHuiTi';
@@ -394,6 +365,33 @@
         ::v-deep .el-table::before {
           height: 0;
         }
+        .tabs-btns {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          .look,.change,.delete {
+            display: flex;
+            align-items: center;
+            margin-right: 30px;
+            cursor: pointer;
+            img {
+              width: 20px;
+              margin-right: 5px;
+            }
+            span {
+              font-size: 15px;
+              font-family: Alibaba PuHuiTi;
+              font-weight: 400;
+              color: #045FFD;
+            }
+          }
+          .delete {
+            margin-right: 0;
+            span {
+              color: #F71052;
+            }
+          }
+        }
       }
       .pagination {
         margin-top: 40px;