Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev

src/i18n/langs/en/map.js

@@ -300,7 +300,7 @@ export default {
     signalUseType: 'Use the type:',
     potLampType: 'Light type:',
     signalDirectionType: 'The direction of the type:',
-    signalDirectionTypeX: 'The direction of the type:',
+    signalDirectionTypeX: 'Running direction:',
     signalPositionType: 'Signal position type:',
     signalOffset: 'The offset:',
     signalPositionX: 'Signal x:',

src/i18n/langs/zh/map.js

@@ -287,7 +287,7 @@ export default {
     signalUseType: '用途类型:',
     potLampType: '点灯类型:',
     signalDirectionType: '行驶方向:',
-    signalDirectionTypeX: '显示方向:',
+    signalDirectionTypeX: '运行方向:',
     signalPositionType: '信号机位置类型:',
     signalOffset: '所属区段偏移量:',
     signalLinkCode: '所属link',

src/views/newMap/newMapdraft/mapoperate/section.vue

@@ -663,9 +663,7 @@ export default {
                     }
                     return;
                 }
-                this.$refs.dataform.resetFields();
+                this.clear();
-                this.editModel.points = [];
-                this.editModel.logicSectionCodeList = [];
                 this.activeName = 'first';
                 this.editModel = deepAssign(this.editModel, selected);
                 this.editModel.logicSectionNum = selected.type === '01' ? selected.logicSectionNum : [0];
@@ -1225,6 +1223,54 @@ export default {
             } else {
                 this.$refs.tipInfo.doShow();
             }
+        },
+        clear() {
+            this.$refs.dataform.resetFields();
+            this.editModel = {
+                code: '',
+                name: '',
+                type: '',
+                relStandCode: '', // 关联站台编码
+                leftStopPointOffset: 0, // 左向停车点偏移量
+                rightStopPointOffset: 0, // 右向停车点偏移量
+                destinationCode: '', // 目的地码
+                destinationCodePoint: { x: 0, y: 0 }, // 目的地码坐标
+                axleShow: false,
+                namePosition: { x: 0, y: 0 },
+                kmRangeRight: 0,
+                kmRangeLeft: 0,
+                region: '',
+                logicSectionNum: [],
+                logicSectionCodeList: [],
+                logicSectionShow: false, // 是否显示逻辑区段
+                standTrack: false, // 是否站台轨
+                standTrackName: '',
+                standTrackNamePosition: { x: 0, y: 0 },
+                reentryTrack: false, // 是否折返轨
+                reentryTrackName: '',
+                reentryTrackNamePosition: { x: 0, y: 0 },
+                transferTrack: false, // 是否转换轨
+                segmentationPosition: { x: 0, y: 0 },
+                transferTrackName: '',
+                transferTrackNamePosition: { x: 0, y: 0 },
+                switchSection: false, // 是否关联道岔
+                relSwitchCode: '',
+                stationCode: '',
+                logicSectionNameSort: true,
+                sepTypeLeft: '',
+                sepTypeRight: '',
+                offsetRight: 0,
+                parentCode: '',
+                points: [],
+                lengthFact: 0,
+                curve: false, // 是否曲线
+                leftSectionCode: '',
+                rightSectionCode: '',
+                trainWindowCode: '',
+                relevanceSectionList: [],
+                logicSectionStartOffset: 0,
+                logicSectionEndOffset: 0
+            };
         }
     }
 };

src/views/newMap/newMapdraft/mapoperate/signal/index.vue

@@ -154,7 +154,7 @@ export default {
                             { prop: 'lampPositionType', label: this.$t('map.lampPositionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SignalLampPositionTypeList },
                             { prop: 'right', label: this.$t('map.signalDirectionTypeX'), type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.SignalDirectionList },
                             { prop: 'positionType', label: this.$t('map.signalPositionType'), type: 'radio', optionLabel: 'name', optionValue: 'code', border: true, radioList: this.SignalPositionTypeList },
-                            { prop: 'rotate', label: this.$t('map.rotateAngle'), type: 'number', min: -90, max: 90, placeholder: this.$t('tip.angle') },
+                            { prop: 'rotate', label: this.$t('map.rotateAngle'), type: 'number', min: -180, max: 180, placeholder: this.$t('tip.angle') },
                             { prop: 'namePosition', label: this.$t('map.signalNamePosition'), type: 'coordinate', width: '140px', children: [
                                 { prop: 'namePosition.x', firstLevel: 'namePosition', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px' },
                                 { prop: 'namePosition.y', firstLevel: 'namePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }