参数调整
This commit is contained in:
fan
parent
e3fb06591c
commit
7cf546efe6
@ -35,7 +35,7 @@ class Signal extends Group {
|
||||
create() {
|
||||
const model = this.model;
|
||||
const style = this.style;
|
||||
const drict = this.model.isRight ? 1 : -1; // 朝向 左:右
|
||||
const drict = this.model.right ? 1 : -1; // 朝向 左:右
|
||||
const posit = this.model.positionType == '01' ? -1 : 1; // 位置 上:下
|
||||
|
||||
// 信号机高柱矮柱
|
||||
@ -70,7 +70,7 @@ class Signal extends Group {
|
||||
// 信号机名称
|
||||
const sigNameX = model.position.x - drict * (style.Signal.post.standardWidth) + model.namePosition.x;
|
||||
const sigNameY = model.position.y + posit * (style.Signal.distance + style.Section.line.width + style.Signal.lamp.radiusR * 2 + model.namePosition.y + style.Signal.text.distance);
|
||||
const textAlign = style.Signal.text.isAlignCenter ? 'middle' : this.model.isRight ? 'left' : 'right';
|
||||
const textAlign = style.Signal.text.isAlignCenter ? 'middle' : this.model.right ? 'left' : 'right';
|
||||
const textVerticalAlign = posit == 1 ? 'top' : 'bottom';
|
||||
this.sigName = new ESigName({
|
||||
zlevel: this.zlevel,
|
||||
@ -499,7 +499,7 @@ class Signal extends Group {
|
||||
|
||||
getShapeTipPoint(opts) {
|
||||
var rect = new BoundingRect(0, 0, 0, 0);
|
||||
var drict = this.model.isRight ? 1 : -1; // 朝向 右:左
|
||||
var drict = this.model.right ? 1 : -1; // 朝向 右:左
|
||||
var offsetY = this.model.positionType == '01' ? this.style.Signal.text.fontSize : 0; // 位置 上:下
|
||||
if (opts.val == '1' || opts.val == '2') {
|
||||
rect = this.sigButton.getBoundingRect();
|
||||
|
||||
@ -94,7 +94,7 @@ export default class Station extends Group {
|
||||
createTurnBack() { // 创建按图折返
|
||||
const model = this.model;
|
||||
const style = this.style;
|
||||
if (model.visible && model.isCreateTurnBack) {
|
||||
if (model.visible && model.createTurnBack) {
|
||||
this.turnBacks = [];
|
||||
for (let index = 0; index < style.Station.turnBack.lamp; index++) {
|
||||
const turnBack = new EControl({
|
||||
@ -133,7 +133,7 @@ export default class Station extends Group {
|
||||
// 创建控制模式
|
||||
createControlMode() {
|
||||
const model = this.model;
|
||||
if (model.visible && model.isCreateControlMode) {
|
||||
if (model.visible && model.createControlMode) {
|
||||
// 紧急站控
|
||||
if (this.style.Station.StationControl.lamp.emergencyControlShow) {
|
||||
this.emergencyControl = new ESingleControl({
|
||||
|
||||
@ -309,16 +309,7 @@ export default class Train extends Group {
|
||||
setState(model) {
|
||||
this.model = model;
|
||||
// let points = [];
|
||||
const flag = false;
|
||||
// if (this.model.sectionModel && this.model.sectionModel.points) {
|
||||
// points = this.model.sectionModel.points;
|
||||
// if (points.length) {
|
||||
// const pointFlag = points[0].x - points[points.length - 1].x;
|
||||
// if (pointFlag > 0) {
|
||||
// flag = true; // 方向去反
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
const flag = model.trainWindowModel.reversal;
|
||||
if (model) {
|
||||
this.recover();
|
||||
this.setServerNoType(model.serverNoType); // 设置服务号状态类型
|
||||
|
||||
@ -3,11 +3,11 @@ export function getBaseUrl() {
|
||||
let BASE_API;
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
// BASE_API = 'https://joylink.club/jlcloud';
|
||||
BASE_API = 'https://test.joylink.club/jlcloud';
|
||||
// BASE_API = 'https://test.joylink.club/jlcloud';
|
||||
// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
|
||||
// BASE_API = 'http://192.168.3.6:9000'; // 旭强
|
||||
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
|
||||
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
|
||||
BASE_API = 'http://192.168.3.82:9000'; // 杜康
|
||||
} else {
|
||||
BASE_API = process.env.VUE_APP_BASE_API;
|
||||
}
|
||||
|
||||
@ -345,7 +345,7 @@ export default {
|
||||
},
|
||||
interBlockStationList() { // 联锁车站列表
|
||||
return this.stationList.filter(station=>{
|
||||
return station.isCIStation;
|
||||
return station.ciStation;
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
@ -32,8 +32,8 @@
|
||||
{{ item.label }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('map.signalDirectionTypeX')" prop="isRight">
|
||||
<el-radio-group v-model="addModel.isRight">
|
||||
<el-form-item :label="$t('map.signalDirectionTypeX')" prop="right">
|
||||
<el-radio-group v-model="addModel.right">
|
||||
<el-radio
|
||||
v-for="item in SignalDirectionList"
|
||||
:key="item.code"
|
||||
@ -95,7 +95,7 @@ export default {
|
||||
addModel: {
|
||||
sectionCode: '',
|
||||
name: '',
|
||||
isRight: false,
|
||||
right: false,
|
||||
leftOrRight: 'L', // 左右侧
|
||||
positionType: '01',
|
||||
stationCode: ''
|
||||
@ -111,7 +111,7 @@ export default {
|
||||
sectionCode: [
|
||||
{ required: true, message: this.$t('rules.selectPhysicalExtentName'), trigger: 'change' }
|
||||
],
|
||||
isRight: [
|
||||
right: [
|
||||
{ required: true, message: this.$t('map.pleaseSelect') + '' + this.$t('map.directionType'), trigger: 'change' }
|
||||
],
|
||||
leftOrRight: [
|
||||
@ -164,7 +164,7 @@ export default {
|
||||
let uname, uid;
|
||||
uname = this.addModel.name || 'X' + this.signalList.length;
|
||||
uid = getUID('X', this.signalList);
|
||||
if (!this.addModel.isRight) { // 下行
|
||||
if (!this.addModel.right) { // 下行
|
||||
uname = this.addModel.name || 'S' + this.signalList.length;
|
||||
uid = getUID('S', this.signalList);
|
||||
}
|
||||
@ -175,7 +175,7 @@ export default {
|
||||
uniqueName: uid,
|
||||
sectionCode: this.addModel.sectionCode,
|
||||
positionType: this.addModel.positionType,
|
||||
isRight: this.addModel.isRight,
|
||||
right: this.addModel.right,
|
||||
// leftOrRight: this.addModel.leftOrRight,
|
||||
nameShow: true,
|
||||
namePosition: { x: 0, y: 0 },
|
||||
|
||||
@ -78,7 +78,7 @@ export default {
|
||||
lampPostType: '',
|
||||
lampPositionType: '',
|
||||
leftOrRight: 'L',
|
||||
isRight: false,
|
||||
right: false,
|
||||
positionType: '',
|
||||
namePosition: { x: 0, y: 0 },
|
||||
useType: '',
|
||||
@ -144,7 +144,7 @@ export default {
|
||||
] },
|
||||
{ prop: 'lampPostType', label: this.$t('map.lampPostType'), type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.SignalLampPostTypeList },
|
||||
{ prop: 'lampPositionType', label: this.$t('map.lampPositionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPositionTypeList },
|
||||
{ prop: 'isRight', label: this.$t('map.signalDirectionTypeX'), type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.SignalDirectionList },
|
||||
{ prop: 'right', label: this.$t('map.signalDirectionTypeX'), type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.SignalDirectionList },
|
||||
{ prop: 'positionType', label: this.$t('map.signalPositionType'), type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.SignalPositionTypeList },
|
||||
{ prop: 'rotate', label: this.$t('map.rotateAngle'), type: 'number', min: -90, max: 90, placeholder: this.$t('tip.angle') },
|
||||
{ prop: 'namePosition', label: this.$t('map.signalNamePosition'), type: 'coordinate', width: '140px', children: [
|
||||
@ -247,7 +247,7 @@ export default {
|
||||
this.activeName = 'first';
|
||||
this.editModel = deepAssign(this.editModel, selected);
|
||||
this.editModel.rotate = selected.rotate || 0; // 角度
|
||||
this.editModel.isRight = Boolean(selected.isRight);
|
||||
this.editModel.right = Boolean(selected.right);
|
||||
} else if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'selectSingalCode'.toUpperCase()) {
|
||||
if (selected.type == '01' || selected.type === '03') {
|
||||
this.$refs.createSignal.setSectionCode(selected.code);
|
||||
@ -307,7 +307,7 @@ export default {
|
||||
this.questionList.push(`${item.name} 信号机位置可能不正确，请手动调试归属区段及偏移量.`);
|
||||
}
|
||||
signalModel.sectionOffset = 2;
|
||||
if (signalModel.isRight) {
|
||||
if (signalModel.right) {
|
||||
if (section.lengthFact) {
|
||||
signalModel.sectionOffset = Math.abs(Number(section.lengthFact) - 2);
|
||||
}
|
||||
@ -321,11 +321,11 @@ export default {
|
||||
// 01 向左 02 向右
|
||||
let model = {};
|
||||
this.sectionList.forEach(section => {
|
||||
if (!signal.isRight && section.type != '02') {
|
||||
if (!signal.right && section.type != '02') {
|
||||
if (section.points[0].x == signal.position.x && Math.abs(section.points[0].y - signal.position.y) <= 20) {
|
||||
model = section;
|
||||
}
|
||||
} else if (signal.isRight && section.type != '02') {
|
||||
} else if (signal.right && section.type != '02') {
|
||||
if (section.points[section.points.length - 1].x == signal.position.x && Math.abs(section.points[section.points.length - 1].y - signal.position.y) <= 20) {
|
||||
model = section;
|
||||
}
|
||||
|
||||
@ -97,7 +97,7 @@ export default {
|
||||
editModel: {
|
||||
centralized: false,
|
||||
// concentrateStationCode: '', // 所属集中站
|
||||
isCIStation: false, // 是否联锁站
|
||||
ciStation: false, // 是否联锁站
|
||||
number:'', // 编号
|
||||
code: '',
|
||||
zcCode: '',
|
||||
@ -121,8 +121,8 @@ export default {
|
||||
position: { x: 0, y: 0 },
|
||||
kilometerPosition: { x: 0, y: 0 }, // 公里标偏移坐标
|
||||
// controlled:false,
|
||||
isCreateControlMode:false,
|
||||
isCreateTurnBack:false,
|
||||
createControlMode:false,
|
||||
createTurnBack:false,
|
||||
turnBackPoint: {x: 0, y: 0}, // 按图折返坐标
|
||||
controlModePoint: { x: 0, y: 0 } // 控制模式坐标
|
||||
},
|
||||
@ -183,12 +183,12 @@ export default {
|
||||
{ prop: 'kmPost', label: this.$t('map.stationKmPost'), type: 'input' },
|
||||
{ prop: 'kmPostFont', label: this.$t('map.stationKmPostFont'), type: 'font', placeholder: this.$t('tip.kilometerFont') },
|
||||
{ prop: 'kmPostFontColor', label: this.$t('map.stationKmPostFontColor'), type: 'color' },
|
||||
{ prop: 'isCreateControlMode', label: '控制模式:', type: 'checkbox', change:true, deviceChange:this.changeControlMode},
|
||||
{ prop: 'controlModePoint', label: this.$t('map.stationControlPosition'), type: 'coordinate', width: '120px', isHidden:!this.editModel.isCreateControlMode, children: [
|
||||
{ prop: 'createControlMode', label: '控制模式:', type: 'checkbox', change:true, deviceChange:this.changeControlMode},
|
||||
{ prop: 'controlModePoint', label: this.$t('map.stationControlPosition'), type: 'coordinate', width: '120px', isHidden:!this.editModel.createControlMode, children: [
|
||||
{ prop: 'controlModePoint.x', firstLevel: 'controlModePoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px'},
|
||||
{ prop: 'controlModePoint.y', firstLevel: 'controlModePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px'}
|
||||
] },
|
||||
{ prop: 'isCreateTurnBack', label: '按图折返:', type: 'checkbox' },
|
||||
{ prop: 'createTurnBack', label: '按图折返:', type: 'checkbox' },
|
||||
{ prop: 'turnBackPoint', label: '按图折返坐标:', type: 'coordinate', width: '120px', isHidden: !this.isPointsShow, children: [
|
||||
{ prop: 'turnBackPoint.x', firstLevel: 'turnBackPoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
|
||||
{ prop: 'turnBackPoint.y', firstLevel: 'turnBackPoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
|
||||
@ -198,7 +198,7 @@ export default {
|
||||
map: {
|
||||
name: this.$t('map.mapData'),
|
||||
item: [
|
||||
{ prop: 'isCIStation', label: this.$t('map.isCIStation'), type: 'checkbox'},
|
||||
{ prop: 'ciStation', label: this.$t('map.isCIStation'), type: 'checkbox'},
|
||||
{ prop: 'centralized', label: this.$t('map.centralized'), type: 'checkbox', disabled:this.controlled, change:true, deviceChange:this.changeCentralized },
|
||||
{ prop: 'zcCode', label: this.$t('map.zcCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.zcList, isHidden: !this.isZcCode, disabled:true },
|
||||
{ prop: 'chargeStationCodeList', label: this.$t('map.chargeStationList'), type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.chargeStation, isHidden: !this.isZcCode, deviceChange:this.changeChargeStation},
|
||||
@ -239,7 +239,7 @@ export default {
|
||||
},
|
||||
|
||||
isPointsShow() {
|
||||
return this.editModel.isCreateTurnBack;
|
||||
return this.editModel.createTurnBack;
|
||||
},
|
||||
isZcCode() {
|
||||
return this.editModel.centralized;
|
||||
@ -385,8 +385,8 @@ export default {
|
||||
// concentrateStationCode: '',
|
||||
// controlled: false,
|
||||
chargeStationCodeList:[],
|
||||
isCreateControlMode: item.control,
|
||||
isCreateTurnBack: false,
|
||||
createControlMode: item.control,
|
||||
createTurnBack: false,
|
||||
turnBackPoint: {x: 0, y: 0} // 按图折返坐标
|
||||
};
|
||||
this.sectionList.forEach(elem => {
|
||||
|
||||
@ -71,7 +71,7 @@ export default {
|
||||
stationCode: '', // 所属车站
|
||||
position: { x: 0, y: 0 },
|
||||
visible: true, // 是否显示
|
||||
isRight: true,
|
||||
right: true,
|
||||
standTrackCode: '',
|
||||
small: false
|
||||
// direction: '' // 上下行方向
|
||||
@ -87,7 +87,7 @@ export default {
|
||||
standTrackUpCode: '', // 上行站台轨
|
||||
standTrackDownCode: '', // 下行站台轨
|
||||
stationstandDirection: '02', // 屏蔽门方向
|
||||
isRight: true,
|
||||
right: true,
|
||||
small: false
|
||||
}
|
||||
};
|
||||
@ -120,7 +120,7 @@ export default {
|
||||
{ prop: 'width', label: this.$t('map.stationstandWidth'), type: 'number', min: 0, max: 2000, placeholder: 'px' },
|
||||
{ prop: 'height', label: this.$t('map.stationstandHeight'), type: 'number', min: 0, max: 2000, placeholder: 'px' },
|
||||
{ prop: 'standTrackCode', label: '站台轨:', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.PhysicalSectionList, hover: this.hover, buttonType: 'editSectionSelectCode', buttonShowType: this.isButtonTypeES },
|
||||
{ prop: 'isRight', label: '行驶方向:', type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.isRightList },
|
||||
{ prop: 'right', label: '行驶方向:', type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.isRightList },
|
||||
{ prop: 'small', label: '是否小型站台:', type: 'checkbox' }
|
||||
]
|
||||
},
|
||||
@ -182,7 +182,7 @@ export default {
|
||||
{ prop: 'width', label: this.$t('map.stationstandWidth'), type: 'number', min: 0, max: 2000, placeholder: 'px' },
|
||||
{ prop: 'height', label: this.$t('map.stationstandHeight'), type: 'number', min: 0, max: 2000, placeholder: 'px' },
|
||||
{ prop: 'standTrackCode', label: '站台轨:', type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', options: this.PhysicalSectionList, hover: this.hover, buttonType: 'sectionSelectCode', buttonShowType: this.isButtonTypeS },
|
||||
{ prop: 'isRight', label: '行驶方向:', type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.isRightList },
|
||||
{ prop: 'right', label: '行驶方向:', type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.isRightList },
|
||||
{ prop: 'small', label: '是否小型站台:', type: 'checkbox' }
|
||||
]
|
||||
},
|
||||
@ -302,7 +302,7 @@ export default {
|
||||
y: this.addModel.pointY
|
||||
},
|
||||
standTrackCode: this.addModel.standTrackCode,
|
||||
isRight: this.addModel.isRight,
|
||||
right: this.addModel.right,
|
||||
small: this.addModel.small
|
||||
};
|
||||
this.stationList.forEach(elem => {
|
||||
|
||||
@ -96,7 +96,7 @@ export default {
|
||||
},
|
||||
width: 0,
|
||||
height: 0,
|
||||
isReversal: false
|
||||
reversal: false
|
||||
},
|
||||
rules: {
|
||||
code: [
|
||||
@ -174,7 +174,7 @@ export default {
|
||||
map: {
|
||||
name: this.$t('map.mapData'),
|
||||
item: [
|
||||
{ prop: 'isReversal', label: '车头翻转', type: 'checkbox' }
|
||||
{ prop: 'reversal', label: '车头翻转', type: 'checkbox' }
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -220,7 +220,7 @@ export default {
|
||||
code: getUID('TrainWindow', [...this.trainWindowList, ...this.addList]),
|
||||
trainWindowShow: true,
|
||||
point: {},
|
||||
isReversal: false
|
||||
reversal: false
|
||||
};
|
||||
|
||||
if (opts) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user