merge

src/jmapNew/config/skinCode/fuzhou_01.js

@@ -673,6 +673,7 @@ class SkinCode extends defaultStyle {
                     {status: '07', showColor: '#FFFF00'}
                 ], // 目的地状态 01准点 02早点 03严重早点 04晚点 05严重晚点 06头码车 07ATP切除
                 destinationStatusSetText: 'trainServer', // 目的地状态设置的对应哪个text的颜色
+                runLineHide: true, // 运行时列车line 竖杆隐藏
                 directionType: [
                     {
                         type: 1,

src/jmapNew/mouseController.js

@@ -122,7 +122,6 @@ class MouseController extends Eventful {
             this._dragging = false;
         }
         if (this._zoomOnMouseWheel && this.$jmap.mapDevice['check_box'] && this._previewOrMapDraw ) {
-            console.log(this.isMoveRight, 'mouseup');
             this.eventTarget = this.$jmap.mapDevice['check_box'].instance;
             this.handleBoundingRect(this.eventTarget);
             let em;

src/jmapNew/shape/graph/Train/index.js

@@ -232,9 +232,9 @@ export default class Train extends Group {
                     let lineRShow = item.lineRShow;
                     let arrowRShow = item.arrowRShow;
                     if (flag) {
-                        lineLShow = !item.lineLShow;
+                        lineLShow = !item.lineLShow && !this.style.Train.trainStatusStyle.runLineHide;
                         arrowLShow = !item.arrowLShow;
-                        lineRShow = !item.lineRShow;
+                        lineRShow = !item.lineRShow && !this.style.Train.trainStatusStyle.runLineHide;
                         arrowRShow = !item.arrowRShow;
                     }
                     this.trainL && this.trainL.setLineShow(lineLShow);

src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue

@@ -20,6 +20,7 @@
           <el-option
             v-for="item in trainList"
             :key="item.code"
+            :disabled="disabledTrain(item.code)"
             :label="item.code"
             :value="item.code"
           />
@@ -103,11 +104,9 @@ export default {
     watch:{},
     methods: {
         doShow(operate, selected) {
-			this.$root.$emit('dialogOpen', selected);
+            this.$root.$emit('dialogOpen', selected);
             this.selected = selected;
             // 如果不是断点激活，则需要对初始值进行初始化
-            // if (!this.dialogShow) {
-            // }
             this.addModel.sectionCode = selected.code;
             this.dialogShow = true;
             this.$nextTick(function () {
@@ -148,12 +147,14 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
             }).catch(() => { this.doClose(); });
+        },
+        disabledTrain(code) {
+            return this.$store.state.map.activeTrainList.includes(code);
         }
     }
 };

src/store/modules/map.js

@@ -1030,6 +1030,12 @@ const map = {
                     }
                 }
             });
+            const train = state.mapDevice[data.code];
+            if (train.physicalCode) {
+                const section = state.mapDevice[train.physicalCode];
+                const station = section ? state.mapDevice[section.stationCode] : {};
+                isExist = isExist || station.depot;
+            }
             if (!isExist) {
                 state.activeTrainList.push(data.code);
                 state.activeTrainListChange += 1;

src/views/newMap/newMapdraft/mapoperate/train/create.vue

@@ -133,7 +133,6 @@ export default {
             this.addModel.modelCode = '';
             this.$emit('dispatch', { callback: 'delTrainMode', params: code});
         },
-        // 14
         handleConfirm() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {

src/views/system/configLine/config.vue

@@ -112,7 +112,8 @@ export default {
                 'checkDirectionWhenSetHead',
                 'transferRouteCanOnlyFaultUnlock',
                 'setManualWhenHeadTrainArriveTarget',
-                'routeDefaultCheckConflict'
+                'routeDefaultCheckConflict',
+                'tripNumberIsUnique'
             ],
             selectList: ['runMode', 'singleApproachLockCancelRoute'],
             generalConfig: [
@@ -158,7 +159,8 @@ export default {
                 'checkDirectionWhenSetHead',
                 'transferRouteCanOnlyFaultUnlock',
                 'setManualWhenHeadTrainArriveTarget',
-                'routeDefaultCheckConflict'
+                'routeDefaultCheckConflict',
+                'tripNumberIsUnique'
             ],
             rangeList: ['noParkingSM', 'parkingSM'],
             speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@@ -210,7 +212,8 @@ export default {
                 checkDirectionWhenSetHead: '设置头码车时检查方向',
                 transferRouteCanOnlyFaultUnlock: '转换轨进路只能通过故障解锁来取消',
                 setManualWhenHeadTrainArriveTarget: '头码车抵达目的地后变为人工车',
-                routeDefaultCheckConflict: '进路默认开启冲突检测'
+                routeDefaultCheckConflict: '进路默认开启冲突检测',
+                tripNumberIsUnique: '运行图中车次号是否唯一'
             }
         };
     },