From 462b0cfb6c1faba72ebe3ef79ecda65b96ba8371 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 29 Oct 2019 16:23:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue                                 | 12 ++++++++++--
 src/views/demonstration/detail/index.vue             |  2 +-
 .../lesson/lessoncategory/edit/sorttree/index.vue    |  2 +-
 src/views/planMonitor/detail.vue                     |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 1af6d626b..dddcd34e3 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -9,7 +9,7 @@
         </transition>
         <!-- </el-scrollbar> -->
       </section>
-      <el-footer style="height:30px;line-height: 30px;">
+      <el-footer class="footers" style="height:30px;">
 		<div style="font-size:14px;float:left;">北京玖琏科技有限公司 &nbsp;联系电话: 13201793090 </div>
         <div style="font-size:14px;float:right;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</div>
       </el-footer>
@@ -89,7 +89,15 @@ export default {
         height: 100%;
         position: absolute;
         z-index: 999;
-    }
+	}
+	.footers{
+		line-height: 30px;
+		position: absolute;
+		width: 100%;
+		bottom: 0;
+		background: #fff;
+		border-top: 1px #ebeef5 solid;
+	}
 </style>
 <style rel="stylesheet/scss" lang="scss">
 	.app_scrollbar_box{
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index 3769fb6a9..b26865016 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -3,7 +3,7 @@
     <div slot="header" style="text-align: center;">
       <span><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span>
     </div>
-    <div class="simulation-detail" :style="{ height: height-190 +'px' }">
+    <div class="simulation-detail" :style="{ height: height-230 +'px' }">
       <p class="list-item">
         <span class="list-label">{{ $t('demonstration.productDescription') }}</span>
         <span class="list-elem">{{ courseModel.remarks }}</span>
diff --git a/src/views/lesson/lessoncategory/edit/sorttree/index.vue b/src/views/lesson/lessoncategory/edit/sorttree/index.vue
index dc5a691f7..8e4b93b9c 100644
--- a/src/views/lesson/lessoncategory/edit/sorttree/index.vue
+++ b/src/views/lesson/lessoncategory/edit/sorttree/index.vue
@@ -90,7 +90,7 @@ export default {
 			}
 			 else if (draggingNode && draggingNode.data.type === 'Training') {
 				//  dropNode.data.type === 'Chapter' || 
-				 return dropNode && (dropNode.data.type === 'Training' && type !== 'inner' );
+				 return dropNode && (dropNode.data.type === 'Training' && type !== 'inner' && draggingNode.parent == dropNode.parent );
 			// 	return dropNode && draggingNode.parent == dropNode.parent && (
 			// 		dropNode.data.type === 'Training' && type !== 'Inner');
 			}
diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue
index 57c22a84a..4ee238dca 100644
--- a/src/views/planMonitor/detail.vue
+++ b/src/views/planMonitor/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card :style="{height: height+'px'}">
+  <el-card :style="{height: height+'px'}" style="overflow-y:scroll;padding-bottom:20px;">
 	<div class="runPlanHeader" style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
 		<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>