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

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

Browse Source 
# Conflicts:
#	src/views/iscs/iscsSystem/config/pis/mainScreen.vue
This commit is contained in:
zyy 2020-01-20 14:05:09 +08:00
commit 9ea26b8f4f
4 changed files with 83 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/iscs/iscsSystem/config/broadcast/homeScreen.vue
View File

@ -13,14 +13,17 @@
<div class="broadcast-form">
<div v-for="item in verticalHeader">
<el-row>
<el-col><div>{{ item.name }}</div></el-col>
<el-col :span="4"><div style="text-align: left; padding-left: 10px ">{{ item.name }}</div></el-col>
<div v-for="it in stationList">
<div v-if="item.type===header">
<div>{{ it }}</div>
</div>
<div v-else>
<div />
</div>
<el-col :span="2">
<div v-if="item.type==='header'">
<div>{{ it }}</div>
</div>
<div v-else>
<div style="margin:0 auto;height: 10px;width: 10px;background: #FBFBFB" />
</div>
</el-col>
</div>
</el-row>
</div>

3
src/views/iscs/iscsSystem/config/index.vue
View File

@ -86,6 +86,9 @@ export default {
'$route': function(val) {
this.mode = this.$route.params.mode;
}
},
mounted() {
this.mode = this.$route.params.mode;
}
};
</script>

59
src/views/iscs/iscsSystem/config/pis/mainScreen.vue
View File

@ -1,6 +1,45 @@
<template>
<div>
主画面
<div class="main_screen_header">乘客信息</div>
<div class="main_screen_content">
<div class="screen_left">
<div class="screen_left_tab" />
<div class="sceen_left_content" />
</div>
<div class="screen_right">
<div id="screen_right_group">
<div class="each_operate">
<div class="each_operate_text">操作</div>
<div class="each_operate_button">信息发布窗口</div>
</div>
<div class="each_operate">
<div class="each_operate_text">信息清楚</div>
<div class="each_operate_button">清除普通信息</div>
</div>
</div>
</div>
</div>
<div class="main_screen_footer">
<textarea id="screen_footer_text" name="" cols="30" rows="10" />
<div class="footer_button_group">
<div class="each_footer_button">
<div class="each_footer_button_icon" />
<div class="each_footer_button_text">正常</div>
</div>
<div class="each_footer_button">
<div class="each_footer_button_icon" />
<div class="each_footer_button_text">故障</div>
</div>
<div class="each_footer_button">
<div class="each_footer_button_icon" />
<div class="each_footer_button_text">通信故障</div>
</div>
<div class="each_footer_button">
<div class="each_footer_button_icon" />
<div class="each_footer_button_text">选定</div>
</div>
</div>
</div>
</div>
</template>
<script>
@ -8,3 +47,21 @@ export default {
};
</script>
<style lang="scss" scoped>
.main_screen_header{}
.main_screen_content{}
.screen_left{}
.screen_left_tab{}
.sceen_left_content{}
.screen_right{}
#screen_right_group{}
.each_operate{}
.each_operate_text{}
.each_operate_button{}
.footer_button_group{}
.main_screen_footer{}
#screen_footer_text{}
.each_footer_button{}
.each_footer_button_icon{}
.each_footer_button_text{}
</style>

12
src/views/iscs/iscsSystem/nav.vue
View File

@ -244,6 +244,18 @@ export default {
]
};
},
mounted() {
this.navList.forEach((nav, navIndex)=>{
if (nav.children && nav.children.length > 0) {
nav.children.forEach((child, childIndex)=>{
if (child.type && child.type === this.$route.params.mode) {
this.selectIndex = navIndex;
this.selectChildIndex = childIndex;
}
});
}
});
},
methods: {
show(item) {
let flag = false;