From b644e37304f90da6cece903a401296e55f75e8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C002001lixiaobang=E2=80=9D?= <2547956374@qq.com>
Date: Tue, 28 Mar 2023 13:18:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/tableGantt.vue |  2 +-
 src/views/index.vue                  |  2 +-
 src/views/login.vue                  |  2 +-
 src/views/modelScreen.vue            |  2 +-
 src/views/modelScreenComponents.vue  |  2 +-
 src/views/progress.vue               |  2 +-
 src/views/progressComponents.vue     | 16 ++++++++++------
 7 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/common/tableGantt.vue b/src/components/common/tableGantt.vue
index 315b421..3aacfa6 100644
--- a/src/components/common/tableGantt.vue
+++ b/src/components/common/tableGantt.vue
@@ -819,7 +819,7 @@ $gantt_item_half: 4px;
     // background-color: transparent !important;
     color: #ADFFFE!important;
     border: none !important;
-    padding-left: 0 !important;
+    padding-left: 0 ;
     padding-right: 0 !important;
 }
 
diff --git a/src/views/index.vue b/src/views/index.vue
index 27f9c67..624584e 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1477,7 +1477,7 @@ position: absolute;
   // background-color: transparent !important;
   color: rgba(255, 255, 255, 0.7) !important;
   border: none !important;
-  padding-left: 0 !important;
+  padding-left: 0 ;
   padding-right: 0 !important;
 }
 
diff --git a/src/views/login.vue b/src/views/login.vue
index cd00dbf..48514ae 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -525,7 +525,7 @@ getWeather () {
   // background-color: transparent !important;
   color: rgba(255, 255, 255, 0.7) !important;
   border: none !important;
-  padding-left: 0 !important;
+  padding-left: 0 ;
   padding-right: 0 !important;
 }
 
diff --git a/src/views/modelScreen.vue b/src/views/modelScreen.vue
index 8d3c7b7..b330aa7 100644
--- a/src/views/modelScreen.vue
+++ b/src/views/modelScreen.vue
@@ -1475,7 +1475,7 @@ export default {
   // background-color: transparent !important;
   color: rgba(255, 255, 255, 0.7) !important;
   border: none !important;
-  padding-left: 0 !important;
+  padding-left: 0 ;
   padding-right: 0 !important;
 }
 
diff --git a/src/views/modelScreenComponents.vue b/src/views/modelScreenComponents.vue
index 3059373..a1ff6ca 100644
--- a/src/views/modelScreenComponents.vue
+++ b/src/views/modelScreenComponents.vue
@@ -1686,7 +1686,7 @@ export default {
   // background-color: transparent !important;
   color: rgba(255, 255, 255, 0.7) !important;
   border: none !important;
-  padding-left: 0 !important;
+  padding-left: 0 ;
   padding-right: 0 !important;
 }
 
diff --git a/src/views/progress.vue b/src/views/progress.vue
index 401046d..9d9f2ca 100644
--- a/src/views/progress.vue
+++ b/src/views/progress.vue
@@ -1332,7 +1332,7 @@ export default {
     // background-color: transparent !important;
     color: #ADFFFE !important;
     border: none !important;
-    padding-left: 0 !important;
+    padding-left: 0 ;
     padding-right: 0 !important;
 }
 
diff --git a/src/views/progressComponents.vue b/src/views/progressComponents.vue
index fc27ac3..f9b8b46 100644
--- a/src/views/progressComponents.vue
+++ b/src/views/progressComponents.vue
@@ -77,7 +77,7 @@
                 </div>
                 <div class="btnIcon" @click="gantDialog"></div>
                 <div class="tableBox">
-                    <el-table height="237" :row-style="{ height: '0' }" :cell-style="{ padding: '8px' }"
+                    <el-table height="100%" :row-style="{ height: '0' }" :cell-style="{ padding: '8px' }"
                         :row-class-name="tableRowClassName" :data="tableData" style="width: 100%">
                         <el-table-column header-align="center" align="center" show-overflow-tooltip prop="name"
                             label="任务名称">
@@ -137,10 +137,10 @@
                 <span></span>
             </div>
             <div class="table2Box">
-                <el-table height="270" :row-class-name="tableRowClassName" :data="table2Data" style="width: 100%" :cell-style="{ padding: '5px' }">
-                    <el-table-column header-align="center" align="center" show-overflow-tooltip prop="name" label="任务名称">
+                <el-table height="100%" :row-class-name="tableRowClassName" :data="table2Data" style="width: 100%" :cell-style="{ padding: '5px' }">
+                    <el-table-column align="left" show-overflow-tooltip prop="name" label="任务名称" style="left:20px">
                     </el-table-column>
-                    <el-table-column align="center" prop="startDate" label="开始时间">
+                    <el-table-column align="center" prop="startDate" label="开始时间" >
                     </el-table-column>
                     <el-table-column align="center" prop="endDate" label="结束时间">
                     </el-table-column>
@@ -685,6 +685,10 @@ export default {
     top: 70px;
     left: 16px;
     position: absolute;
+    height: 286px;
+    @media only screen and (max-height: 1000px) {
+        height: 237px;
+    }
 }
 .dh1 {
     animation: mytest 0.5s linear;
@@ -883,7 +887,7 @@ export default {
     font-size: 14px;
     display: flex;
     flex-wrap: wrap;
-    margin: 10px auto 0;
+    margin: 13px auto 0;
     width: 90%;
     border-bottom: 1px solid rgba(96, 213, 205, 0.4);
 }
@@ -1305,7 +1309,7 @@ export default {
     // background-color: transparent !important;
     color: #ADFFFE !important;
     border: none !important;
-    padding-left: 0 !important;
+    padding-left: 7 !important;
     padding-right: 0 !important;
 }