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

src/views/newMap/display/errrorMessageBox.vue

@@ -206,7 +206,9 @@ export default {
                 if (index !== undefined) {
                     this.alarmDetailMessageList.splice(0, index + 1);
                 }
-                this.showAlarmPlayAlarmMusic();
+                if (newValue[0].handleMethod === 'NCC' && this.$store.getters['map/getDeviceByCode'](this.alarmDetailMessageList[0].deviceCode) !== undefined) {
+                    this.showAlarmPlayAlarmMusic();
+                }
             }
         }
     },
@@ -292,7 +294,17 @@ export default {
     }
 };
 </script>
-
+<style lang='scss'>
+.yellow{
+	pointer-events: none !important;
+	.el-dialog {
+			.el-dialog__header,
+			.el-dialog__body {
+					pointer-events: all !important;
+			}
+	}
+}
+</style>
 <style lang="scss" scoped>
 .alarm-button{
 	position: absolute;
@@ -394,7 +406,7 @@ export default {
    z-index: 1508 !important;
 }
 .item8 {
-   top:400;
+   top:400px;
    z-index: 1509 !important;
 }
 .item9 {

src/views/newMap/display/index.vue

@@ -13,7 +13,7 @@
     <training-left-slider ref="trainingLeftSlider" @overallTranslation="overallTranslation" />
     <lineBoard ref="lineBoard" />
     <bottomTable ref="bottomTable" />
-    <errrorMessageBoxVue />
+    <errrorMessageBoxVue v-if="this.$store.state.training.roles === 'NCC_DISPATCHER'" />
   </div>
 </template>
 <script>