diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js index 43a428598..0d219ab3f 100644 --- a/src/i18n/langs/en/map.js +++ b/src/i18n/langs/en/map.js @@ -410,8 +410,8 @@ export default { switchShowName: '是否显示道岔名称:', switchPositionX: '道岔名称x偏移量:', switchPositionY: '道岔名称y偏移量:', - turnTime: '道岔时间:', - timeoutShow: '是否显示道岔时间:', + turnTime: '道岔转换时间:', + timeoutShow: '是否显示道岔倒计时时间:', sectionACode: '关联的A Section Code:', sectionBCode: '关联的B Section Code:', sectionCCode: '关联的C Section Code:', diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js index db4295d26..fe3b95607 100644 --- a/src/i18n/langs/en/rules.js +++ b/src/i18n/langs/en/rules.js @@ -97,7 +97,7 @@ export default { switchNamePointX: '请输入道岔名称坐标x', switchNamePointY: '请输入道岔名称坐标y', switchStationCode: '请输入设备集中站', - switchTurnTime: '请输入道岔时间', + switchTurnTime: '请输入道岔转换时间', switchTpX: '请输入时间坐标x', switchTpY: '请输入时间坐标y', diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js index ef4374821..435c37198 100644 --- a/src/i18n/langs/zh/map.js +++ b/src/i18n/langs/zh/map.js @@ -333,8 +333,8 @@ export default { switchShowName: '是否显示道岔名称:', switchPositionX: '道岔名称x偏移量:', switchPositionY: '道岔名称y偏移量:', - turnTime: '道岔时间:', - timeoutShow: '是否显示道岔时间:', + turnTime: '道岔转换时间:', + timeoutShow: '是否显示道岔倒计时时间:', sectionACode: '关联的A Section Code:', sectionBCode: '关联的B Section Code:', sectionCCode: '关联的C Section Code:', diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js index db4295d26..fe3b95607 100644 --- a/src/i18n/langs/zh/rules.js +++ b/src/i18n/langs/zh/rules.js @@ -97,7 +97,7 @@ export default { switchNamePointX: '请输入道岔名称坐标x', switchNamePointY: '请输入道岔名称坐标y', switchStationCode: '请输入设备集中站', - switchTurnTime: '请输入道岔时间', + switchTurnTime: '请输入道岔转换时间', switchTpX: '请输入时间坐标x', switchTpY: '请输入时间坐标y', diff --git a/src/jmap/shape/Switch/index.js b/src/jmap/shape/Switch/index.js index de7602a9c..34786f860 100644 --- a/src/jmap/shape/Switch/index.js +++ b/src/jmap/shape/Switch/index.js @@ -65,7 +65,7 @@ export default class Switch extends Group { const point2 = [point1[0] + directx * switchWidth / this.triangle.getSinRate(), point1[1]]; const point3 = [point2[0] + directx * this.triangle.getCotRate() * swPadding, point2[1] + directy * swPadding]; const point4 = [point3[0] + direct * this.triangle.getSin(switchWidth), point3[1] - direct * this.triangle.getCos(switchWidth)]; - this.locShelter = new ESwLocal({ + this.locShelter = new ESwLocal({ // 定位 zlevel: this.zlevel, z: this.z, style: style, @@ -92,7 +92,7 @@ export default class Switch extends Group { const spoint3 = [model.intersection.x - directx * width3, model.intersection.y + directy * switchWidth1]; const spoint4 = [spoint1[0] + directx * (width2 + width1) - directx * width3, spoint3[1]]; - this.relocShelter = new ESwLnversion({ + this.relocShelter = new ESwLnversion({ // 反位 zlevel: this.zlevel, z: this.z, style: style, @@ -148,7 +148,7 @@ export default class Switch extends Group { createLockRect() { const offsetX = this.model.locateType == '01' ? 3 : 0; - this.lockRect = new ELockRect({ + this.lockRect = new ELockRect({ // 锁定矩形 zlevel: this.zlevel, z: this.z + 6, x: this.model.intersection.x - this.style.Switch.monolock.rectWidth / 2 + offsetX, diff --git a/src/scripts/attribute.js b/src/scripts/attribute.js index abfd1f5bb..8b49b48f8 100644 --- a/src/scripts/attribute.js +++ b/src/scripts/attribute.js @@ -272,8 +272,8 @@ export const attribute = { { prop: 'nameShow', label: '是否显示道岔名称:', type: 'checkbox' }, { prop: 'namePoint.x', firstLevel: 'namePoint', secondLevel: 'x', label: '道岔名称x偏移量:', type: 'number', placeholder: 'px' }, { prop: 'namePoint.y', firstLevel: 'namePoint', secondLevel: 'y', label: '道岔名称y偏移量:', type: 'number', placeholder: 'px' }, - { prop: 'turnTime', label: '道岔时间:', type: 'number', min: 0, max: 1000, placeholder: 's' }, - { prop: 'timeoutShow', label: '是否显示道岔时间:', type: 'checkbox' }, + { prop: 'turnTime', label: '道岔转换时间:', type: 'number', min: 0, max: 1000, placeholder: 's' }, + { prop: 'timeoutShow', label: '是否显示道岔倒计时时间:', type: 'checkbox' }, { prop: 'sectionACode', label: '关联的A Section Code:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'sectionList' }, { prop: 'sectionBCode', label: '关联的B Section Code:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'sectionList' }, { prop: 'sectionCCode', label: '关联的C Section Code:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: [], optionCode: 'sectionList' }, @@ -297,7 +297,7 @@ export const attribute = { { required: true, message: '请输入设备集中站', trigger: 'change' } ], turnTime: [ - { required: true, message: '请输入道岔时间', trigger: 'blur' } + { required: true, message: '请输入道岔转换时间', trigger: 'blur' } ], 'tp.x': [ { required: true, message: '请输入时间坐标x', trigger: 'blur' } diff --git a/src/views/map/mapdraft/mapedit/configMap.vue b/src/views/map/mapdraft/mapedit/configMap.vue index 7fe90507c..47ef12d74 100644 --- a/src/views/map/mapdraft/mapedit/configMap.vue +++ b/src/views/map/mapdraft/mapedit/configMap.vue @@ -1,30 +1,28 @@