From 14e054b0ab48020a04acb6d34fcd199e82b92b83 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Fri, 6 Mar 2020 20:35:53 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/haerbin_01.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index 76851b190..5b9af2f6c 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -491,7 +491,13 @@ class SkinCode extends defaultStyle {
                 trainNameFormat: 'tripNumber:serviceNumber:groupNumber'// 列车显示格式
             },
             hsda: {
-                trainHSDATextFontSize: 8// 列车HDSA字号
+                lrPaddingHSDA: 3, // HSDA两边间隔
+                upPaddingHSDA: 20, // HSDA上边距离
+                trainHSDATextFontSize: 8, // 列车HDSA字号
+                textHContent: '扣', // textH文本
+                textSContent: '跳', // textS文本
+                textDContent: '门', // textD文本
+                textAContent: '警' // textA文本
             },
             trainAtrStatus: {
                 trainAtrStatusOffset: { x: 68, y: 9},

From 5d39b8e84e5c7368657351f042c7b3cfd7b526fa Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 11 Mar 2020 10:53:09 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E7=BB=98=E5=9B=BE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/map.js                      |   6 +-
 src/i18n/langs/zh/map.js                      |   8 +-
 src/jmapNew/map.js                            |  11 +-
 src/jmapNew/shape/Text/index.js               |  17 ++-
 src/jmapNew/shape/utils/handlePath.js         |  16 +--
 src/jmapNew/utils/handlePath.js               |  25 +++++
 src/jmapNew/utils/parser.js                   |   4 +-
 src/views/newMap/jlmapNew/index.vue           |  10 +-
 .../newMap/jlmapNew/pendant/showMode.vue      | 104 ++++++++++++++++++
 .../jlmapNew/{zoom => pendant}/zoom.vue       |  90 +++++++--------
 .../dataRelation/routeoperate/detail.vue      |  32 +++---
 src/views/newMap/newMapdraft/index.vue        |   2 +-
 12 files changed, 243 insertions(+), 82 deletions(-)
 create mode 100644 src/jmapNew/utils/handlePath.js
 create mode 100644 src/views/newMap/jlmapNew/pendant/showMode.vue
 rename src/views/newMap/jlmapNew/{zoom => pendant}/zoom.vue (51%)

diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js
index 98746137f..72cb8a8ff 100644
--- a/src/i18n/langs/en/map.js
+++ b/src/i18n/langs/en/map.js
@@ -605,5 +605,9 @@ export default {
     whetherAutoRoute: 'Whether auto route',
     hostileData: 'Hostile data',
     routeContinuesToProtectSectorData: 'Route continues to protect sector data',
-    physicalSectionID: 'Physical section id'
+    physicalSectionID: 'Physical section ID',
+    physicalSectionName: 'Physical section name',
+    routePhysicalSectionData: 'Route physical section data',
+    routeSideDefenseSwitch: 'Route side defense switch',
+    switchID: 'Switch ID'
 };
diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index d2a845f57..68f5800cd 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -598,5 +598,11 @@ export default {
     whetherAutoRoute: '是否自定进路',
     hostileData: '敌对数据',
     routeContinuesToProtectSectorData: '进路延续保护区段数据',
-    physicalSectionID: '物理区段ID'
+    physicalSectionID: '物理区段ID',
+    physicalSectionName: '物理区段名称',
+    routePhysicalSectionData: '进路物理区段数据',
+    routeSideDefenseSwitch: '进路侧防道岔',
+    switchID: '道岔ID',
+    normalPosition: '定位',
+    reversePosition: '反位'
 };
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 6d0a32ca3..99b158d20 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -10,6 +10,7 @@ import deviceType from './constant/deviceType';
 import { selectLineCode } from './config/deviceStyle';
 import { deviceFactory, createBoundingRect, calculateDCenter } from './utils/parser';
 import { deepAssign } from '@/utils/index';
+import { getPrdType, isPreviewOrMapDraw } from './utils/handlePath';
 import store from '@/store';
 
 const renderer = 'canvas';
@@ -61,6 +62,9 @@ class Jlmap {
 
         this.$keyboardController = new KeyboardController(this);
         this.$keyboardController.enable();
+        this.prdType = getPrdType();
+        this.previewOrMapDraw = isPreviewOrMapDraw();
+        this.showMode = '03'; // 预览和绘图下默认是现地状态
     }
 
     loadStyle(lineCode) {
@@ -159,7 +163,8 @@ class Jlmap {
         (list || []).forEach(elem => {
             const code = elem.code;
             const type = elem._type;
-            const oDevice = this.mapDevice[code] || deviceFactory(type, elem);
+            const showConfig = {prdType: this.prdType, previewOrMapDraw: this.previewOrMapDraw, showMode: this.showMode};
+            const oDevice = this.mapDevice[code] || deviceFactory(type, elem, showConfig);
             const nDevice = deepAssign(oDevice || {}, elem);
             this.$painter.delete(oDevice);
             delete this.mapDevice[code];
@@ -246,7 +251,7 @@ class Jlmap {
             const code = elem.code;
             const type = elem._type;
             const oDevice = this.mapDevice[code] || deviceFactory(type, elem);
-            this.hookHandle(oDevice, elem)
+            this.hookHandle(oDevice, elem);
         });
     }
     update(list) {
@@ -268,7 +273,7 @@ class Jlmap {
                     this.$painter.delete(oDevice);
                 } else {
                     // if (this.hookHandle(oDevice, elem)) {
-                        this.$painter.update(oDevice);
+                    this.$painter.update(oDevice);
                     // }
                 }
             }
diff --git a/src/jmapNew/shape/Text/index.js b/src/jmapNew/shape/Text/index.js
index 6b197771c..e289bcdae 100644
--- a/src/jmapNew/shape/Text/index.js
+++ b/src/jmapNew/shape/Text/index.js
@@ -1,6 +1,6 @@
 import Text from 'zrender/src/graphic/Text';
 import Group from 'zrender/src/container/Group';
-import {getPrdType, isShowThePrdType} from '../utils/handlePath';
+import { isShowThePrdType } from '../utils/handlePath';
 
 export default class Text2 extends Group {
     constructor(model, style) {
@@ -12,11 +12,13 @@ export default class Text2 extends Group {
         this.model = model;
         this.style = style;
         this.z = 6;
-        this.prdType = getPrdType();
-        if (isShowThePrdType(this.prdType, model.showConditions)) {
+        if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) {
             this.create();
             this.setState(model);
         }
+        if (model.previewOrMapDraw) {
+            this.setShowMode();
+        }
     }
 
     create() {
@@ -45,4 +47,13 @@ export default class Text2 extends Group {
 
     setState(model) {
     }
+    setShowMode() {
+        const showMode = this.model.showMode;
+        const showConditions = this.model.showCondition;
+        if (!showConditions || showConditions === '01' || showMode === showConditions) {
+            this.text.show();
+        } else {
+            this.text.hide();
+        }
+    }
 }
diff --git a/src/jmapNew/shape/utils/handlePath.js b/src/jmapNew/shape/utils/handlePath.js
index aa92d6364..034ea8b28 100644
--- a/src/jmapNew/shape/utils/handlePath.js
+++ b/src/jmapNew/shape/utils/handlePath.js
@@ -12,14 +12,14 @@ export function getPrdType() {
     return prdType;
 }
 export function isShowThePrdType (prdType, showConditions) {
-    const path = window.location.href;
-    if (path.indexOf('map/draw') !== -1 ) {
+    if (showConditions === '01' || (showConditions === '02' && prdType === '02') || (showConditions === '03' && prdType === '01')) {
         return true;
-    } else {
-        if (showConditions === '01' || (showConditions === '02' && prdType === '02') || (showConditions === '03' && prdType === '01')) {
-            return true;
-        } else if (!showConditions) {
-            return true; // 兼容老数据没有showConditions
-        }
+    } else if (!showConditions) {
+        return true; // 兼容老数据没有showConditions
     }
+
+}
+export function isPreviewOrMapDraw() {
+    const path = window.location.href;
+    return path.indexOf('map/draw') !== -1 || path.indexOf('mapPreviewNew') !== -1;
 }
diff --git a/src/jmapNew/utils/handlePath.js b/src/jmapNew/utils/handlePath.js
new file mode 100644
index 000000000..034ea8b28
--- /dev/null
+++ b/src/jmapNew/utils/handlePath.js
@@ -0,0 +1,25 @@
+export function getPrdType() {
+    let prdType = '';
+    const path = window.location.href;
+    if (path.includes('?')) {
+        const arr = window.location.href.split('?')[1].split('&');
+        arr.forEach(elem => {
+            if (elem.split('=')[0] === 'prdType') {
+                prdType = elem.split('=')[1];
+            }
+        });
+    }
+    return prdType;
+}
+export function isShowThePrdType (prdType, showConditions) {
+    if (showConditions === '01' || (showConditions === '02' && prdType === '02') || (showConditions === '03' && prdType === '01')) {
+        return true;
+    } else if (!showConditions) {
+        return true; // 兼容老数据没有showConditions
+    }
+
+}
+export function isPreviewOrMapDraw() {
+    const path = window.location.href;
+    return path.indexOf('map/draw') !== -1 || path.indexOf('mapPreviewNew') !== -1;
+}
diff --git a/src/jmapNew/utils/parser.js b/src/jmapNew/utils/parser.js
index ee489847d..d7163345d 100644
--- a/src/jmapNew/utils/parser.js
+++ b/src/jmapNew/utils/parser.js
@@ -30,8 +30,8 @@ export function calculateDCenter(viewRect, zrbound) {
     return { dx: dx, dy: dy };
 }
 
-export function deviceFactory(type, elem) {
-    return {...deviceRender[type], ...elem};
+export function deviceFactory(type, elem, showConfig) {
+    return {...deviceRender[type], ...elem, ...showConfig};
 }
 
 export function createDevice(type, elem, propConvert) {
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index a15641cee..d87a07a67 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -4,6 +4,7 @@
     <div :id="canvasId" style="background: #000;" class="display_canvas" />
     <progress-bar ref="progressBar" />
     <zoom-box v-if="!isScreen" :scale-rate="dataZoom.scaleRate" @setShrink="setShrink" @setMagnify="setMagnify" />
+    <show-mode v-if="isDesign" />
     <div v-if="show" class="zoom-view" :style="{ width: width +'px'}">
       <el-form :model="dataZoom" label-width="80px" size="mini" inline>
         <el-form-item :label="$t(`global.offset`)">
@@ -33,7 +34,8 @@
 import Vue from 'vue';
 import localStore from 'storejs';
 import Jlmap from '@/jmapNew/map';
-import ZoomBox from './zoom/zoom';
+import ZoomBox from './pendant/zoom';
+import ShowMode from './pendant/showMode';
 import ProgressBar from '@/views/components/progressBar/index';
 import { mapGetters } from 'vuex';
 import { TrainingMode } from '@/scripts/ConstDic';
@@ -44,7 +46,8 @@ export default {
     name: 'JlmapVisual',
     components: {
         ZoomBox,
-        ProgressBar
+        ProgressBar,
+        ShowMode
     },
     data() {
         return {
@@ -89,6 +92,9 @@ export default {
         },
         maskOpen() {
             return this.$store.state.config.maskOpen;
+        },
+        isDesign() {
+            return this.$route.path.indexOf('mapPreviewNew') !== -1 || this.$route.path.indexOf('map/draw') !== -1;
         }
     },
     watch: {
diff --git a/src/views/newMap/jlmapNew/pendant/showMode.vue b/src/views/newMap/jlmapNew/pendant/showMode.vue
new file mode 100644
index 000000000..7ada7284a
--- /dev/null
+++ b/src/views/newMap/jlmapNew/pendant/showMode.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="zoom-box" :style="{top: offsetY+'px', right: offsetX+ 'px'}">
+    <el-select v-model="swch" size="small" :placeholder="$t('display.schema.selectProduct')" @change="switchMode">
+      <el-option v-for="item in swchList" :key="item.value" :label="item.name" :value="item.value" />
+    </el-select>
+  </div>
+</template>
+<script>
+export default {
+    name: 'ShowMode',
+    data() {
+        return {
+            offsetY: 15,
+            offsetX: 20,
+            swch: '01',
+            swchList: [
+                { value: '01', name: '现地' },
+                { value: '02', name: '行调' }
+            ]
+        };
+    },
+    watch: {
+        '$store.state.config.menuBarLoadedCount': function (val) {
+            this.$nextTick(() => {
+                this.setPosition();
+            });
+        },
+        '$route' () {
+            this.setOffsetX();
+        }
+    },
+    mounted() {
+        this.setOffsetX();
+    },
+    methods: {
+        setPosition() {
+            this.$nextTick(() => {
+                let offsetY = 15;
+                const menuBar = document.getElementById('menuBar');
+                const menuTool = document.getElementById('menuTool');
+
+                if (menuBar) {
+                    offsetY += (menuBar.offsetHeight || 0);
+                }
+
+                if (menuTool) {
+                    offsetY += (menuTool.offsetHeight || 0);
+                }
+
+                if (this.offsetY != offsetY) {
+                    this.offsetY = offsetY;
+                }
+            });
+        },
+        setOffsetX() {
+            if (this.$route.path.indexOf('mapPreviewNew') !== -1) {
+                this.offsetX = 20;
+            } else if (this.$route.path.indexOf('map/draw') !== -1) {
+                this.offsetX = 140;
+            }
+        },
+        switchMode(val) {
+            console.log(val, '==========');
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .zoom-box {
+        z-index: 7;
+        position: absolute;
+        right: 20px;
+        width: 120px;
+        height: 32px;
+        background: rgb(224, 223, 223);
+        border-radius: 4px;
+        overflow: hidden;
+
+        .zoom {
+            width: 50%;
+            float: right;
+            height: 100%;
+            margin: 0;
+            padding: 0;
+            border-radius: 0;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            border: none;
+            outline: none;
+            color: #333;
+
+            i {
+                color: #000;
+                font-size: 18px;
+                font-weight: 900;
+            }
+        }
+
+        .shrink {
+            border-right: 1px solid #333;
+        }
+    }
+</style>
diff --git a/src/views/newMap/jlmapNew/zoom/zoom.vue b/src/views/newMap/jlmapNew/pendant/zoom.vue
similarity index 51%
rename from src/views/newMap/jlmapNew/zoom/zoom.vue
rename to src/views/newMap/jlmapNew/pendant/zoom.vue
index 957a7cb6e..87764c435 100644
--- a/src/views/newMap/jlmapNew/zoom/zoom.vue
+++ b/src/views/newMap/jlmapNew/pendant/zoom.vue
@@ -10,54 +10,54 @@
 </template>
 <script>
 export default {
-	name: 'ZoomBox',
-	props: {
-		scaleRate: {
-			type: String,
-			default() {
-				return '1';
-			}
-		}
-	},
-	data() {
-		return {
-			offset: 15
-		};
-	},
-	watch: {
-		'$store.state.config.menuBarLoadedCount': function (val) {
-			this.$nextTick(() => {
-				this.setPosition();
-			});
-		}
-	},
-	methods: {
-		setPosition() {
-			this.$nextTick(() => {
-				let offset = 15;
-				const menuBar = document.getElementById('menuBar');
-				const menuTool = document.getElementById('menuTool');
+    name: 'ZoomBox',
+    props: {
+        scaleRate: {
+            type: String,
+            default() {
+                return '1';
+            }
+        }
+    },
+    data() {
+        return {
+            offset: 15
+        };
+    },
+    watch: {
+        '$store.state.config.menuBarLoadedCount': function (val) {
+            this.$nextTick(() => {
+                this.setPosition();
+            });
+        }
+    },
+    methods: {
+        setPosition() {
+            this.$nextTick(() => {
+                let offset = 15;
+                const menuBar = document.getElementById('menuBar');
+                const menuTool = document.getElementById('menuTool');
 
-				if (menuBar) {
-					offset += (menuBar.offsetHeight || 0);
-				}
+                if (menuBar) {
+                    offset += (menuBar.offsetHeight || 0);
+                }
 
-				if (menuTool) {
-					offset += (menuTool.offsetHeight || 0);
-				}
+                if (menuTool) {
+                    offset += (menuTool.offsetHeight || 0);
+                }
 
-				if (this.offset != offset) {
-					this.offset = offset;
-				}
-			});
-		},
-		setShrinkCanvas() {
-			this.$emit('setShrink');
-		},
-		setMagnifyCanvas() {
-			this.$emit('setMagnify');
-		}
-	}
+                if (this.offset != offset) {
+                    this.offset = offset;
+                }
+            });
+        },
+        setShrinkCanvas() {
+            this.$emit('setShrink');
+        },
+        setMagnifyCanvas() {
+            this.$emit('setMagnify');
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
index 5b2bdf9f4..ee244e8d8 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
@@ -306,8 +306,8 @@ export default {
                     name: row.name,
                     model: {
                         items: [
-                            { prop: 'sectionCode', label: '物理区段ID', type: 'text' },
-                            { prop: 'sectionCode', label: '物理区段名称', type: 'select', options: sectionDict }
+                            { prop: 'sectionCode', label: this.$t('map.physicalSectionID'), type: 'text' },
+                            { prop: 'sectionCode', label: this.$t('map.physicalSectionName'), type: 'select', options: sectionDict }
                         ]
                     }
                 };
@@ -322,12 +322,12 @@ export default {
                 const fieldList = {
                     id: row.id,
                     mapId: this.$route.params.mapId,
-                    title: '进路物理区段数据',
+                    title: this.$t('map.routePhysicalSectionData'),
                     name: row.name,
                     model: {
                         items: [
-                            { prop: 'sectionCode', label: '物理区段ID', type: 'text' },
-                            { prop: 'sectionCode', label: '物理区段名称', type: 'select', options: sectionDict }
+                            { prop: 'sectionCode', label: this.$t('map.physicalSectionID'), type: 'text' },
+                            { prop: 'sectionCode', label: this.$t('map.physicalSectionName'), type: 'select', options: sectionDict }
                         ]
                     }
                 };
@@ -355,18 +355,18 @@ export default {
                 const fieldList = {
                     id: row.id,
                     mapId: this.$route.params.mapId,
-                    title: '进路侧防道',
+                    title: this.$t('map.routeSideDefenseSwitch'),
                     name: row.name,
                     model: {
                         items: [
-                            { prop: 'switchCode', label: '道岔ID', type: 'text' },
-                            { prop: 'switchCode', label: '道岔名称', type: 'select', options: switchDict },
-                            { prop: 'switchType', label: '道岔类型', type: 'text'}
+                            { prop: 'switchCode', label: this.$t('map.switchID'), type: 'text' },
+                            { prop: 'switchCode', label: this.$t('map.switchName'), type: 'select', options: switchDict },
+                            { prop: 'switchType', label: this.$t('map.switchType'), type: 'text'}
                         ]
                     }
                 };
                 row.routeFlankProtectionList.forEach( item => {
-                    item.switchType = item.normal ? '定位' : '反位';
+                    item.switchType = item.normal ? this.$t('map.normalPosition') : this.$t('map.reversePosition');
                 });
                 this.$refs.previewField.doShow(fieldList, row.routeFlankProtectionList);
             }
@@ -378,19 +378,19 @@ export default {
                 const fieldList = {
                     id: row.id,
                     mapId: this.$route.params.mapId,
-                    title: '进路道岔数据',
+                    title: this.$t('map.entryTurnout'),
                     name: row.name,
                     model: {
                         field: 'routeSwitchList',
                         items: [
-                            { prop: 'switchCode', label: '道岔ID', type: 'text' },
-                            { prop: 'switchCode', label: '道岔名称', type: 'select', options: switchDict },
-                            { prop: 'switchType', label: '道岔类型', type: 'text'}
+                            { prop: 'switchCode', label: this.$t('map.switchID'), type: 'text' },
+                            { prop: 'switchCode', label: this.$t('map.switchName'), type: 'select', options: switchDict },
+                            { prop: 'switchType', label: this.$t('map.switchType'), type: 'text'}
                         ]
                     }
                 };
                 row.routeSwitchList.forEach( item => {
-                    item.switchType = item.normal ? '定位' : '反位';
+                    item.switchType = item.normal ? this.$t('map.normalPosition') : this.$t('map.reversePosition');
                 });
                 this.$refs.previewField.doShow(fieldList, row.routeSwitchList);
             }
@@ -398,7 +398,7 @@ export default {
         // 保存
         saveRelated(row) {
             putRouteNew(row).then(response => {
-                this.$message.success('更新成功');
+                this.$message.success(this.$t('tip.updateSuccessfully'));
             }).catch(() => {
                 this.$messageBox('操作异常');
             });
diff --git a/src/views/newMap/newMapdraft/index.vue b/src/views/newMap/newMapdraft/index.vue
index bf4cfb89b..356481103 100644
--- a/src/views/newMap/newMapdraft/index.vue
+++ b/src/views/newMap/newMapdraft/index.vue
@@ -386,7 +386,7 @@ export default {
     .operation_box{
         position: absolute;
         right: 20px;
-        top: 20px;
+        top: 15px;
         z-index: 9;
     }
 

From ef60af34c0698c7e4918ddbea8c67090a9116999 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 11 Mar 2020 15:10:08 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E7=BB=98=E5=9B=BE=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=8E=B0=E5=9C=B0=E8=A1=8C=E8=B0=83=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/skinCode/bejing_01.js      |  8 +--
 src/jmapNew/config/skinCode/chengdu_01.js     | 30 +++++++++--
 src/jmapNew/config/skinCode/chengdu_03.js     |  8 +--
 src/jmapNew/config/skinCode/fuzhou_01.js      | 30 +++++++++--
 src/jmapNew/config/skinCode/haerbin_01.js     | 30 +++++++++--
 src/jmapNew/config/skinCode/ningbo_01.js      |  8 +--
 src/jmapNew/map.js                            | 24 ++++++---
 src/jmapNew/painter.js                        |  9 +++-
 src/jmapNew/shape/Automactic/index.js         | 23 ++++++--
 src/jmapNew/shape/AutomacticRoute/index.js    | 21 ++++++--
 src/jmapNew/shape/LcControl/index.js          |  1 +
 src/jmapNew/shape/LimitControl/index.js       |  1 +
 src/jmapNew/shape/Line/index.js               | 22 ++++++--
 src/jmapNew/shape/OutFrame/index.js           | 18 +++++--
 src/jmapNew/shape/Psd/index.js                |  2 +
 src/jmapNew/shape/Resource/index.js           |  1 +
 src/jmapNew/shape/Section/index.js            |  2 +-
 src/jmapNew/shape/Signal/index.js             |  1 +
 src/jmapNew/shape/Station/index.js            | 18 +++++--
 src/jmapNew/shape/StationControl/index.js     |  1 +
 src/jmapNew/shape/StationCounter/index.js     |  1 +
 src/jmapNew/shape/StationDelayUnlock/index.js |  1 +
 src/jmapNew/shape/StationStand/index.js       | 24 +++++++--
 src/jmapNew/shape/Switch/index.js             |  5 +-
 src/jmapNew/shape/Text/index.js               | 11 ++--
 src/jmapNew/shape/Train/index.js              |  1 +
 src/jmapNew/shape/TrainWindow/index.js        |  1 +
 src/jmapNew/shape/ZcControl/index.js          |  1 +
 src/jmapNew/shape/checkBox/checkBox.js        |  1 +
 src/jmapNew/shape/element/EControl.js         |  8 +++
 src/jmapNew/shape/utils/handlePath.js         | 25 ---------
 src/jmapNew/utils/parser.js                   | 52 +++++++++----------
 src/store/modules/map.js                      |  8 ++-
 src/utils/baseUrl.js                          |  4 +-
 src/views/newMap/jlmapNew/index.vue           | 20 ++++++-
 .../newMap/jlmapNew/pendant/showMode.vue      |  6 +--
 36 files changed, 313 insertions(+), 114 deletions(-)
 delete mode 100644 src/jmapNew/shape/utils/handlePath.js

diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index ada8ab466..7e1d9fb83 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -212,7 +212,7 @@ class SkinCode extends defaultStyle {
 
         this[deviceType.MapCycleButtonVO] = {
             // 是否显示
-            visibleConditions: ['01'],
+            visibleConditions: '03',
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
@@ -239,7 +239,7 @@ class SkinCode extends defaultStyle {
         this[deviceType.StationStand] = {
             common: { 												// 通用属性
                 textFontSize: 8, 									// 站台默认字体大小
-                functionButtonShow: ['01']					// 功能灯按钮显示条件（prdType）
+                functionButtonShow: '03'							// 功能灯按钮显示条件（01所有模式下显示 02 行调显示 03现地显示）
             },
             safetyDoor: { 											// 屏蔽门
                 height: 1.6, 										// 站台屏蔽门高度
@@ -320,7 +320,7 @@ class SkinCode extends defaultStyle {
             // 	show: true											// 公里标名称显示
             // },
             kmPostShow: true,										// 公里标显示
-            functionButtonShow: ['01'],					// 功能灯按钮（引导总锁）显示条件（prdType）
+            functionButtonShow: '03',					// 功能灯按钮（引导总锁）显示条件 01全部模式下显示 02 行调显示 03 现地显示
             kilometerPosition: 'down', 							 	// 公里标位置
             fontWeight: 'bold',										// 文字错细
             text: {
@@ -492,7 +492,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.AutomaticRoute] = {
             // 是否显示
-            displayCondition: [], // 显示条件 prdType
+            displayCondition: '03', // 显示条件 prdType
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js
index 3fc506cf9..ebf7ad2a4 100644
--- a/src/jmapNew/config/skinCode/chengdu_01.js
+++ b/src/jmapNew/config/skinCode/chengdu_01.js
@@ -209,7 +209,7 @@ class SkinCode extends defaultStyle {
             common: { 										// 通用属性
                 textFontSize: 10, 							// 站台默认字体大小
                 haveJumpShow: false,							// 站台是否有列车停跳显示
-                functionButtonShow: []						// 功能灯按钮显示条件（prdType）
+                functionButtonShow: '03'					// 功能灯按钮显示条件（01所有模式下显示 02 行调显示 03现地显示）
             },
             safetyDoor: { 									// 屏蔽门
                 height: 3, 									// 站台屏蔽门高度
@@ -289,13 +289,37 @@ class SkinCode extends defaultStyle {
                 borderColor: '#FFFFFF'						// 延迟解锁边框颜色
             }
         };
+        this[deviceType.MapCycleButtonVO] = {
+            // 是否显示
+            visibleConditions: '03',
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            subtitleText: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 17 // 等于副标题距离
+            },
+            lamp: {
+                lineDash: null, // 灯的包围框
+                borderShow: false, // 是否显示边框
+                stroke: '#FFFFFF', // 框的颜色
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3'						// 控制灯颜色 (灰色)
+            },
+            OutFrame: {
 
+            }
+        };
         this[deviceType.Station] = {
             // text: {
             // 	show: true											// 公里标名称显示
             // },
             kmPostShow: false,										// 公里标显示
-            functionButtonShow: ['01'],					// 功能灯按钮（引导总锁）显示条件（prdType）
+            functionButtonShow: '03',					// 功能灯按钮（引导总锁）显示条件 01全部模式下显示 02 行调显示 03 现地显示
             kilometerPosition: 'up',							// 公里标朝向
             text: {
                 fontSize: 11,								// 字体大小
@@ -426,7 +450,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.AutomaticRoute] = {
             // 是否显示
-            displayCondition: [], // 显示条件 prdType
+            displayCondition: '03', // 显示条件 prdType
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index ad1c8fba2..5e8f30c4c 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -212,7 +212,7 @@ class SkinCode extends defaultStyle {
             common: { 										// 通用属性
                 textFontSize: 10, 							// 站台默认字体大小
                 haveJumpShow: true,							// 站台是否有列车停跳显示
-                functionButtonShow: ['01']					// 功能灯按钮显示条件（prdType）
+                functionButtonShow: '03'					// 功能灯按钮显示条件（prdType）
             },
             safetyDoor: { 									// 屏蔽门
                 height: 3, 									// 站台屏蔽门高度
@@ -300,7 +300,7 @@ class SkinCode extends defaultStyle {
             // 	show: true									// 公里标名称显示
             // },
             kmPostShow: false,										// 公里标显示
-            functionButtonShow: ['01'],					// 功能灯按钮（引导总锁）显示条件（prdType）
+            functionButtonShow: '03',					// 功能灯按钮（引导总锁）显示条件 01全部模式下显示 02 行调显示 03 现地显示
             kilometerPosition: 'up',							// 公里标朝向
             text: {
                 fontSize: 11,								// 字体大小
@@ -451,7 +451,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.AutomaticRoute] = {
             // 是否显示
-            displayCondition: ['01'], // 显示条件prdType 为01
+            displayCondition: '03', // 显示条件prdType 为01
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
@@ -465,7 +465,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.MapCycleButtonVO] = {
             // 是否显示
-            visibleConditions: ['01'],
+            visibleConditions: '03',
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index 4bc15dab7..7f3a26437 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -200,7 +200,7 @@ class SkinCode extends defaultStyle {
         this[deviceType.StationStand] = {
             common: { 											// 通用属性
                 textFontSize: 11, 								// 站台默认字体大小
-                functionButtonShow: []							// 功能灯按钮显示条件（prdType）
+                functionButtonShow: '03'					// 功能灯按钮显示条件（01所有模式下显示 02 行调显示 03现地显示）
             },
             safetyDoor: { 										// 屏蔽门
                 height: 3, 										// 站台屏蔽门高度
@@ -272,13 +272,37 @@ class SkinCode extends defaultStyle {
                 borderColor: '#FFFFFF'							// 延迟解锁边框颜色
             }
         };
+        this[deviceType.MapCycleButtonVO] = {
+            // 是否显示
+            visibleConditions: '03',
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            subtitleText: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 17 // 等于副标题距离
+            },
+            lamp: {
+                lineDash: null, // 灯的包围框
+                borderShow: false, // 是否显示边框
+                stroke: '#FFFFFF', // 框的颜色
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3'						// 控制灯颜色 (灰色)
+            },
+            OutFrame: {
 
+            }
+        };
         this[deviceType.Station] = {
             // text: {
             // 	show: true											// 公里标名称显示
             // },
             kmPostShow: true,										// 公里标显示
-            functionButtonShow: ['01'],					// 功能灯按钮（引导总锁）显示条件（prdType）
+            functionButtonShow: '03',					// 功能灯按钮（引导总锁）显示条件 01全部模式下显示 02 行调显示 03 现地显示
             kilometerPosition: 'up',									// 公里标朝向
             text: {
                 fontSize: 11,								// 字体大小
@@ -442,7 +466,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.AutomaticRoute] = {
             // 是否显示
-            displayCondition: [], // 显示条件 prdType
+            displayCondition: '03', // 显示条件 prdType
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index 4b7256d8c..ae71cd15f 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -204,7 +204,7 @@ class SkinCode extends defaultStyle {
                 textFontSize: 11, 								// 站台默认字体大小
                 special: true,									// 特殊站台
                 haveJumpShow: true,						// 站台是否有列车停跳显示
-                functionButtonShow: []							// 功能灯按钮显示条件（prdType）
+                functionButtonShow: '03'					// 功能灯按钮显示条件（01所有模式下显示 02 行调显示 03现地显示）
             },
             safetyDoor: { 										// 屏蔽门
                 height: 3, 										// 站台屏蔽门高度
@@ -287,13 +287,37 @@ class SkinCode extends defaultStyle {
                 borderColor: '#FFFFFF'							// 延迟解锁边框颜色
             }
         };
+        this[deviceType.MapCycleButtonVO] = {
+            // 是否显示
+            visibleConditions: '03',
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            subtitleText: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 17 // 等于副标题距离
+            },
+            lamp: {
+                lineDash: null, // 灯的包围框
+                borderShow: false, // 是否显示边框
+                stroke: '#FFFFFF', // 框的颜色
+                fill: 'rgba(0,0,0,0)', // 填充色
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#b5b3b3'						// 控制灯颜色 (灰色)
+            },
+            OutFrame: {
 
+            }
+        };
         this[deviceType.Station] = {
             // text: {
             // 	show: true											// 公里标名称显示
             // },
             kmPostShow: true,										// 公里标显示
-            functionButtonShow: ['01'],					// 功能灯按钮（引导总锁）显示条件（prdType）
+            functionButtonShow: '03',					// 功能灯按钮（引导总锁）显示条件
             kilometerPosition: 'up',									// 公里标朝向
             text: {
                 borderShow: true, // 车站包围框显示
@@ -464,7 +488,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.AutomaticRoute] = {
             // 是否显示
-            displayCondition: ['01'],
+            displayCondition: '03',
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index c8ddb61a5..1f4dbd6ee 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -208,7 +208,7 @@ class SkinCode extends defaultStyle {
 
         this[deviceType.MapCycleButtonVO] = {
             // 是否显示
-            visibleConditions: ['01', '02'],
+            visibleConditions: '01',
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
@@ -236,7 +236,7 @@ class SkinCode extends defaultStyle {
             common: { 										// 通用属性
                 textFontSize: 10, 							// 站台默认字体大小
                 haveJumpShow: false,						// 站台是否有列车停跳显示
-                functionButtonShow: []						// 功能灯按钮显示条件（prdType）
+                functionButtonShow: '03'					// 功能灯按钮显示条件（01所有模式下显示 02 行调显示 03现地显示）
             },
             safetyDoor: { 									// 屏蔽门
                 height: 3, 									// 站台屏蔽门高度
@@ -322,7 +322,7 @@ class SkinCode extends defaultStyle {
             // 	show: true											// 公里标名称显示
             // },
             kmPostShow: false,										// 公里标显示
-            functionButtonShow: ['01'],					// 功能灯按钮（引导总锁）显示条件（prdType）
+            functionButtonShow: '03',					// 功能灯按钮（引导总锁）显示条件 01全部模式下显示 02 行调显示 03 现地显示
             kilometerPosition: 'up',							// 公里标朝向
             text: {
                 fontSize: 11,								// 字体大小
@@ -458,7 +458,7 @@ class SkinCode extends defaultStyle {
         };
         this[deviceType.AutomaticRoute] = {
             // 是否显示
-            displayCondition: [], // 显示条件 prdType
+            displayCondition: '03', // 显示条件 prdType
             text: {
                 fontSize: 11,								// 字体大小
                 fontWeight: 'normal',						// 字体粗细
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 99b158d20..c295b489d 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -10,7 +10,6 @@ import deviceType from './constant/deviceType';
 import { selectLineCode } from './config/deviceStyle';
 import { deviceFactory, createBoundingRect, calculateDCenter } from './utils/parser';
 import { deepAssign } from '@/utils/index';
-import { getPrdType, isPreviewOrMapDraw } from './utils/handlePath';
 import store from '@/store';
 
 const renderer = 'canvas';
@@ -62,9 +61,7 @@ class Jlmap {
 
         this.$keyboardController = new KeyboardController(this);
         this.$keyboardController.enable();
-        this.prdType = getPrdType();
-        this.previewOrMapDraw = isPreviewOrMapDraw();
-        this.showMode = '03'; // 预览和绘图下默认是现地状态
+        this.showConfig = opts.showConfig;
     }
 
     loadStyle(lineCode) {
@@ -163,8 +160,7 @@ class Jlmap {
         (list || []).forEach(elem => {
             const code = elem.code;
             const type = elem._type;
-            const showConfig = {prdType: this.prdType, previewOrMapDraw: this.previewOrMapDraw, showMode: this.showMode};
-            const oDevice = this.mapDevice[code] || deviceFactory(type, elem, showConfig);
+            const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
             const nDevice = deepAssign(oDevice || {}, elem);
             this.$painter.delete(oDevice);
             delete this.mapDevice[code];
@@ -254,6 +250,20 @@ class Jlmap {
             this.hookHandle(oDevice, elem);
         });
     }
+    updateShowMode(list, showMode) {
+        this.showConfig.showMode = showMode;
+        (list || []).forEach(elem => {
+            const code = elem.code;
+            const type = elem._type;
+            const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
+            oDevice.showMode = showMode;
+            this.$painter.updateShowMode(oDevice);
+        });
+        this.$painter.$transformHandle.revisibleAll();
+    }
+    getShowConfig() {
+        return this.showConfig;
+    }
     update(list) {
         this.setUpdateMapDevice(list || []); // 增加一个 前数据 处理 为了在区段中 获取全部的 道岔信息
         (list || []).forEach(elem => {
@@ -268,7 +278,7 @@ class Jlmap {
                     this.$painter.update(signalDevice);
                 }
             } else {
-                const oDevice = this.mapDevice[code] || deviceFactory(type, elem);
+                const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
                 if (elem.dispose) {
                     this.$painter.delete(oDevice);
                 } else {
diff --git a/src/jmapNew/painter.js b/src/jmapNew/painter.js
index d1c7af375..4ecb76566 100644
--- a/src/jmapNew/painter.js
+++ b/src/jmapNew/painter.js
@@ -161,7 +161,14 @@ class Painter {
             }
         }
     }
-
+    /**
+     * 更新显示模式
+     */
+    updateShowMode(device) {
+        if (device && device.instance) {
+            device.instance.setShowMode();
+        }
+    }
     /**
      * 更新transform变化
      * @param {*} opt
diff --git a/src/jmapNew/shape/Automactic/index.js b/src/jmapNew/shape/Automactic/index.js
index 335b5bf38..38778b06e 100644
--- a/src/jmapNew/shape/Automactic/index.js
+++ b/src/jmapNew/shape/Automactic/index.js
@@ -6,7 +6,7 @@ import Arc from 'zrender/src/graphic/shape/Arc';
 import Text from 'zrender/src/graphic/Text';
 import Rect from 'zrender/src/graphic/shape/Rect';
 import EMouse from './EMouse';
-import {getPrdType} from '../utils/handlePath';
+import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class Automactic extends Group {
     constructor(model, style) {
@@ -17,12 +17,14 @@ export default class Automactic extends Group {
         this.zlevel = model.zlevel;
         this.model = model;
         this.style = style;
-        this.prdType = getPrdType();
-        if (!this.prdType || this.style.MapCycleButtonVO.visibleConditions.indexOf(this.prdType) !== -1) {
+        if (isShowThePrdType(model.prdType, style.MapCycleButtonVO.visibleConditions) || model.previewOrMapDraw) {
             this.create();
             this.createMouseEvent();
             this.setState(model);
         }
+        if (model.previewOrMapDraw) {
+            this.setShowMode();
+        }
     }
 
     create() {
@@ -136,4 +138,19 @@ export default class Automactic extends Group {
         }
         return null;
     }
+    setShowMode() {
+        const showMode = this.model.showMode;
+        const showConditions = this.style.MapCycleButtonVO.visibleConditions;
+        if (!showConditions || showConditions === '01' || showMode === showConditions) {
+            this.control.show();
+            this.text.show();
+            this.subtitleText && this.subtitleText.show();
+            this.arcBorder && this.arcBorder.show();
+        } else {
+            this.control.hide();
+            this.text.hide();
+            this.subtitleText && this.subtitleText.hide();
+            this.arcBorder && this.arcBorder.hide();
+        }
+    }
 }
diff --git a/src/jmapNew/shape/AutomacticRoute/index.js b/src/jmapNew/shape/AutomacticRoute/index.js
index 0e9f8c14e..dfa8499a5 100644
--- a/src/jmapNew/shape/AutomacticRoute/index.js
+++ b/src/jmapNew/shape/AutomacticRoute/index.js
@@ -5,7 +5,7 @@ import Group from 'zrender/src/container/Group';
 import Arc from 'zrender/src/graphic/shape/Arc';
 import Text from 'zrender/src/graphic/Text';
 import EMouse from './EMouse';
-import {getPrdType} from '../utils/handlePath';
+import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class LcControl extends Group {
     constructor(model, style) {
@@ -16,12 +16,14 @@ export default class LcControl extends Group {
         this.zlevel = model.zlevel;
         this.model = model;
         this.style = style;
-        this.prdType = getPrdType();
-        if (!this.prdType || this.style.AutomaticRoute.displayCondition.indexOf(this.prdType) !== -1) {
+        if (isShowThePrdType(model.prdType, style.AutomaticRoute.displayCondition) || model.previewOrMapDraw) {
             this.create();
             this.createMouseEvent();
             this.setState(model);
         }
+        if (model.previewOrMapDraw) {
+            this.setShowMode();
+        }
     }
 
     create() {
@@ -106,4 +108,17 @@ export default class LcControl extends Group {
         }
         return null;
     }
+    setShowMode() {
+        const showMode = this.model.showMode;
+        const showConditions = this.style.AutomaticRoute.displayCondition;
+        if (!showConditions || showConditions === '01' || showMode === showConditions) {
+            this.control.show();
+            this.text.show();
+            this.subtitleText && this.subtitleText.show();
+        } else {
+            this.control.hide();
+            this.text.hide();
+            this.subtitleText && this.subtitleText.hide();
+        }
+    }
 }
diff --git a/src/jmapNew/shape/LcControl/index.js b/src/jmapNew/shape/LcControl/index.js
index 53da947a2..d160a39c7 100644
--- a/src/jmapNew/shape/LcControl/index.js
+++ b/src/jmapNew/shape/LcControl/index.js
@@ -76,4 +76,5 @@ export default class LcControl extends Group {
         }
         return null;
     }
+    setShowMode() {}
 }
diff --git a/src/jmapNew/shape/LimitControl/index.js b/src/jmapNew/shape/LimitControl/index.js
index e6ded2ee0..e93aa7760 100644
--- a/src/jmapNew/shape/LimitControl/index.js
+++ b/src/jmapNew/shape/LimitControl/index.js
@@ -80,4 +80,5 @@ export default class LimitControl extends Group {
         }
         return null;
     }
+    setShowMode() {}
 }
diff --git a/src/jmapNew/shape/Line/index.js b/src/jmapNew/shape/Line/index.js
index eaa50caaf..87601d9ef 100644
--- a/src/jmapNew/shape/Line/index.js
+++ b/src/jmapNew/shape/Line/index.js
@@ -1,6 +1,6 @@
 import Line from 'zrender/src/graphic/shape/Line';
 import Group from 'zrender/src/container/Group';
-import {getPrdType, isShowThePrdType} from '../utils/handlePath';
+import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class Line2 extends Group {
     constructor(model, style) {
@@ -11,11 +11,13 @@ export default class Line2 extends Group {
         this.z = 0;
         this.model = model;
         this.style = style;
-        this.prdType = getPrdType();
-        if (isShowThePrdType(this.prdType, model.showConditions)) {
+        if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) {
             this.create();
             this.setState(model);
         }
+        if (model.previewOrMapDraw) {
+            this.setShowMode();
+        }
     }
 
     create() {
@@ -55,4 +57,18 @@ export default class Line2 extends Group {
     setState(model) {
         this.setLineType(model.type);
     }
+    // 设置显示模式
+    setShowMode() {
+        const showMode = this.model.showMode;
+        const showConditions = this.model.showConditions;
+        if (!showConditions || showConditions === '01' || showMode === showConditions) {
+            this.eachChild((child) => {
+                child.show();
+            });
+        } else {
+            this.eachChild((child) => {
+                child.hide();
+            });
+        }
+    }
 }
diff --git a/src/jmapNew/shape/OutFrame/index.js b/src/jmapNew/shape/OutFrame/index.js
index 2d8053a57..6a8dd70b8 100644
--- a/src/jmapNew/shape/OutFrame/index.js
+++ b/src/jmapNew/shape/OutFrame/index.js
@@ -1,6 +1,6 @@
 import Group from 'zrender/src/container/Group';
 import Rect from 'zrender/src/graphic/shape/Rect';
-import {getPrdType, isShowThePrdType} from '../utils/handlePath';
+import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class OutFrame extends Group {
     constructor(model, style) {
@@ -11,11 +11,13 @@ export default class OutFrame extends Group {
         this.style = style;
         this.zlevel = model.zlevel;
         this.z = 0;
-        this.prdType = getPrdType();
-        if (isShowThePrdType(this.prdType, model.showConditions)) {
+        if (isShowThePrdType(model.prdType, model.showConditions) || model.previewOrMapDraw) {
             this.create();
             this.setState(model);
         }
+        if (model.previewOrMapDraw) {
+            this.setShowMode();
+        }
     }
 
     create() {
@@ -42,4 +44,14 @@ export default class OutFrame extends Group {
     // 设置状态
     setState(model) {
     }
+    // 设置显示模式
+    setShowMode() {
+        const showMode = this.model.showMode;
+        const showConditions = this.model.showConditions;
+        if (!showConditions || showConditions === '01' || showMode === showConditions) {
+            this.box && this.box.show();
+        } else {
+            this.box && this.box.hide();
+        }
+    }
 }
diff --git a/src/jmapNew/shape/Psd/index.js b/src/jmapNew/shape/Psd/index.js
index 111828796..71f5d1e2d 100644
--- a/src/jmapNew/shape/Psd/index.js
+++ b/src/jmapNew/shape/Psd/index.js
@@ -96,4 +96,6 @@ export default class Line2 extends Group {
             this.on('mouseover', () => { this.highlight.mouseover(); });
         }
     }
+
+    setShowMode() {}
 }
diff --git a/src/jmapNew/shape/Resource/index.js b/src/jmapNew/shape/Resource/index.js
index 27d37e290..650eb1f49 100644
--- a/src/jmapNew/shape/Resource/index.js
+++ b/src/jmapNew/shape/Resource/index.js
@@ -66,4 +66,5 @@ export default class Resource extends Group {
         }
         return null;
     }
+    setShowMode() {}
 }
diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index c62768421..f9c664fe0 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -1011,5 +1011,5 @@ export default class Section extends Group {
     mouseover() {
         this.section && this.section.setStyle({ stroke: 'rgba(255,255,255,0.8)' });
     }
-
+    setShowMode() {}
 }
diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index db2e4db40..c8f1a2bbb 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -588,6 +588,7 @@ class Signal extends Group {
             });
         }
     }
+    setShowMode() {}
 }
 
 export default Signal;
diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index 498095a88..c43b575f7 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -10,7 +10,7 @@ import EArrow from './EArrow';
 import { arrow } from '../utils/ShapePoints';
 import Rect from 'zrender/src/graphic/shape/Rect';
 import BoundingRect from 'zrender/src/core/BoundingRect';
-import {getPrdType} from '../utils/handlePath';
+import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class Station extends Group {
     constructor(model, style) {
@@ -24,10 +24,12 @@ export default class Station extends Group {
 
         this.create();
         this.createTurnBack(); // 创建按图折返
-        this.prdType = getPrdType();
-        if ((!this.prdType || this.style.StationStand.common.functionButtonShow.indexOf(this.prdType) !== -1) && model.guideTotalLockPoint) {
+        if (isShowThePrdType(model.prdType, style.Station.functionButtonShow) || model.previewOrMapDraw) {
             this.createGuideTotalLock(); // 创建引导总锁
         }
+        if (model.previewOrMapDraw) {
+            this.setShowMode();
+        }
         this.createControlMode();
         this.setState(model);
         this.checkIsDrawMap();
@@ -366,4 +368,14 @@ export default class Station extends Group {
             this.on('mouseover', () => { this.EMouse.mouseover(); });
         }
     }
+    // 设置显示模式
+    setShowMode() {
+        const showMode = this.model.showMode;
+        const showConditions = this.style.Station.functionButtonShow;
+        if (!showConditions || showConditions === '01' || showMode === showConditions) {
+            this.guideLamp && this.guideLamp.show();
+        } else {
+            this.guideLamp && this.guideLamp.hide();
+        }
+    }
 }
diff --git a/src/jmapNew/shape/StationControl/index.js b/src/jmapNew/shape/StationControl/index.js
index 087037322..43e2a090c 100644
--- a/src/jmapNew/shape/StationControl/index.js
+++ b/src/jmapNew/shape/StationControl/index.js
@@ -178,4 +178,5 @@ export default class StationControl extends Group {
         }
         return null;
     }
+    setShowMode() {}
 }
diff --git a/src/jmapNew/shape/StationCounter/index.js b/src/jmapNew/shape/StationCounter/index.js
index 9c637089c..4e17573d8 100644
--- a/src/jmapNew/shape/StationCounter/index.js
+++ b/src/jmapNew/shape/StationCounter/index.js
@@ -86,5 +86,6 @@ export default class StationCounter extends Group {
     getShapeTipPoint() {
         return null;
     }
+    setShowMode() {}
 }
 
diff --git a/src/jmapNew/shape/StationDelayUnlock/index.js b/src/jmapNew/shape/StationDelayUnlock/index.js
index 7ad486668..a068cf5ca 100644
--- a/src/jmapNew/shape/StationDelayUnlock/index.js
+++ b/src/jmapNew/shape/StationDelayUnlock/index.js
@@ -104,4 +104,5 @@ export default class StationDelayUnlock extends Group {
     getShapeTipPoint() {
         return null;
     }
+    setShowMode() {}
 }
diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js
index ee5ce2dfa..e5ee7e4e3 100644
--- a/src/jmapNew/shape/StationStand/index.js
+++ b/src/jmapNew/shape/StationStand/index.js
@@ -12,7 +12,7 @@ import EHighlight from '../element/EHighlight';
 import ETrainStop from './ETrainStop';
 import ETrainDepart from './ETrainDepart';
 import EControl from '../element/EControl';
-import {getPrdType} from '../utils/handlePath';
+import {isShowThePrdType} from '../../utils/handlePath';
 
 class StationStand extends Group {
     constructor(model, style) {
@@ -24,12 +24,14 @@ class StationStand extends Group {
         this.zlevel = model.zlevel;
         this.z = 1;
         this.doors = new Group();
-        this.prdType = getPrdType();
         this.create();
         this.createMouseEvent();
-        if (!this.prdType || this.style.StationStand.common.functionButtonShow.indexOf(this.prdType) !== -1) {
+        if (isShowThePrdType(model.prdType, style.StationStand.common.functionButtonShow) || model.previewOrMapDraw) {
             this.createFunctionButton();
         }
+        if (model.previewOrMapDraw) {
+            this.setShowMode();
+        }
         this.setVisible(model.visible);
         this.setState(model);
         this.checkIsDrawMap();
@@ -563,5 +565,21 @@ class StationStand extends Group {
             this.on('mouseover', () => { this.highlight.mouseover(); });
         }
     }
+    // 设置显示模式
+    setShowMode() {
+        const showMode = this.model.showMode;
+        const showConditions = this.style.StationStand.common.functionButtonShow;
+        if (!showConditions || showConditions === '01' || showMode === showConditions) {
+            this.stopJumpLampButton && this.stopJumpLampButton.show();
+            this.cancelStopJumpLampButton && this.cancelStopJumpLampButton.show();
+            this.upDetainLamp && this.upDetainLamp.show();
+            this.downDetainLamp && this.downDetainLamp.show();
+        } else {
+            this.stopJumpLampButton && this.stopJumpLampButton.hide();
+            this.cancelStopJumpLampButton && this.cancelStopJumpLampButton.hide();
+            this.upDetainLamp && this.upDetainLamp.hide();
+            this.downDetainLamp && this.downDetainLamp.hide();
+        }
+    }
 }
 export default StationStand;
diff --git a/src/jmapNew/shape/Switch/index.js b/src/jmapNew/shape/Switch/index.js
index d47c73450..567771dd9 100644
--- a/src/jmapNew/shape/Switch/index.js
+++ b/src/jmapNew/shape/Switch/index.js
@@ -201,7 +201,7 @@ export default class Switch extends Group {
             stroke: this.style.Switch.monolock.rectBorderColor,
             fill: this.style.transparentColor
         });
-        
+
         this.lockArc = new ELockArc({ // 锁定矩形
             zlevel: this.zlevel,
             z: this.z + 6,
@@ -264,7 +264,7 @@ export default class Switch extends Group {
     /** 恢复状态*/
     recover() {
         this.lockRect.hide(); // 矩形包围框
-        this.lockArc.hide();  // 圆形单锁框
+        this.lockArc.hide(); // 圆形单锁框
         this.setSwitchCoreColor(this.style.backgroundColor);
         this.name.getNameText().stopAnimation(false);
         this.swCore.stopAnimation(false);
@@ -482,4 +482,5 @@ export default class Switch extends Group {
             this.on('mouseover', () => { this.highlight.mouseover(); });
         }
     }
+    setShowMode() {}
 }
diff --git a/src/jmapNew/shape/Text/index.js b/src/jmapNew/shape/Text/index.js
index e289bcdae..ab7175141 100644
--- a/src/jmapNew/shape/Text/index.js
+++ b/src/jmapNew/shape/Text/index.js
@@ -1,6 +1,6 @@
 import Text from 'zrender/src/graphic/Text';
 import Group from 'zrender/src/container/Group';
-import { isShowThePrdType } from '../utils/handlePath';
+import {isShowThePrdType} from '../../utils/handlePath';
 
 export default class Text2 extends Group {
     constructor(model, style) {
@@ -47,13 +47,16 @@ export default class Text2 extends Group {
 
     setState(model) {
     }
+    // 设置显示模式
     setShowMode() {
         const showMode = this.model.showMode;
-        const showConditions = this.model.showCondition;
+        const showConditions = this.model.showConditions;
+        console.log('444444444444444444', showMode, showConditions, this.model);
         if (!showConditions || showConditions === '01' || showMode === showConditions) {
-            this.text.show();
+            console.log('55555555555555');
+            this.text && this.text.show();
         } else {
-            this.text.hide();
+            this.text && this.text.hide();
         }
     }
 }
diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index f1e5f60de..09aa2f849 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -437,4 +437,5 @@ export default class Train extends Group {
 
         this.add(this.trainBorder);
     }
+    setShowMode() {}
 }
diff --git a/src/jmapNew/shape/TrainWindow/index.js b/src/jmapNew/shape/TrainWindow/index.js
index e432ffdcb..e270244eb 100644
--- a/src/jmapNew/shape/TrainWindow/index.js
+++ b/src/jmapNew/shape/TrainWindow/index.js
@@ -78,6 +78,7 @@ class TrainWindow extends Group {
     getInstanceByCode(code) {
         return (store.getters['map/getDeviceByCode'](code) || {}).instance;
     }
+    setShowMode() {}
 }
 
 export default TrainWindow;
diff --git a/src/jmapNew/shape/ZcControl/index.js b/src/jmapNew/shape/ZcControl/index.js
index 324f69377..2797866f3 100644
--- a/src/jmapNew/shape/ZcControl/index.js
+++ b/src/jmapNew/shape/ZcControl/index.js
@@ -80,4 +80,5 @@ export default class ZcControl extends Group {
         }
         return null;
     }
+    setShowMode() {}
 }
diff --git a/src/jmapNew/shape/checkBox/checkBox.js b/src/jmapNew/shape/checkBox/checkBox.js
index 5e3e64902..7dcf8eab5 100644
--- a/src/jmapNew/shape/checkBox/checkBox.js
+++ b/src/jmapNew/shape/checkBox/checkBox.js
@@ -30,4 +30,5 @@ export default class checkBox extends Group {
         });
         this.add(this.box);
     }
+    setShowMode() {}
 }
diff --git a/src/jmapNew/shape/element/EControl.js b/src/jmapNew/shape/element/EControl.js
index 18b4c3897..ca72e7336 100644
--- a/src/jmapNew/shape/element/EControl.js
+++ b/src/jmapNew/shape/element/EControl.js
@@ -102,4 +102,12 @@ export default class EControl extends Group {
             this.text.setStyle('textFill', color);
         }
     }
+    hide() {
+        this.control.hide();
+        this.text.hide();
+    }
+    show() {
+        this.control.show();
+        this.text.show();
+    }
 }
diff --git a/src/jmapNew/shape/utils/handlePath.js b/src/jmapNew/shape/utils/handlePath.js
deleted file mode 100644
index 034ea8b28..000000000
--- a/src/jmapNew/shape/utils/handlePath.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export function getPrdType() {
-    let prdType = '';
-    const path = window.location.href;
-    if (path.includes('?')) {
-        const arr = window.location.href.split('?')[1].split('&');
-        arr.forEach(elem => {
-            if (elem.split('=')[0] === 'prdType') {
-                prdType = elem.split('=')[1];
-            }
-        });
-    }
-    return prdType;
-}
-export function isShowThePrdType (prdType, showConditions) {
-    if (showConditions === '01' || (showConditions === '02' && prdType === '02') || (showConditions === '03' && prdType === '01')) {
-        return true;
-    } else if (!showConditions) {
-        return true; // 兼容老数据没有showConditions
-    }
-
-}
-export function isPreviewOrMapDraw() {
-    const path = window.location.href;
-    return path.indexOf('map/draw') !== -1 || path.indexOf('mapPreviewNew') !== -1;
-}
diff --git a/src/jmapNew/utils/parser.js b/src/jmapNew/utils/parser.js
index d7163345d..edf7a60e2 100644
--- a/src/jmapNew/utils/parser.js
+++ b/src/jmapNew/utils/parser.js
@@ -34,101 +34,101 @@ export function deviceFactory(type, elem, showConfig) {
     return {...deviceRender[type], ...elem, ...showConfig};
 }
 
-export function createDevice(type, elem, propConvert) {
-    const device = deviceFactory(type, Object.assign(elem, { _type: type } ));
+export function createDevice(type, elem, propConvert, showConfig) {
+    const device = deviceFactory(type, Object.assign(elem, { _type: type } ), showConfig);
     return propConvert ? propConvert.initPrivateProps(device) : device;
 }
 
-export function parser(data, skinCode) {
+export function parser(data, skinCode, showConfig) {
     var mapDevice = {};
     var propConvert = skinCode ? Vue.prototype.$theme.loadPropConvert(skinCode) : null;
     if (data) {
         zrUtil.each(data.sectionList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Section, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Section, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.signalList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Signal, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Signal, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.stationList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Station, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Station, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.stationStandList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.StationStand, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.StationStand, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.stationControlList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.StationControl, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.StationControl, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.counterList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.StationCounter, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.StationCounter, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.delayShowList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.StationDelayUnlock, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.StationDelayUnlock, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.lineList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Line, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Line, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.espList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Esp, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Esp, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.psdList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Psd, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Psd, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.textList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Text, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Text, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.zcList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.ZcControl, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.ZcControl, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.lcList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.LcControl, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.LcControl, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.tempSpeedLimitList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.LimitControl, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.LimitControl, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.resourceList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Resource, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Resource, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.trainList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Train, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Train, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.Line || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Line, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Line, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.Text || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Text, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Text, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.cycleButtonList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.MapCycleButtonVO, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.MapCycleButtonVO, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.automaticRouteButtonList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.AutomaticRoute, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.AutomaticRoute, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.outerFrameList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.OutFrame, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.OutFrame, elem, propConvert, showConfig);
         }, this);
 
         zrUtil.each(data.trainWindowList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.TrainWindow, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.TrainWindow, elem, propConvert, showConfig);
             if (elem.sectionCode) {
                 const section = mapDevice[elem.sectionCode];
                 if (section) {
@@ -138,7 +138,7 @@ export function parser(data, skinCode) {
         }, this);
 
         zrUtil.each(data.switchList || [], elem => {
-            mapDevice[elem.code] = createDevice(deviceType.Switch, elem, propConvert);
+            mapDevice[elem.code] = createDevice(deviceType.Switch, elem, propConvert, showConfig);
             const cnodeSection = mapDevice[mapDevice[elem.code].sectionACode];
             const lnodeSection = mapDevice[mapDevice[elem.code].sectionBCode];
             const rnodeSection = mapDevice[mapDevice[elem.code].sectionCCode];
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index d21039c44..26253cb3f 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -195,7 +195,7 @@ const map = {
         mapDataLoadedCount: 0, 	// 地图数据加载完成标识
         trainDetails: null, 	// 地图'列车详情'显示
         deleteCount: 0, 		// 绘图快捷删除标识
-        updateCount: 0, 		 	// 绘图快捷修改标识
+        updateCount: 0, 		// 绘图快捷修改标识
         mousemove: 0 // 实训战场图移动标识
     },
 
@@ -515,7 +515,11 @@ const map = {
         setMapData: (state, map) => {
             if (map && map.skinVO) {
                 state.map = map;
-                state.mapDevice = parser(map, map.skinVO.code);
+                let showConfig = {};
+                if (Vue.prototype.$jlmap) {
+                    showConfig = Vue.prototype.$jlmap.getShowConfig();
+                }
+                state.mapDevice = parser(map, map.skinVO.code, showConfig);
                 Vue.prototype.$jlmap && Vue.prototype.$jlmap.setMapDevice(state.mapDevice);
             } else {
                 state.map = null;
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 0a29bb813..ae880e5e3 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,9 +3,9 @@ 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.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
         // BASE_API = 'http://192.168.3.82:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index d87a07a67..afc917fe7 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -4,7 +4,7 @@
     <div :id="canvasId" style="background: #000;" class="display_canvas" />
     <progress-bar ref="progressBar" />
     <zoom-box v-if="!isScreen" :scale-rate="dataZoom.scaleRate" @setShrink="setShrink" @setMagnify="setMagnify" />
-    <show-mode v-if="isDesign" />
+    <show-mode v-if="isDesign" @setShowMode="setShowMode" />
     <div v-if="show" class="zoom-view" :style="{ width: width +'px'}">
       <el-form :model="dataZoom" label-width="80px" size="mini" inline>
         <el-form-item :label="$t(`global.offset`)">
@@ -159,10 +159,14 @@ export default {
             // 默认个人地图绘制可以滚轮放大缩小 其他地图显示不允许此操作
             const path = window.location.href;
             let mouseWheelFlag = false;
+            let previewOrMapDraw = false;
             if (path.includes('design/userlist/map/draw') || path.includes('design/usermap/map/draw')) {
                 mouseWheelFlag = true;
             }
-
+            if (path.indexOf('map/draw') !== -1 || path.indexOf('mapPreviewNew') !== -1) {
+                previewOrMapDraw = true;
+            }
+            const prdType = this.$route.query.prdType;
             Vue.prototype.$theme = new Theme();
             Vue.prototype.$jlmap = new Jlmap({
                 dom: document.getElementById(this.canvasId),
@@ -177,6 +181,11 @@ export default {
                     offsetY: 0,
                     zoomOnMouseWheel: mouseWheelFlag
                 },
+                showConfig: {
+                    prdType: prdType,
+                    previewOrMapDraw: previewOrMapDraw,
+                    showMode: '03'
+                },
                 methods: {
                     dataLoaded: this.handleDataLoaded,
                     viewLoaded: this.handleViewLoaded,
@@ -318,6 +327,13 @@ export default {
                 y: e.offsetY + Number(this.dataZoom.offsetY)
             };
             this.$store.dispatch('map/setMousemove');
+        },
+        // 切换现地行调显示界面（绘图和预览页面下）
+        setShowMode(showMode) {
+            const list = [...this.$store.state.map.map.automaticRouteButtonList, ...this.$store.state.map.map.cycleButtonList,
+                ...this.$store.state.map.map.stationList, ...this.$store.state.map.map.stationStandList,
+                ...this.$store.state.map.map.lineList, ...this.$store.state.map.map.textList, ...this.$store.state.map.map.outerFrameList];
+            this.$jlmap.updateShowMode(list, showMode);
         }
     }
 };
diff --git a/src/views/newMap/jlmapNew/pendant/showMode.vue b/src/views/newMap/jlmapNew/pendant/showMode.vue
index 7ada7284a..469b9d02c 100644
--- a/src/views/newMap/jlmapNew/pendant/showMode.vue
+++ b/src/views/newMap/jlmapNew/pendant/showMode.vue
@@ -12,9 +12,9 @@ export default {
         return {
             offsetY: 15,
             offsetX: 20,
-            swch: '01',
+            swch: '03',
             swchList: [
-                { value: '01', name: '现地' },
+                { value: '03', name: '现地' },
                 { value: '02', name: '行调' }
             ]
         };
@@ -60,7 +60,7 @@ export default {
             }
         },
         switchMode(val) {
-            console.log(val, '==========');
+            this.$emit('setShowMode', val);
         }
     }
 };

From 95e2832cec6e4849eafa17248ef627476293d5c4 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 11 Mar 2020 15:14:38 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Text/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/jmapNew/shape/Text/index.js b/src/jmapNew/shape/Text/index.js
index ab7175141..b2209aa4d 100644
--- a/src/jmapNew/shape/Text/index.js
+++ b/src/jmapNew/shape/Text/index.js
@@ -51,9 +51,7 @@ export default class Text2 extends Group {
     setShowMode() {
         const showMode = this.model.showMode;
         const showConditions = this.model.showConditions;
-        console.log('444444444444444444', showMode, showConditions, this.model);
         if (!showConditions || showConditions === '01' || showMode === showConditions) {
-            console.log('55555555555555');
             this.text && this.text.show();
         } else {
             this.text && this.text.hide();

From 3273724484f83af62ada98f836f09a123750415c Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 11 Mar 2020 15:50:47 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8A=98=E8=BF=94=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMapdraft/dataRelation/turnedoperate/route.vue   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
index b50eec2f4..f8c1e4579 100644
--- a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
@@ -217,6 +217,15 @@ export default {
         },
         setShowSecond(flag) {
             this.showSecond = flag;
+            if (flag) {
+                this.rules.turnBackRoute2Name = [{ required: true, message: '请选择折返进路2', trigger: 'blur' }];
+                this.rules.basicRoute2Name = [{ required: true, message: '请选择基础进路2', trigger: 'blur'}];
+                this.rules.reentryTrack2Code = [{ required: true, message: '请选择折返区段2', trigger: 'change'}];
+            } else {
+                delete this.rules.turnBackRoute2Name;
+                delete this.rules.basicRoute2Name;
+                delete this.rules.reentryTrack2Code;
+            }
         },
         buildModel(code) {
             const model = Object.assign({}, this.addModel);
@@ -271,6 +280,7 @@ export default {
                 this.addModel.code = '';
                 this.$refs.form.resetFields();
                 this.isSave = true;
+                this.showSecond = false;
             }
         },
         setRouteCode(data, type) {

From 939360917ef16c2bb08da8304990a7566c7730cf Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 11 Mar 2020 16:58:14 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=9C=BA=E6=8E=A5=E8=BF=91=E5=8C=BA=E6=AE=B5=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/config/defaultStyle.js            |  4 +-
 src/jmapNew/shape/Section/index.js            |  2 +-
 .../dataRelation/signaloperate/route.vue      | 63 +++++++++++++++----
 3 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/src/jmapNew/config/defaultStyle.js b/src/jmapNew/config/defaultStyle.js
index 6f74eecd4..3000e43e3 100644
--- a/src/jmapNew/config/defaultStyle.js
+++ b/src/jmapNew/config/defaultStyle.js
@@ -125,5 +125,7 @@ export default class defaultStyle {
 export const drawSectionStyle = {
     routePhysicalSection: 'rgba(255,255,0,0.5)',
     continueProtectSection: 'rgba(255,0,255,0.5)',
-    signalNearSection: 'rgba(255, 0, 0, 0.5)'
+    signalNearSectionCBTC: 'rgba(255, 0, 0, 0.5)',
+    signalNearSectionReserve: 'rgba(160, 32, 240, 0.5)',
+    signalNearSection: 'rgba(124, 252, 0, 0.5)'
 };
diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index 4d080a4af..8ffa8cbcb 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -863,7 +863,7 @@ export default class Section extends Group {
         if (this.selectedType === type) {
             return;
         }
-        if (selected && !this.selectedType) {
+        if (selected && type) {
             this.section && this.section.setStyle({ stroke: drawSectionStyle[type] });
         } else {
             this.section && this.section.setStyle({ stroke: this.style.Section.line.spareColor });
diff --git a/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
index 7536e0dc1..383e8d871 100644
--- a/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
@@ -127,6 +127,9 @@ export default {
         ]),
         newRouteSectionList() {
             return JSON.stringify(this.addModel.routeSectionList);
+        },
+        newBlockSectionList() {
+            return JSON.stringify(this.addModel.blockSectionList);
         }
     },
     watch: {
@@ -145,10 +148,23 @@ export default {
                 const obj = JSON.parse(val);
                 const objOld = JSON.parse(old);
                 if (objOld && objOld.length) {
-                    this.changeSectionSelected(objOld, false, 'signalNearSection');
+                    this.changeSectionSelected(objOld, true);
                 }
                 if (obj && obj.length) {
-                    this.changeSectionSelected(obj, true, 'signalNearSection');
+                    this.changeSectionSelected(obj, true);
+                }
+            },
+            deep: true
+        },
+        newBlockSectionList: {
+            handler: function(val, old) {
+                const obj = JSON.parse(val);
+                const objOld = JSON.parse(old);
+                if (objOld && objOld.length) {
+                    this.changeSectionSelected(objOld, true);
+                }
+                if (obj && obj.length) {
+                    this.changeSectionSelected(obj, true);
                 }
             },
             deep: true
@@ -209,6 +225,8 @@ export default {
                 } else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'blockSectionList'.toUpperCase()) {
                     if ((selected.type === '01' || selected.type === '03') && this.addModel.blockSectionList.indexOf(selected.code) === -1) {
                         this.addModel.blockSectionList.push(selected.code);
+                    } else if (selected.type === '02' && this.addModel.blockSectionList.indexOf(selected.parentCode) === -1) {
+                        this.addModel.blockSectionList.push(selected.parentCode);
                     }
                 }
             }
@@ -262,25 +280,48 @@ export default {
             }
         },
         batchSectionListFocus(flag) {
-            this.changeSectionSelected(this.addModel.routeSectionList, flag, 'signalNearSection');
+            this.changeSectionSelected(this.addModel.routeSectionList, flag);
+            this.changeSectionSelected(this.addModel.blockSectionList, flag);
             this.changeSignalSelected(this.addModel.signalCode, flag, 'routeSignal');
         },
         changeSignalSelected(val, flag, type) {
             const signal = this.$store.getters['map/getDeviceByCode'](val);
             signal && signal.instance.drawBatchSelected(flag, flag ? type : '');
         },
-        changeSectionSelected(list, flag, type) {
+        changeSectionSelected(list, cutOut) {
+            let flag = true;
+            let type = '';
             list && list.forEach((item) => {
                 const section = this.$store.getters['map/getDeviceByCode'](item);
-                if (section && section.logicSectionCodeList && section.logicSectionCodeList.length) {
-                    section.logicSectionCodeList.forEach( (logicSectionCode) => {
-                        const logicSection = this.$store.getters['map/getDeviceByCode'](logicSectionCode);
-                        logicSection && logicSection.instance.drawBatchSelected(flag, flag ? type : '');
-                    });
-                } else {
-                    section && section.instance.drawBatchSelected(flag, flag ? type : '');
+                if (!cutOut) {
+                    this.setSectionSelectedType(section, cutOut, '');
+                    return;
                 }
+                if (this.addModel.routeSectionList.indexOf(item) !== -1 && this.addModel.blockSectionList.indexOf(item) !== -1) {
+                    type = 'signalNearSection';
+                    flag = true;
+                } else if (this.addModel.routeSectionList.indexOf(item) !== -1) {
+                    type = 'signalNearSectionCBTC';
+                    flag = true;
+                } else if (this.addModel.blockSectionList.indexOf(item) !== -1) {
+                    type = 'signalNearSectionReserve';
+                    flag = true;
+                } else {
+                    type = '';
+                    flag = false;
+                }
+                this.setSectionSelectedType(section, flag, type);
             });
+        },
+        setSectionSelectedType(section, flag, type) {
+            if (section && section.logicSectionCodeList && section.logicSectionCodeList.length) {
+                section.logicSectionCodeList.forEach( (logicSectionCode) => {
+                    const logicSection = this.$store.getters['map/getDeviceByCode'](logicSectionCode);
+                    logicSection && logicSection.instance.drawBatchSelected(flag, flag ? type : '');
+                });
+            } else {
+                section && section.instance.drawBatchSelected(flag, flag ? type : '');
+            }
         }
     }
 };

From 8ad0544dc2fa40f6b3533aff492427659cf6cfc9 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 11 Mar 2020 18:00:45 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=AB=99?=
 =?UTF-8?q?=E5=8F=B0=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=AE=BE=E7=BD=AE=E5=8C=BA?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=BA=E7=AB=99=E5=8F=B0=E8=BD=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/newMapdraft/mapoperate/stationstand.vue     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/stationstand.vue b/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
index fee86fc0f..9fa7b6af7 100644
--- a/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
@@ -90,7 +90,7 @@ export default {
                 stationCode: '', // 所属车站
                 position: { x: 0, y: 0 },
                 visible: true, // 是否显示
-                inside: false,   // 内外站台显示
+                inside: false, // 内外站台显示
                 right: true,
                 standTrackCode: '',
                 small: false,
@@ -129,7 +129,7 @@ export default {
             },
             allModel: {
                 width: '',
-                height: '',
+                height: ''
             }
         };
     },
@@ -447,7 +447,7 @@ export default {
                             standCode: Standuid
                         });
                     }
-                    section.standTrack = true;
+                    section.standTrack = !this.addModel.small;
                     models.push(section);
                     this.$emit('updateMapModel', models);
                 }
@@ -512,7 +512,7 @@ export default {
         },
         // 批量设置
         batchSettings() {
-            let models = [];
+            const models = [];
             this.stationStandList.forEach(stationStand => {
                 if (!stationStand.small) {
                     const model = deepAssign({}, stationStand);
@@ -520,7 +520,7 @@ export default {
                     model.height = this.allModel.height;
                     models.push(model);
                 }
-            })
+            });
             this.$emit('updateMapModel', models);
         }
     }

From cf456057c3b1da37b640ae012e8bde58d1a5ff61 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Wed, 11 Mar 2020 19:54:48 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=80=81=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=9B=BE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/map.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 26253cb3f..83955aa87 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -516,8 +516,8 @@ const map = {
             if (map && map.skinVO) {
                 state.map = map;
                 let showConfig = {};
-                if (Vue.prototype.$jlmap) {
-                    showConfig = Vue.prototype.$jlmap.getShowConfig();
+                if (Vue.prototype.$jlmap && ( typeof(Vue.prototype.$jlmap.getShowConfig) === 'function')) {
+                    showConfig =  Vue.prototype.$jlmap.getShowConfig();
                 }
                 state.mapDevice = parser(map, map.skinVO.code, showConfig);
                 Vue.prototype.$jlmap && Vue.prototype.$jlmap.setMapDevice(state.mapDevice);

From 0cc556fa8df5b0643bea8258935018bbefea20c1 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 12 Mar 2020 10:32:30 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=90=E9=83=BD?=
 =?UTF-8?q?=E4=B8=80=E5=8F=B7=E7=BA=BF=E4=BF=A1=E5=8F=B7=E6=9C=BA=E6=8E=92?=
 =?UTF-8?q?=E5=88=97=E8=BF=9B=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/constant/deviceState.js           | 42 +++++++--------
 .../theme/chengdu_01/menus/menuRequest.vue    |  3 +-
 .../theme/chengdu_01/menus/menuSignal.vue     | 54 +++++++++++++------
 .../theme/ningbo_01/menus/menuSignal.vue      |  2 +-
 4 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/src/jmapNew/constant/deviceState.js b/src/jmapNew/constant/deviceState.js
index fd5406736..93875ee7a 100644
--- a/src/jmapNew/constant/deviceState.js
+++ b/src/jmapNew/constant/deviceState.js
@@ -4,16 +4,16 @@ const deviceState = {};
 
 deviceState[deviceType.Section] = {
 /** 区段状态*/
-    blockade: false, // 是否封锁
-    routeLock: false, // 是否进路锁闭
-    overlapLock: false, // 进路延续保护锁闭
-    ctOccupied: false, // 通信车占用
-    nctOccupied: false, // 非通信车占用
-    cutOff: false, // 是否切除
-    invalid: false, // 是否失效
+    blockade: 0, // 是否封锁
+    routeLock: 0, // 是否进路锁闭
+    overlapLock: 0, // 进路延续保护锁闭
+    ctOccupied: 0, // 通信车占用
+    nctOccupied: 0, // 非通信车占用
+    cutOff: 0, // 是否切除
+    invalid: 0, // 是否失效
     speedUpLimit: 0, // 最高限速
     /** 是否故障*/
-    fault: false /** 非故障*/
+    fault: 0 /** 非故障*/
 };
 
 deviceState[deviceType.Switch] = {
@@ -50,7 +50,7 @@ deviceState[deviceType.Switch] = {
     //     State14: '14'			/** 道岔状态类型 - 封锁*/
     // },
     /** 是否故障*/
-    fault: false /** 非故障*/
+    fault: 0 /** 非故障*/
     // /** 是否切除*/
     // cutOff: {
     //     Default: false			/** 是否切除*/
@@ -58,19 +58,19 @@ deviceState[deviceType.Switch] = {
 };
 
 deviceState[deviceType.Signal] = {
-    blockade: false, // 是否锁闭
-    logicLight: false, // 逻辑点灯
-    greenOpen: false, // 绿灯开放
-    yellowOpen: false, // 黄灯开放
-    redOpen: true, // 红灯开放(默认状态)
+    blockade: 0, // 是否锁闭
+    logicLight: 0, // 逻辑点灯
+    greenOpen: 0, // 绿灯开放
+    yellowOpen: 0, // 黄灯开放
+    redOpen: 1, // 红灯开放(默认状态)
     delayTime: 0, // 信号机延迟解锁倒计时
     atsControl: 1, // 0是人工，1是自动
-    fault: false // 是否故障
+    fault: 0 // 是否故障
 };
 
 deviceState[deviceType.Station] = {
     /** 是否故障*/
-    fault: false, /** 非故障*/
+    fault: 0, /** 非故障*/
     controlMode: 'Center'
     // controlMode: 'Local' // Center 中控 Local 站控  Emergency 紧急站控 Interlock 联锁控
 };
@@ -87,7 +87,7 @@ deviceState[deviceType.Psd] = {
     //     State03: '03'			/** 切除 */
     // },
     /** 是否故障*/
-    fault: false /** 非故障*/
+    fault: 0 /** 非故障*/
 };
 
 deviceState[deviceType.StationDelayUnlock] = {
@@ -99,7 +99,7 @@ deviceState[deviceType.StationDelayUnlock] = {
 
     // },
     /** 是否故障*/
-    fault: false /** 非故障*/
+    fault: 0 /** 非故障*/
 };
 
 deviceState[deviceType.StationStand] = {
@@ -123,7 +123,7 @@ deviceState[deviceType.StationStand] = {
     //     State04: '04'			/** 默认 */
     // },
     /** 是否故障*/
-    fault: false /** 非故障*/
+    fault: 0 /** 非故障*/
 };
 
 deviceState[deviceType.Train] = {
@@ -207,7 +207,7 @@ deviceState[deviceType.Train] = {
     //     State02: '02' 			/** 有报警 */
     // },
     /** 车门是否关闭且锁闭 */
-    doorCloseLock: true,
+    doorCloseLock: 1,
     /** 列车运行级别 */
     runLevel: 'CBTC',
     /**  驾驶模式 */
@@ -219,7 +219,7 @@ deviceState[deviceType.Train] = {
     /** 列车是否向右形式 */
     right: 1,
     /** 是否故障*/
-    fault: false /** 非故障*/
+    fault: 0 /** 非故障*/
 };
 
 export default deviceState;
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
index 3243e7651..8f7adc1fd 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
@@ -105,7 +105,8 @@ export default {
             const operate = {
                 over: true,
                 operation: eachCmd.operation.code,
-                cmdType: eachCmd.operation.cmdType
+                cmdType: eachCmd.operation.cmdType,
+                param: eachCmd.operation.param // 请求栈中参数配置
             };
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
index d59afe815..ee87cb316 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
@@ -49,13 +49,13 @@ export default {
                     },
                     {
                         label: '开放自动进路',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+                        handler:  this.singalPassModel,
+                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
                     },
                     {
                         label: '关闭自动进路',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+                        handler: this.singalCancelPassModel,
+                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
                     },
                     {
                         label: '终端信号封锁',
@@ -225,6 +225,7 @@ export default {
             }
         },
         doShow(point) {
+            console.log(this.selected);
             this.clickEvent();
             this.initMenu();
             if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
@@ -307,24 +308,45 @@ export default {
         arrangementRoute() {
             const step = {
                 start: true,
-                // over:true,
                 code: `${this.selected.code}`,
                 operation: OperationEvent.Signal.arrangementRoute.menu.operation,
                 param: {
                     signalCode: `${this.selected.code}`
-                },
-                // cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+                }
             };
 
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true});
-                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.arrangementRoute.menu.operation, name: '始端/终端选择', cmdType:CMD.Signal.CMD_SIGNAL_SET_ROUTE}});
+                    const routes = [];
+                    this.routeList.forEach(elem => {
+                        if (elem.startSignalCode === this.selected.code) {
+                            routes.push(elem);
+                        }
+                    });
+                    const routeCode = this.checkRoutes(routes);
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: {
+                            code: OperationEvent.Signal.arrangementRoute.menu.operation,
+                            name: '始端/终端选择',
+                            cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                            param: {
+                                routeCode: routeCode
+                            }
+                        }
+                    });
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow(step);
             });
         },
+        checkRoutes(routes) {
+            const route = routes.filter(route => {
+                return route.greenOpen;
+            });
+            return route[0].code;
+        },
         // 进路引导
         guide() {
             const step = {
@@ -334,13 +356,13 @@ export default {
                 operation: OperationEvent.Signal.guide.menu.operation,
                 param: {
                     signalCode: `${this.selected.code}`
-                },
+                }
                 // cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
             };
             this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: { code: OperationEvent.Signal.guide.menu.operation, name: '引导信号',cmdType:CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE}});
+                    this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: { code: OperationEvent.Signal.guide.menu.operation, name: '引导信号', cmdType:CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE}});
                 }
             });
         },
@@ -353,14 +375,14 @@ export default {
                 operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
                 param: {
                     signalCode: `${this.selected.code}`
-                },
+                }
                 // cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
 
             };
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: { code: OperationEvent.Signal.cancelTrainRoute.menu.operation, name: '取消进路',cmdType:CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE}});
+                    this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: { code: OperationEvent.Signal.cancelTrainRoute.menu.operation, name: '取消进路', cmdType:CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE}});
                 }
             });
         },
@@ -373,13 +395,13 @@ export default {
                 operation: OperationEvent.Signal.lock.menu.operation,
                 param: {
                     signalCode: `${this.selected.code}`
-                },
+                }
                 // cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
             };
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.lock.menu.operation, name: '终端信号机封锁',cmdType:CMD.Signal.CMD_SIGNAL_BLOCK}});
+                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.lock.menu.operation, name: '终端信号机封锁', cmdType:CMD.Signal.CMD_SIGNAL_BLOCK}});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow(step);
@@ -394,13 +416,13 @@ export default {
                 operation: OperationEvent.Signal.unlock.menu.operation,
                 param: {
                     signalCode: `${this.selected.code}`
-                },
+                }
                 // cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
             };
             this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.unlock.menu.operation, name: '终端信号机解封',cmdType:CMD.Signal.CMD_SIGNAL_UNBLOCK}});
+                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.unlock.menu.operation, name: '终端信号机解封', cmdType:CMD.Signal.CMD_SIGNAL_UNBLOCK}});
                 }
             });
         },
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
index fd994a67e..9f646ef57 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
@@ -525,7 +525,7 @@ export default {
                     this.$refs.routerCommand.doShow(step, this.selected, '是否执行引导命令');
                 }
             });
-        },
+        }
     }
 };
 </script>

From 6045f6dba681fe29e340350a8b245e293f169a44 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 12 Mar 2020 10:33:10 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/chengdu_01/menus/menuSignal.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
index ee87cb316..6c70337c7 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
@@ -225,7 +225,6 @@ export default {
             }
         },
         doShow(point) {
-            console.log(this.selected);
             this.clickEvent();
             this.initMenu();
             if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {

From b7ee3e5f6ea23eeb1ab121dfa64250aacb7607c2 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 12 Mar 2020 13:13:00 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=BA=E6=AE=B5=E5=90=8D=E7=A7=B0=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Section/index.js            |  8 +-
 src/jmapNew/shape/TrainWindow/index.js        |  2 +-
 .../mapoperate/section/batchSettings.vue      | 84 ++++++++++++++++++-
 .../newMapdraft/mapoperate/section/index.vue  |  7 +-
 4 files changed, 94 insertions(+), 7 deletions(-)

diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index 8ffa8cbcb..a4c277b4b 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -251,7 +251,7 @@ export default class Section extends Group {
             /** 区段名称 (逻辑区段名称 或 物理区段名称 是否显示)*/
             let tempx = x;
             let tempy = y;
-            if (model.type == '01') {
+            if (model.type == '01') { // 物理区段名称
                 if (style.Section.text.show) {
                     const opposite = style.Section.text.opposite ? -1 : 1;
                     tempx += traingle.getSin(style.Section.text.distance);
@@ -274,7 +274,7 @@ export default class Section extends Group {
                     });
                     this.add(this.name);
                 }
-            } else if (model.type == '02') {
+            } else if (model.type == '02') { // 逻辑区段
                 if (style.Section.logicText.show) {
                     const opposite = style.Section.logicText.opposite ? -1 : 1;
                     tempx += traingle.getSin(style.Section.logicText.distance);
@@ -297,7 +297,7 @@ export default class Section extends Group {
                     });
                     this.add(this.name);
                 }
-            } else if (model.type == '03') {
+            } else if (model.type == '03') { // 道岔区段
                 if (style.Section.switchText.show) {
                     this.name = new ETextName({
                         zlevel: this.zlevel,
@@ -317,7 +317,7 @@ export default class Section extends Group {
                     });
                     this.add(this.name);
                 }
-            } else if (model.type == '04') {
+            } else if (model.type == '04') { // 道岔计轴区段名称
                 if (router.currentRoute.path.startsWith('/design/usermap/map/draw') && router.currentRoute.path.endsWith('/draft')) {
                     this.name = new ETextName({
                         zlevel: this.zlevel,
diff --git a/src/jmapNew/shape/TrainWindow/index.js b/src/jmapNew/shape/TrainWindow/index.js
index e270244eb..5f35f4cff 100644
--- a/src/jmapNew/shape/TrainWindow/index.js
+++ b/src/jmapNew/shape/TrainWindow/index.js
@@ -39,7 +39,7 @@ class TrainWindow extends Group {
             zlevel: this.zlevel,
             z: this.z - 1,
             shape: {
-                smooth: this.style.TrainWindow.trainWindowSmooth,
+                smooth: this.style.TrainWindow.trainWindowSmooth, // 圆滑程度
                 points: [
                     [point.x - model.width / 2, point.y],
                     [point.x + model.width / 2, point.y],
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
index 0b87d8dcd..b58990028 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/batchSettings.vue
@@ -14,12 +14,50 @@
           </el-button-group>
         </el-form-item>
       </el-form>
+      <el-form ref="formModel" :model="formModel" label-width="200px" size="mini" :rules="formRules">
+        <el-form-item label="区段编码:" prop="modelList">
+          <el-select v-model="formModel.modelList" filterable multiple>
+            <el-option
+              v-for="item in sectionList"
+              :key="item.code"
+              :label="item.name + '(' + item.code + ')'"
+              :value="item.code"
+            />
+          </el-select>
+          <el-button
+            :type="field === 'sectionTypeCode' ? 'danger' : 'primary'"
+            size="small"
+            @click="hover('sectionTypeCode')"
+          >{{ $t('map.activate') }}</el-button>
+        </el-form-item>
+        <el-form-item label="区段名称位置:" prop="trainPosType">
+          <el-select
+            v-model="formModel.trainPosType"
+            placeholder="请选择"
+            :clearable="true"
+          >
+            <el-option
+              v-for="option in positionTypes"
+              :key="option.type"
+              :label="option.name"
+              :value="option.type"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button-group>
+            <el-button type="primary" size="big" @click="setPositionType">{{ $t('global.set') }}</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-form>
     </el-scrollbar>
   </div>
 </template>
 
 <script>
 import { deepAssign } from '@/utils/index';
+import { mapGetters } from 'vuex';
+
 export default {
     name: 'BatchSettings',
     props: {
@@ -28,6 +66,12 @@ export default {
             default: function() {
                 return [];
             }
+        },
+        field: {
+            type: Object,
+            default: function () {
+                return '';
+            }
         }
     },
     data() {
@@ -36,10 +80,34 @@ export default {
                 leftDistance: 0,
                 rightDistance: 0
             },
-            tipInfoList: []
+            formModel: {
+                modelList: [],
+                trainPosType: ''
+            },
+            positionTypes: [
+                { name: '上方', type: '01' },
+                { name: '下方', type: '02' }
+            ],
+            tipInfoList: [],
+            formRules: {
+                trainPosType: [
+                    { required: true, message: '请选择', trigger: 'change' }
+                ],
+                modelList: [
+                    { required: true, message: '请选择', trigger: 'change' }
+                ]
+            }
         };
     },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList'
+        ])
+    },
     methods:{
+        hover(filed) {
+            this.$emit('hover', filed);
+        },
         batchSettings() {
             this.tipInfoList = [];
             const models = [];
@@ -63,6 +131,20 @@ export default {
                     this.$message.success(this.$t('tip.stopPointOffsetTip'));
                 }
             }
+        },
+        setPositionType() {
+            const models = [];
+            this.$refs['formModel'].validate((valid) => {
+                if (valid) {
+                    this.formModel.modelList.forEach(sectionCode => {
+                        const model = deepAssign({}, this.$store.getters['map/getDeviceByCode'](sectionCode) || {});
+                        model.trainPosType = this.formModel.trainPosType;
+                        models.push(model);
+                    });
+                    this.$emit('updateMapModel', models, 'five');
+                    this.$refs.formModel.resetFields(); // 对该表单项进行重置并移除校验结果
+                }
+            });
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index 29275260c..aa3356110 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -24,7 +24,7 @@
       <logic-block ref="logicBlock" :edit-model="editModel" @updateMapModel="updateMapModel" />
     </el-tab-pane>
     <el-tab-pane class="view-control" :label="$t('map.batchSettings')" name="five">
-      <batch-settings ref="batchSettings" :section-list="sectionList" @updateMapModel="updateMapModel" @tipInfoHandle="tipInfoHandle" />
+      <batch-settings ref="batchSettings" :field="field" :section-list="sectionList" @hover="hover" @updateMapModel="updateMapModel" @tipInfoHandle="tipInfoHandle" />
     </el-tab-pane>
     <tip-info ref="tipInfo" :tip-info-list="tipInfoList" />
   </el-tabs>
@@ -453,6 +453,11 @@ export default {
                     this.activeName = 'second';
                     this.field = '';
                     this.$emit('fieldSelect', '');
+                } else if (this.field.toUpperCase() === 'sectionTypeCode'.toUpperCase()) {
+                    this.$refs.batchSettings.formModel.modelList.push(selected.code);
+                    this.activeName = 'five';
+                    // this.field = '';
+                    // this.$emit('fieldSelect', '');
                 }
             }
         },

From 56126bdbf366ab4bb1755921a0432ce5c24c2c52 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 12 Mar 2020 14:41:53 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E5=88=97=E8=BD=A6=E7=B2=BE=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E5=88=97=E8=BD=A6=E7=9A=84=E7=8A=B6=E6=80=81=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=8E=BB=E6=8E=89=E4=BB=BF=E7=9C=9F?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=8B=96=E5=8A=A8=E9=BC=A0=E6=A0=87=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=8C=85=E5=9B=B4=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmap/shape/Train/TrainBody.js             | 448 +++++++++---------
 src/jmapNew/map.js                            |   2 +
 src/jmapNew/mouseController.js                |   3 +-
 src/jmapNew/shape/Train/EMouse.js             |   4 +-
 src/jmapNew/shape/Train/ETriangle.js          |   4 +-
 src/jmapNew/shape/Train/TrainBody.js          |   2 +-
 src/jmapNew/shape/Train/index.js              | 115 ++++-
 .../theme/chengdu_01/menus/menuTrain.vue      |   2 +-
 src/views/newMap/jlmapNew/index.vue           |   8 +-
 9 files changed, 328 insertions(+), 260 deletions(-)

diff --git a/src/jmap/shape/Train/TrainBody.js b/src/jmap/shape/Train/TrainBody.js
index 86a9a54fe..58596d45f 100644
--- a/src/jmap/shape/Train/TrainBody.js
+++ b/src/jmap/shape/Train/TrainBody.js
@@ -7,234 +7,234 @@ import store from '@/store';
 
 /** 车身*/
 export default class TrainBody extends Group {
-	constructor(model) {
-		super();
-		this.model = model;
-		this.deviceModel = model.model;
-		this.nameFormat = model.nameFormat;
-		this.create();
-		this.createMouse(); 			// 鼠标事件
-	}
+    constructor(model) {
+        super();
+        this.model = model;
+        this.deviceModel = model.model;
+        this.nameFormat = model.nameFormat;
+        this.create();
+        this.createMouse(); 			// 鼠标事件
+    }
 
-	createMouse() {
-		this.mouseEvent = new EMouse(this);
-		this.add(this.mouseEvent);
-		if (this.deviceModel.down) {
-			store.dispatch('map/setTrainDetails', this.deviceModel);
-			this.mouseEvent.mouseover();
-		}
+    createMouse() {
+        this.mouseEvent = new EMouse(this);
+        this.add(this.mouseEvent);
+        if (this.deviceModel.down) {
+            store.dispatch('map/setTrainDetails', this.deviceModel);
+            this.mouseEvent.mouseover();
+        }
 
-		this.on('mouseover', () => {
-			store.dispatch('map/setTrainDetails', this.deviceModel);
-			this.mouseEvent.mouseover();
-		});
-		this.on('mouseout', () => {
-			store.dispatch('map/setTrainDetails', null);
-			this.mouseEvent.mouseout();
-		});
-	}
+        this.on('mouseover', () => {
+            store.dispatch('map/setTrainDetails', this.deviceModel);
+            this.mouseEvent.mouseover();
+        });
+        this.on('mouseout', () => {
+            store.dispatch('map/setTrainDetails', null);
+            this.mouseEvent.mouseout();
+        });
+    }
 
-	create() {
-		const model = this.model;
-		const style = this.model.style;
-		this.trainBodyBox = new TrainBodyBox({
-			zlevel: model.zlevel,
-			z: model.z,
-			point: model.point,
-			style: style
-		});
+    create() {
+        const model = this.model;
+        const style = this.model.style;
+        this.trainBodyBox = new TrainBodyBox({
+            zlevel: model.zlevel,
+            z: model.z,
+            point: model.point,
+            style: style
+        });
 
-		const beginX = (model.point.x + style.Train.trainBody.lrPadding);
-		const beginY = (model.point.y - style.Train.hsda.trainHSDATextFontSize - style.Train.hsda.upPaddingHSDA);
-		const margin = (style.Train.common.trainWidth - style.Train.hsda.lrPaddingHSDA * 2) / 4;
+        const beginX = (model.point.x + style.Train.trainBody.lrPadding);
+        const beginY = (model.point.y - style.Train.hsda.trainHSDATextFontSize - style.Train.hsda.upPaddingHSDA);
+        const margin = (style.Train.common.trainWidth - style.Train.hsda.lrPaddingHSDA * 2) / 4;
 
-		this.textH = style.Train.common.haveTextHSDA ? new ETextName({
-			zlevel: model.zlevel,
-			z: model.z,
-			x: parseInt(beginX + margin * 0),
-			y: parseInt(beginY),
-			text: style.Train.hsda.textHContent,
-			textFill: style.trainYellowColor,
-			fontSize: style.Train.hsda.trainHSDATextFontSize,
-			fontFamily: style.Train.common.fontFamily,
-			textAlign: 'middle',
-			textVerticalAlign: 'top'
-		}) : '';
-		this.textS = style.Train.common.haveTextHSDA ? new ETextName({
-			zlevel: model.zlevel,
-			z: model.z,
-			x: parseInt(beginX + margin * 1),
-			y: parseInt(beginY),
-			text: style.Train.hsda.textSContent,
-			textFill: style.trainBlueColor,
-			fontSize: style.Train.hsda.trainHSDATextFontSize,
-			fontFamily: style.Train.common.fontFamily,
-			textAlign: 'middle',
-			textVerticalAlign: 'top'
-		}) : '';
-		this.textD = style.Train.common.haveTextHSDA ? new ETextName({
-			zlevel: model.zlevel,
-			z: model.z,
-			x: parseInt(beginX + margin * 2),
-			y: parseInt(beginY),
-			text: style.Train.hsda.textDContent,
-			textFill: style.trainGreenColor,
-			fontSize: style.Train.hsda.trainHSDATextFontSize,
-			fontFamily: style.Train.common.fontFamily,
-			textAlign: 'middle',
-			textVerticalAlign: 'top'
-		}) : '';
-		this.textA = style.Train.common.haveTextHSDA ? new ETextName({
-			zlevel: model.zlevel,
-			z: model.z,
-			x: parseInt(beginX + margin * 3),
-			y: parseInt(beginY),
-			text: style.Train.hsda.textAContent,
-			textFill: style.trainRedColor,
-			fontSize: style.Train.hsda.trainHSDATextFontSize,
-			fontFamily: style.Train.common.fontFamily,
-			textAlign: 'middle',
-			textVerticalAlign: 'top'
-		}) : '';
-		const serviceNumber = style.Train.trainServer.serviceNumberPrefix + (model.serviceNumber || style.Train.trainServer.defaultServiceNumber) + '';//	服务号(表号)
-		const tripNumber = style.Train.trainTarget.tripNumberPrefix + (style.Train.trainTarget.defaultDirectionCode
-			?(model.directionCode||style.Train.trainTarget.defaultDirectionCode) + (model.tripNumber || style.Train.trainTarget.defaultTripNumber)
-			:model.tripNumber || style.Train.trainTarget.defaultTripNumber) + ''; //  车次号
-		const targetCode = style.Train.trainNumber.targetCodePrefix + (model.targetCode || style.Train.trainNumber.defaultTargetCode) + ''; //  目的地码
-		const groupNumber = style.Train.trainTargetNumber.groupNumberPrefix + (model.groupNumber || style.Train.trainTargetNumber.defaultGroupNumber) + ''; //  车组号
-		this.textTrainServer = new ETextName({
-			zlevel: model.zlevel,
-			z: model.z+1,
-			x: parseInt(model.point.x + style.Train.trainServer.trainServerOffset.x),
-			y: parseInt(model.point.y + style.Train.trainServer.trainServerOffset.y),
-			text: serviceNumber.substring(serviceNumber.length - style.Train.trainServer.serviceNumberPrefix.length),
-			textFill: style.trainTextColor,
-			fontSize: model.fontSize,
-			fontFamily: style.Train.common.fontFamily,
-			textAlign: 'left',
-			textVerticalAlign: 'top'
-		});
-		this.textTrainTarget = new ETextName({
-			zlevel: this.model.zlevel,
-			z: this.model.z+1,
-			x: parseInt(model.point.x + model.style.Train.trainTarget.trainTargetOffset.x),
-			y: parseInt(model.point.y + model.style.Train.trainTarget.trainTargetOffset.y),
-			text: tripNumber.substring(tripNumber.length - style.Train.trainTarget.tripNumberPrefix.length),
-			textFill: style.trainTextColor,
-			fontSize: model.fontSize,
-			fontFamily: style.Train.common.fontFamily,
-			textAlign: style.Train.trainTarget.trainTargetTextAlign,
-			textVerticalAlign: 'top'
-		});
-		this.textTrainNumber = new ETextName({
-			zlevel: model.zlevel,
-			z: model.z+1,
-			x: parseInt(model.point.x + style.Train.trainNumber.trainNumberOffset.x),
-			y: parseInt(model.point.y + style.Train.trainNumber.trainNumberOffset.y),
-			text: targetCode.substring(targetCode.length - 3),
-			textFill: style.trainTextColor,
-			textStroke: style.trainTextColor,
-			fontWeight: 400,
-			textStrokeWidth: 0,
-			fontSize: model.fontSize,
-			fontFamily: style.Train.common.fontFamily,
-			textAlign: 'left',
-			textVerticalAlign: 'top'
-		});
-		this.textTrainTargetNumber = new ETextName({
-			zlevel: model.zlevel,
-			z: model.z+1,
-			x: parseInt(model.point.x - style.Train.trainBody.lrPadding),
-			y: parseInt(model.point.y + style.Train.trainBody.upPadding),
-			text: groupNumber.substring(groupNumber.length - 3),
-			textFill: style.trainTextColor,
-			textStroke: style.trainTextColor,
-			textStrokeWidth: 0,
-			fontSize: model.fontSize,
-			fontFamily: style.Train.common.fontFamily,
-			textAlign: 'left',
-			textVerticalAlign: 'top'
-		});
-		this.formatChangePosition(model, style);
-		this.add(this.trainBodyBox);
-		if (style.Train.common.haveTextHSDA) {
-			this.add(this.textH);
-			this.add(this.textS);
-			this.add(this.textD);
-			this.add(this.textA);
-		}
-	}
+        this.textH = style.Train.common.haveTextHSDA ? new ETextName({
+            zlevel: model.zlevel,
+            z: model.z,
+            x: parseInt(beginX + margin * 0),
+            y: parseInt(beginY),
+            text: style.Train.hsda.textHContent,
+            textFill: style.trainYellowColor,
+            fontSize: style.Train.hsda.trainHSDATextFontSize,
+            fontFamily: style.Train.common.fontFamily,
+            textAlign: 'middle',
+            textVerticalAlign: 'top'
+        }) : '';
+        this.textS = style.Train.common.haveTextHSDA ? new ETextName({
+            zlevel: model.zlevel,
+            z: model.z,
+            x: parseInt(beginX + margin * 1),
+            y: parseInt(beginY),
+            text: style.Train.hsda.textSContent,
+            textFill: style.trainBlueColor,
+            fontSize: style.Train.hsda.trainHSDATextFontSize,
+            fontFamily: style.Train.common.fontFamily,
+            textAlign: 'middle',
+            textVerticalAlign: 'top'
+        }) : '';
+        this.textD = style.Train.common.haveTextHSDA ? new ETextName({
+            zlevel: model.zlevel,
+            z: model.z,
+            x: parseInt(beginX + margin * 2),
+            y: parseInt(beginY),
+            text: style.Train.hsda.textDContent,
+            textFill: style.trainGreenColor,
+            fontSize: style.Train.hsda.trainHSDATextFontSize,
+            fontFamily: style.Train.common.fontFamily,
+            textAlign: 'middle',
+            textVerticalAlign: 'top'
+        }) : '';
+        this.textA = style.Train.common.haveTextHSDA ? new ETextName({
+            zlevel: model.zlevel,
+            z: model.z,
+            x: parseInt(beginX + margin * 3),
+            y: parseInt(beginY),
+            text: style.Train.hsda.textAContent,
+            textFill: style.trainRedColor,
+            fontSize: style.Train.hsda.trainHSDATextFontSize,
+            fontFamily: style.Train.common.fontFamily,
+            textAlign: 'middle',
+            textVerticalAlign: 'top'
+        }) : '';
+        const serviceNumber = style.Train.trainServer.serviceNumberPrefix + (model.serviceNumber || style.Train.trainServer.defaultServiceNumber) + '';//	服务号(表号)
+        const tripNumber = style.Train.trainTarget.tripNumberPrefix + (style.Train.trainTarget.defaultDirectionCode
+            ? (model.directionCode || style.Train.trainTarget.defaultDirectionCode) + (model.tripNumber || style.Train.trainTarget.defaultTripNumber)
+            : model.tripNumber || style.Train.trainTarget.defaultTripNumber) + ''; //  车次号
+        const targetCode = style.Train.trainNumber.targetCodePrefix + (model.destinationCode || style.Train.trainNumber.defaultTargetCode) + ''; //  目的地码
+        const groupNumber = style.Train.trainTargetNumber.groupNumberPrefix + (model.groupNumber || style.Train.trainTargetNumber.defaultGroupNumber) + ''; //  车组号
+        this.textTrainServer = new ETextName({
+            zlevel: model.zlevel,
+            z: model.z + 1,
+            x: parseInt(model.point.x + style.Train.trainServer.trainServerOffset.x),
+            y: parseInt(model.point.y + style.Train.trainServer.trainServerOffset.y),
+            text: serviceNumber.substring(serviceNumber.length - style.Train.trainServer.serviceNumberPrefix.length),
+            textFill: style.trainTextColor,
+            fontSize: model.fontSize,
+            fontFamily: style.Train.common.fontFamily,
+            textAlign: 'left',
+            textVerticalAlign: 'top'
+        });
+        this.textTrainTarget = new ETextName({
+            zlevel: this.model.zlevel,
+            z: this.model.z + 1,
+            x: parseInt(model.point.x + model.style.Train.trainTarget.trainTargetOffset.x),
+            y: parseInt(model.point.y + model.style.Train.trainTarget.trainTargetOffset.y),
+            text: tripNumber.substring(tripNumber.length - style.Train.trainTarget.tripNumberPrefix.length),
+            textFill: style.trainTextColor,
+            fontSize: model.fontSize,
+            fontFamily: style.Train.common.fontFamily,
+            textAlign: style.Train.trainTarget.trainTargetTextAlign,
+            textVerticalAlign: 'top'
+        });
+        this.textTrainNumber = new ETextName({
+            zlevel: model.zlevel,
+            z: model.z + 1,
+            x: parseInt(model.point.x + style.Train.trainNumber.trainNumberOffset.x),
+            y: parseInt(model.point.y + style.Train.trainNumber.trainNumberOffset.y),
+            text: targetCode.substring(targetCode.length - 3),
+            textFill: style.trainTextColor,
+            textStroke: style.trainTextColor,
+            fontWeight: 400,
+            textStrokeWidth: 0,
+            fontSize: model.fontSize,
+            fontFamily: style.Train.common.fontFamily,
+            textAlign: 'left',
+            textVerticalAlign: 'top'
+        });
+        this.textTrainTargetNumber = new ETextName({
+            zlevel: model.zlevel,
+            z: model.z + 1,
+            x: parseInt(model.point.x - style.Train.trainBody.lrPadding),
+            y: parseInt(model.point.y + style.Train.trainBody.upPadding),
+            text: groupNumber.substring(groupNumber.length - 3),
+            textFill: style.trainTextColor,
+            textStroke: style.trainTextColor,
+            textStrokeWidth: 0,
+            fontSize: model.fontSize,
+            fontFamily: style.Train.common.fontFamily,
+            textAlign: 'left',
+            textVerticalAlign: 'top'
+        });
+        this.formatChangePosition(model, style);
+        this.add(this.trainBodyBox);
+        if (style.Train.common.haveTextHSDA) {
+            this.add(this.textH);
+            this.add(this.textS);
+            this.add(this.textD);
+            this.add(this.textA);
+        }
+    }
 
-	removeTrainDetail() {
-		this.mouseEvent.mouseout();
-		store.dispatch('map/setTrainDetails', null);
-		this.deviceModel.down = false;
-	}
-	setTrainColor(color) {
-		this.trainBodyBox && this.trainBodyBox.setStyle('fill', color);
-	}
-	setTextTrainServerColor(color) {
-		this.textTrainServer&&this.textTrainServer.setStyle('textFill', color);
-		this.textTrainServer&&this.textTrainServer.setStyle('textStroke', color);
-	}
-	setTextTrainTargetColor(color) {
-		this.textTrainTarget&&this.textTrainTarget.setStyle('textFill', color);
-		this.textTrainTarget&&this.textTrainTarget.setStyle('textStroke', color);
-	}
-	setTextTrainNumberColor(color) {
-		this.textTrainNumber&&this.textTrainNumber.setStyle('textFill', color);
-		this.textTrainNumber&&this.textTrainNumber.setStyle('textStroke', color);
-	}
-	setTextTrainTargetNumberColor(color) {
-		this.textTrainTargetNumber&&this.textTrainTargetNumber.setStyle('textFill', color);
-		this.textTrainTargetNumber&&this.textTrainTargetNumber.setStyle('textStroke', color);
-	}
-	setHShow(isShow) {
-		if (this.textH) {
-			isShow ? this.textH.show() : this.textH.hide();
-		}
-	}
-	setSShow(isShow) {
-		if (this.textS) {
-			isShow ? this.textS.show() : this.textS.hide();
-		}
-	}
-	setDShow(isShow) {
-		if (this.textD) {
-			isShow ? this.textD.show() : this.textD.hide();
-		}
-	}
-	setAShow(isShow) {
-		if (this.textA) {
-			isShow ? this.textA.show() : this.textA.hide();
-		}
-	}
-	setBodyBoxShape(key, color) {
-		this.trainBodyBox && this.trainBodyBox.setColor(key, color);
-	}
-	formatChangePosition(model, style) {
-		if (this.nameFormat) {
-			const arr = this.nameFormat.split(':');
-			let widthText = 0;
-			arr.forEach(ele => {
-				if (ele == 'targetCode') {
-					this.textTrainNumber.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset) );
-					widthText += this.textTrainNumber.getBoundingRect().width;
-					this.add(this.textTrainNumber);
-				} else if (ele == 'serviceNumber') {
-					this.textTrainServer.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
-					widthText += this.textTrainServer.getBoundingRect().width;
-					this.add(this.textTrainServer);
-				} else if (ele == 'tripNumber') {
-					this.textTrainTarget.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
-					widthText += this.textTrainTarget.getBoundingRect().width;
-					this.add(this.textTrainTarget);
-				} else if (ele == 'groupNumber') {
-					this.textTrainTargetNumber.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
-					widthText += this.textTrainTargetNumber.getBoundingRect().width;
-					this.add(this.textTrainTargetNumber);
-				}
-			});
-		}
-	}
+    removeTrainDetail() {
+        this.mouseEvent.mouseout();
+        store.dispatch('map/setTrainDetails', null);
+        this.deviceModel.down = false;
+    }
+    setTrainColor(color) {
+        this.trainBodyBox && this.trainBodyBox.setStyle('fill', color);
+    }
+    setTextTrainServerColor(color) {
+        this.textTrainServer && this.textTrainServer.setStyle('textFill', color);
+        this.textTrainServer && this.textTrainServer.setStyle('textStroke', color);
+    }
+    setTextTrainTargetColor(color) {
+        this.textTrainTarget && this.textTrainTarget.setStyle('textFill', color);
+        this.textTrainTarget && this.textTrainTarget.setStyle('textStroke', color);
+    }
+    setTextTrainNumberColor(color) {
+        this.textTrainNumber && this.textTrainNumber.setStyle('textFill', color);
+        this.textTrainNumber && this.textTrainNumber.setStyle('textStroke', color);
+    }
+    setTextTrainTargetNumberColor(color) {
+        this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle('textFill', color);
+        this.textTrainTargetNumber && this.textTrainTargetNumber.setStyle('textStroke', color);
+    }
+    setHShow(isShow) {
+        if (this.textH) {
+            isShow ? this.textH.show() : this.textH.hide();
+        }
+    }
+    setSShow(isShow) {
+        if (this.textS) {
+            isShow ? this.textS.show() : this.textS.hide();
+        }
+    }
+    setDShow(isShow) {
+        if (this.textD) {
+            isShow ? this.textD.show() : this.textD.hide();
+        }
+    }
+    setAShow(isShow) {
+        if (this.textA) {
+            isShow ? this.textA.show() : this.textA.hide();
+        }
+    }
+    setBodyBoxShape(key, color) {
+        this.trainBodyBox && this.trainBodyBox.setColor(key, color);
+    }
+    formatChangePosition(model, style) {
+        if (this.nameFormat) {
+            const arr = this.nameFormat.split(':');
+            let widthText = 0;
+            arr.forEach(ele => {
+                if (ele == 'targetCode') {
+                    this.textTrainNumber.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset) );
+                    widthText += this.textTrainNumber.getBoundingRect().width;
+                    this.add(this.textTrainNumber);
+                } else if (ele == 'serviceNumber') {
+                    this.textTrainServer.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
+                    widthText += this.textTrainServer.getBoundingRect().width;
+                    this.add(this.textTrainServer);
+                } else if (ele == 'tripNumber') {
+                    this.textTrainTarget.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
+                    widthText += this.textTrainTarget.getBoundingRect().width;
+                    this.add(this.textTrainTarget);
+                } else if (ele == 'groupNumber') {
+                    this.textTrainTargetNumber.setStyle('x', parseInt(model.point.x + widthText + style.Train.common.textOffset));
+                    widthText += this.textTrainTargetNumber.getBoundingRect().width;
+                    this.add(this.textTrainTargetNumber);
+                }
+            });
+        }
+    }
 }
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index c295b489d..f8c48a7c5 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -43,6 +43,7 @@ class Jlmap {
         const width = opts.dom.clientWidth;
         const height = opts.dom.clientHeight;
         this.zoomOnMouseWheel = opts.options.zoomOnMouseWheel;
+        this.previewOrMapDraw = opts.showConfig.previewOrMapDraw;
 
         this.$zr = zrender.init(opts.dom, deepAssign({ renderer, devicePixelRatio, width, height }, opts.config));
 
@@ -137,6 +138,7 @@ class Jlmap {
             this.$mouseController.disable();
         } else {
             opts['zoomOnMouseWheel'] = this.zoomOnMouseWheel;
+            opts['previewOrMapDraw'] = this.previewOrMapDraw;
             this.$mouseController.enable(opts);
         }
 
diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js
index e29b617e7..510143007 100644
--- a/src/jmapNew/mouseController.js
+++ b/src/jmapNew/mouseController.js
@@ -54,6 +54,7 @@ class MouseController extends Eventful {
                 this._moveOnMouseMove = opts.moveOnMouseMove || true;
                 this._zoomOnMouseWheel = opts.zoomOnMouseWheel || false;
                 this._preventDefaultMouseMove = opts.preventDefaultMouseMove || true;
+                this._previewOrMapDraw = opts.previewOrMapDraw || false;
 
                 this.disable();
 
@@ -121,7 +122,7 @@ class MouseController extends Eventful {
             this._preventDefaultMouseMove && eventTool.stop(e.event);
 
             this.trigger(this.events.__Pan, { dx, dy, oldX, oldY, newX: this._x, newY: this._y });
-        } else if (e.which === 3 && this._zoomOnMouseWheel) {
+        } else if (e.which === 3 && this._zoomOnMouseWheel && this._previewOrMapDraw) {
             this.handleMouseMoveRight({x: e.offsetX, y: e.offsetY});
         }
     }
diff --git a/src/jmapNew/shape/Train/EMouse.js b/src/jmapNew/shape/Train/EMouse.js
index f0a1ab761..2bcd4d25a 100644
--- a/src/jmapNew/shape/Train/EMouse.js
+++ b/src/jmapNew/shape/Train/EMouse.js
@@ -27,9 +27,9 @@ class EMouse extends Group {
         }
         let text = '';
         if (LangStorage.getLang() == 'en') {
-            text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.targetCode ? this.device.model.targetCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${this.device.model.directionType == '02' ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? this.device.model.sectionModel.name : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${!this.device.model.hold ? 'Normal' : 'Detained'}\n \n 跳停状态: ${!this.device.model.jump ? 'Normal' : 'Skip to continue moving'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`;
+            text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${this.device.model.directionType == '02' ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? this.device.model.sectionModel.name : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${!this.device.model.hold ? 'Normal' : 'Detained'}\n \n 跳停状态: ${!this.device.model.jump ? 'Normal' : 'Skip to continue moving'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`;
         } else {
-            text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.targetCode ? this.device.model.targetCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${this.device.model.directionType == '02' ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? this.device.model.sectionModel.name : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${ !this.device.model.hold ? '正常' : '扣车'}\n 跳停状态: ${!this.device.model.jump ? '正常' : '跳停'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`;
+            text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${this.device.model.directionType == '02' ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? this.device.model.sectionModel.name : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${ !this.device.model.hold ? '正常' : '扣车'}\n 跳停状态: ${!this.device.model.jump ? '正常' : '跳停'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`;
         }
         // 文字描述
         this.arrowText = new Text({
diff --git a/src/jmapNew/shape/Train/ETriangle.js b/src/jmapNew/shape/Train/ETriangle.js
index d47ec973e..f658cb6bc 100644
--- a/src/jmapNew/shape/Train/ETriangle.js
+++ b/src/jmapNew/shape/Train/ETriangle.js
@@ -21,9 +21,9 @@ export default class ETriangle extends Group {
                     points:[[model.point.x + 10 * right, model.point.y], [model.point.x, model.point.y - 6], [model.point.x, model.point.y + 6]]
                 },
                 style: {
-                    stroke:'#FFFF00',
+                    stroke:'#00FF00',
                     lineWidth: 0.5,
-                    fill: '#FFFF00'
+                    fill: '#00FF00'
                 }
             });
             this.add(this.angle);
diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js
index c58218619..20329f85b 100644
--- a/src/jmapNew/shape/Train/TrainBody.js
+++ b/src/jmapNew/shape/Train/TrainBody.js
@@ -102,7 +102,7 @@ export default class TrainBody extends Group {
         const tripNumber = style.Train.trainTarget.tripNumberPrefix + (style.Train.trainTarget.defaultDirectionCode
             ? (model.directionCode || style.Train.trainTarget.defaultDirectionCode) + (model.tripNumber || style.Train.trainTarget.defaultTripNumber)
             : model.tripNumber || style.Train.trainTarget.defaultTripNumber) + ''; //  车次号
-        const targetCode = style.Train.trainNumber.targetCodePrefix + (model.targetCode || style.Train.trainNumber.defaultTargetCode) + ''; //  目的地码
+        const targetCode = style.Train.trainNumber.targetCodePrefix + (model.destinationCode || style.Train.trainNumber.defaultTargetCode) + ''; //  目的地码
         const groupNumber = style.Train.trainTargetNumber.groupNumberPrefix + (model.groupNumber || style.Train.trainTargetNumber.defaultGroupNumber) + ''; //  车组号
         this.textTrainServer = new ETextName({
             zlevel: model.zlevel,
diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index c32a940fa..121f85696 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -18,6 +18,7 @@ export default class Train extends Group {
         this.z = 40;
         this.size = 0;
         this.section = null;
+        this.nextPointIndex = 1;
         this.fontSize = style.Train.common.useSelfText ? style.Train.common.nameFontSize || style.Train.common.trainTextFontSize : model.nameFontSize || style.Train.common.nameFontSize || style.Train.common.trainTextFontSize;
         this.newScale = this.fontSize / style.Train.common.trainTextFontSize;
         this.nameFormat = style.Train.common.useSelfFormat ? style.Train.trainBody.trainNameFormat : model.nameFormat || style.Train.trainBody.trainNameFormat;
@@ -68,7 +69,7 @@ export default class Train extends Group {
                 destinationStatus: model.destinationStatus,
                 serviceNumber: model.serviceNumber,
                 tripNumber: model.tripNumber,
-                targetCode: model.targetCode,
+                destinationCode: model.destinationCode,
                 groupNumber: model.groupNumber,
                 directionType: model.directionType,
                 directionCode: model.directionCode,
@@ -105,21 +106,38 @@ export default class Train extends Group {
                 scale: this.newScale
             });
 
-            const data = this.model.physicalCode;
-            const oldmodel = store.getters['map/getDeviceByCode'](data);
-            const leftPoint = oldmodel.points[0];
-            const rightPoint = oldmodel.points[oldmodel.points.length - 1];
-            const right = this.model.right == 1 ? 1 : 0;
-            this.startX = leftPoint.x + (1 - right) * (rightPoint.x - leftPoint.x);
-            this.startY = leftPoint.y + (1 - right) * (rightPoint.y - leftPoint.y);
-            this.triangle = new ETriangle({
-                style: this.style,
-                zlevel: this.zlevel,
-                z:10,
-                right: this.model.right,
-                point:{x:this.startX, y:this.startY}
-            });
-            this.add(this.triangle);
+            if (style.Section.trainPosition.display) {
+                const data = this.model.physicalCode;
+                const oldmodel = store.getters['map/getDeviceByCode'](data);
+                const leftPoint = oldmodel.points[0];
+                const rightPoint = oldmodel.points[oldmodel.points.length - 1];
+                const right = this.model.right == 1 ? 1 : 0;
+                this.startX = leftPoint.x + (1 - right) * (rightPoint.x - leftPoint.x);
+                this.startY = leftPoint.y + (1 - right) * (rightPoint.y - leftPoint.y);
+                // 算出折线的长度
+                this.lineLength = 0;
+                this.currentAdd = 0;
+                let oldPoint = null;
+                oldmodel.points.forEach((point)=>{
+                    if (oldPoint) {
+                        const temp = Math.sqrt(
+                            Math.pow(point.x - oldPoint.x, 2) +
+                        Math.pow(point.y - oldPoint.y, 2),
+                        );
+                        this.lineLength += temp;
+                    }
+                    oldPoint = point;
+                });
+                // this.animatePoint = {x:this.startX, y:this.startY};
+                this.triangle = new ETriangle({
+                    style: this.style,
+                    zlevel: this.zlevel,
+                    z:10,
+                    right: this.model.right,
+                    point:{x:this.startX, y:this.startY}
+                });
+                this.add(this.triangle);
+            }
 
             this.add(this.trainB);
             this.add(this.trainL);
@@ -136,20 +154,67 @@ export default class Train extends Group {
 
     updateSection() {
         const train = this.model;
-        if (train.physicalCode && train.offsetp) {
+        if (train.physicalCode && train.offsetp && this.triangle) {
             const data = train.physicalCode;
             const oldmodel = store.getters['map/getDeviceByCode'](data);
-            const leftPoint = oldmodel.points[0];
-            const rightPoint = oldmodel.points[oldmodel.points.length - 1];
-            if (this.triangle) {
+            // 待处理（多个点的问题）
+            // const points = train.right == 1 ? oldmodel.points : oldmodel.points.reverse();
+            const points = oldmodel.points;
+            // 目标距离
+            let targetDistance = Math.sqrt(
+                Math.pow(points[this.nextPointIndex - 1].x - points[this.nextPointIndex].x, 2) +
+                Math.pow(points[this.nextPointIndex - 1].y - points[this.nextPointIndex].y, 2),
+            );
+            // // 当前距离
+            // const currentDistance = Math.sqrt(
+            //     Math.pow(points[this.nextPointIndex - 1].x - this.animatePoint.x, 2) +
+            //     Math.pow(points[this.nextPointIndex - 1].y - this.animatePoint.y, 2),
+            // );
+
+            const currentDistance = this.lineLength * train.offsetp - this.currentAdd;
+
+            // let cureent this.lineLength * train.offsetp
+            // 利用运动距离与目标距离, 判断运动的点是否超过下一个目标点, 超过了就重置下一个点
+            if (currentDistance >= targetDistance) {
+                // this.animatePoint = {
+                //     x: points[this.nextPointIndex].x,
+                //     y: points[this.nextPointIndex].y
+                // };
+                this.nextPointIndex++;
+                this.currentAdd += targetDistance;
+                targetDistance = Math.sqrt(
+                    Math.pow(points[this.nextPointIndex - 1].x - points[this.nextPointIndex].x, 2) +
+                    Math.pow(points[this.nextPointIndex - 1].y - points[this.nextPointIndex].y, 2),
+                );
+            }
+            if (this.nextPointIndex > points.length - 1) {
+                const leftPoint = oldmodel.points[0];
+                const rightPoint = oldmodel.points[oldmodel.points.length - 1];
                 this.startX = leftPoint.x + (rightPoint.x - leftPoint.x) * train.offsetp;
                 this.startY = leftPoint.y + (rightPoint.y - leftPoint.y) * train.offsetp;
-                const point = {x:this.startX, y:this.startY};
-                this.triangle.point = point;
-                this.triangle.updateTriangle(point, train.right);
-                this.triangle.dirty();
-                this.dirty();
+            } else {
+                // debugger;
+                // this.lineLength * train.offsetp
+                // if (this.currentLength > targetDistance) {
+                //     this.currentLength = this.currentLength - targetDistance;
+                //     this.nextPointIndex++;
+                //     targetDistance = Math.sqrt(
+                //         Math.pow(points[this.nextPointIndex - 1].x - points[this.nextPointIndex].x, 2) +
+                //         Math.pow(points[this.nextPointIndex - 1].y - points[this.nextPointIndex].y, 2),
+                //     );
+                // }
+                debugger;
+                const rate = (this.lineLength * train.offsetp - this.currentAdd) / targetDistance;
+                this.startX = points[this.nextPointIndex - 1].x + (points[this.nextPointIndex].x - points[this.nextPointIndex - 1].x) * rate;
+                this.startY = points[this.nextPointIndex - 1].y + (points[this.nextPointIndex].y - points[this.nextPointIndex - 1].y) * rate;
+                // this.animatePoint.x = this.startX;
+                // this.animatePoint.y = this.startY;
             }
+            const point = {x:this.startX, y:this.startY};
+            this.triangle.point = point;
+            this.triangle.updateTriangle(point, train.right);
+            this.triangle.dirty();
+            this.dirty();
         }
     }
 
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
index b29cd645f..87afa9c2f 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <train-init-plan ref="trainInitPlan"/>
+    <train-init-plan ref="trainInitPlan" />
     <notice-info ref="noticeInfo" />
   </div>
 </template>
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index afc917fe7..c32936182 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -158,11 +158,11 @@ export default {
             };
             // 默认个人地图绘制可以滚轮放大缩小 其他地图显示不允许此操作
             const path = window.location.href;
-            let mouseWheelFlag = false;
+            const mouseWheelFlag = true;
             let previewOrMapDraw = false;
-            if (path.includes('design/userlist/map/draw') || path.includes('design/usermap/map/draw')) {
-                mouseWheelFlag = true;
-            }
+            // if (path.includes('design/userlist/map/draw') || path.includes('design/usermap/map/draw')) {
+            //     mouseWheelFlag = true;
+            // }
             if (path.indexOf('map/draw') !== -1 || path.indexOf('mapPreviewNew') !== -1) {
                 previewOrMapDraw = true;
             }

From 6c7bb150fbc84e9fcb7ab0c8168de4439b5f343c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 12 Mar 2020 15:13:18 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Train/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index 121f85696..35f5b5d15 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -19,6 +19,7 @@ export default class Train extends Group {
         this.size = 0;
         this.section = null;
         this.nextPointIndex = 1;
+        this.currentAdd = 0;
         this.fontSize = style.Train.common.useSelfText ? style.Train.common.nameFontSize || style.Train.common.trainTextFontSize : model.nameFontSize || style.Train.common.nameFontSize || style.Train.common.trainTextFontSize;
         this.newScale = this.fontSize / style.Train.common.trainTextFontSize;
         this.nameFormat = style.Train.common.useSelfFormat ? style.Train.trainBody.trainNameFormat : model.nameFormat || style.Train.trainBody.trainNameFormat;
@@ -116,7 +117,6 @@ export default class Train extends Group {
                 this.startY = leftPoint.y + (1 - right) * (rightPoint.y - leftPoint.y);
                 // 算出折线的长度
                 this.lineLength = 0;
-                this.currentAdd = 0;
                 let oldPoint = null;
                 oldmodel.points.forEach((point)=>{
                     if (oldPoint) {
@@ -203,7 +203,6 @@ export default class Train extends Group {
                 //         Math.pow(points[this.nextPointIndex - 1].y - points[this.nextPointIndex].y, 2),
                 //     );
                 // }
-                debugger;
                 const rate = (this.lineLength * train.offsetp - this.currentAdd) / targetDistance;
                 this.startX = points[this.nextPointIndex - 1].x + (points[this.nextPointIndex].x - points[this.nextPointIndex - 1].x) * rate;
                 this.startY = points[this.nextPointIndex - 1].y + (points[this.nextPointIndex].y - points[this.nextPointIndex - 1].y) * rate;

From 6031ca59eb5e47c0779fb68a750347c2ec61ade6 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 12 Mar 2020 15:54:30 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/chengdu_01/menus/menuRequest.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
index 8f7adc1fd..77f0d2202 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
@@ -41,7 +41,7 @@ export default {
     },
     data() {
         return {
-            unfold: false,
+            unfold: true,
             tempData: [],
             tableStyle: {
                 'border-bottom': 'none',