joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yuan 2023-05-06 18:03:37 +08:00
commit 1318ecb97a
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/newMap/display/errrorMessageBox.vue
View File

@ -206,7 +206,9 @@ export default {
if (index !== undefined) { if (index !== undefined) {
this.alarmDetailMessageList.splice(0, index + 1); 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> </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> <style lang="scss" scoped>
.alarm-button{ .alarm-button{
position: absolute; position: absolute;
@ -394,7 +406,7 @@ export default {
z-index: 1508 !important; z-index: 1508 !important;
} }
.item8 { .item8 {
top:400; top:400px;
z-index: 1509 !important; z-index: 1509 !important;
} }
.item9 { .item9 {

2
src/views/newMap/display/index.vue
View File

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