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-22 14:30:37 +08:00
parent adfe7f0f05
commit e51824dc80
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/config/skinCode/xian_02.js
View File

@ -247,8 +247,8 @@ class SkinCode extends defaultStyle {
standEmergent: { // 紧急关闭
mergentR: 9, // 站台紧急关闭半径
mergentN: 8, // 站台紧急关闭边数（西安二号线特殊样式）
insideOffset: { x: 0, y: 50 }, // 内站台紧急关闭偏移量
outsideOffset: { x: 0, y: -50}, // 外站台紧急关闭偏移量
insideOffset: { x: 0, y: 40 }, // 内站台紧急关闭偏移量
outsideOffset: { x: 0, y: -40}, // 外站台紧急关闭偏移量
closeColor: 'red', // 站台紧急关闭颜色
defaultColor:'#808080', // 西安二号线特殊样式（默认颜色）
special:true // 西安二号线特殊样式

4
src/utils/baseUrl.js
View File

@ -2,9 +2,9 @@ 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.6:9000'; // 旭强
// BASE_API = 'http://192.168.3.41:9000'; // 张赛
// BASE_API = 'http://192.168.3.82:9000'; // 杜康
// BASE_API = 'http://192.168.3.41:9000'; // 张赛

4
src/views/newMap/newMapdraft/mapoperate/splitStation.vue
View File

@ -88,7 +88,7 @@ export default {
draw: {
name: this.$t('map.drawData'),
item: [
{ prop: 'code', label: `${this.$t('map.code')}`, type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.splitStationList},
{ prop: 'code', label: `${this.$t('map.code')}`, type: 'select', optionLabel: 'code', optionValue: 'code', options: this.splitStationList},
{ prop: 'rightStationName', label: this.$t('map.rightCentralStationName'), type: 'input'},
{ prop: 'leftStationName', label: this.$t('map.leftCentralStationName'), type: 'input'},
{ prop: 'position', label: this.$t('map.textPoints'), type: 'coordinate', width: '140px', children: [
@ -141,7 +141,7 @@ export default {
deviceSelect(selected) {
this.$refs.dataform.resetFields();
this.$refs.make.resetFields();
if (selected) {
if (selected && selected._type === 'SplitStation') {
this.activeName = 'first';
this.editModel = deepAssign(this.editModel, selected);
this.editModel.type = selected._type;

7
src/views/newMap/newMapdraft/mapoperate/station.vue
View File

@ -76,6 +76,9 @@
<el-form-item label="公里标字体:" prop="kmPostFont">
<el-font v-model="allModel.kmPostFont" :placeholder="this.$t('tip.stationFont')" />
</el-form-item>
<el-form-item label="车站Y坐标:" prop="positionY">
<el-input-number v-model="allModel.positionY" />
</el-form-item>
<el-form-item>
<el-button-group>
<el-button type="primary" @click="batchSettings">{{ $t('global.set') }}</el-button>
@ -161,7 +164,8 @@ export default {
},
allModel: {
nameFont: '',
kmPostFont: ''
kmPostFont: '',
positionY: 0
}
};
},
@ -493,6 +497,7 @@ export default {
const model = deepAssign({}, station);
model.nameFont = this.allModel.nameFont;
model.kmPostFont = this.allModel.kmPostFont;
model.position.y = this.allModel.positionY;
models.push(model);
});
this.$emit('updateMapModel', models);