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 2020-06-05 18:48:07 +08:00
parent 4d918cc6a7
commit 38b7580f79
4 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/iscs/constant/iscsData.js
View File

File diff suppressed because one or more lines are too long

32
src/jmapNew/theme/foshan_01/menus/dialog/standStopTime.vue
View File

@ -21,7 +21,7 @@
</div> </div>
<el-radio :id="control === '02'? '': domIdChoose1" label="02">全人工</el-radio> <el-radio :id="control === '02'? '': domIdChoose1" label="02">全人工</el-radio>
</el-radio-group> </el-radio-group>
<!-- <el-input-number <el-input-number
:id="domIdInput" :id="domIdInput"
v-model="time" v-model="time"
:disabled="disabledInput" :disabled="disabledInput"
@ -31,7 +31,7 @@
style="width: 130px; padding-left:30px;display: block; float: left; margin-top: 15px;" style="width: 130px; padding-left:30px;display: block; float: left; margin-top: 15px;"
@change="inputTime" @change="inputTime"
/> />
<div style="float: left;margin-top: 22px; margin-left: 5px;">秒</div> --> <div style="float: left;margin-top: 22px; margin-left: 5px;">秒</div>
</div> </div>
</div> </div>
<div style="padding: 10px 15px; border: 1px double lightgray; height: 60px;"> <div style="padding: 10px 15px; border: 1px double lightgray; height: 60px;">
@ -72,7 +72,7 @@ export default {
return { return {
dialogShow: false, dialogShow: false,
loading: false, loading: false,
// time: 0, time: 0,
control: '01', control: '01',
direction: '01', direction: '01',
effective: '0', effective: '0',
@ -143,7 +143,7 @@ export default {
} }
this.control = Number(tempDate.parkingTime) === -1 ? '01' : '02'; this.control = Number(tempDate.parkingTime) === -1 ? '01' : '02';
// this.time = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime); this.time = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime);
// this.effective = tempDate.parkingValidStatus ? true : false; // this.effective = tempDate.parkingValidStatus ? true : false;
this.effective = tempDate.parkingValidStatus ? '1' : '0'; this.effective = tempDate.parkingValidStatus ? '1' : '0';
this.direction = selected.direction; this.direction = selected.direction;
@ -187,18 +187,18 @@ export default {
} }
}); });
}, },
// inputTime() { inputTime() {
// const operate = { const operate = {
// repeat: true, repeat: true,
// operation: OperationEvent.StationStand.setStopTime.input.operation operation: OperationEvent.StationStand.setStopTime.input.operation
// }; };
// this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
// if (valid) { if (valid) {
// this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
// } }
// }); });
// }, },
commit() { commit() {
const operate = { const operate = {
send: true, send: true,
@ -206,7 +206,7 @@ export default {
cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME, cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
param: { param: {
parkingTime: this.control == '01' ? -1 : 1, parkingTime: this.control == '01' ? -1 : 1,
// runLevelTime: this.time, runLevelTime: this.time,
parkingAlwaysValid: this.effective == '1' parkingAlwaysValid: this.effective == '1'
} }
// messages: [`停站时间: ${this.stationName} - ${this.standName}, 停站时间为${this.control == '01' ? '自动' : this.time + '秒'}, 有效次数为${this.effective == false ? '一次有效' : '一直有效'}`] // messages: [`停站时间: ${this.stationName} - ${this.standName}, 停站时间为${this.control == '01' ? '自动' : this.time + '秒'}, 有效次数为${this.effective == false ? '一次有效' : '一直有效'}`]

7
src/jmapNew/theme/foshan_01/menus/dialog/switchUnLock.vue
View File

@ -29,7 +29,7 @@
<div>道岔</div> <div>道岔</div>
<el-col :span="11"> <el-col :span="11">
<el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange"> <el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
<el-option v-for="option in switchList" :key="option.code" :label="option.name" :value="option.name" /> <el-option v-for="option in switchList" :key="option.code" :label="option.name" :value="option.code" />
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="8" :offset="1"> <el-col :span="8" :offset="1">
@ -192,6 +192,10 @@ export default {
}); });
}, },
confirm2() { confirm2() {
if (this.selected.code != this.messageText2) {
this.$refs.noticeInfo.doShow({}, '请选择正确的道岔');
return false;
}
const operate = { const operate = {
operation: '', operation: '',
cmdType: '' cmdType: ''
@ -203,7 +207,6 @@ export default {
operate.operation = OperationEvent.Switch.unblock.confirm2.operation; operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK; operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK;
} }
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });

2
src/views/newMap/jointTrainingNew/chatView/chatBox.vue
View File

@ -79,7 +79,7 @@ export default {
}, },
data() { data() {
return { return {
minimize:false, minimize:true,
bottom:15, bottom:15,
recordSending:false, recordSending:false,
currentCoversition:{}, currentCoversition:{},