From d3546c5de217252c761c4f11b7fbc18c9871de6c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 25 Jan 2021 13:48:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B2=94=E5=BF=83=E9=BC=A0=E6=A0=87=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=20=E7=BB=98=E5=9B=BE=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Section/ELines.js                   | 11 ++++++++---
 src/jmapNew/shape/Section/index.js                    |  4 ++--
 .../newMap/newMapdraft/mapoperate/section/index.vue   |  3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/jmapNew/shape/Section/ELines.js b/src/jmapNew/shape/Section/ELines.js
index c72fb9127..cb245dcb7 100644
--- a/src/jmapNew/shape/Section/ELines.js
+++ b/src/jmapNew/shape/Section/ELines.js
@@ -376,9 +376,14 @@ export default class ELines extends Group {
         this.crossSection && this.crossSection.setStyle(styles);
     }
 
-    setOrignalCross() {
-        this.crossSection && this.crossSection.setStyle({lineWidth:0 });
-        // fill:this.model.style.Section.cross.crossSection.fillColor
+    setOrignalCross(isModifyFill = false) {
+        if (this.crossSection) {
+            if (isModifyFill) {
+                this.crossSection.setStyle({lineWidth:0, fill:this.model.style.Section.cross.crossSection.fillColor });
+            } else {
+                this.crossSection.setStyle({lineWidth:0 });
+            }
+        }
     }
 
     setCrossBlock() {
diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index 24f9b903a..6229e44eb 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -411,7 +411,7 @@ export default class Section extends Group {
             this.on('mouseout', () => { // 移出
                 if (!this.selectedType && !this.selected && this.line ) {
                     this.line.setStyle({ stroke: this.style.Section.line.spareColor, lineWidth: this.style.Section.line.width });
-                    this.line.setOrignalCross();
+                    this.line.setOrignalCross(true);
                 }
                 if (this.style.Switch.sectionAction.flag && this.model.relSwitchCode) {
                     const switchModel = Vue.prototype.$jlmap.mapDevice[this.model.relSwitchCode];
@@ -443,7 +443,7 @@ export default class Section extends Group {
         } else {
             this.lineBorder && this.lineBorder.setStyle({ lineWidth: 0 });
             !this.selectedType && this.setState(this.model);
-            this.line.setOrignalCross();
+            this.line.setOrignalCross(false);
         }
     }
     drawBatchSelected(selected, type) {
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index 9d399dfbd..b25351b17 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -211,7 +211,8 @@ export default {
                             { prop: 'leftStopPointOffset', label: this.$t('map.leftStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 左向停车点偏移量
                             { prop: 'rightStopPointOffset', label: this.$t('map.rightStopPointOffset'), type: 'number', min: 0, max: this.maxLengthFact, isHidden: !this.isStopPointOffset }, // 右向停车点偏移量
                             { prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList, isHidden: !this.sectionColonShow },
-                            { prop: 'trainWindowCode', label: '关联车次窗', type: 'input', disabled: true, isHidden: !this.isSwitchSectionShow || !this.isCrossSectionType }
+                            { prop: 'trainWindowCode', label: '关联车次窗', type: 'input', disabled: true, isHidden: !this.isSwitchSectionShow }
+                            // || !this.isCrossSectionType
                         ]
                     }
                 }