From 033c6f40fafe4290301692f14f045365e9e1f66a Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 24 Oct 2019 18:28:06 +0800
Subject: [PATCH] =?UTF-8?q?desc:=20=E8=B0=83=E6=95=B4=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue                                      | 6 +++---
 src/views/jlmap/index.vue                                 | 2 +-
 src/views/map/mapdraft/mapedit/index.vue                  | 2 +-
 src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue | 4 ++--
 src/views/planMonitor/detail.vue                          | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index d1669aa3d..a905bfaca 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -3,9 +3,9 @@
     <div class="main-container">
       <navbar />
       <app-main :style="{width: width+'px', height: height+'px'}" />
-	  <el-footer style="height:30px;text-align:right;line-height: 30px;">
-		  <span style="font-size:14px;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</span>
-	  </el-footer>
+      <el-footer style="height:30px;text-align:right;line-height: 30px;">
+        <span style="font-size:14px;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</span>
+      </el-footer>
     </div>
   </div>
 </template>
diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue
index b93312fc2..1e319c6cf 100644
--- a/src/views/jlmap/index.vue
+++ b/src/views/jlmap/index.vue
@@ -61,7 +61,7 @@ export default {
 			return this.$store.state.config.width;
 		},
 		height() {
-			return this.$store.state.config.height;
+			return this.$store.state.config.height - 30;
 		},
 		show() {
 			if (this.mode == TrainingMode.EDIT || this.mode == TrainingMode.MAP_EDIT) {
diff --git a/src/views/map/mapdraft/mapedit/index.vue b/src/views/map/mapdraft/mapedit/index.vue
index c461ba5f0..9a575a06d 100644
--- a/src/views/map/mapdraft/mapedit/index.vue
+++ b/src/views/map/mapdraft/mapedit/index.vue
@@ -81,7 +81,7 @@ export default {
 	},
 	computed: {
 		cardHeight() {
-			return this.$store.state.app.height - 195;
+			return this.$store.state.app.height - 195-30;
 		}
 	},
 	watch: {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
index a59845f24..73aecced5 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
@@ -14,10 +14,10 @@
       </el-tab-pane>
       <el-tab-pane class="view-control" :label="$t('map.batchOperation')" name="three">
         <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: cardHeight +'px' }">
-			<!-- style="display: flex;justify-content: center;" -->
+          <!-- style="display: flex;justify-content: center;" -->
           <div style="text-align:center;">
             <el-button type="danger" size="big" @click="removeTrainWindow">{{ $t('map.deleteTrainWindow') }}</el-button>
-            <el-button type="primary" size="big" @click="createTrainWindow" style="margin-top:10px">{{ $t('map.createTrainWindow') }}</el-button>
+            <el-button type="primary" size="big" style="margin-top:10px" @click="createTrainWindow">{{ $t('map.createTrainWindow') }}</el-button>
           </div>
         </el-scrollbar>
       </el-tab-pane>
diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue
index d6e5dc512..d728f2bbf 100644
--- a/src/views/planMonitor/detail.vue
+++ b/src/views/planMonitor/detail.vue
@@ -4,7 +4,7 @@
 		<div class="runPlanList">{{$t('planMonitor.openRunPlan.runPlanList')}}</div>
 		<el-button size="small" type="primary" @click="handleCreate" class="createRunPlan" v-if="isCreate">{{$t('planMonitor.createRunningDiagram')}}</el-button>
 	</div>
-	<el-table :data="runPlanList" height="600" stripe
+	<el-table :data="runPlanList" height="500" stripe
         border
 		style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
         <el-table-column prop="name" :label="this.$t('planMonitor.runGraphName')" />
@@ -75,7 +75,7 @@ export default {
 	},
 	computed: {
 		height() {
-			return this.$store.state.app.height - 50-30;
+			return this.$store.state.app.height - 60 -30;
 		},
 		skinCode() {
 			return this.$route.query.skinCode || '02';