Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/views/newMap/displayNew/dispatherContest/sceneList.vue

@@ -135,12 +135,11 @@ export default {
                         title: res.data.name,
                         dangerouslyUseHTMLString: true,
                         message: `
-							<p><span style="color: #000;font-weight: bold;">场景描述：</span>${row.description}</p>
-							<p><span style="color: #000;font-weight: bold;">处置流程：</span>${row.disposalProcesses}</p>`,
+							<p><span style="color: #000;font-weight: bold;">场景描述：</span>${row.description}</p>`,
                         customClass: 'notify_box',
-                        position: 'top-left',
+                        // position: 'top-left',
                         showClose: false,
-                        offset: 120,
+                        offset: 75,
                         duration: 0
                     });
                     this.$store.commit('training/setNotifySelected', notifyData);
@@ -253,8 +252,8 @@ export default {
 .notify_box{
 	width: 300px;
 	white-space: inherit;
-	&.el-notification.left{
-		left: 5px;
+	&.el-notification.right{
+		right: 5px;
 		padding: 6px 0;
 	}
 }

src/views/newMap/displayNew/menuTrainList.vue

@@ -136,8 +136,8 @@ export default {
 .menuTrainListOut{
     position: absolute;
     right: 0;
-    top: 15%;
-    height: 70%;
+    top: 20%;
+    height: 60%;
 	transform: translateX(400px);
 	transition: all 0.4s;
 	&.active{

src/views/newMap/displayNew/scriptDisplay/component/scriptTip.vue

@@ -99,6 +99,7 @@ export default {
                 this.$notify({
                     title: this.$t('global.tips'),
                     duration: 3000,
+                    offset: 100,
                     message: h('i', { style: 'color:' + opt.color }, opt.message)
                 });
             }

src/views/newMap/jointTrainingNew/menuTrainList.vue

@@ -125,8 +125,8 @@ export default {
 .menuTrainListOut{
     position: absolute;
     right: 0;
-    top: 15%;
-    height: 70%;
+    top: 20%;
+    height: 60%;
 	transform: translateX(400px);
 	transition: all 0.4s;
 	&.active{