From 9f223956050d1ed6a86351fefe907410c537b61e Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 17 Aug 2020 14:46:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E5=8F=B3?=
 =?UTF-8?q?=E9=94=AE=E6=93=8D=E4=BD=9C=E7=BB=84=E4=BB=B6=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8F=91=E5=B8=83=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/ningbo_01/menus/dialog/setFault.vue | 129 ------------
 .../ningbo_01/menus/dialog/standDetail.vue    |  19 +-
 .../ningbo_01/menus/dialog/stationControl.vue |   4 +-
 .../menus/dialog/trainDeletePlan.vue          | 169 ----------------
 .../ningbo_01/menus/dialog/trainEdit.vue      | 181 -----------------
 .../ningbo_01/menus/dialog/trainFlag.vue      | 160 ---------------
 .../menus/dialog/trainMoveEvently.vue         | 189 ------------------
 .../theme/ningbo_01/menus/menuTrain.vue       |   3 -
 .../newDesignUser/mapmanage/publish.vue       |   8 +-
 9 files changed, 10 insertions(+), 852 deletions(-)
 delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue
 delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/trainDeletePlan.vue
 delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/trainEdit.vue
 delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/trainFlag.vue
 delete mode 100644 src/jmapNew/theme/ningbo_01/menus/dialog/trainMoveEvently.vue

diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue
deleted file mode 100644
index 93b1e6f44..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/setFault.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag class="ningbo-01__systerm switch-control" :title="title" :visible.sync="show" width="300px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
-    <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="deviceName" size="small" disabled />
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-select v-model="faultType" style="height: 32px;" placeholder="请选择">
-          <el-option
-            v-for="item in faultList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </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" pop-class="ningbo-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import { commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
-import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
-
-export default {
-    name: 'SwitchControl',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operation: '',
-            stationName: '',
-            switchName: '',
-            activeShow: false,
-            deviceName: '',
-            faultType: '',
-            faultList: []
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
-        },
-        title() {
-            return '设置故障';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            if (!this.dialogShow) {
-                this.switchName = '';
-                this.stationName = '';
-                this.operation = operate.operation;
-                this.deviceName = deviceType[selected._type] + '-' + selected.name;
-                this.faultList = deviceFaultType[selected._type];
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-
-        },
-        sendCommand(operate) { // 发送指令
-            this.loading = true;
-            commitOperate(operate, {}, 2).then(({valid})=>{
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow({}, error.message);
-            });
-        },
-
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue
index 89bed56d2..79d43388a 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standDetail.vue
@@ -17,12 +17,10 @@
       :default-expand-all="true"
       style="background: #f0f0f0;"
     >
-      <div slot-scope="{ node, data }" style="height: 24px; width: 100%;">
+      <div slot-scope="{ data }" style="height: 24px; width: 100%;">
         <div v-if="data.level == 1" style="line-height: 26px;">{{ data.name }}</div>
         <div v-if="data.level == 2" style="background: lightgray; overflow: hidden; height: 100%;">
-          <div
-            style="width: 46%;float: left; height: 24px; line-height: 24px; padding-left: 5px; border-right: 1px solid #f0f0f0;"
-          >
+          <div style="width: 46%;float: left; height: 24px; line-height: 24px; padding-left: 5px; border-right: 1px solid #f0f0f0;">
             {{ data.name }}</div>
           <div style="width: 54%;float: left; height: 24px; line-height: 24px; padding-left: 5px;">
             {{ data.value }}</div>
@@ -108,11 +106,6 @@ export default {
                 },
                 {
                     children: [
-                        // {
-                        //     name: '上行站台',
-                        //     value: '',
-                        //     level: 2
-                        // },
                         {
                             name: '站台',
                             value: '',
@@ -179,19 +172,15 @@ export default {
             // 车站扣车
             this.treeData[1].children[1].value = selected.stationHoldTrain ? '已设置' : '未设置';
             // 停站时间
-            this.treeData[0].children[2].value = selected.parkingTime == 0 ? '自动' : `${selected.parkingTime} 秒`;
+            this.treeData[0].children[2].value = selected.parkingTime >= 0 ? `${selected.parkingTime} 秒` : '自动';
             //  跳停
             this.treeData[0].children[3].value = selected.allSkip || selected.assignSkip ? '已设置' : '未设置';
-            // if (selected.direction == '01') {
-            //  待添加
-            // }
+
             if (!stationStand || !station) {
                 this.treeData[2].children[0].value = `自动`;
             } else {
                 this.treeData[2].children[0].value = selected.runLevelTime > 0 ? `至${station.name}${stationStand.name}:人工` : `至${station.name}${stationStand.name}:自动`;
             }
-            //  待添加
-            // this.tempData.push({ item: '下行折返策略', status: this.strategyMap[selected.reentryStrategy] ? this.strategyMap[selected.reentryStrategy] : '默认' });
         },
         doShow(operate, selected) {
             this.selected = selected;
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
index 6cbd3cbc2..f79a2eb45 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
@@ -15,8 +15,8 @@
             <template slot-scope="scope">
               <span v-if="scope.row.controlMode == 'Center'">遥控</span>
               <span v-else-if="scope.row.controlMode == 'Local'">站控</span>
-              <span v-else-if="scope.row.controlMode == 'Local' && $route.query.prdType == '02'">中心请求站控</span>
-              <span v-else-if="scope.row.controlMode == 'Center' && $route.query.prdType == '01'">现地请求遥控</span>
+              <!-- <span v-else-if="scope.row.controlMode == 'Local' && $route.query.prdType == '02'">中心请求站控</span>
+              <span v-else-if="scope.row.controlMode == 'Center' && $route.query.prdType == '01'">现地请求遥控</span> -->
               <span v-else>获取状态中...</span>
             </template>
           </el-table-column>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDeletePlan.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDeletePlan.vue
deleted file mode 100644
index 22ffb19e1..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDeletePlan.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-<template>
-
-  <!-- <el-dialog class="fuzhou_01 stand-stop-time" :title="title" :visible.sync="show" width="640px" :before-close="doClose" :zIndex="2000" -->
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__systerm train-set-plan"
-    :title="title"
-    :visible.sync="show"
-    width="380px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
-      <div style="overflow: hidden;">
-        <div style="width: 98%; float: left; padding: 10px 15px;  margin: 20px 0px; height: 120px;">
-          <!-- <span class="base-label">目的</span> -->
-          <div style="position: relative; top:-10px;">
-            <el-form-item prop="stationStandGoal">
-              <span slot="label">终&emsp; 端:</span>
-              <el-select v-model="addModel.stationStandGoal" filterable placeholder="请选择">
-                <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="车 次 号:" prop="trainGoal" style="width:280px">
-              <el-input v-model="addModel.trainGoal" />
-            </el-form-item>
-          </div>
-        </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: 'TrainMove',
-    components: {
-    },
-    data() {
-        return {
-            trainNoList: [],
-            addModel: {
-                // trainNo: '',
-                trainSource: '',
-                // stationStandSource: '',
-                trainGoal: '',
-                stationStandGoal: ''
-            },
-
-            rules: {
-                // trainNo: [
-                //     { required: true, message: '请输入车组号', trigger: 'blur' }
-                // ],
-                trainSource: [
-                    { required: true, message: '请输入车次号', trigger: 'blur' }
-                ],
-                // stationStandSource: [
-                //     { required: true, message: '请选择车站', trigger: 'change' }
-                // ],
-                trainGoal: [
-                    { required: true, message: '请输入车次号', trigger: 'blur' }
-                ],
-                stationStandGoal: [
-                    { required: true, message: '请选择车站', trigger: 'change' }
-                ]
-            },
-            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.Train.moveTrainId.menu.domId : '';
-        },
-        title() {
-            return '删除计划车';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            // 如果不是断点激活，则需要对初始值进行初始化
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-                        type: MapDeviceType.Train.type,
-                        // operation: OperationEvent.Train.moveTrainId.menu.operation,
-                        operation: OperationEvent.Train.deletePlanTrainId.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();
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Train.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>
-    .fuzhou_01 .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainEdit.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainEdit.vue
deleted file mode 100644
index cb2aa2985..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainEdit.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__systerm train-edit"
-    :title="title"
-    :visible.sync="show"
-    width="360px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row>
-      <el-col :span="12">新车组号</el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-input :id="domIdInput" v-model="addModel.groupNumber" @change="inputGroupNumber" />
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">车站</el-col>
-      <el-col :span="11" :offset="1">车次窗</el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-input v-model="addModel.stationName" :disabled="true" />
-      </el-col>
-      <el-col :span="11" :offset="1">
-        <el-input v-model="addModel.trainWindowCode" :disabled="true" />
-      </el-col>
-    </el-row>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="5">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
-
-export default {
-    name: 'TrainEdit',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            trainNoList: [],
-            selected: null,
-            addModel: {
-                stationName: '',
-                trainWindowCode: '',
-                groupNumber: ''
-            },
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdInput() {
-            return this.dialogShow ? OperationEvent.Train.editTrainId.input.domId : '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.editTrainId.menu.domId : '';
-        },
-        title() {
-            return '修改计划车';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            if (!this.dialogShow) {
-                const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
-                if (section) {
-                    const station = this.$store.getters['map/getDeviceByCode'](section.stationCode);
-                    if (station) {
-                        this.addModel.stationName = station.name;
-                    }
-                }
-                this.addModel.trainWindowCode = selected.code;
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            mouseCancelState(this.selected);
-        },
-        inputGroupNumber() {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Train.editTrainId.input.operation,
-                val: this.addModel.groupNumber
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Train.editTrainId.menu.operation,
-                val: this.addModel.groupNumber
-            };
-
-            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();
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    /deep/ .el-row {
-        margin: 10px
-    }
-
-    .ningbo-01__systerm .el-dialog .base-label {
-        // background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainFlag.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainFlag.vue
deleted file mode 100644
index 39b3b619a..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainFlag.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__systerm train-flag"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row>
-      <el-col :span="12">车组号:</el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-input v-model="addModel.groupNumber" />
-      </el-col>
-    </el-row>
-    <el-row style="margin-top: 15px; margin-bottom: 30px">
-      <el-col :span="24">
-        <el-radio-group v-model="addModel.type" :disabled="true">
-          <el-radio label="01">备选项</el-radio>
-          <el-radio label="02">备选项</el-radio>
-        </el-radio-group>
-      </el-col>
-    </el-row>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="5">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
-
-export default {
-    name: 'TrainFlag',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            trainNoList: [],
-            selected: null,
-            addModel: {
-                type: '01',
-                groupNumber: ''
-            },
-            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.Train.editTrainId.menu.domId : '';
-        },
-        title() {
-            return 'ATP切除功能';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            if (!this.dialogShow) {
-                const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
-                if (section) {
-                    const station = this.$store.getters['map/getDeviceByCode'](section.stationCode);
-                    if (station) {
-                        this.addModel.stationName = station.name;
-                    }
-                }
-                this.addModel.trainWindowCode = selected.code;
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            mouseCancelState(this.selected);
-        },
-        commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Train.editTrainId.menu.operation,
-                val: this.addModel.tripNumber
-            };
-
-            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();
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Train.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    /deep/ .el-row {
-        margin: 10px
-    }
-
-    .ningbo-01__systerm .el-dialog .base-label {
-        // background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainMoveEvently.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainMoveEvently.vue
deleted file mode 100644
index ed0996eb8..000000000
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainMoveEvently.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<template>
-
-  <!-- <el-dialog class="fuzhou_01 stand-stop-time" :title="title" :visible.sync="show" width="640px" :before-close="doClose" :zIndex="2000" -->
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__systerm train-set-plan"
-    :title="title"
-    :visible.sync="show"
-    width="640px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
-      <!-- <div style="width: 46%;">
-                <el-form-item label="车 组 号:" label-width="95px" prop="trainNo">
-                    <el-input v-model="addModel.trainNo" disabled></el-input>
-                </el-form-item>
-            </div> -->
-      <div style="overflow: hidden;">
-        <div style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px; margin-right: 4%;">
-          <span class="base-label">源</span>
-          <div style="position: relative; top:-10px;">
-            <!-- <el-form-item prop="stationStandSource">
-                            <span slot="label">车&emsp; 站:</span>
-                            <el-select v-model="addModel.stationStandSource" 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="trainSource">
-              <el-input v-model="addModel.trainSource" />
-            </el-form-item>
-          </div>
-        </div>
-        <div style="width: 48%; float: left; 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="stationStandGoal">
-              <span slot="label">终&emsp; 端:</span>
-              <el-select v-model="addModel.stationStandGoal" filterable placeholder="请选择">
-                <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="车 次 号:" prop="trainGoal">
-              <el-input v-model="addModel.trainGoal" />
-            </el-form-item>
-          </div>
-        </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: 'TrainMove',
-    components: {
-    },
-    data() {
-        return {
-            trainNoList: [],
-            addModel: {
-                // trainNo: '',
-                trainSource: '',
-                // stationStandSource: '',
-                trainGoal: '',
-                stationStandGoal: ''
-            },
-
-            rules: {
-                // trainNo: [
-                //     { required: true, message: '请输入车组号', trigger: 'blur' }
-                // ],
-                trainSource: [
-                    { required: true, message: '请输入车次号', trigger: 'blur' }
-                ],
-                // stationStandSource: [
-                //     { required: true, message: '请选择车站', trigger: 'change' }
-                // ],
-                trainGoal: [
-                    { required: true, message: '请输入车次号', trigger: 'blur' }
-                ],
-                stationStandGoal: [
-                    { required: true, message: '请选择车站', trigger: 'change' }
-                ]
-            },
-            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.Train.moveTrainId.menu.domId : '';
-        },
-        title() {
-            return '平移计划车';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            // 如果不是断点激活，则需要对初始值进行初始化
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-                        type: MapDeviceType.Train.type,
-                        // operation: OperationEvent.Train.moveTrainId.menu.operation,
-                        operation: OperationEvent.Train.moveEventlyTrainId.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();
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Train.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>
-    .fuzhou_01 .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
index 240ede036..40451b18d 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -5,10 +5,7 @@
     <train-delete ref="trainDelete" />
     <train-define ref="trainDefine" />
     <train-move ref="trainMove" />
-    <!-- <train-edit ref="trainEdit" /> -->
     <train-set-plan ref="trainSetPlan" />
-    <!-- <train-move-evently ref="trainMoveEvently" /> -->
-    <!-- <train-delete-plan ref="trainDeletePlan" /> -->
     <train-set-head ref="trainSetHead" />
     <train-set-work ref="trainSetWork" />
     <trainSetWorkATP ref="trainSetWorkATP" />
diff --git a/src/views/newMap/newDesignUser/mapmanage/publish.vue b/src/views/newMap/newDesignUser/mapmanage/publish.vue
index 4c1432b64..487903c83 100644
--- a/src/views/newMap/newDesignUser/mapmanage/publish.vue
+++ b/src/views/newMap/newDesignUser/mapmanage/publish.vue
@@ -78,7 +78,6 @@ export default {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.loading = true;
-                    delete this.editModel.children;
                     this.verifyMapName();
                 }
             });
@@ -93,12 +92,13 @@ export default {
                 }
             } catch (error) {
                 console.log(error);
+                this.loading = false;
             }
         },
         confirmPublish() {
-            this.$confirm(this.$t('map.verifyMapName'), this.$t('tip.hint'), {
-                confirmButtonText: this.$t('tip.confirm'),
-                cancelButtonText: this.$t('tip.cancel'),
+            this.$confirm('地图名称重复，您确认发布此地图将会覆盖公共地图？', '提示', {
+                confirmButtonText: '确 定',
+                cancelButtonText: '取 消',
                 type: 'warning'
             }).then(() => {
                 this.publishMap();