From 143f35a222db81fa682398dd2d668c5afe22ae4e Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 19 Dec 2019 16:21:00 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E7=89=A9=E7=90=86?=
 =?UTF-8?q?=E5=8C=BA=E6=AE=B5=E5=88=97=E8=A1=A8=E8=BF=9E=E7=BB=AD=E9=AB=98?=
 =?UTF-8?q?=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Section/index.js            |  15 +-
 src/utils/baseUrl.js                          |   4 +-
 .../newMap/newMapdraft/dataRelation/index.vue |  11 +-
 .../dataRelation/protectoperate/detail.vue    | 157 -------
 .../dataRelation/protectoperate/index.vue     |  84 ----
 .../dataRelation/protectoperate/route.vue     | 413 ------------------
 .../dataRelation/routeoperate/index.vue       |   3 +
 .../dataRelation/routeoperate/route.vue       |  27 +-
 .../newMap/newMapdraft/mapoperate/section.vue |   1 +
 .../mapoperate/section/logicBlock.vue         |   5 +
 10 files changed, 58 insertions(+), 662 deletions(-)
 delete mode 100644 src/views/newMap/newMapdraft/dataRelation/protectoperate/detail.vue
 delete mode 100644 src/views/newMap/newMapdraft/dataRelation/protectoperate/index.vue
 delete mode 100644 src/views/newMap/newMapdraft/dataRelation/protectoperate/route.vue

diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index dbc5fb279..8deec902a 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -22,6 +22,7 @@ export default class Section extends Group {
         this.model = model;
         this.style = style;
         this.selected = false; // 绘图选中状态
+        this.batchSelected = false; // 绘图批量选中状态
         this.create();
         this.createMouseEvent();
         this.setState(model);
@@ -853,7 +854,15 @@ export default class Section extends Group {
     drawSelected(selected) {
         this.selected = selected;
         if (selected) {
-            this.section && this.section.setStyle({stroke: 'rgba(0,255,255,0.6)'});
+            !this.batchSelected && this.section && this.section.setStyle({stroke: 'rgba(0,255,255,0.6)'});
+        } else {
+            !this.batchSelected && this.section && this.section.setStyle({stroke: this.style.Section.line.spareColor });
+        }
+    }
+    drawBatchSelected(selected) {
+        this.batchSelected = selected;
+        if (selected) {
+            this.section && this.section.setStyle({stroke: 'rgba(255,255,0,0.6)'});
         } else {
             this.section && this.section.setStyle({stroke: this.style.Section.line.spareColor });
         }
@@ -862,8 +871,8 @@ export default class Section extends Group {
     checkIsDrawMap() {
         const path = window.location.href;
         if (path.includes('/map/draw')) {
-            this.on('mouseout', () => { !this.selected && this.section && this.section.setStyle({stroke: this.style.Section.line.spareColor }); });
-            this.on('mouseover', () => { this.section && this.section.setStyle({stroke: 'rgba(0,255,255,0.6)'}); });
+            this.on('mouseout', () => { !this.batchSelected && !this.selected && this.section && this.section.setStyle({stroke: this.style.Section.line.spareColor }); });
+            this.on('mouseover', () => { !this.batchSelected && this.section && this.section.setStyle({stroke: 'rgba(0,255,255,0.6)'}); });
         }
     }
 
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 79d1c6346..1e9afea51 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,11 +3,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
     }
diff --git a/src/views/newMap/newMapdraft/dataRelation/index.vue b/src/views/newMap/newMapdraft/dataRelation/index.vue
index 1528f1c41..4b6e73b40 100644
--- a/src/views/newMap/newMapdraft/dataRelation/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/index.vue
@@ -12,7 +12,7 @@
           <el-button type="text" class="mapEdit_box" @click="drawMap">{{ $t('map.drawMap') }}</el-button>
           <el-button type="text" class="mapEdit_box" @click="showMap">{{ $t('map.viewLayer') }}</el-button>
         </div>
-        <el-tabs v-model="enabledTab" type="card" class="map_card" @tab-click="changePane">
+        <el-tabs v-model="enabledTab" type="card" class="map_card" :before-leave="tabBeforeLeave" @tab-click="changePane">
           <el-tab-pane :label="$t('map.routeID')" class="tab_pane_box" name="route">
             <route-operate
               ref="routeOperate"
@@ -183,8 +183,17 @@ export default {
             this.$emit('setCenter', code);
         },
         drawMap() {
+            this.$refs.routeOperate.routeSectionListFocus(false);
             this.$emit('selectView', 'draft');
         },
+        tabBeforeLeave(activeName, oldActiveName) {
+            if (activeName === 'route') {
+                this.$refs.routeOperate.routeSectionListFocus(true);
+            }
+            if (oldActiveName === 'route') {
+                this.$refs.routeOperate.routeSectionListFocus(false);
+            }
+        },
         handleHightLight(selected) {
             if (this.oldDevice && (this.oldDevice._type === 'Section' || this.oldDevice._type === 'Psd') && this.oldDevice.instance && typeof this.oldDevice.instance.drawSelected === 'function') {
                 if (this.isSwitchSection) {
diff --git a/src/views/newMap/newMapdraft/dataRelation/protectoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/protectoperate/detail.vue
deleted file mode 100644
index e3594e548..000000000
--- a/src/views/newMap/newMapdraft/dataRelation/protectoperate/detail.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag :title="$t('map.continueProtectList')" :visible.sync="show" width="85%" :before-do-close="doClose">
-    <div>
-      <QueryListPage
-        ref="queryListPage"
-        :pager-config="pagerConfig"
-        :query-form="queryForm"
-        :query-list="queryList"
-      />
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { getContinueProtectList, delContinueProtect, getContinueProtectById } from '@/api/jmap/mapdraft';
-
-export default {
-    name: 'ProtectDetail',
-    props: {
-        mapInfo: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            show: false,
-            showType: '',
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '120px',
-                queryObject: {
-                    name: {
-                        type: 'text',
-                        label: '延续保护名称'
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: '延续保护名称',
-                        prop: 'name'
-                    },
-                    {
-                        title: '解锁区段',
-                        prop: 'unlockSectionCode',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.unlockSectionCode, this.sectionList, ['code', 'name']); },
-                        tagType: (row) => { return ''; }
-                    },
-                    {
-                        title: '解锁时间(s)',
-                        prop: 'unlockTime'
-                    },
-                    {
-                        type: 'button',
-                        title: this.$t('map.operation'),
-                        width: '200',
-                        buttons: [
-                            {
-                                name: this.$t('map.compile'),
-                                handleClick: this.editObj,
-                                showControl: () => { return this.showType !== 'select'; }
-                            },
-                            {
-                                name: this.$t('map.deleteObj'),
-                                handleClick: this.deleteObj,
-                                type: 'danger',
-                                showControl: () => { return this.showType !== 'select'; }
-                            },
-                            {
-                                name: '选择',
-                                handleClick: this.selectedObj,
-                                showControl: () => { return this.showType === 'select'; }
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'sectionList',
-            'espList',
-            'psdList'
-        ])
-    },
-    watch: {
-    },
-    mounted() {
-    },
-    methods: {
-        doShow(type) {
-            this.show = true;
-            this.reloadTable();
-            if (type) {
-                this.showType = type;
-            }
-        },
-        doClose() {
-            this.show = false;
-        },
-        formatName(code) {
-            let name = '';
-            const device = this.$store.getters['map/getDeviceByCode'](code);
-            if (device) {
-                name = device.uniqueName;
-            }
-
-            return name;
-        },
-        queryFunction(params) {
-            if (this.mapInfo && this.mapInfo.id) {
-                return getContinueProtectList(this.mapInfo.id, params);
-            }
-        },
-        editObj(index, row) {
-            getContinueProtectById(row.id).then(response => {
-                const data = response.data;
-                this.$emit('protectSelected', data);
-                this.doClose();
-            });
-        },
-        deleteObj(index, row) {
-            if (this.mapInfo && this.mapInfo.id && row) {
-                // 删除
-                delContinueProtect(row.id).then(response => {
-                    this.$message.success(this.$t('map.successfullyDelete'));
-                    this.reloadTable();
-                }).catch(() => {
-                    this.$messageBox(this.$t('map.failDelete'));
-                });
-            }
-        },
-        reloadTable() {
-            if (this.queryList && this.queryList.reload) {
-                this.queryList.reload();
-            }
-        },
-        selectedObj(index, row) {
-            this.$emit('setOverlapCode', row);
-            this.show = false;
-        }
-    }
-};
-</script>
diff --git a/src/views/newMap/newMapdraft/dataRelation/protectoperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/protectoperate/index.vue
deleted file mode 100644
index 086e26408..000000000
--- a/src/views/newMap/newMapdraft/dataRelation/protectoperate/index.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-  <div style="height: 100%;">
-    <route-draft
-      ref="routeEdit"
-      :selected="selected"
-      :map-info="mapInfo"
-      :route-data="routeData"
-    />
-    <route-detail ref="routeDetail" :map-info="mapInfo" @protectSelected="protectSelected" />
-  </div>
-</template>
-<script>
-import RouteDraft from './route';
-import RouteDetail from './detail';
-
-export default {
-    name: 'ContinueProtect',
-    components: {
-        RouteDraft,
-        RouteDetail
-    },
-    props: {
-        mapInfo: {
-            type: Object,
-            default() {
-                return null;
-            }
-        },
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            enabledTab: 'protect',
-            routeData: null
-        };
-    },
-    methods: {
-        clickEvent(e, model) {
-            this.onSelect(model);
-        },
-        onSelect(model) {
-            if (model) {
-                this.selected = model;
-            } else {
-                this.selected = null;
-            }
-        },
-        setDelayUnlockStatus(data, status) {
-            if (data && data.delayShowList) {
-                data.delayShowList.forEach(elem => {
-                    elem.status = status;
-                });
-            }
-        },
-        protectSelected: function (data) {
-            this.routeData = data;
-            if (this.$refs.routeEdit) {
-                this.$refs.routeEdit.isSave = false;
-            }
-        },
-        previewRouteEvent: function () {
-            if (this.$refs.routeDetail) {
-                this.$refs.routeDetail.doShow();
-            }
-        },
-        createRouteEvent: function () {
-            if (this.$refs.routeEdit) {
-                this.$refs.routeEdit.clear();
-            }
-        },
-        setSelected(selected) {
-            this.$refs.routeEdit.setSelected(selected);
-        },
-        setCenter(code) {
-            this.$emit('setCenter', code);
-        }
-    }
-};
-</script>
diff --git a/src/views/newMap/newMapdraft/dataRelation/protectoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/protectoperate/route.vue
deleted file mode 100644
index a7bc14665..000000000
--- a/src/views/newMap/newMapdraft/dataRelation/protectoperate/route.vue
+++ /dev/null
@@ -1,413 +0,0 @@
-<template>
-  <div style="height: 100%;">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-form ref="form" :model="addModel" :rules="rules" label-width="180px" size="mini">
-        <div class="definition">
-          <el-form-item label="延续保护名称:" prop="name">
-            <el-input v-model="addModel.name" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="解锁区段" prop="unlockSectionCode">
-            <el-select v-model="addModel.unlockSectionCode">
-              <el-option
-                v-for="item in sectionList"
-                :key="item.code"
-                :label="item.name + ' (' + item.code+ ')'"
-                :value="item.code"
-              />
-            </el-select>
-            <el-button
-              :type=" field === 'unlockSectionCode' ? 'danger' : 'primary'"
-              @click="hover('unlockSectionCode')"
-            >{{ $t('map.activate') }}</el-button>
-          </el-form-item>
-          <el-form-item label="解锁时间(s)" prop="unlockTime">
-            <el-input-number v-model="addModel.unlockTime" :min="0" />
-          </el-form-item>
-          <el-form-item label="延续保护线路:" prop="relSectionSwitchList">
-            <el-table :data="addModel.relSectionSwitchList" border style="width: 80%">
-              <el-table-column type="index" label="序号" width="100" />
-              <el-table-column fixed="right" :label="$t('map.operation')">
-                <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    size="small"
-                    @click.native.prevent="deleteOverlab(addModel.relSectionSwitchList, scope.$index)"
-                  >
-                    移出
-                  </el-button>
-                  <el-button
-                    type="text"
-                    size="small"
-                    @click.native.prevent="editOverlab(addModel.relSectionSwitchList, scope.$index)"
-                  >
-                    编辑
-                  </el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form-item>
-        </div>
-      </el-form>
-      <el-card class="box-card" shadow="never">
-        <div slot="header" class="clearfix">
-          <span style="font-size: 14px;">{{ cardTitle }}</span>
-          <el-button v-if="cardMode === 'generate'" style="float: right; padding: 3px 0" type="text" @click="generateOverlab">生成</el-button>
-          <el-button-group v-else-if=" cardMode === 'edit'" style="float: right;">
-            <el-button type="text" style="padding:3px 3px" @click="updateOverlab">修改</el-button>
-            <el-button type="text" style="padding:3px 0" @click="cancelOverlab">取消</el-button>
-          </el-button-group>
-        </div>
-        <div>
-          <el-form ref="overlabForm" :model="addOverlapModel" :rules="overLapRules" label-width="135px" size="mini" style="margin-top: 15px">
-            <el-form-item :label="$t('map.routeProtectsData') + ':'" prop="routeOverlapSectionList">
-              <el-select v-model="addOverlapModel.routeOverlapSectionList" multiple clearable :filterable="true">
-                <el-option
-                  v-for="item in sectionList"
-                  :key="item.code"
-                  :label="item.name + ' (' + item.code+ ')'"
-                  :value="item.code"
-                />
-              </el-select>
-              <el-button
-                :type=" field === 'routeOverlapSectionList' ? 'danger' : 'primary'"
-                @click="hover('routeOverlapSectionList')"
-              >{{ $t('map.activate') }}</el-button>
-            </el-form-item>
-            <el-form-item :label="$t('map.continueProtectSwitchData') + ':'" prop="routeOverlapSwitchList">
-              <el-select v-model="overlapCode" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
-                <el-option
-                  v-for="item in switchList"
-                  :key="item.code"
-                  :label="`${item.name}(${item.code})`"
-                  :value="item.code"
-                />
-              </el-select>
-              <el-button
-                :type=" field === 'routeOverlapSwitchList' ? 'danger' : 'primary'"
-                @click="hover('routeOverlapSwitchList')"
-              >{{ $t('map.activate') }}</el-button>
-              <el-button
-                type="primary"
-                @click="pushSwitch(addOverlapModel.routeOverlapSwitchList, {switchCode: overlapCode, normal: overlapType, switchType: overlapType ? '定位' : '反位'})"
-              >{{ $t('map.add') }}
-              </el-button>
-              <el-select v-model="overlapType" :filterable="true" :placeholder="$t('map.pleaseSelect')">
-                <el-option
-                  v-for="item in SwitchLocateTypeList"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item.code"
-                />
-              </el-select>
-              <el-table :data="addOverlapModel.routeOverlapSwitchList" border style="width: 97%">
-                <el-table-column prop="switchCode" :label="$t('map.switchId')" width="100">
-                  <template slot-scope="scope">
-                    <span>{{ swictchName(scope.row.switchCode) }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="switchType" :label="$t('map.switchType')" />
-                <el-table-column fixed="right" :label="$t('map.operation')" width="50">
-                  <template slot-scope="scope">
-                    <el-button
-                      type="text"
-                      size="small"
-                      @click.native.prevent="deleteSwitch(addOverlapModel.routeOverlapSwitchList, scope.$index)"
-                    >
-                      {{ $t('map.remove') }}
-                    </el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-card>
-      <div class="draft">
-        <el-button-group>
-          <el-button v-if="isSave" type="primary" size="small" :loading="loading" @click="save">{{ $t('map.save') }}
-          </el-button>
-          <el-button v-else type="warning" size="small" :loading="loading" @click="update">{{ $t('map.updata') }}
-          </el-button>
-        </el-button-group>
-      </div>
-    </el-scrollbar>
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
-import { postContinueProtect, putContinueProtect } from '@/api/jmap/mapdraft';
-import { ViewMode } from '@/scripts/ConstDic';
-import { deepAssign } from '@/utils/index';
-
-export default {
-    name: 'RouteOperation',
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        },
-        mapInfo: {
-            type: Object,
-            default() {
-                return null;
-            }
-        },
-        routeData: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            ViewMode: ViewMode,
-            field: '',
-            overlapCode: '',
-            isSave: true,
-            loading: false,
-            editModel: {},
-            addModel: {
-                id: '',
-                code: '',
-                mapId: '',
-                name: '',
-                unlockSectionCode:'',
-                unlockTime: 0,
-                relSectionSwitchList: []
-            },
-            addOverlapModel: {
-                parentIndex: '',
-                routeOverlapSectionList: [], // 进路延续保护区段数据列表
-                routeOverlapSwitchList: [] // 进路延续保护道岔数据列表
-            },
-            overlapType: '',
-            SwitchLocateTypeList: [
-                { name: '定位', code: true },
-                { name: '反位', code: false }
-            ],
-            editShow: false,
-            overLapRules: {
-
-            },
-            rules: {
-                name: [
-                    { required: true, message: '请输入延续保护名称', trigger:'blur'}
-                ],
-                unlockSectionCode: [
-                    { required: true, message: '请选择解锁区段', trigger:'change'}
-                ],
-                unlockTime: [
-                    { required: true, message: '请输入解锁时间', trigger:'blur'}
-                ],
-                relSectionSwitchList: [
-                    { required: true, message: '请生成延续保护线路', trigger: 'change'}
-                ]
-            },
-            cardMode: 'generate'
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'switchList',
-            'sectionList'
-        ]),
-        cardTitle() {
-            if (this.cardMode === 'generate') {
-                return '生成延续保护线路';
-            } else if (this.cardMode === 'edit') {
-                return '编辑延续保护线路';
-            } else {
-                return '';
-            }
-        }
-    },
-    watch: {
-        mapInfo(val) {
-            if (val) {
-                this.addModel.mapId = val.id;
-            }
-        },
-        routeData(val, old) {
-            if (val) {
-                this.addModel = val;
-                this.editShow = true;
-            }
-        }
-    },
-    mounted() {
-
-    },
-    methods: {
-        hover(field) {
-            this.field = field === this.field ? '' : field;
-        },
-        pushSwitch(list, data) {
-            const index = list.findIndex(elem => { return elem.switchCode == data.switchCode; });
-            if (index < 0) {
-                list.push(data);
-            } else {
-                this.$messageBox(this.$t('tip.routeSameID'));
-            }
-        },
-        deleteSwitch(list, index) {
-            list.splice(index, 1);
-        },
-        swictchName(code) {
-            let name = '';
-            if (code) {
-                const swch = this.$store.getters['map/getDeviceByCode'](code);
-                if (swch) {
-                    name = `${swch.name}(${swch.code})`;
-                }
-            }
-            return name;
-        },
-        setSelected(selected) {
-            if (selected) {
-                if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'routeOverlapSectionList'.toUpperCase()) {
-                    if (this.addOverlapModel.routeOverlapSectionList.indexOf(selected.code) === -1) {
-                        this.addOverlapModel.routeOverlapSectionList.push(selected.code);
-                    }
-                } else if (selected._type.toUpperCase() === 'Switch'.toUpperCase() && this.field.toUpperCase() === 'routeOverlapSwitchList'.toUpperCase()) {
-                    this.overlapCode = selected.code;
-                } else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'unlockSectionCode'.toUpperCase()) {
-                    this.addModel.unlockSectionCode = selected.code;
-                }
-            }
-        },
-        buildModel(code) {
-            const model = Object.assign({}, this.addModel);
-            if (code) { model['code'] = code; }
-            model['mapId'] = this.mapInfo.id;
-            return model;
-        },
-        save() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.loading = true;
-                    postContinueProtect(this.buildModel(getUID('Protect'))).then(resp => {
-                        this.$message.success('创建延续保护成功！');
-                        this.loading = false;
-                        this.clear();
-                    }).catch(() => {
-                        this.$messageBox('创建延续保护失败！');
-                        this.loading = false;
-                    });
-                }
-            });
-        },
-        update() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.loading = true;
-                    putContinueProtect(this.buildModel()).then(resp => {
-                        this.$message.success('更新延续保护成功！');
-                        this.loading = false;
-                        this.clear();
-                    }).catch(() => {
-                        this.$messageBox('更新延续保护失败！');
-                        this.loading = false;
-                    });
-                }
-            });
-        },
-        clear() {
-            if (this.$refs && this.$refs.form && this.mapInfo) {
-                delete this.addModel.id;
-                this.$refs.form.resetFields();
-                this.addModel.mapId = this.mapInfo.id;
-                this.addModel.relSectionSwitchList = [];
-                this.addModel.code = '';
-                this.addModel.unlockTime = 0;
-                this.addModel.unlockSectionCode = '';
-                this.addModel.id = '';
-                this.addModel.name = '';
-                this.isSave = true;
-                this.cardMode = 'generate';
-                this.clearOverlab();
-            }
-        },
-        deleteOverlab(list, index) {
-            list.splice(index, 1);
-            this.$refs.overlabForm.resetFields();
-            this.clearOverlab();
-            this.cardMode = 'generate';
-        },
-        editOverlab(list, index) {
-            this.addOverlapModel = deepAssign({}, list[index]);
-            this.addOverlapModel.parentIndex = index;
-            this.cardMode = 'edit';
-        },
-        updateOverlab() {
-            if (this.addOverlapModel.parentIndex || this.addOverlapModel.parentIndex === 0 ) {
-                this.addModel.relSectionSwitchList[this.addOverlapModel.parentIndex] = {
-                    routeOverlapSectionList:this.addOverlapModel.routeOverlapSectionList,
-                    routeOverlapSwitchList:this.addOverlapModel.routeOverlapSwitchList
-                };
-                this.clearOverlab();
-                this.cardMode = 'generate';
-            }
-        },
-        cancelOverlab() {
-            this.clearOverlab();
-            this.cardMode = 'generate';
-        },
-        generateOverlab() {
-            if (!this.addOverlapModel.routeOverlapSectionList.length) {
-                this.$messageBox('请选择进路延续保护区段!');
-            } else if (!this.addOverlapModel.routeOverlapSwitchList.length) {
-                this.$messageBox('请添加延续保护道岔!');
-            } else {
-                this.addModel.relSectionSwitchList.push({
-                    routeOverlapSectionList:this.addOverlapModel.routeOverlapSectionList,
-                    routeOverlapSwitchList:this.addOverlapModel.routeOverlapSwitchList
-                });
-                this.$refs.overlabForm.resetFields();
-                this.clearOverlab();
-            }
-        },
-        clearOverlab() {
-            this.addOverlapModel = {
-                parentIndex: '',
-                routeOverlapSectionList:[],
-                routeOverlapSwitchList:[]
-            };
-            this.overlapCode = '';
-            this.overlapType = '';
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-	/deep/ .el-radio {
-		margin-right: 10px;
-	}
-    /deep/ {
-        .el-select .el-tag {
-            height: auto;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            padding-right: 15px;
-            box-sizing: border-box;
-            white-space: normal;
-        }
-        .el-input__suffix{
-            right: 2px;
-        }
-    }
-    .box-card {
-        width: 88%;
-        position: relative;
-        left: 8%;
-    }
-    .draft {
-        width: 400px;
-        text-align: center;
-        margin: 20px auto;
-    }
-</style>
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue
index 33ace43fb..6934ae5b6 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue
@@ -79,6 +79,9 @@ export default {
         },
         setCenter(code) {
             this.$emit('setCenter', code);
+        },
+        routeSectionListFocus(flag) {
+            this.$refs.routeEdit.routeSectionListFocus(flag);
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index e28089fcf..bf42ca694 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -350,9 +350,24 @@ export default {
                 this.addModel.name = val;
             }
         },
-        'addModel.routeSectionList': function(val) {
+        'addModel.routeSectionList': function(val, old) {
+            if (old && old.length) {
+                old.forEach((item) => {
+                    const section = this.$store.getters['map/getDeviceByCode'](item);
+                    section.instance.drawBatchSelected(false);
+                });
+            }
             if (val && val.length) {
                 this.$refs.protect.addModel.unlockSectionCode = val[val.length - 1];
+                val.forEach((item) => {
+                    const section = this.$store.getters['map/getDeviceByCode'](item);
+                    if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
+                        section.logicSectionCodeList.forEach( (logicSectionCode) => {
+                            this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(true);
+                        });
+                    }
+                    section.instance.drawBatchSelected(true);
+                });
             }
         }
     },
@@ -466,6 +481,12 @@ export default {
                 this.protectData = resp.data.list[0];
             });
         },
+        routeSectionListFocus(flag) {
+            this.addModel.routeSectionList.forEach((item) => {
+                const section = this.$store.getters['map/getDeviceByCode'](item);
+                section.instance.drawBatchSelected(flag);
+            });
+        },
         setSelected(selected) {
             if (selected) {
                 if (selected._type.toUpperCase() === 'Signal'.toUpperCase() && this.field.toUpperCase() === 'startSignalCode'.toUpperCase()) {
@@ -473,8 +494,10 @@ export default {
                 } else if (selected._type.toUpperCase() === 'Signal'.toUpperCase() && this.field.toUpperCase() === 'endSignalCode'.toUpperCase()) {
                     this.addModel.endSignalCode = selected.code;
                 } else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'routeSectionList'.toUpperCase()) {
-                    if (this.addModel.routeSectionList.indexOf(selected.code) === -1) {
+                    if ((selected.type === '01' || selected.type === '03') && this.addModel.routeSectionList.indexOf(selected.code) === -1) {
                         this.addModel.routeSectionList.push(selected.code);
+                    } else if (selected.type === '02' && this.addModel.routeSectionList.indexOf(selected.parentCode) === -1) {
+                        this.addModel.routeSectionList.push(selected.parentCode);
                     }
                 } else if (selected._type.toUpperCase() === 'Switch'.toUpperCase() && this.field.toUpperCase() === 'routeSwitchList'.toUpperCase()) {
                     this.routeCode = selected.code;
diff --git a/src/views/newMap/newMapdraft/mapoperate/section.vue b/src/views/newMap/newMapdraft/mapoperate/section.vue
index ed572ea5c..750899510 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section.vue
@@ -240,6 +240,7 @@ export default {
                 kmRangeLeft: 0,
                 region: '',
                 logicSectionNum: [],
+                logicSectionCodeList: [],
                 logicSectionShow: false, // 是否显示逻辑区段
                 standTrack: false, // 是否站台轨
                 standTrackName: '',
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue b/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
index 5140b5ed6..bb26e36ad 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
@@ -88,6 +88,10 @@ export default {
                 counts += parseInt(ele.num);
             });
             if (count === 0 || allNotZeros) {
+                const logicSectionCodeList = [];
+                models.forEach(item=> {
+                    logicSectionCodeList.push(item.code);
+                });
                 this.sectionList.forEach(section => { // 删除之前的逻辑区段
                     if (section.type === '02' && section.parentCode == this.editModel.code) {
                         models.push(deepAssign(section, {_dispose: true}));
@@ -97,6 +101,7 @@ export default {
                     logicSectionNumList = [];
                 }
                 this.editModel.logicSectionNum = [...logicSectionNumList];
+                this.editModel.logicSectionCodeList = logicSectionCodeList;
                 models.push(this.editModel);
                 this.$emit('updateMapModel', models);
             } else {

From 9cd46588a9d8d42a98848164b506b1d36a2225a9 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 19 Dec 2019 16:43:56 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E5=92=8C=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4--0003?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/map.js                                        | 2 +-
 src/i18n/langs/zh/map.js                                        | 2 +-
 .../newMap/newMapdraft/dataRelation/automaticoperate/route.vue  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js
index 3a8a983be..7b35eb830 100644
--- a/src/i18n/langs/en/map.js
+++ b/src/i18n/langs/en/map.js
@@ -484,7 +484,7 @@ export default {
     accessSideTurnoutData: 'Access side turnout data',
 
     turnBackRailName: 'Name of reentrant rail',
-    routeSegmentData: 'The approach automatically triggers the segment data',
+    routeSegmentData: 'Interlock clearance section',
     routeProtectsData: 'Path continuation protects segment data',
     physicalSection: 'Access physical segment data',
     routeAccessScreenData: 'Access screen door data',
diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index bd754bcf1..9f224526c 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -425,7 +425,7 @@ export default {
     accessSideTurnoutData: '侧防道岔',
 
     turnBackRailName: '折返轨名称',
-    routeSegmentData: '进路自动触发区段',
+    routeSegmentData: '连锁出清区段',
     routeProtectsData: '进路延续保护区段',
     physicalSection: '进路物理区段',
     routeRouteScreenData: '进路屏蔽门',
diff --git a/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
index eee38d7ef..eacf6441d 100644
--- a/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
@@ -103,7 +103,7 @@ export default {
                 code: '',
                 mapId: '',
                 signalCode: '',
-                alwaysRed: true,
+                alwaysRed: false,
                 sectionList: [],
                 stationStandList: []
             },

From 3101af994823ce5d74b700d03be8000bbd88a5fd Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 19 Dec 2019 18:04:28 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BA=BF=E8=B7=AF?=
 =?UTF-8?q?=E7=9A=AE=E8=82=A4=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=81=94=E9=94=81=E7=AB=99=E5=8F=B0=E6=98=BE=E7=A4=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/management/mapline.js                 |   42 +
 src/components/QueryListPage/DataForm.vue     |   69 +-
 src/i18n/langs/en/router.js                   |    3 +-
 src/i18n/langs/zh/router.js                   |    3 +-
 src/jmapNew/config/deviceStyle.js             |    3 +-
 src/jmapNew/config/skinCode/ningbo_01.js      |  587 ++++++++
 src/jmapNew/theme/factory.js                  |    3 +-
 .../ningbo_01/menus/dialog/alxeEffective.vue  |  381 +++++
 .../ningbo_01/menus/dialog/cancelAllLimit.vue |  371 +++++
 .../childDialog/childDialog/noticeInfo.vue    |   86 ++
 .../dialog/childDialog/confirmControl.vue     |  360 +++++
 .../childDialog/confirmControlSpeed.vue       |  153 +++
 .../childDialog/confirmSignalUnlock.vue       |  118 ++
 .../menus/dialog/childDialog/confirmTip.vue   |   68 +
 .../menus/dialog/childDialog/confirmTrain.vue |  178 +++
 .../menus/dialog/childDialog/password.vue     |    0
 .../dialog/childDialog/passwordInputBox.vue   |  206 +++
 .../menus/dialog/childDialog/popupAlarm.vue   |   99 ++
 .../ningbo_01/menus/dialog/routeControl.vue   |  363 +++++
 .../ningbo_01/menus/dialog/routeDetail.vue    |  140 ++
 .../ningbo_01/menus/dialog/routeGuide.vue     |  283 ++++
 .../ningbo_01/menus/dialog/routeSelection.vue |  270 ++++
 .../menus/dialog/sectionCmdControl.vue        |  435 ++++++
 .../ningbo_01/menus/dialog/sectionControl.vue |  215 +++
 .../ningbo_01/menus/dialog/sectionDetail.vue  |  115 ++
 .../menus/dialog/speedCmdControl.vue          |  902 ++++++++++++
 .../ningbo_01/menus/dialog/standControl.vue   |  621 +++++++++
 .../ningbo_01/menus/dialog/standDetail.vue    |  219 +++
 .../menus/dialog/stationCmdControl.vue        |  389 ++++++
 .../menus/dialog/switchCmdControl.vue         |  459 +++++++
 .../ningbo_01/menus/dialog/switchControl.vue  |  416 ++++++
 src/jmapNew/theme/ningbo_01/menus/index.vue   |  360 +++++
 src/jmapNew/theme/ningbo_01/menus/menuBar.vue | 1220 +++++++++++++++++
 .../theme/ningbo_01/menus/menuCancel.vue      |  150 ++
 .../childDialog/twoConfirmation.vue           |  137 ++
 .../menus/menuDialog/childDialog/userAdd.vue  |  162 +++
 .../menuDialog/childDialog/userDelete.vue     |  144 ++
 .../menus/menuDialog/childDialog/userEdit.vue |  178 +++
 .../ningbo_01/menus/menuDialog/helpAbout.vue  |  131 ++
 .../ningbo_01/menus/menuDialog/limitSpeed.vue |  135 ++
 .../ningbo_01/menus/menuDialog/manageUser.vue |  290 ++++
 .../menus/menuDialog/passwordBox.vue          |  221 +++
 .../menus/menuDialog/setLimitSpeed.vue        |  275 ++++
 .../menuDialog/stationControlConvert.vue      |  414 ++++++
 .../ningbo_01/menus/menuDialog/trainAdd.vue   |  162 +++
 .../menus/menuDialog/trainDelete.vue          |  149 ++
 .../menus/menuDialog/trainTranstalet.vue      |  152 ++
 .../ningbo_01/menus/menuDialog/viewDevice.vue |  166 +++
 .../ningbo_01/menus/menuDialog/viewName.vue   |  248 ++++
 .../menus/menuDialog/viewTrainId.vue          |  183 +++
 .../theme/ningbo_01/menus/menuLimit.vue       |  118 ++
 .../theme/ningbo_01/menus/menuSection.vue     |  403 ++++++
 .../theme/ningbo_01/menus/menuSignal.vue      |  583 ++++++++
 .../theme/ningbo_01/menus/menuStation.vue     |  153 +++
 .../ningbo_01/menus/menuStationControl.vue    |   69 +
 .../ningbo_01/menus/menuStationStand.vue      |  372 +++++
 .../theme/ningbo_01/menus/menuSwitch.vue      |  462 +++++++
 .../theme/ningbo_01/menus/menuTool.vue        |  205 +++
 .../theme/ningbo_01/menus/menuTrain.vue       |   42 +
 .../ningbo_01/menus/passiveDialog/alarm.vue   |  210 +++
 .../ningbo_01/menus/passiveDialog/control.vue |  285 ++++
 .../ningbo_01/menus/passiveDialog/timeout.vue |  106 ++
 .../theme/ningbo_01/menus/statusBar.vue       |   31 +
 .../ningbo_01/menus/statusDownTrainDetail.vue |   31 +
 .../ningbo_01/menus/statusUpTrainDetail.vue   |   31 +
 .../ningbo_01/menus/utils/menuItemStatus.js   |  587 ++++++++
 .../theme/ningbo_01/menusPlan/addTask.vue     |  175 +++
 .../menusPlan/chooseTemplatePlan.vue          |  115 ++
 .../menusPlan/components/dataTable.vue        |  206 +++
 .../ningbo_01/menusPlan/createTodayPlan.vue   |  134 ++
 .../ningbo_01/menusPlan/createWeekPlan.vue    |  137 ++
 .../theme/ningbo_01/menusPlan/deleteTask.vue  |   73 +
 .../ningbo_01/menusPlan/deleteTodayPlan.vue   |   62 +
 .../ningbo_01/menusPlan/managePlanList.vue    |  143 ++
 .../ningbo_01/menusPlan/modifyingPlan.vue     |  177 +++
 .../ningbo_01/menusPlan/modifyingTask.vue     |  326 +++++
 src/jmapNew/theme/ningbo_01/model.js          |   63 +
 src/jmapNew/theme/ningbo_01/planConvert.js    |  310 +++++
 .../theme/ningbo_01/planSchedule/index.vue    |  403 ++++++
 .../theme/ningbo_01/planSchedule/menuBar.vue  |  514 +++++++
 .../theme/ningbo_01/planSchedule/menuTool.vue |  172 +++
 .../theme/ningbo_01/planSchedule/schedule.vue |  482 +++++++
 .../ningbo_01/planSchedule/statusBar.vue      |  100 ++
 .../theme/ningbo_01/planSchedule/titleBar.vue |   75 +
 src/router/index.js                           |    8 +
 src/scripts/GlobalPlugin.js                   |    2 +-
 src/views/jlmap/index.vue                     |    2 +-
 .../newMap/newMapdraft/dataRelation/index.vue |    7 +
 .../dataRelation/routeoperate/index.vue       |    4 +
 .../dataRelation/routeoperate/route.vue       |   12 +-
 src/views/newMap/newMapdraft/index.vue        |    6 +-
 src/views/system/configLine/config.vue        |  127 ++
 src/views/system/configLine/edit.vue          |  147 ++
 src/views/system/configLine/editConfig.vue    |  146 ++
 src/views/system/configLine/index.vue         |  134 ++
 95 files changed, 20368 insertions(+), 16 deletions(-)
 create mode 100644 src/jmapNew/config/skinCode/ningbo_01.js
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/cancelAllLimit.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTrain.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/password.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/passwordInputBox.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/routeGuide.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/sectionCmdControl.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/sectionControl.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/sectionDetail.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/speedCmdControl.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/switchCmdControl.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/switchControl.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/index.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuBar.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuCancel.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/twoConfirmation.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/limitSpeed.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/passwordBox.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/setLimitSpeed.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControlConvert.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/viewDevice.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/viewName.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuDialog/viewTrainId.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuLimit.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuSection.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuStation.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuTool.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/statusBar.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/statusDownTrainDetail.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/statusUpTrainDetail.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menus/utils/menuItemStatus.js
 create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/addTask.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/chooseTemplatePlan.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/components/dataTable.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/createTodayPlan.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/createWeekPlan.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/deleteTask.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/deleteTodayPlan.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/managePlanList.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/modifyingPlan.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/menusPlan/modifyingTask.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/model.js
 create mode 100644 src/jmapNew/theme/ningbo_01/planConvert.js
 create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/index.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/menuBar.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/menuTool.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/statusBar.vue
 create mode 100644 src/jmapNew/theme/ningbo_01/planSchedule/titleBar.vue
 create mode 100644 src/views/system/configLine/config.vue
 create mode 100644 src/views/system/configLine/edit.vue
 create mode 100644 src/views/system/configLine/editConfig.vue
 create mode 100644 src/views/system/configLine/index.vue

diff --git a/src/api/management/mapline.js b/src/api/management/mapline.js
index 345914d09..a157095e6 100644
--- a/src/api/management/mapline.js
+++ b/src/api/management/mapline.js
@@ -43,6 +43,48 @@ export function updateSkinCode(data) {
     });
 }
 
+// 根据code获取线路配置
+export function getRealLineConfigList(lineCode) {
+    return request({
+        url: `/api/realLine/config?lineCode=${lineCode}`,
+        method: 'get'
+    });
+}
+
+// 根据id获取线路配置
+export function getRealLineConfig(id) {
+    return request({
+        url: `/api/realLine/config/${id}`,
+        method: 'get'
+    });
+}
+
+// 根据id修改线路配置
+export function putRealLineConfig(data) {
+    return request({
+        url: `/api/realLine/config/${data.id}`,
+        method: 'put',
+        data: data
+    });
+}
+
+// 创建线路配置
+export function postRealLineConfig(data) {
+    return request({
+        url: `/api/realLine/config`,
+        method: 'post',
+        data: data
+    });
+}
+
+// 删除线路配置
+export function delRealLineConfig(id) {
+    return request({
+        url: `/api/realLine/config/${id}`,
+        method: 'delete'
+    });
+}
+
 /** 通过皮肤Code更新地图皮肤*/
 export function updateSkinCodeByCode(data) {
     return request({
diff --git a/src/components/QueryListPage/DataForm.vue b/src/components/QueryListPage/DataForm.vue
index c23734a1b..9d1ef4c04 100644
--- a/src/components/QueryListPage/DataForm.vue
+++ b/src/components/QueryListPage/DataForm.vue
@@ -58,6 +58,7 @@
             :disabled="item.disabled"
             :min="isNaN(item.min) ? -Infinity : item.min"
             :max="isNaN(item.max)? Infinity : item.max"
+            :step="isNaN(item.step) ? -Infinity : item.step"
           />
           <span
             v-if="item.message"
@@ -188,9 +189,7 @@
           </template>
         </el-form-item>
       </template>
-      <template
-        v-else-if="checkFieldType(item, 'datetime') || checkFieldType(item, 'date') || checkFieldType(item, 'daterange') || checkFieldType(item, 'datetimerange')"
-      >
+      <template v-else-if="checkFieldType(item, 'datetime') || checkFieldType(item, 'date') || checkFieldType(item, 'daterange') || checkFieldType(item, 'datetimerange')">
         <el-form-item :key="item.prop" :prop="item.prop" :label="item.label" :required="item.required" style="width: 100%;">
           <el-date-picker
             v-model="formModel[item.prop]"
@@ -231,6 +230,21 @@
           />
         </el-form-item>
       </template>
+      <template v-else-if="checkFieldType(item, 'coordinate')">
+        <div :key="item.prop" class="coordinate">
+          <span class="title" :style="{width: form.labelWidth}">{{ item.label }}</span>
+          <div v-for="opt in item.children" :key="opt.code" class="listWidth">
+            <el-form-item :label="opt.label" :prop="opt.prop" :label-width="opt.labelWidth">
+              <template v-if="opt.change">
+                <el-input-number v-model="formModel[opt.firstLevel][opt.secondLevel]" :label="opt.label" :disabled="opt.disabled" style="width: 160px;" @change="opt.deviceChange" />
+              </template>
+              <template v-else>
+                <el-input-number v-model="formModel[opt.firstLevel][opt.secondLevel]" :label="opt.label" :disabled="opt.disabled" style="width: 160px;" />
+              </template>
+            </el-form-item>
+          </div>
+        </div>
+      </template>
 
       <template v-else-if="checkFieldType(item, 'table')">
         <div :key="item.prop" style="margin-left:150px;margin-bottom:20px">
@@ -327,4 +341,53 @@ export default {
         }
       }
     }
+    .title {
+      text-align: right;
+      font-size: 14px;
+      color: #606266;
+      line-height: 40px;
+      -webkit-box-sizing: border-box;
+      box-sizing: border-box;
+      line-height: 40px;
+      width: 120px;
+      font-weight: bold;
+      display: block;
+      float: left;
+      padding-right: 12px;
+    }
+    .listWidth{
+      display: table;
+      float: left;
+      margin-right: 20px;
+      &:last-child{
+        margin: 0;
+      }
+    }
+    .coordinate {
+        overflow: hidden;
+
+        .title {
+            text-align: right;
+            font-size: 14px;
+            color: #606266;
+            line-height: 40px;
+            // padding: 0 12px 0 0;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            line-height: 28px;
+            width: 120px;
+            font-weight: bold;
+            display: block;
+            float: left;
+            margin-right: 7px;
+        }
+        .listWidth{
+            display: table;
+            float: left;
+            margin-right: 20px;
+            &:last-child{
+                margin: 0;
+            }
+        }
+    }
 </style>
diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js
index bcc0fa0e9..0ca93382f 100644
--- a/src/i18n/langs/en/router.js
+++ b/src/i18n/langs/en/router.js
@@ -70,5 +70,6 @@ export default {
     runGraphReleaseApplication: 'Run graph release application',
     subsystemGeneration: 'Subsystem generation',
     newsBulletin: 'New bulletin',
-    commandDictionary: 'Command dictionary'
+    commandDictionary: 'Command dictionary',
+    configLine: 'Line management'
 };
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index e3458fee5..a1e74a379 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -71,5 +71,6 @@ export default {
     runGraphReleaseApplication: '运行图发布申请',
     subsystemGeneration: '子系统生成',
     newsBulletin: '消息公告',
-    commandDictionary: '指令字典'
+    commandDictionary: '指令字典',
+    configLine: '线路管理'
 };
diff --git a/src/jmapNew/config/deviceStyle.js b/src/jmapNew/config/deviceStyle.js
index 3b7f47be2..b90f1e158 100644
--- a/src/jmapNew/config/deviceStyle.js
+++ b/src/jmapNew/config/deviceStyle.js
@@ -2,7 +2,8 @@ const mapDeviceStyle = {
     '01': 'chengdu_04',
     '02': 'fuzhou_01',
     '03': 'bejing_01',
-    '04': 'chengdu_03'
+    '04': 'chengdu_03',
+    '06': 'ningbo_01'
 };
 
 export function selectLineCode(code) {
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
new file mode 100644
index 000000000..39bf29e52
--- /dev/null
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -0,0 +1,587 @@
+import defaultStyle from '../defaultStyle';
+import deviceType from '../../constant/deviceType';
+
+class SkinCode extends defaultStyle {
+    constructor() {
+        super();
+        this[deviceType.Section] = {
+            active: {
+                routeColor: false							// 进路触发颜色
+            },
+            text: {
+                show: true,									// 物理区段名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 10,								// 文字离区段距离
+                fontSize: 12, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: 'lightgreen', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            logicText: {									// 逻辑区段名称
+                show: false,								// 逻辑区段名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 12,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            switchText: {
+                show: false,									// 道岔区段名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 18,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            standText: {									// 站台
+                show: true,									// 站台轨名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 24,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            reentryText: { 									// 折返
+                show: true,									// 折返轨名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 36,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            transferText: { 								// 转换轨
+                show: true,									// 转换轨名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 36,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                fontColor: '#FFFFFF', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            destinationText: { // 目的地
+                show: true,									// 目的码名称显示
+                opposite: true,								// 对称相反
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                distance: 12,								// 文字离区段距离
+                fontSize: 11, 								// 字体大小
+                fontWeight: 'bold',							// 字体粗细
+                fontColor: 'yellow', 						// 字体颜色
+                textAlign: 'center', 						// 水平对齐方式
+                textPosition: 'inside', 					// 文字位置
+                textVerticalAlign: 'middle' 				// 文字垂直对齐方式
+            },
+            line: {
+                width: 5, 									// 区段宽度
+                beyondWidth: 0, 							// 区段宽超出宽度
+                invadeColor: '#FFFFFF', 					// 区段侵入颜色
+                spareColor: '#5578B6', 						// 区段空闲颜色
+                communicationOccupiedColor: 'lightpink', 	// 区段通信车占用颜色
+                unCommunicationOccupiedColor: 'red', 		// 区段非通讯车占用颜色
+                routeLockColor: 'rgba(0, 255, 0, 1)', 		// 区段路由锁定颜色
+                faultLockColor: 'white', 					// 区段故障锁定颜色
+                undefinedColor: '#0071C1', 					// 区段未定义颜色
+                protectionLockedColor: '#FFFFFF', 			// 保护区段锁闭
+                blockColor: 'pink', 						// 区段封锁颜色
+                atcExcisionColor: '#A0522D', 				// 区段atc切除颜色
+                atsExcisionColor: '#A0522D', 				// 区段ats切除颜色
+                timeReleaseColor: '#3F3F3F', 				// 区段延时释放颜色
+                protectiveLockColor: '#92D14F', 			// 区段保护锁闭
+                protectiveTimeReleaseColor: '#0071C1', 		// 区段保护延时解锁
+                logicalColor: '#FFFF00', 					// 逻辑区段颜色 (未用)
+                logicalTextColor: 'white' 					// 逻辑区段名称颜色 (未用)
+            },
+            axle: {
+                radius: 3, 									// 计轴 半径
+                distance: 5, 								// 计轴和区段之间的距离 （未用）
+                color: 'white',	 							// 区段计轴颜色
+                resetColor: '#00FFFF', 						// 区段计轴预复位颜色
+                Failure: '#E6A23C' 							// #FFFF00 计轴失效
+            },
+            speedLimit: { 									// 限速元素
+                width: 1, 									// 限速线的宽度
+                distance: 5, 								// 限速线距离区段距离
+                lineColor: '#C0C000', 						// 限速线颜色 （黄色透明光）
+                nameBackground: '#C0C000',					// 限速名称背景颜色
+                nameShow: true, 							// 名称显示
+                nameNumberColor: '#C00808',					// 限速值颜色
+                nameNumberFontSize: 11,						// 限速值大小
+                kilometerColor: '#fff', 					// 公里标颜色
+                kilometerFontSize: 8,						// 公里标大小
+                drogueWidth: 19,							// 浮标宽度
+                drogueHeight: 12							// 浮标高度
+            },
+            separator: {
+                z: 6,										// 分割符层级
+                width: 1.5, 								// 分隔符宽度
+                endWidth: 1.5, 								// 尽头分隔符宽度
+                endColor: '#FFFFFF', 						// 尽头分隔符颜色
+                color: 'white' 								// 区段边界符颜色
+            }
+        };
+
+        this[deviceType.Signal] = {
+            distance: 3,									// 设备距离区段的距离
+            post: {
+                standardColor: '#C0C0C0',					// 灯柱颜色
+                standardWidth: 2							// 灯柱宽度
+            },
+            text: {
+                show: true,											// 信号机名称显示
+                distance: 3,								// 文字和灯杆的距离
+                isAlignCenter: false,						// 信号字体对其方式
+                fontSize: 11,								// 信号机名称字体大小
+                fontWeight: 'bold',							// 信号机名称字体粗细
+                defaultColor: 'white',						// 信号灯字体默认色
+                blockColor: '#EF0C08',						// 信号灯字体锁定颜色
+                checkColor: '#00FF00'						// 信号保护区段检查颜色
+            },
+            lamp: {
+                guidName: 'defult',							// 默认引导类型
+                borderVariable: true,						// 信号灯边框可变
+                stopWidth: 2,								// 禁止线宽度
+                borderWidth: 2,								// 信号灯边框线宽度
+                borderColor: '#3149C3',						// 信号灯边框线颜色
+                radiusR: 3,									// 信号灯半径
+                blockColor: '#EF0C08',						// 信号灯锁闭
+                grayColor: '#C0C0C0',						// 信号灯灰色
+                redColor: 'red',							// 信号灯红色
+                greenColor: 'green',						// 信号灯绿色
+                yellowColor: 'yellow',						// 信号灯黄色
+                whiteColor: '#FFFFFF',						// 信号灯白色
+                blueColor: '#0070C0'						// 信号灯蓝色
+            },
+            route: {
+                direction: true,							// 自动通过方向
+                offset: { x: 4, y: 0},						// 自动通过偏移量
+                routeColor: '#00FF00'						// 自动进路
+            },
+            auto: {
+                direction: false,							// 自动通过方向
+                offset: { x: -4, y: 0},						// 自动通过偏移量
+                width: 5,									// 自动宽度
+                manualControl: '#FFFF00',					// 人工控制
+                autoRoute: '#00FF00',						// 自动进路
+                autoTrigger: '#FFFF00',						// 自动触发
+                outConflict: '#C00808'						// 出车冲突
+            },
+            delay: {
+                direction: false,							// 延时解锁方向
+                offset: { x: -5, y: 0},						// 延时解锁偏移量
+                fontSize: 11,								// 延迟解锁字体大小
+                fontColor: '#C00808',						// 延迟解锁颜色
+                fontWeight: 'bold'							// 字体粗细
+
+            },
+            button: {
+                distance: 5,								// 信号灯按钮距离区段的距离
+                borderDashColor: '#FFFFFF',					// 信号灯按钮边线
+                buttonColor: 'darkgreen',					// 信号灯按钮颜色
+                buttonLightenColor: 'yellow'				// 信号灯按钮闪烁颜色
+            }
+        };
+
+        this[deviceType.StationStand] = {
+            common: { 										// 通用属性
+                textFontSize: 10, 							// 站台默认字体大小
+                haveJumpShow: true							// 站台是否有列车停跳显示
+            },
+            safetyDoor: { 									// 屏蔽门
+                height: 3, 									// 站台屏蔽门高度
+                distance: 4, 								// 站台和屏蔽门之间的距离
+                defaultColor: 'green', 						// 屏蔽门默认颜色
+                splitDoorColor: 'green' 					// 屏蔽门切除颜色
+            },
+            stand: { 										// 站台
+                headFontSize: 10, 							// 站台首端字体大小
+                spareColor: 'white', 						// 站台空闲颜色
+                stopColor: 'yellow', 						// 站台列车停站颜色
+                jumpStopColor: 'blue', 						// 站台跳停颜色
+                designatedJumpStopColor: 'lightSkyBlue'		// 站台指定列车跳停颜色
+            },
+            standEmergent: { 								// 紧急关闭
+                mergentR: 4, 								// 站台紧急关闭半径
+                offset: {x: 0, y: 40}, 						// 站台紧急关闭偏移量
+                closeColor: 'red' 							// 站台紧急关闭颜色
+            },
+            reentry: { 										// 站台折返策略
+                position: 0, 								// 折返方向
+                offset: {x: -16, y: 20}, 					// 折返偏移量
+                noHumanColor: '#0F16DA', 					// 站台无人折返
+                autoChangeEndsColor: '#0BF400' 				// 站台自动换端
+            },
+            detainCar: { 									// 扣车
+                text: '扣', 								// 扣车显示内容
+                position: -1, 								// 扣车方向
+                offset: {x: -8, y: -20}, 					// 扣车偏移量
+                trainColor: 'yellow', 						// 车站扣车颜色
+                centerTrainColor: 'white', 					// 中心扣车颜色
+                andCenterTrainColor: 'red', 				// 车站+中心扣车颜色
+                detainTrainTextColor: '#E4EF50' 			// 车站扣除文字颜色
+            },
+            stopTime: { 									// 停站时间
+                position: 1, 								// 运行时间方向
+                offset: {x: -8, y: -4}, 					// 运行时间偏移量
+                textColor: 'white' 							// 停站时间字体颜色
+            },
+            jump: {
+                text: '跳',									// 停跳显示内容
+                position: -1,								// 停跳方向
+                offset: {x: -8, y: 0},
+                textColor: '#0000FF',						// 停跳文字颜色
+                arcColor: '#0000FF',						// 停跳圆圈颜色
+                fillColor: 'rgba(0,0,0,0)',					// 透明填充颜色
+                r: 8										// 圆半径大小
+            },
+            level: { 										// 运行等级
+                position: 1, 								// 运行等级方向
+                offset: {x: -8, y: 30}, 					// 运行等级偏移量
+                textColor: '#FFF000' 						// 停站等级字体颜色
+            }
+        };
+
+        this[deviceType.StationCounter] = {
+            text: {
+                distance: 2,							 	// 计数器名称和文字的距离
+                fontColor: '#FFFFFF',		 			 	// 计数器字体颜色
+                borderColor: '#E4EF50'	 				 	// 计数器边框颜色
+            }
+        };
+
+        this[deviceType.StationDelayUnlock] = {
+            text: {
+                distance: 3,								// 延迟解锁和设备之间的距离
+                fontColor: '#FFFFFF',						// 延时解锁字体颜色
+                borderColor: '#FFFFFF'						// 延迟解锁边框颜色
+            }
+        };
+
+        this[deviceType.Station] = {
+            // text: {
+            // 	show: true											// 公里标名称显示
+            // },
+            kmPostShow: false,										// 公里标显示
+            kilometerPosition: 'up',							// 公里标朝向
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#FFFF00'						// 控制灯颜色
+            },
+            turnBack: { // 按图折返
+                lamp: 1, // 灯数量
+                lampSpace: 60 // 灯间距
+            },
+            StationControl:{
+                text: {
+                    distance: 2,								// 灯和文字之间的距离
+                    fontSize: 12,								// 字体大小
+                    fontFormat: 'consolas',						// 字体格式
+                    fontColor: '#ffffff',						// 字体颜色
+                    fontWeight: 'normal',						// 字体粗细
+                    textAlign: 'middle',						// 字体水平对齐
+                    textVerticalAlign: 'top',					// 字体垂直对齐
+                    centerControlText: '中控', // 中控文字内容
+                    substationControlText: '站控', // 站控文字内容
+                    emergencyControlText:'紧急站控', // 紧急站控文字内容
+                    interconnectedControlText:'连锁控' // 连锁控文字内容
+                    // stationCenterControlText: '站中控',      // 站中控文字内容
+                    // generalAlarmControlText: '总报警'        // 总报警文字内容
+                },
+                lamp: {
+                    count: 4,									// 控制模式的个数
+                    offset: {x: 20, y: 0},						// 偏移量
+                    radiusR: 4,									// 控制模式灯的半径
+                    distance: 46,								// 控制模式之间灯之间的距离
+                    grayColor: '#C0C0C0',						// 控制模式灰色
+                    greenColor: 'green',						// 控制模式绿色
+                    redColor: 'red',						// 控制模式红色
+                    yellowColor: 'yellow',						// 控制模式黄色
+                    emergencyControlShow: true,					// 紧急站控显示
+                    centerControlShow: true,						// 中控显示
+                    substationControlShow: true,					// 站控按钮显示
+                    interconnectedControlShow: false				// 联锁控显示
+                },
+                arrow: {
+                    show: false									// 控制模式箭头显隐
+                }
+            }
+        };
+
+        this[deviceType.Switch] = {
+            text: {
+                show: true,									// 道岔名称显示
+                position: 0, 								// 区段名称位置 1 上面 -1 下面 0 对称
+                offset: {x: 5, y: -10},						// 道岔名称与区段距离
+                fontSize: 11,								// 字体大小
+                fontColor: '#C0C0C0',						// 道岔名称颜色
+                fontWeight: 'normal',						// 字体粗细
+                borderColor: '#FE0000',						// 道岔边框颜色
+                lossColor: 'lightgreen',					// 道岔失去颜色
+                locateColor: 'lightgreen',					// 道岔定位颜色
+                inversionColor: 'lightgreen',				// 道岔反位颜色
+                monolockColor: '#FFFFFF'					// 道岔单锁颜色
+            },
+            core: {
+                length: 10									// 道岔单边长度
+            },
+            monolock: {										// 道岔单锁配置
+                locationColor: '#00FF00', 					// 道岔单锁'定位'颜色 (绿色)
+                inversionColor: '#FFFF00', 					// 道岔单锁'反位'颜色 (黄色)
+                rectShow: true, 							// 道岔单锁 矩形框是否显示
+                rectWidth: 18, 								// 矩形框 宽高
+                rectBorderColor: '#fff'						// 矩形边框颜色
+            },
+            block: {										// 道岔封锁配置
+                nameBorderShow: false, 						// 道岔名称是否有包围框 显示
+                contentRectShow: true,						// 道岔封锁显示
+                contentRectColor: 'red'						// 道岔封锁边框颜色
+            }
+        };
+
+        this[deviceType.LcControl] = {
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#FFFF00'						// 控制灯颜色
+            }
+        };
+
+        this[deviceType.ZcControl] = {
+            // 是否显示
+            visible:true,
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',								// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#00FF00'						// 控制灯颜色
+            }
+        };
+
+        this[deviceType.LimitControl] = {
+            text: {
+                fontSize: 11,								// 字体大小
+                fontWeight: 'normal',						// 字体粗细
+                distance: 5 								// 灯跟文字距离
+            },
+            lamp: {
+                radiusR: 6,									// 控制灯大小
+                controlColor: '#ECE9D8'						// 控制灯颜色
+            }
+        };
+
+        this[deviceType.Line] = {
+            lineColor: '#FFFFFF'							// 线条颜色
+        };
+
+        this[deviceType.TrainWindow] = {
+            lineColor: '#4DD43F',							// 车次窗颜色
+            lineDash: null,									// 车次窗虚线间隔
+            lineWidth: 1,									// 车次窗线宽
+            trainWindowSmooth: 0							// 车次窗矩形圆滑程度
+        };
+
+        this[deviceType.Train] = {
+            trainBody: {
+                trainBodyLineWidth: 1, // 车身line宽
+                changeTrainWidth: false, // 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
+                specialTrainType: [], // 特殊列车类型需设置显示格式
+                lrPadding: 4, // 两边间隔
+                upPadding: 4, // 上边距离
+                trainBodyFillColor: '#000099', // 列车车身填充颜色
+                trainNameFormat: 'serviceNumber:targetCode'// 列车显示格式
+            },
+            hsda: {
+                lrPaddingHSDA: 3, // HSDA两边间隔
+                upPaddingHSDA: 4, // HSDA上边距离
+                trainHSDATextFontSize: 8, // 列车HDSA字号
+                textHContent: '扣', // textH文本
+                textSContent: '跳', // textS文本
+                textDContent: '门', // textD文本
+                textAContent: '警' // textA文本
+            },
+            trainNumber: {
+                targetCodePrefix: '000', // 目的地码前缀
+                defaultTargetCode: 'DDD', // 默认目的地码
+                trainTargetTextAlign: 'left', // 目的地码文字显示位置
+                trainNumberOffset: { x: 24, y: 4}// 目的地码偏移量
+            },
+            trainServer: {
+                serviceNumberPrefix: '000', // 服务号(表号)前缀
+                defaultServiceNumber: 'TTT', // 默认服务号（表号）
+                defaultServerNoColor: '#FFFFFF', //  默认服务号状态显示颜色
+                trainServerOffset: { x: 4, y: 4} // 列车服务号偏移
+            },
+            trainTarget: {
+                tripNumberPrefix: '000', // 车次号前缀
+                defaultTripNumber: 'DDD', // 默认车次号2
+                trainTargetOffset: { x: 36, y: 4}, // 列车车次号偏移
+                trainTargetTextAlign: 'right' // 车次号文字显示位置
+            },
+            trainTargetNumber: {
+                trainTargetNumberOffset: {x: 0, y: 0}// 车组号偏移量
+            },
+            trainHead: {
+                trainMoreLength: 1, // 列车车头比车身高出的长度,上下相比车体伸出去的边框
+                trainHeadTriangleFirst: { x: 7, y: 1}, // 列车车头三角坐标1偏移量
+                trainHeadTriangleSecond: { x: 13, y: 10}, // 列车车头三角坐标2偏移量
+                trainHeadTriangleThird: { x: 7, y: 19}, // 列车车头三角坐标3偏移量
+                trainConntWidth: 4, // 列车竖杠的宽度
+                trainHeadFillColor: '#000000', // 列车车头矩形填充颜色
+                trainHeadRectHeight: 20 // 列车车头矩形高度
+            },
+            common: {
+                trainHeight: 20, // 列车高度
+                trainHeadDistance: 2, // 列车和车头之间的间距
+                trainWidth: 55, // 列车长度
+                trainTextFontSize: 16, // 列车字号
+                fontFamily: 'consolas', // 默认字体 族类
+                haveTextHSDA: true, // 是否需创建textHSDA对象
+                haveArrowText: true, // 是否需创建arrowText对象
+                haveTrainBorder: false, // 是否需创建trainBorder对象
+                aspectRatio: 7 / 5, // 字体宽高比例（用以拼接text是计算位置）
+                textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
+                trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
+                useSelfFormat: true, // 使用配置项的nameFormat
+                useSelfText: true // 使用配置项的字体大小
+            },
+            trainStatusStyle: {
+                defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
+                destinationStatusSetText: 'trainTarget', // 目的地状态设置的对应哪个text的颜色
+                destinationStatus: [
+                    {status: '01', showColor: '#FFFFFF'},
+                    {status: '02', showColor: '#00FF00'},
+                    {status: '03', showColor: '#A0522D'},
+                    {status: '04', showColor: '#FFFF00'}
+                ], // 目的地状态 01准点 02早点 03晚点 04头码车
+                serverNoType: [
+                    {type: '01', showColor: '#FFFFFF'},
+                    {type: '02', showColor: '#FFF000'}
+                ], // 服务号状态类型 01显示服务号 计划车 02显示车组号: 头码车与人工车
+                directionType: [
+                    {
+                        type: '01',
+                        lineLShow: true,
+                        lineRShow: true,
+                        arrowLShow: false,
+                        arrowRShow: false
+                    },
+                    {
+                        type: '02',
+                        lineLShow: false,
+                        lineRShow: true,
+                        arrowLShow: false,
+                        arrowRShow: true
+                    },
+                    {
+                        type: '03',
+                        lineLShow: true,
+                        lineRShow: false,
+                        arrowLShow: true,
+                        arrowRShow: false
+                    }
+                ], // 列车运行方向状态类型对应车头显示状态  01未知方向 02从左往右 上行 03从右往左 下行
+                directionStopType: [
+                    {
+                        type: '01',
+                        lineLShow: false,
+                        lineRShow: false
+                    },
+                    {
+                        type: '02',
+                        lineLShow: false,
+                        lineRShow: true
+                    },
+                    {
+                        type: '03',
+                        lineLShow: true,
+                        lineRShow: false
+                    }
+                ], // 列车停止方向类型对应车头显示状态   01未知方向 02从左往右 上行 03从右往左 下行
+                runModeStatus: [
+                    {
+                        status: '01',
+                        trainLColor: '#FFFFFF',
+                        trainRColor: '#FFFFFF'
+                    },
+                    {
+                        status: '02',
+                        trainLColor: '#00FF00',
+                        trainRColor: '#00FF00'
+                    },
+                    {
+                        status: '03',
+                        trainLColor: '#FFFF00',
+                        trainRColor: '#FFFF00'
+                    },
+                    {
+                        status: '04',
+                        trainLColor: '#A0522D',
+                        trainRColor: '#A0522D'
+                    },
+                    {
+                        status: '05',
+                        trainLColor: '#A0522D',
+                        trainRColor: '#A0522D'
+                    }
+                ], // 列车运行模式对应车头颜色 01未知 02 ATO自动驾驶模式AM  03 ATP监控下的人工驾驶模式CM 04 限制人工驾驶模式RM 05 非限制人工驾驶模式RM
+                runControlStatus: [
+                    {
+                        status: '01',
+                        hShow: false,
+                        sShow: false
+                    },
+                    {
+                        status: '02',
+                        hShow: true,
+                        sShow: false
+                    },
+                    {
+                        status: '03',
+                        hShow: false,
+                        sShow: true
+                    }
+                ], // 设置运行控制状态类型 01正常 02扣车 03停跳
+                doorStatus: [
+                    {status: '01', dShow: false},
+                    {status: '02', dShow: true}
+                ], // 设置车门状态类型 01关门 02开门
+                communicationStatus: [
+                    {status: '01', trainColor: '#725A64'},
+                    {status: '02', trainColor: '#C0C0C0'}
+                ], // 设置通信状态  01正常 02故障
+                alarmStatus: [
+                    {status: '01', aShow: false},
+                    {status: '02', aShow: true}
+                ] // 设置报警状态 01不报警 02报警
+            }
+        };
+    }
+}
+
+export default new SkinCode();
diff --git a/src/jmapNew/theme/factory.js b/src/jmapNew/theme/factory.js
index d1d180c21..84517bb0f 100644
--- a/src/jmapNew/theme/factory.js
+++ b/src/jmapNew/theme/factory.js
@@ -6,7 +6,8 @@ class Theme {
             '02': 'fuzhou_01',
             '03': 'beijing_01',
             '04': 'chengdu_03',
-            '05': 'fuzhou_01' // 国际版运行图皮肤 指向05 福州线路
+            '05': 'fuzhou_01', // 国际版运行图皮肤 指向05 福州线路
+            '06': 'ningbo_01'
         };
     }
 
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
new file mode 100644
index 000000000..37b8fda24
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
@@ -0,0 +1,381 @@
+<template>
+    <el-dialog class="chengdou-03__systerm alxe-effective" :title="title" :visible.sync="show" width="420px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <div style="padding: 10px 20px;border: 1px solid lightgray;">
+            <span class="base-label">准备</span>
+            <div style="margin-top: 10px">
+                <el-row type="flex" justify="left">
+                    <el-col :span="9">车站</el-col>
+                    <el-col :span="9">轨道/计轴</el-col>
+                </el-row>
+                <el-row type="flex" justify="left">
+                    <el-col :span="9">
+                        <el-input :type="type" v-model="model.stationName" size="mini" :disabled="true"></el-input>
+                    </el-col>
+                    <el-col :span="9">
+                        <el-input :type="type" v-model="model.sectionName" size="mini" :disabled="true"></el-input>
+                    </el-col>
+                    <el-col :span="4" :offset="1">
+                        <el-button :id="domIdConfirm1" size="mini" @click="commitOnce" :disabled="type==='password'">确认
+                        </el-button>
+                    </el-col>
+                </el-row>
+            </div>
+        </div>
+        <div style="padding: 10px 20px;border: 1px solid lightgray;margin-top: 10px">
+            <span class="base-label">确认</span>
+            <div>
+                <el-row type="flex" justify="left">
+                    <el-col :span="9">车站</el-col>
+                    <el-col :span="9">轨道/计轴</el-col>
+                </el-row>
+                <el-row type="flex" justify="left">
+                    <el-col :span="9">
+                        <el-select :id="domIdChoose1" v-model="model.confirmStationName" filterable size="mini"
+                            @change="stationSelectChange" :disabled="type==='text'">
+                            <el-option v-for="(option,index) in filterStationList" :key="index" :label="option.name"
+                                :value="option.name">
+                            </el-option>
+                        </el-select>
+                    </el-col>
+                    <el-col :span="9">
+                        <el-select :id="domIdChoose2" v-model="model.confirmSectionName" filterable size="mini"
+                            @change="sectionSelectChange" :disabled="type==='text'">
+                            <el-option v-for="(option,index) in randomSectionList" :key="index" :label="option.name"
+                                :value="option.name">
+                            </el-option>
+                        </el-select>
+                    </el-col>
+                    <el-col :span="4" :offset="1">
+                        <el-button :id="domIdConfirm2" size="mini" :loading="loading" @click="commit"
+                            :disabled="type==='text'">确认</el-button>
+                    </el-col>
+                </el-row>
+            </div>
+        </div>
+        <el-row type="flex" justify="left" style="margin-top:20px">
+            <el-col :span="6" :offset="1"> 操作倒计时</el-col>
+            <el-col :span="16">
+                <el-input v-model="model.time" size="mini" :readonly="true"></el-input>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :offset="1"> 状态</el-col>
+        </el-row>
+        <el-row>
+            <el-col :offset="1" :span="23">
+                <el-input type="textarea" :rows="2" placeholder="" v-model="model.status">
+                </el-input>
+            </el-col>
+        </el-row>
+        <el-row class="botton-group" style="margin-top:20px">
+            <el-col :span="4" :offset="10">
+                <el-button :id="domIdCancel" @click="cancel">关闭</el-button>
+            </el-col>
+        </el-row>
+        <notice-info ref="noticeInfo"></notice-info>
+        <popup-alarm ref="popupAlarm"></popup-alarm>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+    import { mouseCancelState } from '../utils/menuItemStatus';
+    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+    import PopupAlarm from './childDialog/popupAlarm';
+
+    export default {
+        name: 'AlxeEffective',
+        components: {
+            NoticeInfo,
+            PopupAlarm
+        },
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                type: 'text',
+                timeout: 1000,
+                timenum: 30,
+                stepNum: 0,
+                task: null,
+                model: {
+                    stationName: '',
+                    sectionName: '',
+                    confirmStationName: '',
+                    confirmSectionName: '',
+                    status: '',
+                    time: 0,
+                },
+                selected: null,
+                operate: null,
+                operation: '',
+                randomSectionList: []
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'stationList',
+                'sectionList'
+            ]),
+            filterStationList() {
+                let i = 0, list = [];
+                if (this.stationList) {
+                    this.stationList.forEach(elem => {
+                        if (list.findIndex(it => { return it.name == elem.name }) < 0) {
+                            list.push({ name: elem.name });
+                        }
+                    });
+                }
+                return list;
+            },
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdConfirm1() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                        return OperationEvent.Section.alxeEffective.confirm1.domId;
+                    }
+                }
+            },
+            domIdConfirm2() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                        return OperationEvent.Section.alxeEffective.confirm2.domId;
+                    }
+                }
+            },
+            domIdChoose1() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                        return OperationEvent.Section.alxeEffective.choose1.domId;
+                    }
+                }
+            },
+            domIdChoose2() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                        return OperationEvent.Section.alxeEffective.choose2.domId;
+                    }
+                }
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            title() {
+                this.earlyDepar = false;
+                if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                    return '确认计轴恢复工作';
+                }
+            },
+        },
+        watch: {
+            'model.sectionName': function (name) {
+                let index = Math.floor(Math.random(1) * 5);
+                for (var i = 0; i < 5; i++) {
+                    if (i == index) {
+                        this.randomSectionList.push({ name });
+                    } else {
+                        let section = this.sectionList[Math.floor(Math.random(1) * this.sectionList.length)];
+                        if (section.type != '02') {
+                            if (this.randomSectionList.findIndex(it => { return it.name == section.name }) < 0) {
+                                this.randomSectionList.push({ name: section.name });
+                            } else {
+                                i--;
+                            }
+                        } else {
+                            i--;
+                        }
+                    }
+                }
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            stopTask() {
+                if (this.task) {
+                    clearInterval(this.task);
+                    this.task = null;
+                }
+
+                if (this.stepNum < 3) {
+                    this.$store.dispatch('training/backSteps', this.stepNum);
+                    this.$store.dispatch('training/emitTipFresh');
+                    this.model.name = '';
+                    this.model.time = '';
+                    this.type = 'text';
+                }
+            },
+            doShow(operate, selected) {
+                this.selected = selected;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.status = '';
+                this.model.stationName = '';
+                this.model.sectionName = '';
+                this.model.confirmStationName = '';
+                this.model.confirmSectionName = '';
+                if (selected) {
+                    if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                        if (selected.isSwitchSection) {
+                            let section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                            if (section) {
+                                this.model.sectionName = section.name;
+                            }
+                        } else {
+                            let section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                            if (section) {
+                                this.model.sectionName = section.name;
+                                this.model.sectionName = `${section.name}-${selected.name}`;
+                            } else {
+                                this.model.sectionName = `${selected.name}`;
+                            }
+                        }
+                    } else if (selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
+                        let section = this.$store.getters['map/getDeviceByCode'](selected.switchSectionCode);
+                        if (section) {
+                            this.model.sectionName = section.name;
+                        }
+                    }
+
+                    let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.model.stationName = station.name;
+                    }
+                }
+
+                this.stepNum = 0;
+                this.loading = false;
+                this.dialogShow = true;
+                this.stopTask();
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+                mouseCancelState(this.selected);
+            },
+            waitSelectEvent() {
+                if (!this.$store.state.menuOperation.break) {
+                    this.model.time -= 1;
+                    if (this.model.time <= 0) {
+                        this.stopTask();
+                    }
+                }
+            },
+            commitOnce() {
+                this.stepNum = 1;
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Section.alxeEffective.confirm1.operation
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.type = 'password';
+                        this.model.time = this.timenum;
+                        this.task = setInterval(this.waitSelectEvent, this.timeout);
+                    }
+                })
+            },
+            stationSelectChange(val) {
+                if (this.model.confirmStationName === this.model.stationName) {
+                    this.stepNum = 2;
+                } else {
+                    this.model.time = 0;
+                }
+
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Section.alxeEffective.choose1.operation,
+                    val: val
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                })
+            },
+            sectionSelectChange(val) {
+                if (this.model.confirmSectionName === this.model.sectionName) {
+                    this.stepNum = 2;
+                } else {
+                    this.model.time = 0;
+                }
+
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Section.alxeEffective.choose2.operation,
+                    val: val
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                })
+            },
+            /** 确认计轴恢复工作*/
+            commit() {
+                let operate = {
+                    send: true,
+                    type: this.operate.type,
+                    operation: OperationEvent.Section.alxeEffective.confirm2.operation,
+                    val: this.selected.code
+                }
+
+                this.model.status = '';
+                if (this.model.stationName == this.model.confirmStationName &&
+                    this.model.sectionName == this.model.confirmSectionName) {
+                    this.stepNum = 3;
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.type = 'text';
+                            this.stopTask();
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                            this.$refs.popupAlarm.doShow(Object.assign(this.operate, { val: operate.val }),
+                                [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`]);
+                        }
+                    }).catch(error => {
+                        this.loading = false;
+                    })
+                } else {
+                    if (this.model.stationName != this.model.confirmStationName) {
+                        this.model.status = '车站选择错误';
+                    } else if (this.model.sectionName != this.model.confirmSectionName) {
+                        this.model.status = '区段选择错误';
+                    }
+
+                }
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            }
+        }
+    }
+</script>
+<style>
+    .alxe-effective .context {
+        height: 80px !important;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/cancelAllLimit.vue
new file mode 100644
index 000000000..1f90d642c
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/cancelAllLimit.vue
@@ -0,0 +1,371 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-detain-train"
+    :title="title"
+    :visible.sync="show"
+    width="380px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div class="head_content content">
+      <span class="base-label" style="left: 0px;">会话管理</span>
+      <el-col :span="8">
+        <el-button class="status">查询会话状态</el-button>
+      </el-col>
+      <el-col :span="15" :offset="1">
+        <el-input :value="messageText" placeholder="" size="mini" disabled />
+      </el-col>
+      <el-col :span="12">
+        <el-button
+          :id="openMessageId"
+          class="status_btn"
+          :disabled="isOpenMessage"
+          @click="handleMessage('open')"
+        >打开会话</el-button>
+      </el-col>
+      <el-col :span="12">
+        <el-button
+          :id="closeMessageId"
+          class="status_btn"
+          :disabled="!isOpenMessage"
+          @click="handleMessage('close')"
+        >关闭会话
+        </el-button>
+      </el-col>
+    </div>
+    <div class="content cotnent_body">
+      <span class="base-label" style="left: 0px;">操作</span>
+      <el-col :span="3">
+        <div class="text">操作</div>
+      </el-col>
+      <el-col :span="11" :offset="1">
+        <el-input :value="messageText1" placeholder="" size="mini" disabled />
+      </el-col>
+      <el-col :span="8" :offset="1">
+        <el-button :id="confirmId1" class="status_btn" :disabled="disabledConfirm1" @click="confirm1">确认
+        </el-button>
+      </el-col>
+    </div>
+    <div class="content cotnent_body">
+      <span class="base-label" style="left: 0px;">确认</span>
+      <el-col :span="3">
+        <div class="text">操作</div>
+      </el-col>
+      <el-col :span="11" :offset="1">
+        <el-input :value="messageText2" placeholder="" size="mini" disabled />
+      </el-col>
+      <el-col :span="8" :offset="1">
+        <el-button :id="confirmId2" class="status_btn" :disabled="disabledConfirm2" @click="confirm2">确认
+        </el-button>
+      </el-col>
+    </div>
+    <div class="body_cont">
+      <el-col :span="7">
+        <div class="text">操作倒计时</div>
+      </el-col>
+      <el-col :span="17">
+        <div style="border: 2px inset #E9E9E9; height: 30px; width: 100%;">
+          {{ timeCountConfirm == -1 ? '' : timeCountConfirm }}</div>
+      </el-col>
+    </div>
+    <div class="body_cont">
+      <div class="status_text">状态</div>
+      <div class="textarea_content" />
+    </div>
+
+    <el-button :id="domIdConfirm" class="close_btn" type="primary" @click="commit">关闭</el-button>
+    <confirm-tip ref="ConfirmTip" @close="closeMessage" />
+  </el-dialog>
+</template>
+
+<script>
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import ConfirmTip from './childDialog/confirmTip';
+
+export default {
+    name: 'StandDetainTrain',
+    components: {
+        ConfirmTip
+    },
+    data() {
+        return {
+            dialogShow: false,
+            standName: '',
+            stationName: '',
+            selected: null,
+            operation: null,
+            radio: '1',
+            radio1: '1',
+            earlyDepar: false,
+
+            messageText: '',
+            messageText1: '',
+            messageText2: '',
+            isOpenMessage: false,
+            timeCountConfirm: -1,
+            disabledConfirm1: false,
+            disabledConfirm2: false
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        openMessageId() {
+            return this.dialogShow ? OperationEvent.LimitControl.CancelAllLimit.openMessage.domId : '';
+        },
+        closeMessageId() {
+            return this.dialogShow ? OperationEvent.LimitControl.CancelAllLimit.closeMessage.domId : '';
+        },
+        confirmId1() {
+            return this.dialogShow ? OperationEvent.LimitControl.CancelAllLimit.confirm1.domId : '';
+        },
+        confirmId2() {
+            return this.dialogShow ? OperationEvent.LimitControl.CancelAllLimit.confirm2.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.LimitControl.CancelAllLimit.confirm.domId : '';
+        },
+        title() {
+            return '取消全线临时限速';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+        this.timer = setInterval(() => {
+            if (this.timeCountConfirm > 0) {
+                this.timeCountConfirm--;
+            } else if (this.timeCountConfirm == 0) { // 关闭会话
+                this.timeCountConfirm = -1;
+                this.disabledConfirm2 = true;
+            }
+        }, 1000);
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            if (!this.dialogShow) {
+                this.standName = '';
+                this.stationName = '';
+
+                this.operation = operate.operation;
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        handleMessage(message) {
+            if (message == 'open') {
+                const operate = {
+                    type: MapDeviceType.LimitControl.type,
+                    operation: OperationEvent.LimitControl.CancelAllLimit.openMessage.operation
+                };
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.isOpenMessage = true;
+                        this.messageText1 = '取消全线临时限速';
+                    }
+                }).catch(() => {
+                    this.doClose();
+                });
+            } else {
+                const operate = {
+                    type: MapDeviceType.LimitControl.type,
+                    operation: OperationEvent.LimitControl.CancelAllLimit.closeMessage.operation
+                };
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.isOpenMessage = false;
+                        this.messageText1 = '';
+                        this.messageText2 = '';
+                        this.disabledConfirm1 = false;
+                        this.disabledConfirm2 = false;
+                        this.timeCountConfirm = -1; // 倒计时
+                    }
+                }).catch(() => {
+                    this.doClose();
+                });
+            }
+        },
+        confirm1() {
+            const operate = {
+                type: MapDeviceType.LimitControl.type,
+                operation: OperationEvent.LimitControl.CancelAllLimit.confirm1.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.isOpenMessage = true;
+                    this.messageText1 = '**************';
+                    this.messageText2 = '取消全线临时限速';
+                    this.disabledConfirm1 = true;
+                    this.timeCountConfirm = 60; // 倒计时
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        },
+        confirm2() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.LimitControl.type,
+                operation: OperationEvent.LimitControl.CancelAllLimit.confirm2.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.isOpenMessage = true;
+                    this.messageText2 = '**************';
+                    this.disabledConfirm2 = true;
+                    this.timeCountConfirm = -1;
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        },
+        commit() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.LimitControl.type,
+                operation: OperationEvent.LimitControl.CancelAllLimit.confirm.operation
+            };
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                if (!this.isOpenMessage) {
+                    this.doClose();
+                } else {
+                    const operate = {
+                        message: `是否关闭会话，并关闭窗口`,
+                        confirmId: OperationEvent.LimitControl.CancelAllLimit.close.domId
+                    };
+                    this.$refs.ConfirmTip.doShow(operate);
+                }
+            }).catch(error => {
+                console.log(error);
+            });
+        },
+        closeMessage() {
+            const operate = {
+                type: MapDeviceType.LimitControl.type,
+                operation: OperationEvent.LimitControl.CancelAllLimit.close.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                this.$refs.ConfirmTip.doClose();
+                this.isOpenMessage = false;
+                this.messageText1 = '';
+                this.messageText2 = '';
+                this.disabledConfirm1 = false;
+                this.disabledConfirm2 = false;
+                this.timeCountConfirm = -1; // 倒计时
+                this.doClose();
+            }).catch(error => {
+                console.log(error);
+            });
+        }
+    }
+};
+</script>
+<style scoped lang="scss">
+    .stand-detain-train .context {
+        height: 80px !important;
+    }
+
+    .content {
+        width: 100%;
+        border: 1px solid lightgray;
+        padding: 18px 5px;
+        position: relative;
+
+        .base-label {
+            position: absolute;
+            top: -5px;
+            left: 20px;
+            background-color: #F0F0F0;
+            padding: 0 5px;
+        }
+
+        .el-button {
+            width: 100%;
+            line-height: 28px;
+        }
+
+        .status_btn {
+            width: 110px;
+            margin: 15px auto 0;
+            display: block;
+        }
+
+    }
+
+    .head_content {
+        height: 110px;
+        margin-bottom: 10px;
+    }
+
+    .cotnent_body {
+        height: 60px;
+        margin-bottom: 10px;
+
+        .text {
+            line-height: 30px;
+            text-align: center;
+            font-size: 15px;
+        }
+
+        .status_btn {
+            width: 80px;
+            margin: 0 auto
+        }
+    }
+
+    .close_btn {
+        margin: 0 auto;
+        width: 80px;
+        display: block;
+    }
+
+    .body_cont {
+        margin-bottom: 10px;
+        padding: 0 3px;
+        overflow: hidden;
+
+        .text {
+            line-height: 30px;
+            text-align: center;
+            font-size: 15px;
+        }
+
+        .status_text {
+            margin-bottom: 3px;
+            font-size: 14px;
+            padding-left: 8px;
+        }
+
+        .textarea_content {
+            height: 85px;
+            width: 100%;
+            border: 2px solid #E9E9E9;
+            box-shadow: 2px 2px #959595 inset;
+        }
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/childDialog/noticeInfo.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
new file mode 100644
index 000000000..574e2ed4c
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/childDialog/noticeInfo.vue
@@ -0,0 +1,86 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm notice-info"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <span class="context">
+      <template v-for="(message, index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </span>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="8">
+        <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/ConstDic';
+
+export default {
+	name: 'NoticeInfo',
+	data() {
+		return {
+			dialogShow: false,
+			messages: ['命令下达失败'],
+			operate: null
+		};
+	},
+	computed: {
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		title() {
+			return '提示';
+		},
+		domIdSure() {
+			return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		doShow(operate, messages) {
+			this.operate = operate || {};
+			this.dialogShow = true;
+			this.messages = ['命令下达失败'];
+			if (messages) {
+				this.messages = messages;
+			}
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+		},
+		commit() {
+			this.doClose();
+		},
+		cancel() {
+			this.doClose();
+		}
+	}
+};
+
+</script>
+<style>
+    .notice-info .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue
new file mode 100644
index 000000000..bbb3a2587
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue
@@ -0,0 +1,360 @@
+<template>
+    <el-dialog class="chengdou-03__systerm confirm-control" :title="title" :visible.sync="show" width="360px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
+        <div class="context">
+            <template v-for="message in messages">
+                <span>{{message}}</span>
+            </template>
+        </div>
+        <el-row justify="center" class="button-group">
+            <el-col :span="10" :offset="2">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="4">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+        <notice-info ref="noticeInfo"></notice-info>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import NoticeInfo from './childDialog/noticeInfo'
+
+    export default {
+        name: 'ConfirmControl',
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                operate: {},
+                messages: '',
+                operation: null
+            }
+        },
+        components: {
+            NoticeInfo
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            title() {
+                if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
+                    return '进路设置';
+                } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+                    return '信号关灯';
+                } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
+                    return '信号重开';
+                } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                    return '取消进路';
+                } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
+                    return '进路交人工控';
+                } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
+                    return '进路交ATS自动控'
+                } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
+                    return '设置运行等级';
+                } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
+                    return '停站时间';
+                } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
+                    return '设置折返策略';
+                }
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                if (this.dialogShow) {
+                    if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
+                        /** 进路设置*/
+                        return OperationEvent.Signal.arrangementRoute.confirm.domId
+                    } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+                        /** 信号关灯*/
+                        return OperationEvent.Signal.signalClose.confirm.domId;
+                    } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
+                        /** 信号重开*/
+                        return OperationEvent.Signal.reopenSignal.confirm.domId;
+                    } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                        /** 取消进路*/
+                        return OperationEvent.Signal.cancelTrainRoute.confirm.domId;
+                    } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
+                        /** 进路交人工控*/
+                        return OperationEvent.Signal.humanControl.confirm.domId;
+                    } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
+                        /** 进路交ATS自动控*/
+                        return OperationEvent.Signal.atsAutoControl.confirm.domId;
+                    } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
+                        /** 设置运行等级*/
+                        return OperationEvent.StationStand.setRunLevel.confirm.domId;
+                    } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
+                        /** 设置停战时间*/
+                        return OperationEvent.StationStand.setStopTime.confirm.domId;
+                    } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
+                        /** 设置折返策略*/
+                        return OperationEvent.StationStand.setBackStrategy.confirm.domId;
+                    }
+                }
+            },
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                if (!this.dialogShow) {
+                    this.loading = false;
+                    this.operate = operate || {};
+                    this.messages = operate.messages;
+                    this.operation = operate.operation;
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
+                    /** 进路设置*/
+                    this.routeSetting();
+                } else if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
+                    /** 信号关灯*/
+                    this.signalClose();
+                } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
+                    /** 信号重开*/
+                    this.reopenSignal();
+                } else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                    /** 取消进路*/
+                    this.cancelTrainRoute();
+                } else if (this.operation === OperationEvent.Signal.humanControl.menu.operation) {
+                    /** 进路交人工控*/
+                    this.humanControl();
+                } else if (this.operation === OperationEvent.Signal.atsAutoControl.menu.operation) {
+                    /** 进路交ATS自动控*/
+                    this.atsAutoControl();
+                } else if (this.operation === OperationEvent.StationStand.setRunLevel.menu.operation) {
+                    /** 设置运行等级*/
+                    this.setRunLevel();
+                } else if (this.operation === OperationEvent.StationStand.setStopTime.menu.operation) {
+                    /** 停站时间*/
+                    this.setStopTime();
+                } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
+                    /** 设置折返策略*/
+                    this.setBackStrategy();
+                }
+            },
+            //进路设置
+            routeSetting() {
+                let operate = {
+                    send: true,
+                    type: this.operate.type,
+                    operation: OperationEvent.Signal.arrangementRoute.confirm.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //信号关灯
+            signalClose() {
+                let operate = {
+                    send: true,
+                    type: this.operate.type,
+                    operation: OperationEvent.Signal.signalClose.confirm.operation
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //信号重开
+            reopenSignal() {
+                let operate = {
+                    send: true,
+                    type: this.operate.type,
+                    operation: OperationEvent.Signal.reopenSignal.confirm.operation
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //取消进路
+            cancelTrainRoute() {
+                let operate = {
+                    send: true,
+                    type: this.operate.type,
+                    operation: OperationEvent.Signal.cancelTrainRoute.confirm.operation
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //进路交人工控
+            humanControl() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.humanControl.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //进路交ATS自动控
+            atsAutoControl() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //设置运行等级
+            setRunLevel() {
+                let operate = {
+                    send: true,
+                    type: this.operate.type,
+                    operation: OperationEvent.StationStand.setRunLevel.confirm.operation,
+                    val: this.operate.val
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //停站时间
+            setStopTime() {
+                let operate = {
+                    send: true,
+                    type: this.operate.type,
+                    operation: OperationEvent.StationStand.setStopTime.confirm.operation,
+                    val: this.operate.val,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //设置折返策略
+            setBackStrategy() {
+                let operate = {
+                    send: true,
+                    type: this.operate.type,
+                    operation: OperationEvent.StationStand.setBackStrategy.confirm.operation,
+                    val: this.operate.val,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            }
+        }
+    }
+
+</script>
+<style>
+    .confirm-control .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue
new file mode 100644
index 000000000..31d4587e0
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -0,0 +1,153 @@
+<template>
+    <el-dialog class="chengdou-03__systerm confirm-control-speed" :title="title" :visible.sync="show" width="540px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
+        <div style="height: 60px; padding-left: 20px">
+            <span style="font-size: 18px">{{message}}</span>
+        </div>
+        <el-row justify="center" class="button-group">
+            <el-col :span="6" :offset="6">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="10" :offset="2">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'ConfirmControlSpeed',
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                type: '',
+                operation: '',
+                message: '',
+            }
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            title() {
+                if (this.dialogShow) {
+                    if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                        return "区段设置限速";
+                    } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                        return "区段取消限速";
+                    } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                        return "道岔设置限速";
+                    } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                        return "道岔取消限速";
+                    }
+                }
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                if (this.dialogShow) {
+                    if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                        /** 区段设置限速*/
+                        return OperationEvent.Section.setSpeed.confirm.domId;
+                    } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                        /** 区段取消限速*/
+                        return OperationEvent.Section.cancelSpeed.confirm.domId;
+                    } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                        /** 道岔设置限速*/
+                        return OperationEvent.Switch.setSpeed.confirm.domId;
+                    } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                        /** 道岔取消限速*/
+                        return OperationEvent.Switch.cancelSpeed.confirm.domId;
+                    }
+                }
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                if (!this.dialogShow) {
+                    this.type = operate.type;
+                    this.operation = operate.operation;
+                    this.message = operate.message;
+                }
+
+                this.loading = false;
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                let operate = {
+                    type: this.type
+                }
+
+                if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
+                    /** 区段设置限速*/
+                    operate.operation = OperationEvent.Section.setSpeed.confirm.operation;
+                } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
+                    /** 区段取消限速*/
+                    operate.operation = OperationEvent.Section.cancelSpeed.confirm.operation;
+                } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
+                    /** 道岔设置限速*/
+                    operate.operation = OperationEvent.Switch.setSpeed.confirm.operation;
+                } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
+                    /** 道岔取消限速*/
+                    operate.operation = OperationEvent.Switch.cancelSpeed.confirm.operation;
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        this.$emit('setOperate', { step: 1, success: true });
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.loading = false;
+                    this.$emit('setOperate', { step: 0, success: false });
+                    this.doClose();
+                })
+            },
+            cancel() {
+                let operate = {
+                    type: this.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        this.$emit('setOperate', { step: 0, success: false });
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            }
+        }
+    }
+
+</script>
+<style>
+    .confirm-control-speed .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue
new file mode 100644
index 000000000..c6f069ffe
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -0,0 +1,118 @@
+<template>
+    <el-dialog class="chengdou-03__systerm route-unlock-confirm" :title="title" :visible.sync="show" width="500px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
+        <div style="height: 60px; padding-left: 20px">
+            <span>在{{stationName}}【{{signalName}}】信号机，信号解锁，确认下达吗？</span>
+        </div>
+        <el-row justify="center" class="button-group">
+            <el-col :span="6" :offset="6">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="10" :offset="2">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'RouteUnlockConfirm',
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                signalName: '',
+                stationName: ''
+            }
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            title() {
+                return '信号解封'
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Signal.unlock.confirm.domId : '';
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate, selected) {
+                this.stationName = ''
+                this.signalName = '';
+                if (selected) {
+                    this.signalName = selected.name;
+                    let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                    if (station) {
+                        this.stationName = station.name;
+                    }
+                }
+
+                this.loading = false;
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                let operate = {
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.unlock.confirm.operation
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        this.$emit('setOperate', { step: 1, success: true });
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.loading = false;
+                    this.$emit('setOperate', { step: 0, success: false });
+                    this.doClose();
+                })
+            },
+            cancel() {
+                let operate = {
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        this.$emit('setOperate', { step: 0, success: false });
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            }
+        }
+    }
+
+</script>
+<style>
+    .route-unlock-confirm .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue
new file mode 100644
index 000000000..6917c9a94
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue
@@ -0,0 +1,68 @@
+<template>
+    <el-dialog class="chengdou-03__systerm confirm-control-speed" :title="title" :visible.sync="show" width="340px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
+        <div style="height: 60px; padding-left: 20px">
+            <span style="font-size: 18px">{{message}}</span>
+        </div>
+        <el-row justify="center" class="button-group">
+            <el-col :span="11">
+                <el-button type="primary" :id="confirmId" @click="confirm">确定</el-button>
+            </el-col>
+            <el-col :span="11" :offset="2">
+                <el-button @click="doClose">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'ConfirmTip',
+        data() {
+            return {
+                dialogShow: false,
+                message: '',
+                confirmId: '',
+            }
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            title() {
+                if (this.dialogShow) {
+                    return "提示";
+                }
+            }
+        },
+        mounted() {
+
+        },
+        methods: {
+            doShow(operate) {
+                this.message = operate.message;
+                this.dialogShow = true;
+                this.confirmId = operate.confirmId;
+            },
+            confirm() {
+                this.$emit('close');
+            },
+            doClose() {
+                this.dialogShow = false;
+            }
+        }
+    }
+
+</script>
+<style scoped>
+    .confirm-control-speed .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+    .chengdou-03__systerm .el-dialog .el-button{
+        display: block;
+        margin: 0 auto;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTrain.vue
new file mode 100644
index 000000000..b0a7ffc5d
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTrain.vue
@@ -0,0 +1,178 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm confirm-control"
+    :title="title"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="(message, index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from './childDialog/noticeInfo';
+
+export default {
+	name: 'ConfirmTrain',
+	components: {
+		NoticeInfo
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			operate: {},
+			messages: '',
+			operation: null
+		};
+	},
+	computed: {
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		title() {
+			if (this.operation === OperationEvent.Train.addTrainId.menu.operation) {
+				return '添加列车识别号';
+			} else if (this.operation === OperationEvent.Train.editTrainId.menu.operation) {
+				return '修改列车识别号';
+			} else if (this.operation === OperationEvent.Train.delTrainId.menu.operation) {
+				return '删除列车识别号';
+			} else if (this.operation === OperationEvent.Train.moveTrainId.menu.operation) {
+				return '移动列车识别号';
+			} else if (this.operation === OperationEvent.Train.switchTrainId.menu.operation) {
+				return '交换列车识别号';
+			} else if (this.operation === OperationEvent.Train.editTrainNo.menu.operation) {
+				return '修改车组号';
+			}
+			return '';
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			if (this.operation === OperationEvent.Train.addTrainId.menu.operation) {
+				/** 添加列车识别号*/
+				return OperationEvent.Train.addTrainId.confirm.domId;
+			} else if (this.operation === OperationEvent.Train.editTrainId.menu.operation) {
+				/** 修改列车识别号*/
+				return OperationEvent.Train.editTrainId.confirm.domId;
+			} else if (this.operation === OperationEvent.Train.delTrainId.menu.operation) {
+				/** 删除列车识别号*/
+				return OperationEvent.Train.delTrainId.confirm.domId;
+			} else if (this.operation === OperationEvent.Train.moveTrainId.menu.operation) {
+				/** 移动列车识别号*/
+				return OperationEvent.Train.moveTrainId.confirm.domId;
+			} else if (this.operation === OperationEvent.Train.switchTrainId.menu.operation) {
+				/** 交换列车识别号*/
+				return OperationEvent.Train.switchTrainId.confirm.domId;
+			} else if (this.operation === OperationEvent.Train.editTrainNo.menu.operation) {
+				/** 修改车组号*/
+				return OperationEvent.Train.editTrainNo.confirm.domId;
+			}
+			return '';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		doShow(operate) {
+			if (!this.dialogShow) {
+				this.loading = false;
+				this.operate = operate || {};
+				this.messages = operate.messages;
+				this.operation = operate.operation;
+			}
+
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('map/setTrainWindowShow', false);
+			this.$store.dispatch('training/emitTipFresh');
+		},
+		commit() {
+			if (this.operation === OperationEvent.Train.addTrainId.menu.operation) {
+				this.routeSetting();
+			} else if (this.operation === OperationEvent.Train.editTrainId.menu.operation) {
+				this.routeSetting();
+			} else if (this.operation === OperationEvent.Train.delTrainId.menu.operation) {
+				this.routeSetting();
+			} else if (this.operation === OperationEvent.Train.moveTrainId.menu.operation) {
+				this.routeSetting();
+			} else if (this.operation === OperationEvent.Train.switchTrainId.menu.operation) {
+				this.routeSetting();
+			} else if (this.operation === OperationEvent.Train.editTrainNo.menu.operation) {
+				this.routeSetting();
+			}
+		},
+		// 进路设置
+		routeSetting() {
+			const operate = {
+				send: true,
+				type: this.operate.type,
+				operation: OperationEvent.Train.addTrainId.confirm.operation
+			};
+
+			this.loading = true;
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				this.loading = false;
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.loading = false;
+				this.doClose();
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		cancel() {
+			const operate = {
+				type: this.operate.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.doClose();
+			});
+		}
+	}
+};
+
+</script>
+<style>
+    .confirm-control .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/password.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/password.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/passwordInputBox.vue
new file mode 100644
index 000000000..dda9defa7
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/passwordInputBox.vue
@@ -0,0 +1,206 @@
+<template>
+	<el-dialog class="chengdou-03__systerm" :visible.sync="show" width="360px" :before-close="doClose" :zIndex="2000"
+		:modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
+		<el-row>
+			<el-col :span="22" :offset="1">
+				<el-input placeholder="请使用软键盘输入" v-model="encryptionPassword" size="medium" :disabled="true"></el-input>
+			</el-col>
+		</el-row>
+		<el-row v-if="showMistake">
+			<el-col :span="22" :offset="1">
+				<span class="password-error">*密码输入错误请重新输入*</span>
+			</el-col>
+		</el-row>
+		<el-row justify="center" class="button-group">
+			<el-col :span="4" :offset="1">
+				<el-button @click="inputNum">7</el-button>
+			</el-col>
+			<el-col :span="4" :offset="4">
+				<el-button @click="inputNum">8</el-button>
+			</el-col>
+			<el-col :span="4" :offset="4">
+				<el-button @click="inputNum">9</el-button>
+			</el-col>
+		</el-row>
+		<el-row justify="center" class="button-group">
+			<el-col :span="4" :offset="1">
+				<el-button @click="inputNum">4</el-button>
+			</el-col>
+			<el-col :span="4" :offset="4">
+				<el-button @click="inputNum">5</el-button>
+			</el-col>
+			<el-col :span="4" :offset="4">
+				<el-button @click="inputNum">6</el-button>
+			</el-col>
+		</el-row>
+		<el-row justify="center" class="button-group">
+			<el-col :span="4" :offset="1">
+				<el-button @click="inputNum">1</el-button>
+			</el-col>
+			<el-col :span="4" :offset="4">
+				<el-button @click="inputNum">2</el-button>
+			</el-col>
+			<el-col :span="4" :offset="4">
+				<el-button @click="inputNum">3</el-button>
+			</el-col>
+		</el-row>
+		<el-row justify="center" class="button-group">
+			<el-col :span="4" :offset="1">
+				<el-button @click="inputNum">0</el-button>
+			</el-col>
+			<el-col :span="4" :offset="4">
+				<el-button @click="inputClear">C</el-button>
+			</el-col>
+			<el-col :span="4" :offset="4">
+				<el-button @click="backSpace">&lt-</el-button>
+			</el-col>
+		</el-row>
+		<el-row justify="center" class="button-group">
+			<el-col :span="4" :offset="1">
+				<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+			</el-col>
+			<el-col :span="4" :offset="12">
+				<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+			</el-col>
+		</el-row>
+	</el-dialog>
+</template>
+
+<script>
+	import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+	export default {
+		name: 'passwordBox',
+		data() {
+			return {
+				/*写死的初始密码*/
+				correctPassword: '123456',
+				dialogShow: false,
+				operation: null,
+				checkHasInput: false,
+				/*输入值*/
+				passwordCheck: '',
+				/*输入值替换为对应长度的星号*/
+				encryptionPassword: '',
+				loading: false,
+				showMistake: false,
+			}
+		},
+		computed: {
+			show() {
+				return this.dialogShow && !this.$store.state.menuOperation.break;
+			},
+			domIdCancel: {
+				get: function () {
+					return this.dialogShow ? OperationEvent.Command.close.password.domId : '';
+				},
+				set: function () {
+				}
+			},
+			domIdConfirm: {
+				get: function () {
+					return OperationEvent.Command.close.confirm.domId;
+				},
+				set: function () {
+				}
+			}
+		},
+		mounted() {
+			this.$nextTick(() => {
+				this.$store.dispatch('training/tipReload');
+			})
+		},
+		methods: {
+			doShow(operate) {
+				this.operate = operate || {};
+				this.dialogShow = true;
+				this.checkHasInput = false;
+				this.$nextTick(function () {
+					this.$store.dispatch('training/emitTipFresh');
+				});
+			},
+			doClose() {
+				this.loading = false;
+				this.dialogShow = false;
+				this.showMistake = false;
+				this.$store.dispatch('training/emitTipFresh');
+			},
+			commit() {
+				let operate = {
+					send: false,
+					type: this.operate.type,
+					operation: OperationEvent.Command.close.confirm.operation,
+				};
+				if (this.passwordCheck === this.correctPassword) {
+					this.$store.dispatch('training/next', operate).then(({ valid }) => {
+						this.loading = false;
+
+						if (valid) {
+							this.$emit('checkOver', this.operate.operation);
+							this.doClose();
+							this.inputClear();
+							this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+						}
+					}).catch(() => {
+						this.loading = false;
+						this.$refs.noticeInfo.doShow(operate);
+					})
+				} else {
+					this.showMistake = true;
+				}
+			},
+			/*软键盘输入*/
+			inputNum(e) {
+				this.showMistake = false;
+				this.passwordCheck += e.path[0].innerText;
+				this.encryptionPassword = this.passwordCheck.replace(/./g, '*');
+			},
+			/*软键盘清除*/
+			inputClear() {
+				this.showMistake = false;
+				this.passwordCheck = '';
+				this.encryptionPassword = '';
+			},
+			/*软键盘回退*/
+			backSpace() {
+				this.showMistake = false;
+				let password = this.passwordCheck;
+				if (password !== '') {
+					this.passwordCheck = password.substring(0, password.length - 1);
+					this.encryptionPassword = this.passwordCheck;
+				}
+			},
+
+			cancel() {
+				let operate = {
+					send: false,
+					type: this.operate.type,
+					operation: OperationEvent.Command.close.password.operation,
+				};
+				this.$store.dispatch('training/next', operate).then(({ valid }) => {
+					this.loading = false;
+					if (valid) {
+						this.doClose();
+						this.inputClear();
+						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					}
+				}).catch(() => {
+					this.loading = false;
+					this.$refs.noticeInfo.doShow(operate);
+				});
+			}
+		}
+	}
+
+</script>
+<style>
+	.notice-info .context {
+		padding-bottom: 40px !important;
+		border: 1px solid lightgray;
+	}
+
+	.password-error {
+
+		color: red;
+	}
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue
new file mode 100644
index 000000000..f71cf4158
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/popupAlarm.vue
@@ -0,0 +1,99 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm popup-alarm"
+    :title="title"
+    :visible.sync="show"
+    width="500px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <el-row>
+      <el-col :offset="2">
+        <span v-for="(message, index) in messages" :key="index">{{ message }}</span>
+      </el-col>
+    </el-row>
+    <el-button justify="center" class="button-group">
+      <el-col :span="10" :offset="8">
+        <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
+      </el-col>
+    </el-button>
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/ConstDic';
+
+export default {
+	name: 'PopupAlarm',
+	data() {
+		return {
+			dialogShow: false,
+			messages: [],
+			operate: null,
+			operation: ''
+		};
+	},
+	computed: {
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		title() {
+			return '弹出式告警';
+		},
+		domIdSure() {
+			return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		doShow(operate, messages) {
+			this.operate = operate || {};
+			this.operation = operate.operation;
+			this.dialogShow = true;
+			this.messages = messages || [];
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+		},
+		commit() {
+			if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+				// 确认计轴有效
+				this.alxeEffective();
+			}
+
+		},
+		alxeEffective() {
+			const operate = {
+				type: this.operate.type,
+				operation: OperationEvent.Command.close.alarm.operation
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.doClose();
+				}
+			});
+		}
+	}
+};
+
+</script>
+<style>
+    .popup-alarm .context {
+        padding-bottom: 40px !important;
+        border: 1px solid lightgray;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue
new file mode 100644
index 000000000..4c7ab1437
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeControl.vue
@@ -0,0 +1,363 @@
+<template>
+    <el-dialog class="chengdou-03__systerm signal-control" :title="title" :visible.sync="show" width="440px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <el-row>
+            <el-col :span="2"><span>车站</span></el-col>
+            <el-col :span="6">
+                <el-input v-model="stationName" size="small" disabled></el-input>
+            </el-col>
+            <el-col :span="5" :offset="1"><span>始端信号机</span></el-col>
+            <el-col :span="6">
+                <el-input v-model="signalName" size="small" disabled></el-input>
+            </el-col>
+        </el-row>
+        <el-row justify="center" style="margin-top: 50px">
+            <el-col :span="11" :offset="13">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+        <confirm-control ref="confirmControl"></confirm-control>
+        <password-box ref="password" @checkOver="confirm"></password-box>
+        <notice-info ref="noticeInfo"></notice-info>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+    import { mouseCancelState } from '../utils/menuItemStatus';
+    import ConfirmControl from './childDialog/confirmControl';
+    import PasswordBox from './childDialog/passwordInputBox';
+    import NoticeInfo from './childDialog/childDialog/noticeInfo';
+
+    export default {
+        name: 'RouteControl',
+        components: {
+            ConfirmControl,
+            PasswordBox,
+            NoticeInfo,
+        },
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                selected: null,
+                tempdata: [],
+                operation: null,
+                stationName: '',
+                signalName: ''
+
+            }
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? getDomIdByOperation(this.operation) : '';
+            },
+            title() {
+                if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                    return '取消列车进路';
+                } else if (this.operation == OperationEvent.Signal.humanTrainRoute.menu.operation) {
+                    return '总人解';
+                } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
+                    return '重开信号';
+                } else if (this.operation == OperationEvent.Signal.lock.menu.operation) {
+                    return '信号封锁';
+                } else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                    return '信号解封';
+                } else if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
+                    return '进路收人工控';
+                } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+                    return '进路交自动控';
+                } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
+                    return '信号关灯';
+                }
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate, selected, tempdata) {
+                this.selected = selected;
+                this.tempdata = tempdata;
+                if (!this.dialogShow) {
+                    this.signalName = '';
+                    this.stationName = '';
+                    if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                        this.signalName = selected.name
+                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                        if (station) {
+                            this.stationName = station.name;
+                        }
+                    }
+                    this.operation = operate.operation;
+                }
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+                mouseCancelState(this.selected);
+            },
+            commit() {
+                if (this.operation == OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                    /** 取消列车进路*/
+                    this.cancelTrainRoute();
+                } else if (this.operation == OperationEvent.Signal.humanTrainRoute.menu.operation) {
+                    /** 总人解*/
+                    this.humanTrainRoute();
+                } else if (this.operation == OperationEvent.Signal.reopenSignal.menu.operation) {
+                    /** 信号重开*/
+                    this.reopenSignal();
+                } else if (this.operation == OperationEvent.Signal.lock.menu.operation) {
+                    /** 信号封锁*/
+                    this.lock();
+                } else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                    /** 信号解封*/
+                    this.unlock();
+                } else if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
+                    /** 进路收人工控*/
+                    this.humanControl();
+                } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
+                    /** 进路交自动控*/
+                    this.atsAutoControl();
+                } else if (this.operation == OperationEvent.Signal.signalClose.menu.operation) {
+                    /** 信号关灯*/
+                    this.signalClose();
+                }
+            },
+            //取消列车进路
+            cancelTrainRoute() {
+                if (this.$store.state.training.prdType == '01') {
+                    /** 现地工作站*/
+                    this.cancelTrainRouteByLocal();
+                } else if (this.$store.state.training.prdType == '02') {
+                    /** 行调工作站*/
+                    this.cancelTrainRouteByCentral();
+                }
+            },
+            //现地工作站取消进路
+            cancelTrainRouteByLocal() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //行调工作站取消进路
+            cancelTrainRouteByCentral() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.cancelTrainRoute.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //总人解
+            humanTrainRoute() {
+                let operate = {
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.humanTrainRoute.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$refs.password.doShow();
+                    }
+                }).catch(error => {
+                });
+            },
+            //信号重开
+            reopenSignal() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.reopenSignal.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //信号解封
+            lock() {
+                let operate = {
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.lock.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$refs.password.doShow();
+                    }
+                }).catch(error => {
+                });
+            },
+            //信号解封
+            unlock() {
+                let operate = {
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.unlock.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$refs.password.doShow();
+                    }
+                }).catch(error => {
+                });
+            },
+            //进路收人工控
+            humanControl() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.humanControl.menu.operation,
+                    val: 'all'
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //进路交自动控
+            atsAutoControl() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.atsAutoControl.menu.operation,
+                    val: 'all'
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //信号关灯
+            signalClose() {
+                let operate = {
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Signal.signalClose.menu.operation,
+                    messages: [`信号关灯: ${this.signalName}`],
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.confirmControl.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                });
+            },
+            //破铅封确认
+            confirm() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Signal.type,
+                }
+
+                if (this.operation == OperationEvent.Signal.humanTrainRoute.menu.operation) {
+                    //总人解
+                    operate.operation = OperationEvent.Signal.humanTrainRoute.menu.confirm;
+                } else if (this.operation == OperationEvent.Signal.lock.menu.operation) {
+                    //信号封锁
+                    operate.operation = OperationEvent.Signal.lock.menu.confirm;
+                } else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
+                    //信号解封
+                    operate.operation = OperationEvent.Signal.unlock.menu.confirm;
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //取消
+            cancel() {
+                let operate = {
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Command.close.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue
new file mode 100644
index 000000000..c93dc7380
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeDetail.vue
@@ -0,0 +1,140 @@
+<template>
+    <div>
+        <el-dialog class="chengdou-03__systerm route-detail" :title="title" :visible.sync="show" width="460px"
+            :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+            <el-row>
+                <el-col :span="2"><span>车站</span></el-col>
+                <el-col :span="6">
+                    <el-input v-model="stationName" size="small" disabled></el-input>
+                </el-col>
+                <el-col :span="6" :offset="1"><span>始端信号机</span></el-col>
+                <el-col :span="6">
+                    <el-input v-model="signalName" size="small" disabled></el-input>
+                </el-col>
+            </el-row>
+            <div style="margin-top: 20px">
+                <el-table ref="tempTable" :data="tempData" border style="width: 100%" size="mini" highlight-current-row
+                    :height="140">
+                    <el-table-column type="index" label="Id" width="40">
+                    </el-table-column>
+                    <el-table-column label="描述" width="140">
+                        <template slot-scope="scope">
+                            <span>{{scope.row.name}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="方向" width="60">
+                        <template slot-scope="scope">
+                            <span>{{scope.row.name}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="完整性">
+                        <template slot-scope="scope">
+                            <span>{{scope.row.name}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="status" label="控制">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.controlType == '01'">自动</span>
+                            <span v-else>人工</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <el-row justify="center" class="button-group">
+                <el-col :span="5" :offset="19">
+                    <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+                </el-col>
+            </el-row>
+            <notice-info ref="noticeInfo"></notice-info>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { mouseCancelState } from '../utils/menuItemStatus';
+    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+
+    export default {
+        name: 'RouteDetail',
+        components: {
+            NoticeInfo
+        },
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                selected: null,
+                tempData: [],
+                stationName: '',
+                signalName: '',
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'signalList'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Signal.detail.menu.domId : '';
+            },
+            title() {
+                return '查询进路状态'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate, selected, tempData) {
+                this.selected = selected;
+                //如果不是因为断点激活则需要，初始化菜单初始值
+                if (!this.dialogShow) {
+                    this.signalName = '';
+                    this.stationName = '';
+                    if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                        this.signalName = selected.name
+                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                        if (station) {
+                            this.stationName = station.name;
+                        }
+                    }
+                    this.tempData = tempData || [];
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+                mouseCancelState(this.selected);
+            },
+            cancel() {
+                let operate = {
+                    type: MapDeviceType.Signal.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeGuide.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeGuide.vue
new file mode 100644
index 000000000..4d0534ee1
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeGuide.vue
@@ -0,0 +1,283 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm route-setting"
+    :title="title"
+    :visible.sync="show"
+    width="460px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-col>
+      <el-col :span="2"><span class="item-lable">车站</span></el-col>
+      <el-col :span="6">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="4" :offset="1"><span class="item-lable">始端信号机</span></el-col>
+      <el-col :span="6">
+        <el-input v-model="signalName" size="small" disabled />
+      </el-col>
+    </el-col>
+    <div class="route-table-box">
+      <span class="route-table-tip">进路列表</span>
+      <el-table
+        ref="table"
+        :data="tempData"
+        border
+        :cell-style="tableStyle"
+        style="width: 99%;"
+        size="mini"
+        height="90"
+        highlight-current-row
+        @row-click="clickEvent"
+      >
+        <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px" />
+        <el-table-column :id="domIdChoose" prop="controlType" label="进路属性" style="margin-left:30px">
+          <template slot-scope="scope">
+            {{ controlTypeNameMap[scope.row.controlType] }}
+          </template>
+        </el-table-column>
+        <el-table-column :id="domIdChoose" prop="controlType" label="进路描述" style="margin-left:30px">
+          <template>无</template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-row justify="center" style="margin-top: 40px">
+      <el-col :span="12" :offset="12">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="commitDisabled" @click="commit">执行</el-button>
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+    <!-- <password ref="password"></password> -->
+  </el-dialog>
+</template>
+
+<script>
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
+// import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+// import Password from './childDialog/childDialog/password';
+
+export default {
+	name: 'RouteSelection',
+	components: {
+		// ConfirmControl,
+		NoticeInfo
+		// Password
+	},
+	data() {
+		return {
+			tempData: [],
+			beforeSectionList: [],
+			dialogShow: false,
+			loading: false,
+			selected: null,
+			row: null,
+			operation: '',
+			display: true,
+			stationName: '',
+			signalName: '',
+			tableStyle: {
+				'border-bottom': 'none'
+			},
+			controlTypeNameMap: {
+				'01': '折返',
+				'02': '直通'
+			}
+		};
+	},
+	computed: {
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdChoose() {
+			return this.dialogShow ? OperationEvent.Signal.guide.choose.domId : '';
+		},
+		domIdConfirm() {
+			return this.dialogShow ? OperationEvent.Signal.guide.menu.domId : '';
+		},
+		title() {
+			return '办理引导进路';
+		},
+		commitDisabled() {
+			let disabled = true;
+			if (this.row) {
+				disabled = !this.row.canSetting;
+			}
+			return disabled;
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		getProtectedSectionName(row) {
+			let name = '';
+			if (row &&
+                    row.overlapSectionList &&
+                    row.overlapSectionList &&
+                    row.overlapSectionList.length > 0) {
+
+				const protect = row.overlapSectionList[0];
+				name = `${protect.name}`;
+				const station = this.$store.getters['map/getDeviceByCode'](protect.stationCode);
+				if (station) {
+					name = `${name}(${station.name})`;
+				}
+			}
+			return name;
+		},
+		doShow(operate, selected, tempData) {
+			this.selected = selected;
+			// 如果不是断点激活，而是第一次显示，则需要设置初始值
+			if (!this.dialogShow) {
+				this.signalName = '';
+				this.stationName = '';
+				if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+					this.signalName = selected.name;
+					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+					if (station) {
+						this.stationName = station.name;
+					}
+				}
+
+				this.tempData = tempData || [];
+				this.operation = operate.operation;
+			}
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.guide();
+			this.$refs.table.setCurrentRow();
+			this.$store.dispatch('training/emitTipFresh');
+			mouseCancelState(this.selected);
+		},
+		guide() {
+			// 恢复之前选中设备
+			if (this.beforeSectionList && this.beforeSectionList.length) {
+				this.beforeSectionList.forEach(elem => {
+					elem.cutOff = false;
+				});
+			}
+
+			this.$store.dispatch('training/updateMapState', [...this.beforeSectionList]);
+			this.beforeSectionList = [];
+		},
+		clickEvent(row, event, column) {
+			this.row = row;
+			if (row) {
+				// 恢复进路区段的切除状态
+				this.guide();
+
+				if (row.canSetting) {
+					// 设置选中区段为切除状态
+					if (row.containSectionList && row.containSectionList.length) {
+						// 设置新选的进路区段为切除状态
+						row.containSectionList.forEach(elem => {
+							elem.cutOff = true;
+						});
+					}
+
+					this.$store.dispatch('training/updateMapState', [...row.containSectionList]);
+					this.beforeSectionList = row.containSectionList || [];
+
+					// 设置选中指令
+					const operate = {
+						type: MapDeviceType.Signal.type,
+						operation: OperationEvent.Signal.guide.choose.operation,
+						val: row.code
+					};
+
+					this.$store.dispatch('training/next', operate).then(({ valid }) => {
+						if (valid) {
+							this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+						}
+					});
+				}
+			}
+		},
+		commit() {
+			if (this.row && this.row.canSetting) {
+				const operate = {
+					type: MapDeviceType.Signal.type,
+					operation: OperationEvent.Signal.guide.menu.operation
+				};
+
+				this.loading = true;
+				this.$store.dispatch('training/next', operate).then(({ valid }) => {
+					this.loading = false;
+					if (valid) {
+						this.$refs.password.doShow(operate);
+					}
+				}).catch(() => {
+					this.loading = false;
+				});
+			}
+		},
+		confirm() {
+			const operate = {
+				send: true,
+				type: MapDeviceType.Signal.type,
+				operation: OperationEvent.Signal.guide.confirm.operation
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+			}).catch(() => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.Signal.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.doClose();
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+    .route-table-tip {
+        position: relative !important;
+        color: #3C72DF !important;
+        background: #ECE9D8 !important;
+        font-size: 12px;
+        top: -7px;
+        left: 7px;
+    }
+
+    .route-table-box {
+        margin-top: 20px !important;
+        line-height: 10px !important;
+        border: 2px solid #FFFFFF !important;
+        border-radius: 5px !important;
+        z-index: 1;
+        padding-bottom: 40px;
+    }
+
+    .item-lable {
+        line-height: 26px !important;
+        font-size: 13px;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
new file mode 100644
index 000000000..88df28887
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
@@ -0,0 +1,270 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm route-setting"
+    :title="title"
+    :visible.sync="show"
+    width="460px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="2"><span class="item-lable">车站</span></el-col>
+      <el-col :span="6">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="4" :offset="1"><span class="item-lable">始端信号机</span></el-col>
+      <el-col :span="6">
+        <el-input v-model="signalName" size="small" disabled />
+      </el-col>
+    </el-row>
+    <div class="route-table-box">
+      <span class="route-table-tip">进路列表</span>
+      <el-table
+        ref="table"
+        :data="tempData"
+        border
+        :cell-style="tableStyle"
+        style="width: 99%;"
+        size="mini"
+        height="150"
+        highlight-current-row
+        @row-click="clickEvent"
+      >
+        <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px" />
+        <el-table-column :id="domIdChoose" prop="controlType" label="进路属性" style="margin-left:30px">
+          <template slot-scope="scope">
+            {{ controlTypeNameMap[scope.row.controlType] }}
+          </template>
+        </el-table-column>
+        <el-table-column :id="domIdChoose" prop="controlType" label="进路描述" style="margin-left:30px">
+          <template>无</template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-row justify="center" style="margin-top: 70px">
+      <el-col :span="12" :offset="12">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="commitDisabled" @click="commit">执行</el-button>
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
+// import ConfirmControl from './childDialog/confirmControl';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+
+export default {
+	name: 'RouteSelection',
+	components: {
+		// ConfirmControl,
+		NoticeInfo
+	},
+	data() {
+		return {
+			tempData: [],
+			beforeSectionList: [],
+			dialogShow: false,
+			loading: false,
+			selected: null,
+			row: null,
+			operation: '',
+			display: true,
+			stationName: '',
+			signalName: '',
+			tableStyle: {
+				'border-bottom': 'none'
+			},
+			controlTypeNameMap: {
+				'01': '折返',
+				'02': '直通'
+			}
+		};
+	},
+	computed: {
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdChoose() {
+			return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
+		},
+		domIdConfirm() {
+			return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
+		},
+		title() {
+			return '办理进路';
+		},
+		commitDisabled() {
+			let disabled = true;
+			if (this.row) {
+				disabled = !this.row.canSetting;
+			}
+			return disabled;
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		getProtectedSectionName(row) {
+			let name = '';
+			if (row &&
+                    row.overlapSectionList &&
+                    row.overlapSectionList &&
+                    row.overlapSectionList.length > 0) {
+
+				const protect = row.overlapSectionList[0];
+				name = `${protect.name}`;
+				const station = this.$store.getters['map/getDeviceByCode'](protect.stationCode);
+				if (station) {
+					name = `${name}(${station.name})`;
+				}
+			}
+			return name;
+		},
+		doShow(operate, selected, tempData) {
+			this.selected = selected;
+			// 如果不是断点激活，而是第一次显示，则需要设置初始值
+			if (!this.dialogShow) {
+				this.signalName = '';
+				this.stationName = '';
+				if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+					this.signalName = selected.name;
+					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+					if (station) {
+						this.stationName = station.name;
+					}
+				}
+
+				this.tempData = tempData || [];
+				this.operation = operate.operation;
+			}
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.restoreBeforeDevices();
+			this.$refs.table.setCurrentRow();
+			this.$store.dispatch('training/emitTipFresh');
+			mouseCancelState(this.selected);
+		},
+		restoreBeforeDevices() {
+			// 恢复之前选中设备
+			if (this.beforeSectionList && this.beforeSectionList.length) {
+				this.beforeSectionList.forEach(elem => {
+					elem.cutOff = false;
+				});
+			}
+
+			this.$store.dispatch('training/updateMapState', [...this.beforeSectionList]);
+			this.beforeSectionList = [];
+		},
+		clickEvent(row, event, column) {
+			this.row = row;
+			if (row) {
+				// 恢复进路区段的切除状态
+				this.restoreBeforeDevices();
+
+				if (row.canSetting) {
+					// 设置选中区段为切除状态
+					if (row.containSectionList && row.containSectionList.length) {
+						// 设置新选的进路区段为切除状态
+						row.containSectionList.forEach(elem => {
+							elem.cutOff = true;
+						});
+					}
+
+					this.$store.dispatch('training/updateMapState', [...row.containSectionList]);
+					this.beforeSectionList = row.containSectionList || [];
+
+					// 设置选中指令
+					const operate = {
+						type: MapDeviceType.Signal.type,
+						operation: OperationEvent.Signal.arrangementRoute.choose.operation,
+						val: row.code
+					};
+
+					this.$store.dispatch('training/next', operate).then(({ valid }) => {
+						if (valid) {
+							this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+						}
+					});
+				}
+			}
+		},
+		commit() {
+			if (this.row && this.row.canSetting) {
+				const operate = {
+					send: true,
+					type: MapDeviceType.Signal.type,
+					operation: OperationEvent.Signal.arrangementRoute.menu.operation
+				};
+
+				this.loading = true;
+				this.$store.dispatch('training/next', operate).then(({ valid }) => {
+					this.loading = false;
+					if (valid) {
+						this.doClose();
+					}
+				}).catch(() => {
+					this.loading = false;
+					this.doClose();
+					this.$refs.noticeInfo.doShow(operate);
+				});
+			}
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.Signal.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.doClose();
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+    .route-table-tip {
+        position: relative !important;
+        color: #3C72DF !important;
+        background: #ECE9D8 !important;
+        font-size: 12px;
+        top: -7px;
+        left: 7px;
+    }
+
+    .route-table-box {
+        margin-top: 15px !important;
+        line-height: 10px !important;
+        border: 2px solid #FFFFFF !important;
+        border-radius: 5px !important;
+        z-index: 1;
+    }
+
+    .item-lable {
+        line-height: 26px !important;
+        font-size: 13px;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionCmdControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionCmdControl.vue
new file mode 100644
index 000000000..96bd8f04b
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionCmdControl.vue
@@ -0,0 +1,435 @@
+<template>
+    <div>
+        <el-dialog class="chengdou-03__systerm section-cmd-control" :title="title" :visible.sync="show" width="800px"
+            :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+            <div style="padding: 10px 20px; border: 1px solid lightgray;">
+                <span class="base-label">命令信息</span>
+                <el-form label-position="center" size="mini">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="类型" label-width="40px">
+                                <el-select v-model="operation" size="small" disabled>
+                                    <el-option v-for="option in typeList" :key="option.code" :label="option.name"
+                                        :value="option.code">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="车站名称" label-width="80px">
+                                <el-input v-model="stationName" size="small" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="区段名称" label-width="100px">
+                                <el-input v-model="sectionName" size="small" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+            </div>
+            <el-table class="table" ref="tempData" :data="tempData" border style="width: 100%" size="mini"
+                highlight-current-row height="200">
+                <el-table-column prop="order" :width="50" label="序号">
+                </el-table-column>
+                <el-table-column prop="date" :width="160" label="时间">
+                </el-table-column>
+                <el-table-column prop="context" :width="180" label="执行过程">
+                </el-table-column>
+                <el-table-column prop="result" label="执行结果">
+                </el-table-column>
+            </el-table>
+            <span class="notice">{{message}}</span>
+            <el-row class="button-group">
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">下达<span
+                            v-show="timeCountCommand>0">({{timeCountCommand}})</span></el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdConfirm1" type="primary" :disabled="cmdDisabled[1]" @click="confirm1">确认1
+                    </el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdConfirm2" type="primary" :disabled="cmdDisabled[2]" @click="confirm2">确认2<span
+                            v-show="timeCountConfirm>0">({{timeCountConfirm}})</span></el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">中止</el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdClose" @click="close">关闭</el-button>
+                </el-col>
+            </el-row>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { mouseCancelState } from '../utils/menuItemStatus';
+    import { now } from '@/utils/date';
+
+    export default {
+        name: 'SectionCmdControl',
+        data() {
+            return {
+                dialogShow: false,
+                backOperate: '',
+                selected: '',
+                order: 0,
+                row: null,
+                timer: null,
+                operation: '',
+                cmdDisabled: [true, true, true],
+                stpDisabled: true,
+                tempData: [],
+                message: '',
+                timeCountCommand: -1,
+                timeCountConfirm: -1,
+                stationName: '',
+                sectionName: ''
+            }
+        },
+        computed: {
+            typeList() {
+                return [
+                    { code: OperationEvent.Section.unlock.menu.operation, name: '区段解封' },
+                    { code: OperationEvent.Section.fault.menu.operation, name: '区段故障解锁' },
+                    { code: OperationEvent.Section.axlePreReset.menu.operation, name: '区段计轴预复位' },
+                ]
+            },
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCommand() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                        /** 区段解封*/
+                        return OperationEvent.Section.unlock.order.domId;
+                    } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                        /** 区段故障解锁*/
+                        return OperationEvent.Section.fault.order.domId;
+                    } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                        /** 区段计轴预复位*/
+                        return OperationEvent.Section.axlePreReset.order.domId;
+                    }
+                }
+            },
+            domIdConfirm1() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                        /** 区段解封*/
+                        return OperationEvent.Section.unlock.confirm1.domId;
+                    } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                        /** 区段故障解锁*/
+                        return OperationEvent.Section.fault.confirm1.domId;
+                    } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                        /** 区段计轴预复位*/
+                        return OperationEvent.Section.axlePreReset.confirm1.domId;
+                    }
+                }
+            },
+            domIdConfirm2() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                        /** 区段解封*/
+                        return OperationEvent.Section.unlock.confirm2.domId;
+                    } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                        /** 区段故障解锁*/
+                        return OperationEvent.Section.fault.confirm2.domId;
+                    } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                        /** 区段计轴预复位*/
+                        return OperationEvent.Section.axlePreReset.confirm2.domId;
+                    }
+                }
+            },
+            domIdStop() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                        /** 区段解封*/
+                        return OperationEvent.Section.unlock.stop.domId;
+                    } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                        /** 区段故障解锁*/
+                        return OperationEvent.Section.fault.stop.domId;
+                    } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                        /** 区段计轴预复位*/
+                        return OperationEvent.Section.axlePreReset.stop.domId;
+                    }
+                }
+            },
+            domIdClose() {
+                if (this.dialogShow) {
+                    return OperationEvent.Command.close.menu.domId;
+                }
+            },
+            title() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                        return '区段解封';
+                    } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                        return '区段故障解锁';
+                    } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                        return '区段计轴预复位';
+                    }
+                }
+            }
+        },
+        watch: {
+            cmdDisabled: {
+                handler(val, oldVal) {
+                    this.stpDisabled = true;
+                    val.forEach((elem, index) => {
+                        // 在确定1之前的操作才可以终止
+                        if (elem == false && 1 <= index && index <= 2) {
+                            this.stpDisabled = false;
+                        }
+                    });
+                },
+                deep: true
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+            this.timer = setInterval(() => {
+                if (!this.$store.state.menuOperation.break) {
+                    if (this.timeCountCommand > 0) {
+                        this.timeCountCommand--;
+                    } else if (this.timeCountCommand == 0) {
+                        this.setButtonEnable({ step: 0 });
+                        this.timeCountCommand = -1;
+                    }
+                    if (this.timeCountConfirm > 0) {
+                        this.timeCountConfirm--;
+                    } else if (this.timeCountConfirm == 0) {
+                        this.setButtonEnable({ step: 0 });
+                        this.timeCountConfirm = -1;
+                    }
+                }
+            }, 1000)
+        },
+        beforeDestroy() {
+            clearInterval(this.timer);
+            this.timer = null;
+        },
+        methods: {
+            doShow(operate, selected) {
+                this.selected = selected;
+                if (!this.dialogShow) {
+                    this.sectionName = '';
+                    this.stationName = '';
+                    if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                        if (selected.type === '02') {
+                            let section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                            if (section) {
+                                this.sectionName += section.name
+                            }
+                        }
+                        this.sectionName += selected.name
+
+                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                        if (station) {
+                            this.stationName = station.name;
+                        }
+                    }
+
+                    this.order = 0;
+                    this.operation = operate.operation || '';
+                    this.dialogShow = true;
+                    this.tempData = [];
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = -1;
+                    this.cmdDisabled = [false, true, true];
+                }
+                this.stpDisabled = true;
+                this.setMessage('请点击“下达”按钮，下达命令！');
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+                mouseCancelState(this.selected);
+            },
+            command() {
+                if (this.operation == OperationEvent.Section.fault.menu.operation ||
+                    this.operation == OperationEvent.Section.unlock.menu.operation ||
+                    this.operation == OperationEvent.Section.cancelSpeed.menu.operation ||
+                    this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    /** 第一步不带弹框处理*/
+                    this.commandNoPopUp();
+                } else {
+                    /** 第一步带弹框处理*/
+                    this.commandHasPopUp();
+                }
+            },
+            commandHasPopUp() {
+            },
+            commandNoPopUp() {
+                let operate = {
+                    type: MapDeviceType.Section.type
+                }
+
+                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                    /** 区段解封*/
+                    operate.operation = OperationEvent.Section.unlock.order.operation
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    /** 区段故障解锁*/
+                    operate.operation = OperationEvent.Section.fault.order.operation
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    /** 区段计轴预复位*/
+                    operate.operation = OperationEvent.Section.axlePreReset.order.operation
+                }
+
+                this.setMessage('请点击“确认1”按钮，确认命令！');
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.setButtonEnable({ step: 1 });
+                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行失败' });
+                    }
+                }).catch(() => {
+                    this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行异常' });
+                })
+            },
+            confirm1() {
+                let operate = {
+                    type: MapDeviceType.Section.type,
+                }
+
+                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                    /** 区段解封*/
+                    operate.operation = OperationEvent.Section.unlock.confirm1.operation;
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    /** 区段故障解锁*/
+                    operate.operation = OperationEvent.Section.fault.confirm1.operation;
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    /** 区段计轴预复位*/
+                    operate.operation = OperationEvent.Section.axlePreReset.confirm1.operation;
+                }
+
+                this.setMessage('请点击“确认2”按钮，确认命令！');
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.timeCountCommand = -1;
+                        this.timeCountConfirm = 10;
+                        this.setButtonEnable({ step: 2 });
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行失败' });
+                    }
+                }).catch(() => {
+                    this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行异常' });
+                })
+            },
+            confirm2() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Section.type
+                }
+
+                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                    /** 区段解封*/
+                    operate.operation = OperationEvent.Section.unlock.confirm2.operation;
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    /** 区段故障解锁*/
+                    operate.operation = OperationEvent.Section.fault.confirm2.operation;
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    /** 区段计轴预复位*/
+                    operate.operation = OperationEvent.Section.axlePreReset.confirm2.operation;
+                }
+                this.setMessage('');
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = -1;
+                    this.setButtonEnable({ step: -1 });
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行失败' });
+                    }
+                }).catch(() => {
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = -1;
+                    this.setButtonEnable({ step: -1 });
+                    this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行异常' });
+                })
+            },
+            stop() {
+                let operate = {
+                    type: MapDeviceType.Section.type,
+                }
+
+                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                    /** 区段解封*/
+                    operate.operation = OperationEvent.Section.unlock.stop.operation;
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    /** 区段故障解锁*/
+                    operate.operation = OperationEvent.Section.fault.stop.operation;
+                } else if (this.operation == OperationEvent.Section.axlePreReset.menu.operation) {
+                    /** 区段计轴预复位*/
+                    operate.operation = OperationEvent.Section.axlePreReset.stop.operation;
+                }
+
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.setButtonEnable({ step: 0 });
+                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行失败' });
+                    }
+                }).catch(error => {
+                    this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行异常' });
+                })
+            },
+            close() {
+                let operate = {
+                    type: MapDeviceType.Section.type,
+                    operation: OperationEvent.Command.close.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            },
+            getOperate(operate) {
+                /** 弹框返回值处理*/
+            },
+            setButtonEnable(param) {
+                this.cmdDisabled = [true, true, true];
+                if (param && param.step >= 0) {
+                    this.cmdDisabled[param.step] = false;
+                }
+            },
+            setMessage(message) {
+                this.message = message;
+            },
+            writeRecord(param) {
+                this.tempData.push(param);
+            },
+            editRecord(param) {
+                this.tempData.forEach(elem => {
+                    if (elem.order == param.order) {
+                        for (var prop in param) {
+                            elem[prop] = param[prop];
+                        }
+                    }
+                })
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionControl.vue
new file mode 100644
index 000000000..13ac35839
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionControl.vue
@@ -0,0 +1,215 @@
+<template>
+    <el-dialog class="chengdou-03__systerm section-control" :title="title" :visible.sync="show" width="440px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <el-row>
+            <el-col :span="3"><span>车站</span></el-col>
+            <el-col :span="6">
+                <el-input v-model="stationName" size="small" disabled></el-input>
+            </el-col>
+            <el-col :span="3" :offset="2"><span>区段</span></el-col>
+            <el-col :span="6">
+                <el-input v-model="sectionName" size="small" disabled></el-input>
+            </el-col>
+        </el-row>
+        <el-row justify="center" class="button-group">
+            <el-col :span="11" :offset="13">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+        <notice-info ref="noticeInfo"></notice-info>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+    import { mouseCancelState } from '../utils/menuItemStatus';
+    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+
+    export default {
+        name: 'SectionControl',
+        components: {
+            NoticeInfo
+        },
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                selected: null,
+                operation: '',
+                stationName: '',
+                sectionName: '',
+            }
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? getDomIdByOperation(this.operation) : '';
+            },
+            title() {
+                if (this.operation == OperationEvent.Section.lock.menu.operation) {
+                    return '区段封锁';
+                } else if (this.operation == OperationEvent.Section.split.menu.operation) {
+                    return '区段控制';
+                } else if (this.operation == OperationEvent.Section.active.menu.operation) {
+                    return '区段控制';
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    return '区故解'
+                }
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate, selected) {
+                this.selected = selected;
+                if (!this.dialogShow) {
+                    this.sectionName = '';
+                    this.stationName = '';
+                    if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                        if (selected.type === '02') {
+                            let section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                            if (section) {
+                                this.sectionName += section.name
+                            }
+                        }
+                        this.sectionName += selected.name
+
+                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                        if (station) {
+                            this.stationName = station.name;
+                        }
+                    }
+                    this.operation = operate.operation || '';
+                }
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+                mouseCancelState(this.selected);
+            },
+            commit() {
+                if (this.operation == OperationEvent.Section.lock.menu.operation) {
+                    /** 区段封锁*/
+                    this.lock();
+                } else if (this.operation == OperationEvent.Section.split.menu.operation) {
+                    /** 轨道区段切除*/
+                    this.split();
+                } else if (this.operation == OperationEvent.Section.active.menu.operation) {
+                    /** 轨道区段激活*/
+                    this.active();
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    /** 区故解*/
+                    this.fault();
+                }
+            },
+            //道岔单锁
+            lock() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Section.type,
+                    operation: OperationEvent.Section.lock.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //轨道区段切除
+            split() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Section.type,
+                    operation: OperationEvent.Section.split.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //轨道区段激活
+            active() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Section.type,
+                    operation: OperationEvent.Section.active.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //区故解
+            fault() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Section.type,
+                    operation: OperationEvent.Section.fault.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            cancel() {
+                let operate = {
+                    type: MapDeviceType.Section.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionDetail.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionDetail.vue
new file mode 100644
index 000000000..21c0c7e13
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionDetail.vue
@@ -0,0 +1,115 @@
+<template>
+    <div>
+        <el-dialog class="chengdou-03__systerm section-detail" :title="title" :visible.sync="show" width="320px"
+            :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+            <el-form ref="form" label-position="left" :model="formModel" label-width="100px">
+                <el-form-item label="区段名称">
+                    <el-input v-model="formModel.sectionName" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="车站名称">
+                    <el-input v-model="formModel.stationName" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="公里标(Km)">
+                    <el-input v-model="formModel.kmPost" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="长度(Km)">
+                    <el-input v-model="formModel.factLength" disabled></el-input>
+                </el-form-item>
+            </el-form>
+            <el-row justify="center" style="margin-top: 50px">
+                <el-col :span="7" :offset="17">
+                    <el-button :id="domIdConfirm" @click="commit">确定</el-button>
+                </el-col>
+            </el-row>
+            <notice-info ref="noticeInfo"></notice-info>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { mouseCancelState } from '../utils/menuItemStatus';
+    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+
+    export default {
+        name: 'RouteDetail',
+        components: {
+            NoticeInfo
+        },
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                selected: null,
+                formModel: {
+                    sectionName: '',
+                    stationName: '',
+                    kmPost: '',
+                    factLength: '',
+                },
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'signalList'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Section.detail.menu.domId : '';
+            },
+            title() {
+                return '无岔区段属性对话框'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate, selected) {
+                this.selected = selected;
+                //如果不是因为断点激活则需要，初始化菜单初始值
+                if (!this.dialogShow) {
+                    if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
+                        this.formModel.sectionName = selected.name;
+                        this.formModel.factLength = '';
+                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                        if (station) {
+                            this.formModel.stationName = station.name;
+                            this.formModel.kmPost = station.kmPost;
+                        }
+                    }
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+                mouseCancelState(this.selected);
+            },
+            commit() {
+                let operate = {
+                    type: MapDeviceType.Section.type,
+                    operation: OperationEvent.Section.detail.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/speedCmdControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/speedCmdControl.vue
new file mode 100644
index 000000000..46caafc6b
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/speedCmdControl.vue
@@ -0,0 +1,902 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="chengdou-03__systerm section-cmd-speed"
+      :title="title"
+      :visible.sync="show"
+      width="800px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <div style="padding: 10px 20px 2px; margin-bottom: 25px; border: 1px solid lightgray;">
+        <span class="base-label">会话管理</span>
+        <el-form label-position="center" size="mini" style="margin-top: -15px;">
+          <el-row>
+            <el-col :span="3">
+              <el-button type="primary" style="width: 110px; line-height: 26px;" @click="commit">查询会话状态
+              </el-button>
+            </el-col>
+            <el-col :span="11" :offset="1">
+              <el-input v-model="dialogueStatus" size="mini" disabled />
+            </el-col>
+            <el-col :span="3" :offset="1">
+              <el-button
+                :id="openConversationId"
+                type="primary"
+                style="width: 110px; line-height: 26px;"
+                :disabled="!isOpenMessage"
+                @click="openMessage('open')"
+              >打开会话
+              </el-button>
+            </el-col>
+            <el-col :span="3" :offset="1">
+              <el-button
+                :id="closeConversationId"
+                type="primary"
+                style="width: 110px; line-height: 26px;"
+                :disabled="isOpenMessage"
+                @click="openMessage('close')"
+              >关闭会话
+              </el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div style="margin-bottom: 15px;">
+        <el-row>
+          <el-col :span="15">
+            <div style="padding: 12px 8px 8px; height: 170px; border: 1px solid lightgray;">
+              <div style="float: left; width: 20%; padding: 25px 8px 0;">
+                <div style="margin-bottom: 5px;">限速数值</div>
+                <el-select
+                  :id="firstLimitSpeedId"
+                  v-model="firstScetion.speed"
+                  size="mini"
+                  :disabled="spdDisabled"
+                  placeholder=""
+                  @change="changeSelect(firstScetion.speed, '1')"
+                >
+                  <el-option
+                    v-for="item in speedList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </div>
+              <div
+                style="float: left; width: 29%; margin-left: 1%; border: 1px solid lightgray; padding:8px;"
+              >
+                <span class="base-label" style="left: 0px;">起点</span>
+                <div style="margin-bottom: 5px;">区间选择</div>
+                <el-select
+                  :id="firstStartSectionId"
+                  v-model="firstScetion.startSection"
+                  size="mini"
+                  :disabled="spdDisabled"
+                  placeholder=""
+                  @change="changeSelect(firstScetion.startSection, '2')"
+                >
+                  <el-option
+                    v-for="item in regionList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <div style="margin-bottom: 5px;margin-top: 5px;">公里标数值(m)</div>
+                <el-input
+                  :id="firstStartvalueId"
+                  v-model="firstScetion.startValue"
+                  :min="0"
+                  size="mini"
+                  :disabled="spdDisabled"
+                  @blur="changeSelect(firstScetion.startValue, '3')"
+                />
+              </div>
+              <div
+                style="float: left; width: 29%; margin-left: 1%; border: 1px solid lightgray; padding:8px;"
+              >
+                <span class="base-label" style="left: 0px;">终点</span>
+                <div style="margin-bottom: 5px;">区间选择</div>
+                <el-select
+                  :id="firstEndSectionId"
+                  v-model="firstScetion.endSection"
+                  size="mini"
+                  :disabled="spdDisabled"
+                  placeholder=""
+                  @change="changeSelect(firstScetion.endSection, '4')"
+                >
+                  <el-option
+                    v-for="item in regionList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <div style="margin-bottom: 5px; margin-top: 5px;">公里标数值(m)</div>
+                <el-input
+                  :id="firstEndvalueId"
+                  v-model="firstScetion.endValue"
+                  :min="0"
+                  size="mini"
+                  :disabled="spdDisabled"
+                  @blur="changeSelect(firstScetion.endValue, '5')"
+                />
+              </div>
+              <div style="float: left; width: 20%; padding:8px;">
+                <el-button
+                  :id="firstCheckId"
+                  type="primary"
+                  style="width: 90px; margin: 18px 0 20px; line-height: 26px;"
+                  :disabled="spdDisabled"
+                  @click="CheckEquipment"
+                >查看设备
+                </el-button>
+                <el-button
+                  :id="firstComfirmId"
+                  type="primary"
+                  style="width: 90px; margin: 0; line-height: 26px;"
+                  :disabled="firstDisabled"
+                  @click="Confirmed"
+                >首次确认
+                </el-button>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="9">
+            <div style="padding: 8px; height: 170px; border: 1px solid lightgray; margin-left: 10px;">
+              <span class="base-label" style="left: 4px; background: #f0f0f0;">设备列表：</span>
+              <div style="height: 100%; margin-top: -14px; border: 2px inset #E9E9E9; overflow-y: auto">
+                <div v-for="(item, index) in equipmentText" :key="index">
+                  {{ item.name }}: {{ item.text }}
+                </div>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="margin-bottom: 15px;">
+        <el-row>
+          <el-col :span="15">
+            <div style="padding: 12px 8px 8px; height: 170px; border: 1px solid lightgray;">
+              <div style="float: left; width: 20%; padding: 25px 8px 0;">
+                <div style="margin-bottom: 5px;">限速数值</div>
+                <el-select
+                  :id="secondLimitSpeedId"
+                  v-model="secondScetion.speed"
+                  size="mini"
+                  :disabled="stpDisabled"
+                  placeholder=""
+                  @change="changeSelect(secondScetion.speed, '6')"
+                >
+                  <el-option
+                    v-for="item in speedList"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </div>
+              <div
+                style="float: left; width: 29%; margin-left: 1%; border: 1px solid lightgray; padding:8px;"
+              >
+                <span class="base-label" style="left: 0px;">起点</span>
+                <div style="margin-bottom: 5px;">区间选择</div>
+                <el-select
+                  :id="secondStartSectionId"
+                  v-model="secondScetion.startSection"
+                  size="mini"
+                  :disabled="stpDisabled"
+                  placeholder=""
+                  @change="changeSelect(secondScetion.startSection, '7')"
+                >
+                  <el-option
+                    v-for="item in regionList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <div style="margin-bottom: 5px;margin-top: 5px;">公里标数值(m)</div>
+                <el-select
+                  :id="secondStartvalueId"
+                  v-model="secondScetion.startValue"
+                  size="mini"
+                  :disabled="stpDisabled"
+                  placeholder=""
+                  @change="changeSelect(secondScetion.startValue, '8')"
+                >
+                  <el-option
+                    v-for="item in startSectionList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </div>
+              <div
+                style="float: left; width: 29%; margin-left: 1%; border: 1px solid lightgray; padding:8px;"
+              >
+                <span class="base-label" style="left: 0px;">终点</span>
+                <div style="margin-bottom: 5px;">区间选择</div>
+                <el-select
+                  :id="secondEndSectionId"
+                  v-model="secondScetion.endSection"
+                  size="mini"
+                  :disabled="stpDisabled"
+                  placeholder=""
+                  @change="changeSelect(secondScetion.endSection, '9')"
+                >
+                  <el-option
+                    v-for="item in regionList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <div style="margin-bottom: 5px; margin-top: 5px;">公里标数值(m)</div>
+                <el-select
+                  :id="secondEndvalueId"
+                  v-model="secondScetion.endValue"
+                  size="mini"
+                  :disabled="stpDisabled"
+                  placeholder=""
+                  @change="changeSelect(secondScetion.endValue, '10')"
+                >
+                  <el-option
+                    v-for="item in endSectionList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </div>
+              <div style="float: left; width: 20%; padding:8px;">
+                <el-button
+                  :id="secondCheckId"
+                  type="primary"
+                  style="width: 90px; margin: 18px 0 20px; line-height: 26px;"
+                  @click="CheckSecondEquipment"
+                >查看设备
+                </el-button>
+                <el-button
+                  :id="secondComfirmId"
+                  type="primary"
+                  style="width: 90px; margin: 0; line-height: 26px;"
+                  :disabled="secondDisabled"
+                  @click="confirm"
+                >确认发送
+                </el-button>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="9">
+            <div style="padding: 8px; height: 170px; border: 1px solid lightgray; margin-left: 10px;">
+              <span class="base-label" style="left: 4px; background: #f0f0f0;">设备列表：</span>
+              <div style="height: 100%; margin-top: -14px; border: 2px inset #E9E9E9; overflow-y: auto">
+                <div v-for="(item, index) in equipmentText1" :key="index">
+                  {{ item.name }}: {{ item.text }}
+                </div>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <el-row>
+        <el-col :span="5">
+          <div style="float: left; height: 30px; line-height: 30px; margin-right:10px;">操作倒计时</div>
+          <div style="border: 2px inset #E9E9E9; height: 30px; width: 45px;float: left;">
+            {{ timeCountConfirm == -1 ? '' : timeCountConfirm }}</div>
+        </el-col>
+        <el-col :span="19">
+          <div style="float: left; height: 30px; line-height: 30px; margin-right:10px;">状态</div>
+          <div style="border: 2px inset #E9E9E9; height: 30px; width: calc(100% - 38px);float: left;">
+            {{ messageStatus }}</div>
+        </el-col>
+      </el-row>
+      <el-row class="button-group">
+        <el-button :id="domIdClose" style="margin: 0px auto; display: block;" @click="close">关闭</el-button>
+      </el-row>
+    </el-dialog>
+    <confirm-tip ref="ConfirmTip" @close="closeMessage" />
+  </div>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/ConstDic';
+// import { mouseCancelState } from '../utils/menuItemStatus';
+// import { now } from '@/utils/date';
+import ConfirmTip from './childDialog/confirmTip';
+import { sendCommand } from '@/api/jmap/training';
+import router from '@/router';
+
+export default {
+	name: 'SectionCmdSpeed',
+	components: {
+		ConfirmTip
+	},
+	data() {
+		return {
+			dialogShow: false,
+			selected: '',
+			order: 0,
+			code: '',
+			row: null,
+			timer: null,
+			type: '',
+			operation: '',
+			spdDisabled: true,
+			firstDisabled: true,
+			secondDisabled: true,
+			stpDisabled: true,
+			timeCountCommand: -1,
+			timeCountConfirm: -1,
+			equipmentText: [],
+			equipmentText1: [],
+			maxSpeed: 85,
+			speedSpace: 5,
+			stationName: '111',
+			name: '',
+			speed: '',
+			regionList: [],
+			startSectionList: [],
+			endSectionList: [],
+			sectionList: [
+				{
+					value: 'up',
+					name: '上行'
+				},
+				{
+					value: 'down',
+					name: '下行'
+				}
+			],
+			messageStatus: '请先打开会话！',
+			dialogueStatus: '会话已关闭',
+			isOpenMessage: true,
+			codeText: '',
+			firstScetion: {
+				speed: '',
+				startSection: '',
+				endSection: '',
+				startValue: '',
+				endValue: ''
+			},
+			firstShow: false,
+			copyScetion: {
+				speed: '',
+				startSection: '',
+				endSection: '',
+				startValue: '',
+				endValue: ''
+			},
+			secondScetion: {
+				speed: '',
+				startSection: '',
+				endSection: '',
+				startValue: '',
+				endValue: ''
+			}
+		};
+	},
+	computed: {
+		speedList() {
+			const list = [{ value: -1, name: '无限速' }];
+			for (var i = 5; i * this.speedSpace <= this.maxSpeed; i++) {
+				list.push({ value: String(i * this.speedSpace), name: String(i * this.speedSpace) });
+			}
+			return list;
+		},
+		title() {
+			if (this.dialogShow) {
+				return '公里标输入临时限速';
+			}
+			return '';
+		},
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		openConversationId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.openConversation.domId : '';
+		},
+		closeConversationId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.closeConversation.domId : '';
+		},
+		firstLimitSpeedId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.firstLimitSpeed.domId : '';
+		},
+		firstStartSectionId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.firstStartSection.domId : '';
+		},
+		firstStartvalueId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.firstStartvalue.domId : '';
+		},
+		firstEndSectionId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.firstEndSection.domId : '';
+		},
+		firstEndvalueId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.firstEndvalue.domId : '';
+		},
+		firstCheckId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.firstCheck.domId : '';
+		},
+		firstComfirmId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.firstComfirm.domId : '';
+		},
+		secondLimitSpeedId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.secondLimitSpeed.domId : '';
+		},
+		secondStartSectionId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.secondStartSection.domId : '';
+		},
+		secondStartvalueId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.secondStartvalue.domId : '';
+		},
+		secondEndSectionId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.secondEndSection.domId : '';
+		},
+		secondEndvalueId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.secondEndvalue.domId : '';
+		},
+		secondCheckId() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.secondCheck.domId : '';
+		},
+		secondComfirmId() {
+			return this.dialogShow ? OperationEvent.Section.confirmLimit.menu.domId : '';
+		},
+		domIdClose() {
+			return this.dialogShow ? OperationEvent.Section.setLimitSpeed.domIdClose.domId : '';
+		}
+	},
+	watch: {
+		'timeCountCommand': function (val) {
+			if (val <= 0) {
+				this.dialogueStatus = `会话已关闭`;
+				// this.openMessage('close');
+				this.isOpenMessage = true;
+				this.spdDisabled = true;
+				this.firstDisabled = true;
+				this.secondDisabled = true;
+				this.messageStatus = '请先打开会话！';
+				this.timeCountCommand = -1;
+				if (this.speed) {
+					this.messageStatus = '会话关闭成功';
+				}
+				this.equipmentText = [];
+				this.equipmentText1 = [];
+				this.firstScetion = {
+					speed: '',
+					startSection: '',
+					endSection: '',
+					startValue: '',
+					endValue: ''
+				};
+				this.secondScetion = {
+					speed: '',
+					startSection: '',
+					endSection: '',
+					startValue: '',
+					endValue: ''
+				};
+			} else {
+				this.dialogueStatus = `会话打开，剩余时间${val}秒`;
+			}
+		},
+		firstScetion: {
+			handler: function (val) {
+				if (val.speed && val.startSection && val.endSection && val.startValue != '' && val.endValue != '') {
+					this.firstShow = true;
+				} else {
+					this.firstShow = false;
+				}
+			},
+			deep: true
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+		this.regionList = this.$ConstSelect.RegionTypeList;
+		this.timer = setInterval(() => {
+			if (this.timeCountCommand > 0) {
+				this.timeCountCommand--;
+			} else if (this.timeCountCommand == 0) { // 关闭会话
+				this.isOpenMessage = true;
+				this.timeCountCommand = -1;
+			}
+			if (this.timeCountConfirm > 0) {
+				this.timeCountConfirm--;
+			} else if (this.timeCountConfirm == 0) { // 关闭会话
+				this.timeCountConfirm = -1;
+			}
+		}, 1000);
+	},
+	beforeDestroy() {
+		clearInterval(this.timer);
+		this.timer = null;
+	},
+	methods: {
+		doShow(operate, selected, tempData) {
+			this.selected = selected;
+			if (!this.dialogShow) {
+				this.name = '';
+				if (selected) {
+					this.timeCountCommand = -1; // 倒计时
+					this.order = 0;
+					this.type = operate.type;
+					this.operation = operate.operation;
+					this.code = operate.code;
+				}
+			}
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.secondScetion = {
+				speed: '',
+				startSection: '',
+				endSection: '',
+				startValue: '',
+				endValue: ''
+			};
+			this.firstScetion = {
+				speed: '',
+				startSection: '',
+				endSection: '',
+				startValue: '',
+				endValue: ''
+			};
+			this.speed = 0;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			// mouseCancelState(this.selected);
+		},
+		openMessage(state) {
+			if (state == 'open') { // 打开会话
+				const operate = {
+					type: this.type,
+					operation: OperationEvent.Section.setLimitSpeed.openConversation.operation
+				};
+				this.$store.dispatch('training/next', operate).then(({ valid }) => {
+					if (valid) {
+						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+						this.isOpenMessage = false;
+						this.spdDisabled = false;
+						this.messageStatus = '会话打开成功';
+						this.speed = 1;
+						this.timeCountCommand = 120;
+					}
+				}).catch(error => {
+					console.log(error);
+				});
+			} else { // 关闭会话
+				const operate = {
+					type: this.type,
+					operation: OperationEvent.Section.setLimitSpeed.closeConversation.operation
+				};
+				this.$store.dispatch('training/next', operate).then(({ valid }) => {
+					if (valid) {
+						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+						this.isOpenMessage = true;
+						this.spdDisabled = true;
+						this.firstDisabled = true;
+						this.secondDisabled = true;
+						this.messageStatus = '请先打开会话！';
+						this.timeCountCommand = -1;
+						this.startSectionList = [];
+						this.endSectionList = [];
+						if (this.speed) {
+							this.messageStatus = '会话关闭成功';
+						}
+					}
+				}).catch(error => {
+					console.log(error);
+				});
+			}
+		},
+		CheckEquipment() { // 第一次确认设备
+			if (this.firstShow) {
+				const value = `${this.firstScetion.speed}::${this.firstScetion.startSection}::${this.firstScetion.startValue}::${this.firstScetion.endSection}::${this.firstScetion.endValue}`;
+				const operate = {
+					send: true,
+					val: value,
+					type: this.type,
+					operation: OperationEvent.Section.setLimitSpeed.firstCheck.operation
+				};
+
+				this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+					if (valid) {
+						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+						this.firstDisabled = false; // 运行首次发送
+						this.getEquipmentList(response.data);
+						this.copyScetion = {
+							speed: this.firstScetion.speed,
+							startSection: this.firstScetion.startSection,
+							endSection: this.firstScetion.endSection,
+							startValue: this.firstScetion.startValue,
+							endValue: this.firstScetion.endValue
+						};
+						this.startSectionList = [];
+						this.endSectionList = [];
+						for (let index = 0; index < 4; index++) {
+							const starData = {
+								value: Number(this.firstScetion.startValue) + index,
+								label: Number(this.firstScetion.startValue) + index
+							};
+							this.startSectionList.push(starData);
+							const endData = {
+								value: Number(this.firstScetion.endValue) + index,
+								label: Number(this.firstScetion.endValue) + index
+							};
+							this.endSectionList.push(endData);
+						}
+					}
+				}).catch(error => {
+					console.log(error);
+				});
+			}
+		},
+		getEquipmentList(list) {
+			this.equipmentText = [];
+			const stationStand = [];
+			const stationText = [];
+			this.codeText = '';
+			const arr = [];
+			list.forEach(ele => {
+				if (stationStand.indexOf(ele.stationCode) == -1) {
+					stationStand.push(ele.stationCode);
+					const text = this.getTextName(ele);
+					stationText.push(text);
+				} else {
+					const index = stationStand.indexOf(ele.stationCode);
+					const text = this.getTextName(ele);
+					stationText[index] += text;
+				}
+				arr.push(ele.code);
+			});
+			this.codeText = arr.join('::');
+			stationStand.forEach((item, index) => {
+				const stationStandName = this.$store.getters['map/getDeviceByCode'](item);
+				const data = {
+					text: stationText[index],
+					name: stationStandName.name
+				};
+				this.equipmentText.push(data);
+			});
+		},
+		getTextName(ele) {
+			if (ele.switchSectionType) {
+				switch (ele.switchSectionType) {
+				case '01':
+					return `${ele.name}(主), `;
+					break;
+				case '02':
+					return `${ele.name}(定), `;
+					break;
+				case '03':
+					return `${ele.name}(反), `;
+					break;
+				}
+			} else if (ele.parentName) {
+				return `${ele.parentName}-${ele.name}, `;
+			} else {
+				return `${ele.name}, `;
+			}
+		},
+		CheckSecondEquipment() { // 二次查看设备
+			if (this.secondScetion.speed == this.copyScetion.speed && this.secondScetion.startSection == this.copyScetion.startSection && this.secondScetion.endSection == this.copyScetion.endSection && this.secondScetion.startValue == this.copyScetion.startValue && this.secondScetion.endValue == this.copyScetion.endValue) {
+				const operate = {
+					type: this.type,
+					operation: OperationEvent.Section.setLimitSpeed.secondCheck.operation
+				};
+				this.$store.dispatch('training/next', operate).then(({ valid }) => {
+					if (valid) {
+						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+						this.equipmentText1 = this.equipmentText;
+						this.secondDisabled = false; // 第二次确认发送
+					}
+				}).catch(error => {
+					console.log(error);
+				});
+			} else {
+				this.firstScetion = {
+					speed: this.copyScetion.speed,
+					startSection: this.copyScetion.startSection,
+					endSection: this.copyScetion.endSection,
+					startValue: this.copyScetion.startValue,
+					endValue: this.copyScetion.endValue
+				};
+				this.firstDisabled = true;
+				this.secondScetion = {
+					speed: '',
+					startSection: '',
+					endSection: '',
+					startValue: '',
+					endValue: ''
+				};
+				this.spdDisabled = false;
+				this.equipmentText = [];
+				this.stpDisabled = true;
+				this.timeCountConfirm = -1;
+				const operate = {
+					message: `两次值不一致`
+				};
+				this.$refs.ConfirmTip.doShow(operate);
+			}
+		},
+		changeSelect(value, val) {
+			const operate = {
+				type: this.type,
+				operation: '',
+				val: value
+			};
+
+			switch (val) {
+			case '1': {
+				operate.operation = OperationEvent.Section.setLimitSpeed.firstLimitSpeed.operation;
+			} break;
+			case '2': {
+				operate.operation = OperationEvent.Section.setLimitSpeed.firstStartSection.operation;
+			} break;
+			case '3': {
+				operate.operation = OperationEvent.Section.setLimitSpeed.firstStartvalue.operation;
+			} break;
+			case '4': {
+				operate.operation = OperationEvent.Section.setLimitSpeed.firstEndSection.operation;
+			} break;
+			case '5': {
+				operate.operation = OperationEvent.Section.setLimitSpeed.firstEndvalue.operation;
+			} break;
+			case '6': {
+				operate.operation = OperationEvent.Section.setLimitSpeed.secondLimitSpeed.operation;
+			} break;
+			case '7': {
+				operate.operation = OperationEvent.Section.setLimitSpeed.secondStartSection.operation;
+			} break;
+			case '8': {
+				operate.operation = OperationEvent.Section.setLimitSpeed.secondStartvalue.operation;
+			} break;
+			case '9': {
+				operate.operation = OperationEvent.Section.setLimitSpeed.secondEndSection.operation;
+			} break;
+			case '10': {
+				operate.operation = OperationEvent.Section.setLimitSpeed.secondEndvalue.operation;
+			} break;
+			}
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			}).catch(error => {
+				console.log(error);
+			});
+		},
+
+		Confirmed() { // 第一次确认
+			const operate = {
+				type: this.type,
+				operation: OperationEvent.Section.setLimitSpeed.firstComfirm.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.spdDisabled = true;
+					this.stpDisabled = false;
+					this.firstDisabled = true;
+					this.messageStatus = '收到Confirm request消息';
+					this.timeCountConfirm = 60; // 倒计时
+					this.firstScetion = {
+						speed: '',
+						startSection: '',
+						endSection: '',
+						startValue: '***',
+						endValue: '***'
+					};
+				}
+			}).catch(error => {
+				console.log(error);
+			});
+		},
+
+		confirm() { // 第二次确认
+			// let value = `${this.secondScetion.speed}::${this.codeText}`;
+			const value = `${this.secondScetion.speed}::${this.secondScetion.startSection}::${this.secondScetion.startValue}::${this.secondScetion.endSection}::${this.secondScetion.endValue}`;
+			const operate = {
+				send: true,
+				val: value,
+				type: this.type,
+				code: this.code,
+				operation: OperationEvent.Section.confirmLimit.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					const group = router.currentRoute.query.group;
+					const command = this.handleMenuConfirmLimit(operate);
+					sendCommand(group, command).then((response) => {
+						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+						this.timeCountConfirm = -1;
+						this.stpDisabled = true;
+						this.messageStatus = '临时限速设置成功';
+					}).catch(error => {
+						const operate = {
+							message: error.message
+						};
+						this.$refs.ConfirmTip.doShow(operate);
+						console.log(error);
+					});
+				}
+			}).catch(error => {
+				const operate = {
+					message: error.message
+				};
+				this.$refs.ConfirmTip.doShow(operate);
+				console.log(error);
+			});
+		},
+
+		close() { // 设置成功 关闭弹窗
+			const operate = {
+				type: this.type,
+				operation: OperationEvent.Section.setLimitSpeed.domIdClose.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					if (this.isOpenMessage) {
+						this.doClose();
+					} else {
+						const operate = {
+							message: `是否关闭会话，并关闭窗口`,
+							confirmId: OperationEvent.Section.setLimitSpeed.close.domId
+						};
+						this.$refs.ConfirmTip.doShow(operate);
+					}
+				}
+			}).catch(() => {
+				this.doClose();
+			});
+		},
+		commit() {
+
+		},
+		closeMessage() {
+			const operate = {
+				type: this.type,
+				operation: OperationEvent.Section.setLimitSpeed.close.operation
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				this.$refs.ConfirmTip.doClose();
+				this.isOpenMessage = true;
+				this.spdDisabled = true;
+				this.firstDisabled = true;
+				this.secondDisabled = true;
+				this.timeCountCommand = -1;
+				this.startSectionList = [];
+				this.endSectionList = [];
+				this.doClose();
+			}).catch(error => {
+				console.log(error);
+			});
+		},
+		//  处理右键菜单 确认临时限速
+		handleMenuConfirmLimit(operate) {
+			return {
+				type: operate.type,
+				code: operate.code,
+				over: true,
+				operation: OperationEvent.Section.confirmLimit.event,
+				val: operate.val
+			};
+		}
+	}
+};
+</script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue
new file mode 100644
index 000000000..7e019bfd0
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standControl.vue
@@ -0,0 +1,621 @@
+<template>
+    <el-dialog class="chengdou-03__systerm stand-detain-train" :title="title" :visible.sync="show" width="400px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <el-row class="header">
+            <el-col :span="11">
+                <span>车站</span>
+                <el-input style="width: 110px; margin-left: 10px;" v-model="stationName" size="small" disabled>
+                </el-input>
+            </el-col>
+            <el-col :span="11" :offset="1">
+                <span>站台</span>
+                <el-input style="width: 110px; margin-left: 10px;" v-model="standName" size="small" disabled></el-input>
+            </el-col>
+        </el-row>
+        <div v-if="DetainTrain">
+            <div
+                style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray; height: 90px;">
+                <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">范围</span>
+                <el-row style="margin-top: -13px;">
+                    <el-radio-group v-model="radio" @change="choose" :id="domIdDetainCar">
+                        <el-col :span="24">
+                            <el-radio label="01"
+                                style="display: block; text-align: left; float: left; margin-right: 10px;">本站台
+                            </el-radio>
+                            <el-radio label="02" v-if="radio1 == 2"
+                                style="display: block; text-align: left; float: left; margin-right: 10px;">上行全线
+                            </el-radio>
+                            <el-radio label="03" v-if="radio1 == 2"
+                                style="display: block; text-align: left; float: left;">下行全线</el-radio>
+                        </el-col>
+                    </el-radio-group>
+                </el-row>
+            </div>
+            <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
+                <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">功能</span>
+                <el-row style="margin-top: -13px;">
+                    <el-col :span="11">
+                        <el-radio v-model="radio1" label="1" :disabled="radio1 == '2'"
+                            style="display: block; text-align: left;">
+                            扣车</el-radio>
+                    </el-col>
+                    <el-col :span="11" :offset="2">
+                        <el-radio v-model="radio1" label="2" :disabled="radio1 == '1'"
+                            style="display: block; text-align: left;">
+                            取消扣车</el-radio>
+                    </el-col>
+                </el-row>
+            </div>
+        </div>
+        <div v-if="JumpStop">
+            <div
+                style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray; height: 115px;">
+                <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">范围</span>
+                <el-row style="margin-top: -13px;">
+                    <el-col :span="24">
+                        <el-radio-group v-model="radio" @change="chooseJumpStop">
+                            <el-radio label="01" :id="radio == '02' ? domIdChoose : ''"
+                                style="display: block; text-align: left; margin-right: 10px; margin-bottom: 20px; width: 80px;">
+                                站台跳停
+                            </el-radio>
+                            <el-radio label="02" :id="radio == '01' ? domIdChoose : ''"
+                                style="display: block; text-align: left; margin-left: 0; float: left;">
+                                指定列车跳停</el-radio>
+                            <div style="float: left; margin-left: 20px;">
+                                <span>车组号</span>
+                                <el-input v-if="radio1 != 2" style="width: 120px; margin-left: 20px;"
+                                    v-model="tripNumber" size="small" :id="domIdJumpStop" @blur="handleTrainNoBlur"
+                                    :disabled="radio == '01'">
+                                </el-input>
+                                <el-select v-if="radio1 == 2" style="width: 120px; margin-left: 20px;"
+                                    v-model="tripNumber" size="mini" @change="trainNoSelectChange"
+                                    :id="domIdCancelJumpStop" :disabled="radio == '01'">
+                                    <el-option v-for="option in trainList" :key="option.groupNumber"
+                                        :label="option.groupNumber" :value="option.groupNumber">
+                                    </el-option>
+                                </el-select>
+                            </div>
+                        </el-radio-group>
+                    </el-col>
+                </el-row>
+            </div>
+            <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
+                <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">功能</span>
+                <el-row style="margin-top: -13px;">
+                    <el-col :span="11">
+                        <el-radio v-model="radio1" label="1" :disabled="radio1 == 2"
+                            style="display: block; text-align: left;">
+                            跳停</el-radio>
+                    </el-col>
+                    <el-col :span="11" :offset="2">
+                        <el-radio v-model="radio1" label="2" :disabled="radio1 == 1"
+                            style="display: block; text-align: left;">
+                            取消跳停</el-radio>
+                    </el-col>
+                </el-row>
+            </div>
+        </div>
+        <div v-if="RunLevel">
+            <div
+                style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray; height: 115px;">
+                <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">范围</span>
+                <el-row style="margin-top: -13px;">
+                    <el-radio-group v-model="radio" @change="chooseStopTime">
+                        <el-col :span="24">
+                            <el-radio label="01" :id="radio == '02' ? domIdChoose1 : ''"
+                                style="display: block; text-align: left; margin-right: 10px; margin-bottom: 20px; width: 60px;">
+                                自动
+                            </el-radio>
+                            <el-radio label="02" :id="radio == '01' ? domIdChoose1 : ''"
+                                style="display: block; text-align: left; margin-left: 0; float: left;">
+                                人工</el-radio>
+                            <div style="float: left; margin-left: 20px;">
+                                <span v-if="radio2 != 2">站停时间</span>
+                                <span v-if="radio2 == 2">运行等级</span>
+                                <el-input v-if="radio2 != 2" style="width: 120px; margin-left: 20px;"
+                                    v-model="trainStopTime" size="small" :id="domIdStopTime" :disabled="radio == '01'"
+                                    @blur="stopTimeBlur">
+                                </el-input>
+                                <el-select v-if="radio2 == 2" style="width: 120px; margin-left: 20px;"
+                                    v-model="trainRunlevel" size="mini" @change="trainNoSelectLevel" :id="domIdRunLevel"
+                                    :disabled="radio == '01'">
+                                    <el-option v-for="option in trainList" :key="option.groupNumber"
+                                        :label="option.groupNumber" :value="option.groupNumber">
+                                    </el-option>
+                                </el-select>
+                            </div>
+                        </el-col>
+                    </el-radio-group>
+                </el-row>
+            </div>
+            <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
+                <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">功能</span>
+                <el-row style="margin-top: -13px;">
+                    <el-radio-group v-model="effective" @change="chooseEffective">
+                        <el-col :span="11">
+                            <el-radio label="01" style="display: block; text-align: left;"
+                                :id="effective == '02' ? '': domIdChoose2">
+                                一次有效</el-radio>
+                        </el-col>
+                        <el-col :span="11" :offset="2">
+                            <el-radio label="02" style="display: block; text-align: left;"
+                                :id="effective == '01' ? '': domIdChoose2">
+                                一直有效</el-radio>
+                        </el-col>
+                    </el-radio-group>
+                </el-row>
+            </div>
+        </div>
+        <el-row class="button-group">
+            <el-col :span="10" :offset="2">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="4">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+        <notice-info ref="noticeInfo"></notice-info>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+    import { mouseCancelState } from '../utils/menuItemStatus';
+    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+
+    export default {
+        name: 'StandDetainTrain',
+        components: {
+            NoticeInfo
+        },
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                standName: '',
+                stationName: '',
+                selected: null,
+                operation: null,
+                radio: '01',
+                radio1: '1',
+                radio2: '1',
+                DetainTrain: false,
+                JumpStop: false,
+                RunLevel: false,
+                trainList: [],
+                tripNumber: '',
+                effective: '01',
+                trainStopTime: 0,
+                trainRunlevel: '01',
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'map'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? getDomIdByOperation(this.operation) : '';
+            },
+            domIdDetainCar() {
+                return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrain.choose.domId : '';
+            },
+            domIdChoose() {
+                if (this.radio1 == '1') { // 跳停
+                    return this.dialogShow ? OperationEvent.StationStand.setJumpStop.select.domId : '';
+                } else {  // 取消跳停
+                    return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.select.domId : '';
+                }
+            },
+            domIdJumpStop() {
+                return this.dialogShow ? OperationEvent.StationStand.setJumpStop.choose.domId : '';
+            },
+            domIdCancelJumpStop() {
+                return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.choose.domId : '';
+            },
+            domIdChoose1() {
+                if (this.radio2 == '1') { // 设置停站时间
+                    return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose1.domId : '';
+                } else {  // 设置站间运行等级
+                    return this.dialogShow ? OperationEvent.StationStand.setRunLevel.choose1.domId : '';
+                }
+            },
+            domIdChoose2() {
+                if (this.radio2 == '1') { // 设置停站时间
+                    return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose2.domId : '';
+                } else {  // 设置站间运行等级
+                    return this.dialogShow ? OperationEvent.StationStand.setRunLevel.choose2.domId : '';
+                }
+            },
+            domIdStopTime() {
+                return this.dialogShow ? OperationEvent.StationStand.setStopTime.input.domId : '';
+            },
+            domIdRunLevel() {
+                return this.dialogShow ? OperationEvent.StationStand.setRunLevel.chooseTrain.domId : '';
+            },
+            title() {
+                this.JumpStop = false;
+                this.RunLevel = false;
+                this.DetainTrain = false;
+                if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
+                    this.radio1 = '1';
+                    this.radio = '01';
+                    this.DetainTrain = true;
+                    return '扣车';
+                } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
+                    this.radio1 = '2';
+                    this.radio = '01';
+                    this.DetainTrain = true;
+                    return '取消扣车';
+                } else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
+                    this.JumpStop = true;
+                    this.radio1 = '1'
+                    return '设置跳停';
+                } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
+                    this.JumpStop = true;
+                    this.radio1 = '2';
+                    return '取消跳停';
+                } else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {
+                    this.RunLevel = true;
+                    this.radio2 = '1';
+                    return '设置停站时间';
+                } else if (this.operation == OperationEvent.StationStand.setRunLevel.menu.operation) {
+                    this.RunLevel = true;
+                    this.radio2 = '2';
+                    return '设置站间运行等级';
+                }
+            },
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate, selected, tempDate = null) {
+                this.selected = selected;
+                if (!this.dialogShow) {
+                    this.tripNumber = '';
+                    this.standName = '';
+                    this.stationName = '';
+                    if (selected) {
+                        this.standName = selected.direction == '01' ? '下行' : '上行';
+                    }
+                    if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
+                        this.standName = selected.direction == '01' ? '下行' : '上行';
+                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                        if (station) {
+                            this.stationName = station.name;
+                        }
+                    }
+                    if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation || this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
+                        this.radio = selected.direction;
+                    } else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {
+                        this.trainStopTime = Number(tempDate.parkingTime) === -1 ? 15 : Number(tempDate.parkingTime);
+                        this.radio = Number(tempDate.parkingTime) === -1 ? '01' : '02';
+                        this.effective = tempDate.parkingValidStatus ? '01' : '02';
+                    }
+                    this.operation = operate.operation;
+                    this.trainList = this.map.trainList; // 加载列车数据
+                }
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+                mouseCancelState(this.selected);
+            },
+            choose(upDown) {
+                // 取消扣车 请求code码
+                let operate = {
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation,
+                    val: `${upDown}`,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                })
+            },
+            handleTrainNoBlur() {  // 设置跳停 填写车组号
+                let operate = {
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation,
+                    val: `${this.tripNumber}`,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                })
+            },
+            trainNoSelectChange(upDown) {  // 取消跳停 选择车组号
+                let operate = {
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation,
+                    val: `${upDown}`,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                })
+            },
+            chooseJumpStop(upDown) {
+                let operate = {
+                    type: MapDeviceType.StationStand.type,
+                    operation: '',
+                    val: `${upDown}`,
+                }
+                if (this.radio1 == '1') { // 跳停选择
+                    operate.operation = OperationEvent.StationStand.setJumpStop.select.operation;
+                } else { // 取消跳停选择
+                    operate.operation = OperationEvent.StationStand.cancelJumpStop.select.operation;
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                })
+            },
+            chooseEffective(effective) {
+                let operate = {
+                    type: MapDeviceType.StationStand.type,
+                    operation: '',
+                    val: `${effective}`
+                }
+                if (this.radio2 == '1') { // 设置停站时间
+                    operate.operation = OperationEvent.StationStand.setStopTime.choose2.operation;
+                } else {  // 设置站间运行等级
+                    operate.operation = OperationEvent.StationStand.setRunLevel.choose2.operation;
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                })
+            },
+            chooseStopTime(upDown) {
+                let operate = {
+                    type: MapDeviceType.StationStand.type,
+                    operation: '',
+                    val: `${upDown}`,
+                }
+                if (this.radio2 == '1') { // 设置停站时间
+                    operate.operation = OperationEvent.StationStand.setStopTime.choose1.operation;
+                } else { // 设置站间运行等级
+                    operate.operation = OperationEvent.StationStand.setRunLevel.choose1.operation;
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                })
+            },
+            stopTimeBlur() {
+                let operate = {
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.StationStand.setStopTime.input.operation,
+                    val: `${this.trainStopTime}`,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                })
+            },
+            trainNoSelectLevel(upDown) {
+                let operate = {
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.StationStand.setRunLevel.chooseTrain.operation,
+                    val: `${upDown}`,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                })
+            },
+            commit() {
+                if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
+                    this.setDetainTrain();  /** 设置扣车*/
+                } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
+                    this.cancelDetainTrain(); /** 取消扣车*/
+                } else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
+                    this.setJumpStop(); /** 设置跳停*/
+                } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
+                    this.cancelJumpStop(); /** 取消跳停*/
+                } else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {
+                    this.setStopTime(); /** 设置停站时间*/
+                } else if (this.operation == OperationEvent.StationStand.setRunLevel.menu.operation) {
+                    this.setRunLevel(); /** 设置站间运行等级*/
+                }
+            },
+            //设置扣车
+            setDetainTrain() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.StationStand.setDetainTrain.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    this.doClose();
+                    if (!valid) {
+                        this.$refs.noticeInfo.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //取消扣车
+            cancelDetainTrain() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation,
+                    val: '',
+                }
+                if (this.radio == '02') {
+                    operate.operation = OperationEvent.StationStand.cancelDetainTrainAll.menu.operation;
+                    operate.val = '02';
+                } else if (this.radio == '03'){
+                    operate.operation = OperationEvent.StationStand.cancelDetainTrainAll.menu.operation;
+                    operate.val = '01';
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    this.doClose();
+                    if (!valid) {
+                        this.$refs.noticeInfo.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            // 设置跳停
+            setJumpStop() {
+                let val = this.radio;
+                if (this.radio == '02') {
+                    val = this.radio + '::' + this.tripNumber;
+                }
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.StationStand.setJumpStop.menu.operation,
+                    val: val,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            // 取消跳停
+            cancelJumpStop() {
+                let val = this.radio;
+                if (this.radio == '02') {
+                    val = this.radio + '::' + this.tripNumber;
+                }
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.StationStand.cancelJumpStop.menu.operation,
+                    val: val    //站台的上下行方向, 01:下行 /02:上行
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            // 设置停站时间
+            setStopTime() {
+                let forver = this.effective == '02' ? true : false;
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.StationStand.setStopTime.menu.operation,
+                    val: [`${this.radio}`, this.trainStopTime, forver].join('::'),
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                })
+            },
+            // 设置运行速度
+            setRunLevel() {
+                let forver = this.effective == '02' ? true : false;
+                let val = this.radio;
+                if (this.radio == '02') {
+                    val = `${this.radio}::${this.trainRunlevel}::${forver}`;
+                }
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.StationStand.setRunLevel.menu.operation,
+                    val: val,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.loading = false;
+                    this.doClose();
+                })
+            },
+            cancel() {
+                let operate = {
+                    type: MapDeviceType.StationStand.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.loading = false;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            }
+        }
+    }
+</script>
+<style>
+    .stand-detain-train .context {
+        height: 80px !important;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue
new file mode 100644
index 000000000..5aea6cf4c
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue
@@ -0,0 +1,219 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-detail"
+    :title="title"
+    :visible.sync="show"
+    width="380px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row class="header">
+      <el-col :span="10">
+        <span>车站</span>
+      </el-col>
+      <el-col :span="10" :offset="2">
+        <span>站台</span>
+      </el-col>
+    </el-row>
+    <el-row class="header">
+      <el-col :span="10">
+        <el-input v-model="stationName" size="small" disabled />
+      </el-col>
+      <el-col :span="10" :offset="2">
+        <el-input v-model="standName" style="padding: 0 3px;" size="small" disabled />
+      </el-col>
+    </el-row>
+    <el-row class="content">
+      <el-col :span="6">
+        <span>停站时间</span>
+      </el-col>
+      <el-col :span="18">
+        <el-input v-model="modelData.stopTime" size="small" disabled />
+      </el-col>
+    </el-row>
+    <el-row class="content">
+      <el-col :span="6">
+        <span>运行等级</span>
+      </el-col>
+      <el-col :span="18">
+        <el-input v-model="modelData.runLevel" size="small" disabled />
+      </el-col>
+    </el-row>
+    <el-row class="content">
+      <el-col :span="6">
+        <span>扣车</span>
+      </el-col>
+      <el-col :span="18">
+        <el-input v-model="modelData.detainCar" size="small" disabled />
+      </el-col>
+    </el-row>
+    <el-row class="content">
+      <el-col :span="6">
+        <span>跳停</span>
+      </el-col>
+      <el-col :span="18">
+        <el-input v-model="modelData.jumpStop" size="small" disabled />
+      </el-col>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="18">
+        <span style="opacity: 0;">1</span>
+      </el-col>
+      <el-col :span="4">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">退出</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
+
+export default {
+	name: 'StandDetail',
+	components: {
+		NoticeInfo
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			tempData: [],
+			stationName: '',
+			standName: '',
+			strategyMap: {
+				'01': '无折返',
+				'02': '无人折返',
+				'03': '自动换端',
+				'04': '默认'
+			},
+			modelData: {
+				stopTime: '自动',
+				runLevel: '自动',
+				detainCar: '无扣车',
+				jumpStop: '无跳停'
+			}
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'stationList'
+		]),
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+		},
+		title() {
+			return '站台信息';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		loadInitData(selected, opts) {
+			this.tempData = [];
+
+			// const stationList = this.stationList.slice();
+			const index = this.stationList.findIndex(n => n.code == selected.stationCode);
+			// let stationStand;
+			// let station;
+			if (selected.direction == '01') { // 下行
+				// 下行时，此站不是最后一站
+				if (index != 0) {
+					// stationStand = this.$store.getters['map/getDeviceByCode'](this.stationList[index - 1].code);
+					// station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
+				}
+			} else {
+				// 上行时，此站不是最后一站
+				if (index != this.stationList.length - 1) {
+					// stationStand = this.$store.getters['map/getDeviceByCode'](this.stationList[index + 1].code);
+					// station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
+				}
+			}
+
+			this.modelData = {
+				stopTime: opts.parkingTime != -1 ? opts.parkingTime : '自动',
+				runLevel: opts.intervalRunTime > 0 ? '常速': '自动',
+				detainCar: opts.holdStatus == '02' || opts.holdStatus == '04' ? '已设置' : '无扣车',
+				jumpStop: opts.jumpStopStatus != '01' ? '已设置' : '无跳停'
+			};
+		},
+		doShow(operate, selected, opts) {
+			this.selected = selected;
+			if (!this.dialogShow) {
+				this.standName = '';
+				this.stationName = '';
+				if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
+					this.standName = selected.direction == '01' ? '下行' : '上行';
+					const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+					if (station) {
+						this.stationName = station.name;
+					}
+				}
+				this.loadInitData(selected, opts);
+			}
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+			mouseCancelState(this.selected);
+		},
+		commit() {
+			const operate = {
+				type: MapDeviceType.StationStand.type,
+				operation: OperationEvent.Command.close.confirm.operation
+			};
+
+			this.loading = true;
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				this.loading = false;
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.loading = false;
+				this.doClose();
+			});
+		},
+		cancel() {
+			const operate = {
+				type: MapDeviceType.StationStand.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => {
+				this.doClose();
+			});
+		}
+	}
+};
+</script>
+<style>
+    .content {
+        margin-top: 20px;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue
new file mode 100644
index 000000000..4680847c6
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationCmdControl.vue
@@ -0,0 +1,389 @@
+<template>
+    <div>
+        <el-dialog class="chengdou-03__systerm station-cmd-control" :title="title" :visible.sync="show" width="800px"
+            :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+            <div style="padding: 10px 20px; border: 1px solid lightgray;">
+                <span class="base-label">命令信息</span>
+                <el-form label-position="center" size="mini">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="类型" label-width="40px">
+                                <el-select v-model="operation" size="small" disabled>
+                                    <el-option v-for="option in typeList" :key="option.code" :label="option.name"
+                                        :value="option.code">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="车站名称" label-width="100px">
+                                <el-input v-model="stationName" size="small" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+            </div>
+            <el-table class="table" ref="tempData" :data="tempData" border style="width: 100%" size="mini"
+                highlight-current-row height="200">
+                <el-table-column prop="order" :width="50" label="序号">
+                </el-table-column>
+                <el-table-column prop="date" :width="160" label="时间">
+                </el-table-column>
+                <el-table-column prop="context" :width="180" label="执行过程">
+                </el-table-column>
+                <el-table-column prop="result" label="执行结果">
+                </el-table-column>
+            </el-table>
+            <span class="notice">{{message}}</span>
+            <el-row class="button-group">
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">下达<span
+                            v-show="timeCountCommand>0">({{timeCountCommand}})</span></el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdConfirm1" type="primary" :disabled="cmdDisabled[1]" @click="confirm1">确认1
+                    </el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdConfirm2" type="primary" :disabled="cmdDisabled[2]" @click="confirm2">确认2<span
+                            v-show="timeCountConfirm>0">({{timeCountConfirm}})</span></el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">中止</el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdClose" @click="close">关闭</el-button>
+                </el-col>
+            </el-row>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { mouseCancelState } from '../utils/menuItemStatus';
+    import { now } from '@/utils/date';
+
+    export default {
+        name: 'StationCmdControl',
+        data() {
+            return {
+                dialogShow: false,
+                backOperate: '',
+                selected: null,
+                order: 0,
+                row: null,
+                timer: null,
+                operation: '',
+                cmdDisabled: [true, true, true],
+                stpDisabled: true,
+                tempData: [],
+                message: '',
+                timeCountCommand: -1,
+                timeCountConfirm: -1,
+                stationName: ''
+            }
+        },
+        computed: {
+            typeList() {
+                return [
+                    { code: OperationEvent.Station.powerUnLock.menu.operation, name: '上电解锁' },
+                    { code: OperationEvent.Station.execKeyOperationTest.menu.operation, name: '执行关键操作测试' }
+                ]
+            },
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCommand() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                        /** 上电解锁*/
+                        return OperationEvent.Station.powerUnLock.order.domId;
+                    } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                        /** 执行关键操作测试*/
+                        return OperationEvent.Station.execKeyOperationTest.order.domId;
+                    }
+                }
+            },
+            domIdConfirm1() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                        /** 上电解锁*/
+                        return OperationEvent.Station.powerUnLock.confirm1.domId;
+                    } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                        /** 执行关键操作测试*/
+                        return OperationEvent.Station.execKeyOperationTest.confirm1.domId;
+                    }
+                }
+            },
+            domIdConfirm2() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                        /** 上电解锁*/
+                        return OperationEvent.Station.powerUnLock.confirm2.domId;
+                    } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                        /** 执行关键操作测试*/
+                        return OperationEvent.Station.execKeyOperationTest.confirm2.domId;
+                    }
+                }
+            },
+            domIdStop() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                        /** 上电解锁*/
+                        return OperationEvent.Station.powerUnLock.stop.domId;
+                    } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                        /** 执行关键操作测试*/
+                        return OperationEvent.Station.execKeyOperationTest.stop.domId;
+                    }
+                }
+            },
+            domIdClose() {
+                if (this.dialogShow) {
+                    return OperationEvent.Command.close.menu.domId;
+                }
+            },
+            title() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                        return '信号解封';
+                    } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                        return '执行关键操作测试';
+                    }
+                }
+            }
+        },
+        watch: {
+            cmdDisabled: {
+                handler(val, oldVal) {
+                    this.stpDisabled = true;
+                    val.forEach((elem, index) => {
+                        // 在确定1之前的操作才可以终止
+                        if (elem == false && 1 <= index && index <= 2) {
+                            this.stpDisabled = false;
+                        }
+                    });
+                },
+                deep: true
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+            this.timer = setInterval(() => {
+                if (!this.$store.state.menuOperation.break) {
+                    if (this.timeCountCommand > 0) {
+                        this.timeCountCommand--;
+                    } else if (this.timeCountCommand == 0) {
+                        this.setButtonEnable({ step: 0 });
+                        this.timeCountCommand = -1;
+                    }
+                    if (this.timeCountConfirm > 0) {
+                        this.timeCountConfirm--;
+                    } else if (this.timeCountConfirm == 0) {
+                        this.setButtonEnable({ step: 0 });
+                        this.timeCountConfirm = -1;
+                    }
+                }
+            }, 1000)
+        },
+        beforeDestroy() {
+            clearInterval(this.timer);
+            this.timer = null;
+        },
+        methods: {
+            doShow(operate, selected) {
+                this.selected = selected;
+                if (!this.dialogShow) {
+                    this.stationName = '';
+                    if (selected && selected._type.toUpperCase() === 'Station'.toUpperCase()) {
+                        this.stationName = selected.name
+                    }
+
+                    this.order = 0;
+                    this.operation = operate.operation;
+                    this.tempData = [];
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = -1;
+                    this.cmdDisabled = [false, true, true];
+                }
+                this.stpDisabled = true;
+                this.dialogShow = true;
+                this.setMessage('请点击“下达”按钮，下达命令！');
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+                mouseCancelState(this.selected);
+            },
+            command() {
+                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation ||
+                    this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                    /** 第一步不带弹框处理*/
+                    this.commandNoPopUp();
+                } else {
+                    /** 第一步带弹框处理*/
+                    this.commandHasPopUp();
+                }
+            },
+            commandHasPopUp() {
+            },
+            commandNoPopUp() {
+                let operate = {
+                    type: MapDeviceType.Station.type
+                }
+
+                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                    /** 上电解锁*/
+                    operate.operation = OperationEvent.Station.powerUnLock.order.operation
+                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                    /** 执行关键操作测试*/
+                    operate.operation = OperationEvent.Station.execKeyOperationTest.order.operation
+                }
+
+                this.setMessage('请点击“确认1”按钮，确认命令！');
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.setButtonEnable({ step: 1 });
+                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行失败' });
+                    }
+                }).catch(() => {
+                    this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行异常' });
+                })
+            },
+            confirm1() {
+                let operate = {
+                    type: MapDeviceType.Station.type,
+                }
+
+                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                    /** 上电解锁*/
+                    operate.operation = OperationEvent.Station.powerUnLock.confirm1.operation;
+                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                    /** 执行关键操作测试*/
+                    operate.operation = OperationEvent.Station.execKeyOperationTest.confirm1.operation;
+                }
+
+                this.setMessage('请点击“确认2”按钮，确认命令！');
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.timeCountCommand = -1;
+                        this.timeCountConfirm = 10;
+                        this.setButtonEnable({ step: 2 });
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行失败' });
+                    }
+                }).catch(() => {
+                    this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行异常' });
+                })
+            },
+            confirm2() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Station.type
+                }
+
+                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                    /** 上电解锁*/
+                    operate.operation = OperationEvent.Station.powerUnLock.confirm2.operation;
+                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                    /** 执行关键操作测试*/
+                    operate.operation = OperationEvent.Station.execKeyOperationTest.confirm2.operation;
+                }
+
+                this.setMessage('');
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = -1;
+                    this.setButtonEnable({ step: -1 });
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行失败' });
+                    }
+                }).catch(() => {
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = -1;
+                    this.setButtonEnable({ step: -1 });
+                    this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行异常' });
+                })
+            },
+            stop() {
+                let operate = {
+                    type: MapDeviceType.Station.type,
+                }
+
+                if (this.operation == OperationEvent.Station.powerUnLock.menu.operation) {
+                    /** 上电解锁*/
+                    operate.operation = OperationEvent.Station.powerUnLock.stop.operation;
+                } else if (this.operation == OperationEvent.Station.execKeyOperationTest.menu.operation) {
+                    /** 执行关键操作测试*/
+                    operate.operation = OperationEvent.Station.execKeyOperationTest.stop.operation;
+                }
+
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.setButtonEnable({ step: 0 });
+                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行失败' });
+                    }
+                }).catch(error => {
+                    this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行异常' });
+                })
+            },
+            close() {
+                let operate = {
+                    type: MapDeviceType.Station.type,
+                    operation: OperationEvent.Command.close.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            },
+            getOperate(operate) {
+                /** 弹框返回值处理*/
+            },
+            setButtonEnable(param) {
+                this.cmdDisabled = [true, true, true];
+                if (param && param.step >= 0) {
+                    this.cmdDisabled[param.step] = false;
+                }
+            },
+            setMessage(message) {
+                this.message = message;
+            },
+            writeRecord(param) {
+                this.tempData.push(param);
+            },
+            editRecord(param) {
+                this.tempData.forEach(elem => {
+                    if (elem.order == param.order) {
+                        for (var prop in param) {
+                            elem[prop] = param[prop];
+                        }
+                    }
+                })
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/switchCmdControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/switchCmdControl.vue
new file mode 100644
index 000000000..ae66d1d28
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/switchCmdControl.vue
@@ -0,0 +1,459 @@
+<template>
+    <div>
+        <el-dialog class="chengdou-03__systerm switch-cmd-control" :title="title" :visible.sync="show" width="800px"
+            :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+            <div style="padding: 10px 20px; border: 1px solid lightgray;">
+                <span class="base-label">命令信息</span>
+                <el-form label-position="center" size="mini">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="类型" label-width="40px">
+                                <el-select v-model="operation" size="small" disabled>
+                                    <el-option v-for="option in typeList" :key="option.code" :label="option.name"
+                                        :value="option.code">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="车站名称" label-width="80px">
+                                <el-input v-model="stationName" size="small" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="道岔名称" label-width="80px">
+                                <el-input v-model="switchName" size="small" disabled></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+            </div>
+            <el-table class="table" ref="tempData" :data="tempData" border style="width: 100%" size="mini"
+                highlight-current-row height="200">
+                <el-table-column prop="order" :width="50" label="序号">
+                </el-table-column>
+                <el-table-column prop="date" :width="160" label="时间">
+                </el-table-column>
+                <el-table-column prop="context" :width="180" label="执行过程">
+                </el-table-column>
+                <el-table-column prop="result" label="执行结果">
+                </el-table-column>
+            </el-table>
+            <span class="notice">{{message}}</span>
+            <el-row class="button-group">
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdCommand" type="primary" :disabled="cmdDisabled[0]" @click="command">下达<span
+                            v-show="timeCountCommand>0">({{timeCountCommand}})</span></el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdConfirm1" type="primary" :disabled="cmdDisabled[1]" @click="confirm1">确认1
+                    </el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdConfirm2" type="primary" :disabled="cmdDisabled[2]" @click="confirm2">确认2<span
+                            v-show="timeCountConfirm>0">({{timeCountConfirm}})</span></el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdStop" type="primary" :disabled="stpDisabled" @click="stop">中止</el-button>
+                </el-col>
+                <el-col :span="2" :offset="2">
+                    <el-button :id="domIdClose" @click="close">关闭</el-button>
+                </el-col>
+            </el-row>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    import { mouseCancelState } from '../utils/menuItemStatus';
+    import { now } from '@/utils/date';
+
+    export default {
+        name: 'SwitchCmdControl',
+        data() {
+            return {
+                dialogShow: false,
+                backOperate: '',
+                selected: '',
+                order: 0,
+                row: null,
+                timer: null,
+                operation: '',
+                cmdDisabled: [true, true, true],
+                stpDisabled: true,
+                tempData: [],
+                message: '',
+                timeCountCommand: -1,
+                timeCountConfirm: -1,
+                stationName: '',
+                switchName: ''
+            }
+        },
+        computed: {
+            typeList() {
+                return [
+                    { code: OperationEvent.Switch.unlock.menu.operation, name: '道岔单解' },
+                    { code: OperationEvent.Switch.unblock.menu.operation, name: '道岔解封' },
+                    { code: OperationEvent.Switch.fault.menu.operation, name: '道岔故障解锁' },
+                    { code: OperationEvent.Switch.axlePreReset.menu.operation, name: '道岔计轴预复位' },
+                ]
+            },
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCommand() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                        /** 道岔单解*/
+                        return OperationEvent.Switch.unlock.order.domId;
+                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                        /** 道岔解封*/
+                        return OperationEvent.Switch.unblock.order.domId;
+                    } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                        /** 道岔故障解锁*/
+                        return OperationEvent.Switch.fault.order.domId;
+                    } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                        /** 道岔计轴复位*/
+                        return OperationEvent.Switch.axlePreReset.order.domId;
+                    }
+                }
+            },
+            domIdConfirm1() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                        /** 道岔单解*/
+                        return OperationEvent.Switch.unlock.confirm1.domId;
+                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                        /** 道岔解封*/
+                        return OperationEvent.Switch.unblock.confirm1.domId;
+                    } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                        /** 道岔故障解锁*/
+                        return OperationEvent.Switch.fault.confirm1.domId;
+                    } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                        /** 道岔计轴复位*/
+                        return OperationEvent.Switch.axlePreReset.confirm1.domId;
+                    }
+                }
+            },
+            domIdConfirm2() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                        /** 道岔单解*/
+                        return OperationEvent.Switch.unlock.confirm2.domId;
+                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                        /** 道岔解封*/
+                        return OperationEvent.Switch.unblock.confirm2.domId;
+                    } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                        /** 道岔故障解锁*/
+                        return OperationEvent.Switch.fault.confirm2.domId;
+                    } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                        /** 道岔计轴复位*/
+                        return OperationEvent.Switch.axlePreReset.confirm2.domId;
+                    }
+                }
+            },
+            domIdStop() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                        /** 道岔单解*/
+                        return OperationEvent.Switch.unlock.stop.domId;
+                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                        /** 道岔解封*/
+                        return OperationEvent.Switch.unblock.stop.domId;
+                    } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                        /** 道岔故障解锁*/
+                        return OperationEvent.Switch.fault.stop.domId;
+                    } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                        /** 道岔计轴复位*/
+                        return OperationEvent.Switch.axlePreReset.stop.domId;
+                    }
+                }
+            },
+            domIdClose() {
+                if (this.dialogShow) {
+                    return OperationEvent.Command.close.menu.domId;
+                }
+            },
+            title() {
+                if (this.dialogShow) {
+                    if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                        return '道岔单解';
+                    } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                        return '道岔解封';
+                    } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                        return '道岔故障解锁';
+                    } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                        return '道岔计轴复位';
+                    }
+                }
+            }
+        },
+        watch: {
+            cmdDisabled: {
+                handler(val, oldVal) {
+                    this.stpDisabled = true;
+                    val.forEach((elem, index) => {
+                        // 在确定1之前的操作才可以终止
+                        if (elem == false && 1 <= index && index <= 2) {
+                            this.stpDisabled = false;
+                        }
+                    });
+                },
+                deep: true
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+            this.timer = setInterval(() => {
+                if (!this.$store.state.menuOperation.break) {
+                    if (this.timeCountCommand > 0) {
+                        this.timeCountCommand--;
+                    } else if (this.timeCountCommand == 0) {
+                        this.setButtonEnable({ step: 0 });
+                        this.timeCountCommand = -1;
+                    }
+                    if (this.timeCountConfirm > 0) {
+                        this.timeCountConfirm--;
+                    } else if (this.timeCountConfirm == 0) {
+                        this.setButtonEnable({ step: 0 });
+                        this.timeCountConfirm = -1;
+                    }
+                }
+            }, 1000)
+        },
+        beforeDestroy() {
+            clearInterval(this.timer);
+            this.timer = null;
+        },
+        methods: {
+            doShow(operate, selected) {
+                this.selected = selected;
+                if (!this.dialogShow) {
+                    this.switchName = '';
+                    this.stationName = '';
+                    if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
+                        this.switchName = selected.name
+                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                        if (station) {
+                            this.stationName = station.name;
+                        }
+                    }
+
+                    this.order = 0;
+                    this.operation = operate.operation;
+                    this.dialogShow = true;
+                    this.tempData = [];
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = -1;
+                    this.cmdDisabled = [false, true, true];
+                }
+                this.stpDisabled = true;
+                this.setMessage('请点击“下达”按钮，下达命令！');
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+                mouseCancelState(this.selected);
+            },
+            command() {
+                /** 道岔单解/道岔解封/道岔故障解锁/道岔计轴复位*/
+                if (this.operation == OperationEvent.Switch.unlock.menu.operation ||
+                    this.operation == OperationEvent.Switch.unblock.menu.operation ||
+                    this.operation == OperationEvent.Switch.fault.menu.operation ||
+                    this.operation == OperationEvent.Switch.axlePreReset.menu.operation ||
+                    this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
+                    /** 第一步不带弹框处理*/
+                    this.commandNoPopUp();
+                } else {
+                    /** 第一步带弹框处理*/
+                    this.commandHasPopUp();
+                }
+            },
+            commandHasPopUp() {
+
+            },
+            commandNoPopUp() {
+                let operate = {
+                    type: MapDeviceType.Switch.type
+                }
+
+                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    /** 道岔单解*/
+                    operate.operation = OperationEvent.Switch.unlock.order.operation
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    /** 道岔解封*/
+                    operate.operation = OperationEvent.Switch.unblock.order.operation
+                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                    /** 道岔故障解锁*/
+                    operate.operation = OperationEvent.Switch.fault.order.operation
+                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                    /** 道岔计轴复位*/
+                    operate.operation = OperationEvent.Switch.axlePreReset.order.operation;
+                }
+
+                this.setMessage('请点击“确认1”按钮，确认命令！');
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.setButtonEnable({ step: 1 });
+                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行失败' });
+                    }
+                }).catch(() => {
+                    this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行异常' });
+                })
+            },
+            confirm1() {
+                let operate = {
+                    type: MapDeviceType.Switch.type,
+                }
+
+                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    /** 道岔单解*/
+                    operate.operation = OperationEvent.Switch.unlock.confirm1.operation;
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    /** 道岔解封*/
+                    operate.operation = OperationEvent.Switch.unblock.confirm1.operation;
+                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                    /** 道岔故障解锁*/
+                    operate.operation = OperationEvent.Switch.fault.confirm1.operation
+                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                    /** 道岔计轴复位*/
+                    operate.operation = OperationEvent.Switch.axlePreReset.confirm1.operation;
+                }
+
+                this.setMessage('请点击“确认2”按钮，确认命令！');
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.timeCountCommand = -1;
+                        this.timeCountConfirm = 10;
+                        this.setButtonEnable({ step: 2 });
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行失败' });
+                    }
+                }).catch(() => {
+                    this.editRecord({ order: this.order, date: now(), context: '点击确认1', result: '执行异常' });
+                })
+            },
+            confirm2() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                }
+
+                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    /** 道岔单解*/
+                    operate.operation = OperationEvent.Switch.unlock.confirm2.operation;
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    /** 道岔解封*/
+                    operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
+                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                    /** 道岔故障解锁*/
+                    operate.operation = OperationEvent.Switch.fault.confirm2.operation
+                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                    /** 道岔计轴复位*/
+                    operate.operation = OperationEvent.Switch.axlePreReset.confirm2.operation;
+                }
+
+                this.setMessage('');
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = -1;
+                    this.setButtonEnable({ step: -1 });
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行失败' });
+                    }
+                }).catch(() => {
+                    this.timeCountCommand = -1;
+                    this.timeCountConfirm = -1;
+                    this.setButtonEnable({ step: -1 });
+                    this.editRecord({ order: this.order, date: now(), context: '点击确认2', result: '执行异常' });
+                })
+            },
+            stop() {
+                let operate = {
+                    type: MapDeviceType.Switch.type,
+                }
+
+                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    /** 道岔单解*/
+                    operate.operation = OperationEvent.Switch.unlock.stop.operation;
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    /** 道岔解封*/
+                    operate.operation = OperationEvent.Switch.unblock.stop.operation;
+                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                    /** 道岔故障解锁*/
+                    operate.operation = OperationEvent.Switch.fault.stop.operation
+                } else if (this.operation == OperationEvent.Switch.axlePreReset.menu.operation) {
+                    /** 道岔计轴复位*/
+                    operate.operation = OperationEvent.Switch.axlePreReset.stop.operation;
+                }
+
+                this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.setButtonEnable({ step: 0 });
+                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行成功' });
+                    } else {
+                        this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行失败' });
+                    }
+                }).catch(error => {
+                    this.editRecord({ order: this.order, date: now(), context: '点击终止', result: '执行异常' });
+                })
+            },
+            close() {
+                let operate = {
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Command.close.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            },
+            getOperate(operate) {
+                /** 弹框返回值处理*/
+            },
+            setButtonEnable(param) {
+                this.cmdDisabled = [true, true, true];
+                if (param && param.step >= 0) {
+                    this.cmdDisabled[param.step] = false;
+                }
+            },
+            setMessage(message) {
+                this.message = message;
+            },
+            writeRecord(param) {
+                this.tempData.push(param);
+            },
+            editRecord(param) {
+                this.tempData.forEach(elem => {
+                    if (elem.order == param.order) {
+                        for (var prop in param) {
+                            elem[prop] = param[prop];
+                        }
+                    }
+                })
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/switchControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/switchControl.vue
new file mode 100644
index 000000000..c45f04de0
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/switchControl.vue
@@ -0,0 +1,416 @@
+<template>
+    <el-dialog class="chengdou-03__systerm switch-control" :title="title" :visible.sync="show" width="300px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <el-row class="header">
+            <el-col :span="11"><span>车站名称</span></el-col>
+            <el-col :span="11" :offset="2"><span>道岔</span></el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="11">
+                <el-input v-model="stationName" size="small" disabled></el-input>
+            </el-col>
+            <el-col :span="11" :offset="2">
+                <el-input v-model="switchName" size="small" disabled></el-input>
+            </el-col>
+        </el-row>
+        <el-row justify="center" class="button-group">
+            <el-col :span="10" :offset="2">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="4">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+        <notice-info ref="noticeInfo"></notice-info>
+        <password-box ref="passwordBox" @checkOver="toSwitchControl"></password-box>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent, getDomIdByOperation } from '@/scripts/ConstDic';
+    import { mouseCancelState } from '../utils/menuItemStatus';
+    import NoticeInfo from './childDialog/childDialog/noticeInfo';
+    import PasswordBox from './childDialog/passwordInputBox';
+
+    export default {
+        name: 'SwitchControl',
+        components: {
+            NoticeInfo,
+            PasswordBox,
+        },
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                selected: null,
+                operation: '',
+                stationName: '',
+                switchName: '',
+            }
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? getDomIdByOperation(this.operation) : '';
+            },
+            title() {
+                if (this.operation == OperationEvent.Switch.lock.menu.operation) {
+                    return '道岔单锁';
+                } else if (this.operation == OperationEvent.Switch.block.menu.operation) {
+                    return '道岔封锁';
+                } else if (this.operation == OperationEvent.Switch.turnout.menu.operation) {
+                    return '道岔转动';
+                } else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) {
+                    return '道岔强扳';
+                } else if (this.operation == OperationEvent.Switch.split.menu.operation) {
+                    return '区段切除';
+                } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
+                    return '区段激活';
+                } else if (this.operation == OperationEvent.Switch.locate.menu.operation) {
+                    return '单操到定位';
+                } else if (this.operation == OperationEvent.Switch.reverse.menu.operation) {
+                    return '单操到反位';
+                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                    return '区故解';
+                } else if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    return '道岔解锁';
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    return '道岔解封';
+                }
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate, selected) {
+                this.selected = selected;
+                if (!this.dialogShow) {
+                    this.switchName = '';
+                    this.stationName = '';
+                    if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
+                        this.switchName = selected.name
+                        let station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
+                        if (station) {
+                            this.stationName = station.name;
+                        }
+                    }
+                    this.operation = operate.operation;
+                }
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+                mouseCancelState(this.selected);
+            },
+            commit() {
+                //debugger;
+                if (this.operation == OperationEvent.Switch.lock.menu.operation) {
+                    /** 道岔单锁*/
+                    this.lock();
+                } else if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                    /* 道岔解锁*/
+                    this.unlock();
+                } else if (this.operation == OperationEvent.Switch.turnout.menu.operation) {
+                    /** 道岔转动*/
+                    this.turnout(this.operation);
+                } else if (this.operation == OperationEvent.Switch.turnoutForce.menu.operation) {
+                    /** 道岔强扳*/
+                    this.turnoutForce();
+                } else if (this.operation == OperationEvent.Switch.split.menu.operation) {
+                    /** 区段激活*/
+                    this.split();
+                } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
+                    /** 区段激活*/
+                    this.active();
+                } else if (this.operation == OperationEvent.Switch.locate.menu.operation) {
+                    /*单操到正位*/
+                    this.locate();
+                } else if (this.operation == OperationEvent.Switch.reverse.menu.operation) {
+                    /*单操到反位*/
+                    this.reverse();
+                } else if (this.operation == OperationEvent.Switch.block.menu.operation) {
+                    /** 道岔封锁*/
+                    this.openPasswordBox(this.operation);
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    /*道岔解封*/
+                    this.openPasswordBox(this.operation);
+                } else if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+                    /*区故解*/
+                    this.openPasswordBox(this.operation);
+                }
+            },
+            //道岔单锁
+            lock() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Switch.lock.menu.operation,
+                };
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //道岔解锁
+            unlock() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Switch.unlock.menu.operation,
+                };
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+
+            },
+            //道岔封锁
+            block() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Switch.block.menu.operation,
+                };
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //道岔解封
+            unblock() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Switch.unblock.menu.operation,
+                };
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //道岔转动
+            turnout(operation) {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Switch.turnout.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //道岔强扮
+            turnoutForce() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Switch.turnoutForce.menu.operation,
+                }
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //区段切除
+            split() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Switch.split.menu.operation,
+                }
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //区段激活
+            active() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Switch.active.menu.operation,
+                };
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //单操到正位
+            locate() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Switch.locate.menu.operation,
+                };
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = true;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //单操到反位
+            reverse() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Switch.reverse.menu.operation,
+                };
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = true;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //区故解
+            fault() {
+                let operate = {
+                    send: true,
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Switch.fault.menu.operation,
+                };
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //打开密码输入框
+            openPasswordBox(operation) {
+                let operate = {
+                    type: MapDeviceType.Switch.type,
+                    operation: operation,
+                };
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.passwordBox.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow(operate);
+                });
+            },
+            //密码输入正确会回调
+            toSwitchControl(operation) {
+                if (operation === OperationEvent.Switch.fault.menu.operation) {
+                    this.fault();
+                } else if (operation === OperationEvent.Switch.block.menu.operation) {
+                    this.block();
+                } else if (operation === OperationEvent.Switch.unblock.menu.operation) {
+                    this.unblock();
+                }
+            },
+            cancel() {
+                let operate = {
+                    type: MapDeviceType.Switch.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.doClose();
+                });
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/index.vue b/src/jmapNew/theme/ningbo_01/menus/index.vue
new file mode 100644
index 000000000..ec218b332
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/index.vue
@@ -0,0 +1,360 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-cancel ref="menuCancel" />
+    <template v-show="isShowAll">
+      <template v-show="isShowBar">
+        <menu-bar ref="menuBar" :selected="selected" />
+      </template>
+      <menu-station-control ref="menuStationControl" :selected="selected" />
+      <menu-station-stand ref="menuStationStand" :selected="selected" />
+      <menu-switch ref="menuSwitch" :selected="selected" />
+      <menu-signal ref="menuSignal" :selected="selected" />
+      <menu-section ref="menuSection" :selected="selected" />
+      <menu-train ref="menuTrain" :selected="selected" />
+      <menu-station ref="menuStation" :selected="selected" />
+      <menu-limit ref="menuLimit" :selected="selected" />
+      <passive-alarm ref="passiveAlarm" />
+      <passive-contorl ref="passiveControl" />
+      <passive-Timeout ref="passiveTimeout" />
+    </template>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuCancel from './menuCancel';
+import MenuSignal from './menuSignal';
+import MenuStationControl from './menuStationControl';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './menuBar';
+import MenuLimit from './menuLimit';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from './passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+
+export default {
+	name: 'Menus',
+	components: {
+		MenuBar,
+		MenuCancel,
+		MenuSignal,
+		MenuSwitch,
+		MenuSection,
+		MenuStationControl,
+		MenuStationStand,
+		MenuStation,
+		MenuTrain,
+		MenuLimit,
+		PassiveAlarm,
+		PassiveContorl,
+		PassiveTimeout
+	},
+	props: {
+		selected: {
+			type: Object,
+			default() {
+				return null;
+			}
+		}
+	},
+	computed: {
+		...mapGetters('config', [
+			'width'
+		]),
+		isShowAll() {
+			return this.$route.params.mode !== 'dp' &&
+                    this.$route.params.mode !== 'plan' &&
+                    this.$store.state.training.roles != 'BigScreen';
+		},
+		isShowBar() {
+			return this.$store.state.training.prdType;
+		}
+	},
+	watch: {
+		isShowBar(val) {
+			val && this.$store.dispatch('config/updateMenuBar');
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('config/updateMenuBar');
+		});
+	}
+};
+</script>
+
+<style>
+    .menus .pop-menu {
+        background: #F0F0F0;
+    }
+
+    .menus .pop-menu span {
+        color: #000;
+    }
+
+    .menus .pop-menu .is-disabled span {
+        color: #B4B3B8;
+    }
+
+    .chengdou-03__systerm {
+        overflow: hidden !important;
+    }
+
+    .chengdou-03__systerm .el-dialog {
+        background: #0055E8;
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        border: 1px solid rgb(69, 134, 247);
+        border-radius: 6px;
+        font-size: 13px !important;
+        color: #000;
+    }
+
+    .chengdou-03__systerm .el-dialog span {
+        font-size: 13px !important;
+        line-height: 22px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-dialog__footer {
+        background: #ECE9D8;
+        opacity: 1;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-dialog__body {
+        padding: 20px;
+        margin: 0px 3px 3px;
+        border: 2px solid rgba(120, 121, 123, 0.5);
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        background: #ECE9D8;
+        opacity: 1;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-dialog__title {
+        font-size: 16px;
+        color: #fff;
+        position: absolute;
+        top: 4px;
+        left: 7px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-dialog__headerbtn {
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid #fff;
+        border-radius: 4px;
+        top: 6px;
+        right: 3px;
+        line-height: 16px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+        font-size: 16px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-button {
+        height: 24px;
+        line-height: 22px;
+        padding: 0px;
+        width: 80px;
+        border: 2px outset #E2E2E2;
+        border-radius: 4px !important;
+        color: #000;
+        background: #F0F0F0;
+    }
+
+    .chengdou-03__systerm .el-dialog .expand {
+        width: 120px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-button:focus span {
+        border: 1px dashed gray;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-button:active {
+        border: 2px inset #E2E2E2;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-button:disabled {
+        border: 2px inset #E2E2E2;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-button:disabled span {
+        border: 0px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-input {
+        border: 2px inset #E9E9E9;
+        height: 22px !important;
+        line-height: 22px !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-input__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+        height: 22px !important;
+        line-height: 22px !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-textarea {
+        border: 2px inset #E9E9E9;
+        border-radius: 0px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-textarea .el-textarea__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-table--border th.gutter {
+        background: #EBEADB !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-table {
+        border: 2px inset #E9E9E9;
+        color: #000 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-table .cell {
+        height: 22px;
+        line-height: 22px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-table th.is-leaf {
+        background: #F0F0F0 !important;
+        border-right: 1px solid #BDBDBD !important;
+        border-bottom: 1px solid #BDBDBD !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-table tr td {
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-table .el-table__empty-text {
+        top: 15px !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .current-row>td {
+        background: #3399FF !important;
+        color: #fff !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-checkbox__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-checkbox__label {
+        color: #000 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+        color: #C5C9CC !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+        position: absolute;
+        -webkit-box-sizing: content-box;
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #000;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        top: 1px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-radio__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-radio__label {
+        color: #000 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+        width: 4px;
+        height: 4px;
+        border-radius: 100%;
+        background-color: #000 !important;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+        color: #C5C9CC !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -15px;
+        top: -18px;
+    }
+
+    .chengdou-03__systerm .el-dialog .el-form-item label {
+        font-weight: normal !important;
+        color: #000 !important;
+    }
+
+    .chengdou-03__systerm .el-dialog .context {
+        height: 100px;
+        border: 2px inset #E2E2E2;
+        overflow-y: scroll;
+    }
+
+    .chengdou-03__systerm .el-dialog .table {
+        margin-top: 10px;
+    }
+
+    .chengdou-03__systerm .el-dialog .notice {
+        margin-left: 62px;
+        line-height: 30px;
+    }
+
+    .chengdou-03__systerm .el-dialog .button-group {
+        margin-top: 20px;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue
new file mode 100644
index 000000000..943662caa
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue
@@ -0,0 +1,1220 @@
+<template>
+  <div id="menuBar">
+    <div class="nav">
+      <template v-for="(item,i) in menu">
+        <template v-if="noShowingChildren(item.children)">
+          <li :id="getDomId(item)" :key="i" class="nav-li" @click="hookClick(item)">
+            <span class="nav-li-text">{{ item.title }}</span>
+          </li>
+        </template>
+        <template v-else>
+          <li
+            v-if="handleShow(item)"
+            :id="getDomId(item)"
+            :key="i"
+            class="nav-li"
+            @click.stop="selectedClassA(item, i)"
+          >
+            <span class="nav-li-text">{{ item.title }}</span>
+            <ul class="nav-ul" :class="{'active' :i==classA}">
+              <template v-for="(child,j) in item.children">
+                <template v-if="child.children && child.children.length > 0">
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li
+                    v-else
+                    :id="getDomId(child)"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="selectedClassB(child, j)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                    <ul class="menu-ul" :class="{'active' :j==classB}">
+                      <template v-for="(grandchild,k) in child.children">
+                        <li v-if="grandchild.type === 'separator'" :key="k" class="menu-separator">
+                          <span class="status">&ensp;</span>
+                          <span class="separator">&ensp;</span>
+                        </li>
+                        <li
+                          v-else-if="grandchild.show"
+                          :id="getDomId(grandchild)"
+                          :key="k"
+                          class="menu-li"
+                          @click.stop="hookClick(grandchild)"
+                        >
+                          <div class="menu-li-block">
+                            <span class="menu-li-text">
+                              <span class="status">&ensp;</span>
+                              <span class="label">{{ grandchild.title }}</span>
+                            </span>
+                          </div>
+                        </li>
+                      </template>
+                    </ul>
+                  </li>
+                </template>
+                <template v-else>
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li
+                    v-else-if="child.show"
+                    :id="getDomId(child)"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="hookClick(child)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                  </li>
+                </template>
+              </template>
+            </ul>
+          </li>
+        </template>
+      </template>
+    </div>
+    <station-control-convert ref="stationControlConvert" />
+    <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
+    <view-train-id ref="viewTrainId" />
+    <view-name ref="viewName" />
+    <view-device ref="viewDevice" />
+    <notice-info ref="noticeInfo" />
+    <train-add ref="trainAdd" />
+    <train-transtalet ref="trainTranstalet" />
+    <train-delete ref="trainDelete" />
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+    <set-limit-speed ref="setLimitSpeed" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { TrainingMode, OperationEvent } from '@/scripts/ConstDic';
+// import { OperateMode } from '@/scripts/ConstDic';
+import { menuBarConvert, SystemType } from './utils/menuItemStatus';
+import StationControlConvert from './menuDialog/stationControlConvert';
+import TrainAdd from './menuDialog/trainAdd';
+import TrainTranstalet from './menuDialog/trainTranstalet';
+import TrainDelete from './menuDialog/trainDelete';
+import PasswordBox from './menuDialog/passwordBox';
+import ViewTrainId from './menuDialog/viewTrainId';
+import ViewName from './menuDialog/viewName';
+import ViewDevice from './menuDialog/viewDevice';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+import SetLimitSpeed from './menuDialog/setLimitSpeed';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+	name: 'MenuBar',
+	components: {
+		NoticeInfo,
+		StationControlConvert,
+		PasswordBox,
+		ViewTrainId,
+		ViewName,
+		ViewDevice,
+		TrainAdd,
+		TrainTranstalet,
+		TrainDelete,
+		ManageUser,
+		HelpAbout,
+		SetLimitSpeed
+	},
+	props: {
+		selected: {
+			type: Object,
+			default() {
+				return null;
+			}
+		}
+	},
+	data() {
+		return {
+			classA: -1,
+			classB: -1,
+			tempClassA: -1,
+			tempClassB: -1,
+			valid: true,
+			menu: [],
+			menuNormal: {
+				local: [
+					{
+						title: '系统',
+						operate: OperationEvent.Command.mBar.system,
+						children: [
+							{
+								title: '登录',
+								click: this.undeveloped
+							},
+							{
+								title: '注销',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '连接主用中心',
+								click: this.undeveloped
+							},
+							{
+								title: '连接备用中心',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '退出',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '临时限速',
+						operate: OperationEvent.Command.mBar.limitSpeed,
+						children: [
+							{
+								title: '设置临时限速',
+								operate: OperationEvent.Section.setLimitSpeed,
+								click: this.setLimitSpeed
+							},
+							{
+								title: '取消临时限速',
+								operate: OperationEvent.Section.cancelSpeed,
+								click: this.cancleLimitSpeed
+							}
+						]
+					},
+					{
+						title: '查看',
+						operate: OperationEvent.Command.mBar.check,
+						children: [
+							{
+								title: '运行图',
+								click: this.undeveloped
+							},
+							{
+								title: '报告分析',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '视图',
+								click: this.undeveloped,
+								operate: '',
+								children: [{
+									title: '报警',
+									click: this.undeveloped
+								},
+								{
+									title: '列车运行信息',
+									click: this.undeveloped
+								},
+								{
+									title: '设备状态',
+									click: this.undeveloped
+								},
+								{
+									title: '列车详细信息',
+									click: this.undeveloped
+								},
+								{
+									title: '站台详细信息',
+									click: this.undeveloped
+								}]
+							},
+							{
+								title: '终端站发车列表',
+								click: this.undeveloped
+							},
+							{
+								title: '详细设备状态',
+								click: this.undeveloped
+							},
+							{
+								title: '查找列车',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '显示目的地号',
+								click: this.undeveloped
+							},
+							{
+								title: '显示轨道名',
+								click: this.undeveloped
+							},
+							{
+								title: '显示道岔名',
+								click: this.undeveloped
+							},
+							{
+								title: '显示信号机名',
+								click: this.undeveloped
+							},
+							{
+								title: '显示车次窗位置',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '显示车次号',
+								click: this.undeveloped
+							},
+							{
+								title: '显示车组号',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '全屏',
+								click: this.undeveloped
+							},
+							{
+								title: '放大',
+								click: this.undeveloped
+							},
+							{
+								title: '缩小',
+								click: this.undeveloped
+							},
+							{
+								title: '恢复',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '车站定位',
+						operate: '',
+						children: [
+						]
+					},
+					{
+						title: '显示',
+						operate: OperationEvent.Command.mBar.view,
+						hide: true,
+						children: [
+							{
+								title: '设置列车识别号显示',
+								click: this.setTrainIdDisplay,
+								operate: OperationEvent.Command.view.setTrainIdDisplay
+							},
+							{
+								title: '设置名称显示',
+								click: this.setNameDisplay,
+								operate: OperationEvent.Command.view.setNameDisplay
+							},
+							{
+								title: '设置设备显示',
+								click: this.setDeviceDisplay,
+								operate: OperationEvent.Command.view.setDeviceDisplay
+							}
+						]
+					},
+					{
+						title: 'ATS终端操作',
+						operate: '',
+						children: [
+							{
+								title: '当天运行车计划',
+								click: this.undeveloped
+							},
+							{
+								title: '出入库预告',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '计划车操作',
+						operate: '',
+						children: [
+							{
+								title: '添加计划车',
+								click: this.undeveloped
+							},
+							{
+								title: '平移计划车',
+								click: this.undeveloped
+							},
+							{
+								title: '删除计划车',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '批处理命令',
+						operate: '',
+						children: [
+							{
+								title: '全线扣车',
+								click: this.undeveloped
+							},
+							{
+								title: '取消全线扣车',
+								click: this.undeveloped
+							},
+							{
+								title: '取消上行全线扣车',
+								click: this.undeveloped
+							},
+							{
+								title: '取消下行全线扣车',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '信息管理',
+						operate: '',
+						children: [
+							{
+								title: '调度日志',
+								click: this.undeveloped
+							},
+							{
+								title: '调度留言提醒',
+								click: this.undeveloped
+							},
+							{
+								title: '报警设置',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '帮助',
+						children: [
+							{
+								title: '关于ITS GPC 工作站',
+								click: this.about,
+								operate: OperationEvent.Command.help.about
+							}
+						]
+					}
+				],
+				central: [
+					{
+						title: '系统',
+						operate: OperationEvent.Command.mBar.system,
+						children: [
+							{
+								title: '登录',
+								click: this.undeveloped
+							},
+							{
+								title: '注销',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '连接主用中心',
+								click: this.undeveloped
+							},
+							{
+								title: '连接备用中心',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '退出',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '临时限速',
+						operate: OperationEvent.Command.mBar.limitSpeed,
+						children: [
+							{
+								title: '设置临时限速',
+								operate: OperationEvent.Section.setLimitSpeed,
+								click: this.setLimitSpeed
+							},
+							{
+								title: '取消临时限速',
+								operate: OperationEvent.Section.cancelSpeed,
+								click: this.cancleLimitSpeed
+							}
+						]
+					},
+					{
+						title: '查看',
+						operate: OperationEvent.Command.mBar.check,
+						children: [
+							{
+								title: '运行图',
+								click: this.undeveloped
+							},
+							{
+								title: '报告分析',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '视图',
+								click: this.undeveloped,
+								operate: '',
+								children: [{
+									title: '报警',
+									click: this.undeveloped
+								},
+								{
+									title: '列车运行信息',
+									click: this.undeveloped
+								},
+								{
+									title: '设备状态',
+									click: this.undeveloped
+								},
+								{
+									title: '列车详细信息',
+									click: this.undeveloped
+								},
+								{
+									title: '站台详细信息',
+									click: this.undeveloped
+								}]
+							},
+							{
+								title: '终端站发车列表',
+								click: this.undeveloped
+							},
+							{
+								title: '详细设备状态',
+								click: this.undeveloped
+							},
+							{
+								title: '查找列车',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '显示目的地号',
+								click: this.undeveloped
+							},
+							{
+								title: '显示轨道名',
+								click: this.undeveloped
+							},
+							{
+								title: '显示道岔名',
+								click: this.undeveloped
+							},
+							{
+								title: '显示信号机名',
+								click: this.undeveloped
+							},
+							{
+								title: '显示车次窗位置',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '显示车次号',
+								click: this.undeveloped
+							},
+							{
+								title: '显示车组号',
+								click: this.undeveloped
+							},
+							{
+								type: 'separator'
+							},
+							{
+								title: '全屏',
+								click: this.undeveloped
+							},
+							{
+								title: '放大',
+								click: this.undeveloped
+							},
+							{
+								title: '缩小',
+								click: this.undeveloped
+							},
+							{
+								title: '恢复',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '车站定位',
+						operate: '',
+						children: [
+						]
+					},
+					{
+						title: '显示',
+						operate: OperationEvent.Command.mBar.view,
+						hide: true,
+						children: [
+							{
+								title: '设置列车识别号显示',
+								click: this.setTrainIdDisplay,
+								operate: OperationEvent.Command.view.setTrainIdDisplay
+							},
+							{
+								title: '设置名称显示',
+								click: this.setNameDisplay,
+								operate: OperationEvent.Command.view.setNameDisplay
+							},
+							{
+								title: '设置设备显示',
+								click: this.setDeviceDisplay,
+								operate: OperationEvent.Command.view.setDeviceDisplay
+							}
+						]
+					},
+					{
+						title: 'ATS终端操作',
+						operate: '',
+						children: [
+							{
+								title: '当天运行车计划',
+								click: this.undeveloped
+							},
+							{
+								title: '出入库预告',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '计划车操作',
+						operate: '',
+						children: [
+							{
+								title: '添加计划车',
+								click: this.undeveloped
+							},
+							{
+								title: '平移计划车',
+								click: this.undeveloped
+							},
+							{
+								title: '删除计划车',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '批处理命令',
+						operate: '',
+						children: [
+							{
+								title: '全线扣车',
+								click: this.undeveloped
+							},
+							{
+								title: '取消全线扣车',
+								click: this.undeveloped
+							},
+							{
+								title: '取消上行全线扣车',
+								click: this.undeveloped
+							},
+							{
+								title: '取消下行全线扣车',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '信息管理',
+						operate: '',
+						children: [
+							{
+								title: '调度日志',
+								click: this.undeveloped
+							},
+							{
+								title: '调度留言提醒',
+								click: this.undeveloped
+							},
+							{
+								title: '报警设置',
+								click: this.undeveloped
+							}
+						]
+					},
+					{
+						title: '帮助',
+						children: [
+							{
+								title: '关于ITS GPC 工作站',
+								click: this.about,
+								operate: OperationEvent.Command.help.about
+							}
+						]
+					}
+				]
+			}
+		};
+	},
+	computed: {
+		...mapGetters('training', [
+			'mode',
+			'started',
+			'steps',
+			'order',
+			'mode'
+		]),
+		...mapGetters('map', [
+			'stationList'
+		])
+	},
+	watch: {
+		tempClassA() {
+			this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
+		},
+		tempClassB() {
+			this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
+		},
+		'$store.state.menuOperation.break': function (val) {
+			if (val) {
+				this.classA = this.classB = -1;
+			} else {
+				this.classA = this.tempClassA;
+				this.classB = this.tempClassB;
+			}
+		},
+		'$store.state.training.operatemode': function (mode) {
+			this.initMenu();
+		},
+		'$store.state.training.started': function (val) {
+			this.closeMenu(true);
+		},
+		'$store.state.training.prdType': function () {
+			this.initMenu();
+		}
+	},
+	mounted() {
+		this.initMenu();
+	},
+	methods: {
+		handleShow(item) {
+			if (item.hide) {
+				return false;
+			}
+			return true;
+		},
+		initStationList() {
+			const list = [];
+			this.stationList.forEach(station => {
+				if (station.visible) {
+					const node = {
+						title: station.name,
+						operate: station.code,
+						show: true,
+						click: this.mapLocation,
+						code: station.code
+					};
+
+					list.push(node);
+				}
+			});
+			return list;
+		},
+		initMenu(menu) {
+			this.menu = menuBarConvert(this.menuNormal[SystemType[this.$store.state.training.prdType]], this.$store.state.training.operatemode);
+			this.menu[2].children = this.initStationList();
+			this.clickEvent();
+			this.closeMenu(true);
+		},
+		clickEvent() {
+			const self = this;
+			window.onclick = function (e) {
+				if (document.getElementById('menuBar')) {
+					self.closeMenu(false);
+				}
+			};
+		},
+		getDomId(item) {
+			if (item && item.operate) {
+				return item.operate.domId;
+			}
+			return '';
+		},
+		noShowingChildren(children) {
+			if (!children || children.length <= 0) {
+				return true;
+			}
+			return false;
+		},
+		hasShowingChildren(children) {
+			if (children && children.length > 0) {
+				return true;
+			}
+			return false;
+		},
+		closeMenu(flag) {
+			if (flag || (this.mode !== TrainingMode.EDIT && this.mode !== TrainingMode.TEACH)) {
+				this.classA = this.tempClassA = -1;
+				this.classB = this.tempClassB = -1;
+			}
+		},
+		hookClick(item, event) {
+			this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+			if (item && typeof item.click == 'function') {
+				item.click(item.operate);
+			}
+		},
+		selectedClassA(item, index) {
+			const order = this.order || 0;
+			if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+				this.popupMenuA(item, index);
+			} else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+				this.popupMenuA(item, index);
+			}
+		},
+		// 弹出顶部菜单操作
+		popupMenuA(item, index) {
+			this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+			this.clickEvent();
+			const operate = {
+				type: 'bar',
+				operation: item.operate.operation
+			};
+			this.tempClassA = index;
+			this.tempClassB = -1;
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		selectedClassB(item, index) {
+			const order = this.order || 0;
+			if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+				this.popupMenuB(item, index);
+			} else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+				this.popupMenuB(item, index);
+			}
+		},
+		popupMenuB(item, index) {
+			this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+			const operate = {
+				type: 'bar',
+				operation: item.operate.operation
+			};
+			this.tempClassB = index;
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				}
+			});
+		},
+		// 设置地图定位
+		mapLocation(code) {
+			if (code) {
+				this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
+				this.closeMenu(true);
+			}
+		},
+		// 转为站控
+		turnToStationControl(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.stationControlConvert.doShow(operate);
+				}
+			});
+		},
+		// 强制转为站控
+		mandatoryStationControl(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.passwordBox.doShow(operate);
+				}
+			});
+		},
+		// 请求中控
+		conterStationControl(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.stationControlConvert.doShow(operate);
+				}
+			});
+		},
+		// 设置列车识别号显示
+		setTrainIdDisplay(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.viewTrainId.doShow(operate);
+				}
+			});
+		},
+		// 设置设备显示
+		setNameDisplay(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.viewName.doShow(operate);
+				}
+			});
+		},
+		// 设置名称显示
+		setDeviceDisplay(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.viewDevice.doShow(operate);
+				}
+			});
+		},
+		// 添加计划车
+		addPlanTrain(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainAdd.doShow(operate);
+				}
+			});
+		},
+		// 平移计划车
+		translatPlanTrain(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainTranstalet.doShow(operate);
+				}
+			});
+		},
+		// 删除计划车
+		delPlanTrain(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainDelete.doShow(operate);
+				}
+			});
+		},
+		// 用户管理
+		userManage(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.manageUser.doShow(operate);
+				}
+			});
+		},
+		// 关于
+		about(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.helpAbout.doShow(operate);
+				}
+			});
+		},
+		// 刷新
+		refresh() {
+			this.closeMenu(true);
+			EventBus.$emit('refresh');
+		},
+		getLoginResult(operate) {
+			/** 密码校验*/
+			if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
+				if (operate.success) {
+					/** 校验成功*/
+					this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
+				}
+			}
+		},
+		setLimitSpeed(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.setLimitSpeed.doShow(operate, true);
+				}
+			});
+		},
+		cancleLimitSpeed(order) {
+			const operate = {
+				type: 'bar',
+				operation: order.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.closeMenu(true);
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.setLimitSpeed.doShow(operate, false);
+				}
+			});
+		},
+		undeveloped() {
+			this.doClose();
+			this.$alert('实现中......', '提示', {
+				confirmButtonText: '确定',
+				callback: action => {
+				}
+			});
+		},
+		doClose() {
+			this.$nextTick(() => {
+				EventBus.$emit('closeMenu');
+			});
+		}
+	}
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+    $width: 30px;
+    $height: 30px;
+    $menuPadding: 10px;
+    $menuItemHeight: 30px;
+    $menuItemWidth: 180px;
+    $menuItemPadding: 5px;
+
+    #menuBar {
+        z-index: 10;
+        position: absolute;
+        width: inherit;
+        height: $height;
+        line-height: $height;
+    }
+
+    .nav {
+        display: block;
+        cursor: pointer;
+        color: #0000;
+        background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
+        background: -o-linear-gradient(#FDFDFE, #DEE3F3);
+        background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
+        background: linear-gradient(#FDFDFE, #DEE3F3);
+        border: 1px solid #B6BCCC !important;
+        border-bottom: 2px solid #B6BCCC !important;
+        list-style: none;
+    }
+
+    .nav-li {
+        position: relative;
+        display: inline-block;
+        padding-left: $menuPadding;
+        padding-right: $menuPadding;
+    }
+
+    .nav-li:active {
+        background: #C9D0E1;
+        border-radius: 4px;
+    }
+
+    .nav-li-text {
+        font-size: 13px;
+        color: #000;
+        text-align: center;
+        text-decoration: none;
+    }
+
+    .nav-ul {
+        display: none;
+        position: absolute;
+        list-style: none;
+        border: 1px solid gray !important;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth;
+        padding: 0px;
+        margin: 0px;
+        max-height: 550px;
+        overflow-y: scroll;
+
+        &::-webkit-scrollbar {
+            width: 4px;
+        }
+
+        &::-webkit-scrollbar-thumb {
+            border-radius: 10px;
+            background: #c3c3c3;
+        }
+
+        &::-webkit-scrollbar-track {
+            border-radius: 0;
+            background: #f0f0f0;
+
+        }
+    }
+
+    .menu-ul {
+        display: none;
+        list-style: none;
+        background: #F0F0F0;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth;
+        bottom: $menuItemHeight;
+    }
+
+    .active {
+        position: absolute;
+        display: block !important;
+    }
+
+    .menu-ul-text {
+        font-size: 14px;
+        color: #000;
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li {
+        text-align: left;
+        background: #F0F0F0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-block {
+        display: flex;
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-text {
+        font-size: 14px;
+        color: #000;
+    }
+
+    .menu-li-text .status {
+        display: inline-block;
+        border-right: 1px inset #CACACA;
+        width: $width;
+    }
+
+    .menu-li-text .label {
+        display: inline-block;
+    }
+
+    .menu-separator {
+        text-align: left;
+        background: #F0F0F0;
+        height: 2px;
+        line-height: 2px;
+    }
+
+    .menu-separator .status {
+        display: inline-block;
+        border-right: 1px inset #CACACA;
+        width: $width;
+        height: 100%;
+        background: #EFECDE;
+    }
+
+    .menu-separator .separator {
+        display: inline-block;
+        background: #CACACA;
+        margin-left: 5px;
+        height: 2px;
+        width: $menuItemWidth - $width - 30px;
+    }
+
+    .menu-li-block:hover {
+        background: #C9DEF7;
+        box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuCancel.vue b/src/jmapNew/theme/ningbo_01/menus/menuCancel.vue
new file mode 100644
index 000000000..90d599739
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuCancel.vue
@@ -0,0 +1,150 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import { mapGetters } from 'vuex';
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { exitFullscreen } from '@/utils/screen';
+import { runDiagramQuit } from '@/api/simulation';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'CancelMenu',
+    components: {
+        PopMenu
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: [],
+            menuScreen: [
+                {
+                    label: '放大地图',
+                    handler: this.magnifyMap,
+                    disabled: false
+                },
+                {
+                    label: '缩小地图',
+                    handler: this.shrinkMap,
+                    disabled: false
+                },
+                {
+                    label: '返回',
+                    handler: this.back,
+                    disabled: false
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        isScreen() { // 大屏隐藏所有菜单
+            return this.$route.params.mode === 'dp' ||
+				this.$store.state.training.roles == 'BigScreen';
+        },
+        group() {
+            return this.$route.query.group;
+        }
+    },
+    watch: {
+        '$store.state.menuOperation.buttonOperation': function (val, old) {
+            if (!this.isScreen && this.menu && this.menu.length > 1) {
+                // this.menu[0].disabled = (this.menu[0] && val) ? true : true;
+                // this.menu[1].disabled = !((this.menu[1] && val));
+            }
+        },
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        initMenu() {
+            // this.menuNormal = [];
+            // this.stationList.forEach(station => {
+            //     if (station.code === station.concentrateStationCode) {
+            //         let node = {
+            //             label: station.name,
+            //             children: []
+            //         }
+
+            //         this.stationList.forEach(elem => {
+            //             if (elem.visible) {
+            //                 let next = elem;
+            //                 while (next.code != next.concentrateStationCode || !next.concentrateStationCode) {
+            //                     next = this.$store.getters['map/getDeviceByCode'](next.concentrateStationCode);
+            //                 }
+
+            //                 if (station.code == next.code) {
+            //                     node.children.push({
+            //                         code: elem.code,
+            //                         label: elem.name,
+            //                         handler: this.mapLocation,
+            //                     });
+            //                 }
+            //             }
+            //         })
+
+            //         this.menuNormal.push(node);
+            //     }
+            // });
+
+            if (this.isScreen) {
+                this.menu = [...this.menuScreen];
+            }
+            // else {
+            //     this.menu = [...this.menuNormal];
+            // }
+        },
+        doShow(point) {
+            this.clickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置地图定位
+        mapLocation(item) {
+            if (item) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: item.code });
+                this.doClose();
+            }
+        },
+        // 放大地图
+        magnifyMap() {
+            this.$store.dispatch('menuOperation/handleMagnifyCount');
+        },
+        // 缩小地图
+        shrinkMap() {
+            this.$store.dispatch('menuOperation/handleShrinkCount');
+        },
+        // 返回
+        async back() {
+            await runDiagramQuit(this.group);
+            EventBus.$emit('trainingSubscribeStop');
+            history.go(-1);
+            exitFullscreen();
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/twoConfirmation.vue
new file mode 100644
index 000000000..d15dda0a8
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm two-confirmation"
+    title="二次确认"
+    :visible.sync="show"
+    width="360px"
+    :before-close="doClose"
+    :show-close="false"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div class="context">
+      <template v-for="(message, index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </div>
+    <el-row class="button-group">
+      <el-col :span="10" :offset="3">
+        <el-button :id="show? domIdConfirm: ''" :loading="loading" @click="commit">确认</el-button>
+      </el-col>
+      <el-col :span="6" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">关闭</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+import NoticeInfo from '../../dialog/childDialog/childDialog/noticeInfo';
+
+export default {
+	name: 'TwoConfirmation',
+	components: {
+		NoticeInfo
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			operate: '',
+			timer: null,
+			domIdConfirm: ''
+		};
+	},
+	computed: {
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+		},
+		messages() {
+			if (this.operate) {
+				return this.operate.messages;
+			}
+			return [];
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		doShow(operate) {
+			this.domIdConfirm = '';
+			if (checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.forcedStationControl)) {
+				this.domIdConfirm = OperationEvent.StationControl.forcedStationControl.confirm.domId;
+			} else if (checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.requestStationControl)) {
+				this.domIdConfirm = OperationEvent.StationControl.requestStationControl.confirm.domId;
+			} else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+				this.domIdConfirm = OperationEvent.StationControl.requestCentralControl.confirm.domId;
+			}
+
+			this.operate = operate || {};
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+		},
+		cancel() {
+			const operate = {
+				type: this.operate.type,
+				operation: OperationEvent.Command.close.confirm.operation
+			};
+
+			this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.doClose();
+				}
+			});
+		},
+		commit() {
+			if (this.operate && this.operate.selection) {
+				const operate = {
+					send: true,
+					type: this.operate.type,
+					val: this.operate.val,
+					selection: this.operate.selection
+				};
+
+				if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.forcedStationControl)) {
+					operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation;
+				} else if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestStationControl)) {
+					operate.operation = OperationEvent.StationControl.requestStationControl.confirm.operation;
+				} else if (checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestCentralControl)) {
+					operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation;
+				}
+
+				this.loading = true;
+				this.doClose();
+				this.$emit('setOperate', { selection: this.operate.selection, commit: true });
+				this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+					if (valid) {
+						this.loading = false;
+						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					}
+				}, 1000).catch(() => {
+					this.loading = true;
+					this.$refs.noticeInfo.doShow(operate);
+				});
+			}
+		}
+	}
+};
+</script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue
new file mode 100644
index 000000000..2bea83e3e
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue
@@ -0,0 +1,162 @@
+<template>
+    <el-dialog class="chengdou-03__systerm user-add" :title="title" :visible.sync="show" width="420px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
+        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
+                <el-form-item label="工号:" prop="jobNumber">
+                    <el-input v-model="model.jobNumber"></el-input>
+                </el-form-item>
+                <el-form-item label="用户名:" prop="userName">
+                    <el-input v-model="model.userName"></el-input>
+                </el-form-item>
+                <el-form-item label="密码:" prop="password">
+                    <el-input type="password" v-model="model.password"></el-input>
+                </el-form-item>
+                <el-form-item label="确认密码:" prop="confirm">
+                    <el-input type="password" v-model="model.confirm"></el-input>
+                </el-form-item>
+
+            </el-form>
+        </div>
+        <el-row justify="center" class="button-group">
+            <el-col :span="8" :offset="6">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="0">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'UserAdd',
+        components: {
+        },
+        data() {
+            return {
+                operate: {},
+                operation: null,
+                dialogShow: false,
+                loading: false,
+                model: {
+                    type: 'ADD',
+                    jobNumber: '',
+                    userName: '',
+                    password: '',
+                    confirm: '',
+                },
+                rules: {
+                    jobNumber: [
+                        { required: true, message: '请输入工号', trigger: 'blur' }
+                    ],
+                    userName: [
+                        { required: true, message: '请输入用户名', trigger: 'blur' }
+                    ],
+                    password: [
+                        { required: true, message: '请输入密码', trigger: 'change' }
+                    ],
+                    confirm: [
+                        { required: true, message: '请再次输入密码', trigger: 'change' }
+                    ],
+                },
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'stationStandList'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+            },
+            title() {
+                return '增加用户'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                //非断电激活时设置初始值
+                if (!this.dialogShow) {
+                    this.loading = false;
+                    this.operate = operate || {};
+                    this.operation = operate.operation;
+                    this.$nextTick(() => {
+                        this.$refs.form.resetFields();
+                    });
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        let operate = {
+                            type: this.operate.type,
+                            operation: OperationEvent.Command.close.confirm.operation,
+                        }
+
+                        this.loading = true;
+                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                            this.loading = false;
+                            if (valid) {
+                                if (this.model.password === this.model.confirm) {
+                                    this.doClose();
+                                    this.$emit('operateUser', this.model);
+                                } else {
+                                    this.$messageBox('二次输入密码不一致');
+                                }
+                            }
+                        })
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); this.model });
+            }
+        }
+    }
+</script>
+<style scoped>
+    .chengdou-03__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue
new file mode 100644
index 000000000..631bcf2ea
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue
@@ -0,0 +1,144 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm user-delete"
+    :title="title"
+    :visible.sync="show"
+    width="260px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <span style="padding-left: 10px; padding-bottom: 10px">
+      <i class="el-icon-info" />
+      <template v-for="(message, index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </span>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="3">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="2">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/ConstDic';
+
+export default {
+	name: 'UserDelete',
+	components: {
+	},
+	data() {
+		return {
+			operate: {},
+			messages: [],
+			model: {
+				type: 'DELETE',
+				jobNumber: '',
+				userName: ''
+			},
+			operation: null,
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'stationStandList'
+		]),
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+		},
+		title() {
+			return '删除用户';
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		doShow(operate, selected) {
+			// 非断电激活时设置初始值
+			if (!this.dialogShow) {
+				this.loading = false;
+				this.operate = operate || {};
+				this.operation = operate.operation;
+				this.messages = operate.messages;
+				this.model.userName = '';
+				this.model.jobNumber = '';
+				if (selected) {
+					this.model.userName = selected.userName;
+					this.model.jobNumber = selected.jobNumber;
+				}
+			}
+
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+		},
+		commit() {
+			if (this.model.userName && this.model.jobNumber) {
+				const operate = {
+					type: this.operate.type,
+					operation: OperationEvent.Command.close.confirm.operation
+				};
+
+				this.loading = true;
+				this.$store.dispatch('training/next', operate).then(({ valid }) => {
+					this.loading = false;
+					if (valid) {
+						this.doClose();
+						this.$emit('operateUser', this.model);
+					}
+				});
+			} else {
+				this.$messageBox('选择的用户名或工号为空');
+			}
+		},
+		cancel() {
+			const operate = {
+				type: this.operate.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			}).catch(() => { this.doClose(); });
+		}
+	}
+};
+</script>
+<style scoped>
+    .chengdou-03__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue
new file mode 100644
index 000000000..95e4e8fa8
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue
@@ -0,0 +1,178 @@
+<template>
+    <el-dialog class="chengdou-03__systerm user-edit" :title="title" :visible.sync="show" width="420px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
+        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
+                <el-form-item label="工号:" prop="jobNumber">
+                    <el-input v-model="model.jobNumber" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="用户名:" prop="userName">
+                    <el-input v-model="model.userName" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="原始密码:" prop="oldPassword">
+                    <el-input type="oldPassword" v-model="model.oldPassword"></el-input>
+                </el-form-item>
+                <el-form-item label="密码:" prop="password">
+                    <el-input type="password" v-model="model.password"></el-input>
+                </el-form-item>
+                <el-form-item label="确认密码:" prop="confirm">
+                    <el-input type="password" v-model="model.confirm"></el-input>
+                </el-form-item>
+
+            </el-form>
+        </div>
+        <el-row justify="center" class="button-group">
+            <el-col :span="8" :offset="6">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="0">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'UserEdit',
+        components: {
+        },
+        data() {
+            return {
+                operate: {},
+                selected: {},
+                operation: null,
+                dialogShow: false,
+                loading: false,
+                model: {
+                    type: 'EDIT',
+                    jobNumber: '',
+                    userName: '',
+                    oldPassword: '',
+                    password: '',
+                    confirm: '',
+                },
+                rules: {
+                    jobNumber: [
+                        { required: true, message: '请输入工号', trigger: 'blur' }
+                    ],
+                    userName: [
+                        { required: true, message: '请输入用户名', trigger: 'blur' }
+                    ],
+                    oldPassword: [
+                        { required: true, message: '请输入原始密码', trigger: 'change' }
+                    ],
+                    password: [
+                        { required: true, message: '请输入新密码', trigger: 'change' }
+                    ],
+                    confirm: [
+                        { required: true, message: '请再次输入新密码', trigger: 'change' }
+                    ],
+                },
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'stationStandList'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+            },
+            title() {
+                return '用户编辑页面'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate, selected) {
+                //非断电激活时设置初始值
+                if (!this.dialogShow) {
+                    this.loading = false;
+                    this.operate = operate || {};
+                    this.operation = operate.operation;
+                    this.$nextTick(() => {
+                        this.$refs.form.resetFields();
+                        this.selected = selected;
+                        if (selected) {
+                            this.model.jobNumber = selected.jobNumber;
+                            this.model.userName = selected.userName;
+                        }
+                    });
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        let operate = {
+                            type: this.operate.type,
+                            operation: OperationEvent.Command.close.confirm.operation,
+                        }
+
+                        this.loading = true;
+                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                            this.loading = false;
+                            if (valid)
+                                if (this.selected.password !== this.model.oldPassword) {
+                                    this.$messageBox('原始密码错误');
+                                } else if (this.model.password !== this.model.confirm) {
+                                    this.$messageBox('二次输入的密码错误');
+                                } else if (this.model.oldPassword === this.model.password) {
+                                    this.$messageBox('老密码和新密相同');
+                                } else {
+                                    this.doClose();
+                                    this.$emit('operateUser', this.model);
+                                }
+                        })
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            }
+        }
+    }
+</script>
+<style scoped>
+    .chengdou-03__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue
new file mode 100644
index 000000000..698bd5429
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue
@@ -0,0 +1,131 @@
+<template>
+    <el-dialog class="chengdou-03__systerm manage-user" :title="title" :visible.sync="show" width="600px" :before-close="doClose"
+        :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <div style="height: 70px;">
+            <div style="position: relative; left: 10px;">
+            </div>
+            <div style="position: relative; left: 80px;">
+                <div style="width:100%">
+                    <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
+                    <el-button style="position: absolute; right: 95px;" :id="domIdConfirm" type="primary"
+                        :loading="loading" @click="commit">确定</el-button>
+                </div>
+                <div style="width:100%; padding-top: 20px">
+                    <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
+                </div>
+            </div>
+        </div>
+        <div style="padding: 10px;  margin: 5px; ">
+            <el-table :data="tableData" style="width: 100%;" height="400">
+                <el-table-column prop="moduleName" label="模块名称" width="180">
+                </el-table-column>
+                <el-table-column prop="version" label="版本" width="180">
+                </el-table-column>
+                <el-table-column prop="updateDate" label="修改日期">
+                </el-table-column>
+            </el-table>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'ManageUser',
+        data() {
+            return {
+                tableData: [
+                    {
+                        moduleName: '主程序版本:',
+                        version: '123',
+                        updateDate: '123'
+                    }
+                ],
+                operate: {},
+                operation: null,
+                dialogShow: false,
+                loading: false,
+                selected: null,
+            }
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+            },
+            title() {
+                return '关于ControlMonitor'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                //非断电激活时设置初始值
+                if (!this.dialogShow) {
+                    this.loading = false;
+                    this.operate = operate || {};
+                    this.operation = operate.operation;
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.close.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                })
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            }
+        }
+    }
+</script>
+<style scoped>
+    .chengdou-03__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/limitSpeed.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/limitSpeed.vue
new file mode 100644
index 000000000..0ac49d4d4
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/limitSpeed.vue
@@ -0,0 +1,135 @@
+<template>
+    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <el-row justify="center" class="button-group">
+            <el-col :span="10" :offset="2">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="4">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'TrainAdd',
+        components: {
+        },
+        data() {
+            return {
+                trainNoList: [],
+                addModel: {
+
+                },
+
+                rules: {
+                    // groupNumber: [
+                    //     { required: true, message: '请输入车次号', trigger: 'blur' }
+                    // ],                   
+                    // stationStandCode: [
+                    //     { required: true, message: '请选择终端', trigger: 'change' }
+                    // ],
+                },
+                operation: null,
+                dialogShow: false,
+                loading: false,
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'stationStandList'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
+            },
+            title() {
+                return '设置限速'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+
+                if (!this.dialogShow) {
+                    this.loading = false;
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        let operate = {
+                            send: true,
+                            type: MapDeviceType.Train.type,
+                            operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
+                        }
+
+                        this.loading = true;
+                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                            this.loading = false;
+                            if (valid) {
+                                this.doClose();
+                            } else {
+                                // this.$refs.noticeInfo.doShow(operate);
+                            }
+                        }).catch(error => {
+                            this.loading = false;
+                            this.doClose();
+                            // this.$refs.noticeInfo.doShow(operate);
+                        })
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            cancel() {
+                let operate = {
+                    type: MapDeviceType.Train.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            }
+        }
+    }
+</script>
+<style scoped>
+    .chengdou-03__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue
new file mode 100644
index 000000000..f7a2e1589
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue
@@ -0,0 +1,290 @@
+<template>
+    <el-dialog class="chengdou-03__systerm manage-user" :title="title" :visible.sync="show" width="420px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
+            <span class="base-label">用户列表</span>
+            <el-row>
+                <el-col :span="18">
+                    <el-table ref="multipleTable" :data="tableData" border row-key="code" style="width: 100%"
+                        height="450" center size="mini" highlight-current-row @row-click="chooseUser">
+                        <el-table-column prop="jobNumber" label="工号" width="120">
+                            <template slot-scope="scope">
+                                <span>{{scope.row.jobNumber}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="userName" label="用户名">
+                            <template slot-scope="scope">
+                                <span>{{scope.row.userName}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column width="20">
+                        </el-table-column>
+                    </el-table>
+                </el-col>
+                <el-col :span="4">
+                    <el-button style="margin-top: 140px; margin-left: 10px;" :id="domIdFreshUser" @click="freshUser">刷新
+                    </el-button>
+                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdAddUser" @click="addUser">增加
+                    </el-button>
+                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdEditUser" @click="editUser">修改
+                    </el-button>
+                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdDelUser" @click="delUser">删除
+                    </el-button>
+                </el-col>
+            </el-row>
+        </div>
+        <el-row justify="center" class="button-group">
+            <el-col :span="8" :offset="6">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="0">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+        <user-add ref="userAdd" @operateUser="operateUser"></user-add>
+        <user-edit ref="userEdit" @operateUser="operateUser"></user-edit>
+        <user-delete ref="userDelete" @operateUser="operateUser"></user-delete>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import UserAdd from './childDialog/userAdd';
+    import UserEdit from './childDialog/userEdit';
+    import UserDelete from './childDialog/userDelete';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'ManageUser',
+        components: {
+            UserAdd,
+            UserEdit,
+            UserDelete
+        },
+        data() {
+            return {
+                tableData: [],
+                operate: {},
+                operation: null,
+                dialogShow: false,
+                loading: false,
+                selected: null,
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'stationStandList'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdAddUser() {
+                return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
+            },
+            domIdEditUser() {
+                return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
+            },
+            domIdDelUser() {
+                return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
+            },
+            domIdFreshUser() {
+                return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
+            },
+            domIdChooseUser() {
+                return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+            },
+            title() {
+                return '用户管理'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                //非断电激活时设置初始值
+                if (!this.dialogShow) {
+                    this.loading = false;
+                    this.operate = operate || {};
+                    this.operation = operate.operation;
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            //添加用户
+            addUser() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.addUser.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.$refs.userAdd.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                })
+            },
+            //编辑用户
+            editUser() {
+                if (this.selected) {
+                    let operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.manage.editUser.operation,
+                    }
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.$refs.userEdit.doShow(operate, this.selected);
+                        }
+                    }).catch(error => {
+                        this.loading = false;
+                    })
+                } else {
+                    this.$messageBox('请先选择用户');
+                }
+            },
+            //删除用户
+            delUser() {
+                if (this.selected) {
+                    let operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.manage.delUser.operation,
+                        messages: [`你确定删除用户${this.selected.userName}吗？`]
+                    }
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.$refs.userDelete.doShow(operate, this.selected);
+                        }
+                    }).catch(error => {
+                        this.loading = false;
+                    })
+                } else {
+                    this.$messageBox('请先选择用户');
+                }
+            },
+            //刷新用户
+            freshUser() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.freshUser.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                }).catch(error => {
+                    this.loading = false;
+                })
+            },
+            //选择用户
+            chooseUser(row) {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.chooseUser.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    this.selected = row;
+                }).catch(error => {
+                    this.loading = false;
+                })
+            },
+            commit() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.close.menu.operation,
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                    this.doClose();
+                })
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            },
+            //增删改函数处理
+            operateUser(data) {
+                if (data && data.type === 'ADD') {
+                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
+                    if (index < 0) {
+                        this.tableData.push({
+                            jobNumber: data.jobNumber,
+                            userName: data.userName,
+                            password: data.password
+                        });
+                    } else {
+                        this.$messageBox('添加失败，存在相同工号的用户');
+                    }
+                } else if (data && data.type === 'EDIT') {
+                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
+                    if (index >= 0) {
+                        this.tableData[index].password = data.password;
+                        this.tableData[index].userName = data.userName;
+                    } else {
+                        this.$messageBox('修改失败');
+                    }
+                } else if (data && data.type === 'DELETE') {
+                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
+                    if (index >= 0) {
+                        this.tableData.splice(index, 1);
+                    } else {
+                        this.$messageBox('删除失败');
+                    }
+                }
+            }
+        }
+    }
+</script>
+<style scoped>
+    .chengdou-03__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -10px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/passwordBox.vue
new file mode 100644
index 000000000..9feaf8232
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/passwordBox.vue
@@ -0,0 +1,221 @@
+<template>
+    <el-dialog class="chengdou-03__systerm password-box" title="密码框" :visible.sync="show" width="320px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <div class="context" style="overflow:hidden">
+            <el-form label-width="80px" size="mini">
+                <el-form-item prop="username">
+                    <span slot="label">用户名：</span>
+                    <el-input v-model="model.username" disabled></el-input>
+                </el-form-item>
+                <el-form-item prop="password">
+                    <span slot="label">密&emsp;码：</span>
+                    <el-input type="password" v-model="model.password"></el-input>
+                </el-form-item>
+            </el-form>
+            <div class="operate">
+                <el-button-group class="left" v-model="key" size="mini">
+                    <el-button size="mini" @click="click(1)">1</el-button>
+                    <el-button size="mini" @click="click(2)">2</el-button>
+                    <el-button size="mini" @click="click(3)">3</el-button>
+                    <el-button size="mini" @click="click(4)">4</el-button>
+                    <el-button size="mini" @click="click(5)">5</el-button>
+                </el-button-group>
+                <el-button-group class="right" v-model="key" size="mini">
+                    <el-button @click="esc">回退</el-button>
+                </el-button-group>
+                <el-button-group class="left" v-model="key" size="mini">
+                    <el-button size="mini" @click="click(6)">6</el-button>
+                    <el-button size="mini" @click="click(7)">7</el-button>
+                    <el-button size="mini" @click="click(8)">8</el-button>
+                    <el-button size="mini" @click="click(9)">9</el-button>
+                    <el-button size="mini" @click="click(0)">0</el-button>
+                </el-button-group>
+                <el-button-group class="right" v-model="key" size="mini">
+                    <el-button @click="clr">清空</el-button>
+                </el-button-group>
+            </div>
+        </div>
+        <el-row class="button-group">
+            <el-col :span="6" :offset="4">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="6" :offset="4">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+        <notice-info ref="noticeInfo"></notice-info>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+    import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+
+    export default {
+        name: 'PasswordBox',
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                operate: null,
+                operation: null,
+                model: {
+                    username: '',
+                    password: '',
+                },
+                key: ''
+            }
+        },
+        components: {
+            NoticeInfo
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.close.password.domId : '';
+            },
+            domIdConfirm() {
+                if (this.dialogShow) {
+                    if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                        /** 强制站控*/
+                        return OperationEvent.StationControl.forcedStationControl.passwordConfirm.domId;
+                    }
+                }
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            loadInitData(operate) {
+                this.model.username = '';
+                this.model.password = '';
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.model.username = this.$store.state.user.name;
+            },
+            doShow(operate) {
+                /** 如果不是断点激活，而是第一次显示需要初始化数据*/
+                if (!this.dialogShow) {
+                    this.loadInitData(operate);
+                }
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.close.password.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                })
+            },
+            commit() {
+                let operate = {
+                    type: this.operate.type,
+                }
+
+                if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                    /** 强制站控*/
+                    operate.operation = OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation
+                }
+
+                if (this.model.password == '123456') {
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+
+                        if (valid) {
+                            this.$emit('setLoginResult', {
+                                operation: operate.operation,
+                                success: valid
+                            });
+                            this.doClose();
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.$emit('setLoginResult', {
+                            operation: operate.operation,
+                            success: false
+                        });
+                    })
+                } else {
+                    this.$refs.noticeInfo.doShow(operate, ['密码输入错误！']);
+
+                }
+            },
+            click(key) {
+                if (!this.model.password) {
+                    this.model.password = '';
+                }
+                this.model.password += key;
+            },
+            esc() {
+                if (this.model.password) {
+                    this.model.password = this.model.password.substring(0, this.model.password.length - 1);
+                }
+            },
+            clr() {
+                this.model.password = '';
+            }
+
+        }
+    }
+
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+
+
+    .password-box .el-form {
+        margin-top: 10px !important;
+        margin-right: 20px !important;
+    }
+
+    .password-box .el-form-item {
+        margin-bottom: 5px !important;
+    }
+
+    .password-box .context {
+        height: 170px !important;
+    }
+
+    .password-box .operate {
+        margin-top: 10px !important;
+        padding-bottom: 10px !important;
+    }
+
+    .password-box .left {
+        margin-left: 10px !important;
+    }
+
+    .password-box .left .el-button {
+        color: #000;
+        background: #F0F0F0;
+        text-align: center;
+        width: 30px !important;
+    }
+
+    .password-box .right {
+        color: #000;
+        margin-left: 10px !important;
+        background: #F0F0F0;
+        width: 80px !important;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/setLimitSpeed.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/setLimitSpeed.vue
new file mode 100644
index 000000000..6f19587a8
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/setLimitSpeed.vue
@@ -0,0 +1,275 @@
+<template>
+    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="800px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <el-row>
+            <el-col :span="14">
+                <div class="card-box">
+                    <span class="tip-label">请求</span>
+                    <el-row style="margin: 5px">
+                        <el-col :span="6" class="item-label">线路选择</el-col>
+                        <el-col :span="6">
+                            <el-select v-model="data.path">
+                                <el-option v-for="item in pathList" :key="item.value" :label="item.name"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-col>
+                        <el-col :span="6" class="item-label">限制速度</el-col>
+                        <el-col :span="6">
+                            <el-select v-model="data.speed">
+                                <el-option v-for="item in speedList" :key="item.value" :label="item.name"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="6" class="item-label">起始公里标</el-col>
+                        <el-col :span="6">
+                            <el-input v-model="data.begKmPost"></el-input>
+                        </el-col>
+                        <el-col :span="6" class="item-label">结束公里标</el-col>
+                        <el-col :span="6">
+                            <el-input v-model="data.endKmPost"></el-input>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="6" class="item-label">限速区段长度</el-col>
+                        <el-col :span="6">
+                            <el-input v-model="data.length"></el-input>
+                        </el-col>
+                        <el-col :span="3">
+                            <el-button>查看</el-button>
+                        </el-col>
+                        <el-col :span="3">
+                            <el-button>请求</el-button>
+                        </el-col>
+                    </el-row>
+                </div>
+                <div class="card-box">
+                    <span class="tip-label">执行</span>
+                    <el-row style="margin: 5px">
+                        <el-col :span="6" class="item-label">线路选择</el-col>
+                        <el-col :span="6">
+                            <el-select v-model="form.path">
+                                <el-option v-for="item in pathList" :key="item.value" :label="item.name"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-col>
+                        <el-col :span="6" class="item-label">限制速度</el-col>
+                        <el-col :span="6">
+                            <el-select v-model="form.speed">
+                                <el-option v-for="item in speedList" :key="item.value" :label="item.name"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="6" class="item-label">起始公里标</el-col>
+                        <el-col :span="6">
+                            <el-input v-model="form.begKmPost"></el-input>
+                        </el-col>
+                        <el-col :span="6" class="item-label">结束公里标</el-col>
+                        <el-col :span="6">
+                            <el-input v-model="form.endKmPost"></el-input>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="6" class="item-label">限速区段长度</el-col>
+                        <el-col :span="6">
+                            <el-input v-model="form.length"></el-input>
+                        </el-col>
+                        <el-col :span="3">
+                            <el-button>查看</el-button>
+                        </el-col>
+                        <el-col :span="3">
+                            <el-button>请求</el-button>
+                        </el-col>
+                    </el-row>
+                </div>
+                <div class="card-box">
+                    <span class="tip-label">操作提示</span>
+                    11111113
+                </div>
+            </el-col>
+            <el-col :span="9" :offset="1">
+                <div class="card-box">
+                    <span class="tip-label">设备列表</span>
+                    <el-table class="card-table" :data="deviceData" border style="width: 100%" height="300">
+                        <el-table-column prop="stationName" label="站名">
+                        </el-table-column>
+                        <el-table-column prop="deviceCode" label="设备号">
+                        </el-table-column>
+                        <el-table-column prop="deviceName" label="设备名">
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </el-col>
+        </el-row>
+        <el-row justify="center" class="button-group">
+            <el-col :span="10" :offset="2">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="4">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'TrainAdd',
+        components: {
+        },
+        data() {
+            return {
+                operation: null,
+                dialogShow: false,
+                loading: false,
+                data: {
+                    path: '',
+                    speed: '',
+                    begKmPost: '',
+                    endKmPost: '',
+                    length: '',
+                },
+                form: {
+                    path: '',
+                    speed: '',
+                    begKmPost: '',
+                    endKmPost: '',
+                    length: '',
+                },
+                pathList: [
+                    { name: '上行站线', value: '01' },
+                    { name: '下行站线', value: '02' }
+                ],
+                speedList: [
+                    { name: '10Km/h', value: '10' },
+                    { name: '15Km/h', value: '15' },
+                    { name: '20Km/h', value: '20' },
+                    { name: '25Km/h', value: '25' },
+                ],
+                deviceData: []
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'stationStandList'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
+            },
+            title() {
+                return '设置临时限速'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+
+                if (!this.dialogShow) {
+                    this.loading = false;
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        let operate = {
+                            send: true,
+                            type: MapDeviceType.Train.type,
+                            operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
+                        }
+
+                        this.loading = true;
+                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                            this.loading = false;
+                            if (valid) {
+                                this.doClose();
+                            } else {
+                                // this.$refs.noticeInfo.doShow(operate);
+                            }
+                        }).catch(error => {
+                            this.loading = false;
+                            this.doClose();
+                            // this.$refs.noticeInfo.doShow(operate);
+                        })
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            cancel() {
+                let operate = {
+                    type: MapDeviceType.Train.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            }
+        }
+    }
+</script>
+<style scoped>
+    .chengdou-03__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+
+    .card-box {
+        border: 1px solid #c0c0c0;
+        margin-bottom: 20px;
+    }
+
+    .card-table {
+        position: relative;
+        top: -15px;
+    }
+
+    .tip-label {
+        position: relative;
+        left: 5px;
+        top: -15px;
+        background: #ECE9D8;
+    }
+
+    .item-label {
+        text-align: center;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControlConvert.vue
new file mode 100644
index 000000000..4bd00cc1b
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControlConvert.vue
@@ -0,0 +1,414 @@
+<template>
+    <el-dialog class="chengdou-03__systerm station-control-convert" title="控制模式转换" :visible.sync="show" width="700px"
+        :before-close="doClose" :showClose="true" :zIndex="2000" :modal="false" :close-on-click-modal="false"
+        v-dialogDrag>
+        <el-table ref="multipleTable" :data="tableData" border row-key="code" style="width: 100%" height="250" center
+            size="mini" highlight-current-row>
+            <el-table-column prop="check" label="选择" width="60" :id="domIdChoose" style="margin-left:30px">
+                <template slot-scope="scope">
+                    <el-checkbox ref="check" v-model="scope.row.check" :disabled="scope.row.disabled"></el-checkbox>
+                </template>
+            </el-table-column>
+            <el-table-column prop="operate" label="操作区域" width="140">
+                <template slot-scope="scope">
+                    <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{scope.row.operate}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="control" label="控制模式" width="80">
+                <template slot-scope="scope">
+                    <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{scope.row.control}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="status" label="中心-车站通信状态" width="140">
+                <template slot-scope="scope">
+                    <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{scope.row.status}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="result" label="转换执行状态">
+                <template slot-scope="scope">
+                    <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{scope.row.result}}</span>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-row class="button-group">
+            <el-col :span="10" :offset="3">
+                <el-button v-if="isFork" :id="domIdFork" :disabled="disabledCommit" @click="forkCommit">强制站控</el-button>
+                <el-button v-if="isRequest" :id="domIdRequest" :disabled="disabledCommit" @click="requestCommit">请求站控
+                </el-button>
+                <el-button v-if="isConter" :id="domIdConter" :disabled="disabledCommit" @click="conterCommit">请求中控
+                </el-button>
+            </el-col>
+            <el-col :span="6" :offset="4">
+                <el-button :id="domIdCancel" :disabled="disabledClose" @click="cancel">关闭</el-button>
+            </el-col>
+        </el-row>
+        <two-confirmation ref="twoConfirmation" @setOperate="getOperate"></two-confirmation>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, TrainingMode, OperationEvent, getDomIdByOperation, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+    import TwoConfirmation from './childDialog/twoConfirmation';
+
+    export default {
+        name: 'StationControlConvert',
+        data() {
+            return {
+                operate: null,
+                dialogShow: false,
+                disabledSend: false,
+                disabledSure: false,
+                disabledClose: false,
+                operation: '',
+                controlProps: {
+                    '01': '中控',
+                    '02': '站控'
+                },
+                selection: [],
+                tableData: [],
+                timer: null,
+                count: 0,
+                backOperate: '',
+                timeout: 61,
+            }
+        },
+        components: {
+            TwoConfirmation
+        },
+        computed: {
+            ...mapGetters('map', [
+                'stationList',
+                'stationControlList',
+            ]),
+            ...mapGetters('training', [
+                'mode',
+                'started'
+            ]),
+            disabledCommit() {
+                return this.disabledSend || this.disabledSure;
+            },
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            isFork() {
+                if (this.dialogShow) {
+                    return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)
+                }
+            },
+            isRequest() {
+                if (this.dialogShow) {
+                    return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)
+                }
+            },
+            isConter() {
+                if (this.dialogShow) {
+                    return checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)
+                }
+            },
+            domIdChoose() {
+                if (this.dialogShow) {
+                    if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                        return OperationEvent.StationControl.forcedStationControl.choose.domId
+                    } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                        return OperationEvent.StationControl.requestStationControl.choose.domId
+                    } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                        return OperationEvent.StationControl.requestCentralControl.choose.domId
+                    }
+                }
+            },
+            domIdConter() {
+                return this.dialogShow ? OperationEvent.StationControl.requestCentralControl.menu.domId : '';
+            },
+            domIdFork() {
+                return this.dialogShow ? OperationEvent.StationControl.forcedStationControl.menu.domId : '';
+            },
+            domIdRequest() {
+                return this.dialogShow ? OperationEvent.StationControl.requestStationControl.menu.domId : '';
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            }
+        },
+        watch: {
+            '$store.state.socket.msgHead': function (elem) {
+                if (elem) {
+                    if (elem.hasOwnProperty('timeout')) {
+                        this.updateTableValue(elem.stationControlCode, { result: `接受转换应答超时` }, false);
+                    } else if (elem.hasOwnProperty('success')) {
+                        if (elem.success) {
+                            this.updateTableValue(elem.stationControlCode, { result: '控制模式转换成功' }, true);
+                        } else {
+                            this.updateTableValue(elem.stationControlCode, { result: `控制模式转换失败` }, false);
+                        }
+                    }
+                }
+            },
+            backOperate: function (operate) {
+                if (this.dialogShow && operate) {
+                    if (operate.selection && operate.selection.length) {
+                        operate.selection.forEach(elem => {
+                            if (operate.commit) {
+                                this.updateTableValue(elem.code, { result: `已发送转换请求，${this.timeout}秒后超时.` }, false);
+                            } else if (operate.cancel) {
+                                this.updateTableValue(elem.code, { result: '' }, false);
+                            }
+                        })
+                    }
+                }
+            },
+            //深度数据状态
+            tableData: {
+                handler(val, oldVal) {
+                    this.checkTableDataSelction(val);
+                },
+                deep: true
+            }
+        },
+        mounted() {
+            this.loadTableData();
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            updateTableValue(code, result, success) {
+                this.tableData.forEach((row, index) => {
+                    if (row.code == code) {
+                        for (let prop in result) {
+                            row[prop] = result[prop];
+                        }
+                        if (success) {
+                            if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                                row.control = this.controlProps['02'];  //01:中控， 02:站控
+                            } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                                row.control = this.controlProps['01'];  //01:中控， 02:站控
+                            }
+                            row.disabled = true;
+                            row.check = false;
+                        }
+                    }
+                })
+            },
+            checkTableDataSelction(data) {
+                let selection = [];
+                if (data && data.length > 0) {
+                    data.forEach(row => {
+                        if (row.check && !row.disabled) {
+                            selection.push(row);
+                        }
+                    })
+                }
+
+                this.disabledSend = selection.length ? false : true;
+                if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
+                    this.handleChooseChange(selection);
+                    this.selection = selection;
+                }
+            },
+            checkBoxDisabled(row) {
+                let control = (this.$store.getters('map/getDeviceByCode')(row.code) || {});
+                if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                    if (control && control.status == '02') { //01:中控， 02:站控
+                        return true;
+                    }
+                } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                    if (control && control.status == '01') { //01:中控， 02:站控
+                        return true;
+                    }
+                }
+
+            },
+            loadTableData() {
+                this.tableData = [];
+                this.stationControlList.forEach(control => {
+                    let station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                    this.tableData.push({
+                        code: control.code,
+                        operate: station.name || '',
+                        control: '',
+                        check: false,
+                        disabled: false,
+                        status: '正常',
+                        result: '',
+                    });
+                })
+            },
+            initTableDataStatus() {
+                this.tableData.forEach(row => {
+                    row.disabled = this.checkBoxDisabled(row);
+                    row.check = false;
+                    row.result = '';
+                    let control = (this.$store.getters('map/getDeviceByCode')(row.code) || {}).state;
+                    if (control) {
+                        row.control = this.controlProps[control.status];
+                    }
+                })
+            },
+            doShow(operate) {
+                if (!this.dialogShow) {
+                    this.operate = operate || {};
+                    this.operation = operate.operation;
+                    this.disabledSure = false;
+                    this.initTableDataStatus();
+                }
+                this.dialogShow = true;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            doClose() {
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+                this.$refs.multipleTable.setCurrentRow();
+            },
+            cancel() {
+                let operate = {
+                    type: 'bar',
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                })
+            },
+            clearTimer() {
+                this.count = 0;
+                if (this.timer) {
+                    clearInterval(this.timer);
+                    this.timer = null;
+                }
+            },
+            serializeCodeListWithSeparator(sep) {
+                let codeList = [];
+                if (this.selection && this.selection.length) {
+                    this.selection.forEach(elem => {
+                        codeList.push(elem.code);
+                    })
+                }
+                return codeList.join(sep);
+            },
+            handleChooseChange(selection) {
+                this.selection = selection;
+                if (selection && selection.length) {
+                    let operate = {
+                        type: MapDeviceType.StationControl.type,
+                        operation: '',
+                        val: this.serializeCodeListWithSeparator('::'),
+                        selection: selection
+                    }
+
+                    if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
+                        operate.operation = OperationEvent.StationControl.forcedStationControl.choose.operation
+                    } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+                        operate.operation = OperationEvent.StationControl.requestStationControl.choose.operation
+                    } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+                        operate.operation = OperationEvent.StationControl.requestCentralControl.choose.operation
+                    }
+
+                    this.disabledSure = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        if (valid) {
+                            this.disabledSure = false;
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        }
+                    })
+                } else if (!selection) {
+                    this.$messageBox('请选择一条数据');
+                }
+            },
+            requestCommit() {
+                let operate = {
+                    type: MapDeviceType.StationControl.type,
+                    messages: ['确认将如下操作区域的控制模式由中控转为站控:'],
+                    operation: OperationEvent.StationControl.requestStationControl.menu.operation,
+                    val: this.serializeCodeListWithSeparator('::'),
+                    selection: this.selection
+                }
+
+                this.selection.forEach((elem, index) => {
+                    operate.messages.push(`操作区域${index + 1}:${elem.operate}`);
+                });
+
+                this.disabledSure = true;
+                this.disabledClose = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.twoConfirmation.doShow(operate);
+                    } else {
+                        this.disabledSure = false;
+                    }
+                }).catch((error) => {
+                    this.disabledSure = false;
+                    this.disabledClose = false;
+                })
+            },
+            forkCommit() {
+                let operate = {
+                    type: MapDeviceType.StationControl.type,
+                    messages: ['确认将如下操作区域的控制模式由中控转为站控:'],
+                    operation: OperationEvent.StationControl.forcedStationControl.menu.operation,
+                    val: this.serializeCodeListWithSeparator('::'),
+                    selection: this.selection
+                }
+
+                this.selection.forEach((elem, index) => {
+                    operate.messages.push(`操作区域${index + 1}:${elem.operate}`);
+                });
+
+                this.disabledSure = true;
+                this.disabledClose = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.twoConfirmation.doShow(operate);
+                    } else {
+                        this.disabledSure = false;
+                    }
+                }).catch(() => {
+                    this.disabledSure = false;
+                    this.disabledClose = false;
+                })
+            },
+            conterCommit() {   // 请求中控
+                let operate = {
+                    type: MapDeviceType.StationControl.type,
+                    messages: ['确认将如下操作区域的控制模式由站控转为中控:'],
+                    operation: OperationEvent.StationControl.requestCentralControl.menu.operation,
+                    val: this.serializeCodeListWithSeparator('::'),
+                    selection: this.selection
+                }
+
+                this.selection.forEach((elem, index) => {
+                    operate.messages.push(`操作区域${index + 1}:${elem.operate}`);
+                });
+
+                this.disabledSure = true;
+                this.disabledClose = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.twoConfirmation.doShow(operate);
+                    } else {
+                        this.disabledSure = false;
+                    }
+                }).catch(() => {
+                    this.disabledSure = false;
+                    this.disabledClose = false;
+                })
+            },
+            getOperate(operate) {
+                this.backOperate = operate;
+                if (operate.cancel) {
+                    this.disabledClose = false;
+                    this.disabledSure = this.disabledSend = false;
+                }
+                if (operate.commit || operate.timeout) {
+                    this.disabledSend = this.disabledSure = true;
+                    this.disabledClose = false;
+                }
+            }
+        }
+    }
+</script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue
new file mode 100644
index 000000000..7ddcff22c
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue
@@ -0,0 +1,162 @@
+<template>
+    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
+            <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
+                <span class="base-label">添加位置</span>
+                <div style="position: relative; top:-10px;">
+                    <el-form-item prop="stationStandCode">
+                        <span slot="label">终&emsp;&emsp;&emsp;端:</span>
+                        <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
+                            <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
+                                :value="item.code">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="前车车次号:" prop="trainNumberLimber">
+                        <el-input v-model="addModel.trainNumberLimber"></el-input>
+                    </el-form-item>
+                </div>
+            </div>
+            <el-form-item label="添加车次号:" label-width="115px" prop="groupNumber">
+                <el-input v-model="addModel.groupNumber"></el-input>
+            </el-form-item>
+        </el-form>
+        <el-row justify="center" class="button-group">
+            <el-col :span="10" :offset="2">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="4">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'TrainAdd',
+        components: {
+        },
+        data() {
+            return {
+                trainNoList: [],
+                addModel: {
+                    groupNumber: '',
+                    stationStandCode: '',
+                    trainNumberLimber: '',
+                },
+
+                rules: {
+                    groupNumber: [
+                        { required: true, message: '请输入车次号', trigger: 'blur' }
+                    ],
+                    // trainNumberLimber: [
+                    //     { required: true, message: '请输入前车车次号', trigger: 'blur' }
+                    // ],
+                    stationStandCode: [
+                        { required: true, message: '请选择终端', trigger: 'change' }
+                    ],
+                },
+                operation: null,
+                dialogShow: false,
+                loading: false,
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'stationStandList'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
+            },
+            title() {
+                return '添加计划车'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+
+                //非断电激活时设置初始值
+                if (!this.dialogShow) {
+                    this.loading = false;
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        let operate = {
+                            send: true,
+                            type: MapDeviceType.Train.type,
+                            operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
+                        }
+
+                        this.loading = true;
+                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                            this.loading = false;
+                            if (valid) {
+                                this.doClose();
+                            } else {
+                                // this.$refs.noticeInfo.doShow(operate);
+                            }
+                        }).catch(error => {
+                            this.loading = false;
+                            this.doClose();
+                            // this.$refs.noticeInfo.doShow(operate);
+                        })
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            cancel() {
+                let operate = {
+                    type: MapDeviceType.Train.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            }
+        }
+    }
+</script>
+<style scoped>
+    .chengdou-03__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue
new file mode 100644
index 000000000..398ccb370
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue
@@ -0,0 +1,149 @@
+<template>
+    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
+            <el-form-item prop="stationStandCode">
+                <span slot="label">终&emsp;&emsp;端:</span>
+                <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
+                    <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="车 次 号:" prop="groupNumber">
+                <el-input v-model="addModel.groupNumber"></el-input>
+            </el-form-item>
+        </el-form>
+        <el-row justify="center" class="button-group">
+            <el-col :span="10" :offset="2">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="4">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'TrainAdd',
+        components: {
+        },
+        data() {
+            return {
+                trainNoList: [],
+                addModel: {
+                    groupNumber: '',
+                    stationStandCode: '',
+                },
+
+                rules: {
+                    groupNumber: [
+                        { required: true, message: '请输入车次号', trigger: 'blur' }
+                    ],
+                    stationStandCode: [
+                        { required: true, message: '请选择终端', trigger: 'change' }
+                    ],
+                },
+                operation: null,
+                dialogShow: false,
+                loading: false,
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'stationStandList'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : '';
+            },
+            title() {
+                return '删除计划车'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+
+                //非断电激活时设置初始值
+                if (!this.dialogShow) {
+                    this.loading = false;
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        let operate = {
+                            send: true,
+                            type: MapDeviceType.Train.type,
+                            operation: OperationEvent.Command.planTrain.delPlanTrain.operation,
+                        }
+
+                        this.loading = true;
+                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                            this.loading = false;
+                            if (valid) {
+                                this.doClose();
+                            } else {
+                                // this.$refs.noticeInfo.doShow(operate);
+                            }
+                        }).catch(error => {
+                            this.loading = false;
+                            this.doClose();
+                            // this.$refs.noticeInfo.doShow(operate);
+                        })
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            cancel() {
+                let operate = {
+                    type: MapDeviceType.Train.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            }
+        }
+    }
+</script>
+<style scoped>
+    .chengdou-03__systerm .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -5px;
+        top: -18px;
+        padding: 0 5px;
+        background-color: #F0F0F0;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue
new file mode 100644
index 000000000..c82352003
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue
@@ -0,0 +1,152 @@
+<template>
+    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
+            <el-form-item label="车 次 号:" label-width="115px" prop="groupNumber">
+                <el-input v-model="addModel.groupNumber"></el-input>
+            </el-form-item>
+            <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
+                <span class="base-label">目的</span>
+                <div style="position: relative; top:-10px;">
+                    <el-form-item prop="stationStandCode">
+                        <span slot="label">终&emsp;&emsp;端:</span>
+                        <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
+                            <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
+                                :value="item.code">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="车 次 号:" prop="trainNumberLimber">
+                        <el-input v-model="addModel.trainNumberLimber"></el-input>
+                    </el-form-item>
+                </div>
+            </div>
+        </el-form>
+        <el-row justify="center" class="button-group">
+            <el-col :span="10" :offset="2">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="8" :offset="4">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+
+    export default {
+        name: 'TrainTranstalet',
+        components: {
+        },
+        data() {
+            return {
+                trainNoList: [],
+                addModel: {
+                    groupNumber: '',
+                    stationStandCode: '',
+                    trainNumberLimber: '',
+                },
+
+                rules: {
+                    groupNumber: [
+                        { required: true, message: '请输入车次号', trigger: 'blur' }
+                    ],
+                    trainNumberLimber: [
+                        { required: true, message: '请输入前车车次号', trigger: 'blur' }
+                    ],
+                    stationStandCode: [
+                        { required: true, message: '请选择终端', trigger: 'change' }
+                    ],
+                },
+                operation: null,
+                dialogShow: false,
+                loading: false,
+            }
+        },
+        computed: {
+            ...mapGetters('map', [
+                'stationStandList'
+            ]),
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : '';
+            },
+            title() {
+                return '平移计划车'
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+
+                //非断电激活时设置初始值
+                if (!this.dialogShow) {
+                    this.loading = false;
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            commit() {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        let operate = {
+                            send: true,
+                            type: MapDeviceType.Train.type,
+                            operation: OperationEvent.Command.planTrain.translatPlanTrain.operation,
+                        }
+
+                        this.loading = true;
+                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                            this.loading = false;
+                            if (valid) {
+                                this.doClose();
+                            } else {
+                                // this.$refs.noticeInfo.doShow(operate);
+                            }
+                        }).catch(error => {
+                            this.loading = false;
+                            this.doClose();
+                            // this.$refs.noticeInfo.doShow(operate);
+                        })
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            cancel() {
+                let operate = {
+                    type: MapDeviceType.Train.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(error => { this.doClose(); });
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/viewDevice.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/viewDevice.vue
new file mode 100644
index 000000000..dd4fc2e38
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/viewDevice.vue
@@ -0,0 +1,166 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm view-display"
+    title="设备显示设置"
+    :visible.sync="show"
+    width="240px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-checkbox-group v-model="deviceLevels">
+      <div>
+        <el-checkbox :label="1">车次窗</el-checkbox>
+      </div>
+      <div>
+        <el-checkbox :label="2">区段边界</el-checkbox>
+      </div>
+      <div>
+        <el-checkbox :label="3">联锁自动进路表示灯</el-checkbox>
+      </div>
+      <div>
+        <el-checkbox :label="4">ATS自动触发表示灯</el-checkbox>
+      </div>
+    </el-checkbox-group>
+    <el-row class="button-group">
+      <el-col :span="8" :offset="2">
+        <el-button :id="domIdConfirm" class="commit" type="primary" :loading="loading" @click="commit">确定
+        </el-button>
+      </el-col>
+      <el-col :span="8" :offset="3">
+        <el-button :id="domIdCancel" class="cancal" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
+</template>
+
+<script>
+import { OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+import deviceType from '@/jmap/constant/deviceType';
+
+export default {
+	name: 'ViewDevice',
+	components: {
+		NoticeInfo
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			operate: null,
+			operation: '',
+			deviceLevels: [2, 3, 4, 5]
+		};
+	},
+	computed: {
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+		},
+		domIdConfirm() {
+			return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+		}
+
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.setDeviceDisplay();
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		doShow(operate) {
+			// 如果不是断点激活，而是第一次显示，需要初始化数据
+			if (!this.dialogShow) {
+				this.operate = operate || {};
+				this.operation = operate.operation;
+			}
+
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+		},
+		cancel() {
+			let operate = {
+				type: this.operate.type,
+				operation: OperationEvent.Command.cancel.menu.operation
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.doClose();
+				}
+			});
+		},
+		commit() {
+			let operate = {
+				over: true,
+				type: this.operate.type,
+				operation: OperationEvent.Command.close.confirm.operation,
+				val: this.deviceLevels.sort().join('::')
+			};
+
+			this.loading = true;
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				this.loading = false;
+				if (valid) {
+					this.doClose();
+					this.setDeviceDisplay();
+				}
+			}).catch(() => {
+				this.loading = false;
+			});
+		},
+		setDeviceDisplay() {
+			let show = false;
+			let deviceList = [];
+
+			// 区段边界设置
+			let borderBorderShow = this.deviceLevels.indexOf(2) !== -1;
+			let sectionList = this.$store.getters['map/sectionList'];
+			if (sectionList && sectionList.length > 0) {
+				sectionList.forEach(elem => {
+					deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { borderBorderShow })); // 区段边界
+				});
+			}
+
+			// 车次窗设置
+			let trainWindowShow = this.deviceLevels.indexOf(1) !== -1;
+			let trainWindowList = this.$store.getters['map/trainWindowList'];
+			if (trainWindowList && trainWindowList.length > 0) {
+				trainWindowList.forEach(elem => {
+					deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { trainWindowShow })); // 车次窗
+				});
+			}
+
+			// 联锁自动进路表示灯和ATS自动触发表示灯设置
+			let linkageAutoRouteShow = this.deviceLevels.indexOf(3) !== -1;// 联锁自动进路表示灯
+			let atsAutoTriggerShow = this.deviceLevels.indexOf(4) !== -1;// ATS自动触发表示灯
+			let signalList = this.$store.getters['map/signalList'];
+			if (signalList && signalList.length > 0) {
+				signalList.forEach(elem => {
+					deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { linkageAutoRouteShow, atsAutoTriggerShow }));
+				});
+			}
+
+			this.$store.dispatch('map/updateMapDevices', deviceList);
+		}
+	}
+};
+
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/viewName.vue
new file mode 100644
index 000000000..aa1ccd4f0
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/viewName.vue
@@ -0,0 +1,248 @@
+<template>
+    <el-dialog class="chengdou-03__systerm view-name" title="名称显示设置" :visible.sync="show" width="320px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <el-checkbox-group v-model="nameLevels">
+            <el-row>
+                <el-col :span="10">
+                    <el-checkbox :label="1">信号机名称</el-checkbox>
+                </el-col>
+                <el-col :span="10" :offset="4">
+                    <el-checkbox :label="2">站台轨名称</el-checkbox>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="10">
+                    <el-checkbox :label="3" disabled>按钮名称</el-checkbox>
+                </el-col>
+                <el-col :span="10" :offset="4">
+                    <el-checkbox :label="4">折返轨名称</el-checkbox>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="10">
+                    <el-checkbox :label="5">股道名称</el-checkbox>
+                </el-col>
+                <el-col :span="10" :offset="4">
+                    <el-checkbox dio :label="6">转换轨名称</el-checkbox>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="10">
+                    <el-checkbox :label="7">道岔名称</el-checkbox>
+                </el-col>
+                <el-col :span="10" :offset="4">
+                    <el-checkbox dio :label="8">标识灯名称</el-checkbox>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="10">
+                    <el-checkbox :label="9">道岔区段名称</el-checkbox>
+                </el-col>
+                <el-col :span="10" :offset="4">
+                    <el-checkbox dio :label="10">目的地名称</el-checkbox>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="10">
+                    <el-checkbox :label="11">计轴区段名称</el-checkbox>
+                </el-col>
+                <el-col :span="10" :offset="4">
+                    <el-checkbox dio :label="12">公里标</el-checkbox>
+                </el-col>
+            </el-row>
+        </el-checkbox-group>
+        <el-row class="button-group">
+            <el-col :span="6" :offset="2">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="4" :offset="8">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+        <notice-info ref="noticeInfo"></notice-info>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+    import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+
+    export default {
+        name: 'viewName',
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                operate: null,
+                nameLevels: [1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+            }
+        },
+        components: {
+            NoticeInfo
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.setNameDisplay();
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                //如果不是断点激活显示，而是第一次显示时，需要初始化参数
+                if (!this.dialogShow) {
+                    this.operate = operate || {};
+                    this.operation = operate.operation;
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                })
+            },
+            commit() {
+                let operate = {
+                    over: true,
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.close.confirm.operation,
+                    val: this.nameLevels.sort().join('::')
+                }
+
+                this.loading = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                        this.setNameDisplay();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                })
+            },
+            setNameDisplay() {
+                let deviceList = [];
+
+                //信号机
+                let nameShow = this.nameLevels.indexOf(1) !== -1 ? true : false;
+                let signalList = this.$store.getters['map/signalList'];
+                if (signalList && signalList.length > 0) {
+                    signalList.forEach(elem => {
+                        deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow }));
+                    })
+                }
+
+                //按钮名称
+                nameShow = this.nameLevels.indexOf(3) !== -1 ? true : false;
+
+
+                //道岔
+                nameShow = this.nameLevels.indexOf(7) !== -1 ? true : false; //道岔名称
+                let switchSectionNameShow = this.nameLevels.indexOf(9) !== -1 ? true : false;  //道岔轨名称
+                let switchList = this.$store.getters['map/switchList'];
+                if (switchList && switchList.length > 0) {
+                    switchList.forEach(elem => {
+                        deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow, switchSectionNameShow }));
+                    })
+                }
+
+                //控制模式
+                let indicatorShow = this.nameLevels.indexOf(8) !== -1 ? true : false;
+                let control = this.$store.getters['map/stationControlList'];
+                if (control && control.length > 0) {
+                    control.forEach(elem => {
+                        deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { indicatorShow })); //标识灯名称
+                    })
+                }
+
+                //区段
+                nameShow = false;
+                let standTrackNameShow = false;
+                let reentryTrackNameShow = false;
+                let transferTrackNameShow = false;
+                let sectionList = this.$store.getters['map/sectionList'];
+                if (sectionList && sectionList.length > 0) {
+                    sectionList.forEach(elem => {
+                        if (elem.isSwitchSection && elem.parentCode) {
+                            //道岔轨的区段名称默认不显示
+                            nameShow = false;
+                        } else {
+                            if (elem.type === '01') {
+                                nameShow = this.nameLevels.indexOf(11) !== -1 ? true : false;
+                            } else if (elem.type === '02') {
+                                //股道轨名称
+                                nameShow = this.nameLevels.indexOf(5) !== -1 ? true : false;
+                            } else if (elem.type === '03') {
+                                //道岔区段名称
+                                nameShow = this.nameLevels.indexOf(9) !== -1 ? true : false;
+                            }
+                        }
+
+                        //站台轨名称
+                        if (elem.isStandTrack) {
+                            standTrackNameShow = this.nameLevels.indexOf(2) !== -1 ? true : false;
+                        }
+
+                        //折返轨名称
+                        if (elem.isReentryTrack) {
+                            reentryTrackNameShow = this.nameLevels.indexOf(4) !== -1 ? true : false;
+                        }
+
+                        //转换轨名称
+                        if (elem.isTransferTrack) {
+                            transferTrackNameShow = this.nameLevels.indexOf(6) !== -1 ? true : false;
+                        }
+                        
+                        deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow, standTrackNameShow, reentryTrackNameShow, transferTrackNameShow }));
+                    })
+                }
+
+                //停车点
+                let destCodeShow = this.nameLevels.indexOf(10) !== -1 ? true : false;
+                let stopPointList = this.$store.getters['map/stopPointList'];
+                if (stopPointList && stopPointList.length > 0) {
+                    stopPointList.forEach(elem => {
+                        deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { destCodeShow }));
+                    })
+                }
+
+                //车站
+                let kmPostShow = this.nameLevels.indexOf(12) !== -1 ? true : false;
+                let stationList = this.$store.getters['map/stationList'];
+                if (stationList && stationList.length > 0) {
+                    stationList.forEach(elem => {
+                        deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { kmPostShow })); //公里标
+                    })
+                }
+
+                this.$store.dispatch('map/updateMapDevices', deviceList);
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/viewTrainId.vue
new file mode 100644
index 000000000..888ba8d38
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/viewTrainId.vue
@@ -0,0 +1,183 @@
+<template>
+    <el-dialog class="chengdou-03__systerm view-train-id" title="列车识别号显示设置" :visible.sync="show" width="420px"
+        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <div style="padding: 10px 20px; border: 1px double lightgray;">
+            <span class="base-label">计划车显示模式</span>
+            <el-radio-group v-model="planMode">
+                <el-row>
+                    <el-col :span="10">
+                        <el-radio :label="1">表号+车次号</el-radio>
+                    </el-col>
+                    <el-col :span="10" :offset="4">
+                        <el-radio :label="2">表号+车组号</el-radio>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="10">
+                        <el-radio :label="3">目的地号+车次号</el-radio>
+                    </el-col>
+                    <el-col :span="10" :offset="4">
+                        <el-radio :label="4">目的地号+车组号</el-radio>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="10">
+                        <el-radio :label="5">目的地号+表号+车次号</el-radio>
+                    </el-col>
+                    <el-col :span="10" :offset="4">
+                        <el-radio :label="6">目的地号+表号+车组号</el-radio>
+                    </el-col>
+                </el-row>
+            </el-radio-group>
+        </div>
+        <div style="padding: 10px 20px; border: 1px double lightgray; margin: 20px 0px;">
+            <span class="base-label">头码车显示模式</span>
+            <el-radio-group v-model="headMode">
+                <el-row>
+                    <el-col :span="10">
+                        <el-radio :label="3">目的地号+车次号</el-radio>
+                    </el-col>
+                    <el-col :span="6" :offset="8">
+                        <el-radio :label="4">目的地号+车组号</el-radio>
+                    </el-col>
+                </el-row>
+            </el-radio-group>
+        </div>
+        <div style="padding: 10px 20px; border: 1px double lightgray;">
+            <span class="base-label">字体大小</span>
+            <el-row>
+                <el-col :span="10">
+                    <el-input v-model="fontSize" size="small" min="16" max="99"></el-input>
+                </el-col>
+                <el-col :span="10" :offset="1">
+                    <span style="height:32px; line-height:32px;">（范围：16-99）</span>
+                </el-col>
+            </el-row>
+        </div>
+        <el-row class="button-group">
+            <el-col :span="6" :offset="2">
+                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+            </el-col>
+            <el-col :span="4" :offset="8">
+                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            </el-col>
+        </el-row>
+        <notice-info ref="noticeInfo"></notice-info>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+    import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+
+    export default {
+        name: 'ViewTrainId',
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                operate: null,
+                operation: '',
+                planMode: 5,
+                headMode: 5,
+                fontSize: 16,
+            }
+        },
+        components: {
+            NoticeInfo
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            },
+            domIdConfirm() {
+                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+            }
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.setTrainDispaly();
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                this.operate = operate || {};
+                this.operation = operate.operation;
+
+                //非断电激活时设置初始值
+                if (!this.dialogShow) {
+                    this.loading = false;
+                }
+
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                this.loading = false;
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            cancel() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.cancel.menu.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                })
+            },
+            commit() {
+                let operate = {
+                    over: true,
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.close.confirm.operation,
+                    val: [this.planMode, this.headMode, this.fontSize].join('::')
+                }
+
+                this.loading = true
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.loading = false
+                    if (valid) {
+                        this.setTrainDispaly();
+                        this.doClose();
+                    }
+                }).catch(error => {
+                    this.loading = false;
+                })
+            },
+            setTrainDispaly() {
+                let updatList = [];
+                let trainList = this.$store.getters['training/viewTrainList'];
+                if (trainList && trainList.length > 0) {
+                    let nameFormat = this.trainNameFormatBy(this.planMode);
+                    let nameFontSize = this.fontSize;
+                    trainList.forEach(elem => {
+                        updatList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameFormat, nameFontSize }));
+                    });
+
+                    this.$store.dispatch('map/updateMapDevices', updatList);
+                }
+            },
+            trainNameFormatBy(mode) {
+                switch (mode.toString()) {
+                    case '1': return 'serviceNumber:tripNumber';                 //表号+车次号
+                    case '2': return 'serviceNumber:groupNumber';             //表号+车组号
+                    case '3': return 'targetCode:tripNumber';               //目的地号+车次号
+                    case '4': return 'targetCode:groupNumber';           //目的地号+车组号
+                    case '5': return 'targetCode:serviceNumber:tripNumber';      //目的地号+表号+车次号
+                    case '6': return 'targetCode:serviceNumber:groupNumber';  //目的地号+表号+车组号
+                }
+                return ''; //无格式类型
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuLimit.vue b/src/jmapNew/theme/ningbo_01/menus/menuLimit.vue
new file mode 100644
index 000000000..d8600220a
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuLimit.vue
@@ -0,0 +1,118 @@
+<template>
+    <div>
+        <pop-menu ref="popMenu" :menu="menu"></pop-menu>
+        <cancel-all-limit ref="cancelAllLimit"></cancel-all-limit>
+    </div>
+</template>
+
+<script>
+    import PopMenu from '@/components/PopMenu';
+    import CancelAllLimit from './dialog/cancelAllLimit';
+    import { mapGetters } from 'vuex';
+    import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
+    import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+    import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+    import { mouseCancelState } from './utils/menuItemStatus';
+
+    export default {
+        name: 'MenuLimit',
+        components: {
+            PopMenu,
+            CancelAllLimit,
+        },
+        props: {
+            selected: {
+                type: Object
+            }
+        },
+        data() {
+            return {
+                menu: [{
+                    label: '取消全线临时限速',
+                    handler: this.cancelSpeed,
+                    disabledCallback: '',
+                    auth: { station: true, center: false }
+                }],
+                menuNormal: {
+                    local: [
+                        {
+                            label: '取消全线临时限速',
+                            handler: this.cancelSpeed,
+                            disabledCallback: MenuDisabledState.Section.cancelSpeed,
+                            auth: { station: true, center: false }
+                        }
+                    ],
+                    central: [
+                        {
+                            label: '取消全线临时限速',
+                            handler: this.cancelSpeed,
+                            disabledCallback: MenuDisabledState.Section.cancelSpeed,
+                            auth: { station: false, center: true }
+                        }
+                    ]
+                },
+            }
+        },
+        watch: {
+            '$store.state.menuOperation.menuCount': function (val) {
+                if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.LimitControl) && !this.buttonOperation) {
+                    this.doShow(this.$store.state.menuOperation.menuPosition);
+                } else {
+                    this.doClose();
+                }
+            }
+        },
+        computed: {
+            ...mapGetters('training', [
+                'mode',
+                'operatemode'
+            ]),
+            ...mapGetters('menuOperation', [
+                'buttonOperation'
+            ])
+        },
+        methods: {
+            clickEvent() {
+                let self = this;
+                window.onclick = function (e) {
+                    self.doClose();
+                }
+            },
+            initMenu() {
+                //编辑模式菜单列表
+                if (this.operatemode === OperateMode.ADMIN) {
+                    this.menu = [...this.menu]
+                }
+            },
+            doShow(point) {
+                this.clickEvent();
+                this.initMenu();
+                if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                    this.$refs.popMenu.resetShowPosition(point);
+                }
+            },
+            doClose() {
+                if (this.$refs && this.$refs.popMenu) {
+                    this.$refs.popMenu.close();
+                }
+            },
+            //取消速度
+            cancelSpeed() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.LimitControl.type,
+                    label: MapDeviceType.LimitControl.label,
+                    operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.cancelAllLimit.doShow(operate, this.selected);
+                    }
+                });
+            },
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
new file mode 100644
index 000000000..3cc709001
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
@@ -0,0 +1,403 @@
+<template>
+  <div>
+    <pop-menu ref="popMenu" :menu="menu" />
+    <section-control ref="sectionControl" />
+    <section-cmd-control ref="sectionCmdControl" />
+    <speed-cmd-control ref="speedCmdControl" />
+    <!-- <train-create ref="trainCreate"></train-create> -->
+    <alxe-effective ref="alxeEffective" />
+    <section-detail ref="sectionDetail" />
+    <notice-info ref="noticeInfo" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import SectionControl from './dialog/sectionControl';
+import SectionCmdControl from './dialog/sectionCmdControl';
+import SectionDetail from './dialog/sectionDetail';
+import SpeedCmdControl from './dialog/speedCmdControl';
+// import TrainCreate from './dialog/trainCreate';
+import AlxeEffective from './dialog/alxeEffective';
+import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+import { mapGetters } from 'vuex';
+import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
+import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+import { mouseCancelState } from './utils/menuItemStatus';
+
+export default {
+	name: 'SectionMenu',
+	components: {
+		PopMenu,
+		SectionControl,
+		SectionCmdControl,
+		SectionDetail,
+		SpeedCmdControl,
+		// TrainCreate,
+		AlxeEffective,
+		NoticeInfo
+	},
+	props: {
+		selected: {
+			type: Object
+		}
+	},
+	data() {
+		return {
+			menu: [],
+			menuNormal: {
+				local: [
+					{
+						label: '区故解',
+						handler: this.fault,
+						disabledCallback: MenuDisabledState.Section.fault,
+						auth: { station: true, center: false }
+					},
+					{
+						label: '属性',
+						handler: this.detail,
+						disabledCallback: MenuDisabledState.Section.setSpeed,
+						auth: { station: false, center: true }
+					}
+					// {
+					//     label: '区段激活',
+					//     handler: this.active,
+					//     disabledCallback: MenuDisabledState.Section.active,
+					//     auth: { station: true, center: false }
+					// },
+					// {
+					//     label: '区段切除',
+					//     handler: this.split,
+					//     disabledCallback: MenuDisabledState.Section.split,
+					//     auth: { station: true, center: false }
+					// },
+					// {
+					//     label: '区段计轴预复位',
+					//     handler: this.axlePreReset,
+					//     disabledCallback: MenuDisabledState.Section.axlePreReset,
+					//     auth: { station: true, center: false }
+					// },
+					// {
+					//     label: '区段封锁',
+					//     handler: this.lock,
+					//     disabledCallback: MenuDisabledState.Section.lock,
+					//     auth: { station: true, center: false }
+					// },
+					// {
+					//     label: '区段解封',
+					//     handler: this.unlock,
+					//     disabledCallback: MenuDisabledState.Section.unlock,
+					//     auth: { station: true, center: false }
+					// },
+					// {
+					//     label: '区段设置限速',
+					//     handler: this.setSpeed,
+					//     disabledCallback: MenuDisabledState.Section.setSpeed,
+					//     auth: { station: true, center: false }
+					// },
+					// {
+					//     label: '区段取消限速',
+					//     handler: this.cancelSpeed,
+					//     disabledCallback: MenuDisabledState.Section.cancelSpeed,
+					//     auth: { station: true, center: false }
+					// },
+					// {
+					//     label: '确认计轴有效',
+					//     handler: this.alxeEffective,
+					//     disabledCallback: MenuDisabledState.Section.alxeEffective,
+					//     auth: { station: false, center: true }
+					// },
+				],
+				central: [
+					{
+						label: '区故解',
+						handler: this.fault,
+						disabledCallback: MenuDisabledState.Section.fault,
+						auth: { station: true, center: false }
+					},
+					{
+						label: '属性',
+						handler: this.detail,
+						disabledCallback: MenuDisabledState.Section.setSpeed,
+						auth: { station: false, center: true }
+					}
+				]
+			},
+			menuTrain: [
+				{
+					label: '新建列车',
+					handler: this.newTrain,
+					disabledCallback: MenuDisabledState.Section.newTrain
+				}
+			],
+			menuForce: [
+				{
+					label: '设置计轴失效',
+					handler: this.alxeFailure,
+					disabledCallback: MenuDisabledState.Section.alxeFailure
+				}
+			]
+		};
+	},
+	watch: {
+		'$store.state.menuOperation.menuCount': function (val) {
+			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && !this.buttonOperation) {
+				this.doShow(this.$store.state.menuOperation.menuPosition);
+			} else {
+				this.doClose();
+			}
+		}
+	},
+	computed: {
+		...mapGetters('training', [
+			'mode',
+			'operatemode'
+		]),
+		...mapGetters('menuOperation', [
+			'buttonOperation'
+		])
+	},
+	methods: {
+		clickEvent() {
+			const self = this;
+			window.onclick = function (e) {
+				self.doClose();
+			};
+		},
+		initMenu() {
+			// 编辑模式菜单列表
+			this.menu = menuFiltration(this.menuNormal);
+			if (this.operatemode === OperateMode.ADMIN) {
+				this.menu = [...this.menu, ...this.menuForce, ...this.menuTrain];
+			}
+
+			// 故障模式菜单列表
+			if (this.operatemode === OperateMode.FAULT) {
+				this.menu = this.menuForce;
+			}
+
+			this.menu = menuConvert(this.menu);
+		},
+		doShow(point) {
+			this.clickEvent();
+			this.initMenu();
+			if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+				this.$refs.popMenu.resetShowPosition(point);
+			}
+		},
+		doClose() {
+			if (this.$refs && this.$refs.popMenu) {
+				this.$refs.popMenu.close();
+			}
+		},
+		// 设置计轴失效
+		alxeFailure() {
+			const operate = {
+				start: true,
+				send: true,
+				code: this.selected.code,
+				type: MapDeviceType.Section.type,
+				label: MapDeviceType.Section.label,
+				operation: OperationEvent.Section.alxeFailure.menu.operation
+			};
+
+			mouseCancelState(this.selected);
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				} else {
+					this.$refs.noticeInfo.doShow(operate);
+				}
+			}).catch(error => {
+				this.$refs.noticeInfo.doShow(operate);
+			});
+		},
+		// 新建列车
+		newTrain() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Section.type,
+				label: MapDeviceType.Section.label,
+				operation: OperationEvent.Section.newtrain.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.trainCreate.doShow(operate, this.selected);
+				}
+			});
+		},
+		// 故障解锁
+		fault() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Section.type,
+				label: MapDeviceType.Section.label,
+				operation: OperationEvent.Section.fault.menu.operation
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.sectionControl.doShow(operate, this.selected);
+				}
+			});
+		},
+		detail() {
+			const operate = {
+				start: true,
+				code: this.selected.code,
+				type: MapDeviceType.Section.type,
+				label: MapDeviceType.Section.label,
+				operation: OperationEvent.Section.detail.menu.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				if (valid) {
+					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+					this.$refs.sectionDetail.doShow(operate, this.selected);
+				}
+			});
+		},
+		undeveloped() {
+			this.doClose();
+			this.$alert('实现中......', '提示', {
+				confirmButtonText: '确定',
+				callback: action => {
+				}
+			});
+		}
+		// //切除
+		// split() {
+		//     let operate = {
+		//         start: true,
+		//         code: this.selected.code,
+		//         type: MapDeviceType.Section.type,
+		//         label: MapDeviceType.Section.label,
+		//         operation: OperationEvent.Section.split.menu.operation
+		//     };
+		//     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+		//         if (valid) {
+		//             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+		//             this.$refs.sectionControl.doShow(operate, this.selected);
+		//         }
+		//     });
+		// },
+		// alxeEffective() {
+		//     let operate = {
+		//         start: true,
+		//         code: this.selected.code,
+		//         type: MapDeviceType.Section.type,
+		//         label: MapDeviceType.Section.label,
+		//         operation: OperationEvent.Section.alxeEffective.menu.operation
+		//     };
+		//     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+		//         if (valid) {
+		//             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+		//             this.$refs.alxeEffective.doShow(operate, this.selected);
+		//         }
+		//     });
+		// },
+		// //激活
+		// active() {
+		//     let operate = {
+		//         start: true,
+		//         code: this.selected.code,
+		//         type: MapDeviceType.Section.type,
+		//         label: MapDeviceType.Section.label,
+		//         operation: OperationEvent.Section.active.menu.operation
+		//     };
+		//     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+		//         if (valid) {
+		//             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+		//             this.$refs.sectionControl.doShow(operate, this.selected);
+		//         }
+		//     });
+		// },
+		// //区段计轴预复位
+		// axlePreReset() {
+		//     let operate = {
+		//         start: true,
+		//         code: this.selected.code,
+		//         type: MapDeviceType.Section.type,
+		//         label: MapDeviceType.Section.label,
+		//         operation: OperationEvent.Section.axlePreReset.menu.operation
+		//     };
+		//     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+		//         if (valid) {
+		//             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+		//             this.$refs.sectionCmdControl.doShow(operate, this.selected);
+		//         }
+		//     });
+		// },
+		// //区段解锁
+		// lock() {
+		//     let operate = {
+		//         start: true,
+		//         code: this.selected.code,
+		//         type: MapDeviceType.Section.type,
+		//         label: MapDeviceType.Section.label,
+		//         operation: OperationEvent.Section.lock.menu.operation
+		//     };
+		//     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+		//         if (valid) {
+		//             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+		//             this.$refs.sectionControl.doShow(operate, this.selected);
+		//         }
+		//     });
+		// },
+		// //区段封锁
+		// unlock() {
+		//     let operate = {
+		//         start: true,
+		//         code: this.selected.code,
+		//         type: MapDeviceType.Section.type,
+		//         label: MapDeviceType.Section.label,
+		//         operation: OperationEvent.Section.unlock.menu.operation
+		//     };
+		//     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+		//         if (valid) {
+		//             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+		//             this.$refs.sectionCmdControl.doShow(operate, this.selected);
+		//         }
+		//     });
+		// },
+		// //设置速度
+		// setSpeed() {
+		//     let operate = {
+		//         start: true,
+		//         code: this.selected.code,
+		//         type: MapDeviceType.Section.type,
+		//         label: MapDeviceType.Section.label,
+		//         operation: OperationEvent.Section.setLimitSpeed.menu.operation
+		//     };
+		//     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+		//         if (valid) {
+		//             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+		//             this.$refs.speedCmdControl.doShow(operate, this.selected);
+		//         }
+		//     });
+		// },
+		// //取消速度
+		// cancelSpeed() {
+		//     let operate = {
+		//         start: true,
+		//         send: true,
+		//         code: this.selected.code,
+		//         type: MapDeviceType.Section.type,
+		//         label: MapDeviceType.Section.label,
+		//         operation: OperationEvent.Section.cancelSpeed.menu.operation
+		//     };
+		//     this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+		//         if (valid) {
+		//             let tempData = response.data;
+		//             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+		//             this.$refs.speedCmdControl.doShow(operate, this.selected, tempData);
+		//         }
+		//     });
+		// },
+	}
+};
+</script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
new file mode 100644
index 000000000..b01c897d3
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
@@ -0,0 +1,583 @@
+<template>
+    <div>
+        <pop-menu ref="popMenu" :menu="menu"></pop-menu>
+        <route-selection ref="routeSelection"></route-selection>
+        <route-control ref="routeControl"></route-control>
+        <route-detail ref="routeDetail"></route-detail>
+        <route-guide ref="routeGuide"></route-guide>
+        <notice-info ref="noticeInfo"></notice-info>
+    </div>
+</template>
+
+<script>
+    import PopMenu from '@/components/PopMenu';
+    import RouteControl from './dialog/routeControl';
+    import RouteSelection from './dialog/routeSelection';
+    import RouteDetail from './dialog/routeDetail';
+    import RouteGuide from './dialog/routeGuide';
+    import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'
+    import { mapGetters } from 'vuex';
+    import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
+    import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+    import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+    import { mouseCancelState } from './utils/menuItemStatus';
+
+    export default {
+        name: 'SignalMenu',
+        components: {
+            PopMenu,
+            RouteControl,
+            RouteSelection,
+            RouteDetail,
+            RouteGuide,
+            NoticeInfo
+        },
+        props: {
+            selected: {
+                type: Object
+            }
+        },
+        data() {
+            return {
+                menu: [],
+                menuNormal: {
+                    local: [
+                        {
+                            label: '办理进路',
+                            handler: this.arrangementRoute,
+                            disabledCallback: MenuDisabledState.Signal.arrangementRoute,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '办理引导进路',
+                            handler: this.guide,
+                            disabledCallback: MenuDisabledState.Signal.guide,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '取消进路',
+                            handler: this.cancelTrainRoute,
+                            disabledCallback: MenuDisabledState.Signal.cancelTrainRoute,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '总人解',
+                            handler: this.humanTrainRoute,
+                            disabledCallback: MenuDisabledState.Signal.humanTrainRoute,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '信号重开',
+                            handler: this.reopenSignal,
+                            disabledCallback: MenuDisabledState.Signal.reopenSignal,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '信号封锁',
+                            handler: this.lock,
+                            disabledCallback: MenuDisabledState.Signal.lock,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '信号解封',
+                            handler: this.unlock,
+                            disabledCallback: MenuDisabledState.Signal.unlock,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '进路收人工控',
+                            handler: this.humanControl,
+                            disabledCallback: MenuDisabledState.Signal.humanControl,
+                            auth: { station: false, center: true },
+                        },
+                        {
+                            label: '进路交自动控',
+                            handler: this.atsAutoControl,
+                            disabledCallback: MenuDisabledState.Signal.atsAutoControl,
+                            auth: { station: false, center: true },
+                        },
+                        {
+                            label: '查询进路控制状态',
+                            handler: this.detail,
+                            disabledCallback: MenuDisabledState.Signal.detail,
+                            auth: { station: true, center: true },
+                        }
+                        // {
+                        //     label: '设置联锁自动进路',
+                        //     handler: this.setAutoInterlock,
+                        //     disabledCallback: MenuDisabledState.Signal.setAutoInterlock,
+                        //     auth: { station: true, center: false },
+                        // },
+                        // {
+                        //     label: '取消联锁自动进路',
+                        //     handler: this.cancelAutoInterlock,
+                        //     disabledCallback: MenuDisabledState.Signal.cancelAutoInterlock,
+                        //     auth: { station: true, center: false },
+                        // },
+                        // {
+                        //     label: '设置联锁自动触发',
+                        //     handler: this.setAutoTrigger,
+                        //     disabledCallback: MenuDisabledState.Signal.setAutoTrigger,
+                        //     auth: { station: true, center: false },
+                        // },
+                        // {
+                        //     label: '取消联锁自动触发',
+                        //     handler: this.cancelAutoTrigger,
+                        //     disabledCallback: MenuDisabledState.Signal.cancelAutoTrigger,
+                        //     auth: { station: true, center: false },
+                        // },
+                        // {
+                        //     label: '信号关灯',
+                        //     handler: this.signalClose,
+                        //     disabledCallback: MenuDisabledState.Signal.signalClose,
+                        //     auth: { station: true, center: false },
+                        // }
+                    ],
+                    central: [
+                        {
+                            label: '办理进路',
+                            handler: this.arrangementRoute,
+                            disabledCallback: MenuDisabledState.Signal.arrangementRoute,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '办理引导进路',
+                            handler: this.guide,
+                            disabledCallback: MenuDisabledState.Signal.guide,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '取消进路',
+                            handler: this.cancelTrainRoute,
+                            disabledCallback: MenuDisabledState.Signal.cancelTrainRoute,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '总人解',
+                            handler: this.humanTrainRoute,
+                            disabledCallback: MenuDisabledState.Signal.humanTrainRoute,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '信号重开',
+                            handler: this.reopenSignal,
+                            disabledCallback: MenuDisabledState.Signal.reopenSignal,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '信号封锁',
+                            handler: this.lock,
+                            disabledCallback: MenuDisabledState.Signal.lock,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '信号解封',
+                            handler: this.unlock,
+                            disabledCallback: MenuDisabledState.Signal.unlock,
+                            auth: { station: true, center: false },
+                        },
+                        {
+                            label: '进路收人工控',
+                            handler: this.humanControl,
+                            disabledCallback: MenuDisabledState.Signal.humanControl,
+                            auth: { station: false, center: true },
+                        },
+                        {
+                            label: '进路交自动控',
+                            handler: this.atsAutoControl,
+                            disabledCallback: MenuDisabledState.Signal.atsAutoControl,
+                            auth: { station: false, center: true },
+                        },
+                        {
+                            label: '查询进路控制状态',
+                            handler: this.detail,
+                            disabledCallback: MenuDisabledState.Signal.detail,
+                            auth: { station: true, center: true },
+                        }
+                    ],
+                },
+                menuForce: [
+                    {
+                        label: '信号关灯',
+                        handler: this.signalClose,
+                        disabledCallback: '',
+                    },
+                    {
+                        label: '设置故障',
+                        handler: this.setStoppage,
+                        disabledCallback: MenuDisabledState.Signal.setStoppage
+                    },
+                    {
+                        label: '取消故障',
+                        handler: this.cancelStoppage,
+                        disabledCallback: MenuDisabledState.Signal.cancelStoppage
+                    }
+                ]
+            }
+        },
+        watch: {
+            '$store.state.menuOperation.menuCount': function (val) {
+                if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
+                    this.doShow(this.$store.state.menuOperation.menuPosition);
+                } else {
+                    this.doClose();
+                }
+            }
+        },
+        computed: {
+            ...mapGetters('training', [
+                'mode',
+                'operatemode'
+            ]),
+            ...mapGetters('menuOperation', [
+                'buttonOperation'
+            ])
+        },
+        methods: {
+            clickEvent() {
+                let self = this;
+                window.onclick = function (e) {
+                    self.doClose();
+                }
+            },
+            initMenu() {
+                //编辑模式菜单列表
+                this.menu = menuFiltration(this.menuNormal);
+                if (this.operatemode === OperateMode.ADMIN) {
+                    this.menu = [...this.menu, ...this.menuForce]
+                }
+
+                //故障模式菜单列表
+                if (this.operatemode === OperateMode.FAULT) {
+                    this.menu = this.menuForce
+                }
+
+                this.menu = menuConvert(this.menu);
+
+            },
+            doShow(point) {
+                this.clickEvent();
+                this.initMenu();
+                if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                    this.$refs.popMenu.resetShowPosition(point);
+                }
+            },
+            doClose() {
+                if (this.$refs && this.$refs.popMenu) {
+                    this.$refs.popMenu.close();
+                }
+            },
+            //设置故障
+            setStoppage() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.stoppage.menu.operation
+                };
+
+                mouseCancelState(this.selected);
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    } else {
+                        this.$refs.noticeInfo.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //取消故障
+            cancelStoppage() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.cancelStoppage.menu.operation
+                };
+
+                mouseCancelState(this.selected);
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    } else {
+                        this.$refs.noticeInfo.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            // 设置进路
+            arrangementRoute() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.arrangementRoute.menu.operation
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        var tempData = null;
+                        if (response) {
+                            tempData = response.data;
+                        }
+                        this.$refs.routeSelection.doShow(operate.operation, this.selected, tempData);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //进路引导
+            guide() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.guide.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        var tempData = null;
+                        if (response) {
+                            tempData = response.data;
+                        }
+                        this.$refs.routeGuide.doShow(operate.operation, this.selected, tempData);
+                    }
+                });
+            },
+            //取消进路
+            cancelTrainRoute() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.cancelTrainRoute.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        this.$refs.routeControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //总人解
+            humanTrainRoute() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.humanTrainRoute.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        this.$refs.routeControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //信号重开
+            reopenSignal() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.reopenSignal.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.routeControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //信号封锁
+            lock() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.lock.menu.operation
+                };
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.routeControl.doShow(operate, this.selected);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //信号解封
+            unlock() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.unlock.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.routeControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //进路交人工控
+            humanControl() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.humanControl.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                    if (valid) {
+                        let tempData = null;
+                        if (response) {
+                            tempData = response.data;
+                        }
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.routeControl.doShow(operate, this.selected, tempData);
+                    }
+                });
+            },
+            //进路交自动控
+            atsAutoControl() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.atsAutoControl.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                    if (valid) {
+                        let tempData = null;
+                        if (response) {
+                            tempData = response.data;
+                        }
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.routeControl.doShow(operate, this.selected, tempData);
+                    }
+                });
+            },
+            // //设置联锁自动进路
+            // setAutoInterlock() {
+            //     let operate = {
+            //         start: true,
+            //         code: this.selected.code,
+            //         type: MapDeviceType.Signal.type,
+            //         label: MapDeviceType.Signal.label,
+            //         operation: OperationEvent.Signal.setAutoInterlock.menu.operation
+            //     };
+            //     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            //         if (valid) {
+            //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            //             this.$refs.routeControl.doShow(operate, this.selected);
+            //         }
+            //     });
+            // },
+            // //取消联锁自动进路
+            // cancelAutoInterlock() {
+            //     let operate = {
+            //         start: true,
+            //         code: this.selected.code,
+            //         type: MapDeviceType.Signal.type,
+            //         label: MapDeviceType.Signal.label,
+            //         operation: OperationEvent.Signal.cancelAutoInterlock.menu.operation
+            //     };
+            //     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            //         if (valid) {
+            //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            //             this.$refs.routeControl.doShow(operate, this.selected);
+            //         }
+            //     });
+            // },
+            // //设置联锁自动触发
+            // setAutoTrigger() {
+            //     let operate = {
+            //         start: true,
+            //         code: this.selected.code,
+            //         type: MapDeviceType.Signal.type,
+            //         label: MapDeviceType.Signal.label,
+            //         operation: OperationEvent.Signal.setAutoTrigger.menu.operation
+            //     };
+            //     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            //         if (valid) {
+            //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            //             this.$refs.routeControl.doShow(operate, this.selected);
+            //         }
+            //     });
+            // },
+            // //取消联锁自动触发
+            // cancelAutoTrigger() {
+            //     let operate = {
+            //         start: true,
+            //         code: this.selected.code,
+            //         type: MapDeviceType.Signal.type,
+            //         label: MapDeviceType.Signal.label,
+            //         operation: OperationEvent.Signal.cancelAutoTrigger.menu.operation
+            //     };
+            //     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            //         if (valid) {
+            //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            //             this.$refs.routeControl.doShow(operate, this.selected);
+            //         }
+            //     });
+            // },
+            // //信号关灯
+            // signalClose() {
+            //     let operate = {
+            //         start: true,
+            //         code: this.selected.code,
+            //         type: MapDeviceType.Signal.type,
+            //         label: MapDeviceType.Signal.label,
+            //         operation: OperationEvent.Signal.signalClose.menu.operation
+            //     };
+            //     this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            //         if (valid) {
+            //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            //             this.$refs.routeControl.doShow(operate, this.selected);
+            //         }
+            //     });
+            // },
+            //查询进路状态
+            detail() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Signal.type,
+                    label: MapDeviceType.Signal.label,
+                    operation: OperationEvent.Signal.detail.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.routeDetail.doShow(operate, this.selected, response.data);
+                    }
+                });
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
new file mode 100644
index 000000000..a4e2e0c7d
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
@@ -0,0 +1,153 @@
+<template>
+    <div>
+        <pop-menu ref="popMenu" :menu="menu"></pop-menu>
+        <notice-info ref="noticeInfo"></notice-info>
+    </div>
+</template>
+
+<script>
+    import PopMenu from '@/components/PopMenu';
+    import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo'
+    import { mapGetters } from 'vuex';
+    import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
+    import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+    import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+    import { mouseCancelState } from './utils/menuItemStatus';
+
+    export default {
+        name: 'StationMenu',
+        components: {
+            PopMenu,
+            NoticeInfo
+        },
+        props: {
+            selected: {
+                type: Object
+            }
+        },
+        data() {
+            return {
+                menu: [],
+                menuNormal: {
+                    local: [
+                    ],
+                    central: [
+                    ],
+                },
+                menuForce: [
+                    {
+                        label: '设置ZC故障',
+                        handler: this.setStoppage,
+                        disabledCallback: MenuDisabledState.Station.setStoppage
+                    },
+                    {
+                        label: '取消ZC故障',
+                        handler: this.cancelStoppage,
+                        disabledCallback: MenuDisabledState.Station.cancelStoppage
+                    }
+                ]
+            }
+        },
+        watch: {
+            '$store.state.menuOperation.menuCount': function (val) {
+                if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Station) && !this.buttonOperation) {
+                    this.doShow(this.$store.state.menuOperation.menuPosition);
+                } else {
+                    this.doClose();
+                }
+            }
+        },
+        computed: {
+            ...mapGetters('training', [
+                'mode',
+                'operatemode'
+            ]),
+            ...mapGetters('menuOperation', [
+                'buttonOperation'
+            ])
+        },
+        methods: {
+            clickEvent() {
+                let self = this;
+                window.onclick = function (e) {
+                    self.doClose();
+                }
+            },
+            initMenu() {
+                this.menu = [];
+                if (this.selected.concentrateStationCode == this.selected.code) {
+                    //编辑模式菜单列表
+                    this.menu = menuFiltration(this.menuNormal);
+                    if (this.operatemode === OperateMode.ADMIN) {
+                        this.menu = [...this.menu, ...this.menuForce]
+                    }
+                }
+
+                if (this.selected.centralized) {
+                    //故障模式菜单列表
+                    if (this.operatemode === OperateMode.FAULT) {
+                        this.menu = [...this.menuForce]
+                    }
+                }
+
+                this.menu = menuConvert(this.menu);
+            },
+            doShow(point) {
+                this.clickEvent();
+                this.initMenu();
+                if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                    this.$refs.popMenu.resetShowPosition(point);
+                }
+            },
+            doClose() {
+                if (this.$refs && this.$refs.popMenu) {
+                    this.$refs.popMenu.close();
+                }
+            },
+            //设置故障
+            setStoppage() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Station.type,
+                    label: MapDeviceType.Station.label,
+                    operation: OperationEvent.Station.stoppage.menu.operation
+                };
+
+                mouseCancelState(this.selected);
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    } else {
+                        this.$refs.noticeInfo.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //取消故障
+            cancelStoppage() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Station.type,
+                    label: MapDeviceType.Station.label,
+                    operation: OperationEvent.Station.cancelStoppage.menu.operation
+                };
+
+                mouseCancelState(this.selected);
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    } else {
+                        this.$refs.noticeInfo.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
new file mode 100644
index 000000000..b569ec165
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
@@ -0,0 +1,69 @@
+<template>
+    <pop-menu ref="popMenu" :menu="menu"></pop-menu>
+</template>
+
+<script>
+    import PopMenu from '@/components/PopMenu';
+    import { mapGetters } from 'vuex';
+    import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
+    import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+    import { MenuDisabledState, menuConvert } from './utils/menuItemStatus';
+    import { mouseCancelState } from './utils/menuItemStatus';
+
+    export default {
+        name: 'StationControlMenu',
+        props: {
+            selected: {
+                type: Object
+            }
+        },
+        components: {
+            PopMenu
+        },
+        data() {
+            return {
+                menu: [],
+                menuNormal: [
+                ],
+                menuForce: [
+                ]
+            }
+        },
+        watch: {
+            '$store.state.menuOperation.menuCount': function (val) {
+                if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationControl) && !this.buttonOperation) {
+                    this.doShow(this.$store.state.menuOperation.menuPosition);
+                } else {
+                    this.doClose();
+                }
+            }
+        },
+        computed: {
+            ...mapGetters('training', [
+                'mode',
+                'operatemode'
+            ]),
+            ...mapGetters('menuOperation', [
+                'buttonOperation'
+            ])
+        },
+        methods: {
+            clickEvent() {
+                let self = this;
+                window.onclick = function (e) {
+                    self.doClose();
+                }
+            },
+            doShow(point) {
+                if (this.$refs && this.$refs.popMenu) {
+                    this.$refs.popMenu.close();
+                }
+            },
+            doClose() {
+                if (this.$refs && this.$refs.popMenu) {
+                    this.$refs.popMenu.close();
+                }
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
new file mode 100644
index 000000000..5350140d1
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
@@ -0,0 +1,372 @@
+<template>
+    <div>
+        <pop-menu ref="popMenu" :menu="menu"></pop-menu>
+        <stand-control ref="standControl"></stand-control>
+        <stand-detail ref="standDetail"></stand-detail>
+        <notice-info ref="noticeInfo"></notice-info>
+    </div>
+</template>
+
+<script>
+    import PopMenu from '@/components/PopMenu';
+    import StandControl from './dialog/standControl';
+    import StandDetail from './dialog/standDetail';
+    import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+    import { mapGetters } from 'vuex';
+    import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
+    import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+    import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+    import { mouseCancelState } from './utils/menuItemStatus';
+
+    export default {
+        name: 'StationStandMenu',
+        components: {
+            PopMenu,
+            StandControl,
+            StandDetail,
+            NoticeInfo,
+        },
+        props: {
+            selected: {
+                type: Object
+            }
+        },
+        data() {
+            return {
+                menu: [],
+                menuNormal: {
+                    local: [
+                        {
+                            label: '设置扣车',
+                            handler: this.setDetainTrain,
+                            disabledCallback: MenuDisabledState.StationStand.setDetainTrain,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '取消扣车',
+                            handler: this.cancelDetainTrain,
+                            disabledCallback: MenuDisabledState.StationStand.cancelDetainTrain,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '设置跳停',
+                            handler: this.setJumpStop,
+                            disabledCallback: MenuDisabledState.StationStand.setJumpStop,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '取消跳停',
+                            handler: this.cancelJumpStop,
+                            disabledCallback: MenuDisabledState.StationStand.cancelJumpStop,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '设置停站时间',
+                            handler: this.setStopTime,
+                            disabledCallback: MenuDisabledState.StationStand.setStopTime,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '设置站间运行等级',
+                            handler: this.setRunLevel,
+                            disabledCallback: MenuDisabledState.StationStand.setRunLevel,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '属性',
+                            handler: this.detail,
+                            disabledCallback: MenuDisabledState.StationStand.detail,
+                            auth: { station: true, center: true },
+                        }
+                    ],
+                    central: [
+                        {
+                            label: '设置扣车',
+                            handler: this.setDetainTrain,
+                            disabledCallback: MenuDisabledState.StationStand.setDetainTrain,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '取消扣车',
+                            handler: this.cancelDetainTrain,
+                            disabledCallback: MenuDisabledState.StationStand.cancelDetainTrain,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '设置跳停',
+                            handler: this.setJumpStop,
+                            disabledCallback: MenuDisabledState.StationStand.setJumpStop,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '取消跳停',
+                            handler: this.cancelJumpStop,
+                            disabledCallback: MenuDisabledState.StationStand.cancelJumpStop,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '设置停站时间',
+                            handler: this.setStopTime,
+                            disabledCallback: MenuDisabledState.StationStand.setStopTime,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '设置站间运行等级',
+                            handler: this.setRunLevel,
+                            disabledCallback: MenuDisabledState.StationStand.setRunLevel,
+                            auth: { station: true, center: true },
+                        },
+                        {
+                            label: '属性',
+                            handler: this.detail,
+                            disabledCallback: MenuDisabledState.StationStand.detail,
+                            auth: { station: true, center: true },
+                        }
+                    ]
+                },
+                menuForce: [
+                    {
+                        label: '设置故障',
+                        handler: this.setStoppage,
+                        disabledCallback: MenuDisabledState.StationStand.setStoppage
+                    },
+                    {
+                        label: '取消故障',
+                        handler: this.cancelStoppage,
+                        disabledCallback: MenuDisabledState.StationStand.cancelStoppage
+                    }
+                ]
+            }
+        },
+        computed: {
+            ...mapGetters('training', [
+                'mode',
+                'operatemode'
+            ]),
+            ...mapGetters('menuOperation', [
+                'buttonOperation'
+            ])
+        },
+        watch: {
+            '$store.state.menuOperation.menuCount': function (val) {
+                if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationStand) && !this.buttonOperation) {
+                    this.doShow(this.$store.state.menuOperation.menuPosition);
+                } else {
+                    this.doClose();
+                }
+            }
+        },
+        methods: {
+            clickEvent() {
+                let self = this;
+                window.onclick = function (e) {
+                    self.doClose();
+                }
+            },
+            initMenu() {
+                //编辑模式菜单列表
+                this.menu = menuFiltration(this.menuNormal);
+                if (this.operatemode === OperateMode.ADMIN) {
+                    this.menu = [...this.menu, ...this.menuForce]
+                }
+
+                //故障模式菜单列表
+                if (this.operatemode === OperateMode.FAULT) {
+                    this.menu = this.menuForce
+                }
+
+                this.menu = menuConvert(this.menu);
+            },
+            doShow(point) {
+                this.clickEvent();
+                this.initMenu();
+                if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                    this.$refs.popMenu.resetShowPosition(point);
+                }
+            },
+            doClose() {
+                if (this.$refs && this.$refs.popMenu) {
+                    this.$refs.popMenu.close();
+                }
+            },
+            //设置故障
+            setStoppage() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.StationStand.type,
+                    label: MapDeviceType.StationStand.label,
+                    operation: OperationEvent.StationStand.stoppage.menu.operation
+                };
+
+                mouseCancelState(this.selected);
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    } else {
+                        this.$refs.noticeInfo.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //取消故障
+            cancelStoppage() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.StationStand.type,
+                    label: MapDeviceType.StationStand.label,
+                    operation: OperationEvent.StationStand.cancelStoppage.menu.operation
+                };
+
+                mouseCancelState(this.selected);
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    } else {
+                        this.$refs.noticeInfo.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //设置扣车
+            setDetainTrain() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.StationStand.type,
+                    label: MapDeviceType.StationStand.label,
+                    operation: OperationEvent.StationStand.setDetainTrain.menu.operation
+                };
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.standControl.doShow(operate, this.selected);
+                    }
+                })
+            },
+            //取消扣车
+            cancelDetainTrain() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.StationStand.type,
+                    label: MapDeviceType.StationStand.label,
+                    operation: OperationEvent.StationStand.cancelDetainTrain.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.standControl.doShow(operate, this.selected);
+                    }
+                })
+            },
+            //设置跳停
+            setJumpStop() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.StationStand.type,
+                    label: MapDeviceType.StationStand.label,
+                    operation: OperationEvent.StationStand.setJumpStop.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.standControl.doShow(operate, this.selected);
+                    }
+                })
+            },
+            //取消跳停
+            cancelJumpStop() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.StationStand.type,
+                    label: MapDeviceType.StationStand.label,
+                    operation: OperationEvent.StationStand.cancelJumpStop.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.standControl.doShow(operate, this.selected);
+                    }
+                })
+            },
+            //停站时间控制
+            setStopTime() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.StationStand.type,
+                    label: MapDeviceType.StationStand.label,
+                    operation: OperationEvent.StationStand.setStopTime.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                    if (valid) {
+                        let tempDate = null;
+                        if (response) {
+                            tempDate = response.data;
+                        }
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.standControl.doShow(operate, this.selected, tempDate);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            // 设置运行等级
+            setRunLevel() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.StationStand.type,
+                    label: MapDeviceType.StationStand.label,
+                    operation: OperationEvent.StationStand.setRunLevel.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                    if (valid) {
+                        let tempDate = null;
+                        if (response) {
+                            tempDate = response.data;
+                        }
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.standControl.doShow(operate, this.selected, tempDate);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //查询站台状态
+            detail() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.StationStand.type,
+                    label: MapDeviceType.StationStand.label,
+                    operation: OperationEvent.StationStand.detail.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                    if (valid) {
+                        let tempDate = null;
+                        if (response) {
+                            tempDate = response.data;
+                        }
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.standDetail.doShow(operate, this.selected, tempDate);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
new file mode 100644
index 000000000..d6c79e675
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
@@ -0,0 +1,462 @@
+<template>
+    <div>
+        <pop-menu ref="popMenu" :menu="menu"></pop-menu>
+        <section-control ref="sectionControl"></section-control>
+        <switch-control ref="switchControl"></switch-control>
+        <notice-info ref="noticeInfo"></notice-info>
+    </div>
+</template>
+
+<script>
+    import PopMenu from '@/components/PopMenu';
+    import SectionControl from './dialog/sectionControl';
+    import SwitchControl from './dialog/switchControl';
+    import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
+    import { mapGetters } from 'vuex';
+    import { TrainingMode, OperateMode } from '@/scripts/ConstDic';
+    import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+    import { MenuDisabledState, menuConvert, menuFiltration } from './utils/menuItemStatus';
+    import { mouseCancelState } from './utils/menuItemStatus';
+
+    export default {
+        name: 'SwitchMenu',
+        components: {
+            PopMenu,
+            SectionControl,
+            SwitchControl,
+            NoticeInfo
+        },
+        props: {
+            selected: {
+                type: Object
+            }
+        },
+        data() {
+            return {
+                menu: [],
+                menuNormal: {
+                    local: [
+                        {
+                            label: '单操到定位',
+                            handler: this.locate,
+                            disabledCallback: MenuDisabledState.Switch.locate,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '单操到反位',
+                            handler: this.reverse,
+                            disabledCallback: MenuDisabledState.Switch.reverse,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '道岔单锁',
+                            handler: this.lock,
+                            disabledCallback: MenuDisabledState.Switch.lock,
+                            auth: { station: true, center: false }
+                        },
+                        {
+                            label: '道岔解锁',
+                            handler: this.unlock,
+                            disabledCallback: MenuDisabledState.Switch.unlock,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '道岔封锁',
+                            handler: this.block,
+                            disabledCallback: MenuDisabledState.Switch.block,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '道岔解封',
+                            handler: this.unblock,
+                            disabledCallback: MenuDisabledState.Switch.unblock,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '区故解',
+                            handler: this.fault,
+                            disabledCallback: MenuDisabledState.Switch.fault,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '属性',
+                            handler: this.undeveloped,
+                            disabledCallback: MenuDisabledState.Switch.property,
+                            auth: { station: true, center: true }
+                        },
+                    ],
+                    central: [
+                        {
+                            label: '单操到定位',
+                            handler: this.locate,
+                            disabledCallback: MenuDisabledState.Switch.locate,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '单操到反位',
+                            handler: this.reverse,
+                            disabledCallback: MenuDisabledState.Switch.reverse,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '道岔单锁',
+                            handler: this.lock,
+                            disabledCallback: MenuDisabledState.Switch.lock,
+                            auth: { station: true, center: false }
+                        },
+                        {
+                            label: '道岔解锁',
+                            handler: this.unlock,
+                            disabledCallback: MenuDisabledState.Switch.unlock,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '道岔封锁',
+                            handler: this.block,
+                            disabledCallback: MenuDisabledState.Switch.block,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '道岔解封',
+                            handler: this.unblock,
+                            disabledCallback: MenuDisabledState.Switch.unblock,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '区故解',
+                            handler: this.fault,
+                            disabledCallback: MenuDisabledState.Switch.fault,
+                            auth: { station: true, center: true }
+                        },
+                        {
+                            label: '属性',
+                            handler: this.undeveloped,
+                            disabledCallback: MenuDisabledState.Switch.property,
+                            auth: { station: true, center: true }
+                        }
+                    ]
+                },
+                menuForce: [
+                    {
+                        label: '设置故障',
+                        handler: this.setStoppage,
+                        disabledCallback: MenuDisabledState.Switch.setStoppage,
+                        auth: {
+
+                        }
+                    },
+                    {
+                        label: '取消故障',
+                        handler: this.cancelStoppage,
+                        disabledCallback: MenuDisabledState.Switch.cancelStoppage,
+                        auth: {
+
+                        }
+                    }
+                ]
+            }
+        },
+        watch: {
+            '$store.state.menuOperation.menuCount': function (val) {
+                if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) {
+                    this.doShow(this.$store.state.menuOperation.menuPosition);
+                } else {
+                    this.doClose();
+                }
+            }
+        },
+        computed: {
+            ...mapGetters('training', [
+                'mode',
+                'operatemode'
+            ]),
+            ...mapGetters('menuOperation', [
+                'buttonOperation'
+            ])
+        },
+        methods: {
+            clickEvent() {
+                let self = this;
+                window.onclick = function (e) {
+                    self.doClose();
+                }
+            },
+            initMenu() {
+                //编辑模式菜单列表
+                this.menu = menuFiltration(this.menuNormal);
+                if (this.operatemode === OperateMode.ADMIN) {
+                    this.menu = [...this.menu, ...this.menuForce]
+                }
+
+                //故障模式菜单列表
+                if (this.operatemode === OperateMode.FAULT) {
+                    this.menu = this.menuForce
+                }
+
+                this.menu = menuConvert(this.menu);
+            },
+            doShow(point) {
+                this.clickEvent();
+                this.initMenu();
+                if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                    this.$refs.popMenu.resetShowPosition(point);
+                }
+            },
+            doClose() {
+                if (this.$refs && this.$refs.popMenu) {
+                    this.$refs.popMenu.close();
+                }
+            },
+            //设置故障
+            setStoppage() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.stoppage.menu.operation
+                };
+
+                mouseCancelState(this.selected);
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    } else {
+                        this.$refs.noticeInfo.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //取消故障
+            cancelStoppage() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.cancelStoppage.menu.operation
+                };
+
+                mouseCancelState(this.selected);
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    } else {
+                        this.$refs.noticeInfo.doShow(operate);
+                    }
+                }).catch(error => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            //道岔单锁
+            lock() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.lock.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.switchControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //道岔解封
+            unlock() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.unlock.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.switchControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //道岔封锁
+            block() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.block.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.switchControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //道岔解封
+            unblock() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.unblock.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.switchControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //道岔强扳
+            switchTurnoutForce() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.turnoutForce.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.switchControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //道岔转动
+            switchTurnout() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.turnout.menu.operation
+                };
+
+                if (operate.operation) {
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        if (valid) {
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                            this.$refs.switchControl.doShow(operate, this.selected);
+                        }
+                    });
+                }
+            },
+            //道岔故障解锁
+            fault() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.fault.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.switchControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //道岔取消速度
+            cancelSpeed() {
+                let operate = {
+                    start: true,
+                    send: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.cancelSpeed.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                    if (valid) {
+                        let tempData = response.data;
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.speedCmdControl.doShow(operate, this.selected, tempData);
+                    }
+                });
+            },
+
+            //区段切除
+            split() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.split.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.switchControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //区段激活
+            active() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.active.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.switchControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //单操到定位
+            locate() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.locate.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.switchControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            //单操到反位
+            reverse() {
+                let operate = {
+                    start: true,
+                    code: this.selected.code,
+                    type: MapDeviceType.Switch.type,
+                    label: MapDeviceType.Switch.label,
+                    operation: OperationEvent.Switch.reverse.menu.operation
+                };
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$refs.switchControl.doShow(operate, this.selected);
+                    }
+                });
+            },
+            undeveloped() {
+                this.doClose();
+                this.$alert('实现中......', '提示', {
+                    confirmButtonText: '确定',
+                    callback: action => {
+                    }
+                });
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTool.vue b/src/jmapNew/theme/ningbo_01/menus/menuTool.vue
new file mode 100644
index 000000000..dc32a9673
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTool.vue
@@ -0,0 +1,205 @@
+<template>
+    <div id="menuTool">
+        <div class="nav">
+            <div class="tool" v-for="(item,index) in tools" :key="index">
+                <img :src="item.src" :alt="item.title" />
+            </div>
+            <img class="logo" :src="logoImg" />
+            <system-time class="time" v-if="isShowSystemTime" :time="time" :zoom="2" :width="180" :height="48" :fine="2"
+                :top="6"></system-time>
+        </div>
+    </div>
+</template>
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, TrainingMode, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+    import { OperateMode } from '@/scripts/ConstDic';
+    import { prefixIntrger } from '@/utils/date';
+    import SystemTime from '@/views/components/systemTime/index';
+    import logo_ from '@/assets/logo_.png';
+
+
+    export default {
+        name: 'MenuTool',
+        props: {
+            selected: {
+                type: Object
+            }
+        },
+        components: {
+            SystemTime
+        },
+        data() {
+            return {
+                logoImg: logo_,
+                time: '00:0000',
+                tools: [
+                    {
+                        title: '服务器1',
+                        operate: '',
+                        src: logo_,
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '服务器2',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '前置机1',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '前置机2',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '主调',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '调度台1',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '调度台2',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '调度台3',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '大屏',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '维护工作站',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '运行图显示人工站',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '跳停',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '扣车',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '列车报警',
+                        operate: '',
+                        src: logo_,
+                        click: this.undeveloped,
+                    }
+                ]
+            }
+        },
+        watch: {
+            '$store.state.training.initTime': function (initTime) {
+                let date = new Date(initTime);
+                this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`
+            }
+        },
+        computed: {
+            isShowSystemTime() {
+                return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
+            }
+        },
+        mounted() {
+            this.initTools();
+        },
+        methods: {
+            initTools() {
+                this.tools = [];
+            }
+        }
+    }
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+    $top: 30px;
+    $width: 50px;
+    $height: 50px;
+
+    #menuTool {
+        z-index: 5;
+        position: absolute;
+        top: $top;
+        width: 100%;
+    }
+
+    .nav {
+        display: block;
+        height: $height;
+        line-height: $height;
+        color: #0000;
+        background: #ECE9D8;
+        border: 1px solid #B6BCCC !important;
+        border-bottom: 2px solid #B6BCCC !important;
+        list-style: none;
+    }
+
+    .tool {
+        background: #808080;
+        display: flex;
+        justify-content: center;
+        cursor: pointer;
+        position: relative;
+        float: left;
+        height: $height - 2;
+        width: $width + 15;
+        margin: 1px;
+
+        img {
+            display: block;
+            text-align: center;
+            padding-top: 4px;
+            height: $height - 10;
+            width: $width - 10;
+        }
+    }
+
+
+    .time {
+        position: relative;
+        float: right;
+        text-align: center;
+    }
+
+    .logo {
+        position: relative;
+        float: right;
+        text-align: center;
+        margin: 1px 10px;
+        height: $height - 4;
+        width: $width - 4;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
new file mode 100644
index 000000000..989ceb08e
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -0,0 +1,42 @@
+<template>
+  <div>
+    1111111
+  </div>
+</template>
+
+<script>
+
+export default {
+	name: 'MenuTrain',
+	components: {
+	},
+	props: {
+		selected: {
+			type: Object,
+			default() {
+				return null;
+			}
+		}
+	},
+	data() {
+		return {
+			menu: [],
+			menuNormal: {
+				local: [],
+				central: []
+			},
+			menuForce: [],
+			menuSpeed: []
+		};
+	},
+	computed: {
+
+	},
+	watch: {
+
+	},
+	methods: {
+
+	}
+};
+</script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
new file mode 100644
index 000000000..9ec516a1c
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
@@ -0,0 +1,210 @@
+<template>
+  <el-dialog v-dialogDrag class="chengdou-03__systerm alarm-detail" :title="level+'级告警详细信息'" :visible.sync="show" width="760px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
+    <el-form label-width="80px" size="mini">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="线路名称">
+            <el-input v-model="model.lineName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="单位名称">
+            <el-input v-model="model.unitName" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="模块名称">
+            <el-input v-model="model.moduleName" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="9">
+          <el-form-item label="报警时间">
+            <el-date-picker v-model="model.alarmDate" type="datetime" placeholder="选择日期时间" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item>
+            <span slot="label">等&emsp;级</span>
+            <el-input v-model="model.level" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="确认状态">
+            <el-input v-model="model.confirm" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="9" class="alarm-type">
+          <el-form-item>
+            <span slot="label">类&emsp;&emsp;型</span>
+            <el-input v-model="model.type" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="15" class="alarm-child-type">
+          <el-form-item label="子类型">
+            <el-input v-model="model.childType" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="时间摘要">
+        <el-input v-model="model.timeSummary" disabled />
+      </el-form-item>
+      <el-form-item label="推荐操作">
+        <el-input v-model="model.recommendedOperation" disabled />
+      </el-form-item>
+      <div class="alarm-detail-description">
+        <span> 报警详细描述</span><br>
+        <el-input v-model="model.alarmDetail" type="textarea" :rows="5" placeholder="请输入内容" disabled />
+      </div>
+    </el-form>
+    <el-row class="button-group">
+      <el-col :span="3" :offset="9">
+        <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">确 定</el-button>
+      </el-col>
+      <el-col :span="10">
+        <span style="line-height:26px">未确认{{ level }}级报警数目：1</span>
+      </el-col>
+    </el-row>
+    <!-- </span> -->
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/ConstDic';
+
+export default {
+	name: 'AlarmDetail',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			level: 0,
+			operate: null,
+			controlProps: {
+				'01': '中控',
+				'02': '站控'
+			},
+			model: {
+				lineName: '',
+				unitName: '',
+				moduleName: '',
+				level: '',
+				confirm: '',
+				alarmDate: '',
+				type: '',
+				childType: '',
+				timeSummary: '',
+				recommendedOperation: '',
+				alarmDetail: ''
+			}
+		};
+	},
+	computed: {
+		...mapGetters('map', [
+			'name'
+		]),
+		show() {
+			return this.dialogShow && !this.$store.state.menuOperation.break;
+		},
+		domIdCancel() {
+			return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+		}
+	},
+	watch: {
+		'$store.state.socket.msgHead': function (elem) {
+			if (elem && elem.hasOwnProperty('success')) {
+				if (elem.success) {
+					const operate = this.$store.state.training.operate;
+					const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+					const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+					const newOperate = {
+						type: operate.type,
+						name: station.name
+					};
+
+					this.doShow(newOperate);
+				}
+			}
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.$store.dispatch('training/tipReload');
+		});
+	},
+	methods: {
+		doShow(operate) {
+			this.operate = operate || {};
+			this.model = {
+				lineName: this.name,
+				unitName: this.operate.name,
+				moduleName: 'CMM控制模式转换模式',
+				level: '0级告警',
+				confirm: '确认状态',
+				alarmDate: new Date(),
+				type: '系统事件',
+				childType: '依据信号设备操作命令设置控制模式',
+				timeSummary: '控制模式摘要',
+				recommendedOperation: '',
+				alarmDetail: `控制模式转换：${this.operate.name}由中控转为站控模式！`
+			};
+			this.dialogShow = true;
+			this.$nextTick(function () {
+				this.$store.dispatch('training/emitTipFresh');
+			});
+		},
+		doClose() {
+			if (this.dialogShow) {
+				this.$store.dispatch('socket/shiftMsgQueue');
+			}
+			this.dialogShow = false;
+			this.$store.dispatch('training/emitTipFresh');
+		},
+		cancel() {
+			const operate = {
+				type: this.operate.type,
+				operation: OperationEvent.Command.close.alarm.operation
+			};
+
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				if (valid) {
+					this.doClose();
+				}
+			});
+		},
+		commit() {
+			const operate = {
+				type: this.operate.type,
+				operation: OperationEvent.Command.close.alarm.operation
+			};
+			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+				this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+				if (valid) {
+					this.doClose();
+				}
+			});
+		},
+		isClose() {
+			return this.dialogShow;
+		}
+	}
+};
+
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    .alarm-type .el-input {
+        width: 220px;
+    }
+
+    .alarm-detail-description {
+        padding-left: 12px;
+        text-align: left;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue
new file mode 100644
index 000000000..1e0175452
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue
@@ -0,0 +1,285 @@
+<template>
+    <el-dialog class="chengdou-03__systerm passive-control" title="控制模式请求" :visible.sync="show" width="700px"
+        :before-close="doClose" :showClose="true" :zIndex="2000" :modal="false" :close-on-click-modal="false"
+        v-dialogDrag>
+        <span class="control-label">{{`${requestInfo}请求如下区域的控制模式`}}</span>
+        <el-table ref="multipleTable" :data="tableData" border row-key="code" style="width: 100%" height="250" center
+            size="mini" highlight-current-row>
+            <el-table-column prop="operate" label="操作区域">
+                <template slot-scope="scope">
+                    <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{scope.row.operate}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="control" label="当前控制模式" width="120">
+                <template slot-scope="scope">
+                    <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{scope.row.control.name}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="target" label="请求控制模式" width="120">
+                <template slot-scope="scope">
+                    <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{scope.row.target.name}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="agree" label="是否同意" width="140">
+                <template slot-scope="scope">
+                    <el-checkbox ref="agree" v-model="scope.row.agree" :disabled="scope.row.disabled"></el-checkbox>
+                </template>
+            </el-table-column>
+        </el-table>
+        <span class="control-label">距离对话还有{{count}}秒，请应答。</span>
+        <el-row class="button-group">
+            <el-col :span="10" :offset="3">
+                <el-button :id="domAgree" :disabled="disabledAgree" @click="agree">同意
+                </el-button>
+            </el-col>
+            <el-col :span="6" :offset="4">
+                <el-button :id="domIdRefuse" :disabled="disabledRefuse" @click="refuse">拒绝</el-button>
+            </el-col>
+        </el-row>
+        <notice-info ref="noticeInfo"></notice-info>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters } from 'vuex';
+    import { MapDeviceType, TrainingMode, OperationEvent, getDomIdByOperation, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+    import NoticeInfo from '../dialog/childDialog/childDialog/noticeInfo';
+
+    export default {
+        name: 'RequestControl',
+        components: {
+            NoticeInfo
+        },
+        data() {
+            return {
+                dialogShow: false,
+                disabledAgree: false,
+                disabledRefuse: false,
+                requestInfo: '调度员1工作站',
+                controlProps: {
+                    '01': '中控',
+                    '02': '站控'
+                },
+                selection: [],
+                tableData: [],
+                timer: null,
+                timeout: 61,
+                count: 0,
+            }
+        },
+        computed: {
+            targetStatus() {
+                if (this.$store.state.training.prdType == '01') {
+                    return '01';
+                }
+                if (this.$store.state.training.prdType == '02') {
+                    return '02'
+                }
+            },
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdChoose() {
+                return this.dialogShow ? OperationEvent.StationControl.controlResponse.choose.domId : '';
+            },
+            domAgree() {
+                return this.dialogShow ? OperationEvent.StationControl.controlResponse.agree.domId : '';
+            },
+            domIdRefuse() {
+                return this.dialogShow ? OperationEvent.StationControl.controlResponse.refuse.domId : '';
+            }
+        },
+        watch: {
+            tableData: {
+                handler(val, oldVal) {
+                    this.checkTableDataSelction(val);
+                },
+                deep: true
+            },
+            '$store.state.socket.msgHead': function (elem) {
+                if (elem && !elem.hasOwnProperty('success') && !elem.hasOwnProperty('timeout')) {
+                    if (elem.stationControlCode) {
+                        this.doShow(elem);
+                    }
+                }
+            },
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            createTimer() {
+                this.count = this.timeout;
+                this.timer = setInterval(() => {
+                    if (this.count <= 0) {
+                        this.doClose();
+                        return;
+                    }
+                    this.count = this.count - 1;
+                }, 1000)
+            },
+            clearTimer() {
+                if (this.timer) {
+                    clearInterval(this.timer);
+                    this.timer = null;
+                }
+            },
+            checkTableDataSelction(data) {
+                let selection = [];
+                if (data && data.length > 0) {
+                    data.forEach(row => {
+                        if (row.agree && !row.disabled) {
+                            selection.push(row);
+                        }
+                    })
+                }
+
+                this.disabledSend = selection.length ? false : true;
+                if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
+                    this.handleChooseChange(selection);
+                    this.selection = selection;
+                    this.disabledAgree = this.selection.length <= 0;
+                }
+            },
+            updateTableData(code) {
+                this.tableData = [];
+
+                let model = {
+                    code: code,
+                    operate: '',
+                    control: { code: '', name: '' },
+                    target: { code: '', name: '' },
+                    agree: false,
+                    disabled: false,
+                }
+
+                let device = this.$store.getters['map/getDeviceByCode'](code);
+                if (device) {
+                    let control = (device || {}).state
+                    if (control) {
+                        model.control = { status: control.status, name: this.controlProps[control.status] };
+                        model.target = { status: this.targetStatus, name: this.controlProps[this.targetStatus] };
+                    }
+
+                    let station = this.$store.getters['map/getDeviceByCode'](device.stationCode);
+                    if (station) {
+                        model.operate = station.name || '';
+                    }
+                }
+
+                this.tableData.push(model);
+            },
+            doShow(msgHead) {
+                this.dialogShow = true;
+                this.disabledAgree = true;
+                this.createTimer();
+                this.updateTableData(msgHead.stationControlCode);
+
+                let operate = {
+                    start: true,
+                    type: MapDeviceType.StationControl.type,
+                    operation: OperationEvent.StationControl.controlResponse.menu.operation,
+                };
+
+                this.$store.dispatch('training/emitTipFresh');
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                });
+
+            },
+            doClose() {
+                this.disabledAgree = false;
+                if (this.dialogShow) {
+                    this.$store.dispatch('socket/shiftMsgQueue');
+                }
+
+                this.count = 0;
+                this.dialogShow = false;
+                this.clearTimer();
+                this.$store.dispatch('training/emitTipFresh');
+                this.$refs.multipleTable.setCurrentRow();
+            },
+            serializeCodeListWithSeparator(sep) {
+                let codeList = [];
+                if (this.selection && this.selection.length) {
+                    this.selection.forEach(elem => {
+                        codeList.push(elem.code);
+                    })
+                }
+                return codeList.join(sep);
+            },
+            handleChooseChange(selection) {
+                this.selection = selection;
+                if (selection && selection.length) {
+                    let operate = {
+                        type: MapDeviceType.StationControl.type,
+                        operation: OperationEvent.StationControl.controlResponse.choose.operation,
+                        val: this.serializeCodeListWithSeparator('::'),
+                    }
+
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        if (valid) {
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        }
+                    })
+                } else if (!selection) {
+                    this.$messageBox('请选择一条数据');
+                }
+            },
+            agree() {
+                let operate = {
+                    send: true,
+                    over: true,
+                    type: MapDeviceType.StationControl.type,
+                    operation: OperationEvent.StationControl.controlResponse.agree.operation,
+                    val: this.selection[0].code,
+                    prdType: this.$store.state.training.prdType
+                }
+
+                this.clearTimer();
+                this.disabledAgree = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            },
+            refuse() {
+                let operate = {
+                    send: true,
+                    over: true,
+                    type: MapDeviceType.StationControl.type,
+                    operation: OperationEvent.StationControl.controlResponse.refuse.operation,
+                    val: this.tableData[0].code,
+                    prdType: this.$store.state.training.prdType
+                }
+
+                this.clearTimer();
+                this.disabledAgree = true;
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch((error) => {
+                    this.$refs.noticeInfo.doShow(operate);
+                })
+            }
+        }
+    }
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    .control-label {
+        line-height: 30px;
+        font-size: 18px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue
new file mode 100644
index 000000000..91cb2849d
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue
@@ -0,0 +1,106 @@
+<template>
+    <el-dialog class="chengdou-03__systerm cmd-notice" title="操作命令提示" :visible.sync="show" width="400px" :before-close="doClose"
+        :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+        <span>{{name}}，{{msg}}!</span>
+        <el-row class="button-group">
+            <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">确认</el-button>
+        </el-row>
+    </el-dialog>
+</template>
+
+<script>
+    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+    export default {
+        name: 'CmdNotice',
+        data() {
+            return {
+                dialogShow: false,
+                loading: false,
+                operate: null,
+                name: '',
+                msg: ''
+            }
+        },
+        computed: {
+            show() {
+                return this.dialogShow && !this.$store.state.menuOperation.break;
+            },
+            domIdCancel() {
+                return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
+            },
+        },
+        watch: {
+            '$store.state.socket.msgHead': function (elem) {
+                if (elem && (elem.hasOwnProperty('success') || elem.hasOwnProperty('timeout'))) {
+                    let operate = this.$store.state.training.operate;
+                    let control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                    let station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                    let newOperate = {
+                        type: operate.type,
+                        name: station.name,
+                    }
+
+                    if (elem.timeout) {
+                        newOperate['msg'] = '请求超时';
+                        this.doShow(newOperate);
+                    } else if (!elem.success) {
+                        newOperate['msg'] = '请求拒绝';
+                        this.doShow(newOperate);
+                    }
+                }
+            },
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.$store.dispatch('training/tipReload');
+            })
+        },
+        methods: {
+            doShow(operate) {
+                this.operate = operate || {};
+                this.name = this.operate.name || '';
+                this.msg = this.operate.msg || '';
+                this.dialogShow = true;
+                this.$nextTick(function () {
+                    this.$store.dispatch('training/emitTipFresh');
+                });
+            },
+            doClose() {
+                if (this.dialogShow) {
+                    this.$store.dispatch('socket/shiftMsgQueue');
+                }
+                this.dialogShow = false;
+                this.$store.dispatch('training/emitTipFresh');
+            },
+            cancel() {
+                let operate = {
+                    operation: this.operate.type,
+                    operation: OperationEvent.Command.close.notice.operation,
+                }
+
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        this.doClose();
+                    }
+                })
+            },
+            commit() {
+                let operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.close.notice.operation,
+                }
+                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (valid) {
+                        this.doClose();
+                    }
+                })
+            },
+            isClose() {
+                return this.dialogShow;
+            }
+        }
+    }
+
+</script>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/statusBar.vue b/src/jmapNew/theme/ningbo_01/menus/statusBar.vue
new file mode 100644
index 000000000..46a07d747
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/statusBar.vue
@@ -0,0 +1,31 @@
+<template>
+    <div id="statusBar"></div>
+</template>
+
+<script>
+    export default {
+        name: 'StatusBar',
+        props: {
+            selected: {
+                type: Object
+            }
+        },
+        data() {
+            return {
+            }
+        },
+        mounted() {
+        }
+    }
+</script>
+<style>
+    #statusBar {
+        z-index: 1000;
+        position: absolute;
+        height: $height;
+        line-height: $height;
+        border-radius: 0px !important;
+        top: 0px;
+        left: 0px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/statusDownTrainDetail.vue b/src/jmapNew/theme/ningbo_01/menus/statusDownTrainDetail.vue
new file mode 100644
index 000000000..14f092b23
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/statusDownTrainDetail.vue
@@ -0,0 +1,31 @@
+<template>
+    <div id="statusDownTrainDetail"></div>
+</template>
+
+<script>
+    export default {
+        name: 'StatusDownTrainDetail',
+        props: {
+            selected: {
+                type: Object
+            }
+        },
+        data() {
+            return {
+            }
+        },
+        mounted() {
+        }
+    }
+</script>
+<style>
+    #statusDownTrainDetail {
+        z-index: 1000;
+        position: absolute;
+        height: $height;
+        line-height: $height;
+        border-radius: 0px !important;
+        top: 0px;
+        left: 0px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/statusUpTrainDetail.vue b/src/jmapNew/theme/ningbo_01/menus/statusUpTrainDetail.vue
new file mode 100644
index 000000000..afafa39cf
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/statusUpTrainDetail.vue
@@ -0,0 +1,31 @@
+<template>
+    <div id="statusUpTrainDetail"></div>
+</template>
+
+<script>
+    export default {
+        name: 'StatusUpTrainDetail',
+        props: {
+            selected: {
+                type: Object
+            }
+        },
+        data() {
+            return {
+            }
+        },
+        mounted() {
+        }
+    }
+</script>
+<style>
+    #statusUpTrainDetail {
+        z-index: 1000;
+        position: absolute;
+        height: $height;
+        line-height: $height;
+        border-radius: 0px !important;
+        top: 0px;
+        left: 0px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/menus/utils/menuItemStatus.js b/src/jmapNew/theme/ningbo_01/menus/utils/menuItemStatus.js
new file mode 100644
index 000000000..44d3cbb9a
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/utils/menuItemStatus.js
@@ -0,0 +1,587 @@
+import store from '@/store';
+import deviceState from '@/jmap/constant/deviceState';
+import { OperateMode } from '@/scripts/ConstDic';
+
+export function getCurrentStateObject() {
+	return store.getters['menuOperation/selected'];
+}
+
+/** 系统类型 */
+export const SystemType = {
+	'01': 'local',		// 现地工作站
+	'02': 'central'		// 中心调度工作站
+};
+
+export const StationControlType = {
+	'01': 'center', 	// 中控
+	'02': 'station',	// 站控
+	'03': 'station'
+};
+
+// 控制禁用
+export const MenuDisabledState = {
+	Section: {
+		// 故障解锁
+		fault() {
+		},
+		// 切除
+		split() {
+			const device = getCurrentStateObject();
+			if (device && device.cutOff != deviceState.Section.cutOff.Default) {
+				return true;
+			}
+		},
+		// 激活
+		active() {
+			const device = getCurrentStateObject();
+			if (device && device.cutOff == deviceState.Section.cutOff.Default) {
+				return true;
+			}
+		},
+		// 区段封锁
+		lock() {
+			const device = getCurrentStateObject();
+			if (device && device.status == deviceState.Section.status.State06) {
+				return true;
+			}
+		},
+		// 区段解禁
+		unlock() {
+			const device = getCurrentStateObject();
+			if (device && device.status != deviceState.Section.status.State06) {
+				return true;
+			}
+		},
+		// 区段设置限速
+		setSpeed() {
+		},
+		// 区段取消限速
+		cancelSpeed() {
+			const device = getCurrentStateObject();
+			if (device && device.speedUpperLimit == deviceState.Section.speedUpperLimit.Default) {
+				return true;
+			}
+		},
+		// 新建列车
+		newTrain() {
+		},
+		// 计轴预复位
+		axlePreReset() {
+		},
+		// 设置计轴有效
+		alxeEffective() {
+		},
+		// 设置计轴失效
+		alxeFailure() {
+			const device = getCurrentStateObject();
+			if (device && device.status == deviceState.Section.status.State13) {
+				return true;
+			}
+		}
+	},
+	Signal: {
+		// 进路选排
+		arrangementRoute() {
+
+		},
+		// 进路取消
+		cancelTrainRoute() {
+		},
+		// 信号封闭
+		lock() {
+			const device = getCurrentStateObject();
+			if (device && device.status == deviceState.Signal.status.State05) {
+				return true;
+			}
+		},
+		// 信号解封
+		unlock() {
+			const device = getCurrentStateObject();
+			if (device && device.status != deviceState.Signal.status.State05) {
+				return true;
+			}
+		},
+		// 信号重开
+		reopenSignal() {
+		},
+		// 进路引导
+		guide() {
+		},
+		// 设置联锁自动进路
+		setAutoInterlock() {
+		},
+		// 取消联锁自动进路
+		cancelAutoInterlock() {
+		},
+		// 设置联锁自动触发
+		setAutoTrigger() {
+		},
+		// 取消联锁自动触发
+		cancelAutoTrigger() {
+		},
+		// 关灯
+		signalClose() {
+			const device = getCurrentStateObject();
+			if (device && device.status == deviceState.Signal.status.State01) {
+				return true;
+			}
+		},
+		// 总人解
+		humanTrainRoute() {
+		},
+		// 人工控
+		humanControl() {
+		},
+		// ats自动控
+		atsAutoControl() {
+		},
+		// 查询进路状态
+		detail() {
+		},
+		// 设置故障
+		setStoppage() {
+			const device = getCurrentStateObject();
+			if (device && device.fault) {
+				return true;
+			}
+		},
+		// 取消故障
+		cancelStoppage() {
+			const device = getCurrentStateObject();
+			if (device && !device.fault) {
+				return true;
+			}
+		}
+	},
+	Station: {
+		// 全站设置联锁自动触发
+		setAutoTrigger() {
+		},
+		// 全站取消联锁自动触发
+		cancelAutoTrigger() {
+		},
+		// 上电解锁
+		powerUnLock() {
+		},
+		// 执行关键操作测试
+		execKeyOperationTest() {
+		},
+		// 所有进路自排开
+		atsAutoControlALL() {
+		},
+		// 所有进路自排关
+		humanControlALL() {
+		},
+		// 设置ZC故障
+		setStoppage() {
+			const device = getCurrentStateObject();
+			if (device && device.fault) {
+				return true;
+			}
+		},
+		// 取消ZC故障
+		cancelStoppage() {
+			const device = getCurrentStateObject();
+			if (device && !device.fault) {
+				return true;
+			}
+		}
+	},
+	StationControl: {
+		// 紧急站控
+		emergencyStationControl() {
+			const device = getCurrentStateObject();
+			if (device && device.status == deviceState.StationControl.status.State03) {
+				return true;
+			}
+		},
+		// 请求站控
+		requestStationControl() {
+			const device = getCurrentStateObject();
+			if (device && device.status == deviceState.StationControl.status.State02) {
+				return true;
+			}
+		},
+		// 强行站控
+		forcedStationControl() {
+			const device = getCurrentStateObject();
+			if (device && device.status == deviceState.StationControl.status.State02) {
+				return true;
+			}
+		},
+		// 请求中控
+		requestCentralControl() {
+			const device = getCurrentStateObject();
+			if (device && device.status == deviceState.StationControl.status.State01) {
+				return true;
+			}
+		},
+		// 设置故障
+		setStoppage() {
+			const device = getCurrentStateObject();
+			if (device && device.fault) {
+				return true;
+			}
+		},
+		// 取消故障
+		cancelStoppage() {
+			const device = getCurrentStateObject();
+			if (device && !device.fault) {
+				return true;
+			}
+		}
+	},
+	StationStand: {
+		// 设置扣车
+		setDetainTrain() {
+			const device = getCurrentStateObject();
+			if (device && device.holdStatus != deviceState.StationStand.holdStatus.State01) {
+				return true;
+			}
+		},
+		// 取消扣车
+		cancelDetainTrain() {
+			const device = getCurrentStateObject();
+			if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) {
+				return true;
+			}
+		},
+		// 强制取消扣车
+		cancelDetainTrainForce() {
+			const device = getCurrentStateObject();
+			if (device && device.holdStatus == deviceState.StationStand.holdStatus.State01) {
+				return true;
+			}
+		},
+		// 设置全站扣车
+		cancelDetainTrainAll() {
+		},
+		// 设置运行等级
+		setRunLevel() {
+		},
+		// 设置停站时间
+		setStopTime() {
+		},
+		// 设置跳停
+		setJumpStop() {
+			const device = getCurrentStateObject();
+			if (device && device.jumpStopStatus != deviceState.StationStand.jumpStopStatus.State01) {
+				return true;
+			}
+		},
+		// 取消跳停
+		cancelJumpStop() {
+			const device = getCurrentStateObject();
+			if (device && device.jumpStopStatus == deviceState.StationStand.jumpStopStatus.State01) {
+				return true;
+			}
+		},
+		// 提前发车
+		earlyDeparture() {
+		},
+		// 站台详细信息
+		detail() {
+		},
+		// 设置折返策略
+		setBackStrategy() {
+		},
+		// 设置故障
+		setStoppage() {
+			const device = getCurrentStateObject();
+			if (device && device.fault) {
+				return true;
+			}
+		},
+		// 取消故障
+		cancelStoppage() {
+			const device = getCurrentStateObject();
+			if (device && !device.fault) {
+				return true;
+			}
+		}
+	},
+	Switch: {
+		// 单锁
+		lock() {
+			const device = getCurrentStateObject();
+			if (device && device.status == deviceState.Switch.status.State10) {
+				return true;
+			}
+		},
+		// 解锁
+		unlock() {
+			const device = getCurrentStateObject();
+			if (device && device.status != deviceState.Switch.status.State10) {
+				return true;
+			}
+		},
+		// 封锁
+		block() {
+			const device = getCurrentStateObject();
+			if (device && device.status == deviceState.Switch.status.State14) {
+				return true;
+			}
+		},
+		// 解封
+		unblock() {
+			const device = getCurrentStateObject();
+			if (device && device.status != deviceState.Switch.status.State14) {
+				return true;
+			}
+		},
+		// 强扳
+		switchTurnoutForce() {
+		},
+		// 转动
+		switchTurnout() {
+		},
+		// 道岔故障解锁
+		fault() {
+		},
+		// 计轴预复位
+		axlePreReset() {
+		},
+		// 道岔切除
+		split() {
+		},
+		// 道岔激活
+		active() {
+		},
+		// 道岔设置速度
+		setSpeed() {
+			// const device = getCurrentStateObject();
+		},
+		// 设置计轴有效
+		alxeEffective() {
+		},
+		// 道岔取消速度
+		cancelSpeed() {
+		},
+		// 设置故障
+		setStoppage() {
+			const device = getCurrentStateObject();
+			if (device && device.fault) {
+				return true;
+			}
+		},
+		// 取消故障
+		cancelStoppage() {
+			const device = getCurrentStateObject();
+			if (device && !device.fault) {
+				return true;
+			}
+		},
+		// 单操到定位
+		locate() {
+		},
+		// 单操到反位
+		reverse() {
+		},
+		// 属性
+		property() {
+		}
+	},
+	Train: {
+		// 添加列车识别号
+		addTrainId() {
+		},
+		// 删除列车识别号
+		delTrainId() {
+		},
+		// 修改列车识别号
+		editTrainId() {
+		},
+		// 修改车组号
+		editTrainNo() {
+		},
+		// 创建车组号
+		createTrainNo() {
+		},
+		// 移动车组号
+		moveTrainNo() {
+		},
+		// 删除车组号
+		deleteTrainNo() {
+		},
+		// 移动列车识别号
+		moveTrainId() {
+		},
+		// 交换列车识别号
+		switchTrainId() {
+		},
+		// 设计划车
+		setPlanTrainId() {
+		},
+		// 设目的地车
+		destinationTrainId() {
+		},
+		// 设人工车
+		artificialTrainId() {
+		},
+		// 详细列车信息
+		detailTrainInfo() {
+		},
+		// 设置限速
+		limitSpeed() {
+		},
+		// 设置通信故障
+		setStoppage() {
+			const device = getCurrentStateObject();
+			if (device && device.fault) {
+				return true;
+			}
+		},
+		// 取消通信故障
+		cancelStoppage() {
+			const device = getCurrentStateObject();
+			if (device && !device.fault) {
+				return true;
+			}
+		}
+	}
+};
+
+/**
+ * 将menu的disabled属性使用disabledCallback计算并返回
+ * @param {Array} menu
+ */
+export function menuConvert(menu) {
+	if (menu.constructor === Array) {
+		menu.forEach(elem => {
+			if (elem.type === 'separator') {
+				elem.show = true;
+				return;
+			}
+			if (elem.disabledCallback.constructor === Function) {
+				// elem.disabled = elem.defaultDisabled;
+				if (!elem.defaultDisabled) {
+					elem.disabled = elem.disabledCallback();
+				}
+			}
+		});
+	}
+	return menu;
+}
+
+/**
+ * 根据产品类型，返回对应的menuBar
+ * @param {*} menuObj
+ */
+export function menuBarConvert(menu, mode) {
+	if (menu) {
+		if (mode === OperateMode.NORMAL) {
+			menu.forEach(item => {
+				if (item.type === 'separator') {
+					item.show = true;
+					return;
+				}
+
+				item.show = false;
+				if (!item.click) {
+					item.click = () => { };
+				}
+
+				if (!item.froce) {
+					item.show = true;
+					if (item.children && item.children.length > 0) {
+						menuBarConvert(item.children, mode);
+					}
+				}
+			});
+		} else if (mode === OperateMode.ADMIN) {
+			menu.forEach(item => {
+				item.show = true;
+				if (!item.click) {
+					item.click = () => { };
+				}
+				if (item.children && item.children.length > 0) {
+					menuBarConvert(item.children, mode);
+				}
+			});
+		}
+	}
+	return menu || [];
+}
+
+/**
+ * 将menu的show属性过滤返回
+ * @param {Array} menu
+ */
+export function menuFiltration(menuObj) {
+	var selected = getCurrentStateObject();
+	var control;
+	var menu = [];
+
+	if (selected._type == 'StationStand') {
+		control = store.getters['map/getStationControlByStationCode'](selected.deviceStationCode);
+	} else if (selected._type == 'Station') {
+		control = store.getters['map/getStationControlByStationCode'](selected.code);
+	} else {
+		control = store.getters['map/getStationControlByStationCode'](selected.stationCode);
+	}
+
+	if (control) {
+		if (store.state.training.prdType != '') {
+			const type = SystemType[store.state.training.prdType];
+			const status = StationControlType[control.status];
+			menu = [...menuObj[type]];
+			if (menu.constructor === Array) {
+				menu.forEach(elem => {
+					if (elem.type === 'separator') {
+						elem.show = true;
+						return;
+					}
+
+					if (elem.auth.constructor === Object) {
+						elem.show = true;
+						if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
+							elem.show = false;
+						}
+						elem.defaultDisabled = !elem.auth[status];
+					}
+				});
+			}
+		}
+	}
+	return menu;
+}
+
+/**
+ * 将train menu的show属性过滤返回
+ */
+export function trainMenuFiltration(menuObj) {
+	var menu = [];
+	if (store.state.training.prdType != '') {
+		var type = SystemType[store.state.training.prdType];
+		menu = [...menuObj[type]];
+		if (menu.constructor === Array) {
+			menu.forEach(elem => {
+				if (elem.type === 'separator') {
+					elem.show = true;
+					return;
+				}
+
+				if (elem.auth.constructor === Object) {
+					elem.show = true;
+					if (!elem.auth['station'] && !elem.auth['center']) {	// 控制不显示
+						elem.show = false;
+					}
+				}
+			});
+		}
+	}
+	return menu;
+}
+
+/**
+ * 离开菜单以及执行完菜单取消选中状态
+ */
+export function mouseCancelState(device) {
+	// Object.assign(device, { _selected: false });
+	// var viewInstance = store.state.map.jlmap.getViewInstanceByDevice({ _type: device._type, _code: device.code });
+	// if (viewInstance && viewInstance['mouseleave']) {
+	// 	viewInstance['selected'] = false;
+	// 	viewInstance['mouseleave'](store.state.map.jlmap._zr.curEvent);
+	// }
+}
+
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/addTask.vue b/src/jmapNew/theme/ningbo_01/menusPlan/addTask.vue
new file mode 100644
index 000000000..009c19f02
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menusPlan/addTask.vue
@@ -0,0 +1,175 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule add-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="margin: 10px">
+      <el-row>
+        <el-col :span="3">
+          <el-radio v-model="model.type" label="1">加在最前</el-radio>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <span>车次号：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.tripNumber" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="3" :offset="1">
+          <span>开始时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.startTime" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="3">
+          <el-radio v-model="model.type" label="2">加在最后</el-radio>
+        </el-col>
+        <el-col :span="2" :offset="1">
+          <span>车次号：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.tripNumber" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="3" :offset="1">
+          <span>开始时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="model.startTime" placeholder="请选择">
+            <el-option
+              v-for="item in tripNumberList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+
+      </el-row>
+      <el-row style="margin-bottom: 5px;">
+        交路：
+      </el-row>
+      <el-row>
+        <el-table :data="model.route" border :height="180">
+          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="address" label="地址" />
+          <el-table-column width="20" />
+        </el-table>
+      </el-row>
+      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+        详情：
+      </el-row>
+      <el-row>
+        <el-table :data="model.detail" border :height="180">
+          <el-table-column prop="date" label="日期" width="180" />
+          <el-table-column prop="name" label="姓名" width="180" />
+          <el-table-column prop="address" label="地址" />
+          <el-table-column width="20" />
+        </el-table>
+      </el-row>
+      <el-row>
+        <el-col :offset="16">
+          <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+	name: 'AddTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				type: '1',
+				serviceNumber: '',
+				tripNumber: '',
+				startTime: '',
+				default: false,
+				route: [],
+				detail: []
+			},
+			tripNumberList: []
+		};
+	},
+	computed: {
+		title() {
+			return '添加任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.model.serviceNumber = params.serviceNumber;
+			this.model.tripNumber = params.tripNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			this.doClose();
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-button {
+            margin-left: 40px !important;
+            margin-right: 40px !important;
+        }
+
+        .el-row {
+            margin-bottom: 5px !important;
+        }
+
+        .el-input__inner {
+            height: 20px !important;
+            line-height: 20px !important;
+        }
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/chooseTemplatePlan.vue b/src/jmapNew/theme/ningbo_01/menusPlan/chooseTemplatePlan.vue
new file mode 100644
index 000000000..fa220d049
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menusPlan/chooseTemplatePlan.vue
@@ -0,0 +1,115 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :title="title"
+    class="beijing-01__schedule choose-plan-template"
+    :visible.sync="dialogShow"
+    width="70%"
+    :before-close="doClose"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button type="primary" :loading="loading" @click="handleConfirm">选 择</el-button>
+      <el-button @click="dialogShow = false">取 消</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { runPlanTemplateList } from '@/api/runplan';
+import { listPublishMap } from '@/api/jmap/map';
+
+export default {
+    name: 'ChooseTemplatePlan',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            mapList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '100px',
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '运行图名称'
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                radioShow: true,
+                columns: [
+                    {
+                        title: '运行图名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '地图名称',
+                        prop: 'mapId',
+                        type: 'tag',
+                        columnValue: (row) => {
+                            return this.$convertField(row.mapId, this.mapList, ['id', 'name']);
+                        },
+                        tagType: (row) => { return 'success'; }
+                    }
+                ]
+            },
+
+            currentModel: {}
+        };
+    },
+    computed: {
+        title() {
+            return '选择模板运行图';
+        }
+    },
+    methods: {
+        loadInitData() {
+            this.mapList = [];
+            listPublishMap().then(response => {
+                this.mapList = response.data;
+            });
+        },
+        doShow() {
+            this.loading = false;
+            this.dialogShow = true;
+            this.loadInitData();
+        },
+        doClose() {
+            this.dialogShow = false;
+        },
+        queryFunction(params) {
+            if (this.$store.state.map && this.$store.state.map.map) {
+                // params['lineCode'] = this.$store.getters['map/lineCode'];
+                params['mapId'] = this.$route.query.mapId;
+            }
+            return runPlanTemplateList(params);
+        },
+        handleConfirm() {
+            this.doClose();
+            if (this.$refs && this.$refs.pageRules) {
+                const choose = this.$refs.pageRules.currentChoose();
+                if (choose) {
+                    this.$emit('chooseConfirm', choose);
+                } else {
+                    this.$messageBox(`请选择模板运行图`);
+                }
+            }
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/components/dataTable.vue b/src/jmapNew/theme/ningbo_01/menusPlan/components/dataTable.vue
new file mode 100644
index 000000000..ef76ee150
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menusPlan/components/dataTable.vue
@@ -0,0 +1,206 @@
+<template>
+  <div v-if="show">
+    <template v-if="maxmini">
+      <div class="nav">
+        <div v-show="config.showClose" class="cls-status" @click="touch('Close')"><span /></div>
+        <div class="min-status" @click="touch('Minim')"><span /></div>
+      </div>
+      <el-table
+        ref="table"
+        :data="config.data"
+        :highlight-current-row="config.highlightCurrentRow"
+        :height="height"
+        border
+        @current-change="handleChange"
+      >
+        <template v-for="(item,index) in config.columns">
+          <el-table-column :key="index" :prop="item.prop" :label="item.label" :width="item.width" />
+        </template>
+      </el-table>
+    </template>
+    <template v-else>
+      <div class="nav">
+        <div class=" max-status" @click="touch('Maxim')"><span /></div>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+	name: 'DataTable',
+	props: {
+		height: {
+			type: Number,
+			required: true
+		},
+		config: {
+			type: Object,
+			required: true
+		}
+	},
+	data() {
+		return {
+			show: true,
+			maxmini: true,
+			touchStrategy: {
+				'Close': [false, true],
+				'Minim': [true, false],
+				'Maxim': [true, true]
+			}
+		};
+	},
+	methods: {
+		handleChange(row) {
+			if (this.config.handleChange) {
+				this.config.handleChange(row);
+			}
+		},
+		setCurrentRow(row) {
+			this.$refs.table.setCurrentRow(row);
+		},
+		touch(operate) {
+			this.$nextTick(() => {
+				[this.show, this.maxmini] = this.touchStrategy[operate];
+				this.$emit('touch', this.maxmini);
+			});
+		}
+	}
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+    $height: 20px;
+    $width: 20px;
+
+    .nav {
+        display: table;
+        float: right;
+        width: 100%;
+        color: #0000;
+        background: -webkit-linear-gradient(#FDFDFE, #B1CBF3);
+        background: -o-linear-gradient(#FDFDFE, #B1CBF3);
+        background: -moz-linear-gradient(#FDFDFE, #B1CBF3);
+        background: linear-gradient(#FDFDFE, #B1CBF3);
+        border: 1px solid #B6BCCC !important;
+        border-bottom: 2px solid #B6BCCC !important;
+        list-style: none;
+        height: $height;
+        line-height: $height;
+    }
+
+    /deep/ {
+        .el-table--border th.gutter {
+            background: #EBEADB !important;
+        }
+
+        .el-table {
+            overflow-y: hidden;
+            width: 100%;
+
+            th.is-leaf {
+                padding: 0px 0;
+                background: #EBEADB;
+                border-right: none !important;
+                border-left: 1px solid #D1CDBD !important;
+                border-top: 1px solid #D1CDBD !important;
+                border-bottom: 1px inset #D1CDBD !important;
+                color: #000;
+
+                .cell {
+                    height: $height;
+                    line-height: $height;
+                }
+            }
+
+            td {
+                padding: 0px 0;
+
+                .cell {
+                    height: $height;
+                    line-height: $height;
+                    font-size: smaller !important;
+                }
+
+            }
+
+            .current-row>td {
+                background: #316AC5 !important;
+                color: #fff !important;
+            }
+        }
+
+        .cls-status {
+            float: right;
+            width: 12px;
+            height: 100%;
+            line-height: 100%;
+            margin-left: 5px;
+            cursor: pointer;
+
+            span {
+                display: inline-block;
+                content: '/';
+                background: black;
+                width: 2px;
+                height: 12px;
+                vertical-align: middle;
+               transform: rotate(45deg);
+            }
+
+            span::after {
+                display: block;
+                content: '/';
+                background: black;
+                width: 2px;
+                height: 12px;
+               transform: rotate(-90deg);
+            }
+        }
+
+        .min-status {
+            float: right;
+            width: 20px;
+            height: 100%;
+            line-height: 100%;
+            cursor: pointer;
+
+            span {
+                display: inline-block;
+                content: '-';
+                background: black;
+                width: 2px;
+                height: 12px;
+                vertical-align: middle;
+               transform: rotate(-90deg);
+            }
+        }
+
+        .max-status {
+            float: right;
+            width: 20px;
+            height: 100%;
+            line-height: 100%;
+            cursor: pointer;
+
+            span {
+                display: inline-block;
+                content: '';
+                background: black;
+                width: 2px;
+                height: 12px;
+               transform: rotate(0deg);
+            }
+
+            span::after {
+                display: block;
+                content: '';
+                background: black;
+                width: 2px;
+                height: 12px;
+               transform: rotate(90deg);
+            }
+        }
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/createTodayPlan.vue b/src/jmapNew/theme/ningbo_01/menusPlan/createTodayPlan.vue
new file mode 100644
index 000000000..061b7f8d0
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menusPlan/createTodayPlan.vue
@@ -0,0 +1,134 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :title="title"
+    class="beijing-01__schedule reload-today-plan"
+    :visible.sync="dialogShow"
+    width="80%"
+    :before-close="doClose"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="pageRules" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button type="primary" :loading="loading" @click="handleConfirm">加 载</el-button>
+      <el-button @click="dialogShow = false">取 消</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { runPlanTemplateList } from '@/api/runplan';
+import { getStationList } from '@/api/runplan';
+import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
+import {getPublishMapInfo} from '@/api/jmap/map';
+
+export default {
+    name: 'ReloadTodayPlan',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '100px',
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '运行图名称'
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                radioShow: true,
+                columns: [
+                    {
+                        title: '运行图名称',
+                        prop: 'name'
+                    }
+                ]
+            },
+
+            currentModel: {}
+        };
+    },
+    computed: {
+        title() {
+            return '加载当天计划';
+        }
+    },
+    methods: {
+        doShow() {
+            this.loading = false;
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.dialogShow = false;
+        },
+        queryFunction(params) {
+            if (this.$store.state.map && this.$store.state.map.map) {
+                // params['lineCode'] = this.$store.getters['map/lineCode'];
+                params['mapId'] = this.$route.query.mapId;
+            }
+            return runPlanTemplateList(params);
+        },
+        // 生成每日运行图
+        handleConfirm() {
+            if (this.$refs && this.$refs.pageRules) {
+                const choose = this.$refs.pageRules.currentChoose();
+                if (choose && choose.id) {
+                    this.loading = true;
+                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
+                        this.loading = false;
+                        this.reloadTable();
+                        this.loadRunData();
+                        this.doClose();
+                        this.$message.success(`生成用户每日运行图成功`);
+                    }).catch(() => {
+                        this.loading = false;
+                        this.reloadTable();
+                        this.$messageBox(`生成用户每日运行图失败`);
+                    });
+                } else {
+                    this.$messageBox(`请选择需要加载的运行图`);
+                }
+            }
+        },
+        loadRunData() {
+            // const skinCode = this.$route.query.skinCode;
+            const mapId = this.$route.query.mapId;
+            this.$store.dispatch('runPlan/clear');
+            if (mapId) {
+                getStationList(mapId).then(response => {
+                    const stations = response.data;
+                    getPublishMapInfo(this.$route.query.mapId).then(res=>{
+                        this.PlanConvert = this.$theme.loadPlanConvert(res.data.lineCode);
+                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
+                            getEveryDayRunPlanData(this.$route.query.group).then(resp => {
+                                this.$store.dispatch('runPlan/setPlanData', resp.data);
+                            }).catch(() => {
+                                this.$store.dispatch('runPlan/setPlanData', []);
+                                this.$messageBox(`获取运行图数据失败`);
+                            });
+                        });
+                    });
+                }).catch(() => {
+                    this.$messageBox(`获取车站列表失败`);
+                });
+            }
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/createWeekPlan.vue b/src/jmapNew/theme/ningbo_01/menusPlan/createWeekPlan.vue
new file mode 100644
index 000000000..2eabc8044
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menusPlan/createWeekPlan.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule create-week-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
+        <el-form-item label="运行图名称:" prop="planId">
+          <el-row>
+            <el-col :span="19">
+              <el-input v-model="model.planName" :readonly="true" />
+            </el-col>
+            <el-col :span="4" :offset="1">
+              <el-button @click="handleChoose">选择 </el-button>
+            </el-col>
+          </el-row>
+        </el-form-item>
+        <el-form-item label="计划日期范围:" prop="dateList">
+          <el-row>
+            <el-date-picker
+              v-model="model.dateList"
+              type="dates"
+              :clearable="false"
+              placeholder="选择一个或多个日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-row>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="create">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+    <choose-template-plan ref="choose" @chooseConfirm="chooseConfirm" />
+  </el-dialog>
+</template>
+
+<script>
+import { createRunPlanLoad } from '@/api/runplan';
+import ChooseTemplatePlan from './chooseTemplatePlan';
+
+export default {
+	name: 'CreateWeekPlan',
+	components: {
+		ChooseTemplatePlan
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				planId: '',
+				planName: '',
+				dateList: []
+			}
+		};
+	},
+	computed: {
+		title() {
+			return '创建一周计划';
+		},
+		rules() {
+			const rules = {
+				planId: [
+					{ required: true, message: '请选择模板运行图', trigger: 'blur' }
+				],
+				dateList: [
+					{ required: true, message: '请选择计划日期范围', trigger: 'change' }
+				]
+			};
+
+			return rules;
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleChoose() {
+			this.$refs.choose.doShow();
+		},
+		chooseConfirm(choose) {
+			if (choose) {
+				this.model.planId = choose.id;
+				this.model.planName = choose.name;
+			}
+		},
+		buildModel() {
+			return {
+				planDateList: this.model.dateList,
+				mapId: this.$route.query.mapId,
+				templatePlanId: this.model.planId
+			};
+		},
+		create() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					createRunPlanLoad(this.buildModel()).then(response => {
+						this.$message.success('创建运行图计划成功');
+						this.doClose();
+					}).catch(() => {
+						this.doClose();
+						this.$messageBox('创建运行图计划失败');
+					});
+				}
+			});
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    .card-box {
+        padding-top: 10px;
+    }
+
+    /deep/ {
+        .el-row {
+            margin: 10px;
+        }
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/deleteTask.vue b/src/jmapNew/theme/ningbo_01/menusPlan/deleteTask.vue
new file mode 100644
index 000000000..cd79c305f
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menusPlan/deleteTask.vue
@@ -0,0 +1,73 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule delete-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-radio v-model="type" :label="1">删除以前所有任务（包含本任务）</el-radio>
+    </el-row>
+    <el-row>
+      <el-radio v-model="type" :label="2">删除以后所有任务（包含本任务）</el-radio>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+	name: 'DeleteTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			tripNumber: '',
+			serviceNumber: '',
+			type: '1'
+		};
+	},
+	computed: {
+		title() {
+			return '删除任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.tripNumber = params.tripNumber;
+			this.serviceNumber = params.serviceNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			// this.tripNumber
+			this.doClose();
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-row {
+            margin: 10px;
+        }
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/deleteTodayPlan.vue b/src/jmapNew/theme/ningbo_01/menusPlan/deleteTodayPlan.vue
new file mode 100644
index 000000000..2e22a7c64
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menusPlan/deleteTodayPlan.vue
@@ -0,0 +1,62 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule create-week-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+	name: 'DeleteTodayPlan',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false
+		};
+	},
+	computed: {
+		title() {
+			return '删除当天计划';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			// this.tripNumber
+			this.doClose();
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-row {
+            margin: 10px;
+        }
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/managePlanList.vue b/src/jmapNew/theme/ningbo_01/menusPlan/managePlanList.vue
new file mode 100644
index 000000000..7fcd45639
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menusPlan/managePlanList.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule manage-plan-list"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="80%"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
+</template>
+
+<script>
+import { getRunPlanLoadList, deleteRunPlanLoad, listAllTempLateRunPlan } from '@/api/runplan';
+import { getPublishMapListOnline } from '@/api/jmap/map';
+
+export default {
+    name: 'ManagePlanList',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '140px',
+                reset: true
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: this.$t('publish.mapName'),
+                        prop: 'mapId',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('publish.runPlanName'),
+                        prop: 'templatePlanId',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.templatePlanId, this.templatePlanList, ['id', 'name']); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '加载日期',
+                        prop: 'loadTime'
+                    },
+                    {
+                        type: 'button',
+                        title: '操作',
+                        width: '100',
+                        buttons: [
+                            {
+                                name: '删除',
+                                handleClick: this.handleDelete,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: '创建', btnCode: 'employee_insert', handler: this.handleCreateRunPlan }
+                ]
+            },
+
+            currentModel: {}
+        };
+    },
+    computed: {
+        title() {
+            return '运行图计划表';
+        }
+    },
+    mounted() {
+        this.loadPageData();
+    },
+    methods: {
+        loadPageData() {
+            this.mapList = [];
+            getPublishMapListOnline().then(resp => {
+                this.mapList = resp.data;
+            });
+            this.templatePlanList = [];
+            listAllTempLateRunPlan().then(resp => {
+                this.templatePlanList = resp.data;
+            });
+        },
+        queryFunction(params) {
+            if (this.$route.query.mapId) {
+                params['mapId'] = this.$route.query.mapId;
+            }
+
+            if (this.$store.state.user.id) {
+                params['userId'] = this.$store.state.user.id;
+            }
+
+            return getRunPlanLoadList(params);
+        },
+        handleDelete(index, row) {
+            this.$confirm('此操作将删除次日加载的运行图, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                deleteRunPlanLoad(row.id).then(response => {
+                    this.$message.success('删除成功');
+                    this.reloadTable();
+                }).catch(() => {
+                    this.reloadTable();
+                    this.$messageBox('删除失败');
+                });
+            }).catch(() => { });
+        },
+        handleCreateRunPlan() {
+            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
+        },
+        doShow() {
+            this.dialogShow = true;
+            this.$nextTick(()=> { this.reloadTable(); });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/modifyingPlan.vue b/src/jmapNew/theme/ningbo_01/menusPlan/modifyingPlan.vue
new file mode 100644
index 000000000..1d2b31102
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menusPlan/modifyingPlan.vue
@@ -0,0 +1,177 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule edit-planning-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :offset="10">列车线路</el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="17">
+        <el-table :data="serviceData" border style="width: 100%" height="160">
+          <el-table-column prop="startStationCode" label="起点站" />
+          <el-table-column prop="startStationStandCode" label="起点站台" />
+          <el-table-column prop="endStationCode" label="终点站" />
+          <el-table-column prop="endStationStandCode" label="终点站台" />
+        </el-table>
+      </el-col>
+      <el-col :span="6" :offset="1">
+        <el-row type="flex" justify="center">
+          <el-button class="view-button" @click="handleAddTask">加任务</el-button>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-button class="view-button" @click="handleReplace">替&ensp;&ensp;换</el-button>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-button class="view-button" @click="handleDeleteTask">删任务</el-button>
+        </el-row>
+        <div class="view-box">
+          <el-row type="flex" justify="center">
+            <el-radio-group v-model="storeInOut">
+              <el-radio :label="1">进库</el-radio>
+              <el-radio :label="2">出库</el-radio>
+            </el-radio-group>
+          </el-row>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row class="view-box">
+      <el-col :span="9" style="padding-left: 10px">
+        <el-input v-model="oldServiceNumber" size="small" :disabled="true" />
+      </el-col>
+      <el-col :span="9" style="padding-left: 20px">
+        <el-input v-model="newServiceNumber" size="small" />
+      </el-col>
+      <el-col :span="5" style="padding-left: 20px">
+        <el-button style="width: 150px;" @click="handleModifyingTripNumber">改车次号</el-button>
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 10px">
+      <el-col :span="4"><span class="view-label">线路开始时间</span></el-col>
+      <el-col :span="8">
+        <el-time-select v-model="serviceStartTime" size="small" />
+      </el-col>
+      <el-col :span="4"><span class="view-label">线路结束时间</span></el-col>
+      <el-col :span="8">
+        <el-time-select v-model="serviceEndTime" size="small" />
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-col :offset="10">线路详细信息</el-col>
+    </el-row>
+    <el-row>
+      <el-table :data="tripData" border style="width: 100%" height="200">
+        <el-table-column prop="arriveTime" label="到站时间" />
+        <el-table-column prop="stationCode" label="车站" />
+        <el-table-column prop="stationStandCode" label="站台" />
+        <el-table-column prop="stopTime" label="停站时间" />
+        <el-table-column prop="level" label="运行等级" />
+      </el-table>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-checkbox v-model="effect">影响后续任务</el-checkbox>
+    </el-row>
+    <el-row type="flex" justify="center">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { formatTime, formatName } from '@/utils/runPlan';
+
+export default {
+	name: 'ModifyingPlan',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			effect: false,
+			storeInOut: '1',
+			oldServiceNumber: '',
+			newServiceNumber: '',
+			serviceStartTime: '',
+			serviceEndTime: '',
+			serviceData: [],
+			tripData: []
+		};
+	},
+	computed: {
+		title() {
+			return '修改';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		formatTime(time) {
+			return formatTime(time);
+		},
+		formatName(code) {
+			return formatName(code);
+		},
+		doShow() {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		// 加任务
+		handleAddTask() {
+			this.$emit('dispatchDialog', { name: 'addTask', params: {} });
+		},
+		// 替换
+		handleReplace() {
+			this.$emit('dispatchDialog', { name: 'modifyingTask', params: {} });
+		},
+		// 删任务
+		handleDeleteTask() {
+			this.$emit('dispatchDialog', { name: 'deleteTask', params: {} });
+		},
+		// 改车次号
+		handleModifyingTripNumber() {
+			this.$emit('dispatchDialog', { name: 'modifyingTripNumber', params: {} });
+		},
+		// 确定修改
+		handleCommit() {
+			this.doClose();
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    .view-button {
+        display: list-item;
+        width: 150px !important;
+        margin-left: 0px;
+    }
+
+    .view-label {
+        height: 32px;
+        line-height: 32px;
+    }
+
+    .view-box {
+        padding: 10px 0px;
+        border: 1px inset gray;
+        border-top: 1px outset gray;
+        border-left: 1px outset gray;
+    }
+
+    /deep/ {
+        .el-row {
+            margin: 5px 20px;
+        }
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menusPlan/modifyingTask.vue b/src/jmapNew/theme/ningbo_01/menusPlan/modifyingTask.vue
new file mode 100644
index 000000000..4679c003e
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menusPlan/modifyingTask.vue
@@ -0,0 +1,326 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__schedule add-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="1000px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="margin: 10px">
+      <el-row>
+        <el-col :span="4">
+          <el-row>
+            <el-col :span="9">
+              <span>车次号：</span>
+            </el-col>
+            <el-col :span="15">
+              <el-select v-model="model.tripNumber" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in tripNumberList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
+          <el-row>
+            <el-col :offset="4">
+              <el-checkbox v-model="model.trainManual">手工</el-checkbox>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="12">
+              <span>缺省停站时间：</span>
+            </el-col>
+            <el-col :span="12">
+              <el-select v-model="model.time" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in timeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="9" :offset="2">
+              <span>表号：</span>
+            </el-col>
+            <el-col :span="13">
+              <el-input v-model="model.serviceNumber" />
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="22" :offset="2">
+              <el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.clearGuest">清客</el-checkbox>
+                </el-col>
+                <el-col :span="8">
+                  <el-checkbox v-model="model.continuationPlan">延续计划</el-checkbox>
+                </el-col>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.firstTrain">首班车</el-checkbox>
+                </el-col>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4">
+          <el-row>
+            <el-col :span="9">
+              <span>序列号：</span>
+            </el-col>
+            <el-col :span="15">
+              <el-select v-model="model.serialNumber" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in serialNumberList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="model.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
+          <el-row>
+            <el-col :offset="4">
+              <el-checkbox v-model="model.serialManual">手工</el-checkbox>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="12">
+              <span>缺省运行等级：</span>
+            </el-col>
+            <el-col :span="12">
+              <el-select v-model="model.level" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in levelList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="5">
+          <el-row>
+            <el-col :span="9" :offset="2">
+              <span>开始时间：</span>
+            </el-col>
+            <el-col :span="13">
+              <el-time-select v-model="model.startTime" placeholder="选择时间" :clearable="false" />
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="8">
+          <el-row>
+            <el-col :span="22" :offset="2">
+              <el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.inStock">入库</el-checkbox>
+                </el-col>
+                <el-col :span="8">
+                  <el-checkbox v-model="model.outStock">出库</el-checkbox>
+                </el-col>
+                <el-col :span="6">
+                  <el-checkbox v-model="model.lastTrain">末班车</el-checkbox>
+                </el-col>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row style="margin-bottom: 5px;">
+        交路：
+      </el-row>
+      <el-row>
+        <el-table :data="model.route" border :height="140">
+          <el-table-column prop="beginStationCode" label="起始站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.beginStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="beginStationStandCode" label="起始站台" />
+          <el-table-column prop="endStationCode" label="终到站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.endStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endStationStandCode" label="终到站台" />
+          <el-table-column prop="describe" label="描述" :width="280" />
+          <el-table-column :width="40" />
+        </el-table>
+      </el-row>
+      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+        详情：
+      </el-row>
+      <el-row>
+        <el-table :data="model.detail" border :height="140">
+          <el-table-column prop="stationCode" label="站台" :width="160">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.stationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="startTime" label="到点">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.startTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="stopTime" label="停站时间">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.stopTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endTime" label="发点">
+            <template slot-scope="scope">
+              {{ formatTime(scope.row.endTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="level" label="运行等级" />
+          <el-table-column width="280" />
+        </el-table>
+      </el-row>
+      <el-row>
+        <el-col :offset="16">
+          <el-checkbox v-model="model.default">显示默认停站时间和运行等级</el-checkbox>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { formatTime, formatName } from '@/utils/runPlan';
+
+export default {
+	name: 'ModifyingTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				tripNumber: '',
+				serialNumber: '',
+				trainManual: false,
+				serialManual: false,
+				clearGuest: false,
+				continuationPlan: false,
+				firstTrain: false,
+				lastTrain: false,
+				inStock: false,
+				outStock: false,
+				startTime: '',
+				route: [],
+				detail: []
+			},
+			timeList: [],
+			levelList: [],
+			tripNumberList: [],
+			serialNumberList: []
+		};
+	},
+	computed: {
+		title() {
+			return '修改任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		formatTime(time) {
+			return formatTime(time);
+		},
+		formatName(code) {
+			return formatName(code);
+		},
+		loadInitData(params) {
+			this.model.tripNumber = params.tripNumber;
+			this.model.serviceNumber = params.serviceNumber;
+			const editData = this.$store.state.runPlan.editData[params.serviceNumber];
+			if (editData) {
+				const trainInfo = editData.trainMap[params.tripNumber];
+				const lastIndex = trainInfo.stationTimeList.length - 1;
+				const taskObj = {
+					tripNumber: params.tripNumber,
+					beginStationCode: trainInfo.stationTimeList[0].stationCode,
+					beginStationStandCode: '',
+					endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
+					endStationStandCode: ''
+				};
+				this.model.route.push(taskObj);
+
+				trainInfo.stationTimeList.forEach((elem, index) => {
+					const stationObj = {
+						stationCode: elem.stationCode,
+						startTime: index == 0 ? null : trainInfo.stationTimeList[index - 1].secondTime,
+						stopTime: index == 0 ? null : elem.secondTime - trainInfo.stationTimeList[index - 1].secondTime,
+						endTime: elem.secondTime,
+						level: ''
+					};
+					this.model.detail.push(stationObj);
+				});
+			}
+		},
+		doShow(params) {
+			this.loadInitData(params);
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-button {
+            margin-left: 40px !important;
+            margin-right: 40px !important;
+        }
+
+        .el-row {
+            margin-bottom: 5px !important;
+        }
+
+        .el-input__inner {
+            height: 20px !important;
+            line-height: 20px !important;
+        }
+
+        .el-input {
+            width: 110px !important;
+        }
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/model.js b/src/jmapNew/theme/ningbo_01/model.js
new file mode 100644
index 000000000..62440bda8
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/model.js
@@ -0,0 +1,63 @@
+import deviceType from '../../constant/deviceType';
+
+class Model {
+    constructor() {
+        // 公共字段部分默认初始值
+        this['public'] = {};
+        this['public'][deviceType.Signal] = {
+            lampPositionType: '02',
+            lampPostType: '02'
+        };
+
+        // 私有字段部分默认初始值
+        this['private'] = {};
+        this['private'][deviceType.StationControl] = {
+            indicatorShow: true									// 标识灯名称显示
+        };
+        this['private'][deviceType.Section] = {
+            borderBorderShow: true,								// 区段边界显示
+            standTrackNameShow: true,							// 站台轨名称显示
+            reentryTrackNameShow: true,							// 折返轨名称显示
+            transferTrackNameShow: true							// 转换轨名称显示
+        };
+        this['private'][deviceType.Signal] = {
+            linkageAutoRouteShow: true,							// 联锁自动进路表示灯显示
+            atsAutoTriggerShow: true							// ATS自动触发表示灯显示
+        };
+        this['private'][deviceType.Train] = {
+            nameFormat: 'targetCode:serviceNumber:tripNumber',	// 字体格式
+            nameFontSize: 10					 				// 字体大小
+        };
+        this['private'][deviceType.TrainWindow] = {
+            trainWindowShow: true
+        };
+    }
+
+    initPublicProps(model) {
+        if (model) {
+            var modelInitial = this.public[model._type];
+            if (modelInitial) {
+                for (var prop in modelInitial) {
+                    model[prop] = modelInitial[prop];
+                }
+            }
+        }
+
+        return model;
+    }
+
+    initPrivateProps(model) {
+        if (model) {
+            var modelInitial = this.private[model._type];
+            if (modelInitial) {
+                for (var prop in modelInitial) {
+                    model[prop] = modelInitial[prop];
+                }
+            }
+        }
+
+        return model;
+    }
+}
+
+export default new Model();
diff --git a/src/jmapNew/theme/ningbo_01/planConvert.js b/src/jmapNew/theme/ningbo_01/planConvert.js
new file mode 100644
index 000000000..dadb1996b
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/planConvert.js
@@ -0,0 +1,310 @@
+import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan';
+
+export default {
+	/** 边缘高度*/
+	EdgeHeight: 600,
+
+	/** 间隔高度*/
+	CoordMultiple: 1,
+
+	/** 偏移时间*/
+	TranslationTime: 60 * 60 * 2,
+
+	/** excel解析配置*/
+	ExcelConfig: {
+		beginRow: 1,
+		beginCol: 0,
+		fieldNum: 10,
+		sepField: '车次',
+		columns: {
+			'车站名': { key: 'stationName', formatter: (val) => { return val; } },
+			'到点': { key: 'arriveTime', formatter: (val) => { return val; } },
+			'发点': { key: 'departureTime', formatter: (val) => { return val; } }
+		}
+	},
+
+	/** 解析exal数据转换为Json后台数据*/
+	importData(Sheet, JsonData) {
+		var dataList = convertSheetToList(Sheet, true);
+		var needList = Object.keys(this.ExcelConfig.columns);
+
+		if (dataList && dataList.length) {
+			for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += this.ExcelConfig.fieldNum + 1) {
+				var isContinue = true;
+				var tripObj = { code: '', arrivalList: [] };
+
+				for (var rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) {
+					isContinue = false;
+
+					var stationObj = {};
+					for (var index = 0; index < this.ExcelConfig.fieldNum; index += 1) {
+						if (dataList[colIndex + index]) {
+							var title = dataList[colIndex + index][0];
+							var value = dataList[colIndex + index][rowIndex];
+
+							if (title && value) {
+								// 数据列解析
+								isContinue = true;
+								var titleStr = `${title}`.trim();
+								var valueStr = `${value}`.trim();
+
+								if (titleStr == this.ExcelConfig.sepField) {
+									if (tripObj.code) {
+										const length = tripObj.arrivalList.length;
+										if (length == 1) {
+											tripObj.arrivalList[0]['flag'] = true;
+										}
+										JsonData.push(tripObj);
+										tripObj = { code: valueStr, arrivalList: [] };
+									} else {
+										tripObj.code = valueStr;
+									}
+								}
+
+								// 取需要的字段
+								if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) {
+									stationObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr);
+								}
+							}
+						}
+					}
+
+					// 添加字段值
+					if (Object.keys(stationObj).length) {
+						tripObj.arrivalList.push(stationObj);
+					}
+				}
+
+				// 添加最后那条没有车次的记录
+				if (tripObj.code) {
+					const length = tripObj.arrivalList.length;
+					if (length) {
+						tripObj.arrivalList[length - 1]['flag'] = true;
+					}
+					JsonData.push(tripObj);
+				}
+			}
+		}
+
+		return JsonData;
+	},
+
+	/** 将后台数据解析成图表*/
+	convertDataToModels(data, stations, kmRangeCoordMap, lineStyle) {
+		var models = [];
+
+		if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) {
+			/** 按服务遍历数据*/
+			data.serviceNumberDataList.forEach((service) => {
+				/** 按车次遍历数据*/
+				var opt = { name: '', markPointData: [], data: [] };
+				if (service.tripNumberDataList && service.tripNumberDataList.length) {
+					service.tripNumberDataList.forEach((train, j) => {
+						var pointdata = {};
+						var idx = 0;
+						var num = 0;
+						var lastPoint = null;
+						var nextPoint = null;
+
+						/** 如果车次号为空，不显示名称*/
+						if (train.tripNumber) {
+							/** 创建标记点名称和坐标*/
+							pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`;
+							pointdata.color = '#000' || lineStyle.color;
+							pointdata.directionCode = train.directionCode;
+							pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)];
+
+							/** 给服务对象添加服务名称和标记点*/
+							opt.markPointData.push(createMartPoint(pointdata));
+							/** 创建服务号名称*/
+							opt.name = `${service.serviceNumber}`;
+						}
+
+						/** 计算非折返点车次点坐标集合*/
+						train.stationTimeList.forEach((elem, index) => {
+							idx = index;
+							if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
+								index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
+								index > 0 && index < train.stationTimeList.length - 1) {
+								const aa = `${train.directionCode}${train.tripNumber}`;
+								opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
+							}
+						});
+
+						/** 计算折返点车次坐标点集合*/
+						if (!service.backup && train.reentry && service.tripNumberDataList[j + 1] && service.tripNumberDataList[j + 1].stationTimeList) {
+							lastPoint = train.stationTimeList[idx - 1];
+							nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
+							num = this.computedReentryNumber(train.tripNumber);
+							opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode]);
+							opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode]);
+						}
+
+						/** 如果是备用车，按车次添加线*/
+						if (service.backup) {
+							/** 创建一条完成的服务数据*/
+							opt.name += j;
+							var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
+							if (model) {
+								models.push(model);
+								opt = { name: '', markPointData: [], data: [] };
+							}
+						}
+					});
+
+					// 不是备用车，按服务添加线
+					if (!service.backup) {
+						/** 创建一条完成的服务数据*/
+						var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
+						if (model) {
+							models.push(model);
+						}
+					}
+				}
+			});
+			return models;
+		} else {
+			return [];
+		}
+	},
+
+	/** 更新数据并解析成图表*/
+	updateDataToModels(data, stations, kmRangeCoordMap, runPlanData, series, lineStyle) {
+		if (data && data.length) {
+			data.forEach(elem => {
+				/** 判断此条记录的服务号是否存在*/
+				if (!runPlanData[elem.serviceNumber]) {
+					/** 创建一个新服务号标记*/
+					runPlanData[elem.serviceNumber] = {};
+
+					/** 不存在此服务号，则需要创建一条新的line*/
+					series.push(createSeriesModel({
+						zlevel: 1,
+						name: `run${elem.serviceNumber}`,
+						data: [],
+						markPointData: []
+					}, Object.assign({ color: hexColor.toCreate() }, lineStyle)));
+				}
+
+				/** 添加数据*/
+				series.forEach(serie => {
+					/** 找到服务号所在图数据的位置*/
+					if (serie.name == `run${elem.serviceNumber}`) {
+						/** 添加车组号记录标记*/
+						if (!runPlanData[elem.serviceNumber][elem.tripNumber]) {
+							runPlanData[elem.serviceNumber][elem.tripNumber] = [];
+						}
+
+						runPlanData[elem.serviceNumber][elem.tripNumber].push(elem);
+						runPlanData[elem.serviceNumber][elem.tripNumber].sort((a, b) => {
+							return parseInt(a.secondTime) - parseInt(b.secondTime);
+						});
+
+						/** 如果此记录车组号的数据为第一条时，则打上标签*/
+						if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
+							serie.markPoint.data.push(createMartPoint({
+								directionCode: elem.directionCode,
+								coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
+								name: `(${elem.groupNumber})${elem.serviceNumber}${elem.directionCode}${elem.tripNumber}`,
+								color: lineStyle.color || '#000'
+							}));
+						}
+
+						/** 计算折返点*/
+						var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), elem.directionCode];
+						if (serie.data.length > 0) {
+							var lastPoint = serie.data[serie.data.length - 1];
+							if (lastPoint[2] !== nextPoint[2]) {
+								var num = this.computedReentryNumber(elem.tripNumber);
+								serie.data.push([lastPoint[0], this.getYvalueByDirectionCode(lastPoint[1], lastPoint[2], num), lastPoint[2]]);
+								serie.data.push([nextPoint[0], this.getYvalueByDirectionCode(nextPoint[1], lastPoint[2], num), lastPoint[2]]);
+							}
+						}
+
+						/** 添加车组号数据到对应的服务图数据中*/
+						serie.data.push(nextPoint);
+
+						/** 保证原始数据排序*/
+						serie.data.sort((a, b) => {
+							return parseInt(a[0]) - parseInt(b[0]);
+						});
+					}
+				});
+			});
+		}
+
+		return series;
+	},
+
+	/** 初始化Y轴*/
+	initializeYaxis(stations) {
+		return createMarkLineModels(stations, (elem) => {
+			return this.EdgeHeight + elem.kmRange * this.CoordMultiple;
+		});
+	},
+
+	/** 将后台数据转换为试图序列模型*/
+	convertStationsToMap(stations) {
+		var map = {};
+		if (stations && stations.length) {
+			stations.forEach((elem) => {
+				map[`${elem.kmRange}`] = this.EdgeHeight + elem.kmRange * this.CoordMultiple;
+			});
+		}
+
+		return map;
+	},
+
+	/** 计算y轴最小值*/
+	computedYaxisMinValue(stations) {
+		return stations[0].kmRange * this.CoordMultiple;
+	},
+
+	/** 计算y轴最大值*/
+	computedYaxisMaxValue(stations) {
+		return stations[stations.length - 1].kmRange * this.CoordMultiple + this.EdgeHeight * 2;
+	},
+
+	/** 格式化y轴数据*/
+	computedFormatYAxis(stations, params) {
+		var yText = '';
+
+		stations.forEach(elem => {
+			if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) {
+				yText = elem.kmRange + 'm';
+			}
+		});
+
+		return yText;
+	},
+
+	/** 根据是否和上一个车次是否相交，计算下一个车次的折返的高度*/
+	computedReentryNumber(code) {
+		return parseInt(code || 1) % 2 ? 1 : 2;
+	},
+
+	/** 根据方向计算y折返偏移量*/
+	getYvalueByDirectionCode(defaultVlue, directionCode, num) {
+		if (directionCode === '1') {
+			defaultVlue -= this.EdgeHeight / 2 * num;
+		} else if (directionCode === '2') {
+			defaultVlue += this.EdgeHeight / 2 * num;
+		}
+
+		return defaultVlue;
+	},
+
+	/** 根据elem计算y值*/
+	getCoordYByElem(stations, kmRangeCoordMap, elem, directionCode, isSpecial, num) {
+		var defaultVlue = 0;
+		var station = stations.find(it => { return it.code == elem.stationCode; });
+		if (station) {
+			defaultVlue = kmRangeCoordMap[`${station.kmRange}`];
+			if (isSpecial) {
+				defaultVlue = this.getYvalueByDirectionCode(defaultVlue, directionCode, num);
+			}
+		}
+
+		return defaultVlue;
+	}
+};
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/index.vue b/src/jmapNew/theme/ningbo_01/planSchedule/index.vue
new file mode 100644
index 000000000..6fa39ed23
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/planSchedule/index.vue
@@ -0,0 +1,403 @@
+<template>
+  <div class="plan-schedule" style="width: 100%">
+    <title-bar ref="titleBar" @back="back" />
+    <menu-bar ref="menuBar" :line-code="lineCode" @dispatchDialog="dispatchDialog" />
+    <schedule ref="schedule" :group="group" :line-code="lineCode" :max-height="height" :max-width="width" />
+    <status-bar ref="statusBar" :max-top="height" @setPosition="setPosition" />
+
+    <manage-plan-list ref="managePlanList" @dispatchDialog="dispatchDialog" />
+    <create-week-plan ref="createWeekPlan" @reloadTable="reloadTable" />
+    <create-today-plan ref="createTodayPlan" />
+    <modifying-plan ref="modifyingPlan" @dispatchDialog="dispatchDialog" />
+    <add-task ref="addTask" />
+    <delete-task ref="deleteTask" />
+    <modifying-task ref="modifyingTask" />
+  </div>
+</template>
+
+<script>
+import TitleBar from './titleBar';
+import MenuBar from './menuBar';
+import StatusBar from './statusBar';
+import Schedule from './schedule';
+import ManagePlanList from '../menusPlan/managePlanList';
+import CreateWeekPlan from '../menusPlan/createWeekPlan';
+import CreateTodayPlan from '../menusPlan/createTodayPlan';
+import ModifyingPlan from '../menusPlan/modifyingPlan';
+import AddTask from '../menusPlan/addTask';
+import DeleteTask from '../menusPlan/deleteTask';
+import ModifyingTask from '../menusPlan/modifyingTask';
+
+export default {
+    name: 'Menus',
+    components: {
+        TitleBar,
+        MenuBar,
+        StatusBar,
+        Schedule,
+        ManagePlanList,
+        CreateWeekPlan,
+        CreateTodayPlan,
+        ModifyingPlan,
+        AddTask,
+        DeleteTask,
+        ModifyingTask
+    },
+    props: {
+        group: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+        };
+    },
+    computed: {
+        lineCode() {
+            return this.$route.query.lineCode || '02';
+        },
+        width() {
+            return this.$store.state.app.width;
+        },
+        height() {
+            return this.$store.state.app.height;
+        }
+    },
+    methods: {
+        setPosition() {
+            this.$nextTick(() => {
+                this.$refs.schedule.setPosition();
+            });
+        },
+        dispatchDialog(dialogObj) {
+            this.$nextTick(() => {
+                if (this.$refs[dialogObj.name]) {
+                    this.$refs[dialogObj.name].doShow(dialogObj.params);
+                }
+            });
+        },
+        reloadTable(dialogObj) {
+            if (this.$refs[dialogObj.name]) {
+                this.$refs[dialogObj.name].reloadTable();
+            }
+        },
+        confirm(params) {
+        },
+        back() {
+            this.$emit('back');
+        }
+    }
+};
+</script>
+
+<style>
+    .plan-schedule {
+        position: absolute;
+        background: gray;
+    }
+
+    .plan-schedule .pop-menu {
+        background: #F0F0F0;
+    }
+
+    .plan-schedule .pop-menu span {
+        color: #000;
+    }
+
+    .plan-schedule .system-close {
+        cursor: pointer;
+        position: absolute;
+        right: 0px;
+        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid white;
+        border-radius: 4px;
+    }
+
+    .plan-schedule .system-close::before {
+        position: absolute;
+        height: 22px;
+        line-height: 22px;
+        top: 0px;
+        left: 0px;
+        font-size: x-large;
+    }
+
+    .plan-schedule .pop-menu .is-disabled span {
+        color: #B4B3B8;
+    }
+
+    .beijing-01__schedule {
+        overflow: hidden !important;
+    }
+
+    .beijing-01__schedule .el-dialog {
+        background: rgba(0, 85, 231, 1);
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        border: 2px solid #727375;
+        border-radius: 4px;
+        color: #000;
+        font-size: 14px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-dialog__header {
+        height: 30px;
+        padding: 5px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-dialog__footer {
+        background: #ECE9D8;
+        opacity: 1;
+    }
+
+    .beijing-01__schedule .el-dialog .el-dialog__body {
+        padding-top: 10px;
+        padding-bottom: 10px;
+        padding-left: 5px;
+        padding-right: 5px;
+        margin: 0px 3px 3px 3px;
+        border: 2px solid rgba(120, 121, 123, 0.5);
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        color: #000;
+        background: #ECE9D8;
+        opacity: 1;
+    }
+
+    .beijing-01__schedule .el-dialog .el-dialog__title {
+        font-size: 16px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-dialog__headerbtn {
+        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid white;
+        border-radius: 4px;
+        top: 0px;
+        right: 3px;
+        line-height: 26px;
+        width: 26px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+        font-size: 16px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+
+    .beijing-01__schedule .el-dialog .el-form {
+        background: #ECE9D8 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-card {
+        background: #ECE9D8 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-button {
+        height: 32px;
+        line-height: 32px;
+        padding: 0px;
+        width: 80px;
+        border: 2px outset #E2E2E2;
+        border-radius: 0px !important;
+        color: #000;
+        background: #ECE9D8;
+    }
+
+    .beijing-01__schedule .el-dialog .expand {
+        width: 120px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-button:focus span {
+        border: 1px dashed gray;
+    }
+
+    .beijing-01__schedule .el-dialog .el-button:active {
+        border: 2px inset #E2E2E2;
+    }
+
+    .beijing-01__schedule .el-dialog .el-button:disabled {
+        border: 2px inset #E2E2E2;
+    }
+
+    .beijing-01__schedule .el-dialog .el-button:disabled span {
+        border: 0px;
+    }
+
+    .beijing-01__schedule .el-dialog .button-group {
+        margin: 0px 5px;
+        text-align: center !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-input {
+        border: 2px inset #E9E9E9;
+    }
+
+    .beijing-01__schedule .el-dialog .el-input .el-input__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .beijing-01__schedule .el-dialog .el-input.is-disabled .el-input__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-textarea {
+        border: 2px inset #E9E9E9;
+        border-radius: 0px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-textarea .el-textarea__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .beijing-01__schedule .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-table {
+        border: 2px inset #E9E9E9;
+        color: #000 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-table .cell {
+        line-height: unset !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-table th.is-leaf {
+        background: #ECE9D8 !important;
+        border-right: 1px solid #BDBDBD !important;
+        border-bottom: 1px solid #BDBDBD !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-table tr td {
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-table .el-table__empty-text {
+        top: 15px !important;
+    }
+
+    .beijing-01__schedule .el-dialog .current-row>td {
+        background: #316AC5 !important;
+        color: #fff !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-checkbox__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-checkbox__label {
+        color: #000 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+        color: #C5C9CC !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+        position: absolute;
+        -webkit-box-sizing: content-box;
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #000;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        top: 1px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-radio__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-radio__label {
+        color: #000 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+        width: 4px;
+        height: 4px;
+        border-radius: 100%;
+        background-color: #000 !important;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+    }
+
+    .beijing-01__schedule .el-dialog .el-radio.is-disabled .el-radio__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .el-radio.is-disabled .el-radio__label {
+        color: #C5C9CC !important;
+    }
+
+    .beijing-01__schedule .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -15px;
+        top: -18px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-form-item label {
+        font-weight: normal !important;
+        color: #000 !important;
+    }
+
+    .beijing-01__schedule .el-dialog .context {
+        height: 100px;
+        border: 2px inset #E2E2E2;
+        overflow-y: scroll;
+    }
+
+    .beijing-01__schedule .el-dialog .table {
+        margin-top: 10px;
+    }
+
+    .beijing-01__schedule .el-dialog .notice {
+        margin-left: 62px;
+        line-height: 30px;
+    }
+
+    .beijing-01__schedule .el-dialog .button-group {
+        margin-top: 10px;
+    }
+
+    .beijing-01__schedule .el-dialog .el-tree__empty-block {
+        background: #E9E9E9 !important;
+        color: #000 !important;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/menuBar.vue b/src/jmapNew/theme/ningbo_01/planSchedule/menuBar.vue
new file mode 100644
index 000000000..e64ae3063
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/planSchedule/menuBar.vue
@@ -0,0 +1,514 @@
+<template>
+  <div id="PlanMenuBar">
+    <div class="nav">
+      <template v-for="(item,i) in menu">
+        <template v-if="noShowingChildren(item.children)">
+          <li class="nav-li" @click="hookClick(item)">
+            <span class="nav-li-text">{{ item.title }}</span>
+          </li>
+        </template>
+        <template v-else>
+          <li class="nav-li" @click.stop="popupMenuA(item, i)">
+            <span class="nav-li-text">{{ item.title }}</span>
+            <ul class="nav-ul" :class="{'active' :i==classA}">
+              <template v-for="(child,j) in item.children">
+                <template
+                  v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)"
+                >
+                  <li v-if="child.type === 'separator'" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li v-else-if="child.type === 'file'" class="menu-li">
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <el-button type="text" class="button" :disabled="child.disabled">
+                          <input
+                            :ref="child.label"
+                            type="file"
+                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                            @change="openLoadFile(child)"
+                          >
+                          {{ child.title }}
+                        </el-button>
+                      </span>
+                    </div>
+                  </li>
+                  <li v-else class="menu-li" @click.stop="popupMenuB(child, j)">
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                    <ul class="menu-ul" :class="{'active' :j==classB}">
+                      <template v-for="(grandchild,k) in child.children">
+                        <li v-if="grandchild.type === 'separator'" class="menu-separator">
+                          <span class="status">&ensp;</span>
+                          <span class="separator">&ensp;</span>
+                        </li>
+                        <li v-else-if="grandchild.type === 'file'" class="menu-li">
+                          <div class="menu-li-block">
+                            <span class="menu-li-text">
+                              <span class="status">&ensp;</span>
+                              <el-button
+                                type="text"
+                                class="button"
+                                :disabled="grandchild.disabled"
+                              >
+                                <input
+                                  :ref="grandchild.label"
+                                  type="file"
+                                  accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                                  @change="openLoadFile(grandchild)"
+                                >
+                                {{ grandchild.title }}
+                              </el-button>
+                            </span>
+                          </div>
+                        </li>
+                        <li v-else class="menu-li" @click.stop="hookClick(grandchild)">
+                          <div class="menu-li-block">
+                            <span class="menu-li-text">
+                              <span class="status">&ensp;</span>
+                              <span class="label">{{ grandchild.title }}</span>
+                            </span>
+                          </div>
+                        </li>
+                      </template>
+                    </ul>
+                  </li>
+                </template>
+                <template v-else>
+                  <li v-if="child.type === 'separator'" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li v-else-if="child.type === 'file'" class="menu-li">
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <el-button type="text" class="button" :disabled="child.disabled">
+                          <input
+                            :ref="child.title"
+                            type="file"
+                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                            @change="openLoadFile(child)"
+                          >
+                          {{ child.title }}
+                        </el-button>
+                      </span>
+                    </div>
+                  </li>
+                  <li v-else class="menu-li" @click.stop="hookClick(child)">
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                  </li>
+                </template>
+              </template>
+            </ul>
+          </li>
+        </template>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'PlanMenuBar',
+    props: {
+        lineCode: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            classA: -1,
+            classB: -1,
+            tempClassA: -1,
+            tempClassB: -1,
+            menu: [
+                {
+                    title: '文件（F）',
+                    children: [
+                    ]
+                },
+                {
+                    title: '显示（V）',
+                    children: [
+                        // {
+                        //     title: '缩放',
+                        // },
+                        // {
+                        //     title: '单色显示历史计划',
+                        // },
+                        // {
+                        //     title: '彩色显示历史计划'
+                        // }
+                    ]
+                },
+                {
+                    title: '编辑（E）',
+                    children: [
+                        // {
+                        //     title: '修改',
+                        //     click: this.handleEditPlanningTrain
+                        // },
+                        // {
+                        //     title: '加任务',
+                        //     click: this.handleAddTask
+                        // },
+                        // {
+                        //     title: '删任务',
+                        //     click: this.handleDeleteTask
+                        // },
+                        // {
+                        //     title: '改表号',
+                        //     click: this.handleModifyingPlanId
+                        // },
+                        // {
+                        //     title: '平移多辆车',
+                        //     click: this.handleTranslationalMulTrain
+                        // }
+                    ]
+                },
+                {
+                    title: '工具（T）',
+                    children: [
+                        {
+                            title: '查看计划列表',
+                            click: this.handleViewPlanSchedule
+                        },
+                        {
+                            title: '创建一周计划',
+                            click: this.handleCreateWeekPlan
+                        },
+                        {
+                            title: '加载当天计划',
+                            click: this.handleReloadTodayPlan
+                        }
+                        // {
+                        //     title: '有效性检查',
+                        //     click: this.handleValidityCheck
+                        // }
+                    ]
+                },
+                {
+                    title: '帮助（H）',
+                    children: [
+                    ]
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode'
+        ]),
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    watch: {
+        tempClassA() {
+            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
+        },
+        tempClassB() {
+            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
+        },
+        '$store.state.menuOperation.break': function (val) {
+            if (val) {
+                this.classA = this.classB = -1;
+            } else {
+                this.classA = this.tempClassA;
+                this.classB = this.tempClassB;
+            }
+        }
+    },
+    mounted() {
+        this.initMenu();
+    },
+    methods: {
+        initMenu() {
+            this.clickEvent();
+            this.closeMenu();
+        },
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.closeMenu(false);
+            };
+        },
+        noShowingChildren(children) {
+            if (!children || children.length <= 0) {
+                return true;
+            }
+            return false;
+        },
+        hasShowingChildren(children) {
+            if (children && children.length > 0) {
+                return true;
+            }
+            return false;
+        },
+        closeMenu() {
+            this.classA = this.tempClassA = -1;
+            this.classB = this.tempClassB = -1;
+        },
+        hookClick(item, event) {
+            this.closeMenu();
+            setTimeout(() => {
+                if (item && typeof item.click == 'function') {
+                    item.click();
+                }
+            }, 500);
+        },
+        popupMenuA(item, index) {
+            this.clickEvent();
+            this.tempClassA = index;
+            this.tempClassB = -1;
+        },
+        popupMenuB(item, index) {
+            this.tempClassB = index;
+        },
+        openLoadFile(item) {
+            const obj = this.$refs[item.title][0];
+            if (obj.files) {
+                const file = obj.files[0];
+                item.click(file);
+                obj.value = '';
+            }
+        },
+        doClose() {
+            this.$nextTick(() => {
+                EventBus.$emit('closeMenu');
+            });
+        },
+        // 刷新
+        refresh() {
+            this.closeMenu(true);
+            EventBus.$emit('refresh');
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        // 修改计划
+        handleEditPlanningTrain() {
+            this.$emit('dispatchDialog', { name: 'modifyingPlan' });
+        },
+        // 添加任务
+        handleAddTask() {
+            const params = this.$store.state.runPlan.selected;
+            this.$emit('dispatchDialog', { name: 'addTask', params });
+        },
+        // 删除任务
+        handleDeleteTask() {
+            const params = this.$store.state.runPlan.selected;
+            this.$emit('dispatchDialog', { name: 'deleteTask', params });
+        },
+        // 修改任务
+        handleModifyingTask() {
+            const params = this.$store.state.runPlan.selected;
+            this.$emit('dispatchDialog', { name: 'modifyingTask', params });
+        },
+        // 改表号
+        handleModifyingPlanId() {
+            this.$emit('dispatchDialog', { name: 'modifyingPlanId' });
+        },
+        // 平移多辆车
+        handleTranslationalMulTrain() {
+            this.$emit('dispatchDialog', { name: 'translationalMulTrain' });
+        },
+        // 查看计划列表
+        handleViewPlanSchedule() {
+            this.$emit('dispatchDialog', { name: 'managePlanList' });
+        },
+        // 创建一周计划
+        handleCreateWeekPlan() {
+            this.$emit('dispatchDialog', { name: 'createWeekPlan' });
+        },
+        // 创建当天计划
+        handleReloadTodayPlan() {
+            this.$emit('dispatchDialog', { name: 'createTodayPlan' });
+        },
+        // 有效性检查
+        handleValidityCheck() {
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+    $top: 25px;
+    $width: 30px;
+    $height: 20px;
+    $menuPadding: 10px;
+    $menuItemHeight: 30px;
+    $menuItemWidth: 160px;
+    $menuItemPadding: 5px;
+
+    #PlanMenuBar {
+        z-index: 10;
+        position: absolute;
+        top: $top;
+        width: 100%;
+        height: $height;
+        line-height: $height;
+    }
+
+    .nav {
+        display: block;
+        cursor: pointer;
+        color: #0000;
+        background: #EBEADB;
+        list-style: none;
+        border: 1px solid #B6BCCC !important;
+    }
+
+    .nav-li {
+        position: relative;
+        display: inline-block;
+        padding-left: $menuPadding;
+        padding-right: $menuPadding;
+    }
+
+    .nav-li:active {
+        background: #C9D0E1;
+        border-radius: 4px;
+    }
+
+    .nav-li-text {
+        font-size: 13px;
+        color: #000;
+        text-align: center;
+        text-decoration: none;
+    }
+
+    .nav-ul {
+        display: none;
+        position: absolute;
+        list-style: none;
+        border: 1px solid gray;
+        width: $menuItemWidth;
+        padding: 0px;
+        margin: 0px;
+    }
+
+    .menu-ul {
+        display: none;
+        list-style: none;
+        background: #F0F0F0;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth;
+        bottom: $menuItemHeight;
+    }
+
+    .active {
+        position: absolute;
+        display: block !important;
+    }
+
+    .menu-ul-text {
+        font-size: 14px;
+        color: #000;
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+        border-left: 1px solid #000;
+        border-right: 1px solid #000;
+    }
+
+    .menu-separator {
+        text-align: left;
+        background: #F0F0F0;
+        height: 2px;
+        line-height: 2px;
+    }
+
+    .menu-separator .status {
+        display: inline-block;
+        border-right: 1px inset #CACACA;
+        width: $width;
+        height: 100%;
+        background: #EFECDE;
+    }
+
+    .menu-separator .separator {
+        display: inline-block;
+        background: #CACACA;
+        margin-left: 5px;
+        height: 2px;
+        width: $menuItemWidth - $width - 30px;
+    }
+
+    .menu-li {
+        text-align: left;
+        background: #F0F0F0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-block {
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-text {
+        font-size: 14px;
+        color: #000;
+    }
+
+    .menu-li-text .status {
+        display: inline-block;
+        border-right: 1px inset #CACACA;
+        width: $width;
+        background: #EFECDE;
+    }
+
+    .menu-li-text .label {
+        display: inline-block;
+        margin-left: 5px;
+    }
+
+    .menu-li-text .button {
+        position: relative;
+        overflow: hidden;
+        margin-left: 10px;
+        line-height: 0px;
+        width: $menuItemWidth - $width;
+        top: -$menuItemHeight;
+        color: #000;
+        cursor: pointer;
+
+        input {
+            opacity: 0;
+            cursor: pointer;
+            position: absolute;
+            top: 0px;
+            width: $menuItemWidth - $width - 10px;
+        }
+    }
+
+    .menu-li-block:hover {
+        background: #C9DEF7;
+        box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/menuTool.vue b/src/jmapNew/theme/ningbo_01/planSchedule/menuTool.vue
new file mode 100644
index 000000000..d3ecde016
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/planSchedule/menuTool.vue
@@ -0,0 +1,172 @@
+<template>
+    <div id="PlanMenuTool">
+        <div class="nav">
+            <div class="tool" v-for="(item,index) in tools" :key="index">
+                <img :src="item.src" :alt="item.title" />
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { mapGetters } from 'vuex';
+    import { prefixIntrger } from '@/utils/date';
+    import logo_ from '@/assets/logo_.png';
+
+
+    export default {
+        name: 'PlanMenuTool',
+        data() {
+            return {
+                tools: [
+                    {
+                        title: '服务器1',
+                        operate: '',
+                        src: logo_,
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '服务器2',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '前置机1',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '前置机2',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '主调',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '调度台1',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '调度台2',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '调度台3',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '大屏',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '维护工作站',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '运行图显示人工站',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '跳停',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '扣车',
+                        operate: '',
+                        src: '',
+                        click: this.undeveloped,
+                    },
+                    {
+                        title: '列车报警',
+                        operate: '',
+                        src: logo_,
+                        click: this.undeveloped,
+                    }
+                ]
+            }
+        },
+        watch: {
+            '$store.state.training.initTime': function (initTime) {
+                let date = new Date(initTime);
+                this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}${prefixIntrger(date.getSeconds(), 2)}`
+            }
+        },
+        computed: {
+            isShowSystemTime() {
+                return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
+            }
+        },
+        mounted() {
+            this.initTools();
+        },
+        methods: {
+            initTools() {
+                this.tools = [];
+            }
+        }
+    }
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+    $top: 48px;
+    $width: 25px;
+    $height: 25px;
+
+    #PlanMenuTool {
+        z-index: 5;
+        position: absolute;
+        width: 100%;
+        top: $top;
+    }
+
+    .nav {
+        display: block;
+        color: #0000;
+        background: #EBEADB;
+        border: 1px solid #B6BCCC !important;
+        border-bottom: 2px solid #B6BCCC !important;
+        list-style: none;
+        height: $height;
+        line-height: $height;
+    }
+
+    .tool {
+        padding-left: 10px;
+        display: flex;
+        justify-content: center;
+        cursor: pointer;
+        position: relative;
+        float: left;
+        margin: 1px;
+        width: $width;
+
+        img {
+            display: block;
+            text-align: center;
+            padding-top: 2px;
+            height: $height - 5;
+            width: $width - 5;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue b/src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue
new file mode 100644
index 000000000..d212eff63
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue
@@ -0,0 +1,482 @@
+<template>
+  <div id="PlanSchedule" :style="{top: top+'px', height: height+'px'}">
+    <div class="left">
+      <div :id="runPlanId" />
+    </div>
+    <div class="right">
+      <data-table
+        ref="serviceTable"
+        :height="height/2"
+        :config="serviceNumberConfig"
+        :style="{top: top-height/2+'px'}"
+        @touch="scheduleTouch"
+      />
+      <data-table
+        ref="tripTable"
+        :height="height/2"
+        :config="tripNumberConfig"
+        :style="{top: top-height/2+'px'}"
+        @touch="trainNumTouch"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { timeFormat } from '@/utils/date';
+import { runDiagramGetTime } from '@/api/simulation';
+import DataTable from '../menusPlan/components/dataTable';
+import echarts from 'echarts';
+
+export default {
+    name: 'PlanSchedule',
+    components: {
+        DataTable
+    },
+    props: {
+        group: {
+            type: String,
+            required: true
+        },
+        lineCode: {
+            type: String,
+            required: true
+        },
+        maxWidth: {
+            type: Number,
+            require: true
+        },
+        maxHeight: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            top: 0,
+            height: 0,
+            heights: [100, 100],
+            runPlanId: 'plan-schedule-id',
+            myChart: null,
+            PlanConvert: {},
+            serviceNumberConfig: {
+                data: [],
+                highlightCurrentRow: true,
+                handleChange: this.serviceNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'serviceNumber',
+                        label: '表号'
+                    },
+                    {
+                        width: 40
+                    }
+                ]
+            },
+            tripNumberConfig: {
+                data: [],
+                highlightCurrentRow: true,
+                handleChange: this.tripNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'tripNumber',
+                        label: '车次号'
+                    },
+                    {
+                        width: 40
+                    }
+                ]
+            },
+            realData: {},
+            kmRangeCoordMap: {},
+            option: {
+                title: {
+                    text: '',
+                    left: 'center'
+                },
+                grid: {
+                    top: '30px',
+                    left: '120px',
+                    right: '40px',
+                    bottom: '65px',
+                    containLabel: true,
+                    backgroundColor: 'floralwhite'
+                },
+                toolbox: {
+                    right: '30px',
+                    feature: {
+                        dataZoom: {
+                            yAxisIndex: 'none'
+                        },
+                        restore: {},
+                        saveAsImage: {}
+                    }
+                },
+                tooltip: {
+                    axisPointer: {
+                        trigger: 'item',
+                        type: 'cross'
+                    },
+                    formatter: this.axisTooltip,
+                    borderWidth: 1
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        boundaryGap: false,
+                        data: [],
+                        axisLine: {
+                            onZero: false,
+                            lineStyle: {
+                                width: 2,
+                                color: '#d14a61'
+                            }
+                        },
+                        axisLabel: {
+                            formatter: this.xAxisLableFormat,
+                            textStyle: {
+                                color: '#333'
+                            }
+                        },
+                        axisPointer: {
+                            snap: true,
+                            label: {
+                                formatter: this.xAxisPointFormat,
+                                backgroundColor: 'rgb(255,0,0,0.5)',
+                                color: 'white'
+                            }
+                        }
+                    }
+                ],
+                yAxis: {
+                    type: 'value',
+                    splitLine: {
+                        show: false
+                    },
+                    axisTick: {
+                        show: false
+                    },
+                    axisLine: {
+                        onZero: false,
+                        lineStyle: {
+                            width: 2,
+                            color: '#d14a61'
+                        }
+                    },
+                    axisLabel: {
+                        interval: 'auto',
+                        formatter: this.yAxisLableFormat
+                    },
+                    axisPointer: {
+                        xAxisIndex: 'all',
+                        label: {
+                            formatter: this.yAxisPointFormat,
+                            backgroundColor: 'rgb(0,100,0,0.5)',
+                            color: 'white'
+                        }
+                    },
+                    min: 0,
+                    max: 0
+                },
+                series: [],
+                dataZoom: [
+                    {
+                        type: 'inside'
+                    },
+                    {
+                        fiterMode: 'filter',
+                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
+                        handleSize: '80%',
+                        handleStyle: {
+                            color: '#fff',
+                            shadowBlur: 3,
+                            shadowColor: 'rgba(0, 0, 0, 0.6)',
+                            shadowOffsetX: 2,
+                            shadowOffsetY: 2
+                        },
+                        bottom: '20px'
+                    }
+                ]
+            },
+            absoluteTime: 2 * 3600,
+            indexKmRangeMap: {}
+        };
+    },
+    computed: {
+        ...mapGetters('runPlan', [
+            'stations'
+        ])
+    },
+    watch: {
+        maxWidth() {
+            this.setPosition();
+        },
+        maxHeight() {
+            this.setPosition();
+        },
+        '$store.state.runPlan.planLoadedCount': async function () {
+            await this.loadChartPage();
+        },
+        '$store.state.runPlan.planSizeCount': function () {
+            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+        },
+        '$store.state.runPlan.selected.serviceNumber': function (val) {
+            const index = this.serviceNumberConfig.data.findIndex(elem => {
+                return elem.serviceNumber == val;
+            });
+
+            this.$refs.serviceTable.setCurrentRow(this.serviceNumberConfig.data[index]);
+        },
+        '$store.state.runPlan.selected.tripNumber': function (val) {
+            const index = this.tripNumberConfig.data.findIndex(elem => {
+                return elem.tripNumber == val;
+            });
+            this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
+        }
+    },
+    mounted() {
+        this.PlanConvert = this.$theme.loadPlanConvert(this.lineCode);
+    },
+    beforeDestroy() {
+        this.destroy();
+    },
+    methods: {
+        serviceNumberChange(row) {
+            if (row) {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
+                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
+                if (serviceObj) {
+                    this.analyticalTripNumber(serviceObj.trainMap);
+                }
+            }
+        },
+        tripNumberChange(row) {
+            if (row) {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
+            }
+        },
+        async analyticalServiceNumber(data) {
+            this.serviceNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
+                .map(serviceNumber => { return { serviceNumber }; });
+        },
+        async analyticalTripNumber(data) {
+            this.tripNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
+                .map(tripNumber => { return { tripNumber }; });
+        },
+        async setPosition() {
+            this.$nextTick(() => {
+                let top = 3;
+                const width = this.maxWidth * 0.85;
+                let height = this.maxHeight;
+
+                const titleBar = document.getElementById('PlanTitleBar');
+                const menuBar = document.getElementById('PlanMenuBar');
+                const menuTool = document.getElementById('PlanMenuTool');
+                const statusBar = document.getElementById('PlanStatusBar');
+
+                if (titleBar) {
+                    top += (titleBar.offsetHeight || 0);
+                }
+
+                if (menuBar) {
+                    top += (menuBar.offsetHeight || 0);
+                }
+
+                if (menuTool) {
+                    top += (menuTool.offsetHeight || 0);
+                }
+
+                if (statusBar) {
+                    height -= (statusBar.offsetHeight || 0);
+                }
+
+                height = height - top;
+                this.$store.dispatch('runPlan/resize', { width, height });
+
+                if (this.top != top) {
+                    this.top = top;
+                }
+
+                if (this.height != height) {
+                    this.height = height - 20 * 2;
+                }
+            });
+        },
+        async loadChartPage() {
+            try {
+                let series = [];
+                const stations = this.$store.state.runPlan.stations;
+                const planData = this.$store.state.runPlan.planData;
+
+                this.viewDisabled = true;
+                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations);
+                series = this.pushModels(series, [this.PlanConvert.initializeYaxis(stations)]);
+                series = this.pushModels(series, this.PlanConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { color: '#000', width: 0.5 }));
+                await this.loadInitData(series);
+                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
+                this.viewDisabled = false;
+
+            } catch (error) {
+                this.viewDisabled = false;
+                this.$messageBox(`加载运行图数据失败`);
+            }
+        },
+        async loadInitData(series) {
+            this.myChart && this.myChart.showLoading();
+            await this.xAxisInit();
+            await this.yAxisInit();
+            await this.loadInitChart(series);
+            this.myChart && this.myChart.hideLoading();
+        },
+        pushModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    if (elem) {
+                        series.push(elem);
+                    }
+                });
+            }
+
+            return series;
+        },
+        popModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    const index = series.indexOf(elem);
+                    if (index >= 0) {
+                        series.split(index, 1);
+                    }
+                });
+            }
+
+            return series;
+        },
+        loadInitChart(series) {
+            return new Promise((resolve, reject) => {
+                try {
+                    this.destroy();
+
+                    let startValue = 3600 + this.PlanConvert.TranslationTime;
+                    const offsetTime = 3600;
+
+                    runDiagramGetTime(this.group).then(resp => {
+                        startValue = resp.data - this.PlanConvert.TranslationTime;
+                        this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
+                        this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
+                        this.option.series = series;
+                        this.myChart = echarts.init(document.getElementById(this.runPlanId));
+                        if (this.myChart) {
+                            this.myChart.setOption(this.option);
+                            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+                            this.myChart.on('click', this.mouseClick);
+                        }
+                    });
+                    resolve(true);
+                } catch (error) {
+                    reject(error);
+                }
+            });
+        },
+        xAxisPointFormat(params) {
+            return timeFormat(params.value);
+        },
+        yAxisPointFormat(params) {
+            return this.PlanConvert.computedFormatYAxis(this.stations, params);
+        },
+        xAxisLableFormat(value, index) {
+            if (value % 60 === 0) {
+                return timeFormat(value);
+            }
+        },
+        yAxisLableFormat(value, index) {
+            return '';
+        },
+        xAxisInit() {
+            const list = [];
+            for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
+                list.push(time);
+            }
+
+            const startValue = 3600 * 6;
+            const offsetTime = 3600 * 1;
+
+            this.option.xAxis[0].data = list;
+            if (!this.option.dataZoom[0].startValue) {
+                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
+            }
+
+            if (!this.option.dataZoom[0].endValue) {
+                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
+            }
+        },
+        yAxisInit() {
+            if (Object.keys(this.PlanConvert).length) {
+                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
+                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
+            }
+        },
+        axisTooltip(param) {
+            const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
+            return [
+                `Point Data <hr size=1 style=" margin: 3px 0">`,
+                `车站名称: ${station.name}<br>`,
+                `车站公里标: ${station.kmRange} km <br>`,
+                `到站时间: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
+            ].join('');
+        },
+        mouseClick(params) {
+            const model = {
+                serviceNumber: params.seriesName
+            };
+            this.$store.dispatch('runPlan/setSelected', model);
+        },
+        reSize(opt) {
+            if (this.myChart) {
+                this.myChart.resize({
+                    width: opt.width,
+                    height: opt.height,
+                    silent: false
+                });
+            }
+        },
+        destroy() {
+            if (this.myChart && this.myChart.isDisposed) {
+                this.myChart.dispose();
+                this.myChart = null;
+            }
+        },
+        scheduleTouch() {
+
+        },
+        trainNumTouch() {
+
+        }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+
+    #PlanSchedule {
+        z-index: 5;
+        position: absolute;
+        width: 100%;
+
+        .left {
+            height: 100%;
+            width: 85%;
+            float: left;
+        }
+
+        .right {
+            height: 100%;
+            width: 15%;
+            float: right;
+        }
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/statusBar.vue b/src/jmapNew/theme/ningbo_01/planSchedule/statusBar.vue
new file mode 100644
index 000000000..170553e15
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/planSchedule/statusBar.vue
@@ -0,0 +1,100 @@
+<template>
+    <data-table id="PlanStatusBar" ref="dataTable" :height="height-11" :config="stationListConfig" :close="false"
+        :style="{top: maxmini? maxTop-110+'px':maxTop-21+'px'}" @touch="touch"></data-table>
+</template>
+
+<script>
+    import DataTable from '../menusPlan/components/dataTable';
+    import { formatTime, formatName } from '@/utils/runPlan';
+
+    export default {
+        name: 'PlanStatusBar',
+        props: {
+            maxTop: {
+                type: Number,
+                required: true
+            }
+        },
+        components: {
+            DataTable
+        },
+        data() {
+            return {
+                maxmini: true,
+                height: 100,
+                stationListConfig: {
+                    data: [],
+                    showClose: true,
+                    highlightCurrentRow: true,
+                    columns: [
+                        {
+                            prop: 'stationName',
+                            label: '站台',
+                            width: 400
+                        },
+                        {
+                            prop: 'startTime',
+                            label: '到点',
+                        },
+                        {
+                            prop: 'stopTime',
+                            label: '停站时间',
+                        },
+                        {
+                            prop: 'endTime',
+                            label: '发点',
+                        },
+                        {
+                            prop: 'level',
+                            label: '运行等级'
+
+                        }
+                    ]
+                }
+            }
+        },
+        watch: {
+            '$store.state.runPlan.selected': function (select) {
+                this.stationListConfig.data = [];
+                let serviceObj = this.$store.state.runPlan.editData[select.serviceNumber];
+                if (serviceObj) {
+                    let trainMap = serviceObj.trainMap;
+                    if (trainMap) {
+                        let trainObj = trainMap[select.tripNumber];
+                        if (trainObj) {
+                            let stationTimeList = trainObj.stationTimeList;
+                            if (stationTimeList && stationTimeList.length) {
+                                stationTimeList.forEach((elem, index) => {
+                                    let stationObj = {
+                                        stationName: formatName(elem.stationCode),
+                                        startTime: formatTime(index == 0 ? null : stationTimeList[index - 1].secondTime),
+                                        stopTime: formatTime(index == 0 ? null : elem.secondTime - stationTimeList[index - 1].secondTime),
+                                        endTime: formatTime(elem.secondTime),
+                                        level: ''
+                                    }
+                                    this.stationListConfig.data.push(stationObj);
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        methods: {
+            touch(maxmini) {
+                this.maxmini = maxmini;
+                this.$emit('setPosition');
+            }
+        }
+    }
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    #PlanStatusBar {
+        z-index: 5;
+        position: absolute;
+        width: 100%;
+    }
+</style>
\ No newline at end of file
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/titleBar.vue b/src/jmapNew/theme/ningbo_01/planSchedule/titleBar.vue
new file mode 100644
index 000000000..689c3486a
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/planSchedule/titleBar.vue
@@ -0,0 +1,75 @@
+<template>
+    <div id="PlanTitleBar">
+        <img class="logo" :src="logoImg" />
+        <span> {{mapName}} &ensp;</span>
+        <span v-if="runPlanName">({{runPlanName}})</span>
+        <span class="system-close el-icon-close" @click="back"></span>
+    </div>
+</template>
+
+<script>
+    import logo_ from '@/assets/logo_.png';
+    import { getPublishMapInfo } from '@/api/jmap/map';
+
+    export default {
+        name: 'PlanTitleBar',
+        data() {
+            return {
+                mapName: '',
+                logoImg: logo_
+            }
+        },
+        computed: {
+            runPlanName() {
+                return this.$route.query.planName || '';
+            }
+        },
+        mounted() {
+            if (this.$route.query.mapId) {
+                getPublishMapInfo(this.$route.query.mapId).then(resp => {
+                    this.mapName = resp.data.name;
+                })
+            }
+        },
+        methods: {
+            back() {
+                this.$emit('back');
+            }
+        }
+    }
+</script>
+<style scoped rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+    $width: 25px;
+    $height: 25px;
+
+    #PlanTitleBar {
+        z-index: 10;
+        display: flex;
+        position: absolute;
+        width: 100%;
+        height: $height;
+        line-height: $height;
+        background: -webkit-linear-gradient(#0055E8, #0099F8);
+        background: -o-linear-gradient(#0055E8, #0099F8);
+        background: -moz-linear-gradient(#0055E8, #0099F8);
+        background: linear-gradient(#0055E8, #0099F8);
+        color: white;
+        font: bold;
+        font-size: 16px;
+
+        .logo {
+            display: inline-block;
+            width: $width;
+            height: $height;
+            padding-right: 5px;
+        }
+
+        .system-close {
+            width: 25px;
+            height: 25px;
+            position: absolute;
+            right: 1px;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 99ce006c7..8b33c9d6d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -33,6 +33,7 @@ const IbpDraw = () => import('@/views/system/ibpDraw/index');
 const News = () => import('@/views/system/news/index');
 const CommandDictionary = () => import('@/views/system/commandDictionary/index');
 const CommandDictionaryDetail = () => import('@/views/system/commandDictionary/edit');
+const configLine = () => import('@/views/system/configLine/index');
 
 const Mapedit = () => import('@/views/mapdraft/index');
 
@@ -836,6 +837,13 @@ export const asyncRouter = [
                 path: 'commands/Detail',
                 hidden: true,
                 component: CommandDictionaryDetail
+            },
+            { // 线路管理
+                path: 'configLine',
+                component: configLine,
+                meta: {
+                    i18n: 'router.configLine'
+                }
             }
         ]
     },
diff --git a/src/scripts/GlobalPlugin.js b/src/scripts/GlobalPlugin.js
index 08bbf343f..4b84bf802 100644
--- a/src/scripts/GlobalPlugin.js
+++ b/src/scripts/GlobalPlugin.js
@@ -4,7 +4,7 @@ import DataForm from '@/components/QueryListPage/DataForm';
 import TurnbackBar from '@/components/TurnbackBar';
 import ConstConfig from '@/scripts/ConstConfig';
 import Dictionary from '@/scripts/DictionaryData';
-import Theme from '@/jmap/theme/factory';
+import Theme from '@/jmapNew/theme/factory';
 
 // 全局组件
 Vue.component('DataForm', DataForm);
diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue
index 406d39d85..1d2cd3295 100644
--- a/src/views/jlmap/index.vue
+++ b/src/views/jlmap/index.vue
@@ -23,7 +23,7 @@
 import Vue from 'vue';
 import localStore from 'storejs';
 import Jlmap from '@/jmap/map';
-import JlmapNew from '@/jmapNew/map';
+// import JlmapNew from '@/jmapNew/map';
 import ZoomBox from './zoom/zoom';
 import ProgressBar from '@/views/components/progressBar/index';
 import { mapGetters } from 'vuex';
diff --git a/src/views/newMap/newMapdraft/dataRelation/index.vue b/src/views/newMap/newMapdraft/dataRelation/index.vue
index 1528f1c41..be1ada1fc 100644
--- a/src/views/newMap/newMapdraft/dataRelation/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/index.vue
@@ -109,6 +109,13 @@ export default {
         showMap() {
             this.$emit('showMap');
         },
+        initLoad() {
+            switch (this.enabledTab) {
+            case 'route':
+                this.$refs.routeOperate.initLoad();
+                break;
+            }
+        },
         createRouteEvent() {
             switch (this.enabledTab) {
             case 'route':
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue
index 33ace43fb..a6e1e18cb 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/index.vue
@@ -69,9 +69,13 @@ export default {
                 this.$refs.routeDetail.doShow();
             }
         },
+        initLoad() {
+            this.$refs.routeEdit && this.$refs.routeEdit.initLoad();
+        },
         createRouteEvent: function () {
             if (this.$refs && this.$refs.routeEdit) {
                 this.$refs.routeEdit.clear();
+
             }
         },
         setSelected(selected) {
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index e28089fcf..9eefa8cb4 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -247,7 +247,7 @@ export default {
             routeCode: '',
             routeType: '',
             loading: false,
-            // interBlockStationList:[],
+            interBlockStationList:[],
             SwitchLocateTypeList: [
                 { name: '定位', code: true },
                 { name: '反位', code: false }
@@ -320,11 +320,6 @@ export default {
                 ]
             };
             return baseRules;
-        },
-        interBlockStationList() { // 联锁车站列表
-            return this.stationList.filter(station=>{
-                return station.ciStation;
-            });
         }
     },
     watch: {
@@ -360,6 +355,11 @@ export default {
         this.getRouteList();
     },
     methods: {
+        initLoad() { // 加载联锁车站列表
+            this.interBlockStationList = this.stationList.filter(station=>{
+                return station.ciStation;
+            });
+        },
         async getRouteList() {
             const response = await getRouteNewList(this.$route.params.mapId, { pageSize: 9999, pageNum: 1 });
             this.routeList = response.data.list;
diff --git a/src/views/newMap/newMapdraft/index.vue b/src/views/newMap/newMapdraft/index.vue
index 6d0909275..074dfa1d9 100644
--- a/src/views/newMap/newMapdraft/index.vue
+++ b/src/views/newMap/newMapdraft/index.vue
@@ -128,6 +128,9 @@ export default {
         },
         selectViewDraft(data) {
             this.viewDraft = data;
+            if (data != 'draft') {
+                this.$refs.dataRelation.initLoad();
+            }
         },
         loadInitPage() {
             this.$store.dispatch('training/changeMode', { mode: TrainingMode.MAP_EDIT });
@@ -140,7 +143,8 @@ export default {
                     });
                     this.setDelayUnlockStatus(response.data, '00');
                     this.initAutoSaveTask();
-                }).catch(() => {
+                }).catch((error) => {
+                    console.log(error, '加载地图错误提示');
                     this.$message.error(this.$t('tip.failedLoadMap'));
                     this.endViewLoading();
                 });
diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
new file mode 100644
index 000000000..7a7b39d3c
--- /dev/null
+++ b/src/views/system/configLine/config.vue
@@ -0,0 +1,127 @@
+<template>
+  <div v-show="dialogVisible">
+    <el-dialog v-dialogDrag title="通用配置项" :visible.sync="dialogVisible" width="550px" :before-close="handleClose" center :close-on-click-modal="false" :z-index="2000">
+      <div style="height: 370px; overflow: auto;">
+        <el-table :data="tableData" style="width: 100%;">
+          <el-table-column prop="configKey" label="key" />
+          <el-table-column prop="configValue" label="value" />
+          <el-table-column prop="description" label="描述" />
+          <el-table-column>
+            <template slot="header" slot-scope="scope">
+              <div class="flex_box">
+                <span>操作</span>
+                <i class="el-icon-circle-plus-outline icon_font" @click="addModel(scope)" />
+              </div>
+            </template>
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="editModel(scope.row, scope.$index)">编辑</el-button>
+              <el-button type="text" size="small" @click="delModel(scope.row, scope.$index)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
+      </span>
+    </el-dialog>
+    <edit-config ref="addConfig" type="ADD" :line-code="lineCode" @create="createModel" />
+    <edit-config ref="editConfig" type="EDIT" :line-code="lineCode" @update="updateModel" />
+  </div>
+</template>
+
+<script>
+import { getRealLineConfigList, delRealLineConfig } from '@/api/management/mapline';
+import EditConfig from './editConfig';
+export default {
+    name: 'Config',
+    components: {
+        EditConfig
+    },
+    props: {
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            index: 0,
+            id: '',
+            lineCode: '',
+            tableData: []
+        };
+    },
+    computed: {
+
+    },
+    methods: {
+        async show(row) {
+            this.dialogVisible = true;
+            if (row && row.id) {
+                this.id = row.id;
+                this.lineCode = row.code;
+                this.getList();
+            }
+        },
+        async getList() {
+            try {
+                const res = await getRealLineConfigList(this.lineCode);
+                if (res.data) {
+                    this.tableData = res.data;
+                }
+            } catch (error) {
+                console.log(error);
+            }
+        },
+        handleClose(done) {
+            if (done) {
+                done();
+            } else {
+                this.dialogVisible = false;
+            }
+        },
+        addModel() {
+            this.$refs.addConfig.show();
+        },
+        editModel(item, index) {
+            this.$refs.editConfig.show(item);
+            this.index = index;
+        },
+        delModel(item, index) {
+            this.$confirm('此操作将删除该配置项, 是否继续?', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                delRealLineConfig(item.id).then(response => {
+                    this.$message.success('删除成功！');
+                    this.tableData.splice(index, 1);
+                }).catch(() => {
+                    this.$messageBox(this.$t('error.deleteFailed'));
+                });
+            });
+        },
+        createModel(data) {
+            this.tableData.push(data);
+        },
+        updateModel(data) {
+            this.tableData.splice(this.index, 1, data);
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .icon_font{
+        font-size: 18px;
+        margin-left: 15px;
+        cursor: pointer;
+    }
+    .flex_box{
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+    }
+
+</style>
+
diff --git a/src/views/system/configLine/edit.vue b/src/views/system/configLine/edit.vue
new file mode 100644
index 000000000..39bc23891
--- /dev/null
+++ b/src/views/system/configLine/edit.vue
@@ -0,0 +1,147 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { addSkinCode, updateSkinCode } from '@/api/management/mapline';
+export default {
+    name: 'DictionaryEdit',
+    props: {
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                id: '',
+                code: '',
+                name: '',
+                origin: { x: 0, y: 0 },
+                scaling: 1
+            }
+        };
+    },
+    computed: {
+        form() {
+            const isAdd = this.type === 'ADD';
+            const form = {
+                labelWidth: '100px',
+                items: [
+                    { prop: 'code', label: this.$t('system.code'), type: 'text', disabled: !isAdd },
+                    { prop: 'name', label: this.$t('system.name'), type: 'text' },
+                    { prop: 'origin', label: '坐标:', type: 'coordinate', children: [
+                        { prop: 'origin.x', firstLevel: 'origin', secondLevel: 'x', label: 'x', type: 'number', labelWidth: '20px'},
+                        { prop: 'origin.y', firstLevel: 'origin', secondLevel: 'y', label: 'y', type: 'number', labelWidth: '20px'}
+                    ] },
+                    { prop: 'scaling', label: '缩放比例:', type: 'number', min: 0.4, max: 8, step: 0.2 }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                name: [
+                    { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' }
+                ],
+                status: [
+                    { required: true, message: this.$t('rules.pleaseSelectStatus'), trigger: 'change' }
+                ],
+                'origin.x': [
+                    { required: true, message: '请输入坐标x', trigger: 'blur' }
+                ],
+                'origin.y': [
+                    { required: true, message: '请输入坐标y', trigger: 'blur' }
+                ],
+                scaling: [
+                    { required: true, message: '请输入缩放比例', trigger: 'blur' }
+                ]
+            };
+            if (this.type === 'ADD') {
+                return Object.assign(crules, {
+                    code: [
+                        { required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' }
+                    ]
+                });
+            } else {
+                return crules;
+            }
+        },
+        title() {
+            if (this.type === 'ADD') {
+                return this.$t('system.createDirectory');
+            } else {
+                return this.$t('system.editDictionary');
+            }
+        }
+    },
+    methods: {
+        show(row) {
+            this.dialogVisible = true;
+            if (row && row.id) {
+                this.formModel = {
+                    id: row.id,
+                    code: row.code,
+                    name: row.name,
+                    origin: row.origin,
+                    scaling: row.scaling
+                };
+            }
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                if (self.type === 'ADD') {
+                    self.create();
+                } else {
+                    self.update();
+                }
+            });
+        },
+        create() {
+            addSkinCode(this.formModel).then(response => {
+                this.$message.success(this.$t('system.createSuccess'));
+                this.handleClose();
+                this.$emit('reloadTable');
+            }).catch(error => {
+                this.$message.error(`${this.$t('error.createDictionaryFailed')}:${error.message}`);
+            });
+        },
+        update() {
+            updateSkinCode(this.formModel).then(response => {
+                this.$message.success(this.$t('system.updateSuccess'));
+                this.handleClose();
+                this.$emit('reloadTable');
+            }).catch(error => {
+                this.$message.error(`${this.$t('error.updateDictionaryFailed')}:${error.message}`);
+            });
+        },
+        handleClose(done) {
+            this.formModel = {
+                id: '',
+                code: '',
+                name: '',
+                origin: { x: 0, y: 0 },
+                scaling: 1
+            };
+            this.$refs.dataform.resetForm();
+            if (done) {
+                done();
+            } else {
+                this.dialogVisible = false;
+            }
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/system/configLine/editConfig.vue b/src/views/system/configLine/editConfig.vue
new file mode 100644
index 000000000..d4572e27f
--- /dev/null
+++ b/src/views/system/configLine/editConfig.vue
@@ -0,0 +1,146 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false" :z-index="3000">
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { putRealLineConfig, postRealLineConfig } from '@/api/management/mapline';
+export default {
+    name: 'DictionaryEdit',
+    props: {
+        type: {
+            type: String,
+            required: true
+        },
+        lineCode: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                configEg: '',
+                configKey: '',
+                configValue: '',
+                description: '',
+                id: '',
+                lineCode: ''
+            }
+        };
+    },
+    computed: {
+        form() {
+            const form = {
+                labelWidth: '100px',
+                items: [
+                    { prop: 'configKey', label: 'key:', type: 'text' },
+                    { prop: 'configValue', label: 'value:', type: 'text' },
+                    { prop: 'description', label: '描述:', type: 'text' }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            return {
+                key: [
+                    { required: true, message: '请输入key值', trigger: 'blur' }
+                ],
+                value: [
+                    { required: true, message: '请输入value值', trigger: 'blur' }
+                ],
+                remarks: [
+                    { required: true, message: '请输入描述', trigger: 'blur' }
+                ]
+            };
+        },
+        title() {
+            if (this.type === 'ADD') {
+                return '添加配置项';
+            } else {
+                return '修改配置项';
+            }
+        }
+    },
+    methods: {
+        show(row) {
+            this.dialogVisible = true;
+            if (row && row.id) {
+                this.formModel = {
+                    configEg: row.configEg,
+                    configKey: row.configKey,
+                    configValue: row.configValue,
+                    description: row.description,
+                    id: row.id,
+                    lineCode: row.lineCode
+                };
+            }
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                if (self.type === 'ADD') {
+                    self.create();
+                } else {
+                    self.update();
+                }
+            });
+        },
+        buildModel(data) {
+            return {
+                configEg: data.configEg,
+                configKey: data.configKey,
+                configValue: data.configValue,
+                description: data.description,
+                id: data.id,
+                lineCode: data.lineCode
+            };
+        },
+        create() {
+            this.formModel.lineCode = this.lineCode;
+            postRealLineConfig(this.formModel).then(response => {
+                this.$message.success('创建成功！');
+                this.$emit('create', this.buildModel(this.formModel));
+                this.handleClose();
+            }).catch(error => {
+                this.$message.error(`${this.$t('error.createDictionaryFailed')}:${error.message}`);
+            });
+        },
+        update() {
+            this.formModel.lineCode = this.lineCode;
+            putRealLineConfig(this.formModel).then(response => {
+                this.$message.success('更新成功！');
+                this.$emit('update', this.buildModel(this.formModel));
+                this.handleClose();
+            }).catch(error => {
+                this.$message.error(`${this.$t('error.updateDictionaryFailed')}:${error.message}`);
+            });
+        },
+        handleClose(done) {
+            this.formModel = {
+                configEg: '',
+                configKey: '',
+                configValue: '',
+                description: '',
+                id: '',
+                lineCode: ''
+            };
+            this.$refs.dataform.resetForm();
+            if (done) {
+                done();
+            } else {
+                this.dialogVisible = false;
+            }
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/system/configLine/index.vue b/src/views/system/configLine/index.vue
new file mode 100644
index 000000000..8d862a96f
--- /dev/null
+++ b/src/views/system/configLine/index.vue
@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <edit ref="create" type="ADD" @reloadTable="reloadTable" />
+    <edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
+    <config ref="config" @reloadTable="reloadTable" />
+  </div>
+</template>
+
+<script>
+import { getSkinCodePageList, delSkinCode } from '@/api/management/mapline';
+import Edit from './edit';
+import Config from './config';
+
+export default {
+    name: 'CommandDictionary',
+    components: {
+        Edit,
+        Config
+    },
+    data() {
+        return {
+            taskStatusList: [],
+            operateList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '80px',
+                reset: true,
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '线路名称'
+                    },
+                    code: {
+                        type: 'text',
+                        label: '线路编号'
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '线路编号', // 线路编号
+                        prop: 'code'
+                    },
+                    {
+                        title: '线路名称', // 线路编号
+                        prop: 'name'
+                    },
+                    {
+                        title: '线路坐标',
+                        prop: 'origin',
+                        type: 'tag',
+                        columnValue: (row) => { return row.origin; },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '缩放比例',
+                        prop: 'scaling'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '350',
+                        buttons: [
+                            {
+                                name: this.$t('global.edit'),
+                                handleClick: this.handleEdit
+                            },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDelete,
+                                type: 'danger'
+                            },
+                            {
+                                name: '查看配置项',
+                                handleClick: this.handleConfig
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: this.$t('global.add'), handler: this.handleAdd }
+                ]
+            },
+
+            currentModel: {}
+        };
+    },
+
+    mounted () {
+    },
+    methods: {
+        queryFunction(params) {
+            return getSkinCodePageList(params);
+        },
+        // 编辑
+        handleEdit(index, row) {
+            this.$refs.edit.show(row);
+        },
+        // 新增指令
+        handleAdd() {
+            this.$refs.create.show();
+        },
+        handleDelete(index, row) {
+            this.$confirm(this.$t('system.wellDelType'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                delSkinCode(row.id).then(response => {
+                    this.$message.success(this.$t('system.deleteSuccess'));
+                    this.reloadTable();
+                }).catch(() => {
+                    this.reloadTable();
+                    this.$messageBox(this.$t('error.deleteFailed'));
+                });
+            });
+        },
+        handleConfig(index, row) {
+            this.$refs.config.show(row);
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
+};
+</script>

From 2a517c8aa5f88c15da53006f33d6d4ef6e173230 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 20 Dec 2019 10:20:03 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E5=BB=B6=E7=BB=AD=E4=BF=9D=E6=8A=A4=E7=94=9F=E6=88=90=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=E9=81=93=E5=B2=94=E5=8F=AF=E4=B8=BA=E7=A9=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=BB=B6=E7=BB=AD=E4=BF=9D=E6=8A=A4=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E6=9C=89=E8=A7=A3=E9=94=81=E5=8C=BA=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E7=BA=BF=E8=B7=AF=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=98=AF=E8=8B=A5=E6=97=A0=E8=A7=A3=E9=94=81=E5=8C=BA?=
 =?UTF-8?q?=E6=AE=B5=E5=92=8C=E7=BA=BF=E8=B7=AF=E5=88=99=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=BB=B6=E7=BB=AD=E4=BF=9D=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataRelation/routeoperate/detail.vue      |  11 +-
 .../dataRelation/routeoperate/protect.vue     | 278 +++++++++---------
 .../dataRelation/routeoperate/route.vue       |  13 +-
 3 files changed, 156 insertions(+), 146 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
index dbc443836..7e16c6ceb 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
@@ -121,7 +121,8 @@ export default {
                         buttons: [
                             {
                                 name: this.$t('map.preview'),
-                                handleClick: this.overlapSwitchDetail
+                                handleClick: this.overlapSwitchDetail,
+                                showControl: (row) => { return row.overlapCode; }
                             }
                         ]
                     },
@@ -245,7 +246,6 @@ export default {
         this.$Dictionary.switchLocateType().then(list => {
             this.SwitchLocateTypeList = list;
         });
-        this.getProtectList();
         this.acquireMapList();
     },
     methods: {
@@ -284,7 +284,6 @@ export default {
                         that.$convertSpecifiedField(elem, that.signalList, 'code', 'uniqueName', ['startSignalCode', 'endSignalCode']);
                         that.$convertSpecifiedField(elem, that.stationList, 'code', 'name', ['stationCode']);
                         that.$convertSpecifiedField(elem, that.sectionList, 'code', 'name', ['nearSectionCode', 'autoTriggerSectionCode', 'turnBackSectionCode']);
-                        that.$convertSpecifiedField(elem, that.ContinueProtectList, 'code', 'name', ['overlapCode']);
                     });
                 }
             }
@@ -469,12 +468,6 @@ export default {
         selectedObj(index, row) {
             this.$emit('setRouteCode', row, this.codeType);
             this.show = false;
-        },
-        // 获取延续保护list
-        getProtectList() {
-            getContinueProtectList(this.$route.params.mapId, {pageSize:9999, pageNum:1}).then((resp) => {
-                this.ContinueProtectList = resp.data.list;
-            });
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
index 555755e60..fe740aa49 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
@@ -1,10 +1,62 @@
 <template>
-  <div style="height: 100%;">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-form ref="form" :model="addModel" :rules="rules" label-width="190px" size="mini">
-        <div class="definition">
-          <el-form-item label="延续保护解锁区段:" prop="unlockSectionCode">
-            <el-select v-model="addModel.unlockSectionCode">
+  <div style="height: 100%; border: 1px solid #EBEEF5; position: relative; left: 8%; width: 88%">
+    <el-form ref="form" :model="addModel" :rules="rules" label-width="150px" size="mini" style="margin-top: 10px">
+      <div class="definition">
+        <el-form-item label="延续保护解锁区段:" prop="unlockSectionCode">
+          <el-select v-model="addModel.unlockSectionCode" clearable>
+            <el-option
+              v-for="item in sectionList"
+              :key="item.code"
+              :label="item.name + ' (' + item.code+ ')'"
+              :value="item.code"
+            />
+          </el-select>
+          <el-button
+            :type=" field === 'unlockSectionCode' ? 'danger' : 'primary'"
+            @click="hover('unlockSectionCode')"
+          >{{ $t('map.activate') }}</el-button>
+        </el-form-item>
+        <el-form-item label="延续保护解锁时间(s):" prop="unlockTime">
+          <el-input-number v-model="addModel.unlockTime" :min="0" />
+        </el-form-item>
+        <el-form-item label="延续保护线路:" prop="relSectionSwitchList">
+          <el-table :data="addModel.relSectionSwitchList" border style="width: 80%">
+            <el-table-column type="index" label="序号" width="100" />
+            <el-table-column fixed="right" :label="$t('map.operation')">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.prevent="deleteOverlab(addModel.relSectionSwitchList, scope.$index)"
+                >
+                  移出
+                </el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.prevent="editOverlab(addModel.relSectionSwitchList, scope.$index)"
+                >
+                  编辑
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+      </div>
+    </el-form>
+    <el-card class="box-card" shadow="never">
+      <div slot="header" class="clearfix">
+        <span style="font-size: 14px;">{{ cardTitle }}</span>
+        <el-button v-if="cardMode === 'generate'" style="float: right; padding: 3px 0" type="text" @click="generateOverlab">生成</el-button>
+        <el-button-group v-else-if=" cardMode === 'edit'" style="float: right;">
+          <el-button type="text" style="padding:3px 3px" @click="updateOverlab">修改</el-button>
+          <el-button type="text" style="padding:3px 0" @click="cancelOverlab">取消</el-button>
+        </el-button-group>
+      </div>
+      <div>
+        <el-form ref="overlabForm" :model="addOverlapModel" :rules="overLapRules" label-width="135px" size="mini" style="margin-top: 15px">
+          <el-form-item :label="$t('map.routeProtectsData') + ':'" prop="routeOverlapSectionList">
+            <el-select v-model="addOverlapModel.routeOverlapSectionList" multiple clearable :filterable="true">
               <el-option
                 v-for="item in sectionList"
                 :key="item.code"
@@ -13,119 +65,65 @@
               />
             </el-select>
             <el-button
-              :type=" field === 'unlockSectionCode' ? 'danger' : 'primary'"
-              @click="hover('unlockSectionCode')"
+              :type=" field === 'routeOverlapSectionList' ? 'danger' : 'primary'"
+              @click="hover('routeOverlapSectionList')"
             >{{ $t('map.activate') }}</el-button>
           </el-form-item>
-          <el-form-item label="延续保护解锁时间(s):" prop="unlockTime">
-            <el-input-number v-model="addModel.unlockTime" :min="0" />
-          </el-form-item>
-          <el-form-item label="延续保护线路:" prop="relSectionSwitchList">
-            <el-table :data="addModel.relSectionSwitchList" border style="width: 80%">
-              <el-table-column type="index" label="序号" width="100" />
-              <el-table-column fixed="right" :label="$t('map.operation')">
+          <el-form-item :label="$t('map.continueProtectSwitchData') + ':'" prop="routeOverlapSwitchList">
+            <el-select v-model="overlapCode" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
+              <el-option
+                v-for="item in switchList"
+                :key="item.code"
+                :label="`${item.name}(${item.code})`"
+                :value="item.code"
+              />
+            </el-select>
+            <el-button
+              :type=" field === 'routeOverlapSwitchList' ? 'danger' : 'primary'"
+              @click="hover('routeOverlapSwitchList')"
+            >{{ $t('map.activate') }}</el-button>
+            <el-button
+              type="primary"
+              @click="pushSwitch(addOverlapModel.routeOverlapSwitchList, {switchCode: overlapCode, normal: overlapType, switchType: overlapType ? '定位' : '反位'})"
+            >{{ $t('map.add') }}
+            </el-button>
+            <el-select v-model="overlapType" :filterable="true" :placeholder="$t('map.pleaseSelect')">
+              <el-option
+                v-for="item in SwitchLocateTypeList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+            <el-table :data="addOverlapModel.routeOverlapSwitchList" border style="width: 97%">
+              <el-table-column prop="switchCode" :label="$t('map.switchId')" width="100">
+                <template slot-scope="scope">
+                  <span>{{ swictchName(scope.row.switchCode) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="switchType" :label="$t('map.switchType')" />
+              <el-table-column fixed="right" :label="$t('map.operation')" width="50">
                 <template slot-scope="scope">
                   <el-button
                     type="text"
                     size="small"
-                    @click.native.prevent="deleteOverlab(addModel.relSectionSwitchList, scope.$index)"
+                    @click.native.prevent="deleteSwitch(addOverlapModel.routeOverlapSwitchList, scope.$index)"
                   >
-                    移出
-                  </el-button>
-                  <el-button
-                    type="text"
-                    size="small"
-                    @click.native.prevent="editOverlab(addModel.relSectionSwitchList, scope.$index)"
-                  >
-                    编辑
+                    {{ $t('map.remove') }}
                   </el-button>
                 </template>
               </el-table-column>
             </el-table>
           </el-form-item>
-        </div>
-      </el-form>
-      <el-card class="box-card" shadow="never">
-        <div slot="header" class="clearfix">
-          <span style="font-size: 14px;">{{ cardTitle }}</span>
-          <el-button v-if="cardMode === 'generate'" style="float: right; padding: 3px 0" type="text" @click="generateOverlab">生成</el-button>
-          <el-button-group v-else-if=" cardMode === 'edit'" style="float: right;">
-            <el-button type="text" style="padding:3px 3px" @click="updateOverlab">修改</el-button>
-            <el-button type="text" style="padding:3px 0" @click="cancelOverlab">取消</el-button>
-          </el-button-group>
-        </div>
-        <div>
-          <el-form ref="overlabForm" :model="addOverlapModel" :rules="overLapRules" label-width="135px" size="mini" style="margin-top: 15px">
-            <el-form-item :label="$t('map.routeProtectsData') + ':'" prop="routeOverlapSectionList">
-              <el-select v-model="addOverlapModel.routeOverlapSectionList" multiple clearable :filterable="true">
-                <el-option
-                  v-for="item in sectionList"
-                  :key="item.code"
-                  :label="item.name + ' (' + item.code+ ')'"
-                  :value="item.code"
-                />
-              </el-select>
-              <el-button
-                :type=" field === 'routeOverlapSectionList' ? 'danger' : 'primary'"
-                @click="hover('routeOverlapSectionList')"
-              >{{ $t('map.activate') }}</el-button>
-            </el-form-item>
-            <el-form-item :label="$t('map.continueProtectSwitchData') + ':'" prop="routeOverlapSwitchList">
-              <el-select v-model="overlapCode" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
-                <el-option
-                  v-for="item in switchList"
-                  :key="item.code"
-                  :label="`${item.name}(${item.code})`"
-                  :value="item.code"
-                />
-              </el-select>
-              <el-button
-                :type=" field === 'routeOverlapSwitchList' ? 'danger' : 'primary'"
-                @click="hover('routeOverlapSwitchList')"
-              >{{ $t('map.activate') }}</el-button>
-              <el-button
-                type="primary"
-                @click="pushSwitch(addOverlapModel.routeOverlapSwitchList, {switchCode: overlapCode, normal: overlapType, switchType: overlapType ? '定位' : '反位'})"
-              >{{ $t('map.add') }}
-              </el-button>
-              <el-select v-model="overlapType" :filterable="true" :placeholder="$t('map.pleaseSelect')">
-                <el-option
-                  v-for="item in SwitchLocateTypeList"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item.code"
-                />
-              </el-select>
-              <el-table :data="addOverlapModel.routeOverlapSwitchList" border style="width: 97%">
-                <el-table-column prop="switchCode" :label="$t('map.switchId')" width="100">
-                  <template slot-scope="scope">
-                    <span>{{ swictchName(scope.row.switchCode) }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="switchType" :label="$t('map.switchType')" />
-                <el-table-column fixed="right" :label="$t('map.operation')" width="50">
-                  <template slot-scope="scope">
-                    <el-button
-                      type="text"
-                      size="small"
-                      @click.native.prevent="deleteSwitch(addOverlapModel.routeOverlapSwitchList, scope.$index)"
-                    >
-                      {{ $t('map.remove') }}
-                    </el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-card>
-    </el-scrollbar>
+        </el-form>
+      </div>
+    </el-card>
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
 import { getUID } from '@/jmap/utils/Uid';
-import { postContinueProtect, putContinueProtect } from '@/api/jmap/mapdraft';
+import { postContinueProtect, putContinueProtect, delContinueProtect } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { deepAssign } from '@/utils/index';
 
@@ -179,17 +177,6 @@ export default {
             editShow: false,
             overLapRules: {
 
-            },
-            rules: {
-                unlockSectionCode: [
-                    { required: true, message: '请选择解锁区段', trigger:'change'}
-                ],
-                unlockTime: [
-                    { required: true, message: '请输入解锁时间', trigger:'blur'}
-                ],
-                relSectionSwitchList: [
-                    { required: true, message: '请生成延续保护线路', trigger: 'change'}
-                ]
             },
             cardMode: 'generate'
         };
@@ -218,6 +205,11 @@ export default {
         protectData(val, old) {
             if (val) {
                 this.addModel = val;
+                this.addModel.relSectionSwitchList && this.addModel.relSectionSwitchList.forEach(item => {
+                    item.routeOverlapSwitchList.length && item.routeOverlapSwitchList.forEach( ele => {
+                        ele.switchType = ele.normal ? '定位' : '反位';
+                    });
+                });
                 this.editShow = true;
             }
         }
@@ -228,6 +220,9 @@ export default {
     methods: {
         hover(field) {
             this.field = field === this.field ? '' : field;
+            if (this.field) {
+                this.$emit('clearHover');
+            }
         },
         pushSwitch(list, data) {
             const index = list.findIndex(elem => { return elem.switchCode == data.switchCode; });
@@ -270,28 +265,45 @@ export default {
             return model;
         },
         save() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    const model = this.buildModel(getUID('Protect'));
-                    postContinueProtect(model).then(resp => {
-                        this.$emit('saveProtectSuccess', model.code);
-                    }).catch(() => {
-                        this.$messageBox('创建延续保护失败！');
-                    });
-                }
-            });
+            this.createProtect('saveProtectSuccess');
         },
         update() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    const model = this.buildModel();
-                    putContinueProtect(model).then(resp => {
-                        this.$emit('updateProtectSuccess', model.code);
-                    }).catch(() => {
-                        this.$messageBox('更新延续保护失败！');
-                    });
+            if (this.addModel.code && this.addModel.unlockSectionCode && this.addModel.relSectionSwitchList.length) {
+                const model = this.buildModel();
+                putContinueProtect(model).then(resp => {
+                    this.$emit('updateProtectSuccess', model.code);
+                }).catch(() => {
+                    this.$messageBox('更新延续保护失败！');
+                });
+            } else if (this.addModel.code && !this.addModel.unlockSectionCode && !this.addModel.relSectionSwitchList.length) {
+                delContinueProtect(this.addModel.id).then(resp => {
+                    this.$emit('updateProtectSuccess', '');
+                });
+            } else if (this.addModel.code && !this.addModel.unlockSectionCode && this.addModel.relSectionSwitchList.length) {
+                this.$messageBox('请填写延续保护解锁区段或清除延续保护相关数据！');
+            } else if (this.addModel.code && this.addModel.unlockSectionCode && !this.addModel.relSectionSwitchList.length) {
+                this.$messageBox('请生成延续保护线路或清除延续保护相关数据！');
+            } else {
+                this.createProtect('updateProtectSuccess');
+            }
+        },
+        createProtect(parentFunction) {
+            if (this.addModel.unlockSectionCode && this.addModel.relSectionSwitchList.length) {
+                const model = this.buildModel(getUID('Protect'));
+                postContinueProtect(model).then(resp => {
+                    this.$emit(parentFunction, model.code);
+                }).catch(() => {
+                    this.$messageBox('创建延续保护失败！');
+                });
+            } else if (!this.addModel.unlockSectionCode && !this.addModel.relSectionSwitchList.length) {
+                this.$emit(parentFunction, '');
+            } else {
+                if (!this.addModel.unlockSectionCode) {
+                    this.$messageBox('请填写延续保护解锁区段或清除延续保护相关数据！');
+                } else if (!this.addModel.relSectionSwitchList.length) {
+                    this.$messageBox('请生成延续保护线路或清除延续保护相关数据！');
                 }
-            });
+            }
         },
         clear() {
             if (this.$refs && this.$refs.form) {
@@ -376,8 +388,6 @@ export default {
         }
     }
     .box-card {
-        width: 88%;
         position: relative;
-        left: 8%;
     }
 </style>
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index bf42ca694..4694dab69 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -193,7 +193,7 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <protect-operate ref="protect" :protect-data="protectData" @saveProtectSuccess="saveProtectSuccess" @updateProtectSuccess="updateProtectSuccess" />
+      <protect-operate ref="protect" :protect-data="protectData" @saveProtectSuccess="saveProtectSuccess" @updateProtectSuccess="updateProtectSuccess" @clearHover="clearHover" />
       <div class="draft">
         <el-button-group>
           <el-button v-if="isSave" type="primary" size="small" :loading="loading" @click="save">{{ $t('map.save') }}
@@ -336,7 +336,7 @@ export default {
         routeData(val, old) {
             if (val) {
                 this.addModel = val;
-                this.initProtectData(val);
+                val.overlapCode && this.initProtectData(val);
                 this.addModel.routeFlankProtectionList.forEach(item => {
                     item.normal ? item.switchType = '定位' : item.switchType = '反位';
                 });
@@ -358,7 +358,9 @@ export default {
                 });
             }
             if (val && val.length) {
-                this.$refs.protect.addModel.unlockSectionCode = val[val.length - 1];
+                if (!this.addModel.code) {
+                    this.$refs.protect.addModel.unlockSectionCode = val[val.length - 1];
+                }
                 val.forEach((item) => {
                     const section = this.$store.getters['map/getDeviceByCode'](item);
                     if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
@@ -394,6 +396,10 @@ export default {
         },
         hover(field) {
             this.field = field === this.field ? '' : field;
+            this.$refs.protect.hover('');
+        },
+        clearHover() {
+            this.field = '';
         },
         pushSwitch(list, data) {
             const index = list.findIndex(elem => { return elem.switchCode == data.switchCode; });
@@ -459,6 +465,7 @@ export default {
                 this.addModel.routeSwitchList = [];
                 this.addModel.routeFlankProtectionList = [];
                 this.addModel.overlapCode = '';
+                this.addModel.code = '';
                 this.isSave = true;
                 this.$refs.protect.clear();
             }

From 73da545e6793a94da17fd0c71ac9545f997438a7 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 20 Dec 2019 10:54:29 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=9C=BA=E5=81=8F=E7=A7=BB=E9=87=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapoperate/section/logicBlock.vue          | 18 ++++++++++--------
 .../newMapdraft/mapoperate/signal/index.vue    |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue b/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
index bb26e36ad..55356e36a 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/logicBlock.vue
@@ -77,14 +77,17 @@ export default {
             const sectionPoints = [...this.editModel.points]; // 获取区段点
             let allNotZeros = true;
             let count = 0;
-            let lineLength = 0;
+            let totalNum = 0;
+            const lengthFact = this.editModel.lengthFact;
+            this.tableData.forEach((ele, index) => {
+                totalNum += Number(ele.num);
+            });
+            const lineLength = lengthFact / totalNum; // 均分逻辑区段偏移量
             this.tableData.forEach((ele, index) => {
-                const triangle = new JTriangle(sectionPoints[index], sectionPoints[index + 1]);
                 models = [...models, ...this.createLogicalSections(Number(ele.num), sectionPoints[index], sectionPoints[index + 1], this.editModel, counts, lineLength)];
                 allNotZeros = Number(ele.num) && allNotZeros;
                 count += Number(ele.num);
                 logicSectionNumList.push(Number(ele.num));
-                lineLength += Math.sqrt(triangle.abspowz);
                 counts += parseInt(ele.num);
             });
             if (count === 0 || allNotZeros) {
@@ -122,7 +125,7 @@ export default {
                     { x: beg.x + triangle.getCos(offset * i), y: beg.y + triangle.getSin(offset * i) },
                     { x: beg.x + triangle.getCos(offset * (i + 1)), y: beg.y + triangle.getSin(offset * (i + 1)) }
                 ];
-                const param = this.addLogicalSection(model, points, counts + i, offset, i, lineLength);
+                const param = this.addLogicalSection(model, points, counts + i, lineLength);
                 param.lengthFact = Number(model.lengthFact) / num;
                 models.push(param);
                 this.addList.push(param);
@@ -130,7 +133,7 @@ export default {
             return models;
         },
         // 逻辑区段模型
-        addLogicalSection(model, points, index, offset, i, lineLength) {
+        addLogicalSection(model, points, index, lineLength) {
             const data = {
                 _type: 'Section',
                 code: getUID('T', [...this.sectionList, ...this.addList]),
@@ -157,7 +160,6 @@ export default {
                     x: model.transferTrackNamePosition.x,
                     y: model.transferTrackNamePosition.y
                 },
-                // segmentation: false,
                 segmentationPosition: {
                     x: model.segmentationPosition.x,
                     y: model.segmentationPosition.y
@@ -177,8 +179,8 @@ export default {
                 kmRangeRight: model.kmRangeRight,
                 kmRangeLeft: model.kmRangeLeft,
                 region: model.region,
-                logicSectionStartOffset:lineLength + offset * i,
-                logicSectionEndOffset: lineLength + offset * (i + 1),
+                logicSectionStartOffset: Math.floor(lineLength * index),
+                logicSectionEndOffset: Math.floor(lineLength * (index + 1)),
                 relevanceSectionList: []
             };
             if (this.isDelimiter) {
diff --git a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
index acee40db0..fd5d4cfd1 100644
--- a/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/signal/index.vue
@@ -319,7 +319,7 @@ export default {
                             signalModel.sectionCode = section.code;
                         }
                         if (!section.code) {
-                            this.questionList.push(`${item.name} 信号机位置可能不正确，请手动调试归属区段及偏移量.`);
+                            this.questionList.push(`${item.name}(${item.code}) 信号机位置可能不正确，请手动调试归属区段及偏移量.`);
                         }
                         signalModel.sectionOffset = this.addModel.number;
                         if (signalModel.right) {

From 2cbafa7950e7778b28c6363ff5eb3d58aa3af5ef Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 20 Dec 2019 11:22:30 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E5=BB=B6=E7=BB=AD=E4=BF=9D=E6=8A=A4?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMapdraft/dataRelation/routeoperate/protect.vue     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
index fe740aa49..cbbe89876 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
@@ -386,6 +386,14 @@ export default {
         .el-input__suffix{
             right: 2px;
         }
+        .el-card__header{
+            border-bottom: 1px solid #EBEEF5;
+            border-top: 1px solid #EBEEF5;
+        }
+        .el-card{
+            border:0 solid #EBEEF5;
+
+        }
     }
     .box-card {
         position: relative;

From 6a82d745d971c2af2ad3caaf48d757f07a8aadda Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 20 Dec 2019 13:48:37 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=94=9F=E6=88=90code=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/utils/Uid.js                             | 12 ++++++++++++
 src/utils/baseUrl.js                                 |  4 ++--
 .../dataRelation/automaticoperate/route.vue          |  4 ++--
 .../newMapdraft/dataRelation/pathoperate/route.vue   |  6 +++---
 .../dataRelation/routeoperate/protect.vue            |  4 ++--
 .../newMapdraft/dataRelation/routeoperate/route.vue  |  6 +++---
 .../dataRelation/routingoperate/route.vue            |  4 ++--
 .../newMapdraft/dataRelation/signaloperate/route.vue |  4 ++--
 .../newMapdraft/dataRelation/turnedoperate/route.vue |  4 ++--
 9 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/jmapNew/utils/Uid.js b/src/jmapNew/utils/Uid.js
index 2163c9f81..036d41c25 100644
--- a/src/jmapNew/utils/Uid.js
+++ b/src/jmapNew/utils/Uid.js
@@ -45,3 +45,15 @@ export function getUID(type, list) {
     // use Math.random to make id as unique as possible.
 }
 
+var base = 0;
+
+/**
+ * @public
+ * @param {string} type
+ * @return {string}
+ */
+export function setUID(type) {
+    // use Math.random to make id as unique as possible.
+    return [(type || ''), base++, Math.random().toFixed(5)].join('_');
+}
+
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 1e9afea51..79d1c6346 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,11 +3,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        BASE_API = 'http://192.168.3.82:9000'; // 杜康
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
     }
diff --git a/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
index eacf6441d..adc6767b3 100644
--- a/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/automaticoperate/route.vue
@@ -64,7 +64,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { postAutoSignalNew, putAutoSignalNew } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { formatName } from '@/utils/runPlan';
@@ -174,7 +174,7 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    postAutoSignalNew(this.buildModel(getUID('autoSingle'))).then(resp => {
+                    postAutoSignalNew(this.buildModel(setUID('autoSingle'))).then(resp => {
                         this.$message.success(this.$t('map.automaticSignalSuccessful'));
                         this.loading = false;
                         this.clear();
diff --git a/src/views/newMap/newMapdraft/dataRelation/pathoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/pathoperate/route.vue
index c2429bac7..1f3de2982 100644
--- a/src/views/newMap/newMapdraft/dataRelation/pathoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/pathoperate/route.vue
@@ -83,7 +83,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { addRouteUnit, setRouteUnit } from '@/api/jmap/pathunit';
 import PathRoute from './pathRoute';
 import { ViewMode } from '@/scripts/ConstDic';
@@ -123,7 +123,7 @@ export default {
             loading: false,
             addModel: {
                 mapId: '',
-                code: getUID('RouteUnit'),
+                code: setUID('RouteUnit'),
                 startSectionCode: '',
                 endSectionCode: '',
                 mapRouteUnitRelList: []
@@ -262,7 +262,7 @@ export default {
                 this.editShow = false;
                 this.addModel = {
                     mapId: this.mapInfo.id,
-                    code: getUID('RouteUnit'),
+                    code: setUID('RouteUnit'),
                     startSectionCode: '',
                     endSectionCode: '',
                     mapRouteUnitRelList: []
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
index fe740aa49..77d95dc02 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
@@ -122,7 +122,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { postContinueProtect, putContinueProtect, delContinueProtect } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { deepAssign } from '@/utils/index';
@@ -289,7 +289,7 @@ export default {
         },
         createProtect(parentFunction) {
             if (this.addModel.unlockSectionCode && this.addModel.relSectionSwitchList.length) {
-                const model = this.buildModel(getUID('Protect'));
+                const model = this.buildModel(setUID('Protect'));
                 postContinueProtect(model).then(resp => {
                     this.$emit(parentFunction, model.code);
                 }).catch(() => {
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index 5e22cb24d..db57c9e7e 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -207,7 +207,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { postRouteNew, putRouteNew, getRouteNewList, getContinueProtectList } from '@/api/jmap/mapdraft';
 import RouteDetail from './detail';
 import ProtectOperate from './protect';
@@ -426,10 +426,10 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    postRouteNew(this.buildModel(overlapCode, getUID('Route'))).then(response => {
+                    postRouteNew(this.buildModel(overlapCode, setUID('Route'))).then(response => {
                         this.$message.success('创建成功');
                         this.loading = false;
-                        this.routeList.push(this.buildModel(getUID('Route')));
+                        this.routeList.push(this.buildModel(setUID('Route')));
                         this.clear();
                     }).catch(() => {
                         this.$messageBox(this.$t('tip.operationAbnormal'));
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
index 7c29dcb2e..af8b650c9 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/route.vue
@@ -152,7 +152,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { addRouting, updateRouting } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { formatName } from '@/utils/runPlan';
@@ -327,7 +327,7 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    addRouting(this.buildModel(getUID('Routing'))).then(resp => {
+                    addRouting(this.buildModel(setUID('Routing'))).then(resp => {
                         this.$message.success(this.$t('tip.pathCreationSuccessful'));
                         this.loading = false;
                         this.clear();
diff --git a/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
index ffbc56bf6..4aa52b9af 100644
--- a/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/signaloperate/route.vue
@@ -44,7 +44,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { postApproachSection, putApproachSection } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { formatName } from '@/utils/runPlan';
@@ -146,7 +146,7 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    postApproachSection(this.buildModel(getUID('signalSection'))).then(resp => {
+                    postApproachSection(this.buildModel(setUID('signalSection'))).then(resp => {
                         this.$message.success(this.$t('map.signalSectionSuccessful'));
                         this.loading = false;
                         this.clear();
diff --git a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
index fbb24c179..d153476c8 100644
--- a/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/turnedoperate/route.vue
@@ -44,7 +44,7 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { getUID } from '@/jmap/utils/Uid';
+import { setUID } from '@/jmapNew/utils/Uid';
 import { postAutoReentry, putAutoReentry, getRouteNewList } from '@/api/jmap/mapdraft';
 import { ViewMode } from '@/scripts/ConstDic';
 import { formatName } from '@/utils/runPlan';
@@ -159,7 +159,7 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    postAutoReentry(this.buildModel(getUID('TurnedAround'))).then(resp => {
+                    postAutoReentry(this.buildModel(setUID('TurnedAround'))).then(resp => {
                         this.$message.success('创建折返成功！');
                         this.loading = false;
                         this.clear();

From bfe6c5a537bb3c4349e91b02ced70d2b1820cffc Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Fri, 20 Dec 2019 14:02:11 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BA=BF=E8=B7=AF?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/management/mapline.js              | 33 +++---------------
 src/utils/baseUrl.js                       |  4 +--
 src/views/system/configLine/config.vue     | 29 +++++++++-------
 src/views/system/configLine/editConfig.vue | 40 ++++------------------
 4 files changed, 30 insertions(+), 76 deletions(-)

diff --git a/src/api/management/mapline.js b/src/api/management/mapline.js
index a157095e6..baf989ed9 100644
--- a/src/api/management/mapline.js
+++ b/src/api/management/mapline.js
@@ -44,15 +44,7 @@ export function updateSkinCode(data) {
 }
 
 // 根据code获取线路配置
-export function getRealLineConfigList(lineCode) {
-    return request({
-        url: `/api/realLine/config?lineCode=${lineCode}`,
-        method: 'get'
-    });
-}
-
-// 根据id获取线路配置
-export function getRealLineConfig(id) {
+export function getRealLineConfigList(id) {
     return request({
         url: `/api/realLine/config/${id}`,
         method: 'get'
@@ -60,28 +52,11 @@ export function getRealLineConfig(id) {
 }
 
 // 根据id修改线路配置
-export function putRealLineConfig(data) {
-    return request({
-        url: `/api/realLine/config/${data.id}`,
-        method: 'put',
-        data: data
-    });
-}
-
-// 创建线路配置
-export function postRealLineConfig(data) {
-    return request({
-        url: `/api/realLine/config`,
-        method: 'post',
-        data: data
-    });
-}
-
-// 删除线路配置
-export function delRealLineConfig(id) {
+export function putRealLineConfig(id, data) {
     return request({
         url: `/api/realLine/config/${id}`,
-        method: 'delete'
+        method: 'post',
+        data: data
     });
 }
 
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 79d1c6346..1e9afea51 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,11 +3,11 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛
-        BASE_API = 'http://192.168.3.82:9000'; // 杜康
+        // BASE_API = 'http://192.168.3.82:9000'; // 杜康
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
     }
diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index 7a7b39d3c..560c830fa 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -21,16 +21,17 @@
         </el-table>
       </div>
       <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('global.confirm') }}</el-button>
         <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
       </span>
     </el-dialog>
-    <edit-config ref="addConfig" type="ADD" :line-code="lineCode" @create="createModel" />
-    <edit-config ref="editConfig" type="EDIT" :line-code="lineCode" @update="updateModel" />
+    <edit-config ref="addConfig" type="ADD" @create="createModel" />
+    <edit-config ref="editConfig" type="EDIT" @update="updateModel" />
   </div>
 </template>
 
 <script>
-import { getRealLineConfigList, delRealLineConfig } from '@/api/management/mapline';
+import { getRealLineConfigList, putRealLineConfig } from '@/api/management/mapline';
 import EditConfig from './editConfig';
 export default {
     name: 'Config',
@@ -48,7 +49,6 @@ export default {
             dialogVisible: false,
             index: 0,
             id: '',
-            lineCode: '',
             tableData: []
         };
     },
@@ -60,15 +60,16 @@ export default {
             this.dialogVisible = true;
             if (row && row.id) {
                 this.id = row.id;
-                this.lineCode = row.code;
                 this.getList();
             }
         },
         async getList() {
             try {
-                const res = await getRealLineConfigList(this.lineCode);
+                const res = await getRealLineConfigList(this.id);
                 if (res.data) {
                     this.tableData = res.data;
+                } else {
+                    this.tableData = [];
                 }
             } catch (error) {
                 console.log(error);
@@ -94,12 +95,7 @@ export default {
                 cancelButtonText: this.$t('global.cancel'),
                 type: 'warning'
             }).then(() => {
-                delRealLineConfig(item.id).then(response => {
-                    this.$message.success('删除成功！');
-                    this.tableData.splice(index, 1);
-                }).catch(() => {
-                    this.$messageBox(this.$t('error.deleteFailed'));
-                });
+                this.tableData.splice(index, 1);
             });
         },
         createModel(data) {
@@ -107,6 +103,15 @@ export default {
         },
         updateModel(data) {
             this.tableData.splice(this.index, 1, data);
+        },
+        save() {
+            putRealLineConfig(this.id, this.tableData).then(res => {
+                this.$message.success(`保存配置项成功!`);
+                this.dialogVisible = false;
+            }).catch(() => {
+                this.$messageBox(`保存配置项失败.`);
+            });
+
         }
     }
 };
diff --git a/src/views/system/configLine/editConfig.vue b/src/views/system/configLine/editConfig.vue
index d4572e27f..900fc056d 100644
--- a/src/views/system/configLine/editConfig.vue
+++ b/src/views/system/configLine/editConfig.vue
@@ -9,29 +9,21 @@
 </template>
 
 <script>
-import { putRealLineConfig, postRealLineConfig } from '@/api/management/mapline';
 export default {
     name: 'DictionaryEdit',
     props: {
         type: {
             type: String,
             required: true
-        },
-        lineCode: {
-            type: String,
-            required: true
         }
     },
     data() {
         return {
             dialogVisible: false,
             formModel: {
-                configEg: '',
                 configKey: '',
                 configValue: '',
-                description: '',
-                id: '',
-                lineCode: ''
+                description: ''
             }
         };
     },
@@ -73,12 +65,9 @@ export default {
             this.dialogVisible = true;
             if (row && row.id) {
                 this.formModel = {
-                    configEg: row.configEg,
                     configKey: row.configKey,
                     configValue: row.configValue,
-                    description: row.description,
-                    id: row.id,
-                    lineCode: row.lineCode
+                    description: row.description
                 };
             }
         },
@@ -103,33 +92,18 @@ export default {
             };
         },
         create() {
-            this.formModel.lineCode = this.lineCode;
-            postRealLineConfig(this.formModel).then(response => {
-                this.$message.success('创建成功！');
-                this.$emit('create', this.buildModel(this.formModel));
-                this.handleClose();
-            }).catch(error => {
-                this.$message.error(`${this.$t('error.createDictionaryFailed')}:${error.message}`);
-            });
+            this.$emit('create', this.buildModel(this.formModel));
+            this.handleClose();
         },
         update() {
-            this.formModel.lineCode = this.lineCode;
-            putRealLineConfig(this.formModel).then(response => {
-                this.$message.success('更新成功！');
-                this.$emit('update', this.buildModel(this.formModel));
-                this.handleClose();
-            }).catch(error => {
-                this.$message.error(`${this.$t('error.updateDictionaryFailed')}:${error.message}`);
-            });
+            this.$emit('update', this.buildModel(this.formModel));
+            this.handleClose();
         },
         handleClose(done) {
             this.formModel = {
-                configEg: '',
                 configKey: '',
                 configValue: '',
-                description: '',
-                id: '',
-                lineCode: ''
+                description: ''
             };
             this.$refs.dataform.resetForm();
             if (done) {

From ab70d8168b9fa0e2005a38ea9829f195104c6b2a Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 20 Dec 2019 14:23:59 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=9B?=
 =?UTF-8?q?=E8=B7=AF=E9=81=93=E5=B2=94=E7=B1=BB=E5=9E=8B=E4=B8=8D=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/i18n/langs/en/map.js                           |  4 +++-
 src/i18n/langs/zh/map.js                           |  4 +++-
 .../dataRelation/routeoperate/detail.vue           | 14 ++++++++------
 .../dataRelation/routeoperate/protectDetail.vue    |  2 +-
 .../dataRelation/routeoperate/route.vue            |  4 ++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/i18n/langs/en/map.js b/src/i18n/langs/en/map.js
index 7b35eb830..818ed8488 100644
--- a/src/i18n/langs/en/map.js
+++ b/src/i18n/langs/en/map.js
@@ -571,5 +571,7 @@ export default {
     frontSectionMode:'Extend Mode',
     lockFirst:'Lock First',
     continueProtect: 'Continue protect',
-    continueProtectList: 'Continue protect list'
+    continueProtectList: 'Continue protect list',
+    saveRoute: 'Save route',
+    updataRoute: 'Updata route'
 };
diff --git a/src/i18n/langs/zh/map.js b/src/i18n/langs/zh/map.js
index 9f224526c..c2726ca3e 100644
--- a/src/i18n/langs/zh/map.js
+++ b/src/i18n/langs/zh/map.js
@@ -565,5 +565,7 @@ export default {
     frontSectionMode:'延伸方式',
     lockFirst:'是否先锁闭',
     continueProtect: '延续保护',
-    continueProtectList: '延续保护列表'
+    continueProtectList: '延续保护列表',
+    saveRoute: '保存进路',
+    updataRoute: '修改进路'
 };
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
index 7e16c6ceb..595b6993d 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/detail.vue
@@ -346,9 +346,7 @@ export default {
         async flankProtectionSwitchDetail(index, row) { // 进路侧防道岔
             if (this.$refs && this.$refs.previewField && row) {
                 const switchDict = {};
-                const switchTypeDict = {};
                 this.switchList.map(elem => { switchDict[elem.code] = elem.name; });
-                this.SwitchLocateTypeList.map(elem => { switchTypeDict[elem.code] = elem.name; });
                 const fieldList = {
                     id: row.id,
                     mapId: this.$route.params.mapId,
@@ -358,19 +356,20 @@ export default {
                         items: [
                             { prop: 'switchCode', label: '道岔ID', type: 'text' },
                             { prop: 'switchCode', label: '道岔名称', type: 'select', options: switchDict },
-                            { prop: 'switchLocateType', label: '道岔类型', type: 'select', options: switchTypeDict }
+                            { prop: 'switchType', label: '道岔类型', type: 'text'}
                         ]
                     }
                 };
+                row.routeFlankProtectionList.forEach( item => {
+                    item.switchType = item.normal ? '定位' : '反位';
+                });
                 this.$refs.previewField.doShow(fieldList, row.routeFlankProtectionList);
             }
         },
         async routeSwitchDetail(index, row) { // 道岔段数据列表
             if (this.$refs && this.$refs.previewField && row) {
                 const switchDict = {};
-                const switchTypeDict = {};
                 this.switchList.map(elem => { switchDict[elem.code] = elem.name; });
-                this.SwitchLocateTypeList.map(elem => { switchTypeDict[elem.code] = elem.name; });
                 const fieldList = {
                     id: row.id,
                     mapId: this.$route.params.mapId,
@@ -381,10 +380,13 @@ export default {
                         items: [
                             { prop: 'switchCode', label: '道岔ID', type: 'text' },
                             { prop: 'switchCode', label: '道岔名称', type: 'select', options: switchDict },
-                            { prop: 'switchLocateType', label: '道岔类型', type: 'select', options: switchTypeDict }
+                            { prop: 'switchType', label: '道岔类型', type: 'text'}
                         ]
                     }
                 };
+                row.routeSwitchList.forEach( item => {
+                    item.switchType = item.normal ? '定位' : '反位';
+                });
                 this.$refs.previewField.doShow(fieldList, row.routeSwitchList);
             }
         },
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protectDetail.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protectDetail.vue
index ec33dc395..11db11161 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protectDetail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protectDetail.vue
@@ -3,7 +3,7 @@
     v-dialogDrag
     :title="mapInfo.name + ' / ' + '延续保护'"
     :visible.sync="show"
-    width="30%"
+    width="60%"
     :before-close="doClose"
     center
     append-to-body
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index 5e22cb24d..398517a61 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -196,9 +196,9 @@
       <protect-operate ref="protect" :protect-data="protectData" @saveProtectSuccess="saveProtectSuccess" @updateProtectSuccess="updateProtectSuccess" @clearHover="clearHover" />
       <div class="draft">
         <el-button-group>
-          <el-button v-if="isSave" type="primary" size="small" :loading="loading" @click="save">{{ $t('map.save') }}
+          <el-button v-if="isSave" type="primary" size="small" :loading="loading" @click="save">{{ $t('map.saveRoute') }}
           </el-button>
-          <el-button v-else type="warning" size="small" :loading="loading" @click="update">{{ $t('map.updata') }}</el-button>
+          <el-button v-else type="warning" size="small" :loading="loading" @click="update">{{ $t('map.updataRoute') }}</el-button>
         </el-button-group>
       </div>
     </el-scrollbar>

From 0207e54914967dbdc599f854f640613f2e0d8984 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 20 Dec 2019 15:44:12 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E5=BB=B6=E7=BB=AD?=
 =?UTF-8?q?=E4=BF=9D=E6=8A=A4=E5=8C=BA=E6=AE=B5=E9=80=89=E4=B8=AD=E7=BA=A2?=
 =?UTF-8?q?=E8=89=B2?=
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            | 22 +++++++++++--------
 .../dataRelation/routeoperate/protect.vue     | 20 +++++++++++++++++
 .../dataRelation/routeoperate/route.vue       |  6 ++---
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/jmapNew/config/defaultStyle.js b/src/jmapNew/config/defaultStyle.js
index d20fc5a23..f38fb4b52 100644
--- a/src/jmapNew/config/defaultStyle.js
+++ b/src/jmapNew/config/defaultStyle.js
@@ -122,3 +122,7 @@ export default class defaultStyle {
         };
     }
 }
+export const drawSectionStyle = {
+    routePhysicalSection: 'rgba(255,255,0,0.5)',
+    continueProtectSection: 'rgba(255,0,255,0.5)'
+};
diff --git a/src/jmapNew/shape/Section/index.js b/src/jmapNew/shape/Section/index.js
index 8deec902a..267b0646b 100644
--- a/src/jmapNew/shape/Section/index.js
+++ b/src/jmapNew/shape/Section/index.js
@@ -10,6 +10,7 @@ import { EBackArrow, EBackArrowTriangle } from './EBackArrow'; // 折返进路
 import ELimitName from './ELimitName'; // 成都三号线 限速名称
 import JTriangle from '../../utils/JTriangle';
 import router from '@/router';
+import {drawSectionStyle} from '../../config/defaultStyle';
 
 /** 区段*/
 export default class Section extends Group {
@@ -22,7 +23,7 @@ export default class Section extends Group {
         this.model = model;
         this.style = style;
         this.selected = false; // 绘图选中状态
-        this.batchSelected = false; // 绘图批量选中状态
+        this.selectedType = ''; // 绘图批量选中状态
         this.create();
         this.createMouseEvent();
         this.setState(model);
@@ -854,25 +855,28 @@ export default class Section extends Group {
     drawSelected(selected) {
         this.selected = selected;
         if (selected) {
-            !this.batchSelected && this.section && this.section.setStyle({stroke: 'rgba(0,255,255,0.6)'});
+            !this.selectedType && this.section && this.section.setStyle({stroke: 'rgba(0,255,255,0.6)'});
         } else {
-            !this.batchSelected && this.section && this.section.setStyle({stroke: this.style.Section.line.spareColor });
+            !this.selectedType && this.section && this.section.setStyle({stroke: this.style.Section.line.spareColor });
         }
     }
-    drawBatchSelected(selected) {
-        this.batchSelected = selected;
-        if (selected) {
-            this.section && this.section.setStyle({stroke: 'rgba(255,255,0,0.6)'});
+    drawBatchSelected(selected, type) {
+        if (this.selectedType === type) {
+            return;
+        }
+        if (selected && !this.selectedType) {
+            this.section && this.section.setStyle({stroke: drawSectionStyle[type]});
         } else {
             this.section && this.section.setStyle({stroke: this.style.Section.line.spareColor });
         }
+        this.selectedType = type;
     }
 
     checkIsDrawMap() {
         const path = window.location.href;
         if (path.includes('/map/draw')) {
-            this.on('mouseout', () => { !this.batchSelected && !this.selected && this.section && this.section.setStyle({stroke: this.style.Section.line.spareColor }); });
-            this.on('mouseover', () => { !this.batchSelected && this.section && this.section.setStyle({stroke: 'rgba(0,255,255,0.6)'}); });
+            this.on('mouseout', () => { !this.selectedType && !this.selected && this.section && this.section.setStyle({stroke: this.style.Section.line.spareColor }); });
+            this.on('mouseover', () => { !this.selectedType && this.section && this.section.setStyle({stroke: 'rgba(0,255,255,0.6)'}); });
         }
     }
 
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
index 3026e681b..ac3dc9dd3 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
@@ -212,6 +212,26 @@ export default {
                 });
                 this.editShow = true;
             }
+        },
+        'addOverlapModel.routeOverlapSectionList': function (val, old) {
+            if (old && old.length) {
+                old.forEach((item) => {
+                    const section = this.$store.getters['map/getDeviceByCode'](item);
+                    section.instance.drawBatchSelected(false, '');
+                });
+            }
+            if (val && val.length) {
+                val.forEach((item) => {
+                    const section = this.$store.getters['map/getDeviceByCode'](item);
+                    if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
+                        section.logicSectionCodeList.forEach( (logicSectionCode) => {
+                            this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(true, 'continueProtectSection');
+                        });
+                    }
+                    section.instance.drawBatchSelected(true, 'continueProtectSection');
+                });
+            }
+
         }
     },
     mounted() {
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index 8d026314b..abbf5312c 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -349,7 +349,7 @@ export default {
             if (old && old.length) {
                 old.forEach((item) => {
                     const section = this.$store.getters['map/getDeviceByCode'](item);
-                    section.instance.drawBatchSelected(false);
+                    section.instance.drawBatchSelected(false, '');
                 });
             }
             if (val && val.length) {
@@ -360,10 +360,10 @@ export default {
                     const section = this.$store.getters['map/getDeviceByCode'](item);
                     if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
                         section.logicSectionCodeList.forEach( (logicSectionCode) => {
-                            this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(true);
+                            this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(true, 'routePhysicalSection');
                         });
                     }
-                    section.instance.drawBatchSelected(true);
+                    section.instance.drawBatchSelected(true, 'routePhysicalSection');
                 });
             }
         }

From a60971c54e8fa60a033dbe1870e61026c3182b51 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 20 Dec 2019 17:15:15 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=9B?=
 =?UTF-8?q?=E8=B7=AF=E7=89=A9=E7=90=86=E5=8C=BA=E6=AE=B5=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8C=BA=E6=AE=B5=E6=97=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=89=A9=E7=90=86=E5=8C=BA=E6=AE=B5=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMapdraft/dataRelation/routeoperate/protect.vue | 11 +++++++++--
 .../newMapdraft/dataRelation/routeoperate/route.vue   | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
index ac3dc9dd3..b299edde4 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
@@ -217,7 +217,13 @@ export default {
             if (old && old.length) {
                 old.forEach((item) => {
                     const section = this.$store.getters['map/getDeviceByCode'](item);
-                    section.instance.drawBatchSelected(false, '');
+                    if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
+                        section.logicSectionCodeList.forEach( (logicSectionCode) => {
+                            this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(false, '');
+                        });
+                    } else {
+                        section.instance.drawBatchSelected(false, '');
+                    }
                 });
             }
             if (val && val.length) {
@@ -227,8 +233,9 @@ export default {
                         section.logicSectionCodeList.forEach( (logicSectionCode) => {
                             this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(true, 'continueProtectSection');
                         });
+                    } else {
+                        section.instance.drawBatchSelected(true, 'continueProtectSection');
                     }
-                    section.instance.drawBatchSelected(true, 'continueProtectSection');
                 });
             }
 
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index abbf5312c..689a20459 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -349,7 +349,13 @@ export default {
             if (old && old.length) {
                 old.forEach((item) => {
                     const section = this.$store.getters['map/getDeviceByCode'](item);
-                    section.instance.drawBatchSelected(false, '');
+                    if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
+                        section.logicSectionCodeList.forEach( (logicSectionCode) => {
+                            this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(false, '');
+                        });
+                    } else {
+                        section.instance.drawBatchSelected(false, '');
+                    }
                 });
             }
             if (val && val.length) {
@@ -362,8 +368,9 @@ export default {
                         section.logicSectionCodeList.forEach( (logicSectionCode) => {
                             this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(true, 'routePhysicalSection');
                         });
+                    } else {
+                        section.instance.drawBatchSelected(true, 'routePhysicalSection');
                     }
-                    section.instance.drawBatchSelected(true, 'routePhysicalSection');
                 });
             }
         }

From 6ec990a1b27a2d2f4b62aca8cdcc6100feef331d Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 23 Dec 2019 09:15:25 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=AE=81=E6=B3=A2?=
 =?UTF-8?q?=E4=B8=80=E5=8F=B7=E7=BA=BF=E8=BF=90=E8=A1=8C=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/ningbo_01/planConvert.js    | 552 +++++++++---------
 .../designUser/mapmanage/operateMenu.vue      |   1 -
 src/views/designUser/mapmanage/publish.vue    |   1 -
 .../newDesignUser/mapmanage/publish.vue       |   1 -
 .../newMapdraft/mapoperate/stationstand.vue   |   5 +
 .../editTool/menus/createEmptyPlan.vue        |   1 +
 6 files changed, 292 insertions(+), 269 deletions(-)

diff --git a/src/jmapNew/theme/ningbo_01/planConvert.js b/src/jmapNew/theme/ningbo_01/planConvert.js
index dadb1996b..f30a8361b 100644
--- a/src/jmapNew/theme/ningbo_01/planConvert.js
+++ b/src/jmapNew/theme/ningbo_01/planConvert.js
@@ -1,310 +1,330 @@
-import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList } from '@/utils/runPlan';
+import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, convertSheetToList, prefixTime } from '@/utils/runPlan';
 
 export default {
-	/** 边缘高度*/
-	EdgeHeight: 600,
+    /** 边缘高度*/
+    EdgeHeight: 600,
 
-	/** 间隔高度*/
-	CoordMultiple: 1,
+    /** 间隔高度*/
+    CoordMultiple: 1,
 
-	/** 偏移时间*/
-	TranslationTime: 60 * 60 * 2,
+    /** 偏移时间*/
+    TranslationTime: 60 * 60 * 2,
 
-	/** excel解析配置*/
-	ExcelConfig: {
-		beginRow: 1,
-		beginCol: 0,
-		fieldNum: 10,
-		sepField: '车次',
-		columns: {
-			'车站名': { key: 'stationName', formatter: (val) => { return val; } },
-			'到点': { key: 'arriveTime', formatter: (val) => { return val; } },
-			'发点': { key: 'departureTime', formatter: (val) => { return val; } }
-		}
-	},
+    /** excel解析配置*/
+    ExcelConfig: {
+        beginRow: 1,
+        beginCol: 0,
+        fieldNum: 10,
+        sepField: '行车间隔',
+        trainId: 'TrainID',
+        columns: ['折返线', 'TrainID', '行车间隔']
+    },
 
-	/** 解析exal数据转换为Json后台数据*/
-	importData(Sheet, JsonData) {
-		var dataList = convertSheetToList(Sheet, true);
-		var needList = Object.keys(this.ExcelConfig.columns);
+    /** 解析exal数据转换为Json后台数据*/
+    importData(Sheet, JsonData) {
+        var dataList = convertSheetToList(Sheet, true);
 
-		if (dataList && dataList.length) {
-			for (var colIndex = this.ExcelConfig.beginCol; colIndex < dataList.length; colIndex += this.ExcelConfig.fieldNum + 1) {
-				var isContinue = true;
-				var tripObj = { code: '', arrivalList: [] };
+        if (dataList && dataList.length) {
+            if (dataList && dataList.length && dataList[1] && dataList[0]) {
+                const tIndex = dataList.findIndex(it => { return it[0]; }); // 设置不用过滤行数
 
-				for (var rowIndex = this.ExcelConfig.beginRow; isContinue; rowIndex += 1) {
-					isContinue = false;
+                /** 解析二维数组为json对象*/
+                const reg3 = /^(\d+:\d+:\d+|)/; // 06:12:00
+                dataList.forEach((elem, i) => {
+                    var begin = -1;
+                    /** 跳过名称所在的行*/
+                    if (i != tIndex && elem && elem.length > 0) {
+                        let flag = false;
+                        let count = 0;
+                        let param = { begTime: '', endTime: '' };
+                        if (i > tIndex) { elem.reverse(); }
+                        elem.forEach((item, j) => {
+                            /** 过滤空值*/
+                            if (item) {
+                                let title = '';
+                                var value = `${item}`.trim();
+                                if (i > tIndex) { // 上行线
+                                    title = `${dataList[tIndex][dataList[tIndex].length - j - 1]}`.replace(/\s*/g, '');
+                                    if (title == 'undefined') {
+                                        title = `${dataList[tIndex][dataList[tIndex].length - j - 2]}`.replace(/\s*/g, '');
+                                    }
+                                } else { // 下行线
+                                    title = `${dataList[tIndex][j]}`.replace(/\s*/g, '');
+                                    if (title == 'undefined') {
+                                        title = `${dataList[tIndex][j - 1]}`.replace(/\s*/g, '');
+                                    }
+                                }
 
-					var stationObj = {};
-					for (var index = 0; index < this.ExcelConfig.fieldNum; index += 1) {
-						if (dataList[colIndex + index]) {
-							var title = dataList[colIndex + index][0];
-							var value = dataList[colIndex + index][rowIndex];
+                                /** 匹配到开始位置或者结束位置*/
+                                if (title == this.ExcelConfig.trainId) {
+                                    if (begin == -1) {
+                                        flag = true;
+                                        begin = value; 	// 设置初始索引
+                                        JsonData.push({
+                                            code: value,
+                                            arrivalList: []
+                                        });
+                                    } else if (flag) {
+                                        begin = -1; 	// 清空初始索引
+                                        flag = false;
+                                    }
+                                } else if (begin !== -1) {
+                                    /** 匹配到中间位置*/
+                                    var stationName = title.replace(/\s/, '');
+                                    if (this.ExcelConfig.columns.indexOf(stationName) == -1 && reg3.test(value)) {
+                                        let need = false;
+                                        // var flag = false;
+                                        if (count == 1) {
+                                            count = 0;
+                                            param.endTime = value;
+                                        }
+                                        if (count == 0) {
+                                            count = 1;
+                                            param.begTime = param.begTime || value;
+                                        }
 
-							if (title && value) {
-								// 数据列解析
-								isContinue = true;
-								var titleStr = `${title}`.trim();
-								var valueStr = `${value}`.trim();
+                                        if (param.begTime && param.endTime) {
+                                            need = true;
+                                        }
 
-								if (titleStr == this.ExcelConfig.sepField) {
-									if (tripObj.code) {
-										const length = tripObj.arrivalList.length;
-										if (length == 1) {
-											tripObj.arrivalList[0]['flag'] = true;
-										}
-										JsonData.push(tripObj);
-										tripObj = { code: valueStr, arrivalList: [] };
-									} else {
-										tripObj.code = valueStr;
-									}
-								}
+                                        /** 添加json数据*/
+                                        if (need) { // 储存非空 数据
+                                            var stationObj = {
+                                                stationName: stationName
+                                            };
+                                            stationObj['arriveTime'] = prefixTime(param.begTime);
+                                            stationObj['departureTime'] = prefixTime(param.endTime);
+                                            JsonData[JsonData.length - 1].arrivalList.push(stationObj);
+                                            param = { begTime: '', endTime: '' };
+                                            count = 0;
+                                        }
+                                    }
+                                }
+                            }
+                        });
+                    }
+                });
+            }
+        }
+        return JsonData;
+    },
 
-								// 取需要的字段
-								if (needList.findIndex(elem => { return elem == titleStr; }) >= 0) {
-									stationObj[this.ExcelConfig.columns[titleStr].key] = this.ExcelConfig.columns[titleStr].formatter(valueStr);
-								}
-							}
-						}
-					}
+    /** 将后台数据解析成图表*/
+    convertDataToModels(data, stations, kmRangeCoordMap, lineStyle) {
+        var models = [];
 
-					// 添加字段值
-					if (Object.keys(stationObj).length) {
-						tripObj.arrivalList.push(stationObj);
-					}
-				}
+        if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) {
+            /** 按服务遍历数据*/
+            data.serviceNumberDataList.forEach((service) => {
+                /** 按车次遍历数据*/
+                var opt = { name: '', markPointData: [], data: [] };
+                if (service.tripNumberDataList && service.tripNumberDataList.length) {
+                    service.tripNumberDataList.forEach((train, j) => {
+                        var pointdata = {};
+                        var idx = 0;
+                        var num = 0;
+                        var lastPoint = null;
+                        var nextPoint = null;
 
-				// 添加最后那条没有车次的记录
-				if (tripObj.code) {
-					const length = tripObj.arrivalList.length;
-					if (length) {
-						tripObj.arrivalList[length - 1]['flag'] = true;
-					}
-					JsonData.push(tripObj);
-				}
-			}
-		}
+                        /** 如果车次号为空，不显示名称*/
+                        if (train.tripNumber) {
+                            /** 创建标记点名称和坐标*/
+                            pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`;
+                            pointdata.color = '#000' || lineStyle.color;
+                            pointdata.directionCode = train.directionCode;
+                            pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)];
 
-		return JsonData;
-	},
+                            /** 给服务对象添加服务名称和标记点*/
+                            opt.markPointData.push(createMartPoint(pointdata));
+                            /** 创建服务号名称*/
+                            opt.name = `${service.serviceNumber}`;
+                        }
 
-	/** 将后台数据解析成图表*/
-	convertDataToModels(data, stations, kmRangeCoordMap, lineStyle) {
-		var models = [];
-
-		if (data && data.serviceNumberDataList && data.serviceNumberDataList.length) {
-			/** 按服务遍历数据*/
-			data.serviceNumberDataList.forEach((service) => {
-				/** 按车次遍历数据*/
-				var opt = { name: '', markPointData: [], data: [] };
-				if (service.tripNumberDataList && service.tripNumberDataList.length) {
-					service.tripNumberDataList.forEach((train, j) => {
-						var pointdata = {};
-						var idx = 0;
-						var num = 0;
-						var lastPoint = null;
-						var nextPoint = null;
-
-						/** 如果车次号为空，不显示名称*/
-						if (train.tripNumber) {
-							/** 创建标记点名称和坐标*/
-							pointdata.name = `${service.serviceNumber}${train.directionCode}${train.tripNumber}`;
-							pointdata.color = '#000' || lineStyle.color;
-							pointdata.directionCode = train.directionCode;
-							pointdata.coord = [train.stationTimeList[1].secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, train.stationTimeList[1], train.directionCode, false)];
-
-							/** 给服务对象添加服务名称和标记点*/
-							opt.markPointData.push(createMartPoint(pointdata));
-							/** 创建服务号名称*/
-							opt.name = `${service.serviceNumber}`;
-						}
-
-						/** 计算非折返点车次点坐标集合*/
-						train.stationTimeList.forEach((elem, index) => {
-							idx = index;
-							if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
+                        /** 计算非折返点车次点坐标集合*/
+                        train.stationTimeList.forEach((elem, index) => {
+                            idx = index;
+                            if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
 								index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
 								index > 0 && index < train.stationTimeList.length - 1) {
-								const aa = `${train.directionCode}${train.tripNumber}`;
-								opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
-							}
-						});
+                                const aa = `${train.directionCode}${train.tripNumber}`;
+                                opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.directionCode, false), elem.stationCode, aa]);
+                            }
+                        });
 
-						/** 计算折返点车次坐标点集合*/
-						if (!service.backup && train.reentry && service.tripNumberDataList[j + 1] && service.tripNumberDataList[j + 1].stationTimeList) {
-							lastPoint = train.stationTimeList[idx - 1];
-							nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
-							num = this.computedReentryNumber(train.tripNumber);
-							opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode]);
-							opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode]);
-						}
+                        /** 计算折返点车次坐标点集合*/
+                        if (!service.backup && train.reentry && service.tripNumberDataList[j + 1] && service.tripNumberDataList[j + 1].stationTimeList) {
+                            lastPoint = train.stationTimeList[idx - 1];
+                            nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
+                            num = this.computedReentryNumber(train.tripNumber);
+                            opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.directionCode, true, num), lastPoint.stationCode]);
+                            opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.directionCode, true, num), nextPoint.stationCode]);
+                        }
 
-						/** 如果是备用车，按车次添加线*/
-						if (service.backup) {
-							/** 创建一条完成的服务数据*/
-							opt.name += j;
-							var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
-							if (model) {
-								models.push(model);
-								opt = { name: '', markPointData: [], data: [] };
-							}
-						}
-					});
+                        /** 如果是备用车，按车次添加线*/
+                        if (service.backup) {
+                            /** 创建一条完成的服务数据*/
+                            opt.name += j;
+                            var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
+                            if (model) {
+                                models.push(model);
+                                opt = { name: '', markPointData: [], data: [] };
+                            }
+                        }
+                    });
 
-					// 不是备用车，按服务添加线
-					if (!service.backup) {
-						/** 创建一条完成的服务数据*/
-						var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
-						if (model) {
-							models.push(model);
-						}
-					}
-				}
-			});
-			return models;
-		} else {
-			return [];
-		}
-	},
+                    // 不是备用车，按服务添加线
+                    if (!service.backup) {
+                        /** 创建一条完成的服务数据*/
+                        var model = createSeriesModel(opt, Object.assign({ color: hexColor.toCreate() }, lineStyle));
+                        if (model) {
+                            models.push(model);
+                        }
+                    }
+                }
+            });
+            return models;
+        } else {
+            return [];
+        }
+    },
 
-	/** 更新数据并解析成图表*/
-	updateDataToModels(data, stations, kmRangeCoordMap, runPlanData, series, lineStyle) {
-		if (data && data.length) {
-			data.forEach(elem => {
-				/** 判断此条记录的服务号是否存在*/
-				if (!runPlanData[elem.serviceNumber]) {
-					/** 创建一个新服务号标记*/
-					runPlanData[elem.serviceNumber] = {};
+    /** 更新数据并解析成图表*/
+    updateDataToModels(data, stations, kmRangeCoordMap, runPlanData, series, lineStyle) {
+        if (data && data.length) {
+            data.forEach(elem => {
+                /** 判断此条记录的服务号是否存在*/
+                if (!runPlanData[elem.serviceNumber]) {
+                    /** 创建一个新服务号标记*/
+                    runPlanData[elem.serviceNumber] = {};
 
-					/** 不存在此服务号，则需要创建一条新的line*/
-					series.push(createSeriesModel({
-						zlevel: 1,
-						name: `run${elem.serviceNumber}`,
-						data: [],
-						markPointData: []
-					}, Object.assign({ color: hexColor.toCreate() }, lineStyle)));
-				}
+                    /** 不存在此服务号，则需要创建一条新的line*/
+                    series.push(createSeriesModel({
+                        zlevel: 1,
+                        name: `run${elem.serviceNumber}`,
+                        data: [],
+                        markPointData: []
+                    }, Object.assign({ color: hexColor.toCreate() }, lineStyle)));
+                }
 
-				/** 添加数据*/
-				series.forEach(serie => {
-					/** 找到服务号所在图数据的位置*/
-					if (serie.name == `run${elem.serviceNumber}`) {
-						/** 添加车组号记录标记*/
-						if (!runPlanData[elem.serviceNumber][elem.tripNumber]) {
-							runPlanData[elem.serviceNumber][elem.tripNumber] = [];
-						}
+                /** 添加数据*/
+                series.forEach(serie => {
+                    /** 找到服务号所在图数据的位置*/
+                    if (serie.name == `run${elem.serviceNumber}`) {
+                        /** 添加车组号记录标记*/
+                        if (!runPlanData[elem.serviceNumber][elem.tripNumber]) {
+                            runPlanData[elem.serviceNumber][elem.tripNumber] = [];
+                        }
 
-						runPlanData[elem.serviceNumber][elem.tripNumber].push(elem);
-						runPlanData[elem.serviceNumber][elem.tripNumber].sort((a, b) => {
-							return parseInt(a.secondTime) - parseInt(b.secondTime);
-						});
+                        runPlanData[elem.serviceNumber][elem.tripNumber].push(elem);
+                        runPlanData[elem.serviceNumber][elem.tripNumber].sort((a, b) => {
+                            return parseInt(a.secondTime) - parseInt(b.secondTime);
+                        });
 
-						/** 如果此记录车组号的数据为第一条时，则打上标签*/
-						if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
-							serie.markPoint.data.push(createMartPoint({
-								directionCode: elem.directionCode,
-								coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
-								name: `(${elem.groupNumber})${elem.serviceNumber}${elem.directionCode}${elem.tripNumber}`,
-								color: lineStyle.color || '#000'
-							}));
-						}
+                        /** 如果此记录车组号的数据为第一条时，则打上标签*/
+                        if (runPlanData[elem.serviceNumber][elem.tripNumber].length <= 1) {
+                            serie.markPoint.data.push(createMartPoint({
+                                directionCode: elem.directionCode,
+                                coord: [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false)],
+                                name: `(${elem.groupNumber})${elem.serviceNumber}${elem.directionCode}${elem.tripNumber}`,
+                                color: lineStyle.color || '#000'
+                            }));
+                        }
 
-						/** 计算折返点*/
-						var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), elem.directionCode];
-						if (serie.data.length > 0) {
-							var lastPoint = serie.data[serie.data.length - 1];
-							if (lastPoint[2] !== nextPoint[2]) {
-								var num = this.computedReentryNumber(elem.tripNumber);
-								serie.data.push([lastPoint[0], this.getYvalueByDirectionCode(lastPoint[1], lastPoint[2], num), lastPoint[2]]);
-								serie.data.push([nextPoint[0], this.getYvalueByDirectionCode(nextPoint[1], lastPoint[2], num), lastPoint[2]]);
-							}
-						}
+                        /** 计算折返点*/
+                        var nextPoint = [parseInt(elem.secondTime), this.getCoordYByElem(stations, kmRangeCoordMap, elem, false), elem.directionCode];
+                        if (serie.data.length > 0) {
+                            var lastPoint = serie.data[serie.data.length - 1];
+                            if (lastPoint[2] !== nextPoint[2]) {
+                                var num = this.computedReentryNumber(elem.tripNumber);
+                                serie.data.push([lastPoint[0], this.getYvalueByDirectionCode(lastPoint[1], lastPoint[2], num), lastPoint[2]]);
+                                serie.data.push([nextPoint[0], this.getYvalueByDirectionCode(nextPoint[1], lastPoint[2], num), lastPoint[2]]);
+                            }
+                        }
 
-						/** 添加车组号数据到对应的服务图数据中*/
-						serie.data.push(nextPoint);
+                        /** 添加车组号数据到对应的服务图数据中*/
+                        serie.data.push(nextPoint);
 
-						/** 保证原始数据排序*/
-						serie.data.sort((a, b) => {
-							return parseInt(a[0]) - parseInt(b[0]);
-						});
-					}
-				});
-			});
-		}
+                        /** 保证原始数据排序*/
+                        serie.data.sort((a, b) => {
+                            return parseInt(a[0]) - parseInt(b[0]);
+                        });
+                    }
+                });
+            });
+        }
 
-		return series;
-	},
+        return series;
+    },
 
-	/** 初始化Y轴*/
-	initializeYaxis(stations) {
-		return createMarkLineModels(stations, (elem) => {
-			return this.EdgeHeight + elem.kmRange * this.CoordMultiple;
-		});
-	},
+    /** 初始化Y轴*/
+    initializeYaxis(stations) {
+        return createMarkLineModels(stations, (elem) => {
+            return this.EdgeHeight + elem.kmRange * this.CoordMultiple;
+        });
+    },
 
-	/** 将后台数据转换为试图序列模型*/
-	convertStationsToMap(stations) {
-		var map = {};
-		if (stations && stations.length) {
-			stations.forEach((elem) => {
-				map[`${elem.kmRange}`] = this.EdgeHeight + elem.kmRange * this.CoordMultiple;
-			});
-		}
+    /** 将后台数据转换为试图序列模型*/
+    convertStationsToMap(stations) {
+        var map = {};
+        if (stations && stations.length) {
+            stations.forEach((elem) => {
+                map[`${elem.kmRange}`] = this.EdgeHeight + elem.kmRange * this.CoordMultiple;
+            });
+        }
 
-		return map;
-	},
+        return map;
+    },
 
-	/** 计算y轴最小值*/
-	computedYaxisMinValue(stations) {
-		return stations[0].kmRange * this.CoordMultiple;
-	},
+    /** 计算y轴最小值*/
+    computedYaxisMinValue(stations) {
+        return stations[0].kmRange * this.CoordMultiple;
+    },
 
-	/** 计算y轴最大值*/
-	computedYaxisMaxValue(stations) {
-		return stations[stations.length - 1].kmRange * this.CoordMultiple + this.EdgeHeight * 2;
-	},
+    /** 计算y轴最大值*/
+    computedYaxisMaxValue(stations) {
+        return stations[stations.length - 1].kmRange * this.CoordMultiple + this.EdgeHeight * 2;
+    },
 
-	/** 格式化y轴数据*/
-	computedFormatYAxis(stations, params) {
-		var yText = '';
+    /** 格式化y轴数据*/
+    computedFormatYAxis(stations, params) {
+        var yText = '';
 
-		stations.forEach(elem => {
-			if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) {
-				yText = elem.kmRange + 'm';
-			}
-		});
+        stations.forEach(elem => {
+            if (elem.kmRange < parseInt(params.value) / this.CoordMultiple - this.EdgeHeight) {
+                yText = elem.kmRange + 'm';
+            }
+        });
 
-		return yText;
-	},
+        return yText;
+    },
 
-	/** 根据是否和上一个车次是否相交，计算下一个车次的折返的高度*/
-	computedReentryNumber(code) {
-		return parseInt(code || 1) % 2 ? 1 : 2;
-	},
+    /** 根据是否和上一个车次是否相交，计算下一个车次的折返的高度*/
+    computedReentryNumber(code) {
+        return parseInt(code || 1) % 2 ? 1 : 2;
+    },
 
-	/** 根据方向计算y折返偏移量*/
-	getYvalueByDirectionCode(defaultVlue, directionCode, num) {
-		if (directionCode === '1') {
-			defaultVlue -= this.EdgeHeight / 2 * num;
-		} else if (directionCode === '2') {
-			defaultVlue += this.EdgeHeight / 2 * num;
-		}
+    /** 根据方向计算y折返偏移量*/
+    getYvalueByDirectionCode(defaultVlue, directionCode, num) {
+        if (directionCode === '1') {
+            defaultVlue -= this.EdgeHeight / 2 * num;
+        } else if (directionCode === '2') {
+            defaultVlue += this.EdgeHeight / 2 * num;
+        }
 
-		return defaultVlue;
-	},
+        return defaultVlue;
+    },
 
-	/** 根据elem计算y值*/
-	getCoordYByElem(stations, kmRangeCoordMap, elem, directionCode, isSpecial, num) {
-		var defaultVlue = 0;
-		var station = stations.find(it => { return it.code == elem.stationCode; });
-		if (station) {
-			defaultVlue = kmRangeCoordMap[`${station.kmRange}`];
-			if (isSpecial) {
-				defaultVlue = this.getYvalueByDirectionCode(defaultVlue, directionCode, num);
-			}
-		}
+    /** 根据elem计算y值*/
+    getCoordYByElem(stations, kmRangeCoordMap, elem, directionCode, isSpecial, num) {
+        var defaultVlue = 0;
+        var station = stations.find(it => { return it.code == elem.stationCode; });
+        if (station) {
+            defaultVlue = kmRangeCoordMap[`${station.kmRange}`];
+            if (isSpecial) {
+                defaultVlue = this.getYvalueByDirectionCode(defaultVlue, directionCode, num);
+            }
+        }
 
-		return defaultVlue;
-	}
+        return defaultVlue;
+    }
 };
diff --git a/src/views/designUser/mapmanage/operateMenu.vue b/src/views/designUser/mapmanage/operateMenu.vue
index 3837d2503..29f0559b8 100644
--- a/src/views/designUser/mapmanage/operateMenu.vue
+++ b/src/views/designUser/mapmanage/operateMenu.vue
@@ -92,7 +92,6 @@ export default {
     },
     watch: {
         '$store.state.menuOperation.menuCount': function (val) {
-            console.log(val);
             if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Map)) {
                 this.menu = [...this.menuMap];
                 if (this.hasRelease) {
diff --git a/src/views/designUser/mapmanage/publish.vue b/src/views/designUser/mapmanage/publish.vue
index 995b9e9b7..c5f5cf887 100644
--- a/src/views/designUser/mapmanage/publish.vue
+++ b/src/views/designUser/mapmanage/publish.vue
@@ -85,7 +85,6 @@ export default {
         async verifyMapName() { // 校验地图名称是否唯一
             try {
                 const res = await checkMapName(this.editModel.name);
-                console.log(res);
                 if (res.data) {
                     this.confirmPublish();
                 } else {
diff --git a/src/views/newMap/newDesignUser/mapmanage/publish.vue b/src/views/newMap/newDesignUser/mapmanage/publish.vue
index 995b9e9b7..c5f5cf887 100644
--- a/src/views/newMap/newDesignUser/mapmanage/publish.vue
+++ b/src/views/newMap/newDesignUser/mapmanage/publish.vue
@@ -85,7 +85,6 @@ export default {
         async verifyMapName() { // 校验地图名称是否唯一
             try {
                 const res = await checkMapName(this.editModel.name);
-                console.log(res);
                 if (res.data) {
                     this.confirmPublish();
                 } else {
diff --git a/src/views/newMap/newMapdraft/mapoperate/stationstand.vue b/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
index 924efb97c..c073d1fe3 100644
--- a/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/stationstand.vue
@@ -387,6 +387,11 @@ export default {
                             models.push(deepAssign(item, { _dispose: true }));
                         }
                     });
+                    this.psdList.forEach(item => {
+                        if (item.standCode == selected.code) {
+                            models.push(deepAssign(item, { _dispose: true }));
+                        }
+                    });
                     _that.$emit('updateMapModel', models);
                     _that.deviceSelect();
                     this.$refs.dataform.resetFields();
diff --git a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
index 1774a51fa..6cd8a1c89 100644
--- a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
+++ b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
@@ -219,6 +219,7 @@ export default {
                                     for (const index in wb.Sheets) {
                                         jsonData = that.planConvert.importData(wb.Sheets[index], jsonData);
                                     }
+                                    // console.log(jsonData, '解析后数据');
 
                                     if (!jsonData[0].downTrack && !jsonData[0].upTrack) {
                                         that.loadingDig.close();

From d9bf1af2d9ef2d8ca3f5ca523a514c1f4ccd8b15 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 23 Dec 2019 09:23:29 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=BB=98?=
 =?UTF-8?q?=E5=9B=BE=E9=AB=98=E7=BA=A7=E7=BB=98=E5=9B=BE=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataRelation/routeoperate/protect.vue     | 38 +++++++++----------
 .../dataRelation/routeoperate/route.vue       | 36 +++++++-----------
 2 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
index b299edde4..0c47e3bcb 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
@@ -214,29 +214,12 @@ export default {
             }
         },
         'addOverlapModel.routeOverlapSectionList': function (val, old) {
+            console.log(val, old, '==========');
             if (old && old.length) {
-                old.forEach((item) => {
-                    const section = this.$store.getters['map/getDeviceByCode'](item);
-                    if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
-                        section.logicSectionCodeList.forEach( (logicSectionCode) => {
-                            this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(false, '');
-                        });
-                    } else {
-                        section.instance.drawBatchSelected(false, '');
-                    }
-                });
+                this.changeSectionSelected(old, false, 'continueProtectSection' );
             }
             if (val && val.length) {
-                val.forEach((item) => {
-                    const section = this.$store.getters['map/getDeviceByCode'](item);
-                    if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
-                        section.logicSectionCodeList.forEach( (logicSectionCode) => {
-                            this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(true, 'continueProtectSection');
-                        });
-                    } else {
-                        section.instance.drawBatchSelected(true, 'continueProtectSection');
-                    }
-                });
+                this.changeSectionSelected(val, true, 'continueProtectSection' );
             }
 
         }
@@ -392,6 +375,21 @@ export default {
             };
             this.overlapCode = '';
             this.overlapType = '';
+        },
+        changeSectionSelected(list, flag, type) {
+            list.forEach((item) => {
+                const section = this.$store.getters['map/getDeviceByCode'](item);
+                if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
+                    section.logicSectionCodeList.forEach( (logicSectionCode) => {
+                        this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(flag, flag ? type : '');
+                    });
+                } else {
+                    section.instance.drawBatchSelected(flag, flag ? type : '');
+                }
+            });
+        },
+        routeSectionListFocus(flag) {
+            this.changeSectionSelected(this.addModel.routeSectionList, flag, 'continueProtectSection');
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index 689a20459..18a251edb 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -347,31 +347,13 @@ export default {
         },
         'addModel.routeSectionList': function(val, old) {
             if (old && old.length) {
-                old.forEach((item) => {
-                    const section = this.$store.getters['map/getDeviceByCode'](item);
-                    if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
-                        section.logicSectionCodeList.forEach( (logicSectionCode) => {
-                            this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(false, '');
-                        });
-                    } else {
-                        section.instance.drawBatchSelected(false, '');
-                    }
-                });
+                this.changeSectionSelected(old, false, 'routePhysicalSection');
             }
             if (val && val.length) {
                 if (!this.addModel.code) {
                     this.$refs.protect.addModel.unlockSectionCode = val[val.length - 1];
                 }
-                val.forEach((item) => {
-                    const section = this.$store.getters['map/getDeviceByCode'](item);
-                    if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
-                        section.logicSectionCodeList.forEach( (logicSectionCode) => {
-                            this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(true, 'routePhysicalSection');
-                        });
-                    } else {
-                        section.instance.drawBatchSelected(true, 'routePhysicalSection');
-                    }
-                });
+                this.changeSectionSelected(val, true, 'routePhysicalSection');
             }
         }
     },
@@ -496,9 +478,19 @@ export default {
             });
         },
         routeSectionListFocus(flag) {
-            this.addModel.routeSectionList.forEach((item) => {
+            this.changeSectionSelected(this.addModel.routeSectionList, flag, '');
+            this.$refs['protect'].routeSectionListFocus(flag);
+        },
+        changeSectionSelected(list, flag, type) {
+            list.forEach((item) => {
                 const section = this.$store.getters['map/getDeviceByCode'](item);
-                section.instance.drawBatchSelected(flag);
+                if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
+                    section.logicSectionCodeList.forEach( (logicSectionCode) => {
+                        this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(flag, flag ? type : '');
+                    });
+                } else {
+                    section.instance.drawBatchSelected(flag, flag ? type : 'routePhysicalSection');
+                }
             });
         },
         setSelected(selected) {

From 35dceb2950a374129e766e01c13213ad89ec9f7d Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 23 Dec 2019 09:31:04 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=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

---
 .../newMap/newMapdraft/dataRelation/routeoperate/protect.vue    | 2 +-
 .../newMap/newMapdraft/dataRelation/routeoperate/route.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
index 0c47e3bcb..f8931d6df 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
@@ -377,7 +377,7 @@ export default {
             this.overlapType = '';
         },
         changeSectionSelected(list, flag, type) {
-            list.forEach((item) => {
+            list && list.forEach((item) => {
                 const section = this.$store.getters['map/getDeviceByCode'](item);
                 if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
                     section.logicSectionCodeList.forEach( (logicSectionCode) => {
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index 18a251edb..7ab10ed80 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -482,7 +482,7 @@ export default {
             this.$refs['protect'].routeSectionListFocus(flag);
         },
         changeSectionSelected(list, flag, type) {
-            list.forEach((item) => {
+            list && list.forEach((item) => {
                 const section = this.$store.getters['map/getDeviceByCode'](item);
                 if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
                     section.logicSectionCodeList.forEach( (logicSectionCode) => {

From 4677be1b3247e234fd6fb52f17a15aab778f5040 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 23 Dec 2019 09:44:03 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=80=89=E4=B8=ADtype=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/newMapdraft/dataRelation/routeoperate/protect.vue  | 3 +--
 .../newMap/newMapdraft/dataRelation/routeoperate/route.vue    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
index f8931d6df..a43ee3a7b 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/protect.vue
@@ -214,7 +214,6 @@ export default {
             }
         },
         'addOverlapModel.routeOverlapSectionList': function (val, old) {
-            console.log(val, old, '==========');
             if (old && old.length) {
                 this.changeSectionSelected(old, false, 'continueProtectSection' );
             }
@@ -389,7 +388,7 @@ export default {
             });
         },
         routeSectionListFocus(flag) {
-            this.changeSectionSelected(this.addModel.routeSectionList, flag, 'continueProtectSection');
+            this.changeSectionSelected(this.addOverlapModel.routeOverlapSectionList, flag, 'continueProtectSection');
         }
     }
 };
diff --git a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
index 7ab10ed80..aa1417e62 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routeoperate/route.vue
@@ -478,7 +478,7 @@ export default {
             });
         },
         routeSectionListFocus(flag) {
-            this.changeSectionSelected(this.addModel.routeSectionList, flag, '');
+            this.changeSectionSelected(this.addModel.routeSectionList, flag, 'routePhysicalSection');
             this.$refs['protect'].routeSectionListFocus(flag);
         },
         changeSectionSelected(list, flag, type) {
@@ -489,7 +489,7 @@ export default {
                         this.$store.getters['map/getDeviceByCode'](logicSectionCode).instance.drawBatchSelected(flag, flag ? type : '');
                     });
                 } else {
-                    section.instance.drawBatchSelected(flag, flag ? type : 'routePhysicalSection');
+                    section.instance.drawBatchSelected(flag, flag ? type : '');
                 }
             });
         },

From 065a3ba72ea89d52a1a7a78fcd0a9e263ebdf8db Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 23 Dec 2019 10:15:45 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=B7=A6=E5=8F=B3=E5=85=B3=E8=81=94=E5=8C=BA=E6=AE=B5?=
 =?UTF-8?q?list=E6=95=B0=E6=8D=AE=E4=B8=BA=E8=AE=A1=E8=BD=B4=E5=8C=BA?=
 =?UTF-8?q?=E6=AE=B5=E5=92=8C=E9=81=93=E5=B2=94=E5=8C=BA=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/newMapdraft/mapoperate/section.vue | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/section.vue b/src/views/newMap/newMapdraft/mapoperate/section.vue
index 750899510..fb7c3ecf3 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section.vue
@@ -41,7 +41,7 @@
             </el-form-item>
             <el-form-item v-if="createModel.type == '03'" :label="$t('map.leftAssociatedSection')" prop="leftSectionCode">
               <el-select v-model="createModel.leftSectionCode" filterable>
-                <el-option v-for="item in PhysicalSectionList" :key="item.code" :label="item.name" :value="item.code" />
+                <el-option v-for="item in switchAndPhySicalSectionList" :key="item.code" :label="item.name" :value="item.code" />
               </el-select>
               <el-button
                 :type="field == 'getSectionStart' ? 'danger' : 'primary'"
@@ -54,7 +54,7 @@
             </el-form-item>
             <el-form-item v-if="createModel.type == '02' || createModel.type == '04'" label="起始区段:" prop="leftSectionCode">
               <el-select v-model="createModel.leftSectionCode" filterable>
-                <el-option v-for="item in PhysicalSectionList" :key="item.code" :label="item.name" :value="item.code" />
+                <el-option v-for="item in switchAndPhySicalSectionList" :key="item.code" :label="item.name" :value="item.code" />
               </el-select>
               <el-button
                 :type="field == 'getSectionStart' ? 'danger' : 'primary'"
@@ -65,7 +65,7 @@
             <el-form-item v-if="createModel.type == '02'" :label="$t('map.rightAssociatedSection')" prop="rightSectionCode">
               <el-select v-model="createModel.rightSectionCode" filterable>
                 <el-option
-                  v-for="item in PhysicalSectionList"
+                  v-for="item in switchAndPhySicalSectionList"
                   :key="item.code"
                   :label="item.name"
                   :value="item.code"
@@ -381,8 +381,8 @@ export default {
                                 { prop: 'namePosition.y', firstLevel: 'namePosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '25px' }
                             ] },
                             { prop: 'type', label: this.$t('map.sectionType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionTypeList},
-                            { prop: 'leftSectionCode', label: this.$t('map.leftAssociatedSection'), type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.PhysicalSectionList, hover: this.hover, buttonType: 'leftSection', buttonShowType: this.isLeftSectionButtonShow, isHidden: !this.hasAssociatedSection},
-                            { prop: 'rightSectionCode', label: this.$t('map.rightAssociatedSection'), type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.PhysicalSectionList, hover: this.hover, buttonType: 'rightSection', buttonShowType: this.isRightSectionButtonShow, isHidden: !this.hasAssociatedSection},
+                            { prop: 'leftSectionCode', label: this.$t('map.leftAssociatedSection'), type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.switchAndPhySicalSectionList, hover: this.hover, buttonType: 'leftSection', buttonShowType: this.isLeftSectionButtonShow, isHidden: !this.hasAssociatedSection},
+                            { prop: 'rightSectionCode', label: this.$t('map.rightAssociatedSection'), type: 'selectHover', optionLabel: 'name&&code', optionValue: 'code', clearable: true, options: this.switchAndPhySicalSectionList, hover: this.hover, buttonType: 'rightSection', buttonShowType: this.isRightSectionButtonShow, isHidden: !this.hasAssociatedSection},
                             { prop: 'parentCode', label: this.$t('map.associatedSection'), type: 'select', mode: true, optionLabel: 'name&&code', optionValue: 'code', disabled: true, options: this.sectionList, isHidden: !this.isParentCode },
                             { prop: 'sepTypeLeft', label: this.$t('map.sepTypeLeft'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionSepTypeList, isHidden: !this.isSwitchSectionType },
                             { prop: 'sepTypeRight', label: this.$t('map.sepTypeRight'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.SectionSepTypeList, isHidden: !this.isSwitchSectionType },
@@ -521,6 +521,13 @@ export default {
             }
             return list;
         },
+        switchAndPhySicalSectionList() {
+            let list = [];
+            if (this.sectionList && this.sectionList.length) {
+                list = this.sectionList.filter(elem => { return elem.type === '01' || elem.type === '03'; });
+            }
+            return list;
+        },
         switchSectionList() {
             let list = [];
             if (this.sectionList && this.sectionList.length) {
@@ -1080,7 +1087,7 @@ export default {
                         const models = [];
                         let rsection = null;
                         let lsection = null;
-                        this.PhysicalSectionList.forEach(section => {
+                        this.switchAndPhySicalSectionList.forEach(section => {
                             if (section.code === this.mergeModel.lsectioncode) {
                                 lsection = section;
                             }
@@ -1187,13 +1194,6 @@ export default {
                                 this.$emit('updateMapModel', models);
                             }
                         }
-
-                        this.PhysicalSectionList.forEach(lsection => {
-                            if (lsection.code === this.mergeModel.lsectioncode) {
-                                this.PhysicalSectionList.forEach(rsection => {
-                                });
-                            }
-                        });
                     }
                 }
             });

From 6e7ad61b4a39d6b8fbaafdeb8c4769a6e7d24fdc Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 23 Dec 2019 10:36:32 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=EF=BC=8C=E6=97=A7=E7=89=88=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=9C=A8=E5=85=AC=E5=85=B1=E5=9C=B0=E5=9B=BE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                        |   9 +-
 src/views/designPlatform/demonList.vue     |   9 +-
 src/views/designPlatform/mapPreviewNew.vue | 108 +++++++++++++++++++++
 src/views/jlmap/index.vue                  |   5 +-
 src/views/newMap/jlmapNew/index.vue        |   5 +-
 5 files changed, 129 insertions(+), 7 deletions(-)
 create mode 100644 src/views/designPlatform/mapPreviewNew.vue

diff --git a/src/router/index.js b/src/router/index.js
index be70e1e1b..35e000956 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -72,6 +72,7 @@ const PlanMonitorDetail = () => import('@/views/planMonitor/detail');
 const DesignPlatformHome = () => import('@/views/designPlatform/home');
 const DesignPlatform = () => import('@/views/designPlatform/index');
 const MapPreview = () => import('@/views/designPlatform/mapPreview');
+const MapPreviewNew = () => import('@/views/designPlatform/mapPreviewNew');
 
 const DesignPlatformUser = () => import('@/views/designUser/index');
 
@@ -171,7 +172,8 @@ export const UrlConfig = {
         runPlan: '/design/runPlan/detail',
         scriptHome: '/design/script/home',
         display: '/design/display',
-        mapPreview: '/design/mapPreview'
+        mapPreview: '/design/mapPreview',
+        mapPreviewNew: '/design/mapPreviewNew'
     },
     designUser: {
         prefix: '/design/userlist/home',
@@ -397,6 +399,11 @@ export const asyncRouter = [
                         component: MapPreview,
                         hidden: true
 
+                    },
+                    { // 新版地图预览
+                        path: 'mapPreviewNew/:mapId',
+                        component: MapPreviewNew,
+                        hidden: true
                     }
                 ]
             }
diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue
index 8d580b86a..01a48c750 100644
--- a/src/views/designPlatform/demonList.vue
+++ b/src/views/designPlatform/demonList.vue
@@ -108,7 +108,11 @@ export default {
                 break;
             }
             case 'mapPreview': {
-                this.$router.push({ path: `${UrlConfig.design.mapPreview}/${obj.mapId}` });
+                if (obj.drawWay) {
+                    this.$router.push({ path: `${UrlConfig.design.mapPreviewNew}/${obj.mapId}` });
+                } else {
+                    this.$router.push({ path: `${UrlConfig.design.mapPreview}/${obj.mapId}` });
+                }
                 break;
             }
             }
@@ -131,7 +135,8 @@ export default {
                             name: this.$t('designPlatform.mapPreview'),
                             type: 'mapPreview',
                             mapId: elem.id,
-                            cityCode: elem.cityCode
+                            cityCode: elem.cityCode,
+                            drawWay: elem.drawWay
                         }
                     ];
                     this.isAdministrator() ? elem.children.push({id: '2', name: this.$t('designPlatform.lessonDesign'), type: 'lessonDesign', mapId: elem.id, cityCode: elem.cityCode}) : '';
diff --git a/src/views/designPlatform/mapPreviewNew.vue b/src/views/designPlatform/mapPreviewNew.vue
new file mode 100644
index 000000000..e6179b773
--- /dev/null
+++ b/src/views/designPlatform/mapPreviewNew.vue
@@ -0,0 +1,108 @@
+<template>
+  <div class="map-view">
+    <jlmap-visual ref="jlmapVisual" />
+  </div>
+</template>
+<script>
+import JlmapVisual from '@/views/newMap/jlmapNew/index';
+import { loadMapDataById } from '@/utils/loaddata';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'MapPreview',
+    components: {
+        JlmapVisual
+    },
+    props: {
+        widthLeft: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            size: {
+                width: document.documentElement.clientWidth - 400,
+                height: document.documentElement.clientHeight - 80
+            }
+        };
+    },
+    computed: {
+        mapId() {
+            return this.$route.params.mapId;
+        },
+        height() {
+            return this.$store.state.app.height - 50 - 30;
+        }
+    },
+    watch: {
+        widthLeft(val) {
+            this.setWindowSize();
+        },
+        $route() {
+            this.$nextTick(() => {
+                this.initLoadData();
+            });
+        },
+        '$store.state.app.windowSizeCount': function() {
+            this.setWindowSize();
+        },
+        '$store.state.map.mapViewLoadedCount':function() {
+            this.$store.dispatch('map/setTrainWindowShow', false);
+        }
+    },
+    async beforeDestroy() {
+        await this.$store.dispatch('map/mapClear');
+    },
+    async mounted() {
+        await this.setWindowSize();
+        await this.initLoadData();
+    },
+    methods: {
+        async initLoadData() { // 加载地图数据
+            if (parseInt(this.mapId)) {
+                await this.loadMapDataById(this.mapId);
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 通过id加载地图数据
+        async loadMapDataById(mapId) {
+            try {
+                await this.$store.dispatch('training/changeMode', { mode: null });
+                loadMapDataById(mapId).then(()=>{
+                    this.$store.dispatch('training/over');
+                    this.$store.dispatch('training/setMapDefaultState');
+                    this.$store.dispatch('map/clearJlmapTrainView');
+                });
+            } catch (error) {
+                this.$messageBox(`获取地图数据失败: ${error.message}`);
+                this.endViewLoading();
+            }
+        },
+        // 结束加载状态
+        endViewLoading(isSuccess) {
+            if (!isSuccess) {
+                this.$store.dispatch('map/mapClear');
+            }
+
+            this.$nextTick(() => {
+                EventBus.$emit('viewLoading', false);
+            });
+        },
+        setWindowSize() {
+            this.$nextTick(() => {
+                const width = this.$store.state.app.width - (this.widthLeft || 450);
+                const height = this.height;
+                this.$store.dispatch('config/resize', { width, height });
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+    .map-view {
+        float: left;
+        width: auto;
+    }
+</style>
diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue
index 1d2cd3295..a8054c892 100644
--- a/src/views/jlmap/index.vue
+++ b/src/views/jlmap/index.vue
@@ -79,9 +79,10 @@ export default {
             try {
                 if (val) {
                     this.setMap(val);
-                } else {
-                    this.mapViewLoaded(false);
                 }
+                // else {
+                //     this.mapViewLoaded(false);
+                // }
             } catch (error) {
                 console.log('[ERROR] ', error);
                 this.mapViewLoaded(false);
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index 5344121fc..e52568172 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -91,9 +91,10 @@ export default {
             try {
                 if (val) {
                     this.setMap(val);
-                } else {
-                    this.mapViewLoaded(false);
                 }
+                // } else {
+                //     this.mapViewLoaded(false);
+                // }
             } catch (error) {
                 console.log('[ERROR] ', error);
                 this.mapViewLoaded(false);