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:
fan 2020-04-14 18:51:09 +08:00
parent 4bbc0d648f
commit 2613b68413
8 changed files with 62 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/i18n/langs/en/map.js
View File

@ -615,12 +615,12 @@ export default {
psd: 'Psd',
platformEmergencyStop: 'Platform emergency stop',
functionButton: 'Function button',
saidLamp: 'Said lamp',
saidLamp: 'Said status',
rectangularBox: 'Rectangular box',
boundingBox: 'Bounding box',
ownedCiStation: 'Owned CI station:',
saidLampType: 'Said lamp type:',
saidLampName: 'Said lamp name:',
saidLampType: 'Said status type:',
saidLampName: 'Said status name:',
functionButtonType: 'Function type:',
buttonMainName: 'Button main name:',
buttonViceName: 'Button vice name:',

4
src/i18n/langs/en/rules.js
View File

@ -322,7 +322,7 @@ export default {
enterDeviceCode: 'Please enter device code',
selectDeviceType: 'Please select device type',
selectBelongProject: 'Please select belongs to project',
selectSaidLampType: 'Please select type of said lamp',
enterSaidLampName: 'Please enter said lamp name',
selectSaidLampType: 'Please select type of said status',
enterSaidLampName: 'Please enter said status name',
selectFunctionType: 'Please select type of function'
};

6
src/i18n/langs/zh/map.js
View File

@ -610,12 +610,12 @@ export default {
psd: '屏蔽门',
platformEmergencyStop: '站台紧急停车',
functionButton: '功能按钮',
saidLamp: '表示灯',
saidLamp: '表示状态',
rectangularBox: '矩形框',
boundingBox: '包围框',
ownedCiStation: '所属集中站:',
saidLampType: '表示灯类型:',
saidLampName: '表示灯名称:',
saidLampType: '表示状态类型:',
saidLampName: '表示状态名称:',
functionButtonType: '功能类型:',
buttonMainName: '按钮主名称:',
buttonViceName: '按钮副名称:',

4
src/i18n/langs/zh/rules.js
View File

@ -324,7 +324,7 @@ export default {
enterDeviceCode: '请输入设备编码',
selectDeviceType: '请选择设备类型',
selectBelongProject: '请选择所属项目',
selectSaidLampType: '请选择表示灯类型',
enterSaidLampName: '请输入表示灯名称',
selectSaidLampType: '请选择表示状态类型',
enterSaidLampName: '请输入表示状态名称',
selectFunctionType: '请选择功能类型'
};

5
src/jmapNew/config/skinCode/foshan_01.js
View File

@ -513,7 +513,7 @@ class SkinCode extends defaultStyle {
this[deviceType.Train] = {
trainBody: {
trainBodyLineWidth: 0, // 车身line宽
changeTrainWidth: true, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
specialTrainType: [
{
type: '03',
@ -567,9 +567,10 @@ class SkinCode extends defaultStyle {
trainHeadFillColor: '#EF0C08'// 列车车头矩形填充颜色
},
common: {
useSelfText: true,
trainHeight: 17, // 列车高度
trainHeadDistance: 2, // 列车和车头之间的间距
trainWidth: 76, // 列车长度
trainWidth:76, // 列车长度
trainTextFontSize: 15, // 列车字号
fontFamily: 'consolas', // 默认字体 族类
nameFontSize: 15, // 字体大小

45
src/jmapNew/shape/SplitStation/index.js Normal file
View File

@ -0,0 +1,45 @@
import Group from 'zrender/src/container/Group';
import Line from 'zrender/src/graphic/shape/Line';
import Polygon from 'zrender/src/graphic/shape/Polygon';
// import Text from 'zrender/src/graphic/Text';
export default class SplitStation extends Group {
constructor(model) {
super();
this.z = model.z;
this._code = model.code;
this._type = model._type;
this.zlevel = model.zlevel;
this.model = model;
this.style = model.style;
this.create();
}
create() {
const model = this.model;
const style = this.style;
this.line1 = new Line({
zlevel: this.zlevel,
z: this.z,
shape: {
x1: model.position.x,
y1: model.position.y,
x2: model.position.x,
y2: model.position.y + style.SplitStation.height
},
style: {
lineWidth: style.SplitStation.lineWidth,
stroke: style.SplitStation.strokeColor
}
});
this.triangleLeft = new Polygon({
zlevel: this.zlevel,
z: this.z,
shape: {
points: [[model.position.x, model.position.y + style.SplitStation.height / 2 - style.SplitStation.verticalDistance / 2]]
},
style: {
fill: style.SplitStation.triangleFillColor
}
});
}
}

2
src/jmapNew/shape/element/ETextName.js
View File

@ -11,7 +11,7 @@ export default function ETextName(model) {
style: {
x: model.x,
y: model.y,
fontWeight: model.fontWeight,
fontWeight: model.fontWeight || 'normal',
fontSize: model.fontSize,
fontFamily: model.fontFamily,
text: model.text,

12
src/views/newMap/newMapdraft/mapoperate/controlLamp.vue
View File

@ -140,9 +140,6 @@ export default {
],
stationCode: [
{ required: true, message: this.$t('rules.pleaseSelectStationCode'), trigger: 'change'}
],
deviceStationCode: [
{ required: true, message: '请选择所属车站', trigger: 'change'}
]
}
};
@ -170,8 +167,7 @@ export default {
{ prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
{ prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
] },
{ prop:'stationCode', label: `${this.$t('map.ownedCiStation')}:`, type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList},
{ prop: 'deviceStationCode', label: '所属车站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, isHidden: this.editModel.type !== 'ModeStatusGroup'}
{ prop:'stationCode', label: '所属车站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList}
]
}
}
@ -188,8 +184,7 @@ export default {
{ prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
{ prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
] },
{ prop:'stationCode', label: `${this.$t('map.ownedCiStation')}`, type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList},
{ prop: 'deviceStationCode', label: '所属车站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, isHidden: this.addModel.type !== 'ModeStatusGroup'}
{ prop:'stationCode', label: '所属车站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList}
]
};
return form;
@ -402,8 +397,7 @@ export default {
x: this.addModel.position.x,
y: this.addModel.position.y
},
stationCode: this.addModel.stationCode, // 所属设备集中站
deviceStationCode: this.addModel.deviceStationCode
stationCode: this.addModel.stationCode // 所属设备集中站
};
models.push(model);
this.$emit('updateMapModel', models);