diff --git a/src/jmapNew/shape/Automactic/EMouse.js b/src/jmapNew/shape/Automactic/EMouse.js index ae2ae8344..967f6094e 100644 --- a/src/jmapNew/shape/Automactic/EMouse.js +++ b/src/jmapNew/shape/Automactic/EMouse.js @@ -31,10 +31,8 @@ export default class EMouse extends Group { if (e.target && e.target._subType == 'Text') { this.text.show(); } else { - // this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor); - this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor); - this.device.control.setTextBorder(true); - this.device.control.setArcBorder(true); + // this.device.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor); + // this.device.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor); } } @@ -43,10 +41,8 @@ export default class EMouse extends Group { if (e.target && e.target._subType == 'Text') { this.text.hide(); } else { - // this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor); - this.device.control.setTextColor('#FFFFFF'); - this.device.control.setTextBorder(false); - this.device.control.setArcBorder(false); + // this.device.setControlColor(this.device.style.LcControl.lamp.controlColor); + // this.device.setTextColor('#FFFFFF'); } } } diff --git a/src/jmapNew/shape/Automactic/index.js b/src/jmapNew/shape/Automactic/index.js index 7151f113f..bb997649c 100644 --- a/src/jmapNew/shape/Automactic/index.js +++ b/src/jmapNew/shape/Automactic/index.js @@ -170,4 +170,15 @@ export default class Automactic extends Group { this.subtitleText && this.subtitleText.hide(); this.arcBorder && this.arcBorder.hide(); } + + setControlColor(color) { + if (color) { + this.control.setStyle('fill', color); + } + } + setTextColor(color) { + if (color) { + this.text.setStyle('textFill', color); + } + } } diff --git a/src/jmapNew/shape/GuideLock/EMouse.js b/src/jmapNew/shape/GuideLock/EMouse.js index 96e179317..2241f7e1c 100644 --- a/src/jmapNew/shape/GuideLock/EMouse.js +++ b/src/jmapNew/shape/GuideLock/EMouse.js @@ -31,10 +31,8 @@ export default class EMouse extends Group { if (e.target && e.target._subType == 'Text') { this.text.show(); } else { - this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor); - this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor); - this.device.control.setTextBorder(true); - this.device.control.setArcBorder(true); + // this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor); + // this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor); } } @@ -43,10 +41,8 @@ export default class EMouse extends Group { if (e.target && e.target._subType == 'Text') { this.text.hide(); } else { - this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor); - this.device.control.setTextColor('#FFFFFF'); - this.device.control.setTextBorder(false); - this.device.control.setArcBorder(false); + // this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor); + // this.device.control.setTextColor('#FFFFFF'); } } } diff --git a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue index 575fa8668..e585ae4c1 100644 --- a/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue +++ b/src/views/newMap/newMapdraft/mapoperate/ControlDraft.vue @@ -253,9 +253,10 @@ export default { this.getAutoMaticList(); }, deviceSelect(selected) { + debugger; this.$refs.dataform.resetFields(); this.$refs.make.resetFields(); - if (selected && selected._type.toUpperCase() == 'AutomaticRoute'.toUpperCase() || selected._type.toUpperCase() == 'MapCycleButtonVO'.toUpperCase() || selected._type.toUpperCase() == 'AxleReset'.toUpperCase() || selected._type.toUpperCase() == 'LimitControl'.toUpperCase()) { + if (selected && selected._type.toUpperCase() == 'AutomaticRoute'.toUpperCase() || selected._type.toUpperCase() == 'MapCycleButtonVO'.toUpperCase() || selected._type.toUpperCase() == 'AxleReset'.toUpperCase() || selected._type.toUpperCase() == 'LimitControl'.toUpperCase() || selected._type.toUpperCase() == 'GuideLock'.toUpperCase()) { this.activeName = 'first'; this.editModel = deepAssign(this.editModel, selected); this.editModel.type = selected._type; diff --git a/src/views/newMap/newMapdraft/mapoperate/index.vue b/src/views/newMap/newMapdraft/mapoperate/index.vue index eed9c093f..b16d4ba62 100644 --- a/src/views/newMap/newMapdraft/mapoperate/index.vue +++ b/src/views/newMap/newMapdraft/mapoperate/index.vue @@ -301,7 +301,7 @@ export default { this.enabledTab = 'Esp'; } else if (this.feild) { this.enabledTab = 'Section'; - } else if (type == 'AutomaticRoute' || type == 'MapCycleButtonVO' || type == 'AxleReset' || type == 'LimitControl') { + } else if (type == 'AutomaticRoute' || type == 'MapCycleButtonVO' || type == 'AxleReset' || type == 'LimitControl' || type == 'GuideLock') { this.enabledTab = 'ControlDraft'; } else { this.enabledTab = type;