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

发送发车预告 同意发车预告 指令添加

Browse Source
This commit is contained in:
joylink_cuiweidong 2022-06-15 09:57:48 +08:00
parent e2ccfa8ca4
commit 9e917f09eb
8 changed files with 86 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jmapNew/theme/components/utils/menuOperate.js
View File

@ -553,6 +553,16 @@ export const menuOperate = {
modifyTripNumber:{
operation: OperationEvent.CTCCommand.modifyTripNumber.menu.operation,
cmdType: CMD.CTC.CTC_MODIFY_TRIP_NUMBER
},
// 发送发车预告
sendNotcie:{
operation: OperationEvent.CTCCommand.sendNotcie.menu.operation,
cmdType: CMD.CTC.CTC_SEND_NOTICE
},
// 同意发车预告
agreeNotcie:{
operation: OperationEvent.CTCCommand.agreeNotcie.menu.operation,
cmdType: CMD.CTC.CTC_AGREE_NOTICE
}
}

7
src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue
View File

@ -21,18 +21,13 @@
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
</el-dialog>
</template>
<script>
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {
name: 'DeleteRunplan',
components: {
NoticeInfo
},
data() {
return {
dialogShow: false,
@ -84,7 +79,7 @@ export default {
this.loading = false;
this.$emit('clearRpRow');
this.doClose();
this.$refs.noticeInfo.doShow();
this.$emit('noticeInfo');
});
},
cancel() {

7
src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue
View File

@ -54,19 +54,14 @@
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
</el-dialog>
</template>
<script>
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {
name: 'ModifyAdjacentStation',
components: {
NoticeInfo
},
data() {
return {
dialogShow: false,
@ -126,7 +121,7 @@ export default {
this.loading = false;
this.$emit('clearRpRow');
this.doClose();
this.$refs.noticeInfo.doShow();
this.$emit('noticeInfo');
});
},
cancel() {

7
src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue
View File

@ -65,19 +65,14 @@
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
</el-dialog>
</template>
<script>
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {
name: 'ModifyTripNumber',
components: {
NoticeInfo
},
data() {
return {
dialogShow: false,
@ -144,7 +139,7 @@ export default {
this.loading = false;
this.$emit('clearRpRow');
this.doClose();
this.$refs.noticeInfo.doShow();
this.$emit('noticeInfo');
});
},
cancel() {

2
src/jmapNew/theme/datie_02/menus/dialog/sendRunplan.vue
View File

@ -212,7 +212,7 @@ export default {
}).catch(() => {
this.loading = false;
this.doClose();
// this.$refs.noticeInfo.doShow();
this.$emit('noticeInfo');
});
}

59
src/jmapNew/theme/datie_02/menus/runplanPane.vue
View File

@ -58,8 +58,8 @@
<div class="runplanContentL">
<div class="runplanVLine" />
<div class="runplanContentLIn">
<div class="runplanContentBtn">预告(F1)</div>
<div class="runplanContentBtn">同意(F2)</div>
<div class="runplanContentBtn" @click="sendNotcie">预告(F1)</div>
<div class="runplanContentBtn" @click="agreeNotcie">同意(F2)</div>
<div class="runplanContentBtn">到达(F3)</div>
<div class="runplanContentBtn">出发(F4)</div>
<div class="runplanContentBtn">通过(F11)</div>
@ -465,10 +465,11 @@
</div>
</div>
<send-runplan ref="sendRunplan" @closeFlash="closeFlash" />
<modify-adjacent-station ref="modifyAdjacentStation" @clearRpRow="clearRpRow" />
<delete-runplan ref="deleteRunplan" @clearRpRow="clearRpRow" />
<modify-trip-number ref="modifyTripNumber" @clearRpRow="clearRpRow" />
<send-runplan ref="sendRunplan" @closeFlash="closeFlash" @noticeInfo="noticeInfo" />
<modify-adjacent-station ref="modifyAdjacentStation" @clearRpRow="clearRpRow" @noticeInfo="noticeInfo" />
<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" />
</div>
</template>
<script>
@ -484,10 +485,12 @@ import Rpsa from '@/assets/ctc_icon/rpsa.png';
import Rpb from '@/assets/ctc_icon/rpb.png';
import Rpwp from '@/assets/ctc_icon/rpwp.png';
import Rph from '@/assets/ctc_icon/rph.png';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import SendRunplan from './dialog/sendRunplan';
import DeleteRunplan from './dialog/deleteRunplan';
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';
export default {
@ -496,7 +499,8 @@ export default {
SendRunplan,
DeleteRunplan,
ModifyAdjacentStation,
ModifyTripNumber
ModifyTripNumber,
NoticeInfo
},
data() {
return {
@ -668,6 +672,46 @@ export default {
event.stopPropagation();
this.rpMenuPopShow = false;
this.$refs.deleteRunplan.doShow(this.currentRow);
},
// 发送发车预告
sendNotcie() {
if (this.currentRow) {
this.loading = true;
commitOperate(menuOperate.CTC.sendNotcie, {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code}, 2).then(({valid})=>{
this.loading = false;
this.clearRpRow();
if (valid) {
this.doClose();
}
}).catch(() => {
this.loading = false;
this.clearRpRow();
this.doClose();
this.noticeInfo();
});
}
},
// 同意发车预告
agreeNotcie() {
if (this.currentRow) {
commitOperate(menuOperate.CTC.agreeNotcie, {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code}, 2).then(({valid})=>{
this.loading = false;
this.clearRpRow();
if (valid) {
this.doClose();
}
}).catch(() => {
this.loading = false;
this.clearRpRow();
this.doClose();
this.noticeInfo();
});
}
},
noticeInfo() {
this.$refs.noticeInfo.doShow();
}
}
@ -819,6 +863,7 @@ export default {
text-align: center;
padding: 9px 0px;
border-bottom: 1px #ccc solid;
cursor: pointer;
}
.rpDispacherCommand{margin-left: 10px;}
.runplanClickBtn{

7
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -392,6 +392,11 @@ export default {
CTC_BATCH_MODIFY_RUN_PLAN:{value: 'CTC_BATCH_MODIFY_RUN_PLAN', label: '批量修改股道'},
CTC_REMOVE_RUN_PLAN:{value: 'CTC_REMOVE_RUN_PLAN', label: '移除行车日志'},
CTC_MODIFY_ADJACENT_STATION:{value: 'CTC_MODIFY_ADJACENT_STATION', label: '修改邻站信息'},
CTC_MODIFY_TRIP_NUMBER:{value: 'CTC_MODIFY_TRIP_NUMBER', label: '修改车次号(大铁CTC)'}
CTC_MODIFY_TRIP_NUMBER:{value: 'CTC_MODIFY_TRIP_NUMBER', label: '修改车次号(大铁CTC)'},
CTC_SEND_NOTICE:{value: 'CTC_SEND_NOTICE', label: '发送发车预告'},
CTC_AGREE_NOTICE:{value: 'CTC_AGREE_NOTICE', label: '同意发车预告'}
// 参数：
// stationCode 车站编码
// runPlanCode 运行编码
}
};

14
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -3694,6 +3694,20 @@ export const OperationEvent = {
operation: '1114',
domId: '_Tips-CTC-modifyTripNumber-Menu{TOP}'
}
},
// 发送发车预告
sendNotcie:{
menu: {
operation: '1115',
domId: '_Tips-CTC-sendNotcie-Menu{TOP}'
}
},
// 同意发车预告
agreeNotcie:{
menu: {
operation: '1116',
domId: '_Tips-CTC-agreeNotcie-Menu{TOP}'
}
}
}