From bb1a98507bbf387d40e311f7ddee9d67b4fa1dbd Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 16 Aug 2019 18:02:50 +0800
Subject: [PATCH] =?UTF-8?q?desc:=20=E5=9C=B0=E5=9B=BE=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E7=BB=98=E5=9B=BE=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/zh/map.js                      |  2 +-
 src/utils/baseUrl.js                          |  4 ++--
 .../mapedit/mapoperate/config/list.vue        |  3 +--
 .../mapdraft/mapedit/mapoperate/counter.vue   |  2 +-
 .../mapedit/mapoperate/delayunlock.vue        |  2 +-
 .../mapdraft/mapedit/mapoperate/section.vue   | 15 +++++++-------
 .../mapdraft/mapedit/mapoperate/signal.vue    | 20 ++++++++++---------
 .../mapdraft/mapedit/mapoperate/station.vue   |  9 +++++----
 .../mapedit/mapoperate/stationcontrol.vue     |  5 +++--
 .../mapedit/mapoperate/stationstand.vue       |  5 +++--
 .../mapdraft/mapedit/mapoperate/switch.vue    |  9 ++++-----
 .../mapedit/mapoperate/trainwindow.vue        |  2 +-
 12 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index ca8bcd87d..ef4374821 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -255,7 +255,7 @@ export default {
 	sepTypeRight: '右侧分隔符类型:',
 	sectionOffsetRight: '右侧Link偏移量:',
 	isSegmentation: '是否分割:',
-	segmentationPosition: '默认背景:',
+	segmentationPosition: '分割坐标:',
 	isCurve: '是否曲线:',
 	sectionPoints: '区段显示坐标:',
 	trainPosType: '列车所在方向:',
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 72be3b2f1..2e575c51e 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,8 +3,8 @@ 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 = 'http://192.168.3.5:9000'; // 袁琪
+		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.4:9000' // 琰培
 	} else {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue b/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
index 54dd75fc1..93199b8b2 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
@@ -104,7 +104,7 @@
           <template v-if="checkFieldType(item, 'points')">
             <div v-if="!item.isHidden" :key="item.prop" class="coordinate">
               <span class="title" :style="{width: item.width}">{{ item.label }}</span>
-              <div class="point-section">
+              <div class="point-section" :style="{ width: `calc(100% - 10px - ${item.width})` }">
                 <template v-for="(point, index) in formModel[item.prop]">
                   <div :key="index" style="overflow: hidden;">
                     <el-form-item
@@ -283,7 +283,6 @@ export default {
 }
 .point-section {
 	float: left;
-	width: calc(100% - 180px);
 }
 
 .point-button {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
index 14c1334b8..aaaa98158 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
@@ -140,7 +140,6 @@ export default {
 						item: [
 							{ prop: 'code', label: this.$t('map.counterCoding'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.counterList, change: true, deviceChange: this.deviceChange },
 							{ prop: 'name', label: this.$t('map.counterName'), type: 'input' },
-							{ prop: 'stationCode', label: this.$t('map.belongsStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
 							{ prop: 'type', label: this.$t('map.counterType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.typeList },
 							{ prop: 'max', label: this.$t('map.countMax'), type: 'number', min: 0, placeholder: '个' },
 							{ prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: this.$t('map.pointX'), type: 'number', placeholder: 'px' },
@@ -150,6 +149,7 @@ export default {
 					map: {
 						name: '地图数据',
 						item: [
+							{ prop: 'stationCode', label: this.$t('map.belongsStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList }
 						]
 					}
 				}
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
index 85c400f33..0848d8420 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
@@ -121,7 +121,6 @@ export default {
 						name: '绘图数据',
 						item: [
 							{ prop: 'code', label: this.$t('map.delayUnlockingCode'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.delayShowList, change: true, deviceChange: this.deviceChange },
-							{ prop: 'stationCode', label: this.$t('map.belongsStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
 							{ prop: 'unlockTime', label: this.$t('map.delayTime'), type: 'number', min: 0, max: 1000, placeholder: 's' },
 							{ prop: 'fontFamily', label: this.$t('map.font'), type: 'font' },
 							{ prop: 'textFontColor', label: this.$t('map.color'), type: 'color' },
@@ -132,6 +131,7 @@ export default {
 					map: {
 						name: '地图数据',
 						item: [
+							{ prop: 'stationCode', label: this.$t('map.belongsStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList }
 						]
 					}
 				}
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/section.vue b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
index a79cfe690..6bd5a3e9f 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/section.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
@@ -290,15 +290,11 @@ export default {
 							{ prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: this.isStationCodeDisabled, options: this.stationList },
 							{ prop: 'parentCode', label: this.$t('map.associatedSection'), type: 'select', mode: true, optionLabel: 'code&&name', optionValue: 'code', disabled: true, options: this.sectionList, isHidden: !this.isParentCode },
 							{ prop: 'code', label: this.$t('map.blockCoding'), type: 'select', mode: false, optionLabel: 'code&&name', optionValue: 'code', options: this.sectionList, change: true, deviceChange: this.deviceChange },
-							{ prop: 'type', label: this.$t('map.sectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionTypeList },
 							{ prop: 'name', label: this.$t('map.sectionNameColon'), type: 'input' },
 							{ prop: 'namePoint', label: this.$t('map.sectionNameOffset'), type: 'coordinate', width: '150px', children: [
 								{ prop: 'namePoint.x', firstLevel: 'namePoint', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
 								{ prop: 'namePoint.y', firstLevel: 'namePoint', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
 							] },
-							{ prop: 'kmRangeLeft', label: this.$t('map.leftKilometerMark'), type: 'number', min: 0 },
-							{ prop: 'kmRangeRight', label: this.$t('map.rightKilometerMark'), type: 'number', min: 0 },
-							{ prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList },
 							{ prop: 'nameShow', label: this.$t('map.displayExtentName'), type: 'checkbox', isHidden: !this.isSectionType },
 							{ prop: 'axleShow', label: this.$t('map.displayAxleCounter'), type: 'checkbox', disabled: this.isStationAxleShow, isHidden: !this.isSectionType},
 							{ prop: 'logicSectionShow', label: this.$t('map.displayLogicalExtents'), type: 'checkbox', isHidden: !this.isSectionType },
@@ -338,22 +334,25 @@ export default {
 							] },
 							{ prop: 'linkCode', label: this.$t('map.relevanceLinkCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList, disabled: true, isHidden: !this.isSectionType },
 							{ prop: 'sepTypeLeft', label: this.$t('map.sepTypeLeft'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionSepTypeList, isHidden: !this.isSectionType },
-							{ prop: 'offsetLeft', label: this.$t('map.sectionOffsetLeft'), type: 'number', min: 0, placeholder: '米', isHidden: !this.isSectionType },
 							{ prop: 'sepTypeRight', label: this.$t('map.sepTypeRight'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionSepTypeList, isHidden: !this.isSectionType },
-							{ prop: 'offsetRight', label: this.$t('map.sectionOffsetRight'), type: 'number', min: 0, placeholder: '米', isHidden: !this.isSectionType },
 							{ prop: 'isSegmentation', label: this.$t('map.isSegmentation'), type: 'checkbox', isHidden: !this.isSectionType },
 							{ prop: 'segmentationPosition', label: this.$t('map.segmentationPosition'), type: 'coordinate', width: '150px', isHidden: !this.issegmentationPosition, children: [
 								{ prop: 'segmentationPosition.x', firstLevel: 'segmentationPosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px', disabled: true },
 								{ prop: 'segmentationPosition.y', firstLevel: 'segmentationPosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: true }
 							] },
 							{ prop: 'isCurve', label: this.$t('map.isCurve'), type: 'checkbox', isHidden: !this.isSectionType },
-							{ prop: 'points', label: this.$t('map.sectionPoints'), type: 'points', width: '160px', isHidden: !this.isPointsShow, pointDisabled: this.pointDisabledName, addPoint: this.addPoint, delPoint: this.delPoint },
-							{ prop: 'trainPosType', label: this.$t('map.trainPosType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.TrainPositionTypeList, isHidden: !this.isSectionType }
+							{ prop: 'points', label: this.$t('map.sectionPoints'), type: 'points', width: '140px', isHidden: !this.isPointsShow, pointDisabled: this.pointDisabledName, addPoint: this.addPoint, delPoint: this.delPoint }
 						]
 					},
 					map: {
 						name: '地图数据',
 						item: [
+							{ prop: 'offsetLeft', label: this.$t('map.sectionOffsetLeft'), type: 'number', min: 0, placeholder: '米', isHidden: !this.isSectionType },
+							{ prop: 'offsetRight', label: this.$t('map.sectionOffsetRight'), type: 'number', min: 0, placeholder: '米', isHidden: !this.isSectionType },
+							{ prop: 'region', label: this.$t('map.sectionColon'), type: 'select', optionLabel: 'label', optionValue: 'value', options: this.regionList },
+							{ prop: 'kmRangeLeft', label: this.$t('map.leftKilometerMark'), type: 'number', min: 0 },
+							{ prop: 'kmRangeRight', label: this.$t('map.rightKilometerMark'), type: 'number', min: 0 },
+							{ prop: 'type', label: this.$t('map.sectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionTypeList },
 							{ prop: 'trainPosType', label: this.$t('map.trainPosType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.TrainPositionTypeList, isHidden: !this.isSectionType }
 						]
 					}
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
index b134bf5c6..880d7dcf4 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
@@ -203,18 +203,13 @@ export default {
 							{ prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
 							{ prop: 'code', label: this.$t('map.signalCodeColon'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.signalList, change: true, deviceChange: this.deviceChange },
 							{ prop: 'name', label: this.$t('map.signalNameColon'), type: 'input' },
-							{ prop: 'uniqueName', label: this.$t('map.signalUniqueName'), type: 'input' },
 							{ prop: 'nameShow', label: this.$t('map.signalDisplayName'), type: 'checkbox' },
 							{ prop: 'lampPostType', label: this.$t('map.lampPostType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPostTypeList },
-							{ prop: 'lampPositionType', label: this.$t('map.lampPositionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPositionTypeList },
-							{ prop: 'useType', label: this.$t('map.signalUseType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalUseTypeList },
-							{ prop: 'potLampType', label: this.$t('map.potLampType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalPotLampTypeList },
+							{ prop: 'lampPositionType', label: this.$t('map.lampPositionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPositionTypeList },						
 							{ prop: 'directionType', label: this.$t('map.signalDirectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalDirectionTypeList },
 							{ prop: 'positionType', label: this.$t('map.signalPositionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalPositionTypeList },
-							{ prop: 'linkCode', label: 'LinkCode:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList },
-							{ prop: 'offset', label: this.$t('map.signalOffset'), type: 'number', min: 0, placeholder: this.$t('tip.meter') },
-							{ prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: this.$t('map.signalPositionX'), type: 'number', placeholder: this.$t('tip.meter') },
-							{ prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: this.$t('map.signalPositionY'), type: 'number', placeholder: this.$t('tip.meter') },
+							{ prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: this.$t('map.signalPositionX'), type: 'number', placeholder: 'px' },
+							{ prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: this.$t('map.signalPositionY'), type: 'number', placeholder: 'px' },
 							{ prop: 'rotate', label: this.$t('map.signalRotate'), type: 'number', min: -90, max: 90, placeholder: this.$t('tip.angle') },
 							{ prop: 'namePosition.x', firstLevel: 'namePosition', secondLevel: 'x', label: this.$t('map.signalNamePositionX'), type: 'number', placeholder: 'px' },
 							{ prop: 'namePosition.y', firstLevel: 'namePosition', secondLevel: 'x', label: this.$t('map.signalNamePositionY'), type: 'number', placeholder: 'px' },
@@ -228,7 +223,14 @@ export default {
 					},
 					map: {
 						name: '地图数据',
-						item: []
+						item: [
+							{ prop: 'uniqueName', label: this.$t('map.signalUniqueName'), type: 'input' },
+							{ prop: 'useType', label: this.$t('map.signalUseType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalUseTypeList },
+							{ prop: 'potLampType', label: this.$t('map.potLampType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalPotLampTypeList },
+							{ prop: 'linkCode', label: 'LinkCode:', type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.linkList },
+							{ prop: 'offset', label: this.$t('map.signalOffset'), type: 'number', min: 0, placeholder: this.$t('tip.meter') },
+
+						]
 					}
 				}
 			};
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/station.vue b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
index a64ccd8b8..e44456f16 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/station.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
@@ -106,10 +106,7 @@ export default {
 						item: [
 							{ prop: 'concentrateStationCode', label: this.$t('map.concentrateStationCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.stationList },
 							{ prop: 'code', label: this.$t('map.stationCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.stationList, change: true, deviceChange: this.deviceChange },
-							{ prop: 'zcCode', label: this.$t('map.zcCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.zcList },
-							{ prop: 'centralized', label: this.$t('map.centralized'), type: 'checkbox' },
 							{ prop: 'name', label: this.$t('map.stationNameColon'), type: 'input' },
-							{ prop: 'runPlanName', label: this.$t('map.stationRunPlanName'), type: 'input' },
 							{ prop: 'visible', label: this.$t('map.stationVisible'), type: 'checkbox' },
 							{ prop: 'nameFont', label: this.$t('map.stationNameFont'), type: 'font', placeholder: this.$t('tip.stationFont') },
 							{ prop: 'nameFontColor', label: this.$t('map.stationNameFontColor'), type: 'color' },
@@ -124,7 +121,11 @@ export default {
 					},
 					map: {
 						name: '地图数据',
-						item: []
+						item: [
+							{ prop: 'zcCode', label: this.$t('map.zcCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.zcList },
+							{ prop: 'centralized', label: this.$t('map.centralized'), type: 'checkbox' },
+							{ prop: 'runPlanName', label: this.$t('map.stationRunPlanName'), type: 'input' }
+						]
 					}
 				}
 			};
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
index da60a0003..ce17c3780 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
@@ -97,7 +97,6 @@ export default {
 						item: [
 							{ prop: 'stationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
 							{ prop: 'code', label: this.$t('map.stationControlCode'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.stationControlList, change: true, deviceChange: this.deviceChange },
-							{ prop: 'zcCode', label: this.$t('map.zcCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.zcList },
 							{ prop: 'name', label: this.$t('map.stationControlName'), type: 'input' },
 							{ prop: 'zokContent', label: this.$t('map.zokContent'), type: 'input' },
 							{ prop: 'zakContent', label: this.$t('map.zakContent'), type: 'input' },
@@ -109,7 +108,9 @@ export default {
 					},
 					map: {
 						name: '地图数据',
-						item: []
+						item: [
+							{ prop: 'zcCode', label: this.$t('map.zcCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.zcList }
+						]
 					}
 				}
 			};
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
index 116c0667a..c68450a5f 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
@@ -128,7 +128,6 @@ export default {
 							{ prop: 'deviceStationCode', label: this.$t('map.equipmentStation'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.stationList },
 							{ prop: 'code', label: this.$t('map.relStandCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.stationStandList, change: true, deviceChange: this.deviceChange },
 							{ prop: 'name', label: this.$t('map.stationstandNameColon'), type: 'input', disabled: true },
-							{ prop: 'stationCode', label: this.$t('map.belongsStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList },
 							{ prop: 'direction', label: this.$t('map.stationstandTopBottom'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.RunDirectionTypeList },
 							{ prop: 'visible', label: this.$t('map.stationVisible'), type: 'checkbox' },
 							{ prop: 'nameShow', label: this.$t('map.stationstandShowName'), type: 'checkbox' },
@@ -142,7 +141,9 @@ export default {
 					},
 					map: {
 						name: '地图数据',
-						item: []
+						item: [
+							{ prop: 'stationCode', label: this.$t('map.belongsStation'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.stationList }
+						]
 					}
 				}
 			};
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
index 7826967f3..f2aa843e6 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
@@ -106,11 +106,7 @@ export default {
 							{ prop: 'nameShow', label: this.$t('map.switchShowName'), type: 'checkbox' },
 							{ prop: 'namePoint.x', firstLevel: 'namePoint', secondLevel: 'x', label: this.$t('map.switchPositionX'), type: 'number', placeholder: 'px' },
 							{ prop: 'namePoint.y', firstLevel: 'namePoint', secondLevel: 'y', label: this.$t('map.switchPositionY'), type: 'number', placeholder: 'px' },
-							{ prop: 'turnTime', label: this.$t('map.turnTime'), type: 'number', min: 0, max: 1000, placeholder: 's' },
 							{ prop: 'timeoutShow', label: this.$t('map.timeoutShow'), type: 'checkbox' },
-							{ prop: 'sectionACode', label: this.$t('map.sectionACode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.sectionList },
-							{ prop: 'sectionBCode', label: this.$t('map.sectionBCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.sectionList },
-							{ prop: 'sectionCCode', label: this.$t('map.sectionCCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.sectionList },
 							{ prop: 'tp.x', firstLevel: 'tp', secondLevel: 'x', label: this.$t('map.switchTpX'), type: 'number', placeholder: 'px' },
 							{ prop: 'tp.y', firstLevel: 'tp', secondLevel: 'y', label: this.$t('map.switchTpY'), type: 'number', placeholder: 'px' }
 						]
@@ -118,7 +114,10 @@ export default {
 					map: {
 						name: '绘图数据',
 						item: [
-
+							{ prop: 'turnTime', label: this.$t('map.turnTime'), type: 'number', min: 0, max: 1000, placeholder: 's' },
+							{ prop: 'sectionACode', label: this.$t('map.sectionACode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.sectionList },
+							{ prop: 'sectionBCode', label: this.$t('map.sectionBCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.sectionList },
+							{ prop: 'sectionCCode', label: this.$t('map.sectionCCode'), type: 'select', optionLabel: 'name&&code', optionValue: 'code', options: this.sectionList }
 						]
 					}
 				}
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
index 2b1110db2..896188545 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
@@ -132,7 +132,6 @@ export default {
 							{ prop: 'code', label: this.$t('map.trainWindowCode'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.trainWindowList, change: true, deviceChange: this.deviceChange },
 							{ prop: 'width', label: this.$t('map.trainWindowWidth'), type: 'number', min: 0, placeholder: 'px' },
 							{ prop: 'height', label: this.$t('map.trainWindowHeight'), type: 'number', min: 0, placeholder: 'px' },
-							{ prop: 'sectionCode', label: this.$t('map.trainWindowSectionCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.filterSectionList },
 							{ prop: 'point.x', firstLevel: 'point', secondLevel: 'x', label: this.$t('map.pointX'), type: 'number', placeholder: 'px' },
 							{ prop: 'point.y', firstLevel: 'point', secondLevel: 'y', label: this.$t('map.pointY'), type: 'number', placeholder: 'px' }
 						]
@@ -140,6 +139,7 @@ export default {
 					map: {
 						name: '地图数据',
 						item: [
+							{ prop: 'sectionCode', label: this.$t('map.trainWindowSectionCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.filterSectionList }
 						]
 					}
 				}