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

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

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-09-02 09:46:46 +08:00
commit 4c6ab4f046
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/shape/Section/index.js
View File

@ -160,7 +160,6 @@ export default class Section extends Group {
});
this.add(this.name);
model.nameShow && style.Section.logicText.show ? this.name.show() : this.name.hide();
console.log(model.nameShow, style.Section.logicText.show);
} else if (model.type == '04') { // 道岔计轴区段
this.name = new ETextName({
zlevel: this.zlevel,

15
src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
View File

@ -23,22 +23,25 @@
</el-col>
<el-col :span="15">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="设置进路" name="first">用户管理</el-tab-pane>
<el-tab-pane label="取消进路" name="second">配置管理</el-tab-pane>
<el-tab-pane label="禁止进路" name="third">角色管理</el-tab-pane>
<el-tab-pane label="设置进路" name="first">设置进路</el-tab-pane>
<el-tab-pane label="取消进路" name="second">取消进路</el-tab-pane>
<el-tab-pane label="禁止进路" name="third">禁止进路</el-tab-pane>
</el-tabs>
</el-col>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="6" :offset="2">
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定(O)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">应用(A)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
</el-dialog>

3
src/views/newMap/jlmapNew/index.vue
View File

@ -355,7 +355,7 @@ export default {
async simulationReset() {
await this.$store.dispatch('map/clearJlmapTrainView');
await this.$store.dispatch('map/setTrainWindowShow', false);
// await this.$store.dispatch('training/over');
await this.$store.dispatch('map/resetActiveTrainList');
await this.$store.dispatch('socket/setSimulationReset'); // 清空
await this.$store.dispatch('socket/setSimulationStart');
await this.$store.dispatch('training/setMapDefaultState');
@ -392,7 +392,6 @@ export default {
},
// 设置地图加载状态
mapViewLoaded(loading) {
// console.log(loading, '**************');
this.loading = loading;
if (loading) {
this.$refs.progressBar && this.$refs.progressBar.start();