Merge remote-tracking branch 'origin/master'
# Conflicts: # src/jmapNew/config/skinCode/datie_02.js # src/jmapNew/theme/datie_02/menus/menuButton.vue # src/jmapNew/theme/datie_02/menus/menuTrain.vue
This commit is contained in:
commit
b05cedd44c
@ -437,9 +437,7 @@ class SkinCode extends defaultStyle {
|
||||
selfDiscipline: {
|
||||
show: true,
|
||||
offset: { x: 0, y: 0 },
|
||||
text: '允许自律',
|
||||
defaultColor: '#7F7F7F',
|
||||
lightColor: '#ff0',
|
||||
text: '允许自律'
|
||||
},
|
||||
selfDisciplineControl: {
|
||||
show: true,
|
||||
@ -788,18 +786,16 @@ class SkinCode extends defaultStyle {
|
||||
trainBody: {
|
||||
fontFamily: 'consolas',
|
||||
trainBodyLineWidth: 1, // 车身line宽
|
||||
changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
|
||||
changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
|
||||
specialTrainType: [
|
||||
{
|
||||
type: '03',
|
||||
serviceNumber: '---',
|
||||
// nameFormat: 'groupNumber:serviceNumber'
|
||||
nameFormat:'tripNumber'
|
||||
nameFormat: 'groupNumber:serviceNumber'
|
||||
},
|
||||
{
|
||||
type: '03',
|
||||
// nameFormat: 'serviceNumber:trainNumber'
|
||||
nameFormat:'tripNumber'
|
||||
nameFormat: 'serviceNumber:trainNumber'
|
||||
}
|
||||
], // 特殊列车类型需设置显示格式
|
||||
lrPadding: 4, // 两边间隔
|
||||
@ -807,8 +803,7 @@ class SkinCode extends defaultStyle {
|
||||
trainBodyFillColor: '#88DF8E', // 列车车身填充颜色
|
||||
trainSidelineColor: '#F00',
|
||||
trainSidelineStopColor: '#000',
|
||||
// trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
|
||||
trainNameFormat:'tripNumber'
|
||||
trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
|
||||
},
|
||||
directionArrow: {
|
||||
},
|
||||
@ -843,9 +838,8 @@ class SkinCode extends defaultStyle {
|
||||
trainServerOffset: { x: 4, y: 4} // 列车服务号偏移
|
||||
},
|
||||
trainTarget: {
|
||||
tripNumberPrefix: '', // 车次号前缀
|
||||
// defaultTripNumber: 'DDD', // 默认车次号2
|
||||
defaultTripNumber: ' ', // 默认车次号
|
||||
tripNumberPrefix: '000', // 车次号前缀
|
||||
defaultTripNumber: 'DDD', // 默认车次号2
|
||||
trainTargetOffset: { x: 36, y: 4}, // 列车车次号偏移
|
||||
trainTargetTextAlign: 'right' // 车次号文字显示位置
|
||||
},
|
||||
@ -896,15 +890,15 @@ class SkinCode extends defaultStyle {
|
||||
directionType: [
|
||||
{
|
||||
type: 1,
|
||||
lineLShow: false,
|
||||
lineRShow: false,
|
||||
lineLShow: true,
|
||||
lineRShow: true,
|
||||
arrowLShow: false,
|
||||
arrowRShow: true
|
||||
},
|
||||
{
|
||||
type: 0,
|
||||
lineLShow: false,
|
||||
lineRShow: false,
|
||||
lineLShow: true,
|
||||
lineRShow: true,
|
||||
arrowLShow: true,
|
||||
arrowRShow: false
|
||||
}
|
||||
|
||||
@ -86,9 +86,9 @@
|
||||
<center><b>S引导总锁</b></center>
|
||||
</span>
|
||||
</button>
|
||||
<button :id="Station.powerUnLock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="powerOnUnlock()">
|
||||
<button :id="Command.cancel.clearMbm.domId" :disabled="true" class="button_box" style="cursor: not-allowed;" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Command.cancel.clearMbm.operation)">
|
||||
<!--<span style="color: #800000">-->
|
||||
<span style="color:black">
|
||||
<span style="color: #808080">
|
||||
<center><b>上电解锁</b></center>
|
||||
</span>
|
||||
</button>
|
||||
@ -98,9 +98,9 @@
|
||||
<center><b>辅助菜单</b></center>
|
||||
</span>
|
||||
</button>
|
||||
<button :id="Section.defectiveShunting.button.domId" class="button_box" :style="{width: width+'px',backgroundColor:buttonUpColor}" @click="buttonDown(Section.defectiveShunting.button.operation, ['Section'])">
|
||||
<button :disabled="true" style="cursor: not-allowed;" class="button_box" :style="{width: width+'px',backgroundColor:buttonUpColor}" @click="buttonDown()">
|
||||
<!--<span style="color: #800000">-->
|
||||
<span style="color: black">
|
||||
<span style="color: #808080">
|
||||
<center><b>分路不良</b></center>
|
||||
</span>
|
||||
</button>
|
||||
@ -117,7 +117,6 @@
|
||||
<!--</button>-->
|
||||
<password-box ref="password" @checkOver="passWordCommit" @checkCancel="clearOperate" />
|
||||
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
|
||||
<defective-shunting ref="defectiveShunting" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -126,7 +125,6 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
|
||||
import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
|
||||
import Handler from '@/scripts/cmdPlugin/Handler';
|
||||
import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
|
||||
import DefectiveShunting from './dialog/defectiveShunting.vue';
|
||||
import CMD from '@/scripts/cmdPlugin/CommandEnum';
|
||||
import { mapGetters } from 'vuex';
|
||||
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
|
||||
@ -137,7 +135,6 @@ export default {
|
||||
name: 'MapButtonMenu',
|
||||
components: {
|
||||
PasswordBox,
|
||||
DefectiveShunting,
|
||||
NoticeInfo
|
||||
},
|
||||
props: {
|
||||
@ -279,7 +276,7 @@ export default {
|
||||
const station = this.$store.getters['map/getDeviceByCode'](val);
|
||||
this.$store.getters['map/checkStationGuideMaster'](station.code, station.sGuideMasterLock, station.xGuideMasterLock);
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
beforeDestroy() {
|
||||
this.routeDataMap = null;
|
||||
@ -329,7 +326,6 @@ export default {
|
||||
if (dom) {
|
||||
dom.disabled = false;
|
||||
dom.style.backgroundColor = this.buttonUpColor;
|
||||
this.$refs.password.doClose();
|
||||
}
|
||||
}
|
||||
if (val) {
|
||||
@ -342,33 +338,6 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
// 上电解锁 大铁线路
|
||||
powerOnUnlock() {
|
||||
const operate = {
|
||||
over:true,
|
||||
operation:this.Station.powerUnLock.button.operation,
|
||||
cmdType:CMD.Station.CMD_STATION_POWER_ON_UNLOCK,
|
||||
code:this.$store.state.map.showCentralizedStationCode,
|
||||
param:{stationCode: this.$store.state.map.showCentralizedStationCode}
|
||||
};
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.clearOperate();
|
||||
} else {
|
||||
this.$refs.noticeInfo.doShow();
|
||||
}
|
||||
}).catch((error) => {
|
||||
console.error(error);
|
||||
this.$refs.noticeInfo.doShow();
|
||||
});
|
||||
},
|
||||
// 分路不良
|
||||
handelDefectiveShunting(model) {
|
||||
// CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING;
|
||||
const {switchSection, code, shuntingTypeList} = model;
|
||||
this.clearOperate();
|
||||
this.$refs.defectiveShunting.doShow({switchSection, code, shuntingTypeList});
|
||||
},
|
||||
// S引导总锁按钮点击
|
||||
guideLockLeftButtonDown() {
|
||||
const operate = {
|
||||
@ -408,7 +377,7 @@ export default {
|
||||
operation: operation
|
||||
};
|
||||
// 以下 会弹出密码框 （总人解，区故解） 铅封按钮
|
||||
const operationList = [this.Signal.humanTrainRoute.button.operation, this.Section.fault.button.operation, this.Section.defectiveShunting.button.operation];
|
||||
const operationList = [this.Signal.humanTrainRoute.button.operation, this.Section.fault.button.operation];
|
||||
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
|
||||
if (valid) {
|
||||
this.operation = operation;
|
||||
@ -685,8 +654,6 @@ export default {
|
||||
this.handelSignalBlockOrUnblock(model);
|
||||
} else if (buttonOperation === this.Section.fault.button.operation) {
|
||||
this.handelFaultSection(model);
|
||||
} else if (buttonOperation === this.Section.defectiveShunting.button.operation) {
|
||||
this.handelDefectiveShunting(model);
|
||||
} else {
|
||||
this.clearOperate();
|
||||
}
|
||||
|
||||
@ -179,10 +179,6 @@ export default {
|
||||
{
|
||||
label: '换端',
|
||||
handler: this.handleTurnDirection
|
||||
},
|
||||
{
|
||||
label: '发车',
|
||||
handler: this.handleDepartTrain
|
||||
}
|
||||
],
|
||||
menuSpeed: [
|
||||
@ -563,19 +559,6 @@ export default {
|
||||
this.$refs.noticeInfo.doShow();
|
||||
});
|
||||
},
|
||||
handleDepartTrain() {
|
||||
const group = this.$route.query.group;
|
||||
const param = {
|
||||
commandType: 'Depart_Train',
|
||||
targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
|
||||
params: {}
|
||||
};
|
||||
commitTrainSend(group, param).then(({valid, operate}) => {
|
||||
}).catch((error)=> {
|
||||
console.error(error);
|
||||
this.$refs.noticeInfo.doShow();
|
||||
});
|
||||
},
|
||||
undeveloped() {
|
||||
this.doClose();
|
||||
this.$alert('实现中......', '提示', {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user