初始化按计划行车状态and其他调整

src/i18n/langs/en/map.js

@@ -587,5 +587,9 @@ export default {
     logicalSectionEndOffset: 'Logical section start offset:',
     associateSwitchSection: 'Associate switch section:',
     failedToSetParkingPointOffset: 'failed to set parking point offset: the actual length of the section is less than the offset distance.',
-    correlationWindow: 'Correlation window'
+    correlationWindow: 'Correlation window',
+    showConditions: 'Show conditions:',
+    localCenter: 'Local&Center',
+    local: 'Local',
+    center: 'Center'
 };

src/i18n/langs/zh/map.js

@@ -580,5 +580,9 @@ export default {
     logicalSectionEndOffset: '逻辑区段终点偏移:',
     associateSwitchSection: '关联道岔区段:',
     failedToSetParkingPointOffset: '设置停车点偏移量失败：区段实际长度小于偏移距离。',
-    correlationWindow: '关联车次窗'
+    correlationWindow: '关联车次窗',
+    showConditions: '显示条件:',
+    localCenter: '现地&行调',
+    local: '现地',
+    center: '行调'
 };

src/jmapNew/config/skinCode/bejing_01.js

@@ -134,7 +134,7 @@ class SkinCode extends defaultStyle {
                 color: '#7F7F7F' 									// 区段边界符颜色
             },
             block: {
-                special: false,                                  // 区段特殊显示
+                special: false // 区段特殊显示
             },
             trainPosition:{
                 display: false // 列车实时位置显示
@@ -212,7 +212,7 @@ class SkinCode extends defaultStyle {
 
         this[deviceType.MapCycleButtonVO] = {
             // 是否显示
-            visible: true,
+            visibleConditions: ['01'],
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
@@ -397,7 +397,7 @@ class SkinCode extends defaultStyle {
             },
             sectionAction: {
                 flag: false, // 道岔 关联区段显示
-                spareColor: '#5b5b5b',                       // 区段显示颜色
+                spareColor: '#5b5b5b' // 区段显示颜色
             },
             core: {
                 length: 6											// 道岔单边长度

src/jmapNew/config/skinCode/chengdu_03.js

@@ -137,7 +137,7 @@ class SkinCode extends defaultStyle {
                 distance: 5 								// 限速线距离区段距离
             },
             block: {
-                special: false,                                  // 区段特殊显示
+                special: false // 区段特殊显示
             },
             trainPosition:{
                 display: false // 列车实时位置显示
@@ -369,7 +369,7 @@ class SkinCode extends defaultStyle {
             },
             sectionAction: {
                 flag: false, // 道岔 关联区段显示
-                spareColor: '#5b5b5b',                       // 区段显示颜色
+                spareColor: '#5b5b5b' // 区段显示颜色
             },
             core: {
                 length: 6									// 道岔单边长度
@@ -463,6 +463,31 @@ class SkinCode extends defaultStyle {
                 controlColor: '#b5b3b3'						// 控制灯颜色 (灰色)
             }
         };
+        this[deviceType.MapCycleButtonVO] = {
+            // 是否显示
+            visibleConditions: ['01'],
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            subtitleText: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 17 // 等于副标题距离
+            },
+            lamp: {
+                borderShow: false, // 是否显示边框
+                lineDash: null, // 灯的包围框
+                stroke: '#FFFFFF', // 框的颜色
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3'						// 控制灯颜色 (灰色)
+            },
+            OutFrame: {
+
+            }
+        };
         this[deviceType.TrainWindow] = {
             lineColor: '#4DD43F',							// 车次窗颜色
             lineDash: null,									// 车次窗虚线间隔

src/jmapNew/config/skinCode/ningbo_01.js

@@ -135,7 +135,7 @@ class SkinCode extends defaultStyle {
             },
             block: {
                 special: false, // 区段特殊显示
-                blockGlint: true,                           // 区段封锁闪烁显示
+                blockGlint: true // 区段封锁闪烁显示
             },
             trainPosition:{
                 display: false // 列车实时位置显示
@@ -208,7 +208,7 @@ class SkinCode extends defaultStyle {
 
         this[deviceType.MapCycleButtonVO] = {
             // 是否显示
-            visible: true,
+            visibleConditions: ['01', '02'],
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
@@ -369,7 +369,7 @@ class SkinCode extends defaultStyle {
                     interconnectedControlShow: false,				// 联锁控显示
                     centerControlButtonShow: true,						// 中控显示
                     stroke: '#FFFFFF', // 框的颜色
-                    fill: 'rgba(0,0,0,0)',                      // 填充色
+                    fill: 'rgba(0,0,0,0)' // 填充色
                 },
                 arrow: {
                     show: false									// 控制模式箭头显隐
@@ -393,7 +393,7 @@ class SkinCode extends defaultStyle {
             },
             sectionAction: {
                 flag: false, // 道岔 关联区段显示
-                spareColor: '#5b5b5b',                       // 区段显示颜色
+                spareColor: '#5b5b5b' // 区段显示颜色
             },
             core: {
                 length: 10									// 道岔单边长度

src/jmapNew/shape/Automactic/index.js

@@ -16,10 +16,19 @@ export default class Automactic extends Group {
         this.zlevel = model.zlevel;
         this.model = model;
         this.style = style;
+        const arr = window.location.href.split('?')[1].split('&');
+        this.prdType = '';
+        arr.forEach(elem => {
+            if (elem.split('=')[0] === 'prdType') {
+                this.prdType = elem.split('=')[1];
+            }
+        });
+        if (!this.prdType || this.style.AutomaticRoute.displayCondition.indexOf(this.prdType) !== -1) {
             this.create();
             this.createMouseEvent();
             this.setState(model);
         }
+    }
 
     create() {
         const model = this.model;

src/jmapNew/shape/Text/index.js

@@ -11,6 +11,13 @@ export default class Text2 extends Group {
         this.model = model;
         this.style = style;
         this.z = 6;
+        const arr = window.location.href.split('?')[1].split('&');
+        this.prdType = '';
+        arr.forEach(elem => {
+            if (elem.split('=')[0] === 'prdType') {
+                this.prdType = elem.split('=')[1];
+            }
+        });
         this.create();
         this.setState(model);
     }

src/utils/baseUrl.js

@@ -3,7 +3,7 @@ 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 = '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.41:9000'; // 张赛

src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue

@@ -16,15 +16,16 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="折返进路:" prop="turnBackRouteName">
+          <el-card style="width: 400px;position: relative; left: 80px; padding-top: 10px; margin-bottom: 20px">
+            <el-form-item label="折返进路:" prop="turnBackRouteName" label-width="100px">
               <el-input v-model="addModel.turnBackRouteName" readonly="true" style="width: 178px" />
               <el-button type="primary" @click="selectedRoute('turnBackRoute')">选择</el-button>
             </el-form-item>
-          <el-form-item label="基础进路:" prop="basicRouteName">
+            <el-form-item label="基础进路:" prop="basicRouteName" label-width="100px">
               <el-input v-model="addModel.basicRouteName" readonly="true" style="width: 178px" />
               <el-button type="primary" @click="selectedRoute('basicRoute')">选择</el-button>
             </el-form-item>
-          <el-form-item label="折返区段:" prop="reentryTrackCode">
+            <el-form-item label="折返区段:" prop="reentryTrackCode" label-width="100px">
               <el-select v-model="addModel.reentryTrackCode" filterable>
                 <el-option
                   v-for="item in sectionList"
@@ -38,6 +39,48 @@
                 @click="hover('reentryTrackCode')"
               >{{ $t('map.activate') }}</el-button>
             </el-form-item>
+            <el-button
+              v-show="!showSecond"
+              icon="el-icon-plus"
+              style="position: absolute; right: 10px; bottom: 10px;"
+              size="small"
+              circle
+              class="point-button"
+              @click="setShowSecond(true)"
+            />
+          </el-card>
+          <el-card v-show="showSecond" style="width: 400px;position: relative; left: 80px; padding-top: 10px; margin-bottom: 20px">
+            <el-form-item label="折返进路2:" prop="turnBackRoute2Name" label-width="100px">
+              <el-input v-model="addModel.turnBackRoute2Name" readonly="true" style="width: 178px" />
+              <el-button type="primary" @click="selectedRoute('turnBackRoute2')">选择</el-button>
+            </el-form-item>
+            <el-form-item label="基础进路2:" prop="basicRoute2Name" label-width="100px">
+              <el-input v-model="addModel.basicRoute2Name" readonly="true" style="width: 178px" />
+              <el-button type="primary" @click="selectedRoute('basicRoute2')">选择</el-button>
+            </el-form-item>
+            <el-form-item label="折返区段2:" prop="reentryTrack2Code" label-width="100px">
+              <el-select v-model="addModel.reentryTrack2Code" filterable>
+                <el-option
+                  v-for="item in sectionList"
+                  :key="item.code"
+                  :label="item.name + ' (' + item.code+ ')'"
+                  :value="item.code"
+                />
+              </el-select>
+              <el-button
+                :type=" field === 'reentryTrack2Code' ? 'danger' : 'primary'"
+                @click="hover('reentryTrack2Code')"
+              >{{ $t('map.activate') }}</el-button>
+            </el-form-item>
+            <el-button
+              icon="el-icon-minus"
+              style="position: absolute; right: 10px; bottom: 10px;"
+              size="small"
+              circle
+              class="point-button"
+              @click="setShowSecond(false)"
+            />
+          </el-card>
           <el-form-item>
             <el-button-group>
               <el-button v-if="isSave" type="primary" size="small" :loading="loading" @click="save">{{ $t('map.save') }}
@@ -92,6 +135,7 @@ export default {
             field: '',
             isSave: true,
             loading: false,
+            showSecond: false,
             addModel: {
                 id: '',
                 code: '',
@@ -103,7 +147,12 @@ export default {
                 turnBackRouteCode: '',
                 basicRouteCode:'',
                 priority: 0,
-                reentryTrackCode: ''
+                reentryTrackCode: '',
+                turnBackRoute2Name: '',
+                basicRoute2Name: '',
+                reentryTrack2Code: null,
+                turnBackRoute2Code: null,
+                basicRoute2Code: null
             },
             editShow: false,
             rules: {
@@ -164,6 +213,9 @@ export default {
                 }
             }
         },
+        setShowSecond(flag) {
+            this.showSecond = flag;
+        },
         buildModel(code) {
             const model = Object.assign({}, this.addModel);
             if (code) { model['code'] = code; }
@@ -207,6 +259,11 @@ export default {
                 this.addModel.basicRouteCode = '';
                 this.addModel.turnBackRouteName = '';
                 this.addModel.turnBackRouteCode = '';
+                this.addModel.turnBackRoute2Name = '';
+                this.addModel.basicRoute2Name = '';
+                this.addModel.reentryTrack2Code = null;
+                this.addModel.turnBackRoute2Code = null;
+                this.addModel.basicRoute2Code = null;
                 this.addModel.stationCode = '';
                 this.addModel.mapId = this.mapInfo.id;
                 this.addModel.code = '';
@@ -221,16 +278,36 @@ export default {
             } else if (type === 'turnBackRoute') {
                 this.addModel.turnBackRouteName = data.name;
                 this.addModel.turnBackRouteCode = data.code;
+            } else if (type === 'basicRoute2') {
+                this.addModel.basicRoute2Name = data.name;
+                this.addModel.basicRoute2Code = data.code;
+            } else if (type === 'turnBackRoute2') {
+                this.addModel.turnBackRoute2Name = data.name;
+                this.addModel.turnBackRoute2Code = data.code;
             }
         },
         async handelRouteName(data) {
-            const model = {};
+            const model = {
-            const resp1 = await getRouteNewList(this.$route.params.mapId, {pageSize:10, pageNum:1, code: data.basicRouteCode});
+                reentryTrack2Code: null,
-            model.basicRouteName = resp1.data.list.length ? resp1.data.list[0].name : '';
+                turnBackRoute2Code: null,
-
+                basicRoute2Code: null
-            const resp2 = await getRouteNewList(this.$route.params.mapId, {pageSize:10, pageNum:1, code: data.turnBackRouteCode});
+            };
-            model.turnBackRouteName = resp2.data.list.length ? resp2.data.list[0].name : '';
+            const resp1 = await getRouteNewList(this.$route.params.mapId, {pageSize:9999, pageNum:1});
-
+            if (resp1 && resp1.code == '200') {
+                resp1.data.list.forEach(item => {
+                    if (item.code === data.turnBackRouteCode) {
+                        model.turnBackRouteName = item.name;
+                    } else if (item.code === data.basicRouteCode) {
+                        model.basicRouteName = item.name;
+                    } else if (item.code === data.turnBackRoute2Code) {
+                        model.turnBackRoute2Name = item.name;
+                    } else if (item.code === data.basicRoute2Code) {
+                        model.basicRoute2Name = item.name;
+                    }
+                });
+            } else {
+                this.$messageBox('获取进路列表失败！');
+            }
             this.addModel = deepAssign(model, data);
         }
     }

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

@@ -28,6 +28,13 @@
             <el-form-item :label="$t('map.lineWidth')" prop="width">
               <el-input-number v-model="addModel.width" :min="1" />px
             </el-form-item>
+            <el-form-item :label="$t('map.showConditions')" prop="showConditions">
+              <el-radio-group v-model="addModel.showConditions">
+                <el-radio label="01">{{ $t('map.localCenter') }}</el-radio>
+                <el-radio label="02">{{ $t('map.center') }}</el-radio>
+                <el-radio label="03">{{ $t('map.local') }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
             <div class="coordinate">
               <span class="title">{{ $t('map.linePoint') }}</span>
               <div class="point-section">
@@ -101,15 +108,22 @@ export default {
         return {
             activeName: 'first',
             LineTypeList: [],
+            showConditionsList: [
+                { label: this.$t('map.localCenter'), value: '01'},
+                { label: this.$t('map.center'), value: '02' },
+                { label: this.$t('map.local'), value: '03'}
+            ],
             editModel: {
                 code: '',
                 type: '',
                 width: 1,
+                showConditions: '01',
                 points: []
             },
             addModel: {
                 type: '',
                 width: 1,
+                showConditions: '01',
                 points: [
                     { x: 0, y: 0 },
                     { x: 100, y: 100 }
@@ -159,6 +173,7 @@ export default {
                             { prop: 'code', label: this.$t('map.lineCoding'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.lineList, change: true, deviceChange: this.deviceChange },
                             { prop: 'type', label: this.$t('map.lineType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.LineTypeList },
                             { prop: 'width', label: this.$t('map.lineWidth'), type: 'number', min: 1, placeholder: 'px' },
+                            { prop: 'showConditions', label: this.$t('map.showConditions'), type: 'radio', optionLabel: 'label', optionValue:'value', radioList: this.showConditionsList},
                             { prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '100px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint }
                         ]
                     },

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

@@ -102,10 +102,16 @@ export default {
         return {
             activeName: 'first',
             LineTypeList: [],
+            showConditionsList: [
+                { label: this.$t('map.localCenter'), value: '01'},
+                { label: this.$t('map.center'), value: '02' },
+                { label: this.$t('map.local'), value: '03'}
+            ],
             editModel: {
                 code: '',
                 width: 1,
                 height: 1,
+                showConditions: '01',
                 position: {
                     x: 0,
                     y: 0
@@ -115,6 +121,7 @@ export default {
                 code: '',
                 width: 200,
                 height: 100,
+                showConditions: '01',
                 position: {
                     x: 0,
                     y: 0
@@ -158,10 +165,11 @@ export default {
                             { prop: 'code', label: this.$t('map.lineCoding'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.outerFrameList, change: true, deviceChange: this.deviceChange },
                             { prop: 'width', label: '宽度:', type: 'number', min: 1, placeholder: 'px' },
                             { prop: 'height', label: '高度:', type: 'number', min: 1, placeholder: 'px' },
+                            { prop: 'showConditions', label: this.$t('map.showConditions'), type: 'radio', optionLabel: 'label', optionValue:'value', radioList: this.showConditionsList},
                             { prop: 'position', label: '坐标:', type: 'coordinate', width: '140px', children: [
                                 { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
                                 { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
-                            ] },
+                            ] }
                         ]
                     }
                 }
@@ -177,14 +185,15 @@ export default {
                         item: [
                             { prop: 'width', label: '宽度:', type: 'number', min: 1, placeholder: 'px' },
                             { prop: 'height', label: '高度:', type: 'number', min: 1, placeholder: 'px' },
+                            { prop: 'showConditions', label: this.$t('map.showConditions'), type: 'radio', optionLabel: 'label', optionValue:'value', radioList: this.showConditionsList},
                             { prop: 'position', label: '坐标:', type: 'coordinate', width: '110px', children: [
                                 { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '20px' },
                                 { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px' }
-                            ] },
+                            ] }
                         ]
                     }
                 }
-            }
+            };
         },
         isPointsShow() {
             return this.editModel.points.length > 0;

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

@@ -25,6 +25,13 @@
                 </el-select>
               </el-input>
             </el-form-item>
+            <el-form-item :label="$t('map.showConditions')" prop="showConditions">
+              <el-radio-group v-model="addModel.showConditions">
+                <el-radio label="01">{{ $t('map.localCenter') }}</el-radio>
+                <el-radio label="02">{{ $t('map.center') }}</el-radio>
+                <el-radio label="03">{{ $t('map.local') }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
             <div class="coordinate">
               <span class="title" style="width: 110px">{{ $t('map.textPoints') }}</span>
               <el-form-item
@@ -79,12 +86,18 @@ export default {
         return {
             activeName: 'first',
             skins: [],
+            showConditionsList: [
+                { label: this.$t('map.localCenter'), value: '01'},
+                { label: this.$t('map.center'), value: '02' },
+                { label: this.$t('map.local'), value: '03'}
+            ],
             editModel: {
                 code: '',
                 prepend: 'H',
                 content: '',
                 font: '',
                 fontColor: '',
+                showConditions: '',
                 position: {
                     x: 0,
                     y: 0
@@ -93,6 +106,7 @@ export default {
             addModel: {
                 prepend: 'H',
                 content: '',
+                showConditions: '',
                 position: {
                     x: 0,
                     y: 0
@@ -149,6 +163,7 @@ export default {
                             { prop: 'content', label: this.$t('map.textContent'), type: 'fontContent', content: 'content', prepend: 'prepend', placeholder: this.$t('map.pleaseEnter') },
                             { prop: 'font', label: this.$t('map.textFont'), type: 'font', placeholder: this.$t('map.font') },
                             { prop: 'fontColor', label: this.$t('map.textFontColor'), type: 'color' },
+                            { prop: 'showConditions', label: this.$t('map.showConditions'), type: 'radio', optionLabel: 'label', optionValue:'value', radioList: this.showConditionsList},
                             { prop: 'position', label: this.$t('map.textPoints'), type: 'coordinate', width: '120px', children: [
                                 { prop: 'position.x', firstLevel: 'position', secondLevel: 'x', label: 'x:', type: 'number', labelWidth: '25px', disabled: false },
                                 { prop: 'position.y', firstLevel: 'position', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px', disabled: false }