From 21001446562c7d00d2ea5afad126fc9a0147e435 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Fri, 17 Apr 2020 15:02:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=BA=8C=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4&=E5=AE=81=E6=B3=A2=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BFvue=E5=91=8A=E8=AD=A6=E8=B0=83=E6=95=B4&=E4=BB=BF?= =?UTF-8?q?=E7=9C=9F=E9=BC=A0=E6=A0=87=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/config/skinCode/xian_02.js | 14 +++---- .../ningbo_01/menus/dialog/routeControl.vue | 4 +- .../ningbo_01/menus/dialog/stationControl.vue | 3 +- .../menus/dialog/turnBackControl.vue | 4 +- src/views/newMap/displayNew/index.vue | 18 +++++---- .../newMapdraft/mapoperate/controlLamp.vue | 39 ++++++++++--------- 6 files changed, 44 insertions(+), 38 deletions(-) diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js index 2cea4f0fb..8b47c0b7e 100644 --- a/src/jmapNew/config/skinCode/xian_02.js +++ b/src/jmapNew/config/skinCode/xian_02.js @@ -14,7 +14,7 @@ class SkinCode extends defaultStyle { distance: 18, // 文字离区段距离 fontSize: 11, // 字体大小 fontWeight: 'normal', // 字体粗细 - fontColor: 'lightgreen', // 字体颜色 + fontColor: '#FFFFFF', // 字体颜色 textAlign: 'center', // 水平对齐方式 textPosition: 'inside', // 文字位置 textVerticalAlign: 'middle' // 文字垂直对齐方式 @@ -399,7 +399,7 @@ class SkinCode extends defaultStyle { position: 0, // 区段名称位置 1 上面 -1 下面 0 对称 offset: {x: 0, y: 8}, // 道岔名称与区段距离 fontSize: 11, // 字体大小 - fontColor: '#C0C0C0', // 道岔名称颜色 + fontColor: '#FFFFFF', // 道岔名称颜色 fontWeight: 'normal', // 字体粗细 borderColor: '#FE0000', // 道岔边框颜色 lossColor: 'lightgreen', // 道岔失去颜色 @@ -552,23 +552,23 @@ class SkinCode extends defaultStyle { distance: 30, // 模式间距 psd: { text: 'PSD', - defaultColor: '#FFF' + defaultColor: '#9F9C9C' }, mfa: { text: 'MFA', - defaultColor: '#FFF' + defaultColor: '#9F9C9C' }, mfb: { text: 'MFB', - defaultColor: '#FFF' + defaultColor: '#9F9C9C' }, pfa: { text: 'PFA', - defaultColor: '#FFF' + defaultColor: '#9F9C9C' }, pfb: { text: 'PFB', - defaultColor: '#FFF' + defaultColor: '#9F9C9C' } }; this[deviceType.ReturnModeGroup] = { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue index 08b613516..f06c1f6e2 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue @@ -24,8 +24,8 @@
- 设置自动通过 - 取消自动通过 + 设置自动通过 + 取消自动通过
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue index 161c4ea9a..b2233e491 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue @@ -64,7 +64,8 @@ export default { row: null, operation: '', stationLists: [], - disabledAll: false + disabledAll: false, + checked2: false }; }, computed: { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue index d5207e778..37c1a36cb 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue @@ -24,10 +24,10 @@ - 设置 + 设置 - 取消 + 取消 diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index c22161d1e..ad5e33248 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -324,13 +324,17 @@ export default { } else { this.mouseNumTime += 1; } - if (this.mapBoxP) { - if (this.mouseNumTime >= 8) { - this.mapBoxP.style.cursor = 'none'; // canvas 单个绘图层级只设置一层就好 - } else { - this.mapBoxP.style.cursor = ''; - } - } + if (this.mapBox) { + if (this.mouseNumTime >= 15) { + for (let i = 0; i < this.mapBox.length; i++) { + this.mapBox[i].style.cursor = 'none'; + } + } else { + for (let i = 0; i < this.mapBox.length; i++) { + this.mapBox[i].style.cursor = ''; + } + } + } }, 1000); }, mousemove() { diff --git a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue index 980bcbf70..1bb75128d 100644 --- a/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue +++ b/src/views/newMap/newMapdraft/mapoperate/controlLamp.vue @@ -17,6 +17,9 @@
+
+ 提示:设置归属车站时，坐标会默认设置为车站下方50px +
@@ -52,7 +55,7 @@ export default { data() { return { activeName: 'first', - autoList: [], + selectLists: [], atsControlList: [], centerCommunicationList: [], chainControlList: [], @@ -177,12 +180,12 @@ export default { labelWidth: '150px', items: [ { prop:'type', label: this.$t('map.saidLampType'), type: 'select', optionLabel: 'name', optionValue: 'value', options: this.typeList}, - { prop: 'name', label: this.$t('map.saidLampName'), type: 'input', isHidden: this.noNameTypeList.includes(this.editModel.type) }, + { prop: 'name', label: this.$t('map.saidLampName'), type: 'input', isHidden: this.noNameTypeList.includes(this.addModel.type) }, + { prop:'stationCode', label: '所属车站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList, change: true, deviceChange: this.changeBelongStation}, { prop: 'position', label: this.$t('map.textPoints'), type: 'coordinate', width: '140px', children: [ { 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: '所属车站', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList} + ] } ] }; return form; @@ -232,7 +235,7 @@ export default { } }, mounted() { - this.selectLists = this.indicatorLightList; + this.selectLists = this.indicatorLightList; this.handleIndicatorLightList(this.indicatorLightList); }, methods: { @@ -366,20 +369,6 @@ export default { break; } }, - changeStation(code) { // 选择对应的所属设备集中站 - this.autoList.forEach(elem => { - if (elem.code == code) { - this.addModel.stationCode = elem.stationCode; - } - }); - }, - changeEditStation(code) { // 选择对应的所属设备集中站 - this.autoList.forEach(elem => { - if (elem.code == code) { - this.editModel.stationCode = elem.stationCode; - } - }); - }, deviceChange(code) { this.$emit('setCenter', code); this.deviceSelect(this.$store.getters['map/getDeviceByCode'](code)); @@ -450,6 +439,18 @@ export default { } return idPrefix; }, + changeBelongStation(code) { + console.log(code, '==============='); + if (code) { + this.stationList.forEach(item => { + if (item.code === code) { + this.addModel.position.x = item.position.x; + this.addModel.position.y = item.position.y + 50; + } + }); + } + + }, // 创建对象 create() { this.$refs.make.validate((valid) => {