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
This commit is contained in:
zyy 2020-02-27 18:22:11 +08:00
commit 632a3275e4
3 changed files with 345 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
View File

@ -452,7 +452,6 @@ export default {
this.$refs.noticeInfo.doShow({}, ['所选的进路没有一个是自动的']); this.$refs.noticeInfo.doShow({}, ['所选的进路没有一个是自动的']);
return false; return false;
} }
debugger;
const step = { const step = {
start: true, start: true,
over:true, over:true,

42
src/jmapNew/theme/haerbin_01/menus/menuSignal.vue
View File

@ -109,45 +109,55 @@ export default {
} }
], ],
Center: [ Center: [
// {
// label: this.$t('menu.menuSignal.routeSelect'),
// handler: this.arrangementRoute,
// cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
// },
// {
// label: this.$t('menu.menuSignal.routeCancel'),
// handler: this.cancelTrainRoute,
// cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
// },
{ {
label: this.$t('menu.menuSignal.routeSelect'), label: '封锁信号',
handler: this.arrangementRoute,
cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
},
{
label: this.$t('menu.menuSignal.routeCancel'),
handler: this.cancelTrainRoute,
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
},
{
label: this.$t('menu.menuSignal.signalBlock'),
handler: this.lock, handler: this.lock,
cmdType: CMD.Signal.CMD_SIGNAL_BLOCK cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
}, },
{ {
label: this.$t('menu.menuSignal.signalDeblock'), label: '解封信号',
handler: this.unlock, handler: this.unlock,
cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
}, },
{ {
label: this.$t('menu.menuSignal.signalOff'), label: '关单信号',
handler: this.signalClose, handler: this.signalClose,
cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
}, },
{ {
label: this.$t('menu.menuSignal.signalReopen'), label: '重复开放',
handler: this.reopenSignal, handler: this.reopenSignal,
cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
}, },
{ {
label: this.$t('menu.menuSignal.humanControl'), label: '自排单关',
handler: this.humanControl, handler: this.humanControl,
cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
}, },
{ {
label: this.$t('menu.menuSignal.atsAutoControl'), label: '自排单开',
handler: this.atsAutoControl, handler: this.atsAutoControl,
cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
},
{
label: '追踪单开',
handler: this.setAutoTrigger,
cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
},
{
label: '追踪单关',
handler: this.cancelAutoTrigger,
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
} }
] ]
}, },

24
src/views/newMap/displayNew/demon/runPlanView.vue
View File

@ -16,10 +16,10 @@
<script> <script>
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { runDiagramGetTime } from '@/api/simulation';
import { getPublishMapInfo } from '@/api/jmap/map'; import { getPublishMapInfo } from '@/api/jmap/map';
import { timeFormat } from '@/utils/date'; import { timeFormat } from '@/utils/date';
import echarts from 'echarts'; import echarts from 'echarts';
import {toTimeStamp, formatDuring} from '@/utils/date';
// 运行图预览 // 运行图预览
export default { export default {
@ -236,17 +236,17 @@ export default {
let startValue = 3600 + this.PlanConvert.TranslationTime; let startValue = 3600 + this.PlanConvert.TranslationTime;
const offsetTime = 3600; const offsetTime = 3600;
// runDiagramGetTime(this.group).then(resp => { const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
// startValue = resp.data - this.PlanConvert.TranslationTime; startValue = initTime - this.PlanConvert.TranslationTime;
// this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime; this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
// this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime; this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
// this.option.series = series; this.option.series = series;
// this.myChart = echarts.init(document.getElementById(this.runPlanId)); this.myChart = echarts.init(document.getElementById(this.runPlanId));
// if (this.myChart) { if (this.myChart) {
// this.myChart.setOption(this.option); this.myChart.setOption(this.option);
// this.reSize({ width: document.documentElement.clientWidth, height: document.documentElement.clientHeight - 55 }); this.reSize({ width: document.documentElement.clientWidth -10, height: document.documentElement.clientHeight - 55 });
// } this.myChart.on('click', this.mouseClick);
// }); }
resolve(true); resolve(true);
} catch (error) { } catch (error) {
reject(error); reject(error);