Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
This commit is contained in:
joylink_cuiweidong
commit
3af5629595
@ -272,6 +272,12 @@ export default {
|
||||
this.$store.dispatch('map/setPictureDeviceMap', {});
|
||||
},
|
||||
methods: {
|
||||
changeSignedStatus(info) {
|
||||
this.$refs.cmdManage.changeSignedStatus(info);
|
||||
},
|
||||
signedCmdClose() {
|
||||
this.$refs.cmdManage.doShow();
|
||||
},
|
||||
getRunplanInStationData() {
|
||||
getRunplanInStation(this.group).then(response => {
|
||||
// debugger;
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
</div>
|
||||
<div class="runplanMenuButton">
|
||||
<div class="runplanLine" />
|
||||
<div class="rpDispacherCommand runplanClickBtn">调度命令</div>
|
||||
<div class="rpDispacherCommand runplanClickBtn" :class="{flicker: hasCommandMsg, redFlick: hasCommandMsg}" @click="showCmdManage">调度命令</div>
|
||||
<div class="runplanBtnGroup">
|
||||
<div id="stageRunplan" class="runplanClickBtn" @click="stageRunplan">阶段计划(F8)</div>
|
||||
<div id="sendRunplan" class="runplanClickBtn" @click="sendRunplan">发送计划</div>
|
||||
@ -563,6 +563,8 @@
|
||||
<modify-trip-number ref="modifyTripNumber" @clearRpRow="clearRpRow" @noticeInfo="noticeInfo" />
|
||||
<train-runplan ref="trainRunplan" @clearRpRow="clearRpRow" @noticeInfo="noticeInfo" />
|
||||
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
|
||||
<cmdManage ref="cmdManage" />
|
||||
<signedCmd ref="signedCmd" @signedCmdClose="signedCmdClose" @changeSignedStatus="changeSignedStatus" />
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@ -590,8 +592,10 @@ import ModifyTripNumber from './dialog/modifyTripNumber';
|
||||
import TrainRunplan from './dialog/trainRunplan';
|
||||
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
|
||||
import { copyAssign } from '@/utils/index';
|
||||
import { mapGetters } from 'vuex';
|
||||
import { mapGetters, mapState } from 'vuex';
|
||||
import { transfiniteList } from '@/scripts/ConstDic';
|
||||
import cmdManage from '@/views/dispatcherStationManage/cmdManage.vue';
|
||||
import signedCmd from '@/views/dispatcherStationManage/signedCmd.vue';
|
||||
export default {
|
||||
name:'RunplanPane',
|
||||
components: {
|
||||
@ -601,6 +605,8 @@ export default {
|
||||
ModifyAdjacentStation,
|
||||
ModifyTripNumber,
|
||||
TrainRunplan,
|
||||
cmdManage,
|
||||
signedCmd,
|
||||
NoticeInfo
|
||||
},
|
||||
data() {
|
||||
@ -642,6 +648,16 @@ export default {
|
||||
...mapGetters('map', [
|
||||
'sectionList'
|
||||
]),
|
||||
...mapState('socket', [
|
||||
'dispatchCommandMsg'
|
||||
]),
|
||||
hasCommandMsg() {
|
||||
let status = false;
|
||||
if (this.dispatchCommandMsg.body) {
|
||||
status = true;
|
||||
}
|
||||
return status;
|
||||
},
|
||||
mapStationDirectionData() {
|
||||
return this.$store.state.map.mapStationDirectionData;
|
||||
}
|
||||
@ -676,6 +692,19 @@ export default {
|
||||
}
|
||||
},
|
||||
methods:{
|
||||
changeSignedStatus(info) {
|
||||
this.$refs.cmdManage.changeSignedStatus(info);
|
||||
},
|
||||
signedCmdClose() {
|
||||
this.$refs.cmdManage.doShow();
|
||||
},
|
||||
showCmdManage() {
|
||||
if (this.hasCommandMsg) {
|
||||
this.$refs.signedCmd.doShow();
|
||||
} else {
|
||||
this.$refs.cmdManage.doShow();
|
||||
}
|
||||
},
|
||||
initDate(date) {
|
||||
this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`;
|
||||
const years = date.getFullYear() + '';
|
||||
@ -1214,6 +1243,23 @@ export default {
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.redFlick {
|
||||
background: red !important;
|
||||
}
|
||||
@keyframes fade {
|
||||
from {
|
||||
opacity: 1.0;
|
||||
}
|
||||
50% {
|
||||
opacity: 0.2;
|
||||
}
|
||||
to {
|
||||
opacity: 1.0;
|
||||
}
|
||||
}
|
||||
.flicker {
|
||||
animation: fade 600ms infinite;
|
||||
}
|
||||
.runplanPane{
|
||||
width: 100%;
|
||||
height: calc(100% - 34px);
|
||||
|
||||
@ -308,7 +308,7 @@ export default {
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.redFlick {
|
||||
background: red;
|
||||
background: red !important;
|
||||
}
|
||||
@keyframes fade {
|
||||
from {
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
</div>
|
||||
<div class="runplanMenuButton">
|
||||
<div class="runplanLine" />
|
||||
<div class="rpDispacherCommand runplanClickBtn">调度命令</div>
|
||||
<div class="rpDispacherCommand runplanClickBtn" :class="{flicker: hasCommandMsg, redFlick: hasCommandMsg}" @click="showCmdManage">调度命令</div>
|
||||
<div class="runplanBtnGroup">
|
||||
<div id="stageRunplan" class="runplanClickBtn" @click="stageRunplan">阶段计划(F8)</div>
|
||||
<div id="sendRunplan" class="runplanClickBtn" @click="sendRunplan">发送计划</div>
|
||||
@ -489,6 +489,8 @@
|
||||
<delete-runplan ref="deleteRunplan" @clearRpRow="clearRpRow" @noticeInfo="noticeInfo" />
|
||||
<modify-trip-number ref="modifyTripNumber" @clearRpRow="clearRpRow" @noticeInfo="noticeInfo" />
|
||||
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
|
||||
<cmdManage ref="cmdManage" />
|
||||
<signedCmd ref="signedCmd" @signedCmdClose="signedCmdClose" @changeSignedStatus="changeSignedStatus" />
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@ -512,7 +514,9 @@ import ModifyAdjacentStation from './dialog/modifyAdjacentStation';
|
||||
import ModifyTripNumber from './dialog/modifyTripNumber';
|
||||
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
|
||||
import { copyAssign } from '@/utils/index';
|
||||
import { mapGetters } from 'vuex';
|
||||
import { mapGetters, mapState } from 'vuex';
|
||||
import cmdManage from '@/views/dispatcherStationManage/cmdManage.vue';
|
||||
import signedCmd from '@/views/dispatcherStationManage/signedCmd.vue';
|
||||
export default {
|
||||
name:'RunplanPane',
|
||||
components: {
|
||||
@ -521,7 +525,9 @@ export default {
|
||||
DeleteRunplan,
|
||||
ModifyAdjacentStation,
|
||||
ModifyTripNumber,
|
||||
NoticeInfo
|
||||
NoticeInfo,
|
||||
cmdManage,
|
||||
signedCmd
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@ -552,7 +558,17 @@ export default {
|
||||
computed: {
|
||||
...mapGetters('map', [
|
||||
'sectionList'
|
||||
])
|
||||
]),
|
||||
...mapState('socket', [
|
||||
'dispatchCommandMsg'
|
||||
]),
|
||||
hasCommandMsg() {
|
||||
let status = false;
|
||||
if (this.dispatchCommandMsg.body) {
|
||||
status = true;
|
||||
}
|
||||
return status;
|
||||
}
|
||||
},
|
||||
watch:{
|
||||
'$store.state.socket.railCtcRunplanChange': function (val) {
|
||||
@ -565,6 +581,19 @@ export default {
|
||||
// railwaySimulationRunplanSendChange
|
||||
},
|
||||
methods:{
|
||||
changeSignedStatus(info) {
|
||||
this.$refs.cmdManage.changeSignedStatus(info);
|
||||
},
|
||||
signedCmdClose() {
|
||||
this.$refs.cmdManage.doShow();
|
||||
},
|
||||
showCmdManage() {
|
||||
if (this.hasCommandMsg) {
|
||||
this.$refs.signedCmd.doShow();
|
||||
} else {
|
||||
this.$refs.cmdManage.doShow();
|
||||
}
|
||||
},
|
||||
getRailwaySimulationRunplanSend() {
|
||||
const stationCode = this.$store.state.training.roleDeviceCode;
|
||||
const railwaySimulationRunplanSendMap = this.$store.state.socket.railwaySimulationRunplanSendMap;
|
||||
@ -814,6 +843,24 @@ export default {
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.redFlick {
|
||||
background: red !important;
|
||||
}
|
||||
@keyframes fade {
|
||||
from {
|
||||
opacity: 1.0;
|
||||
}
|
||||
50% {
|
||||
opacity: 0.2;
|
||||
}
|
||||
to {
|
||||
opacity: 1.0;
|
||||
}
|
||||
}
|
||||
.flicker {
|
||||
animation: fade 600ms infinite;
|
||||
}
|
||||
|
||||
.runplanPane{
|
||||
width: 100%;
|
||||
height: calc(100% - 34px);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user