From 6951bf9f3ae5f8b1056cb8b9ae04ca0c33cbf3f2 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 9 Aug 2019 17:26:33 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=9B=BD=E9=99=85=E5=8C=96=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/index.js                    |  4 +-
 src/i18n/langs/en/scriptRecord.js             | 17 ++++
 src/i18n/langs/zh/index.js                    |  4 +-
 src/i18n/langs/zh/scriptRecord.js             | 17 ++++
 src/views/display/scriptRecord/addAction.vue  |  2 +-
 src/views/display/scriptRecord/getAction.vue  | 52 ++++++-----
 .../display/scriptRecord/getBehavior.vue      | 90 ++++++++++---------
 .../scriptRecord/roleConditionScript.vue      |  7 +-
 .../display/scriptRecord/roleSection.vue      | 23 +++--
 src/views/display/scriptRecord/taskScript.vue |  2 +
 src/views/display/tipScriptRecord.vue         | 10 +--
 11 files changed, 137 insertions(+), 91 deletions(-)
 create mode 100644 src/i18n/langs/en/scriptRecord.js
 create mode 100644 src/i18n/langs/zh/scriptRecord.js

diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js
index c6cb99f28..f6b0ed64b 100644
--- a/src/i18n/langs/en/index.js
+++ b/src/i18n/langs/en/index.js
@@ -5,6 +5,7 @@ import router from './router';
 import lesson from './lesson';
 import error from './error';
 import rules from './rules';
+import scriptRecord from './scriptRecord';
 
 export default {
 	...enLocale,
@@ -13,5 +14,6 @@ export default {
 	router,
 	lesson,
 	error,
-	rules
+	rules,
+	scriptRecord
 };
diff --git a/src/i18n/langs/en/scriptRecord.js b/src/i18n/langs/en/scriptRecord.js
new file mode 100644
index 000000000..88dc72795
--- /dev/null
+++ b/src/i18n/langs/en/scriptRecord.js
@@ -0,0 +1,17 @@
+export default {
+    scriptTitle: "Task Recording",
+    saveMaplocation: "Update Location",
+    saveBackground: "Save Background",
+    saveData: "Save Data",
+    roleManage: "Role Manage",
+    targetCondition: "Task Target",
+    taskScript: "Task Script",
+    roleName: "Role Name",
+    roleType: "Role Type",
+    deviceCode: "Device Code",
+    roleList: "Role List",
+    operation:"Operation",
+    roleAdd: "Add",
+    delete: "Delete",
+    behaviorOperate: "Behavior Operate",
+};
\ No newline at end of file
diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js
index 8e88ffa56..1bc599e67 100644
--- a/src/i18n/langs/zh/index.js
+++ b/src/i18n/langs/zh/index.js
@@ -5,6 +5,7 @@ import router from './router';
 import lesson from './lesson';
 import error from './error';
 import rules from './rules';
+import scriptRecord from './scriptRecord';
 
 export default {
 	...cnLocale,
@@ -13,5 +14,6 @@ export default {
 	router,
 	lesson,
 	error,
-	rules
+	rules,
+	scriptRecord
 };
diff --git a/src/i18n/langs/zh/scriptRecord.js b/src/i18n/langs/zh/scriptRecord.js
new file mode 100644
index 000000000..4a9cfbca2
--- /dev/null
+++ b/src/i18n/langs/zh/scriptRecord.js
@@ -0,0 +1,17 @@
+export default {
+    scriptTitle: "任务录制",
+    saveMaplocation: "更新定位",
+    saveBackground: "保存背景",
+    saveData: "保存数据",
+    roleManage:"角色管理",
+    targetCondition:"任务目标",
+    taskScript:"任务剧本",
+    roleName: "角色名称",
+    roleType: "角色类型",
+    deviceCode: "设备编码",
+    roleList: "角色列表",
+    operation: "操作",
+    roleAdd: "添加",
+    delete: "删除",
+    behaviorOperate: "行为操作",
+};
\ No newline at end of file
diff --git a/src/views/display/scriptRecord/addAction.vue b/src/views/display/scriptRecord/addAction.vue
index 84b8d4261..de961d051 100644
--- a/src/views/display/scriptRecord/addAction.vue
+++ b/src/views/display/scriptRecord/addAction.vue
@@ -265,7 +265,7 @@
         font-size: 15px;
     }
     .actionInfo{
-        margin-top: 30px;
+        margin-top:20px;
         margin-left: 5px;
         font-size: 15px;
         width:98%;
diff --git a/src/views/display/scriptRecord/getAction.vue b/src/views/display/scriptRecord/getAction.vue
index 320b1b0ed..f68f4200c 100644
--- a/src/views/display/scriptRecord/getAction.vue
+++ b/src/views/display/scriptRecord/getAction.vue
@@ -1,30 +1,32 @@
 <template>
-        <div class="tab-pane-big">
-        <el-scrollbar wrapClass="scrollbar-wrapper" ref="elActionScrollbar">
+        <div>
             <div class="actionList">
                 <i class="el-icon-back" @click="backToMember"></i>
                 <span class="titleStyle">{{memberName}}角色<span class="titleStyle">/</span><span class="titleStyle">{{behaviorName}}行为</span><span class="titleStyle">/</span><span class="titleStyle">动作信息</span></span>
             </div>
-            <add-action ref="addBehavior" :group="group" :memberId="memberId" :behaviorId="behaviorId" @create="create" :buttonName="buttonName" :operateType="operateType" @modifyButtonName="modifyButtonName"></add-action>
-            <el-table
-                v-loading="loading"
-                :data="actionList" border class="actionListTable">
-                <el-table-column prop="reply" label="回复消息" width="200">
-                </el-table-column>
-                <el-table-column prop="time" label="完成时间" width="200">
-                </el-table-column>
-                <el-table-column prop="type" label="动作类型" width="200">
-                </el-table-column>
-                <el-table-column label="操作" width="200">
-                    <template slot-scope="scope">
-                        <el-row>
-                            <el-button type="primary" size="mini" @click="modifyAction(scope.row)">修改</el-button>
-                            <el-button type="primary" size="mini" @click="deleteAction(scope.row)">删除</el-button>
-                        </el-row>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-scrollbar>
+            <div class="tab-pane-big">
+            <el-scrollbar wrapClass="scrollbar-wrapper" ref="elActionScrollbar">
+                <add-action ref="addBehavior" :group="group" :memberId="memberId" :behaviorId="behaviorId" @create="create" :buttonName="buttonName" :operateType="operateType" @modifyButtonName="modifyButtonName"></add-action>
+                <el-table
+                    v-loading="loading"
+                    :data="actionList" border class="actionListTable">
+                    <el-table-column prop="reply" label="回复消息" width="200">
+                    </el-table-column>
+                    <el-table-column prop="time" label="完成时间" width="200">
+                    </el-table-column>
+                    <el-table-column prop="type" label="动作类型" width="200">
+                    </el-table-column>
+                    <el-table-column label="操作" width="200">
+                        <template slot-scope="scope">
+                            <el-row>
+                                <el-button type="primary" size="mini" @click="modifyAction(scope.row)">修改</el-button>
+                                <el-button type="primary" size="mini" @click="deleteAction(scope.row)">删除</el-button>
+                            </el-row>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-scrollbar>
+            </div>
         </div>
 </template>
 <script>
@@ -120,11 +122,15 @@
         width:802px;
     }
     .actionList{
-        margin-top: 20px;
+        margin-top: 10px;
         margin-left: 5px;
         font-size: 15px;
+        margin-bottom:10px;
     }
     .titleStyle{
         margin-left:10px;
     }
+    .tab-pane-big{
+        height:380px;
+    }
 </style>
diff --git a/src/views/display/scriptRecord/getBehavior.vue b/src/views/display/scriptRecord/getBehavior.vue
index b639ad7ef..22370a101 100644
--- a/src/views/display/scriptRecord/getBehavior.vue
+++ b/src/views/display/scriptRecord/getBehavior.vue
@@ -1,46 +1,48 @@
 <template>
-    <div class="tab-pane-big">
-        <el-scrollbar wrapClass="scrollbar-wrapper" ref="elScrollbar">
-            <div class="behaviorList">
-                <i class="el-icon-back" @click="backToMember" style="cursor:pointer;"></i>
-                <span class="titleStyle">{{memberName}}角色<span class="titleStyle">/</span><span class="titleStyle">行为信息</span></span>
-            </div>
-            <add-behavior ref="addBehavior" :title="title" :group="group" :memberId="memberId" @create="handleCreate" :operateType="operateType" :buttonName="buttonName" @modifyButtonName="modifyButtonName"></add-behavior>
-            <div class="behaviorList">行为列表</div>
-            <el-table
-                v-loading="loading"
-                :data="behaviorList" border class="behaviorListTable">
-                <el-table-column label="是否主动触发" width="150">
-                    <template slot-scope="scope">
-                        <div>{{scope.row.auto?"是":"否"}}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="目标角色" width="200">
-                    <template slot-scope="scope">
-                        <div>{{scope.row.targetMemberId}}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="描述" width="200">
-                    <template slot-scope="scope">
-                        <div>{{scope.row.description}}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="触发条件" width="150">
-                    <template slot-scope="scope">
-                        <div>{{scope.row.conditionVO.triggerType==null?"无":scope.row.conditionVO.triggerType}}</div>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" width="200">
-                    <template slot-scope="scope">
-                        <el-row>
-                            <el-button type="primary" size="mini" @click="modifyActions(scope.row)">修改</el-button>
-                            <el-button type="primary" size="mini" @click="deleteBehavior(scope.row)">删除</el-button>
-                        </el-row>
-                        <el-row style="margin-top:10px"><el-button type="primary" size="mini" @click="getActions(scope.row)">动作操作</el-button></el-row>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-scrollbar>
+    <div>
+        <div class="behaviorList">
+            <i class="el-icon-back" @click="backToMember" style="cursor:pointer;"></i>
+            <span class="titleStyle">{{memberName}}角色<span class="titleStyle">/</span><span class="titleStyle">行为信息</span></span>
+        </div>
+        <div class="tab-pane-big">
+            <el-scrollbar wrapClass="scrollbar-wrapper" ref="elScrollbar">
+                <add-behavior ref="addBehavior" :title="title" :group="group" :memberId="memberId" @create="handleCreate" :operateType="operateType" :buttonName="buttonName" @modifyButtonName="modifyButtonName"></add-behavior>
+                <div class="behaviorList">行为列表</div>
+                <el-table
+                    v-loading="loading"
+                    :data="behaviorList" border class="behaviorListTable">
+                    <el-table-column label="是否主动触发" width="150">
+                        <template slot-scope="scope">
+                            <div>{{scope.row.auto?"是":"否"}}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="目标角色" width="200">
+                        <template slot-scope="scope">
+                            <div>{{scope.row.targetMemberId}}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="描述" width="200">
+                        <template slot-scope="scope">
+                            <div>{{scope.row.description}}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="触发条件" width="150">
+                        <template slot-scope="scope">
+                            <div>{{scope.row.conditionVO.triggerType==null?"无":scope.row.conditionVO.triggerType}}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="200">
+                        <template slot-scope="scope">
+                            <el-row>
+                                <el-button type="primary" size="mini" @click="modifyActions(scope.row)">修改</el-button>
+                                <el-button type="primary" size="mini" @click="deleteBehavior(scope.row)">删除</el-button>
+                            </el-row>
+                            <el-row style="margin-top:10px"><el-button type="primary" size="mini" @click="getActions(scope.row)">动作操作</el-button></el-row>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-scrollbar>
+        </div>
     </div>
 </template>
 <script>
@@ -131,7 +133,7 @@
         width:901px;
     }
     .behaviorList{
-        margin-top: 20px;
+        margin-top: 10px;
         margin-left: 5px;
         font-size: 15px;
         margin-bottom:20px;
@@ -140,6 +142,6 @@
         margin-left:10px;
     }
     .tab-pane-big{
-        height:420px;
+        height:370px;
     }
 </style>
\ No newline at end of file
diff --git a/src/views/display/scriptRecord/roleConditionScript.vue b/src/views/display/scriptRecord/roleConditionScript.vue
index 31ff54d48..6c4dcb876 100644
--- a/src/views/display/scriptRecord/roleConditionScript.vue
+++ b/src/views/display/scriptRecord/roleConditionScript.vue
@@ -1,20 +1,20 @@
 <template>
     <el-tabs v-model="activeName" type="card">
-        <el-tab-pane label="角色管理" name="first">
+        <el-tab-pane :label="$t('scriptRecord.roleManage')" name="first">
             <div class="tab-pane">
                 <el-scrollbar wrapClass="scrollbar-wrapper">
                     <role-section ref="roleSection" :group="group" @getBehaviorList="getBehaviorList"></role-section>
                 </el-scrollbar>
             </div>
         </el-tab-pane>
-        <el-tab-pane label="任务目标" name="second">
+        <el-tab-pane :label="$t('scriptRecord.targetCondition')" name="second">
             <div class="tab-pane">
                 <el-scrollbar wrapClass="scrollbar-wrapper">
                     <target-condition ref="targetCondition" :group="group"></target-condition>
                 </el-scrollbar>
             </div>
         </el-tab-pane>
-        <el-tab-pane label="任务剧本" name="third">
+        <el-tab-pane :label="$t('scriptRecord.taskScript')" name="third">
             <div class="tab-pane">
                 <el-scrollbar wrapClass="scrollbar-wrapper">
                     <task-script ref="taskScript" :group="group"></task-script>
@@ -60,7 +60,6 @@
                     this.$store.dispatch('scriptRecord/updateDeviceCondition', deviceConditionList);
                     this.$store.dispatch('scriptRecord/updateMemberList', response.data.memberVOList);
                     this.$store.dispatch('scriptRecord/updateScript', response.data.script);
-                    debugger;
                     if(response.data.mapLocation)
                     {
                         let mapLocation={"offsetX":response.data.mapLocation.x,"offsetY":response.data.mapLocation.y,"scaleRate":response.data.mapLocation.scale};
diff --git a/src/views/display/scriptRecord/roleSection.vue b/src/views/display/scriptRecord/roleSection.vue
index c74d24ddd..a455e5ba3 100644
--- a/src/views/display/scriptRecord/roleSection.vue
+++ b/src/views/display/scriptRecord/roleSection.vue
@@ -1,35 +1,34 @@
 <template>
     <div>
-            <el-form :model="memberVO" ref="memberVO" :rules="rules" label-width="80px" class="roleAction" label-position="left">
-                <el-form-item label="角色名称" class="conditionVO" prop="name">
+            <el-form :model="memberVO" ref="memberVO" :rules="rules" label-width="100px" class="roleAction" label-position="right">
+                <el-form-item :label="$t('scriptRecord.roleName')" class="conditionVO" prop="name">
                     <el-input v-model="memberVO.name" class="inputStyle"></el-input>
                 </el-form-item>
-                <el-form-item label="角色类型" class="conditionVO" prop="role">
+                <el-form-item :label="$t('scriptRecord.roleType')" class="conditionVO" prop="role">
                     <el-select v-model="memberVO.role" placeholder="请选择角色类型" @change="changeRoleType">
                         <el-option v-for="rolerType in roleTypeList" :key="rolerType.label" :label="rolerType.label" :value="rolerType.value"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="设备编码" class="conditionVO">
+                <el-form-item :label="$t('scriptRecord.deviceCode')" class="conditionVO">
                     <el-select v-model="memberVO.deviceCode" clearable placeholder="请选择设备编码">
-                        <!-- groupNumber -->
                         <el-option v-for="deviceCode in deviceCodeList" :key="deviceCode.code" :label="deviceCode.name" :value="deviceCode.code"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="addQuestMember('memberVO')">添加</el-button>
+                    <el-button type="primary" @click="addQuestMember('memberVO')">{{$t('scriptRecord.roleAdd')}}</el-button>
                 </el-form-item>
             </el-form>
-        <div class="roleList">角色列表</div>
+        <div class="roleList">{{$t('scriptRecord.roleList')}}</div>
         <el-table
             v-loading="loading"
             :data="memberList" border class="memberList">
-            <el-table-column prop="name" label="角色名称" width="350">
+            <el-table-column prop="name" :label="$t('scriptRecord.roleName')" width="350">
             </el-table-column>
-            <el-table-column label="操作"  width="350">
+            <el-table-column :label="$t('scriptRecord.operation')"  width="350">
                 <template slot-scope="scope">
                     <el-row>
-                        <el-button type="primary" size="mini" @click="getMembers(scope.row)">行为操作</el-button>
-                        <el-button type="primary" size="mini" @click="deleteMember(scope.$index,scope.row)">删除</el-button>
+                        <el-button type="primary" size="mini" @click="getMembers(scope.row)">{{$t('scriptRecord.behaviorOperate')}}</el-button>
+                        <el-button type="primary" size="mini" @click="deleteMember(scope.$index,scope.row)">{{$t('scriptRecord.delete')}}</el-button>
                     </el-row>
                 </template>
             </el-table-column>
@@ -88,7 +87,6 @@
                         let group=this.group;
                         postQuestMember(group,data).then(resp => {
                             this.reloadTable();
-                            // this.dialogFormVisible=false;
                             this.memberVO.role="Admin";
                             this.memberVO.deviceCode="";
                             this.memberVO.name="";
@@ -119,6 +117,7 @@
                 let group=this.group;
                 getQuestRecord(group).then(response=>{
                     this.memberList=response.data.memberVOList;
+                    this.$store.dispatch('scriptRecord/updateScript', response.data.script);
                     this.$store.dispatch('scriptRecord/updateMemberList', response.data.memberVOList);
                 });
             },
diff --git a/src/views/display/scriptRecord/taskScript.vue b/src/views/display/scriptRecord/taskScript.vue
index 3382c5cf0..825394afa 100644
--- a/src/views/display/scriptRecord/taskScript.vue
+++ b/src/views/display/scriptRecord/taskScript.vue
@@ -66,6 +66,8 @@
         },
         watch: {
             '$store.state.scriptRecord.memberList': function (val, old){
+                this.taskScript.memberId="";
+                this.taskScript.behavior="";
                 this.taskScriptList=val;
             },
             '$store.state.scriptRecord.script': function (val, old){
diff --git a/src/views/display/tipScriptRecord.vue b/src/views/display/tipScriptRecord.vue
index d44c2cb24..e3e987118 100644
--- a/src/views/display/tipScriptRecord.vue
+++ b/src/views/display/tipScriptRecord.vue
@@ -20,9 +20,9 @@
                             <get-action ref="getAction" :group="group" :memberId="memberId" :behaviorId="behaviorId" @backToBehavior="backToBehavior"></get-action>
                         </template>
                         <el-button-group class="button-group">
-                            <el-button type="primary" @click="saveMaplocation">更新定位</el-button>
-                            <el-button type="primary" @click="saveScenesStage">保存背景</el-button>
-                            <el-button type="success" @click="saveScenesData">保存数据</el-button>
+                            <el-button type="primary" @click="saveMaplocation">{{$t('scriptRecord.saveMaplocation')}}</el-button>
+                            <el-button type="primary" @click="saveScenesStage">{{$t('scriptRecord.saveBackground')}}</el-button>
+                            <el-button type="success" @click="saveScenesData">{{$t('scriptRecord.saveData')}}</el-button>
                             <!-- <el-button type="danger" @click="dumpScenesData">重置剧本</el-button> -->
                         </el-button-group>
                 </div>
@@ -35,7 +35,7 @@
     import GetBehavior from './scriptRecord/getBehavior';
     import GetAction from './scriptRecord/getAction';
     import RoleConditionScript from './scriptRecord/roleConditionScript';
-    
+
     import { launchFullscreen, exitFullscreen } from '@/utils/screen';
     import {saveScriptScenes, saveScriptData, dumpScriptData} from '@/api/simulation';
     import {updateMapLocation} from '@/api/quest';
@@ -55,7 +55,7 @@
         },
         data() {
             return {
-                title: '任务录制',
+                title: this.$t('scriptRecord.scriptTitle'),
                 isShrink: false,
                 memberId:null,
                 behaviorId:null,

From ddd282f5ca209ad8e9a2969c8220cf9296cdff53 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 9 Aug 2019 18:24:13 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index db2e58341..99c4decfd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,7 +27,7 @@ Vue.use(VueI18n);
 Vue.config.productionTip = false;
 
 export const i18n = new VueI18n({
-	locale: LangStorage.getLang('en'),
+	locale: LangStorage.getLang('zh'),
 	messages
 });
 

From 763cff0a7c1582fe9983dc1f8ceb2ab65a7495a3 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Fri, 9 Aug 2019 18:29:08 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   |   2 +-
 src/store/modules/runplan.js                  |  12 +-
 src/utils/baseUrl.js                          |   4 +-
 src/views/planMonitor/editTool/index.vue      |   2 +-
 src/views/planMonitor/editTool/menuBar.vue    |   3 +-
 .../editTool/menus/addPlanningTrain.vue       | 153 ++--
 .../planMonitor/editTool/menus/addTask.vue    | 575 ++++++-------
 .../editTool/menus/createEmptyPlan.vue        | 151 ++--
 .../planMonitor/editTool/menus/deleteTask.vue | 161 ++--
 .../editTool/menus/duplicateTrain.vue         | 159 ++--
 .../editTool/menus/editPlanningTrain.vue      | 413 +++++-----
 .../editTool/menus/modifyingTask.vue          | 766 +++++++++---------
 .../planMonitor/editTool/menus/offLine.vue    | 118 +--
 .../editTool/menus/openRunPlan.vue            | 188 +++--
 src/views/planMonitor/editTool/schedule.vue   |   3 +
 15 files changed, 1418 insertions(+), 1292 deletions(-)

diff --git a/src/main.js b/src/main.js
index db2e58341..99c4decfd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,7 +27,7 @@ Vue.use(VueI18n);
 Vue.config.productionTip = false;
 
 export const i18n = new VueI18n({
-	locale: LangStorage.getLang('en'),
+	locale: LangStorage.getLang('zh'),
 	messages
 });
 
diff --git a/src/store/modules/runplan.js b/src/store/modules/runplan.js
index 3226ad2d4..d0af9b925 100644
--- a/src/store/modules/runplan.js
+++ b/src/store/modules/runplan.js
@@ -9,9 +9,10 @@ const runPlan = {
 		planSizeCount: 0,		// 运行图canvas 大小变更标识
 		planLoadedCount: 0,		// 运行图数据更新
 		planUpdateCount: 0,		// 运行图更新标识
-		selected: {},				// 选择的对象
+		selected: {},			// 选择的对象
 		width: 800, 			// 运行图canvas 容器 宽度
-		height: 600 			// 运行图canvas 容器 高度
+		height: 600, 			// 运行图canvas 容器 高度
+		refreshCount: 0			// 刷新页面重新加载
 	},
 	getters: {
 		stations: (state) => {
@@ -95,6 +96,9 @@ const runPlan = {
 			state.planData = {};
 			state.editData = {};
 			state.selected = {};
+		},
+		refresh: (state) => {
+			state.refreshCount++;
 		}
 	},
 	actions: {
@@ -130,6 +134,10 @@ const runPlan = {
 		/** 清空数据*/
 		clear: ({ commit }) => {
 			commit('clear');
+		},
+		/** 刷新页面*/
+		refresh: ({commit}) => {
+			commit('refresh');
 		}
 	}
 };
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 2e575c51e..72be3b2f1 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,8 +3,8 @@ 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 = 'http://192.168.3.5:9000'; // 袁琪
+		// 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.4:9000' // 琰培
 	} else {
diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue
index 7b281bb37..65c820652 100644
--- a/src/views/planMonitor/editTool/index.vue
+++ b/src/views/planMonitor/editTool/index.vue
@@ -145,7 +145,7 @@ export default {
 				deletePlanService(model).then(resp => {
 					this.$message.success('删除计划成功');
 					this.$store.dispatch('runPlan/setSelected', {});
-					this.$refs.openRunPlan.loadRunPlanData(this.$route.query);
+					this.$refs.openRunPlan.loadRunPlanData(Object.assign({refresh: true}, this.$route.query));
 				}).catch(() => {
 					this.$messageBox('删除计划失败');
 				});
diff --git a/src/views/planMonitor/editTool/menuBar.vue b/src/views/planMonitor/editTool/menuBar.vue
index 39a1ccf23..34a506497 100644
--- a/src/views/planMonitor/editTool/menuBar.vue
+++ b/src/views/planMonitor/editTool/menuBar.vue
@@ -518,7 +518,8 @@ export default {
 						width: 260,
 						message: `真的要删除列车 ${serviceNumber} 吗？`,
 						operate: 'DeletePlanningTrain',
-						serviceNumber: serviceNumber
+						serviceNumber: serviceNumber,
+						refresh: true
 					}
 				});
 			} else {
diff --git a/src/views/planMonitor/editTool/menus/addPlanningTrain.vue b/src/views/planMonitor/editTool/menus/addPlanningTrain.vue
index 27efe2da9..a1127a972 100644
--- a/src/views/planMonitor/editTool/menus/addPlanningTrain.vue
+++ b/src/views/planMonitor/editTool/menus/addPlanningTrain.vue
@@ -1,80 +1,89 @@
 <template>
-    <el-dialog class="planEdit__tool add-planning-train" :title="title" :visible.sync="dialogShow" width="260px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-col :span="6" :offset="3" style="height: 30px; line-height: 30px;">服务号：</el-col>
-            <el-col :span="10" :offset="1">
-                <el-input v-model="serviceNumber" size="mini"></el-input>
-            </el-col>
-        </el-row>
-        <el-row type="flex" justify="center" style="margin-top: 20px">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool add-planning-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="260px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="6" :offset="3" style="height: 30px; line-height: 30px;">服务号：</el-col>
+      <el-col :span="10" :offset="1">
+        <el-input v-model="serviceNumber" size="mini" />
+      </el-col>
+    </el-row>
+    <el-row type="flex" justify="center" style="margin-top: 20px">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { checkServiceNumberExist } from '@/api/runplan';
+import { checkServiceNumberExist } from '@/api/runplan';
 
-    export default {
-        name: 'AddPlanningTrain',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                serviceNumber: '',
-            }
-        },
-        computed: {
-            title() {
-                return '添加计划车'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow() {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                if (this.$route.query.planId) {
-                    if (this.serviceNumber.length == 2) {
-                        checkServiceNumberExist({ planId: this.$route.query.planId, serviceNumber: this.serviceNumber }).then(resp => {
-                            if (resp.data) {
-                                this.$emit('dispatchDialog', {
-                                    name: 'offLine',
-                                    params: {
-                                        type: 'warning',
-                                        operate: 'AddPlanningTrain',
-                                        width: 460,
-                                        message: '本表号已存在，是否强制设置？（强制设置程序可能会出现异常）',
-                                    }
-                                })
+export default {
+	name: 'AddPlanningTrain',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			serviceNumber: ''
+		};
+	},
+	computed: {
+		title() {
+			return '添加计划车';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow() {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			if (this.$route.query.planId) {
+				if (this.serviceNumber.length == 2) {
+					checkServiceNumberExist({ planId: this.$route.query.planId, serviceNumber: this.serviceNumber }).then(resp => {
+						if (resp.data) {
+							this.$emit('dispatchDialog', {
+								name: 'offLine',
+								params: {
+									type: 'warning',
+									operate: 'AddPlanningTrain',
+									width: 460,
+									message: '本表号已存在，是否强制设置？（强制设置程序可能会出现异常）'
+								}
+							});
 
-                                this.doClose();
-                            } else {
-                                this.handleConfirm();
-                            }
-                        })
-                    } else {
-                        this.$messageBox('长度应该为两位数');
-                    }
-                } else {
-                    this.$messageBox('请选打开运行图');
-                }
-            },
-            handleConfirm() {
-                this.doClose();
-                this.$store.dispatch('runPlan/addserviceNumber', this.serviceNumber);
-                this.$emit('dispatchDialog', { name: 'editPlanningTrain', params: { serviceNumber: this.serviceNumber } })
-            }
-        }
-    }
+							this.doClose();
+						} else {
+							this.handleConfirm();
+						}
+					});
+				} else {
+					this.$messageBox('长度应该为两位数');
+				}
+			} else {
+				this.$messageBox('请选打开运行图');
+			}
+		},
+		handleConfirm() {
+			this.doClose();
+			this.$store.dispatch('runPlan/addserviceNumber', this.serviceNumber);
+			this.$emit('dispatchDialog', { name: 'editPlanningTrain', params: { serviceNumber: this.serviceNumber } });
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -89,4 +98,4 @@
             margin-right: 20px !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/planMonitor/editTool/menus/addTask.vue b/src/views/planMonitor/editTool/menus/addTask.vue
index 7f0487536..088c65bf4 100644
--- a/src/views/planMonitor/editTool/menus/addTask.vue
+++ b/src/views/planMonitor/editTool/menus/addTask.vue
@@ -1,294 +1,311 @@
 <template>
-    <el-dialog class="planEdit__tool add-task" :title="title" :visible.sync="dialogShow" width="780px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="margin: 10px">
-            <el-row>
-                <el-col :span="3">
-                    <el-radio v-model="addModel.addToFront" :label="true">加在最前</el-radio>
-                </el-col>
-                <el-col :span="4" style="margin-left: 10px">
-                    <span>车次号：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="addModel.tripNumber" placeholder="请选择">
-                        <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4" style="margin-left: 20px">
-                    <span>开始时间：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-time-picker v-model="addModel.startTime" value-format="HH:mm:ss" :clearable="false">
-                    </el-time-picker>
-                </el-col>
-            </el-row>
-            <el-row style="margin-top: 5px">
-                <el-col :span="3">
-                    <el-radio v-model="addModel.addToFront" :label="false">加在最后</el-radio>
-                </el-col>
-                <el-col :span="4" style="margin-left: 10px">
-                    <span>缺省停站时间：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="addModel.defaultStopTime" placeholder="请选择">
-                        <el-option v-for="item in defaultStopTimeList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4" style="margin-left: 20px">
-                    <span>缺省运行等级：</span>
-                </el-col>
-                <el-col :span="5">
-                    <el-select v-model="addModel.defaultSpeedLevel" placeholder="请选择">
-                        <el-option v-for="item in defaultSpeedLevelList" :key="item.value" :label="item.label"
-                            :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-col>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool add-task"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="780px"
+    :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="addModel.addToFront" :label="true">加在最前</el-radio>
+        </el-col>
+        <el-col :span="4" style="margin-left: 10px">
+          <span>车次号：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="addModel.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="4" style="margin-left: 20px">
+          <span>开始时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-time-picker v-model="addModel.startTime" value-format="HH:mm:ss" :clearable="false" />
+        </el-col>
+      </el-row>
+      <el-row style="margin-top: 5px">
+        <el-col :span="3">
+          <el-radio v-model="addModel.addToFront" :label="false">加在最后</el-radio>
+        </el-col>
+        <el-col :span="4" style="margin-left: 10px">
+          <span>缺省停站时间：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="addModel.defaultStopTime" placeholder="请选择">
+            <el-option
+              v-for="item in defaultStopTimeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
+        <el-col :span="4" style="margin-left: 20px">
+          <span>缺省运行等级：</span>
+        </el-col>
+        <el-col :span="5">
+          <el-select v-model="addModel.defaultSpeedLevel" placeholder="请选择">
+            <el-option
+              v-for="item in defaultSpeedLevelList"
+              :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="addModel.routingList" border highlight-current-row @row-click="handleClick"
-                    :height="180">
-                    <el-table-column prop="startStationCode" label="起始站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.startStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="startSectionCode" label="起始区段">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.startSectionCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="endStationCode" label="终到站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.endStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="endSectionCode" label="终到区段">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.endSectionCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="remarks" label="描述">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-                详情：
-            </el-row>
-            <el-row>
-                <el-table :data="addModel.arriveConfigList" border :height="180">
-                    <el-table-column prop="stationCode" label="车站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.stationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="sectionCode" label="区段">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.sectionCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="arriveTime" label="到点">
-                    </el-table-column>
-                    <el-table-column prop="stopTime" label="停站时间">
-                    </el-table-column>
-                    <el-table-column prop="departureTime" label="发点">
-                    </el-table-column>
-                    <el-table-column prop="speedLevel" label="运行等级">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row>
-                <el-col :offset="16">
-                    <el-checkbox v-model="showDefault">显示默认停站时间和运行等级</el-checkbox>
-                </el-col>
-            </el-row>
-        </div>
-        <el-row addToFront="flex" justify="center" class="button-group">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+      </el-row>
+      <el-row style="margin-bottom: 5px;">
+        交路：
+      </el-row>
+      <el-row>
+        <el-table
+          :data="addModel.routingList"
+          border
+          highlight-current-row
+          :height="180"
+          @row-click="handleClick"
+        >
+          <el-table-column prop="startStationCode" label="起始站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.startStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="startSectionCode" label="起始区段">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.startSectionCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endStationCode" label="终到站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.endStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endSectionCode" label="终到区段">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.endSectionCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="remarks" label="描述" />
+        </el-table>
+      </el-row>
+      <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+        详情：
+      </el-row>
+      <el-row>
+        <el-table :data="addModel.arriveConfigList" border :height="180">
+          <el-table-column prop="stationCode" label="车站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.stationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="sectionCode" label="区段">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.sectionCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="arriveTime" label="到点" />
+          <el-table-column prop="stopTime" label="停站时间" />
+          <el-table-column prop="departureTime" label="发点" />
+          <el-table-column prop="speedLevel" label="运行等级" />
+        </el-table>
+      </el-row>
+      <el-row>
+        <el-col :offset="16">
+          <el-checkbox v-model="showDefault">显示默认停站时间和运行等级</el-checkbox>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row add-to-front="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 { getRoutingList, querySectionListByRouting, getStationRunning, addPlanTrip } from '@/api/runplan';
-    import { formatTime, formatName } from '@/utils/runPlan';
-    import { getUID } from '@/jmap/utils/Uid';
+import { getRoutingList, querySectionListByRouting, getStationRunning, addPlanTrip } from '@/api/runplan';
+import { formatTime, formatName } from '@/utils/runPlan';
+import { getUID } from '@/jmap/utils/Uid';
 
-    export default {
-        name: 'AddTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                isPlan: false,
-                showDefault: true,
-                stopStationMap: {},
-                params: {},
-                addModel: {
-                    taskIndex: '',
-                    addToFront: false,
-                    routingCode: '',
-                    endStationCode: '',
-                    startStationCode: '',
-                    endSectionCode: '',
-                    startSectionCode: '',
-                    startTime: '00:00:00',
-                    endTime: '',
-                    planId: '',
-                    tripNumber: '',
-                    serviceNumber: '',
-                    defaultStopTime: '',
-                    defaultSpeedLevel: '',
-                    routingList: [],
-                    arriveConfigList: []
-                },
-                tripNumberList: [{ value: '', label: '自动' }],
-                defaultStopTimeList: [{ value: '', label: '默认' }],
-                defaultSpeedLevelList: [{ value: '', label: '默认' }],
-            }
-        },
-        computed: {
-            title() {
-                return '添加任务'
-            },
-        },
-        watch: {
-            'addModel.routingCode': function () {
-                this.computedDetailList();
-            },
-            'addModel.startTime': function () {
-                this.computedDetailList();
-            },
-            'addModel.defaultStopTime': function () {
-                this.computedDetailList();
-            },
-            'addModel.defaultSpeedLevel': function () {
-                this.computedDetailList();
-            }
-        },
-        methods: {
-            loadInitData(params) {
-                this.isPlan = params.isPlan;
-                this.addModel.taskIndex = getUID('task_');
-                this.addModel.serviceNumber = params.serviceNumber;
-                this.addModel.planId = this.$route.query.planId;
+export default {
+	name: 'AddTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			isPlan: false,
+			showDefault: true,
+			stopStationMap: {},
+			params: {},
+			addModel: {
+				taskIndex: '',
+				addToFront: false,
+				routingCode: '',
+				endStationCode: '',
+				startStationCode: '',
+				endSectionCode: '',
+				startSectionCode: '',
+				startTime: '00:00:00',
+				endTime: '',
+				planId: '',
+				tripNumber: '',
+				serviceNumber: '',
+				defaultStopTime: '',
+				defaultSpeedLevel: '',
+				routingList: [],
+				arriveConfigList: []
+			},
+			tripNumberList: [{ value: '', label: '自动' }],
+			defaultStopTimeList: [{ value: '', label: '默认' }],
+			defaultSpeedLevelList: [{ value: '', label: '默认' }]
+		};
+	},
+	computed: {
+		title() {
+			return '添加任务';
+		}
+	},
+	watch: {
+		'addModel.routingCode': function () {
+			this.computedDetailList();
+		},
+		'addModel.startTime': function () {
+			this.computedDetailList();
+		},
+		'addModel.defaultStopTime': function () {
+			this.computedDetailList();
+		},
+		'addModel.defaultSpeedLevel': function () {
+			this.computedDetailList();
+		}
+	},
+	methods: {
+		loadInitData(params) {
+			this.isPlan = params.isPlan;
+			this.addModel.taskIndex = getUID('task_');
+			this.addModel.serviceNumber = params.serviceNumber;
+			this.addModel.planId = this.$route.query.planId;
 
-                let planId = this.$route.query.planId;
-                if (planId) {
-                    getRoutingList(planId).then(resp => {
-                        this.addModel.routingList = resp.data;
-                    })
-                }
+			const planId = this.$route.query.planId;
+			if (planId) {
+				getRoutingList(planId).then(resp => {
+					this.addModel.routingList = resp.data;
+				});
+			}
 
-                let skinStyle = this.$route.query.skinStyle;
-                if (skinStyle) {
-                    getStationRunning(skinStyle).then(resp => {
-                        let list = resp.data;
-                        list.forEach(elem => {
-                            this.stopStationMap[[elem.startSectionCode, elem.endSectionCode].toString()] = elem;
-                        });
-                    })
-                }
-            },
-            doShow(params) {
-                this.loadInitData(params);
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            formatName(code) {
-                return formatName(code);
-            },
-            computedTimeByString(timeStr) {
-                let bTime = +new Date(`2019-01-01 00:00:00`);
-                let eTime = +new Date(`2019-01-01 ${timeStr}`);
-                return Number(eTime) - Number(bTime);
-            },
-            compuntedRunTime(list, index, runLevel) {
-                let runTime = 0;
-                if (index < list.length - 1) {
-                    let stopStationObj = this.stopStationMap[[list[index].sectionCode, list[index + 1].sectionCode].toString()];
-                    if (stopStationObj) {
-                        if (stopStationObj.runPlanLevelVO) {
-                            runTime = parseInt(stopStationObj.runPlanLevelVO[runLevel]);
-                        } else {
-                            this.$messageBox(`请先设置开始区段 ${stopStationObj.startSectionCode} 终到区段 ${stopStationObj.endSectionCode} 的站间运行时间`);
-                        }
-                    }
-                }
+			const skinStyle = this.$route.query.skinStyle;
+			if (skinStyle) {
+				getStationRunning(skinStyle).then(resp => {
+					const list = resp.data;
+					list.forEach(elem => {
+						this.stopStationMap[[elem.startSectionCode, elem.endSectionCode].toString()] = elem;
+					});
+				});
+			}
+		},
+		doShow(params) {
+			this.loadInitData(params);
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		formatName(code) {
+			return formatName(code);
+		},
+		computedTimeByString(timeStr) {
+			const bTime = +new Date(`2019-01-01 00:00:00`);
+			const eTime = +new Date(`2019-01-01 ${timeStr}`);
+			return Number(eTime) - Number(bTime);
+		},
+		compuntedRunTime(list, index, runLevel) {
+			let runTime = 0;
+			if (index < list.length - 1) {
+				const stopStationObj = this.stopStationMap[[list[index].sectionCode, list[index + 1].sectionCode].toString()];
+				if (stopStationObj) {
+					if (stopStationObj.runPlanLevelVO) {
+						runTime = parseInt(stopStationObj.runPlanLevelVO[runLevel]);
+					} else {
+						this.$messageBox(`请先设置开始区段 ${stopStationObj.startSectionCode} 终到区段 ${stopStationObj.endSectionCode} 的站间运行时间`);
+					}
+				}
+			}
 
-                return runTime;
-            },
-            computedDetailList() {
-                if (this.addModel.routingCode) {
-                    querySectionListByRouting({ planId: this.$route.query.planId, routingCode: this.addModel.routingCode }).then(resp => {
-                        let list = resp.data;
-                        let waitTime = this.addModel.defaultStopTime || 30;         //默认三十秒
-                        let tempTime = this.computedTimeByString(this.addModel.startTime) / 1000 - 30;
-                        let runLevel = this.addModel.defaultSpeedLevel || 'level3';  //默认等级三
-                        list.forEach((elem, index) => {
-                            elem.arriveTime = index ? formatTime(tempTime) : '';
-                            elem.departureTime = index == list.length - 1 ? '' : formatTime(tempTime + waitTime);
-                            elem.stopTime = this.addModel.defaultSpeedLevel || '默认';
-                            elem.speedLevel = this.addModel.defaultStopTime || '默认';
-                            tempTime = tempTime + waitTime + this.compuntedRunTime(list, index, runLevel);
-                        });
+			return runTime;
+		},
+		computedDetailList() {
+			if (this.addModel.routingCode) {
+				querySectionListByRouting({ planId: this.$route.query.planId, routingCode: this.addModel.routingCode }).then(resp => {
+					const list = resp.data;
+					const waitTime = this.addModel.defaultStopTime || 30; // 默认三十秒
+					let tempTime = this.computedTimeByString(this.addModel.startTime) / 1000 - 30;
+					const runLevel = this.addModel.defaultSpeedLevel || 'level3'; // 默认等级三
+					list.forEach((elem, index) => {
+						elem.arriveTime = index ? formatTime(tempTime) : '';
+						elem.departureTime = index == list.length - 1 ? '' : formatTime(tempTime + waitTime);
+						elem.stopTime = this.addModel.defaultSpeedLevel || '默认';
+						elem.speedLevel = this.addModel.defaultStopTime || '默认';
+						tempTime = tempTime + waitTime + this.compuntedRunTime(list, index, runLevel);
+					});
 
-                        // let startSection = this.$store.getters['map/getDeviceByCode'](this.addModel.startSectionCode);
-                        // if (startSection && startSection.isReentryTrack) {
-                        //     list.shift();
-                        // }
+					// let startSection = this.$store.getters['map/getDeviceByCode'](this.addModel.startSectionCode);
+					// if (startSection && startSection.isReentryTrack) {
+					//     list.shift();
+					// }
 
-                        // let endSection = this.$store.getters['map/getDeviceByCode'](this.addModel.endSectionCode);
-                        // if (endSection && endSection.isReentryTrack) {
-                        //     list.pop();
-                        // }
+					// let endSection = this.$store.getters['map/getDeviceByCode'](this.addModel.endSectionCode);
+					// if (endSection && endSection.isReentryTrack) {
+					//     list.pop();
+					// }
 
-                        this.addModel.arriveConfigList = list;
-                        this.addModel.endTime = formatTime(tempTime - waitTime);
-                    })
-                }
-            },
-            handleClick(row, column, event) {
-                this.addModel.startStationCode = row.startStationCode;
-                this.addModel.endStationCode = row.endStationCode;
-                this.addModel.startSectionCode = row.startSectionCode;
-                this.addModel.endSectionCode = row.endSectionCode;
-                this.addModel.routingCode = row.code;
-            },
-            handleCommit() {
-                if (this.isPlan) {
-                    // 计划添加任务
-                    this.$emit('dispatchOperate', { dialogName: 'editPlanningTrain', operate: 'handleConfirmAddTask', params: Object.assign({}, this.addModel) })
-                } else {
-                    // 直接添加任务
-                    addPlanTrip(this.addModel).then(resp => {
-                        this.$emit('dispatchOperate', {
-                            dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: this.$route.query
-                        });
-                        this.$message.success('添加任务成功！');
-                    }).catch(error => {
-                        this.$messageBox('添加任务失败');
-                    })
-                }
+					this.addModel.arriveConfigList = list;
+					this.addModel.endTime = formatTime(tempTime - waitTime);
+				});
+			}
+		},
+		handleClick(row, column, event) {
+			this.addModel.startStationCode = row.startStationCode;
+			this.addModel.endStationCode = row.endStationCode;
+			this.addModel.startSectionCode = row.startSectionCode;
+			this.addModel.endSectionCode = row.endSectionCode;
+			this.addModel.routingCode = row.code;
+		},
+		handleCommit() {
+			if (this.isPlan) {
+				// 计划添加任务
+				this.$emit('dispatchOperate', { dialogName: 'editPlanningTrain', operate: 'handleConfirmAddTask', params: Object.assign({}, this.addModel) });
+			} else {
+				// 直接添加任务
+				addPlanTrip(this.addModel).then(resp => {
+					this.$emit('dispatchOperate', {
+						dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
+					});
+					this.$message.success('添加任务成功！');
+				}).catch(() => {
+					this.$messageBox('添加任务失败');
+				});
+			}
 
-                this.doClose();
-            }
-        }
-    }
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -314,4 +331,4 @@
             position: relative;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
index 64ad3a8c5..cb6a04b30 100644
--- a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
+++ b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
@@ -1,79 +1,88 @@
 <template>
-    <el-dialog class="planEdit__tool create-empty-plan" :title="title" :visible.sync="dialogShow" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-form ref="form" :model="addModel" label-width="140px" size="mini" :rules="rules" @submit.native.prevent>
-                <el-form-item label="运行图名称:" prop="name">
-                    <el-input autofocus v-model="addModel.name"></el-input>
-                </el-form-item>
-            </el-form>
-        </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>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool create-empty-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-form ref="form" :model="addModel" label-width="140px" size="mini" :rules="rules" @submit.native.prevent>
+        <el-form-item label="运行图名称:" prop="name">
+          <el-input v-model="addModel.name" autofocus />
+        </el-form-item>
+      </el-form>
+    </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>
-    import { createEmptyPlan } from '@/api/runplan';
+import { createEmptyPlan } from '@/api/runplan';
 
-    export default {
-        name: 'CreateEmptyPlan',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                addModel: {
-                    name: '',
-                    skinStyle: this.$route.query.skinStyle,
-                }
-            }
-        },
-        computed: {
-            title() {
-                return '创建空运行图数据'
-            },
-            rules() {
-                return {
-                    name: [
-                        { required: true, message: '请输入运行图名称', trigger: 'blur' }
-                    ]
-                }
-            }
-        },
-        methods: {
-            doShow() {
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        createEmptyPlan(this.addModel).then(resp => {
-                            let params = {
-                                dialogName: 'openRunPlan',
-                                operate: 'loadRunPlanData',
-                                params: { planId: resp.data, skinStyle: this.$route.query.skinStyle, planName: this.addModel.name }
-                            }
+export default {
+	name: 'CreateEmptyPlan',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			addModel: {
+				name: '',
+				skinStyle: this.$route.query.skinStyle
+			}
+		};
+	},
+	computed: {
+		title() {
+			return '创建空运行图数据';
+		},
+		rules() {
+			return {
+				name: [
+					{ required: true, message: '请输入运行图名称', trigger: 'blur' }
+				]
+			};
+		}
+	},
+	methods: {
+		doShow() {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					createEmptyPlan(this.addModel).then(resp => {
+						const params = {
+							dialogName: 'openRunPlan',
+							operate: 'loadRunPlanData',
+							params: { planId: resp.data, skinStyle: this.$route.query.skinStyle, planName: this.addModel.name, refresh: true }
+						};
 
-                            this.$emit('dispatchOperate', params)
-                            this.$message.success('创建空运行图成功！');
-                            this.doClose();
-                        }).catch(error => {
-                            this.$messageBox('创建空运行图失败');
-                            this.doClose();
-                        })
-                    }
-                });
-            }
-        }
-    }
+						this.$emit('dispatchOperate', params);
+						this.$message.success('创建空运行图成功！');
+						this.doClose();
+					}).catch(() => {
+						this.$messageBox('创建空运行图失败');
+						this.doClose();
+					});
+				}
+			});
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -87,4 +96,4 @@
             width: 120px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/planMonitor/editTool/menus/deleteTask.vue b/src/views/planMonitor/editTool/menus/deleteTask.vue
index 84c149433..4b4b24f8f 100644
--- a/src/views/planMonitor/editTool/menus/deleteTask.vue
+++ b/src/views/planMonitor/editTool/menus/deleteTask.vue
@@ -1,84 +1,93 @@
 <template>
-    <el-dialog class="planEdit__tool delete-task" :title="title" :visible.sync="dialogShow" width="400px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-radio v-model="model.deleteBefore" :label="true">删除以前所有任务（包含本任务）</el-radio>
-        </el-row>
-        <el-row>
-            <el-radio v-model="model.deleteBefore" :label="false">删除以后所有任务（包含本任务）</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>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool 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="model.deleteBefore" :label="true">删除以前所有任务（包含本任务）</el-radio>
+    </el-row>
+    <el-row>
+      <el-radio v-model="model.deleteBefore" :label="false">删除以后所有任务（包含本任务）</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>
-    import { deletePlanTrip } from '@/api/runplan';
+import { deletePlanTrip } from '@/api/runplan';
 
-    export default {
-        name: 'DeleteTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                isPlan: false,
-                model: {
-                    taskIndex: '',
-                    deleteBefore: false,
-                    tripNumber: '',
-                    serviceNumber: '',
-                },
-            }
-        },
-        computed: {
-            title() {
-                return '删除任务'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.isPlan = params.isPlan;
-                this.model.taskIndex = params.taskIndex;
-                this.model.tripNumber = params.tripNumber;
-                this.model.serviceNumber = params.serviceNumber;
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                if (this.isPlan) {
-                    // 计划删除任务
-                    this.$emit('dispatchOperate', { dialogName: 'editPlanningTrain', operate: 'handleConfirmDeleteTask', params: this.model })
-                } else {
-                    // 直接删除任务
-                    let model = {
-                        planId: this.$route.query.planId,
-                        SDTNumber: `${this.model.serviceNumber}${this.model.tripNumber}`,
-                        deleteBefore: this.model.deleteBefore
-                    }
+export default {
+	name: 'DeleteTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			isPlan: false,
+			model: {
+				taskIndex: '',
+				deleteBefore: false,
+				tripNumber: '',
+				serviceNumber: ''
+			}
+		};
+	},
+	computed: {
+		title() {
+			return '删除任务';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.isPlan = params.isPlan;
+			this.model.taskIndex = params.taskIndex;
+			this.model.tripNumber = params.tripNumber;
+			this.model.serviceNumber = params.serviceNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			if (this.isPlan) {
+				// 计划删除任务
+				this.$emit('dispatchOperate', { dialogName: 'editPlanningTrain', operate: 'handleConfirmDeleteTask', params: this.model });
+			} else {
+				// 直接删除任务
+				const model = {
+					planId: this.$route.query.planId,
+					SDTNumber: `${this.model.serviceNumber}${this.model.tripNumber}`,
+					deleteBefore: this.model.deleteBefore
+				};
 
-                    deletePlanTrip(model).then(resp => {
-                        this.$store.dispatch('runPlan/setSelected', {});
-                        this.$emit('dispatchOperate', {
-                            dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: this.$route.query
-                        });
-                        this.$message.success('删除任务成功！');
-                    }).catch(error => {
-                        this.$messageBox('删除任务失败');
-                    })
-                }
-                this.doClose();
-            }
-        }
-    }
+				deletePlanTrip(model).then(resp => {
+					this.$store.dispatch('runPlan/setSelected', {});
+					this.$emit('dispatchOperate', {
+						dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
+					});
+					this.$message.success('删除任务成功！');
+				}).catch(() => {
+					this.$messageBox('删除任务失败');
+				});
+			}
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -88,4 +97,4 @@
             margin: 10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/planMonitor/editTool/menus/duplicateTrain.vue b/src/views/planMonitor/editTool/menus/duplicateTrain.vue
index 4f22bb19b..4aa6fe42d 100644
--- a/src/views/planMonitor/editTool/menus/duplicateTrain.vue
+++ b/src/views/planMonitor/editTool/menus/duplicateTrain.vue
@@ -1,82 +1,91 @@
 <template>
-    <el-dialog class="planEdit__tool duplicate-train" :title="title" :visible.sync="dialogShow" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row type="flex" justify="center">
-            <el-radio-group v-model="model.forward">
-                <el-radio :label="true">向前</el-radio>
-                <el-radio :label="false">向后</el-radio>
-            </el-radio-group>
-        </el-row>
-        <el-row style="margin-top: 20px">
-            <el-col :span="5" :offset="4">次数：</el-col>
-            <el-col :span="10">
-                <el-input-number v-model="model.times" size="mini" controls-position="right"></el-input-number>
-            </el-col>
-        </el-row>
-        <el-row style="margin: 10px 0px">
-            <el-col :span="5" :offset="4">间隔时间：</el-col>
-            <el-col :span="10">
-                <el-input-number v-model="model.intervals" size="mini" controls-position="right"></el-input-number>
-                <span>秒</span>
-            </el-col>
-        </el-row>
-        <el-row type="flex" justify="center" style="margin-top: 20px">
-            <el-button @click="handleCommit">确 定</el-button>
-            <el-button @click="doClose">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool duplicate-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row type="flex" justify="center">
+      <el-radio-group v-model="model.forward">
+        <el-radio :label="true">向前</el-radio>
+        <el-radio :label="false">向后</el-radio>
+      </el-radio-group>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-col :span="5" :offset="4">次数：</el-col>
+      <el-col :span="10">
+        <el-input-number v-model="model.times" size="mini" controls-position="right" />
+      </el-col>
+    </el-row>
+    <el-row style="margin: 10px 0px">
+      <el-col :span="5" :offset="4">间隔时间：</el-col>
+      <el-col :span="10">
+        <el-input-number v-model="model.intervals" size="mini" controls-position="right" />
+        <span>秒</span>
+      </el-col>
+    </el-row>
+    <el-row type="flex" justify="center" style="margin-top: 20px">
+      <el-button @click="handleCommit">确 定</el-button>
+      <el-button @click="doClose">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { duplicateService } from '@/api/runplan';
+import { duplicateService } from '@/api/runplan';
 
-    export default {
-        name: 'DuplicateTrain',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                model: {
-                    serviceNumber: '',
-                    forward: false,
-                    times: 0,
-                    intervals: 0,
-                }
-            }
-        },
-        computed: {
-            title() {
-                return '复制列车'
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.model.serviceNumber = params.serviceNumber;
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                this.model['planId'] = this.$route.query.planId;
-                this.model['serviceNumber'] = this.model.serviceNumber;
-                this.doClose();
-                duplicateService(this.model).then(resp => {
-                    this.$emit('dispatchOperate', {
-                        dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: this.$route.query
-                    });
-                    this.$message.success('复制计划成功！');
-                }).catch(error => {
-                    this.$messageBox('复制计划失败');
-                })
-            }
-        }
-    }
+export default {
+	name: 'DuplicateTrain',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				serviceNumber: '',
+				forward: false,
+				times: 0,
+				intervals: 0
+			}
+		};
+	},
+	computed: {
+		title() {
+			return '复制列车';
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.model.serviceNumber = params.serviceNumber;
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			this.model['planId'] = this.$route.query.planId;
+			this.model['serviceNumber'] = this.model.serviceNumber;
+			this.doClose();
+			duplicateService(this.model).then(resp => {
+				this.$emit('dispatchOperate', {
+					dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
+				});
+				this.$message.success('复制计划成功！');
+			}).catch(() => {
+				this.$messageBox('复制计划失败');
+			});
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -87,4 +96,4 @@
             margin-right: 40px !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/planMonitor/editTool/menus/editPlanningTrain.vue b/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
index eead789fd..7bbb86ca4 100644
--- a/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
+++ b/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
@@ -1,211 +1,224 @@
 <template>
-    <el-dialog class="planEdit__tool edit-planning-train" :title="title" :visible.sync="dialogShow" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-col :span="3"> 表号： </el-col>
-            <el-col :span="4">
-                <el-input v-model="model.serviceNumber" disabled size="mini"></el-input>
-            </el-col>
-            <el-col :span="4" :offset="1">
-                <el-checkbox v-model="model.debugTrain">调试车</el-checkbox>
-            </el-col>
-        </el-row>
-        <el-row style="margin-top: 5px">
-            任务：
-        </el-row>
-        <el-row>
-            <div style=" float: left;  width: 78%">
-                <el-table :data="model.tripConfigList" highlight-current-row @current-change="handleCurrentChange"
-                    border :height="380">
-                    <el-table-column prop="beginStationCode" label="起始站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.startStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="startTime" label="起始时间">
-                        <template slot-scope="scope">
-                            {{ scope.row.startTime}}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="endStationCode" label="终到站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.endStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="endTime" label="终到时间">
-                        <template slot-scope="scope">
-                            {{ scope.row.endTime }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column width="20">
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div style="float: right; width: 22%">
-                <el-button class="view-button" :disabled="disabled" @click="handleEditTask">编辑任务</el-button>
-                <el-button class="view-button" :disabled="disabled" @click="handleAddTask">
-                    增加任务
-                </el-button>
-                <el-button class="view-button" :disabled="disabled" @click="handleDeleteTask">删除任务</el-button>
-                <el-button class="view-button" :disabled="disabled" @click="handleCommit">确定</el-button>
-            </div>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool 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 :span="3"> 表号： </el-col>
+      <el-col :span="4">
+        <el-input v-model="model.serviceNumber" disabled size="mini" />
+      </el-col>
+      <el-col :span="4" :offset="1">
+        <el-checkbox v-model="model.debugTrain">调试车</el-checkbox>
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 5px">
+      任务：
+    </el-row>
+    <el-row>
+      <div style=" float: left;  width: 78%">
+        <el-table
+          :data="model.tripConfigList"
+          highlight-current-row
+          border
+          :height="380"
+          @current-change="handleCurrentChange"
+        >
+          <el-table-column prop="beginStationCode" label="起始站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.startStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="startTime" label="起始时间">
+            <template slot-scope="scope">
+              {{ scope.row.startTime }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endStationCode" label="终到站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.endStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endTime" label="终到时间">
+            <template slot-scope="scope">
+              {{ scope.row.endTime }}
+            </template>
+          </el-table-column>
+          <el-table-column width="20" />
+        </el-table>
+      </div>
+      <div style="float: right; width: 22%">
+        <el-button class="view-button" :disabled="disabled" @click="handleEditTask">编辑任务</el-button>
+        <el-button class="view-button" :disabled="disabled" @click="handleAddTask">
+          增加任务
+        </el-button>
+        <el-button class="view-button" :disabled="disabled" @click="handleDeleteTask">删除任务</el-button>
+        <el-button class="view-button" :disabled="disabled" @click="handleCommit">确定</el-button>
+      </div>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { formatName, formatTime } from '@/utils/runPlan';
-    import { addPlanService } from '@/api/runplan';
-    import { getUID } from '@/jmap/utils/Uid';
+import { formatName, formatTime } from '@/utils/runPlan';
+import { addPlanService } from '@/api/runplan';
+import { getUID } from '@/jmap/utils/Uid';
 
-    export default {
-        name: 'EditPlanningTrain',
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                currentRow: {},
-                model: {
-                    serviceNumber: '',
-                    debugTrain: false,
-                    tripConfigList: [],
-                }
-            }
-        },
-        computed: {
-            title() {
-                return '编辑计划车'
-            },
-            disabled() {
-                return !this.model.serviceNumber;
-            }
-        },
-        methods: {
-            formatTime(time) {
-                return formatTime(time);
-            },
-            formatName(code) {
-                return formatName(code);
-            },
-            loadInitData(params) {
-                this.model.planId = this.$route.query.planId;
-                this.model.serviceNumber = params.serviceNumber;
-                this.model.tripConfigList = [];
-                let editData = this.$store.state.runPlan.editData[params.serviceNumber]
-                if (editData) {
-                    let tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex });
-                    tripNumberList.forEach(tripNumber => {
-                        let trainInfo = editData.trainMap[tripNumber];
-                        let lastIndex = trainInfo.stationTimeList.length - 1;
-                        let taskObj = {
-                            taskIndex: getUID('task_'),
-                            tripNumber: tripNumber,
-                            startStationCode: trainInfo.stationTimeList[0].stationCode,
-                            startTime: formatTime(trainInfo.stationTimeList[0].secondTime),
-                            endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
-                            endTime: formatTime(trainInfo.stationTimeList[lastIndex].secondTime),
-                            arriveConfigList: []
-                        }
-                        // console.log(editData.trainMap[tripNumber]);
-                        this.model.tripConfigList.push(taskObj);
-                    })
-                }
-            },
-            doShow(params) {
-                this.loadInitData(params);
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCurrentChange(val) {
-                this.currentRow = val || {};
-            },
-            handleAddTask() {
-                this.$emit('dispatchDialog', {
-                    name: 'addTask', params: {
-                        isPlan: true,
-                        taskIndex: this.currentRow.taskIndex,
-                        serviceNumber: this.model.serviceNumber,
-                        tripNumber: this.currentRow.tripNumber
-                    }
-                })
-            },
-            handleEditTask() {
-                if (this.currentRow.taskIndex) {
-                    this.$emit('dispatchDialog', {
-                        name: 'modifyingTask', params: {
-                            isPlan: true,
-                            serviceNumber: this.model.serviceNumber,
-                            tripNumber: this.currentRow.tripNumber
-                        }
-                    })
-                } else {
-                    this.$messageBox('请选择一条数据');
-                }
-            },
-            handleDeleteTask() {
-                if (this.currentRow.taskIndex) {
-                    this.$emit('dispatchDialog', {
-                        name: 'deleteTask', params: {
-                            isPlan: true,
-                            taskIndex: this.currentRow.taskIndex,
-                            serviceNumber: this.model.serviceNumber,
-                            tripNumber: this.currentRow.tripNumber
-                        }
-                    })
-                } else {
-                    this.$messageBox('请选择一条数据');
-                }
-            },
-            handleConfirmAddTask(model) {
-                // let index = this.model.tripConfigList.findIndex(
-                //     elem => { return elem.taskIndex == this.currentRow.taskIndex }
-                // );
+export default {
+	name: 'EditPlanningTrain',
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			currentRow: {},
+			model: {
+				serviceNumber: '',
+				debugTrain: false,
+				tripConfigList: []
+			}
+		};
+	},
+	computed: {
+		title() {
+			return '编辑计划车';
+		},
+		disabled() {
+			return !this.model.serviceNumber;
+		}
+	},
+	methods: {
+		formatTime(time) {
+			return formatTime(time);
+		},
+		formatName(code) {
+			return formatName(code);
+		},
+		loadInitData(params) {
+			this.model.planId = this.$route.query.planId;
+			this.model.serviceNumber = params.serviceNumber;
+			this.model.tripConfigList = [];
+			const editData = this.$store.state.runPlan.editData[params.serviceNumber];
+			if (editData) {
+				const tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex; });
+				tripNumberList.forEach(tripNumber => {
+					const trainInfo = editData.trainMap[tripNumber];
+					const lastIndex = trainInfo.stationTimeList.length - 1;
+					const taskObj = {
+						taskIndex: getUID('task_'),
+						tripNumber: tripNumber,
+						startStationCode: trainInfo.stationTimeList[0].stationCode,
+						startTime: formatTime(trainInfo.stationTimeList[0].secondTime),
+						endStationCode: trainInfo.stationTimeList[lastIndex].stationCode,
+						endTime: formatTime(trainInfo.stationTimeList[lastIndex].secondTime),
+						arriveConfigList: []
+					};
+					// console.log(editData.trainMap[tripNumber]);
+					this.model.tripConfigList.push(taskObj);
+				});
+			}
+		},
+		doShow(params) {
+			this.loadInitData(params);
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCurrentChange(val) {
+			this.currentRow = val || {};
+		},
+		handleAddTask() {
+			this.$emit('dispatchDialog', {
+				name: 'addTask', params: {
+					isPlan: true,
+					taskIndex: this.currentRow.taskIndex,
+					serviceNumber: this.model.serviceNumber,
+					tripNumber: this.currentRow.tripNumber
+				}
+			});
+		},
+		handleEditTask() {
+			if (this.currentRow.taskIndex) {
+				this.$emit('dispatchDialog', {
+					name: 'modifyingTask', params: {
+						isPlan: true,
+						serviceNumber: this.model.serviceNumber,
+						tripNumber: this.currentRow.tripNumber
+					}
+				});
+			} else {
+				this.$messageBox('请选择一条数据');
+			}
+		},
+		handleDeleteTask() {
+			if (this.currentRow.taskIndex) {
+				this.$emit('dispatchDialog', {
+					name: 'deleteTask', params: {
+						isPlan: true,
+						taskIndex: this.currentRow.taskIndex,
+						serviceNumber: this.model.serviceNumber,
+						tripNumber: this.currentRow.tripNumber
+					}
+				});
+			} else {
+				this.$messageBox('请选择一条数据');
+			}
+		},
+		handleConfirmAddTask(model) {
+			// let index = this.model.tripConfigList.findIndex(
+			//     elem => { return elem.taskIndex == this.currentRow.taskIndex }
+			// );
 
-                // if (index >= 0) {
-                //     if (!model.addToFront) {
-                //         index += 1;
-                //     }
+			// if (index >= 0) {
+			//     if (!model.addToFront) {
+			//         index += 1;
+			//     }
 
-                //     this.model.tripConfigList = [...this.model.tripConfigList.slice(0, index), model, ...this.model.tripConfigList.slice(index)]
-                // } else {
-                //     this.model.tripConfigList.push(model);
-                // }
+			//     this.model.tripConfigList = [...this.model.tripConfigList.slice(0, index), model, ...this.model.tripConfigList.slice(index)]
+			// } else {
+			//     this.model.tripConfigList.push(model);
+			// }
 
-                if (model.addToFront) {
-                    this.model.tripConfigList = [model, ...this.model.tripConfigList];
-                } else {
-                    this.model.tripConfigList.push(model);
-                }
-            },
-            handleConfirmDeleteTask(model) {
-                let index = this.model.tripConfigList.findIndex(
-                    elem => { return elem.taskIndex == this.currentRow.taskIndex }
-                );
+			if (model.addToFront) {
+				this.model.tripConfigList = [model, ...this.model.tripConfigList];
+			} else {
+				this.model.tripConfigList.push(model);
+			}
+		},
+		handleConfirmDeleteTask(model) {
+			const index = this.model.tripConfigList.findIndex(
+				elem => { return elem.taskIndex == this.currentRow.taskIndex; }
+			);
 
-                if (index >= 0) {
-                    if (model.addToFront) {
-                        this.model.tripConfigList = this.model.tripConfigList.slice(index + 1);
-                    } else {
-                        this.model.tripConfigList = this.model.tripConfigList.slice(0, index);
-                    }
-                }
-            },
-            handleCommit() {
-                this.doClose();
-                addPlanService(this.model).then(() => {
-                    this.$emit('dispatchOperate', {
-                        dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: this.$route.query
-                    });
-                    this.$message.success('创建计划成功');
-                }).catch(error => {
-                    this.$messageBox('创建计划失败');
-                })
-            }
-        }
-    }
+			if (index >= 0) {
+				if (model.addToFront) {
+					this.model.tripConfigList = this.model.tripConfigList.slice(index + 1);
+				} else {
+					this.model.tripConfigList = this.model.tripConfigList.slice(0, index);
+				}
+			}
+		},
+		handleCommit() {
+			this.doClose();
+			addPlanService(this.model).then(() => {
+				this.$emit('dispatchOperate', {
+					dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
+				});
+				this.$message.success('创建计划成功');
+			}).catch(() => {
+				this.$messageBox('创建计划失败');
+			});
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -229,4 +242,4 @@
             line-height: 20px !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/planMonitor/editTool/menus/modifyingTask.vue b/src/views/planMonitor/editTool/menus/modifyingTask.vue
index 645d82549..a4b84ce85 100644
--- a/src/views/planMonitor/editTool/menus/modifyingTask.vue
+++ b/src/views/planMonitor/editTool/menus/modifyingTask.vue
@@ -1,396 +1,418 @@
 <template>
-    <el-dialog class="planEdit__tool add-task" :title="title" :visible.sync="dialogShow" width="1000px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <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 style="display: inline-black" v-model="editModel.tripNumber" placeholder="请选择">
-                                <el-option v-for="item in tripNumberList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool 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="editModel.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="8">
+              <el-checkbox v-model="editModel.trainManual">手工</el-checkbox>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="6">
+          <el-row>
+            <el-col :span="11" :offset="1">
+              <span>缺省停站时间：</span>
+            </el-col>
+            <el-col :span="12">
+              <el-select
+                v-model="editModel.defaultStopTime"
+                style="display: inline-black"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in defaultStopTimeList"
+                  :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="editModel.serviceNumber" />
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="7">
+          <el-row>
+            <el-col :span="22" :offset="2">
+              <el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="editModel.clearGuest">清客</el-checkbox>
                 </el-col>
-                <el-col :span="2">
-                    <el-row>
-                        <el-col :offset="8">
-                            <el-checkbox v-model="editModel.trainManual">手工</el-checkbox>
-                        </el-col>
-                    </el-row>
+                <el-col :span="8">
+                  <el-checkbox v-model="editModel.continuationPlan">延续计划</el-checkbox>
                 </el-col>
                 <el-col :span="6">
-                    <el-row>
-                        <el-col :span="11" :offset="1">
-                            <span>缺省停站时间：</span>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-select style="display: inline-black" v-model="editModel.defaultStopTime"
-                                placeholder="请选择">
-                                <el-option v-for="item in defaultStopTimeList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
+                  <el-checkbox v-model="editModel.firstTrain">首班车</el-checkbox>
                 </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="editModel.serviceNumber"></el-input>
-                        </el-col>
-                    </el-row>
+              </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="editModel.serialNumber" style="display: inline-black" placeholder="请选择">
+                <el-option
+                  v-for="item in serialNumberList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="editModel.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
+          <el-row>
+            <el-col :offset="8">
+              <el-checkbox v-model="editModel.serialManual">手工</el-checkbox>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="6">
+          <el-row>
+            <el-col :span="11" :offset="1">
+              <span>缺省运行等级：</span>
+            </el-col>
+            <el-col :span="12">
+              <el-select
+                v-model="editModel.defaultSpeedLevel"
+                style="display: inline-black"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in defaultSpeedLevelList"
+                  :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-picker
+                v-model="editModel.startTime"
+                placeholder="选择时间"
+                value-format="HH:mm:ss"
+                :clearable="false"
+              />
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="7">
+          <el-row>
+            <el-col :span="22" :offset="2">
+              <el-row>
+                <el-col :span="6">
+                  <el-checkbox v-model="editModel.inStock">入库</el-checkbox>
                 </el-col>
-                <el-col :span="7">
-                    <el-row>
-                        <el-col :span="22" :offset="2">
-                            <el-row>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="editModel.clearGuest">清客</el-checkbox>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-checkbox v-model="editModel.continuationPlan">延续计划</el-checkbox>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="editModel.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 style="display: inline-black" v-model="editModel.serialNumber" placeholder="请选择">
-                                <el-option v-for="item in serialNumberList" :key="item.value" :label="item.label"
-                                    :value="editModel.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="2">
-                    <el-row>
-                        <el-col :offset="8">
-                            <el-checkbox v-model="editModel.serialManual">手工</el-checkbox>
-                        </el-col>
-                    </el-row>
+                <el-col :span="8">
+                  <el-checkbox v-model="editModel.outStock">出库</el-checkbox>
                 </el-col>
                 <el-col :span="6">
-                    <el-row>
-                        <el-col :span="11" :offset="1">
-                            <span>缺省运行等级：</span>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-select style="display: inline-black" v-model="editModel.defaultSpeedLevel"
-                                placeholder="请选择">
-                                <el-option v-for="item in defaultSpeedLevelList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
+                  <el-checkbox v-model="editModel.lastTrain">末班车</el-checkbox>
                 </el-col>
-                <el-col :span="5">
-                    <el-row>
-                        <el-col :span="9" :offset="2">
-                            <span>开始时间：</span>
-                        </el-col>
-                        <el-col :span="13">
-                            <el-time-picker v-model="editModel.startTime" placeholder="选择时间" value-format="HH:mm:ss"
-                                :clearable="false">
-                            </el-time-picker>
-                        </el-col>
-                    </el-row>
-                </el-col>
-                <el-col :span="7">
-                    <el-row>
-                        <el-col :span="22" :offset="2">
-                            <el-row>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="editModel.inStock">入库</el-checkbox>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-checkbox v-model="editModel.outStock">出库</el-checkbox>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-checkbox v-model="editModel.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="editModel.routingList" border :height="140">
-                    <el-table-column prop="startStationCode" label="起始站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.startStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="startSectionCode" label="起始区段">
-                    </el-table-column>
-                    <el-table-column prop="endStationCode" label="终到站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.endStationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="endSectionCode" label="终到区段">
-                    </el-table-column>
-                    <el-table-column prop="remarks" label="描述" :width="280">
-                    </el-table-column>
-                    <el-table-column :width="40">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row style=" margin-bottom: 5px;margin-top: 10px;">
-                详情：
-            </el-row>
-            <el-row>
-                <el-table :data="editModel.arriveConfigList" border :height="180">
-                    <el-table-column prop="stationCode" label="车站">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.stationCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="sectionCode" label="区段">
-                        <template slot-scope="scope">
-                            {{ formatName(scope.row.sectionCode) }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="arriveTime" label="到点">
-                    </el-table-column>
-                    <el-table-column prop="stopTime" label="停站时间">
-                    </el-table-column>
-                    <el-table-column prop="departureTime" label="发点">
-                    </el-table-column>
-                    <el-table-column prop="speedLevel" label="运行等级">
-                    </el-table-column>
-                </el-table>
-            </el-row>
-            <el-row>
-                <el-col :offset="16">
-                    <el-checkbox v-model="editModel.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>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row style="margin-bottom: 5px;">
+        交路：
+      </el-row>
+      <el-row>
+        <el-table :data="editModel.routingList" border :height="140">
+          <el-table-column prop="startStationCode" label="起始站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.startStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="startSectionCode" label="起始区段" />
+          <el-table-column prop="endStationCode" label="终到站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.endStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endSectionCode" label="终到区段" />
+          <el-table-column prop="remarks" 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="editModel.arriveConfigList" border :height="180">
+          <el-table-column prop="stationCode" label="车站">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.stationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="sectionCode" label="区段">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.sectionCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="arriveTime" label="到点" />
+          <el-table-column prop="stopTime" label="停站时间" />
+          <el-table-column prop="departureTime" label="发点" />
+          <el-table-column prop="speedLevel" label="运行等级" />
+        </el-table>
+      </el-row>
+      <el-row>
+        <el-col :offset="16">
+          <el-checkbox v-model="editModel.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 { getRoutingBySDTNumber, querySectionListByRouting, getRoutingList, getStationRunning, updatePlanTrip } from '@/api/runplan';
-    import { formatTime, formatName } from '@/utils/runPlan';
+import { getRoutingBySDTNumber, querySectionListByRouting, getStationRunning, updatePlanTrip } from '@/api/runplan';
+import { formatTime, formatName } from '@/utils/runPlan';
 
-    export default {
-        name: 'ModifyingTask',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                isPlan: false,
-                PlanConvert: {},
-                stopStationMap: {},
-                editModel: {
-                    taskIndex: '',
-                    routingCode: '',
-                    defaultStopTime: '',
-                    defaultSpeedLevel: '',
-                    tripNumber: '',
-                    serviceNumber: '',
-                    startTime: '00:00:00',
-                    endTime: '',
-                    routingList: [],
-                    arriveConfigList: [],
+export default {
+	name: 'ModifyingTask',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			isPlan: false,
+			PlanConvert: {},
+			stopStationMap: {},
+			editModel: {
+				taskIndex: '',
+				routingCode: '',
+				defaultStopTime: '',
+				defaultSpeedLevel: '',
+				tripNumber: '',
+				serviceNumber: '',
+				startTime: '00:00:00',
+				endTime: '',
+				routingList: [],
+				arriveConfigList: [],
 
-                    serialNumber: '',
-                    trainManual: false,
-                    serialManual: false,
-                    clearGuest: false,
-                    continuationPlan: false,
-                    firstTrain: false,
-                    lastTrain: false,
-                    inStock: false,
-                    outStock: false,
-                },
-                tripNumberList: [{ value: '', label: '自动' }],
-                defaultStopTimeList: [{ value: '', label: '默认' }],
-                defaultSpeedLevelList: [{ value: '', label: '默认' }],
-                serialNumberList: [],
-            }
-        },
-        computed: {
-            title() {
-                return '修改任务'
-            }
-        },
-        watch: {
-            'editModel.startTime': function () {
-                this.computedDetailList();
-            },
-            'editModel.defaultStopTime': function () {
-                this.computedDetailList();
-            },
-            'editModel.defaultSpeedLevel': function () {
-                this.computedDetailList();
-            }
-        },
-        methods: {
-            formatTime(time) {
-                return formatTime(time);
-            },
-            formatName(code) {
-                return formatName(code);
-            },
-            computedTimeByString(timeStr) {
-                let bTime = +new Date(`2019-01-01 00:00:00`);
-                let eTime = +new Date(`2019-01-01 ${timeStr}`);
-                return Number(eTime) - Number(bTime);
-            },
-            compuntedRunTime(list, index, runLevel) {
-                let runTime = 0;
-                if (index < list.length - 1) {
-                    let stopStationObj = this.stopStationMap[[list[index].sectionCode, list[index + 1].sectionCode].toString()];
-                    if (stopStationObj) {
-                        if (stopStationObj.runPlanLevelVO) {
-                            runTime = parseInt(stopStationObj.runPlanLevelVO[runLevel]);
-                        } else {
-                            this.$messageBox(`请先设置开始区段 ${stopStationObj.startSectionCode} 终到区段 ${stopStationObj.endSectionCode} 的站间运行时间`);
-                        }
-                    }
-                }
+				serialNumber: '',
+				trainManual: false,
+				serialManual: false,
+				clearGuest: false,
+				continuationPlan: false,
+				firstTrain: false,
+				lastTrain: false,
+				inStock: false,
+				outStock: false
+			},
+			tripNumberList: [{ value: '', label: '自动' }],
+			defaultStopTimeList: [{ value: '', label: '默认' }],
+			defaultSpeedLevelList: [{ value: '', label: '默认' }],
+			serialNumberList: []
+		};
+	},
+	computed: {
+		title() {
+			return '修改任务';
+		}
+	},
+	watch: {
+		'editModel.startTime': function () {
+			this.computedDetailList();
+		},
+		'editModel.defaultStopTime': function () {
+			this.computedDetailList();
+		},
+		'editModel.defaultSpeedLevel': function () {
+			this.computedDetailList();
+		}
+	},
+	methods: {
+		formatTime(time) {
+			return formatTime(time);
+		},
+		formatName(code) {
+			return formatName(code);
+		},
+		computedTimeByString(timeStr) {
+			const bTime = +new Date(`2019-01-01 00:00:00`);
+			const eTime = +new Date(`2019-01-01 ${timeStr}`);
+			return Number(eTime) - Number(bTime);
+		},
+		compuntedRunTime(list, index, runLevel) {
+			let runTime = 0;
+			if (index < list.length - 1) {
+				const stopStationObj = this.stopStationMap[[list[index].sectionCode, list[index + 1].sectionCode].toString()];
+				if (stopStationObj) {
+					if (stopStationObj.runPlanLevelVO) {
+						runTime = parseInt(stopStationObj.runPlanLevelVO[runLevel]);
+					} else {
+						this.$messageBox(`请先设置开始区段 ${stopStationObj.startSectionCode} 终到区段 ${stopStationObj.endSectionCode} 的站间运行时间`);
+					}
+				}
+			}
 
-                return runTime;
-            },
-            computedDetailList() {
-                this.editModel.arriveConfigList = [];
-                if (this.editModel.routingCode) {
-                    querySectionListByRouting({ planId: this.$route.query.planId, routingCode: this.editModel.routingCode }).then(rest => {
-                        let list = rest.data;
-                        let waitTime = this.editModel.defaultStopTime || 30;         //默认三十秒
-                        let tempTime = this.computedTimeByString(this.editModel.startTime) / 1000 - 30;
-                        let runLevel = this.editModel.defaultSpeedLevel || 'level3';  //默认等级三
-                        list.forEach((elem, index) => {
-                            elem.arriveTime = index ? formatTime(tempTime) : '';
-                            elem.departureTime = index == list.length - 1 ? '' : formatTime(tempTime + waitTime);
-                            elem.stopTime = this.editModel.defaultSpeedLevel || '默认';
-                            elem.speedLevel = this.editModel.defaultStopTime || '默认';
-                            tempTime = tempTime + waitTime + this.compuntedRunTime(list, index, runLevel);
-                        });
+			return runTime;
+		},
+		computedDetailList() {
+			this.editModel.arriveConfigList = [];
+			if (this.editModel.routingCode) {
+				querySectionListByRouting({ planId: this.$route.query.planId, routingCode: this.editModel.routingCode }).then(rest => {
+					const list = rest.data;
+					const waitTime = this.editModel.defaultStopTime || 30; // 默认三十秒
+					let tempTime = this.computedTimeByString(this.editModel.startTime) / 1000 - 30;
+					const runLevel = this.editModel.defaultSpeedLevel || 'level3'; // 默认等级三
+					list.forEach((elem, index) => {
+						elem.arriveTime = index ? formatTime(tempTime) : '';
+						elem.departureTime = index == list.length - 1 ? '' : formatTime(tempTime + waitTime);
+						elem.stopTime = this.editModel.defaultSpeedLevel || '默认';
+						elem.speedLevel = this.editModel.defaultStopTime || '默认';
+						tempTime = tempTime + waitTime + this.compuntedRunTime(list, index, runLevel);
+					});
 
-                        if (this.editModel.routingList && this.editModel.routingList.length > 0) {
-                            let row = this.editModel.routingList[0];
-                            let startSection = this.$store.getters['map/getDeviceByCode'](row.startSectionCode);
-                            if (startSection && startSection.isReentryTrack) {
-                                list.shift();
-                            }
+					if (this.editModel.routingList && this.editModel.routingList.length > 0) {
+						const row = this.editModel.routingList[0];
+						const startSection = this.$store.getters['map/getDeviceByCode'](row.startSectionCode);
+						if (startSection && startSection.isReentryTrack) {
+							list.shift();
+						}
 
-                            let endSection = this.$store.getters['map/getDeviceByCode'](row.endSectionCode);
-                            if (endSection && endSection.isReentryTrack) {
-                                list.pop();
-                            }
-                        }
+						const endSection = this.$store.getters['map/getDeviceByCode'](row.endSectionCode);
+						if (endSection && endSection.isReentryTrack) {
+							list.pop();
+						}
+					}
 
-                        this.editModel.arriveConfigList = list;
-                        this.editModel.endTime = formatTime(tempTime - waitTime);
-                    })
-                }
-            },
-            loadInitData(params) {
-                let skinStyle = this.$route.query.skinStyle;
-                this.isPlan = params.isPlan;
-                this.editModel.taskIndex = params.taskIndex;
-                this.editModel.serviceNumber = params.serviceNumber;
-                this.editModel.tripNumber = params.tripNumber;
-                this.PlanConvert = this.$theme.loadPlanConvert(skinStyle);
+					this.editModel.arriveConfigList = list;
+					this.editModel.endTime = formatTime(tempTime - waitTime);
+				});
+			}
+		},
+		loadInitData(params) {
+			const skinStyle = this.$route.query.skinStyle;
+			this.isPlan = params.isPlan;
+			this.editModel.taskIndex = params.taskIndex;
+			this.editModel.serviceNumber = params.serviceNumber;
+			this.editModel.tripNumber = params.tripNumber;
+			this.PlanConvert = this.$theme.loadPlanConvert(skinStyle);
 
-                let editData = this.$store.state.runPlan.editData[this.editModel.serviceNumber]
-                if (editData) {
-                    let tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex });
-                    let trainInfo = editData.trainMap[tripNumberList[0]];
-                    this.editModel.startTime = formatTime(trainInfo.stationTimeList[0].secondTime + this.PlanConvert.TranslationTime);
-                }
+			const editData = this.$store.state.runPlan.editData[this.editModel.serviceNumber];
+			if (editData) {
+				const tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex; });
+				const trainInfo = editData.trainMap[tripNumberList[0]];
+				this.editModel.startTime = formatTime(trainInfo.stationTimeList[0].secondTime + this.PlanConvert.TranslationTime);
+			}
 
-                if (skinStyle) {
-                    getStationRunning(skinStyle).then(resp => {
-                        let list = resp.data;
-                        list.forEach(elem => {
-                            this.stopStationMap[[elem.startSectionCode, elem.endSectionCode].toString()] = elem;
-                        });
-                    })
-                }
+			if (skinStyle) {
+				getStationRunning(skinStyle).then(resp => {
+					const list = resp.data;
+					list.forEach(elem => {
+						this.stopStationMap[[elem.startSectionCode, elem.endSectionCode].toString()] = elem;
+					});
+				});
+			}
 
-                let model = {
-                    planId: this.$route.query.planId,
-                    SDTNumber: `${this.editModel.serviceNumber}${this.editModel.tripNumber}`
-                }
+			const model = {
+				planId: this.$route.query.planId,
+				SDTNumber: `${this.editModel.serviceNumber}${this.editModel.tripNumber}`
+			};
 
-                this.editModel.routingList = [];
-                getRoutingBySDTNumber(model).then(resp => {
-                    let routingObj = resp.data;
-                    this.editModel.routingCode = routingObj.code;
-                    this.editModel.routingList.push(routingObj);
-                    this.computedDetailList();
-                });
-            },
-            doShow(params) {
-                this.loadInitData(params);
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            buildModel() {
-                return {
-                    planId: this.$route.query.planId,
-                    routingCode: this.editModel.routingCode,
-                    tripNumber: this.editModel.tripNumber,
-                    startTime: this.editModel.startTime,
-                    endTime: this.editModel.endTime,
-                    arriveConfigList: this.editModel.arriveConfigList,
-                    SDTNumber: `${this.editModel.serviceNumber}${this.editModel.tripNumber}`
-                }
-            },
-            handleCommit() {
-                if (this.isPlan) {
-                    // 计划修改任务
-                } else {
-                    // 直接修改
-                    updatePlanTrip(this.buildModel()).then(resp => {
-                        this.$emit('dispatchOperate', {
-                            dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: this.$route.query
-                        });
-                        this.$message.success('修改任务成功！');
-                    }).catch(error => {
-                        this.$messageBox('修改任务失败');
-                    });
-                }
-                this.doClose();
-            }
-        }
-    }
+			this.editModel.routingList = [];
+			getRoutingBySDTNumber(model).then(resp => {
+				const routingObj = resp.data;
+				this.editModel.routingCode = routingObj.code;
+				this.editModel.routingList.push(routingObj);
+				this.computedDetailList();
+			});
+		},
+		doShow(params) {
+			this.loadInitData(params);
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		buildModel() {
+			return {
+				planId: this.$route.query.planId,
+				routingCode: this.editModel.routingCode,
+				tripNumber: this.editModel.tripNumber,
+				startTime: this.editModel.startTime,
+				endTime: this.editModel.endTime,
+				arriveConfigList: this.editModel.arriveConfigList,
+				SDTNumber: `${this.editModel.serviceNumber}${this.editModel.tripNumber}`
+			};
+		},
+		handleCommit() {
+			if (this.isPlan) {
+				// 计划修改任务
+			} else {
+				// 直接修改
+				updatePlanTrip(this.buildModel()).then(resp => {
+					this.$emit('dispatchOperate', {
+						dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
+					});
+					this.$message.success('修改任务成功！');
+				}).catch(() => {
+					this.$messageBox('修改任务失败');
+				});
+			}
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -419,4 +441,4 @@
             top: -10px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/planMonitor/editTool/menus/offLine.vue b/src/views/planMonitor/editTool/menus/offLine.vue
index 1111996b5..a67347c3e 100644
--- a/src/views/planMonitor/editTool/menus/offLine.vue
+++ b/src/views/planMonitor/editTool/menus/offLine.vue
@@ -1,61 +1,71 @@
 <template>
-    <el-dialog class="planEdit__tool add-planning-train" :title="title" :visible.sync="dialogShow" :width="width + 'px'"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <el-row>
-            <el-col :span="24" :offset="1">
-                <i class="el-icon-warning"></i>
-                {{params.message}}
-            </el-col>
-        </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>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool add-planning-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    :width="width + 'px'"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <el-row>
+      <el-col :span="24" :offset="1">
+        <i class="el-icon-warning" />
+        {{ params.message }}
+      </el-col>
+    </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: 'OffLine',
-        components: {
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                params: {},
-            }
-        },
-        computed: {
-            title() {
-                return 'offline'
-            },
-            width() {
-                if (this.params.width) {
-                    return this.params.width;
-                } else {
-                    return 400;
-                }
-            }
-        },
-        mounted() {
-        },
-        methods: {
-            doShow(params) {
-                this.params = params || {};
-                this.dialogShow = true;
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-            },
-            handleCommit() {
-                this.$emit('handleConfirm', this.params);
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'OffLine',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			params: {}
+		};
+	},
+	computed: {
+		title() {
+			return 'offline';
+		},
+		width() {
+			if (this.params.width) {
+				return this.params.width;
+			} else {
+				return 400;
+			}
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow(params) {
+			this.params = params || {};
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+			this.$emit('handleConfirm', this.params);
+			this.doClose();
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -65,4 +75,4 @@
             width: 40px;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/planMonitor/editTool/menus/openRunPlan.vue b/src/views/planMonitor/editTool/menus/openRunPlan.vue
index aced4f971..4300c997d 100644
--- a/src/views/planMonitor/editTool/menus/openRunPlan.vue
+++ b/src/views/planMonitor/editTool/menus/openRunPlan.vue
@@ -1,93 +1,109 @@
 <template>
-    <el-dialog class="planEdit__tool open-runplan" :title="title" :visible.sync="show" width="640px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-scrollbar wrapClass="scrollbar-wrapper" :style="{height: height+'px'}">
-            <el-tree ref="tree" class="filter-tree" :data="runPlanList" :props="defaultProps" default-expand-all
-                :style="{height: height-20+'px'}">
-                <span slot-scope="{ node, data }">
-                    <el-radio v-model="planId" :label="data.id"><span>{{ data.name }}</span></el-radio>
-                </span>
-            </el-tree>
-        </el-scrollbar>
-        <el-row type="flex" justify="center" class="button-group">
-            <el-button type="primary" @click="handleConfirm">选择运行图</el-button>
-            <el-button @click="dialogShow = false">取 消</el-button>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool open-runplan"
+    :title="title"
+    :visible.sync="show"
+    width="640px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height: height+'px'}">
+      <el-tree
+        ref="tree"
+        class="filter-tree"
+        :data="runPlanList"
+        :props="defaultProps"
+        default-expand-all
+        :style="{height: height-20+'px'}"
+      >
+        <span slot-scope="{ node, data }">
+          <el-radio v-model="planId" :label="data.id"><span>{{ data.name }}</span></el-radio>
+        </span>
+      </el-tree>
+    </el-scrollbar>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button type="primary" @click="handleConfirm">选择运行图</el-button>
+      <el-button @click="dialogShow = false">取 消</el-button>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { getjointTraining, putJointTrainingSimulationEntrance } from '@/api/chat';
-    import { getPublishMapInfo } from '@/api/jmap/map';
-    import { launchFullscreen } from '@/utils/screen';
-    import { getStationListBySkinStyle, queryRunPlan, getRpListByMapId } from '@/api/runplan';
-    import { UrlConfig } from '@/router/index';
+import { getRpListByMapId } from '@/api/runplan';
+import { UrlConfig } from '@/router/index';
 
-    export default {
-        name: 'OpenRunPlan',
-        props: {
-            skinStyle: {
-                type: String,
-                required: true
-            }
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                height: 260,
-                planId: '',
-                runPlanList: [],
-                runPlanDict: {},
-                defaultProps: {
-                    label: 'name',
-                }
-            }
-        },
-        computed: {
-            show() {
-                return this.dialogShow;
-            },
-            title() {
-                return '运行图列表';
-            },
-        },
-        mounted() {
-            this.loadRunPlanData({
-                planId: this.$route.query.planId,
-                skinStyle: this.$route.query.skinStyle,
-                planName: this.$route.query.planName
-            });
-        },
-        methods: {
-            loadRunPlanData({ planId, skinStyle, planName }) {
-                let query = { skinStyle: skinStyle, mapId: this.$route.query.mapId, planId: planId, planName, try: this.$route.query.try, goodsId: this.$route.query.goodsId }
-                this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
-            },
-            doShow() {
-                getRpListByMapId(this.$route.query.mapId).then((resp) => {
-                    this.runPlanList = resp.data;
-                    this.runPlanList.forEach(elem => {
-                        this.runPlanDict[elem.id] = elem.name;
-                    });
-                    this.dialogShow = true;
-                }).catch(error => {
-                    this.$messageBox('获取运行图列表失败');
-                })
-            },
-            doClose() {
-                this.dialogShow = false;
-            },
-            handleConfirm() {
-                this.loadRunPlanData({
-                    planId: this.planId,
-                    skinStyle: this.$route.query.skinStyle,
-                    planName: this.runPlanDict[this.planId]
-                });
-                this.doClose();
-            }
-        }
-    }
+export default {
+	name: 'OpenRunPlan',
+	props: {
+		skinStyle: {
+			type: String,
+			required: true
+		}
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			height: 260,
+			planId: '',
+			runPlanList: [],
+			runPlanDict: {},
+			defaultProps: {
+				label: 'name'
+			}
+		};
+	},
+	computed: {
+		show() {
+			return this.dialogShow;
+		},
+		title() {
+			return '运行图列表';
+		}
+	},
+	mounted() {
+		this.loadRunPlanData({
+			planId: this.$route.query.planId,
+			skinStyle: this.$route.query.skinStyle,
+			planName: this.$route.query.planName
+		});
+	},
+	methods: {
+		loadRunPlanData({ refresh, planId, skinStyle, planName }) {
+			if (refresh) {
+				this.$store.dispatch('runPlan/refresh');
+			} else {
+				const query = { skinStyle: skinStyle, mapId: this.$route.query.mapId, planId: planId, planName, try: this.$route.query.try, goodsId: this.$route.query.goodsId };
+				this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
+			}
+		},
+		doShow() {
+			getRpListByMapId(this.$route.query.mapId).then((resp) => {
+				this.runPlanList = resp.data;
+				this.runPlanList.forEach(elem => {
+					this.runPlanDict[elem.id] = elem.name;
+				});
+				this.dialogShow = true;
+			}).catch(() => {
+				this.$messageBox('获取运行图列表失败');
+			});
+		},
+		doClose() {
+			this.dialogShow = false;
+		},
+		handleConfirm() {
+			this.loadRunPlanData({
+				planId: this.planId,
+				skinStyle: this.$route.query.skinStyle,
+				planName: this.runPlanDict[this.planId]
+			});
+			this.doClose();
+		}
+	}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
@@ -102,4 +118,4 @@
             background: #ECE9D8 !important;
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue
index a36db9ec0..37f4d9ca0 100644
--- a/src/views/planMonitor/editTool/schedule.vue
+++ b/src/views/planMonitor/editTool/schedule.vue
@@ -235,6 +235,9 @@ export default {
 			});
 			this.$refs.tripTable.setCurrentRow(this.tripNumberConfig.data[index]);
 		},
+		'$store.state.runPlan.refreshCount': function() {
+			this.loadChartPage();
+		},
 		$route() {
 			this.loadChartPage();
 		}

From f1b39069733852b0df2662ef61c4f1c462dbfb0a Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 9 Aug 2019 19:00:37 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9B=AE=E6=A0=87?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/scriptRecord.js                  |  5 +++++
 src/i18n/langs/zh/scriptRecord.js                  |  5 +++++
 src/views/display/scriptRecord/deviceCondition.vue | 14 +++++++-------
 src/views/display/scriptRecord/targetCondition.vue |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/i18n/langs/en/scriptRecord.js b/src/i18n/langs/en/scriptRecord.js
index 88dc72795..82f75c13a 100644
--- a/src/i18n/langs/en/scriptRecord.js
+++ b/src/i18n/langs/en/scriptRecord.js
@@ -14,4 +14,9 @@ export default {
     roleAdd: "Add",
     delete: "Delete",
     behaviorOperate: "Behavior Operate",
+    conditionTitle: "Target condition",
+    deviceType: "Device Type",
+    deviceCondition: "Device Condition",
+    paramDeviceType: "Param DeviceType",
+    paramDeviceCode: "Param DeviceCode",
 };
\ No newline at end of file
diff --git a/src/i18n/langs/zh/scriptRecord.js b/src/i18n/langs/zh/scriptRecord.js
index 4a9cfbca2..5e759bae8 100644
--- a/src/i18n/langs/zh/scriptRecord.js
+++ b/src/i18n/langs/zh/scriptRecord.js
@@ -14,4 +14,9 @@ export default {
     roleAdd: "添加",
     delete: "删除",
     behaviorOperate: "行为操作",
+    conditionTitle: "目标条件",
+    deviceType: "设备类型",
+    deviceCondition: "设备条件",
+    paramDeviceType: "参数设备类型",
+    paramDeviceCode: "参数设备编号",
 };
\ No newline at end of file
diff --git a/src/views/display/scriptRecord/deviceCondition.vue b/src/views/display/scriptRecord/deviceCondition.vue
index daef3255e..1b9a48dea 100644
--- a/src/views/display/scriptRecord/deviceCondition.vue
+++ b/src/views/display/scriptRecord/deviceCondition.vue
@@ -1,13 +1,13 @@
 <template>
     <div>
-        <el-form label-width="80px">
+        <el-form label-width="140px">
             <el-form-item :label="title">
                 <el-button type="primary" size="small" @click="addDeviceCondition" :disabled="isdisabled">添加</el-button>
             </el-form-item>
         </el-form>
         <el-table
             :data="ConditionVOList" border style="margin-top:10px;margin-left:10px;width:901px">
-            <el-table-column label="设备类型" width="150">
+            <el-table-column :label="$t('scriptRecord.deviceType')" width="150">
                 <template slot-scope="scope">
                     <div v-if="scope.row.isAdded">{{scope.row.deviceType}}</div>
                     <el-select v-else v-model="scope.row.deviceType" placeholder="请选择" @change="changeDeviceType($event,scope.row)">
@@ -15,7 +15,7 @@
                     </el-select>
                 </template>
             </el-table-column>
-            <el-table-column label="设备编号" width="150">
+            <el-table-column :label="$t('scriptRecord.deviceCode')" width="150">
                 <template slot-scope="scope">
                     <div v-if="scope.row.isAdded">{{scope.row.code}}</div>
                     <el-select v-else v-model="scope.row.code" placeholder="请选择">
@@ -23,7 +23,7 @@
                     </el-select>
                 </template>
             </el-table-column>
-            <el-table-column label="设备条件" width="150">
+            <el-table-column :label="$t('scriptRecord.deviceCondition')" width="150">
                 <template slot-scope="scope">
                     <div v-if="scope.row.isAdded">{{scope.row.condition}}</div>
                     <el-select v-else v-model="scope.row.condition" placeholder="请选择">
@@ -31,7 +31,7 @@
                     </el-select>
                 </template>
             </el-table-column>
-            <el-table-column label="参数设备类型" width="150">
+            <el-table-column :label="$t('scriptRecord.paramDeviceType')" width="150">
                 <template slot-scope="scope">
                     <div v-if="scope.row.isAdded">{{scope.row.paramDeviceType}}</div>
                     <el-select v-else v-model="scope.row.paramDeviceType" placeholder="请选择" @change="changeParamDeviceType">
@@ -39,7 +39,7 @@
                     </el-select>
                 </template>
             </el-table-column>
-            <el-table-column label="参数设备编号" width="150">
+            <el-table-column :label="$t('scriptRecord.paramDeviceCode')" width="150">
                 <template slot-scope="scope">
                     <div v-if="scope.row.isAdded">{{scope.row.paramCode}}</div>
                     <el-select v-else v-model="scope.row.paramCode" placeholder="请选择">
@@ -47,7 +47,7 @@
                     </el-select>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="150">
+            <el-table-column :label="$t('scriptRecord.operation')" width="150">
                 <template slot-scope="scope">
                     <el-row v-if="scope.row.isAdded">
                         <el-button type="primary" size="mini" @click="deleteOperate(scope.$index)">删除</el-button>
diff --git a/src/views/display/scriptRecord/targetCondition.vue b/src/views/display/scriptRecord/targetCondition.vue
index 82bcd0ba5..91e4a35b5 100644
--- a/src/views/display/scriptRecord/targetCondition.vue
+++ b/src/views/display/scriptRecord/targetCondition.vue
@@ -40,7 +40,7 @@
         data(){
             return{
                 deviceConditionList:[],
-                conditionTitle:"目标条件",
+                conditionTitle:this.$t("scriptRecord.conditionTitle"),
                 isAdding:false,
                 // fieldS:"",
             }

From fc6279efdfa34564f55b047c36a3796c8e470d57 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Mon, 12 Aug 2019 09:36:27 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js  | 166 +++++++++++++++++++++----------------------
 src/utils/baseUrl.js |   4 +-
 2 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 724458007..adee8eb9b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -137,30 +137,30 @@ export const constantRoutes = [
 	// 扫码登录
 	{
 		path: '/dp/login',
-		component: resolve => require(['@/views/login/loginNewScreen'], resolve),
+		component: () => import('@/views/login/loginNewScreen'),
 		hidden: true
 	},
 	// 密码登录
 	{
 		path: '/dp/login1',
-		component: resolve => require(['@/views/login/loginScreen'], resolve),
+		component: () => import('@/views/login/loginScreen'),
 		hidden: true
 	},
 	// 扫码登录
 	{
 		path: '/plan/login',
-		component: resolve => require(['@/views/login/loginNewPlan'], resolve),
+		component: () => import('@/views/login/loginNewPlan'),
 		hidden: true
 	},
 	// 密码登录
 	{
 		path: '/plan/login1',
-		component: resolve => require(['@/views/login/loginPlan'], resolve),
+		component: () => import('@/views/login/loginPlan'),
 		hidden: true
 	},
 	{
 		path: '/jlmap3d/edit',
-		component: resolve => require(['@/views/jlmap3d/jlmap3dedit'], resolve),
+		component: () => import('@/views/jlmap3d/jlmap3dedit'),
 		hidden: true
 	},
 	{
@@ -201,32 +201,32 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'dashboard',
-				component: resolve => require(['@/views/dashboard/index.vue'], resolve)
+				component: () => import('@/views/dashboard/index.vue')
 			}
 		]
 	},
 	{
 		path: '/display/:mode',
-		component: resolve => require(['@/views/display/index'], resolve),
+		component: () => import('@/views/display/index'),
 		meta: {
 		},
 		hidden: true
 	},
 	{
 		path: '/trainroom',
-		component: resolve => require(['@/views/trainRoom/index'], resolve),
+		component: () => import('@/views/trainRoom/index'),
 		meta: {
 		},
 		hidden: true
 	},
 	{
 		path: '/jointTraining',
-		component: resolve => require(['@/views/jointTraining/index'], resolve),
+		component: () => import('@/views/jointTraining/index'),
 		hidden: true
 	},
 	{
 		path: '/jlmap3d',
-		component: resolve => require(['@/views/jlmap3d/index'], resolve),
+		component: () => import('@/views/jlmap3d/index'),
 		meta: {
 		},
 		hidden: true
@@ -241,7 +241,7 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'skinStyle',
-				component: resolve => require(['@/views/map/skinStyle/index'], resolve),
+				component: () => import('@/views/map/skinStyle/index'),
 				meta: {
 					i18n: 'router.skinManage'
 				}
@@ -249,19 +249,19 @@ export const asyncRouter = [
 			{
 				path: 'skinStyle/draft/:mode/:skinStyleId',
 				hidden: true,
-				component: resolve => require(['@/views/map/skinStyle/draft'], resolve)
+				component: () => import('@/views/map/skinStyle/draft')
 			},
 			{
 				path: 'draw',
 				redirect: '/map/draw/0/draft',
-				component: resolve => require(['@/views/map/mapdraft/index'], resolve),
+				component: () => import('@/views/map/mapdraft/index'),
 				meta: {
 					i18n: 'router.mapDraw'
 				},
 				children: [
 					{
 						path: ':mapId/:view',
-						component: resolve => require(['@/views/map/mapdraft/mapedit/index'], resolve),
+						component: () => import('@/views/map/mapdraft/mapedit/index'),
 						hidden: true
 					}
 				]
@@ -269,19 +269,19 @@ export const asyncRouter = [
 			{
 				path: 'runPlan',
 				redirect: '/map/runPlan/view/draft',
-				component: resolve => require(['@/views/map/runplan/index'], resolve),
+				component: () => import('@/views/map/runplan/index'),
 				meta: {
 					i18n: 'router.runPlanManage'
 				},
 				children: [{
 					path: 'view/:mode',
-					component: resolve => require(['@/views/map/runplan/chart'], resolve),
+					component: () => import('@/views/map/runplan/chart'),
 					hidden: true
 				}]
 			},
 			{
 				path: 'product',
-				component: resolve => require(['@/views/lesson/trainingcategory/index'], resolve),
+				component: () => import('@/views/lesson/trainingcategory/index'),
 				meta: {
 					i18n: 'router.productEdit'
 				}
@@ -299,28 +299,28 @@ export const asyncRouter = [
 			{
 				path: 'record',
 				redirect: '/lesson/record/training/0/null',
-				component: resolve => require(['@/views/lesson/trainingrecord/index'], resolve),
+				component: () => import('@/views/lesson/trainingrecord/index'),
 				meta: {
 					i18n: 'router.trainingRecord'
 				},
 				children: [
 					{
 						path: 'training/:trainingId/:trainingName',
-						component: resolve => require(['@/views/lesson/trainingrecord/manage/index'], resolve),
+						component: () => import('@/views/lesson/trainingrecord/manage/index'),
 						hidden: true
 					}
 				]
 			},
 			{
 				path: 'manage/taskManage',
-				component: resolve => require(['@/views/lesson/taskmanage/list'], resolve),
+				component: () => import('@/views/lesson/taskmanage/list'),
 				meta: {
 					i18n: 'router.taskManage'
 				}
 			},
 			{
 				path: 'manage/trainingRule',
-				component: resolve => require(['@/views/lesson/trainingRule/list'], resolve),
+				component: () => import('@/views/lesson/trainingRule/list'),
 				meta: {
 					i18n: 'router.trainingRule'
 				}
@@ -328,20 +328,20 @@ export const asyncRouter = [
 			{
 				path: 'manage/trainingRule/detail',
 				hidden: true,
-				component: resolve => require(['@/views/lesson/trainingRule/detail/index'], resolve),
+				component: () => import('@/views/lesson/trainingRule/detail/index'),
 				meta: {
 				}
 			},
 			{
 				path: 'manage/training',
-				component: resolve => require(['@/views/lesson/trainingmanage/index'], resolve),
+				component: () => import('@/views/lesson/trainingmanage/index'),
 				meta: {
 					i18n: 'router.trainingManage'
 				}
 			},
 			{
 				path: 'edit',
-				component: resolve => require(['@/views/lesson/lessoncategory/index'], resolve),
+				component: () => import('@/views/lesson/lessoncategory/index'),
 				meta: {
 					i18n: 'router.lessonEdit'
 				}
@@ -357,7 +357,7 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'scriptManage',
-				component: resolve => require(['@/views/lesson/scriptmanage/list'], resolve),
+				component: () => import('@/views/lesson/scriptmanage/list'),
 				meta: {
 					i18n: 'router.scriptManage'
 				}
@@ -367,14 +367,14 @@ export const asyncRouter = [
 	{
 		path: '/teach',
 		redirect: '/teach/home',
-		component: resolve => require(['@/views/teach/index'], resolve),
+		component: () => import('@/views/teach/index'),
 		meta: {
 			roles: [admin, userLesson, user]
 		},
 		children: [
 			{
 				path: 'home',
-				component: resolve => require(['@/views/teach/home'], resolve),
+				component: () => import('@/views/teach/home'),
 				meta: {
 					i18n: 'router.teachSystem'
 				}
@@ -382,7 +382,7 @@ export const asyncRouter = [
 			{
 				// 课程详情
 				path: 'detail/:lessonId',
-				component: resolve => require(['@/views/teach/detail/index'], resolve),
+				component: () => import('@/views/teach/detail/index'),
 				meta: {
 				},
 				hidden: true
@@ -390,14 +390,14 @@ export const asyncRouter = [
 			{
 				// 实训详情
 				path: 'practical/:trainingId/:lessonId',
-				component: resolve => require(['@/views/teach/practical/index'], resolve),
+				component: () => import('@/views/teach/practical/index'),
 				meta: {
 				},
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				component: resolve => require(['@/views/components/pay/index'], resolve),
+				component: () => import('@/views/components/pay/index'),
 				meta: {
 				},
 				hidden: true
@@ -407,14 +407,14 @@ export const asyncRouter = [
 	{
 		path: '/exam',
 		redirect: '/exam/home',
-		component: resolve => require(['@/views/exam/index'], resolve),
+		component: () => import('@/views/exam/index'),
 		meta: {
 			roles: [admin, userExam, user]
 		},
 		children: [
 			{
 				path: 'home',
-				component: resolve => require(['@/views/exam/home'], resolve),
+				component: () => import('@/views/exam/home'),
 				meta: {
 					i18n: 'router.examSystem'
 				}
@@ -422,40 +422,40 @@ export const asyncRouter = [
 			{
 				// 试卷详情
 				path: 'detail/:examId',
-				component: resolve => require(['@/views/exam/detail/examDetail'], resolve),
+				component: () => import('@/views/exam/detail/examDetail'),
 				hidden: true
 			},
 			{
 				path: 'course/:lessonId',
-				component: resolve => require(['@/views/exam/detail/courseDetail'], resolve),
+				component: () => import('@/views/exam/detail/courseDetail'),
 				hidden: true
 			},
 			{
 				// 规则管理
 				path: 'examRule/manage',
-				component: resolve => require(['@/views/publish/examRule/index'], resolve),
+				component: () => import('@/views/publish/examRule/index'),
 				hidden: true
 			},
 			{
 				path: 'examRule/draft/:mode/:ruleId/:lessonId',
 				hidden: true,
-				component: resolve => require(['@/views/publish/examRule/draft/index'], resolve)
+				component: () => import('@/views/publish/examRule/draft/index')
 			},
 			{
 				path: 'pay/:lessonId',
-				component: resolve => require(['@/views/components/pay/index'], resolve),
+				component: () => import('@/views/components/pay/index'),
 				hidden: true
 			},
 			{
 				// 开始考试
 				path: 'questionDetail/:examQuestionId',
-				component: resolve => require(['@/views/exam/detail/questionDetail'], resolve),
+				component: () => import('@/views/exam/detail/questionDetail'),
 				hidden: true
 			},
 			{
 				// 考试结果
 				path: 'result/:userExamId',
-				component: resolve => require(['@/views/exam/result'], resolve),
+				component: () => import('@/views/exam/result'),
 				hidden: true
 			}
 		]
@@ -463,26 +463,26 @@ export const asyncRouter = [
 	{
 		path: '/demonstration',
 		redirect: '/demonstration/home',
-		component: resolve => require(['@/views/demonstration/index'], resolve),
+		component: () => import('@/views/demonstration/index'),
 		meta: {
 			roles: [admin, userSimulation, user]
 		},
 		children: [
 			{
 				path: 'home',
-				component: resolve => require(['@/views/demonstration/home'], resolve),
+				component: () => import('@/views/demonstration/home'),
 				meta: {
 					i18n: 'router.demonstrationSystem'
 				}
 			},
 			{
 				path: 'detail/:mapId',
-				component: resolve => require(['@/views/demonstration/detail/index'], resolve),
+				component: () => import('@/views/demonstration/detail/index'),
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				component: resolve => require(['@/views/components/pay/index'], resolve),
+				component: () => import('@/views/components/pay/index'),
 				hidden: true
 			}
 		]
@@ -490,14 +490,14 @@ export const asyncRouter = [
 	{
 		path: '/dp',
 		redirect: '/dp/home',
-		component: resolve => require(['@/views/screenMonitor/index'], resolve),
+		component: () => import('@/views/screenMonitor/index'),
 		meta: {
 			roles: [admin, userScreen, user]
 		},
 		children: [
 			{
 				path: 'home',
-				component: resolve => require(['@/views/screenMonitor/home'], resolve),
+				component: () => import('@/views/screenMonitor/home'),
 				meta: {
 					i18n: 'router.dpSystem'
 				},
@@ -505,19 +505,19 @@ export const asyncRouter = [
 			},
 			{
 				path: 'detail/:lessonId',
-				component: resolve => require(['@/views/screenMonitor/detail/index'], resolve),
+				component: () => import('@/views/screenMonitor/detail/index'),
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				component: resolve => require(['@/views/components/pay/index'], resolve),
+				component: () => import('@/views/components/pay/index'),
 				hidden: true
 			}
 		]
 	},
 	{
 		path: '/plan/tool',
-		component: resolve => require(['@/views/planMonitor/editTool/index'], resolve),
+		component: () => import('@/views/planMonitor/editTool/index'),
 		meta: {
 		},
 		hidden: true
@@ -525,14 +525,14 @@ export const asyncRouter = [
 	{
 		path: '/plan',
 		redirect: '/plan/home',
-		component: resolve => require(['@/views/planMonitor/index'], resolve),
+		component: () => import('@/views/planMonitor/index'),
 		meta: {
 			roles: [admin, user]
 		},
 		children: [
 			{
 				path: 'home',
-				component: resolve => require(['@/views/planMonitor/home'], resolve),
+				component: () => import('@/views/planMonitor/home'),
 				meta: {
 					i18n: 'router.planSystem'
 				},
@@ -540,12 +540,12 @@ export const asyncRouter = [
 			},
 			{
 				path: 'detail/:lessonId',
-				component: resolve => require(['@/views/planMonitor/detail'], resolve),
+				component: () => import('@/views/planMonitor/detail'),
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				component: resolve => require(['@/views/components/pay/index'], resolve),
+				component: () => import('@/views/components/pay/index'),
 				hidden: true
 			}
 		]
@@ -559,7 +559,7 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'manage',
-				component: resolve => require(['@/views/replay/index'], resolve),
+				component: () => import('@/views/replay/index'),
 				meta: {
 					i18n: 'router.replayManage'
 				}
@@ -575,14 +575,14 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'manage',
-				component: resolve => require(['@/views/package/index'], resolve),
+				component: () => import('@/views/package/index'),
 				meta: {
 					i18n: 'router.permissionManage'
 				}
 			},
 			{
 				path: 'draft',
-				component: resolve => require(['@/views/package/draft/ruleForm'], resolve),
+				component: () => import('@/views/package/draft/ruleForm'),
 				hidden: true
 			}
 		]
@@ -597,78 +597,78 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'map',
-				component: resolve => require(['@/views/publish/publishMap/index'], resolve),
+				component: () => import('@/views/publish/publishMap/index'),
 				meta: {
 					i18n: 'router.publishMapManage'
 				}
 			},
 			{
 				path: 'product',
-				component: resolve => require(['@/views/publish/productStatus/index'], resolve),
+				component: () => import('@/views/publish/productStatus/index'),
 				meta: {
 					i18n: 'router.productStateManage'
 				}
 			},
 			{
 				path: 'lesson',
-				component: resolve => require(['@/views/publish/publishLesson/index'], resolve),
+				component: () => import('@/views/publish/publishLesson/index'),
 				meta: {
 					i18n: 'router.publishLessonManage'
 				}
 			},
 			// {
 			// 	path: 'script',
-			// 	component: resolve => require(['@/views/publish/simulationScript/index'], resolve),
+			// 	component:() => import('@/views/publish/simulationScript/index'),
 			// 	meta: {
 			// 		title: '仿真脚本管理',
 			// 	}
 			// },
 			{
 				path: 'runPlan/template',
-				component: resolve => require(['@/views/publish/runPlanTemplate/index'], resolve),
+				component: () => import('@/views/publish/runPlanTemplate/index'),
 				meta: {
 					i18n: 'router.runPlanTemplateManage'
 				}
 			},
 			{
 				path: 'runPlan/common',
-				component: resolve => require(['@/views/publish/runPlanCommon/index'], resolve),
+				component: () => import('@/views/publish/runPlanCommon/index'),
 				meta: {
 					i18n: 'router.runPlanCommonManage'
 				}
 			},
 			{
 				path: 'runPlan/everyDay',
-				component: resolve => require(['@/views/publish/runPlanEveryDay/index'], resolve),
+				component: () => import('@/views/publish/runPlanEveryDay/index'),
 				meta: {
 					i18n: 'router.runPlanEveryDayManage'
 				}
 			},
 			{
 				path: 'examRule/manage',
-				component: resolve => require(['@/views/publish/examRule/index'], resolve),
+				component: () => import('@/views/publish/examRule/index'),
 				meta: {
 					i18n: 'router.examRuleManage'
 				}
 			},
 			{
 				path: 'map/draft/:mode/:mapId',
-				component: resolve => require(['@/views/publish/publishMap/draft'], resolve),
+				component: () => import('@/views/publish/publishMap/draft'),
 				hidden: true
 			},
 			{
 				path: 'examRule/draft/:mode/:ruleId/:lessonId',
-				component: resolve => require(['@/views/publish/examRule/draft/index'], resolve),
+				component: () => import('@/views/publish/examRule/draft/index'),
 				hidden: true
 			},
 			{
 				path: 'runPlan/common/:mode',
-				component: resolve => require(['@/views/publish/runPlanCommon/draft'], resolve),
+				component: () => import('@/views/publish/runPlanCommon/draft'),
 				hidden: true
 			},
 			{
 				path: 'runPlan/view/:mode',
-				component: resolve => require(['@/views/map/runplan/chart'], resolve),
+				component: () => import('@/views/map/runplan/chart'),
 				hidden: true
 			}
 		]
@@ -683,28 +683,28 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'commodity/manage',
-				component: resolve => require(['@/views/orderauthor/commodity/index'], resolve),
+				component: () => import('@/views/orderauthor/commodity/index'),
 				meta: {
 					i18n: 'router.commodityManage'
 				}
 			},
 			{
 				path: 'order/manage',
-				component: resolve => require(['@/views/orderauthor/order/list'], resolve),
+				component: () => import('@/views/orderauthor/order/list'),
 				meta: {
 					i18n: 'router.orderManage'
 				}
 			},
 			{
 				path: 'author/manage',
-				component: resolve => require(['@/views/orderauthor/author/index'], resolve),
+				component: () => import('@/views/orderauthor/author/index'),
 				meta: {
 					i18n: 'router.authorityManage'
 				}
 			},
 			{
 				path: 'transfer/manage',
-				component: resolve => require(['@/views/orderauthor/permission/index'], resolve),
+				component: () => import('@/views/orderauthor/permission/index'),
 				meta: {
 					i18n: 'router.authorityTransferManage'
 				}
@@ -712,7 +712,7 @@ export const asyncRouter = [
 			{
 				path: 'commodity/draft/:mode/:commodityId',
 				hidden: true,
-				component: resolve => require(['@/views/orderauthor/commodity/draft'], resolve),
+				component: () => import('@/views/orderauthor/commodity/draft'),
 				meta: {
 					i18n: 'router.addCommodity'
 				}
@@ -720,7 +720,7 @@ export const asyncRouter = [
 			{
 				path: 'order/draft/:mode/:orderId',
 				hidden: true,
-				component: resolve => require(['@/views/orderauthor/order/draft'], resolve),
+				component: () => import('@/views/orderauthor/order/draft'),
 				meta: {
 					i18n: 'router.addOrder'
 				}
@@ -728,19 +728,19 @@ export const asyncRouter = [
 			{
 				path: 'author/draft/:mode/:userId',
 				hidden: true,
-				component: resolve => require(['@/views/orderauthor/author/draft'], resolve),
+				component: () => import('@/views/orderauthor/author/draft'),
 				meta: {
 					i18n: 'router.addCoursePermissions'
 				}
 			},
 			{
 				path: 'transfer/detail/:permissionId',
-				component: resolve => require(['@/views/orderauthor/permission/detail'], resolve),
+				component: () => import('@/views/orderauthor/permission/detail'),
 				hidden: true
 			},
 			{
 				path: 'transfer/package',
-				component: resolve => require(['@/views/orderauthor/permission/draft/ruleForm'], resolve),
+				component: () => import('@/views/orderauthor/permission/draft/ruleForm'),
 				hidden: true
 			}
 		]
@@ -755,7 +755,7 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'dictionary',
-				component: resolve => require(['@/views/management/dictionary/index'], resolve),
+				component: () => import('@/views/management/dictionary/index'),
 				meta: {
 					i18n: 'router.dataDictionary'
 				}
@@ -763,42 +763,42 @@ export const asyncRouter = [
 			{
 				path: 'dictionary/detail',
 				hidden: true,
-				component: resolve => require(['@/views/management/dictionaryDetail/index'], resolve),
+				component: () => import('@/views/management/dictionaryDetail/index'),
 				meta: {
 					i18n: 'router.dataDictionaryDetails'
 				}
 			},
 			{
 				path: 'userManage',
-				component: resolve => require(['@/views/management/userControl/index'], resolve),
+				component: () => import('@/views/management/userControl/index'),
 				meta: {
 					i18n: 'router.userManage'
 				}
 			},
 			{
 				path: 'userTrainingManage',
-				component: resolve => require(['@/views/management/userTraining/index'], resolve),
+				component: () => import('@/views/management/userTraining/index'),
 				meta: {
 					i18n: 'router.userTrainingManage'
 				}
 			},
 			{
 				path: 'userExamManage',
-				component: resolve => require(['@/views/management/userExam/index'], resolve),
+				component: () => import('@/views/management/userExam/index'),
 				meta: {
 					i18n: 'router.userExamManage'
 				}
 			},
 			{
 				path: 'userSimulationManage',
-				component: resolve => require(['@/views/management/userSimulation/index'], resolve),
+				component: () => import('@/views/management/userSimulation/index'),
 				meta: {
 					i18n: 'router.userSimulationManage'
 				}
 			},
 			{
 				path: 'existingSimulation',
-				component: resolve => require(['@/views/management/existingSimulation/index'], resolve),
+				component: () => import('@/views/management/existingSimulation/index'),
 				meta: {
 					i18n: 'router.existingSimulation'
 				}
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 72be3b2f1..2e575c51e 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,8 +3,8 @@ 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 = 'http://192.168.3.5:9000'; // 袁琪
+		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.4:9000' // 琰培
 	} else {

From 358b3cf6d0d2261bc95eac85995d56dd34719222 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 12 Aug 2019 10:14:19 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmap/config/skinStyle/bejing_01.js  |  7 ++++++-
 src/jmap/config/skinStyle/chengdu_03.js |  7 ++++++-
 src/jmap/config/skinStyle/chengdu_04.js |  7 ++++++-
 src/jmap/config/skinStyle/fuzhou_01.js  |  5 ++++-
 src/jmap/shape/Train/TrainBody.js       | 20 +++++++++++++-------
 src/jmap/shape/Train/index.js           | 18 ++++++++++--------
 6 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/src/jmap/config/skinStyle/bejing_01.js b/src/jmap/config/skinStyle/bejing_01.js
index e510ccd53..710a1a982 100644
--- a/src/jmap/config/skinStyle/bejing_01.js
+++ b/src/jmap/config/skinStyle/bejing_01.js
@@ -456,7 +456,12 @@ class SkinStyle extends defaultStyle {
 				fontFamily: 'consolas', // 默认字体 族类
 				haveTextHSDA: true, // 是否需创建textHSDA对象
 				haveArrowText: true, // 是否需创建arrowText对象
-				haveTrainBorder: false// 是否需创建trainBorder对象
+				haveTrainBorder: false, // 是否需创建trainBorder对象
+				aspectRatio: 7/5, // 字体宽高比例（用以拼接text是计算位置）
+				textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
+				trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
+				useSelfFormat: true, // 使用配置项的nameFormat
+				useSelfText: true // 使用配置项的字体大小
 			},
 			trainStatusStyle: {
 				destinationStatus: [
diff --git a/src/jmap/config/skinStyle/chengdu_03.js b/src/jmap/config/skinStyle/chengdu_03.js
index 462a2c286..796fd8bee 100644
--- a/src/jmap/config/skinStyle/chengdu_03.js
+++ b/src/jmap/config/skinStyle/chengdu_03.js
@@ -422,7 +422,12 @@ class SkinStyle extends defaultStyle {
 				fontFamily: 'consolas', // 默认字体 族类
 				haveTextHSDA: true, // 是否需创建textHSDA对象
 				haveArrowText: true, // 是否需创建arrowText对象
-				haveTrainBorder: false // 是否需创建trainBorder对象
+				haveTrainBorder: false, // 是否需创建trainBorder对象
+				aspectRatio: 7/5, // 字体宽高比例（用以拼接text是计算位置）
+				textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
+				trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
+				useSelfFormat: true, // 使用配置项的nameFormat
+				useSelfText: true // 使用配置项的字体大小
 			},
 			trainStatusStyle: {
 				defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
diff --git a/src/jmap/config/skinStyle/chengdu_04.js b/src/jmap/config/skinStyle/chengdu_04.js
index 7ac93a2e0..1aa852dc3 100644
--- a/src/jmap/config/skinStyle/chengdu_04.js
+++ b/src/jmap/config/skinStyle/chengdu_04.js
@@ -419,7 +419,12 @@ class SkinStyle extends defaultStyle {
 				fontFamily: 'consolas', // 默认字体 族类
 				haveTextHSDA: true, // 是否需创建textHSDA对象
 				haveArrowText: true, // 是否需创建arrowText对象
-				haveTrainBorder: false // 是否需创建trainBorder对象
+				haveTrainBorder: false, // 是否需创建trainBorder对象
+				aspectRatio: 7/5, // 字体宽高比例（用以拼接text是计算位置）
+				textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
+				trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
+				useSelfFormat: true, // 使用配置项的nameFormat
+				useSelfText: true // 使用配置项的字体大小
 			},
 			trainStatusStyle: {
 				defaultDestinationColor: '#FFFFFF', // 默认目的地状态显示颜色
diff --git a/src/jmap/config/skinStyle/fuzhou_01.js b/src/jmap/config/skinStyle/fuzhou_01.js
index e0b005879..61e8bd6c9 100644
--- a/src/jmap/config/skinStyle/fuzhou_01.js
+++ b/src/jmap/config/skinStyle/fuzhou_01.js
@@ -370,7 +370,10 @@ class SkinStyle extends defaultStyle {
 				nameFontSize: 15, // 字体大小
 				haveTextHSDA: false, // 是否需创建textHSDA对象
 				haveArrowText: true, // 是否需创建arrowText对象
-				haveTrainBorder: false// 是否需创建trainBorder对象
+				haveTrainBorder: false, // 是否需创建trainBorder对象
+				aspectRatio: 8/15, // 字体宽高比例（用以拼接text是计算位置）
+				textOffset: 1, // 字体偏移（用以控制字体据车头的距离）
+				trainWidthMoreText: 2 // 计算列车长度时--列车长比text多出尺寸
 			},
 			trainStatusStyle: {
 				destinationStatus: [
diff --git a/src/jmap/shape/Train/TrainBody.js b/src/jmap/shape/Train/TrainBody.js
index 3d47dc083..714099fda 100644
--- a/src/jmap/shape/Train/TrainBody.js
+++ b/src/jmap/shape/Train/TrainBody.js
@@ -11,6 +11,7 @@ export default class TrainBody extends Group {
 		super();
 		this.model = model;
 		this.deviceModel = model.model;
+		this.nameFormat = model.nameFormat;
 		this.create();
 		this.createMouse(); 			// 鼠标事件
 	}
@@ -158,7 +159,7 @@ export default class TrainBody extends Group {
 			style.Train.trainBody.specialTrainType.some((item) =>{
 				if (model.type === item.type) {
 					serviceNumber = item.serviceNumber;
-					style.Train.trainBody.nameFormat = item.nameFormat;
+					this.nameFormat = item.nameFormat;
 					return true;
 				}
 			});
@@ -213,20 +214,25 @@ export default class TrainBody extends Group {
 		this.trainBodyBox && this.trainBodyBox.setColor(key, color);
 	}
 	formatChangePosition(model, style) {
-		if (style.Train.trainBody.trainNameFormat) {
-			const arr = style.Train.trainBody.trainNameFormat.split(':');
+		if (this.nameFormat) {
+			const arr = this.nameFormat.split(':');
+			let fontNumber = 0;
 			arr.forEach(ele => {
 				if (ele == 'targetCode') {
-					this.textTrainNumber.setStyle('x', parseInt(model.point.x + style.Train.trainNumber.trainNumberOffset.x));
+					this.textTrainNumber.setStyle('x', parseInt(model.point.x + fontNumber * model.fontSize * style.Train.common.aspectRatio + style.Train.common.textOffset) );
+					fontNumber += (style.Train.trainNumber.targetCodePrefix || '').length;
 					this.add(this.textTrainNumber);
 				} else if (ele == 'serviceNumber') {
-					this.textTrainServer.setStyle('x', parseInt(model.point.x + style.Train.trainServer.trainServerOffset.x));
+					this.textTrainServer.setStyle('x', parseInt(model.point.x + fontNumber * model.fontSize * style.Train.common.aspectRatio + style.Train.common.textOffset));
+					fontNumber += (style.Train.trainServer.serviceNumberPrefix || '').length;
 					this.add(this.textTrainServer);
 				} else if (ele == 'tripNumber') {
-					this.textTrainTarget.setStyle('x', parseInt(model.point.x + style.Train.trainTarget.trainTargetOffset.x));
+					this.textTrainTarget.setStyle('x', parseInt(model.point.x + fontNumber * model.fontSize * style.Train.common.aspectRatio + style.Train.common.textOffset));
+					fontNumber += (style.Train.trainTarget.tripNumberPrefix || '').length;
 					this.add(this.textTrainTarget);
 				} else if (ele == 'groupNumber') {
-					this.textTrainTargetNumber.setStyle('x', parseInt(model.point.x + style.Train.textTrainTargetNumber.trainTargetNumberOffset.x));
+					this.textTrainTargetNumber.setStyle('x', parseInt(model.point.x + fontNumber * model.fontSize * style.Train.common.aspectRatio + style.Train.common.textOffset));
+					fontNumber += (style.Train.trainTargetNumber.groupNumberPrefix || '').length;
 					this.add(this.textTrainTargetNumber);
 				}
 			});
diff --git a/src/jmap/shape/Train/index.js b/src/jmap/shape/Train/index.js
index d0f84ddba..5ee1e3417 100644
--- a/src/jmap/shape/Train/index.js
+++ b/src/jmap/shape/Train/index.js
@@ -16,8 +16,9 @@ export default class Train extends Group {
 		this.z = 40;
 		this.size = 0;
 		this.section = null;
-		this.fontSize = style.Train.common.nameFontSize || style.Train.common.trainTextFontSize;
+		this.fontSize = style.Train.common.useSelfText?style.Train.common.nameFontSize || style.Train.common.trainTextFontSize:model.nameFontSize || style.Train.common.nameFontSize || style.Train.common.trainTextFontSize;
 		this.newScale = this.fontSize / style.Train.common.trainTextFontSize;
+		this.nameFormat = style.Train.common.useSelfFormat?style.Train.trainBody.trainNameFormat:model.nameFormat || style.Train.trainBody.trainNameFormat;
 		this.create();
 		this.setState(model);
 	}
@@ -68,6 +69,7 @@ export default class Train extends Group {
 				runControlStatus: model.runControlStatus,
 				runStatus: model.runStatus,
 				fontSize: this.fontSize,
+				nameFormat: this.nameFormat,
 				type: model.type,
 				speed: model.speed,
 				maLen: model.maLen,
@@ -290,24 +292,24 @@ export default class Train extends Group {
 	// 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
 	isChangeTrainWidth(model, style) {
 		if (!style.Train.trainBody.changeTrainWidth) { return; }
-		if (style.Train.trainBody.trainNameFormat) {
-			const arr = style.Train.trainBody.trainNameFormat.split(':');
+		if (this.nameFormat) {
+			const arr = this.nameFormat.split(':');
 			arr.forEach(ele => {
 				switch (ele) {
 				case 'targetCode': {
-					this.size += style.Train.trainNumber.targetCodePrefix.length || 0;
+					this.size += (style.Train.trainNumber.targetCodePrefix || '').length;
 					break;
 				}
 				case 'serviceNumber': {
-					this.size += style.Train.trainServer.serviceNumberPrefix.length || 0;
+					this.size += (style.Train.trainServer.serviceNumberPrefix || '').length;
 					break;
 				}
 				case 'tripNumber': {
-					this.size += style.Train.trainTarget.tripNumberPrefix.length || 0;
+					this.size += (style.Train.trainTarget.tripNumberPrefix || '').length;
 					break;
 				}
 				case 'groupNumber': {
-					this.size += style.Train.trainTargetNumber.groupNumberPrefix.length || 0;
+					this.size += (style.Train.trainTargetNumber.groupNumberPrefix || '').length;
 					break;
 				}
 				}
@@ -315,7 +317,7 @@ export default class Train extends Group {
 		} else {
 			this.size = 9;
 		}
-		this.style.Train.common.trainWidth = this.size * this.fontSize * (2 / 3) -16;
+		this.style.Train.common.trainWidth = this.size * this.fontSize * this.style.Train.common.aspectRatio + this.style.Train.common.trainWidthMoreText;
 	}
 	removeTrainDetail() {
 		this.trainB && this.trainB.removeTrainDetail();

From 52e9b1f79f2d623a09f129d38d08a5ee628b9f70 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Mon, 12 Aug 2019 10:18:59 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/error.js                |  3 ++-
 src/i18n/langs/en/global.js               |  6 ++++-
 src/i18n/langs/zh/error.js                |  3 ++-
 src/i18n/langs/zh/global.js               |  6 ++++-
 src/main.js                               |  2 +-
 src/views/management/dictionary/index.vue | 28 +++++++++++------------
 6 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/i18n/langs/en/error.js b/src/i18n/langs/en/error.js
index aff088752..b2b723a92 100644
--- a/src/i18n/langs/en/error.js
+++ b/src/i18n/langs/en/error.js
@@ -5,5 +5,6 @@ export default {
 	getMapStepsFailed: 'Failed to get map step data',
 	resetFailed: 'Reset failure',
 	startTrainingFailed: 'Failure to start training',
-	saveBackgroundFailed: 'Failed to save background'
+	saveBackgroundFailed: 'Failed to save background',
+	deleteFailed: 'Failed to delete'
 };
diff --git a/src/i18n/langs/en/global.js b/src/i18n/langs/en/global.js
index f4d63827b..d8b9e9f2a 100644
--- a/src/i18n/langs/en/global.js
+++ b/src/i18n/langs/en/global.js
@@ -6,5 +6,9 @@ export default {
 	cancel: 'Cancel',
 	reset: 'Reset',
 	coachingModel: 'Coaching model',
-	normalMode: 'Normal mode'
+	normalMode: 'Normal mode',
+	operate: 'Operate',
+	edit: 'Edit',
+	delete: 'Delete',
+	add: 'Add'
 };
diff --git a/src/i18n/langs/zh/error.js b/src/i18n/langs/zh/error.js
index fa4c52d7d..7cd8432d8 100644
--- a/src/i18n/langs/zh/error.js
+++ b/src/i18n/langs/zh/error.js
@@ -5,5 +5,6 @@ export default {
 	getMapStepsFailed: '获取地图步骤数据',
 	resetFailed: '重置失败',
 	startTrainingFailed: '开始实训失败',
-	saveBackgroundFailed: '保存背景失败'
+	saveBackgroundFailed: '保存背景失败',
+	deleteFailed: '删除失败'
 };
diff --git a/src/i18n/langs/zh/global.js b/src/i18n/langs/zh/global.js
index 374ed2e0e..37ccc8dca 100644
--- a/src/i18n/langs/zh/global.js
+++ b/src/i18n/langs/zh/global.js
@@ -6,5 +6,9 @@ export default {
 	confirm: '确 定',
 	cancel: '取 消',
 	coachingModel: '教练模式',
-	normalMode: '正常模式'
+	normalMode: '正常模式',
+	operate: '操 作',
+	edit: '编 辑',
+	delete: '删 除',
+	add: '新 增'
 };
diff --git a/src/main.js b/src/main.js
index 99c4decfd..db2e58341 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,7 +27,7 @@ Vue.use(VueI18n);
 Vue.config.productionTip = false;
 
 export const i18n = new VueI18n({
-	locale: LangStorage.getLang('zh'),
+	locale: LangStorage.getLang('en'),
 	messages
 });
 
diff --git a/src/views/management/dictionary/index.vue b/src/views/management/dictionary/index.vue
index b8a97fe48..604f74f4a 100644
--- a/src/views/management/dictionary/index.vue
+++ b/src/views/management/dictionary/index.vue
@@ -26,15 +26,15 @@ export default {
 				queryObject: {
 					code: {
 						type: 'text',
-						label: '编码'
+						label: this.$t('system.code')
 					},
 					name: {
 						type: 'text',
-						label: '名称'
+						label: this.$t('system.name')
 					},
 					status: {
 						type: 'select',
-						label: '状态',
+						label: this.$t('system.status'),
 						config: {
 							data: this.$ConstSelect.Status
 						}
@@ -48,27 +48,27 @@ export default {
 				indexShow: true,
 				columns: [
 					{
-						title: '编码',
+						title: this.$t('system.code'),
 						prop: 'code'
 					},
 					{
-						title: '名称',
+						title: this.$t('system.name'),
 						prop: 'name'
 					},
 					{
-						title: '状态',
+						title: this.$t('system.status'),
 						prop: 'status',
 						type: 'tag',
 						columnValue: (row) => { return this.$ConstSelect.translate(row.status, 'Status'); },
 						tagType: (row) => { if (row.status === '0') { return 'danger'; } else { return 'success'; } }
 					},
 					{
-						title: '说明',
+						title: this.$t('system.remarks'),
 						prop: 'remarks'
 					},
 					{
 						type: 'button',
-						title: '操作',
+						title: this.$t('global.operate'),
 						width: '250',
 						buttons: [
 							{
@@ -76,11 +76,11 @@ export default {
 								handleClick: this.handleViewDetail
 							},
 							{
-								name: '编辑',
+								name: this.$t('global.edit'),
 								handleClick: this.handleEdit
 							},
 							{
-								name: '删除',
+								name: this.$t('global.delete'),
 								handleClick: this.handleDelete,
 								type: 'danger'
 							}
@@ -88,7 +88,7 @@ export default {
 					}
 				],
 				actions: [
-					{ text: '新增', handler: this.handleAdd }
+					{ text: this.$t('global.add'), handler: this.handleAdd }
 					// { text: '批量删除', btnCode: 'employee_delete', handler: this.handleBatchDelete, type: 'danger' }
 				]
 			},
@@ -115,8 +115,8 @@ export default {
 
 		handleDelete(index, row) {
 			this.$confirm('此操作将删除该类型, 是否继续?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
+				confirmButtonText: this.$t('global.confirm'),
+				cancelButtonText: this.$t('global.cancel'),
 				type: 'warning'
 			}).then(() => {
 				del(row.id).then(response => {
@@ -124,7 +124,7 @@ export default {
 					this.reloadTable();
 				}).catch(() => {
 					this.reloadTable();
-					this.$messageBox('删除失败');
+					this.$messageBox(this.$t('error.deleteFailed'));
 				});
 			});
 		},

From 98e6755aba125d40b095591c9079568f30e77b52 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Mon, 12 Aug 2019 10:41:24 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmap/theme/fuzhou_01/planConvert.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmap/theme/fuzhou_01/planConvert.js b/src/jmap/theme/fuzhou_01/planConvert.js
index 0f0340171..73c52c215 100644
--- a/src/jmap/theme/fuzhou_01/planConvert.js
+++ b/src/jmap/theme/fuzhou_01/planConvert.js
@@ -64,7 +64,7 @@ export default {
 									}
 
 									/** 设置标志*/
-									[need, flag] = [true, false];
+									[need, flag] = [true, true];
 								} else if (reg2.test(value)) {
 									/** 含有特殊字符的时间格式*/
 									[, begTime, endTime] = reg2.exec(value);

From a9d00b042efc074a2ffb82e309ca1ae4db34f599 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 12 Aug 2019 10:57:38 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/beijing_01/menus/menuCancel.vue     | 52 ++++++++---------
 .../theme/chengdu_03/menus/menuCancel.vue     | 56 +++++++++----------
 2 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/src/jmap/theme/beijing_01/menus/menuCancel.vue b/src/jmap/theme/beijing_01/menus/menuCancel.vue
index 97809c807..016299b36 100644
--- a/src/jmap/theme/beijing_01/menus/menuCancel.vue
+++ b/src/jmap/theme/beijing_01/menus/menuCancel.vue
@@ -75,34 +75,36 @@ export default {
 		},
 		initMenu() {
 			this.menuNormal = [];
-			this.stationList.forEach(station => {
-			    if (station.code === station.concentrateStationCode) {
-			        let node = {
-			            label: station.name,
-			            children: []
-			        }
+            let resultCode = this.$route.path.indexOf("/display");
+            if(resultCode === -1){
+                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);
-			                }
+                        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 (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];
 			}
diff --git a/src/jmap/theme/chengdu_03/menus/menuCancel.vue b/src/jmap/theme/chengdu_03/menus/menuCancel.vue
index f92ddd305..87d33f98e 100644
--- a/src/jmap/theme/chengdu_03/menus/menuCancel.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuCancel.vue
@@ -76,41 +76,41 @@ export default {
 			};
 		},
 		initMenu() {
-			// this.menuNormal = [];
-			// this.stationList.forEach(station => {
-			//     if (station.code === station.concentrateStationCode) {
-			//         let node = {
-			//             label: station.name,
-			//             children: []
-			//         }
+			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);
-			//                 }
+			        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,
-			//                     });
-			//                 }
-			//             }
-			//         })
+			                if (station.code == next.code) {
+			                    node.children.push({
+			                        code: elem.code,
+			                        label: elem.name,
+			                        handler: this.mapLocation,
+			                    });
+			                }
+			            }
+			        })
 
-			//         this.menuNormal.push(node);
-			//     }
-			// });
+			        this.menuNormal.push(node);
+			    }
+			});
 
 			if (this.isScreen) {
 				this.menu = [...this.menuScreen];
 			}
-			// else {
-			//     this.menu = [...this.menuNormal];
-			// }
+			else {
+			    this.menu = [...this.menuNormal];
+			}
 		},
 		doShow(point) {
 			this.clickEvent();

From 0bc9d40ad1e38533b6ad57ce1e2a329dba8d14d0 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Mon, 12 Aug 2019 11:01:00 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.staging        |   2 +-
 src/router/index.js | 196 ++++++++++++++++++++++----------------------
 src/utils/sock.js   |  15 ++--
 3 files changed, 106 insertions(+), 107 deletions(-)

diff --git a/.env.staging b/.env.staging
index 74355abe2..e091a3230 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
 # just a flag
-NODE_ENV = 'test'
+NODE_ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = 'https://test.joylink.club/jlcloud'
diff --git a/src/router/index.js b/src/router/index.js
index adee8eb9b..1e1c1ac03 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -125,63 +125,63 @@ export const UrlConfig = {
 export const constantRoutes = [
 	{
 		path: '/login',
-		component: () => import('@/views/login/loginNew'),
+		components: import('@/views/login/loginNew'),
 		hidden: true
 	},
 
 	{
 		path: '/login1',
-		component: () => import('@/views/login/index'),
+		components: import('@/views/login/index'),
 		hidden: true
 	},
 	// 扫码登录
 	{
 		path: '/dp/login',
-		component: () => import('@/views/login/loginNewScreen'),
+		components: import('@/views/login/loginNewScreen'),
 		hidden: true
 	},
 	// 密码登录
 	{
 		path: '/dp/login1',
-		component: () => import('@/views/login/loginScreen'),
+		components: import('@/views/login/loginScreen'),
 		hidden: true
 	},
 	// 扫码登录
 	{
 		path: '/plan/login',
-		component: () => import('@/views/login/loginNewPlan'),
+		components: import('@/views/login/loginNewPlan'),
 		hidden: true
 	},
 	// 密码登录
 	{
 		path: '/plan/login1',
-		component: () => import('@/views/login/loginPlan'),
+		components: import('@/views/login/loginPlan'),
 		hidden: true
 	},
 	{
 		path: '/jlmap3d/edit',
-		component: () => import('@/views/jlmap3d/jlmap3dedit'),
+		components: import('@/views/jlmap3d/jlmap3dedit'),
 		hidden: true
 	},
 	{
 		path: '/401',
-		component: () => import('@/views/error-page/401'),
+		components: import('@/views/error-page/401'),
 		hidden: true
 	},
 
 	{
 		path: '/404',
-		component: () => import('@/views/error-page/404'),
+		components: import('@/views/error-page/404'),
 		hidden: true
 	},
 
 	{
 		path: '/',
-		component: Layout,
+		components: Layout,
 		redirect: '/dashboard',
 		children: [{
 			path: 'dashboard',
-			component: () => import('@/views/dashboard/index'),
+			components: import('@/views/dashboard/index'),
 			meta: {
 				i18n: 'router.homePage',
 				icon: 'dashboard'
@@ -195,38 +195,38 @@ export const constantRoutes = [
 export const asyncRouter = [
 	{
 		path: '/',
-		component: Layout,
+		components: Layout,
 		redirect: '/dashboard',
 		hidden: true,
 		children: [
 			{
 				path: 'dashboard',
-				component: () => import('@/views/dashboard/index.vue')
+				components: import('@/views/dashboard/index.vue')
 			}
 		]
 	},
 	{
 		path: '/display/:mode',
-		component: () => import('@/views/display/index'),
+		components: import('@/views/display/index'),
 		meta: {
 		},
 		hidden: true
 	},
 	{
 		path: '/trainroom',
-		component: () => import('@/views/trainRoom/index'),
+		components: import('@/views/trainRoom/index'),
 		meta: {
 		},
 		hidden: true
 	},
 	{
 		path: '/jointTraining',
-		component: () => import('@/views/jointTraining/index'),
+		components: import('@/views/jointTraining/index'),
 		hidden: true
 	},
 	{
 		path: '/jlmap3d',
-		component: () => import('@/views/jlmap3d/index'),
+		components: import('@/views/jlmap3d/index'),
 		meta: {
 		},
 		hidden: true
@@ -237,11 +237,11 @@ export const asyncRouter = [
 			i18n: 'router.mapManage',
 			roles: [admin, mapCreater]
 		},
-		component: Layout,
+		components: Layout,
 		children: [
 			{
 				path: 'skinStyle',
-				component: () => import('@/views/map/skinStyle/index'),
+				components: import('@/views/map/skinStyle/index'),
 				meta: {
 					i18n: 'router.skinManage'
 				}
@@ -249,19 +249,19 @@ export const asyncRouter = [
 			{
 				path: 'skinStyle/draft/:mode/:skinStyleId',
 				hidden: true,
-				component: () => import('@/views/map/skinStyle/draft')
+				components: import('@/views/map/skinStyle/draft')
 			},
 			{
 				path: 'draw',
 				redirect: '/map/draw/0/draft',
-				component: () => import('@/views/map/mapdraft/index'),
+				components: import('@/views/map/mapdraft/index'),
 				meta: {
 					i18n: 'router.mapDraw'
 				},
 				children: [
 					{
 						path: ':mapId/:view',
-						component: () => import('@/views/map/mapdraft/mapedit/index'),
+						components: import('@/views/map/mapdraft/mapedit/index'),
 						hidden: true
 					}
 				]
@@ -269,19 +269,19 @@ export const asyncRouter = [
 			{
 				path: 'runPlan',
 				redirect: '/map/runPlan/view/draft',
-				component: () => import('@/views/map/runplan/index'),
+				components: import('@/views/map/runplan/index'),
 				meta: {
 					i18n: 'router.runPlanManage'
 				},
 				children: [{
 					path: 'view/:mode',
-					component: () => import('@/views/map/runplan/chart'),
+					components: import('@/views/map/runplan/chart'),
 					hidden: true
 				}]
 			},
 			{
 				path: 'product',
-				component: () => import('@/views/lesson/trainingcategory/index'),
+				components: import('@/views/lesson/trainingcategory/index'),
 				meta: {
 					i18n: 'router.productEdit'
 				}
@@ -290,7 +290,7 @@ export const asyncRouter = [
 	},
 	{
 		path: '/lesson',
-		component: Layout,
+		components: Layout,
 		meta: {
 			i18n: 'router.lessaonManage',
 			roles: [admin, lessonCreater]
@@ -299,28 +299,28 @@ export const asyncRouter = [
 			{
 				path: 'record',
 				redirect: '/lesson/record/training/0/null',
-				component: () => import('@/views/lesson/trainingrecord/index'),
+				components: import('@/views/lesson/trainingrecord/index'),
 				meta: {
 					i18n: 'router.trainingRecord'
 				},
 				children: [
 					{
 						path: 'training/:trainingId/:trainingName',
-						component: () => import('@/views/lesson/trainingrecord/manage/index'),
+						components: import('@/views/lesson/trainingrecord/manage/index'),
 						hidden: true
 					}
 				]
 			},
 			{
 				path: 'manage/taskManage',
-				component: () => import('@/views/lesson/taskmanage/list'),
+				components: import('@/views/lesson/taskmanage/list'),
 				meta: {
 					i18n: 'router.taskManage'
 				}
 			},
 			{
 				path: 'manage/trainingRule',
-				component: () => import('@/views/lesson/trainingRule/list'),
+				components: import('@/views/lesson/trainingRule/list'),
 				meta: {
 					i18n: 'router.trainingRule'
 				}
@@ -328,20 +328,20 @@ export const asyncRouter = [
 			{
 				path: 'manage/trainingRule/detail',
 				hidden: true,
-				component: () => import('@/views/lesson/trainingRule/detail/index'),
+				components: import('@/views/lesson/trainingRule/detail/index'),
 				meta: {
 				}
 			},
 			{
 				path: 'manage/training',
-				component: () => import('@/views/lesson/trainingmanage/index'),
+				components: import('@/views/lesson/trainingmanage/index'),
 				meta: {
 					i18n: 'router.trainingManage'
 				}
 			},
 			{
 				path: 'edit',
-				component: () => import('@/views/lesson/lessoncategory/index'),
+				components: import('@/views/lesson/lessoncategory/index'),
 				meta: {
 					i18n: 'router.lessonEdit'
 				}
@@ -350,14 +350,14 @@ export const asyncRouter = [
 	},
 	{
 		path: '/script',
-		component: Layout,
+		components: Layout,
 		meta: {
 			roles: [admin, lessonCreater]
 		},
 		children: [
 			{
 				path: 'scriptManage',
-				component: () => import('@/views/lesson/scriptmanage/list'),
+				components: import('@/views/lesson/scriptmanage/list'),
 				meta: {
 					i18n: 'router.scriptManage'
 				}
@@ -367,14 +367,14 @@ export const asyncRouter = [
 	{
 		path: '/teach',
 		redirect: '/teach/home',
-		component: () => import('@/views/teach/index'),
+		components: import('@/views/teach/index'),
 		meta: {
 			roles: [admin, userLesson, user]
 		},
 		children: [
 			{
 				path: 'home',
-				component: () => import('@/views/teach/home'),
+				components: import('@/views/teach/home'),
 				meta: {
 					i18n: 'router.teachSystem'
 				}
@@ -382,7 +382,7 @@ export const asyncRouter = [
 			{
 				// 课程详情
 				path: 'detail/:lessonId',
-				component: () => import('@/views/teach/detail/index'),
+				components: import('@/views/teach/detail/index'),
 				meta: {
 				},
 				hidden: true
@@ -390,14 +390,14 @@ export const asyncRouter = [
 			{
 				// 实训详情
 				path: 'practical/:trainingId/:lessonId',
-				component: () => import('@/views/teach/practical/index'),
+				components: import('@/views/teach/practical/index'),
 				meta: {
 				},
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				component: () => import('@/views/components/pay/index'),
+				components: import('@/views/components/pay/index'),
 				meta: {
 				},
 				hidden: true
@@ -407,14 +407,14 @@ export const asyncRouter = [
 	{
 		path: '/exam',
 		redirect: '/exam/home',
-		component: () => import('@/views/exam/index'),
+		components: import('@/views/exam/index'),
 		meta: {
 			roles: [admin, userExam, user]
 		},
 		children: [
 			{
 				path: 'home',
-				component: () => import('@/views/exam/home'),
+				components: import('@/views/exam/home'),
 				meta: {
 					i18n: 'router.examSystem'
 				}
@@ -422,40 +422,40 @@ export const asyncRouter = [
 			{
 				// 试卷详情
 				path: 'detail/:examId',
-				component: () => import('@/views/exam/detail/examDetail'),
+				components: import('@/views/exam/detail/examDetail'),
 				hidden: true
 			},
 			{
 				path: 'course/:lessonId',
-				component: () => import('@/views/exam/detail/courseDetail'),
+				components: import('@/views/exam/detail/courseDetail'),
 				hidden: true
 			},
 			{
 				// 规则管理
 				path: 'examRule/manage',
-				component: () => import('@/views/publish/examRule/index'),
+				components: import('@/views/publish/examRule/index'),
 				hidden: true
 			},
 			{
 				path: 'examRule/draft/:mode/:ruleId/:lessonId',
 				hidden: true,
-				component: () => import('@/views/publish/examRule/draft/index')
+				components: import('@/views/publish/examRule/draft/index')
 			},
 			{
 				path: 'pay/:lessonId',
-				component: () => import('@/views/components/pay/index'),
+				components: import('@/views/components/pay/index'),
 				hidden: true
 			},
 			{
 				// 开始考试
 				path: 'questionDetail/:examQuestionId',
-				component: () => import('@/views/exam/detail/questionDetail'),
+				components: import('@/views/exam/detail/questionDetail'),
 				hidden: true
 			},
 			{
 				// 考试结果
 				path: 'result/:userExamId',
-				component: () => import('@/views/exam/result'),
+				components: import('@/views/exam/result'),
 				hidden: true
 			}
 		]
@@ -463,26 +463,26 @@ export const asyncRouter = [
 	{
 		path: '/demonstration',
 		redirect: '/demonstration/home',
-		component: () => import('@/views/demonstration/index'),
+		components: import('@/views/demonstration/index'),
 		meta: {
 			roles: [admin, userSimulation, user]
 		},
 		children: [
 			{
 				path: 'home',
-				component: () => import('@/views/demonstration/home'),
+				components: import('@/views/demonstration/home'),
 				meta: {
 					i18n: 'router.demonstrationSystem'
 				}
 			},
 			{
 				path: 'detail/:mapId',
-				component: () => import('@/views/demonstration/detail/index'),
+				components: import('@/views/demonstration/detail/index'),
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				component: () => import('@/views/components/pay/index'),
+				components: import('@/views/components/pay/index'),
 				hidden: true
 			}
 		]
@@ -490,14 +490,14 @@ export const asyncRouter = [
 	{
 		path: '/dp',
 		redirect: '/dp/home',
-		component: () => import('@/views/screenMonitor/index'),
+		components: import('@/views/screenMonitor/index'),
 		meta: {
 			roles: [admin, userScreen, user]
 		},
 		children: [
 			{
 				path: 'home',
-				component: () => import('@/views/screenMonitor/home'),
+				components: import('@/views/screenMonitor/home'),
 				meta: {
 					i18n: 'router.dpSystem'
 				},
@@ -505,19 +505,19 @@ export const asyncRouter = [
 			},
 			{
 				path: 'detail/:lessonId',
-				component: () => import('@/views/screenMonitor/detail/index'),
+				components: import('@/views/screenMonitor/detail/index'),
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				component: () => import('@/views/components/pay/index'),
+				components: import('@/views/components/pay/index'),
 				hidden: true
 			}
 		]
 	},
 	{
 		path: '/plan/tool',
-		component: () => import('@/views/planMonitor/editTool/index'),
+		components: import('@/views/planMonitor/editTool/index'),
 		meta: {
 		},
 		hidden: true
@@ -525,14 +525,14 @@ export const asyncRouter = [
 	{
 		path: '/plan',
 		redirect: '/plan/home',
-		component: () => import('@/views/planMonitor/index'),
+		components: import('@/views/planMonitor/index'),
 		meta: {
 			roles: [admin, user]
 		},
 		children: [
 			{
 				path: 'home',
-				component: () => import('@/views/planMonitor/home'),
+				components: import('@/views/planMonitor/home'),
 				meta: {
 					i18n: 'router.planSystem'
 				},
@@ -540,26 +540,26 @@ export const asyncRouter = [
 			},
 			{
 				path: 'detail/:lessonId',
-				component: () => import('@/views/planMonitor/detail'),
+				components: import('@/views/planMonitor/detail'),
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				component: () => import('@/views/components/pay/index'),
+				components: import('@/views/components/pay/index'),
 				hidden: true
 			}
 		]
 	},
 	{
 		path: '/replay',
-		component: Layout,
+		components: Layout,
 		meta: {
 			roles: [admin]
 		},
 		children: [
 			{
 				path: 'manage',
-				component: () => import('@/views/replay/index'),
+				components: import('@/views/replay/index'),
 				meta: {
 					i18n: 'router.replayManage'
 				}
@@ -568,28 +568,28 @@ export const asyncRouter = [
 	},
 	{
 		path: '/permission',
-		component: Layout,
+		components: Layout,
 		meta: {
 			roles: [admin, user]
 		},
 		children: [
 			{
 				path: 'manage',
-				component: () => import('@/views/package/index'),
+				components: import('@/views/package/index'),
 				meta: {
 					i18n: 'router.permissionManage'
 				}
 			},
 			{
 				path: 'draft',
-				component: () => import('@/views/package/draft/ruleForm'),
+				components: import('@/views/package/draft/ruleForm'),
 				hidden: true
 			}
 		]
 	},
 	{
 		path: '/publish',
-		component: Layout,
+		components: Layout,
 		meta: {
 			i18n: 'router.pulishManage',
 			roles: [admin]
@@ -597,85 +597,85 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'map',
-				component: () => import('@/views/publish/publishMap/index'),
+				components: import('@/views/publish/publishMap/index'),
 				meta: {
 					i18n: 'router.publishMapManage'
 				}
 			},
 			{
 				path: 'product',
-				component: () => import('@/views/publish/productStatus/index'),
+				components: import('@/views/publish/productStatus/index'),
 				meta: {
 					i18n: 'router.productStateManage'
 				}
 			},
 			{
 				path: 'lesson',
-				component: () => import('@/views/publish/publishLesson/index'),
+				components: import('@/views/publish/publishLesson/index'),
 				meta: {
 					i18n: 'router.publishLessonManage'
 				}
 			},
 			// {
 			// 	path: 'script',
-			// 	component:() => import('@/views/publish/simulationScript/index'),
+			// 	components: import('@/views/publish/simulationScript/index'),
 			// 	meta: {
 			// 		title: '仿真脚本管理',
 			// 	}
 			// },
 			{
 				path: 'runPlan/template',
-				component: () => import('@/views/publish/runPlanTemplate/index'),
+				components: import('@/views/publish/runPlanTemplate/index'),
 				meta: {
 					i18n: 'router.runPlanTemplateManage'
 				}
 			},
 			{
 				path: 'runPlan/common',
-				component: () => import('@/views/publish/runPlanCommon/index'),
+				components: import('@/views/publish/runPlanCommon/index'),
 				meta: {
 					i18n: 'router.runPlanCommonManage'
 				}
 			},
 			{
 				path: 'runPlan/everyDay',
-				component: () => import('@/views/publish/runPlanEveryDay/index'),
+				components: import('@/views/publish/runPlanEveryDay/index'),
 				meta: {
 					i18n: 'router.runPlanEveryDayManage'
 				}
 			},
 			{
 				path: 'examRule/manage',
-				component: () => import('@/views/publish/examRule/index'),
+				components: import('@/views/publish/examRule/index'),
 				meta: {
 					i18n: 'router.examRuleManage'
 				}
 			},
 			{
 				path: 'map/draft/:mode/:mapId',
-				component: () => import('@/views/publish/publishMap/draft'),
+				components: import('@/views/publish/publishMap/draft'),
 				hidden: true
 			},
 			{
 				path: 'examRule/draft/:mode/:ruleId/:lessonId',
-				component: () => import('@/views/publish/examRule/draft/index'),
+				components: import('@/views/publish/examRule/draft/index'),
 				hidden: true
 			},
 			{
 				path: 'runPlan/common/:mode',
-				component: () => import('@/views/publish/runPlanCommon/draft'),
+				components: import('@/views/publish/runPlanCommon/draft'),
 				hidden: true
 			},
 			{
 				path: 'runPlan/view/:mode',
-				component: () => import('@/views/map/runplan/chart'),
+				components: import('@/views/map/runplan/chart'),
 				hidden: true
 			}
 		]
 	},
 	{
 		path: '/orderauthor',
-		component: Layout,
+		components: Layout,
 		meta: {
 			i18n: 'router.orderAuthorityManage',
 			roles: [admin]
@@ -683,28 +683,28 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'commodity/manage',
-				component: () => import('@/views/orderauthor/commodity/index'),
+				components: import('@/views/orderauthor/commodity/index'),
 				meta: {
 					i18n: 'router.commodityManage'
 				}
 			},
 			{
 				path: 'order/manage',
-				component: () => import('@/views/orderauthor/order/list'),
+				components: import('@/views/orderauthor/order/list'),
 				meta: {
 					i18n: 'router.orderManage'
 				}
 			},
 			{
 				path: 'author/manage',
-				component: () => import('@/views/orderauthor/author/index'),
+				components: import('@/views/orderauthor/author/index'),
 				meta: {
 					i18n: 'router.authorityManage'
 				}
 			},
 			{
 				path: 'transfer/manage',
-				component: () => import('@/views/orderauthor/permission/index'),
+				components: import('@/views/orderauthor/permission/index'),
 				meta: {
 					i18n: 'router.authorityTransferManage'
 				}
@@ -712,7 +712,7 @@ export const asyncRouter = [
 			{
 				path: 'commodity/draft/:mode/:commodityId',
 				hidden: true,
-				component: () => import('@/views/orderauthor/commodity/draft'),
+				components: import('@/views/orderauthor/commodity/draft'),
 				meta: {
 					i18n: 'router.addCommodity'
 				}
@@ -720,7 +720,7 @@ export const asyncRouter = [
 			{
 				path: 'order/draft/:mode/:orderId',
 				hidden: true,
-				component: () => import('@/views/orderauthor/order/draft'),
+				components: import('@/views/orderauthor/order/draft'),
 				meta: {
 					i18n: 'router.addOrder'
 				}
@@ -728,26 +728,26 @@ export const asyncRouter = [
 			{
 				path: 'author/draft/:mode/:userId',
 				hidden: true,
-				component: () => import('@/views/orderauthor/author/draft'),
+				components: import('@/views/orderauthor/author/draft'),
 				meta: {
 					i18n: 'router.addCoursePermissions'
 				}
 			},
 			{
 				path: 'transfer/detail/:permissionId',
-				component: () => import('@/views/orderauthor/permission/detail'),
+				components: import('@/views/orderauthor/permission/detail'),
 				hidden: true
 			},
 			{
 				path: 'transfer/package',
-				component: () => import('@/views/orderauthor/permission/draft/ruleForm'),
+				components: import('@/views/orderauthor/permission/draft/ruleForm'),
 				hidden: true
 			}
 		]
 	},
 	{
 		path: '/system',
-		component: Layout,
+		components: Layout,
 		meta: {
 			i18n: 'router.systemManage',
 			roles: [admin]
@@ -755,7 +755,7 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'dictionary',
-				component: () => import('@/views/management/dictionary/index'),
+				components: import('@/views/management/dictionary/index'),
 				meta: {
 					i18n: 'router.dataDictionary'
 				}
@@ -763,42 +763,42 @@ export const asyncRouter = [
 			{
 				path: 'dictionary/detail',
 				hidden: true,
-				component: () => import('@/views/management/dictionaryDetail/index'),
+				components: import('@/views/management/dictionaryDetail/index'),
 				meta: {
 					i18n: 'router.dataDictionaryDetails'
 				}
 			},
 			{
 				path: 'userManage',
-				component: () => import('@/views/management/userControl/index'),
+				components: import('@/views/management/userControl/index'),
 				meta: {
 					i18n: 'router.userManage'
 				}
 			},
 			{
 				path: 'userTrainingManage',
-				component: () => import('@/views/management/userTraining/index'),
+				components: import('@/views/management/userTraining/index'),
 				meta: {
 					i18n: 'router.userTrainingManage'
 				}
 			},
 			{
 				path: 'userExamManage',
-				component: () => import('@/views/management/userExam/index'),
+				components: import('@/views/management/userExam/index'),
 				meta: {
 					i18n: 'router.userExamManage'
 				}
 			},
 			{
 				path: 'userSimulationManage',
-				component: () => import('@/views/management/userSimulation/index'),
+				components: import('@/views/management/userSimulation/index'),
 				meta: {
 					i18n: 'router.userSimulationManage'
 				}
 			},
 			{
 				path: 'existingSimulation',
-				component: () => import('@/views/management/existingSimulation/index'),
+				components: import('@/views/management/existingSimulation/index'),
 				meta: {
 					i18n: 'router.existingSimulation'
 				}
diff --git a/src/utils/sock.js b/src/utils/sock.js
index dc4cb9cb8..46fc73790 100644
--- a/src/utils/sock.js
+++ b/src/utils/sock.js
@@ -1,12 +1,11 @@
 import { handleToken } from '@/utils/auth';
 import { checkLoginLine } from '@/api/login';
-import { getBaseUrl } from '@/utils/baseUrl'
+import { getBaseUrl } from '@/utils/baseUrl';
 
 var SockJS = require('sockjs-client');
 var Stomp = require('stompjs');
 
 const isDev = process.env.NODE_ENV === 'development';
-const isTest = process.env.NODE_ENV === 'test';
 const websocketUrl = `${getBaseUrl()}/joylink-websocket?token=`;
 
 var StompClient = function (headers) {
@@ -29,7 +28,7 @@ StompClient.prototype = {
 	sockStatus: 0,
 
 	headers: {
-		'X-Token': handleToken(),
+		'X-Token': handleToken()
 	},
 
 	count: 0,
@@ -59,7 +58,7 @@ StompClient.prototype = {
 				this.closeStompDebug();
 
 				// 向服务器发起websocket连接并发送CONNECT帧
-				this.clientIns.connect({ 'X-Token': handleToken(), }, () => {
+				this.clientIns.connect({ 'X-Token': handleToken() }, () => {
 					console.info('连接成功.');
 					this.count = 0;
 					this.status = true;
@@ -129,7 +128,7 @@ StompClient.prototype = {
 	closeStompDebug() {
 		if (this.clientIns) {
 			this.clientIns.debug = undefined;
-			if (isDev || isTest) {
+			if (isDev) {
 				this.clientIns.debug = function (message) {
 					console.debug(message);
 				};
@@ -168,11 +167,11 @@ StompClient.prototype = {
 
 	unsubscribe(topic) {
 		if (this.subscribeMap) {
-			let subscription = this.subscribeMap.get(topic);
+			const subscription = this.subscribeMap.get(topic);
 			if (subscription) {
 				subscription.unsubscribe();
 				this.subscribeMap.delete(topic);
-				console.log("取消订阅");
+				console.log('取消订阅');
 			}
 		}
 	},
@@ -204,7 +203,7 @@ StompClient.prototype = {
 			this.clientIns = null;
 		}
 		this.status = false;
-		console.log("断开连接");
+		console.log('断开连接');
 	}
 
 };

From 47b2be3a8b4ff22c47a348e4fc64cc1e3d12af7c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 12 Aug 2019 11:31:43 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                      |  2 +-
 src/views/lesson/scriptmanage/create.vue | 21 +++++++++---------
 src/views/lesson/scriptmanage/list.vue   | 28 +++++++++++++-----------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 1e1c1ac03..c37ca588a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -352,7 +352,7 @@ export const asyncRouter = [
 		path: '/script',
 		components: Layout,
 		meta: {
-			roles: [admin, lessonCreater]
+			roles: [admin, lessonCreater, user]
 		},
 		children: [
 			{
diff --git a/src/views/lesson/scriptmanage/create.vue b/src/views/lesson/scriptmanage/create.vue
index 20c3a48af..f89141290 100644
--- a/src/views/lesson/scriptmanage/create.vue
+++ b/src/views/lesson/scriptmanage/create.vue
@@ -9,7 +9,8 @@
 </template>
 
 <script>
-    import { getSkinStyleList } from '@/api/management/mapskin'
+    import { listPublishMap } from '@/api/jmap/map'
+    
     import { getQuestById} from '@/api/quest';
 
     export default {
@@ -17,12 +18,12 @@
         data() {
             return {
                 dialogVisible: false,
-                skinStyleList: [],
+                mapList: [],
                 taskStatusList: [],
                 disabled:null,
                 formModel: {
                     name: '',
-                    skinCode: '01',
+                    mapId: '',
                     description:''
                 },
                 isShow: false,
@@ -38,7 +39,7 @@
                     labelWidth: '100px',
                     items: [
                         { prop: 'name', label: '剧本名称', type: 'text', required: true},
-                        { prop: 'skinCode', label: '皮肤类型', type: 'select', required: true, options: this.skinStyleList,disabled:this.disabled},
+                        { prop: 'mapId', label: '地图类型', type: 'select', required: true, options: this.mapList,disabled:this.disabled},
                         { prop: 'description', label: '剧本描述', type: 'textarea', required: true},
                     ]
                 }
@@ -49,8 +50,8 @@
                     name: [
                         { required: true, message: '请输入剧本', trigger: 'blur' },
                     ],
-                    skinCode: [
-                        { required: true, message: '请选择皮肤类型', trigger: 'change' },
+                    mapId: [
+                        { required: true, message: '请选择地图类型', trigger: 'change' },
                     ],
                     description:[
                         { required: true, message: '请输入剧本描述', trigger: 'blur' },
@@ -67,16 +68,16 @@
         },
         methods: {
             loadInitData() {
-                this.skinStyleList = [];
-                getSkinStyleList().then(response => {
-                    this.skinStyleList = response.data.map(elem => { return { value: elem.code, label: elem.name } });
+                this.mapList = [];
+                listPublishMap().then(response => {
+                    this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name } });
                 })
             },
             doShow(questid) {
                 if(questid)
                 {
                     getQuestById(questid).then(resp=>{
-                        let data={'name':resp.data.name,'description':resp.data.description,'skinCode':resp.data.skinCode};
+                        let data={'name':resp.data.name,'description':resp.data.description,'mapId':resp.data.mapId};
                         this.formModel=data;
                         this.formModel.id=questid;
                         this.disabled="disabled";
diff --git a/src/views/lesson/scriptmanage/list.vue b/src/views/lesson/scriptmanage/list.vue
index 7722485d5..abac81e50 100644
--- a/src/views/lesson/scriptmanage/list.vue
+++ b/src/views/lesson/scriptmanage/list.vue
@@ -11,8 +11,9 @@
 
 <script>
     import { superAdmin } from '@/router';
-    import { listPublishMap } from '@/api/jmap/mapdraft';
-    import { getSkinStyleList } from '@/api/management/mapskin'
+    // import { listPublishMap } from '@/api/jmap/mapdraft';
+    import { listPublishMap } from '@/api/jmap/map';
+    // import { getSkinStyleList } from '@/api/management/mapskin'
     import { runPlanTemplateList, deleteRunPlanTemplate, generateCommonRunPlanEveryDay } from '@/api/runplan';
     import { UrlConfig } from '@/router/index';
     import { getQuestPageList,createQuest,deleteQuest,updateQuest} from '@/api/quest';
@@ -27,7 +28,7 @@
         },
         data() {
             return {
-                skinCodeList: [],
+                mapList: [],
                 pagerConfig: {
                     pageSize: 'pageSize',
                     pageIndex: 'pageNum'
@@ -36,9 +37,9 @@
                     labelWidth: '140px',
                     reset: true,
                     queryObject: {
-                        skinCode: {
+                        mapId: {
                             type: 'select',
-                            label: '皮肤类型',
+                            label: '地图类型',
                             config: {
                                 data: []
                             }
@@ -55,11 +56,11 @@
                             prop: 'name'
                         },
                         {
-                            title: '皮肤类型',
-                            prop: 'skinCode',
+                            title: '地图类型',
+                            prop: 'mapId',
                             type: 'tag',
                             columnValue: (row) => {
-                                return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name'])
+                                return this.$convertField(row.mapId, this.mapList, ['id', 'name'])
                             },
                             tagType: (row) => { return '' }
                         },
@@ -71,7 +72,7 @@
                             type: 'button',
                             title: '操作',
                             width: '350',
-                            hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
+                            // hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
                             buttons: [
                                 {
                                     name: '录制',
@@ -104,11 +105,12 @@
         },
         methods: {
             loadInitData() {
-                this.skinCodeList = [];
-                getSkinStyleList().then(response => {
-                    this.skinCodeList = response.data;
+                this.mapList = [];
+                listPublishMap().then(response => {
+                    this.mapList = response.data;
+                    // this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name } });
                     response.data.forEach(elem => {
-                        this.queryForm.queryObject.skinCode.config.data.push({ value: elem.code, label: elem.name });
+                        this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
                     })
                 })
             },

From 0b5cfcc9a74b6273371a360a03469d53b53ee9a0 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 12 Aug 2019 13:40:34 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmap/shape/Train/TrainBodyBox.js          |  2 +-
 .../theme/beijing_01/menus/menuCancel.vue     | 63 +++++++++----------
 .../theme/chengdu_03/menus/menuCancel.vue     | 60 +++++++++---------
 src/views/map/mapdraft/mapedit/index.vue      |  1 -
 .../map/mapdraft/mapmanage/operateMenu.vue    | 57 +++++++++++++++--
 5 files changed, 114 insertions(+), 69 deletions(-)

diff --git a/src/jmap/shape/Train/TrainBodyBox.js b/src/jmap/shape/Train/TrainBodyBox.js
index e77155920..d3e442232 100644
--- a/src/jmap/shape/Train/TrainBodyBox.js
+++ b/src/jmap/shape/Train/TrainBodyBox.js
@@ -28,6 +28,6 @@ export default class TrainBodyBox extends Group {
 		this.add(this.trainBodyBox);
 	}
 	setColor(key, color) {
-		this.train.setStyle(key, color);
+		this.trainBodyBox.setStyle(key, color);
 	}
 }
diff --git a/src/jmap/theme/beijing_01/menus/menuCancel.vue b/src/jmap/theme/beijing_01/menus/menuCancel.vue
index 016299b36..8ed520269 100644
--- a/src/jmap/theme/beijing_01/menus/menuCancel.vue
+++ b/src/jmap/theme/beijing_01/menus/menuCancel.vue
@@ -75,42 +75,39 @@ export default {
 		},
 		initMenu() {
 			this.menuNormal = [];
-            let resultCode = this.$route.path.indexOf("/display");
-            if(resultCode === -1){
-                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);
-                    }
-                });
-            }
+            // 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];
-			}
+			// else {
+			//     this.menu = [...this.menuNormal];
+			// }
 		},
 		doShow(point) {
 			this.clickEvent();
diff --git a/src/jmap/theme/chengdu_03/menus/menuCancel.vue b/src/jmap/theme/chengdu_03/menus/menuCancel.vue
index 87d33f98e..b5edfb082 100644
--- a/src/jmap/theme/chengdu_03/menus/menuCancel.vue
+++ b/src/jmap/theme/chengdu_03/menus/menuCancel.vue
@@ -77,40 +77,40 @@ export default {
 		},
 		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);
-			    }
-			});
+			// 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];
-			}
+			// else {
+			//     this.menu = [...this.menuNormal];
+			// }
 		},
 		doShow(point) {
 			this.clickEvent();
diff --git a/src/views/map/mapdraft/mapedit/index.vue b/src/views/map/mapdraft/mapedit/index.vue
index ba968066c..d10951d93 100644
--- a/src/views/map/mapdraft/mapedit/index.vue
+++ b/src/views/map/mapdraft/mapedit/index.vue
@@ -243,7 +243,6 @@ export default {
 				x: em.clientX,
 				y: em.clientY
 			};
-
 			var menu = getDeviceMenuByDeviceType('Cancel');
 
 			this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
diff --git a/src/views/map/mapdraft/mapmanage/operateMenu.vue b/src/views/map/mapdraft/mapmanage/operateMenu.vue
index 2a0a8390f..f22a1781d 100644
--- a/src/views/map/mapdraft/mapmanage/operateMenu.vue
+++ b/src/views/map/mapdraft/mapmanage/operateMenu.vue
@@ -16,6 +16,7 @@ import PopMenu from '@/components/PopMenu';
 import MapEdit from './edit';
 import MapSaveAs from './saveAs';
 import MapPublish from './publish';
+import { mapGetters } from 'vuex';
 
 export default {
 	name: 'MapOperateMenu',
@@ -42,7 +43,7 @@ export default {
 	data() {
 		return {
 			menuShow: false,
-			menu: [
+			menuMap: [
 				{
 					label: this.$t('map.updateObj'),
 					handler: this.updateObj
@@ -87,14 +88,25 @@ export default {
 					label: this.$t('map.jlmap3d'),
 					handler: this.jlmap3d
 				}
-			]
+			],
+            menuNormal:[],
+            menu: []
 		};
 	},
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+    },
 	watch: {
 		'$store.state.menuOperation.menuCount': function (val) {
 			if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Map)) {
+			    this.menu = [ ...this.menuMap]
 				this.doShow(this.$store.state.menuOperation.menuPosition);
-			} else {
+			} else if(this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)){
+			    this.initCancelMenu();
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            }else {
 				this.doClose();
 			}
 		}
@@ -187,7 +199,44 @@ export default {
 		},
 		refresh() {
 			this.$emit('refresh');
-		}
+		},
+        initCancelMenu() {
+		    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);
+                }
+            });
+            this.menu = [ ...this.menuNormal ]
+        },
+        mapLocation(item) {
+            if (item) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: item.code });
+                this.doClose();
+            }
+        },
 	}
 };
 </script>

From ffd23c3adbbc02e5994e22881e71ca3f141b7041 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Mon, 12 Aug 2019 14:04:57 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 285 ++++++++-----
 src/views/index.js  | 974 --------------------------------------------
 2 files changed, 187 insertions(+), 1072 deletions(-)
 delete mode 100644 src/views/index.js

diff --git a/src/router/index.js b/src/router/index.js
index 1e1c1ac03..a83df2b1a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,6 +5,95 @@ Vue.use(Router);
 
 /* Layout */
 import Layout from '@/layout';
+import LoginNew from '@/views/login/loginNew';
+import Login from '@/views/login/index';
+import LoginNewScreen from '@/views/login/loginNewScreen';
+import LoginScreen from '@/views/login/loginScreen';
+import LoginNewPlan from '@/views/login/loginNewPlan';
+import LoginPlan from '@/views/login/loginPlan';
+
+import Jlmap3dedit from '@/views/jlmap3d/jlmap3dedit';
+import Jlmap3d from '@/views/jlmap3d/index';
+import Display from '@/views/display/index';
+import TrainRoom from '@/views/trainRoom/index';
+import JointTraining from '@/views/jointTraining/index';
+
+import Error401 from '@/views/error-page/401';
+import Errpr404 from '@/views/error-page/404';
+import Dashboard from '@/views/dashboard/index';
+import Dashboard1 from '@/views/dashboard/index.vue';
+import SkinStyle from '@/views/map/skinStyle/index';
+import SkinStyleDraft from '@/views/map/skinStyle/draft';
+import Mapdraft from '@/views/map/mapdraft/index';
+import Mapedit from '@/views/map/mapdraft/mapedit/index';
+import Runplan from '@/views/map/runplan/index';
+import RunplanView from '@/views/map/runplan/chart';
+import Trainingcategory from '@/views/lesson/trainingcategory/index';
+import Trainingrecord from '@/views/lesson/trainingrecord/index';
+import TrainingrecordManage from '@/views/lesson/trainingrecord/manage/index';
+import Taskmanage from '@/views/lesson/taskmanage/list';
+import TrainingRuleList from '@/views/lesson/trainingRule/list';
+import TrainingRuleEdit from '@/views/lesson/trainingRule/detail/index';
+import Trainingmanage from '@/views/lesson/trainingmanage/index';
+import Lessoncategory from '@/views/lesson/lessoncategory/index';
+import Scriptmanage from '@/views/lesson/scriptmanage/list';
+import Teach from '@/views/teach/index';
+import TeachHome from '@/views/teach/home';
+import TeachDetail from '@/views/teach/detail/index';
+import TeachPractical from '@/views/teach/practical/index';
+import Pay from '@/views/components/pay/index';
+import Exam from '@/views/exam/index';
+import ExamHome from '@/views/exam/home';
+import ExamDetail from '@/views/exam/detail/examDetail';
+import ExamCourseDetail from '@/views/exam/detail/courseDetail';
+import ExamQuestionDetail from '@/views/exam/detail/questionDetail';
+import ExamResult from '@/views/exam/result';
+
+import PublishExamRule from '@/views/publish/examRule/index';
+import PublishExamRuleDraft from '@/views/publish/examRule/draft/index';
+
+import Demonstration from '@/views/demonstration/index';
+import DemonstrationHome from '@/views/demonstration/home';
+import DemonstrationDetail from '@/views/demonstration/detail/index';
+import ScreenMonitor from '@/views/screenMonitor/index';
+import ScreenMonitorHome from '@/views/screenMonitor/home';
+import ScreenMonitorDetail from '@/views/screenMonitor/detail/index';
+
+import PlanMonitorEditTool from '@/views/planMonitor/editTool/index';
+import PlanMonitor from '@/views/planMonitor/index';
+import PlanMonitorHome from '@/views/planMonitor/home';
+import PlanMonitorDetail from '@/views/planMonitor/detail';
+
+import Replay from '@/views/replay/index';
+import Package from '@/views/package/index';
+import PackageDraft from '@/views/package/draft/ruleForm';
+
+import PublishMap from '@/views/publish/publishMap/index';
+import PublishMapDraft from '@/views/publish/publishMap/draft';
+import RunPlanCommon from '@/views/publish/runPlanCommon/index';
+import RunPlanCommonDraft from '@/views/publish/runPlanCommon/draft';
+import RunPlanTemplate from '@/views/publish/runPlanTemplate/index';
+import RunPlanEveryDay from '@/views/publish/runPlanEveryDay/index';
+import ProductStatus from '@/views/publish/productStatus/index';
+import PublishLesson from '@/views/publish/publishLesson/index';
+// import SimulationScript from '@/views/publish/simulationScript/index';
+
+import Commodity from '@/views/orderauthor/commodity/index';
+import CommodityDraft from '@/views/orderauthor/commodity/draft';
+import OrderList from '@/views/orderauthor/order/list';
+import OrderDraft from '@/views/orderauthor/order/draft';
+import Author from '@/views/orderauthor/author/index';
+import AuthorDraft from '@/views/orderauthor/author/draft';
+import Permission from '@/views/orderauthor/permission/index';
+import PermissionDetail from '@/views/orderauthor/permission/detail';
+import PermissionDraft from '@/views/orderauthor/permission/draft/ruleForm';
+import Dictionary from '@/views/management/dictionary/index';
+import DictionaryDetail from '@/views/management/dictionaryDetail/index';
+import UserControl from '@/views/management/userControl/index';
+import UserTraining from '@/views/management/userTraining/index';
+import UserExam from '@/views/management/userExam/index';
+import UserSimulation from '@/views/management/userSimulation/index';
+import ExistingSimulation from '@/views/management/existingSimulation/index';
 
 /**
  * Note: sub-menu only appear when route children.length >= 1
@@ -125,63 +214,63 @@ export const UrlConfig = {
 export const constantRoutes = [
 	{
 		path: '/login',
-		components: import('@/views/login/loginNew'),
+		component: LoginNew,
 		hidden: true
 	},
 
 	{
 		path: '/login1',
-		components: import('@/views/login/index'),
+		component: Login,
 		hidden: true
 	},
 	// 扫码登录
 	{
 		path: '/dp/login',
-		components: import('@/views/login/loginNewScreen'),
+		component: LoginNewScreen,
 		hidden: true
 	},
 	// 密码登录
 	{
 		path: '/dp/login1',
-		components: import('@/views/login/loginScreen'),
+		component: LoginScreen,
 		hidden: true
 	},
 	// 扫码登录
 	{
 		path: '/plan/login',
-		components: import('@/views/login/loginNewPlan'),
+		component: LoginNewPlan,
 		hidden: true
 	},
 	// 密码登录
 	{
 		path: '/plan/login1',
-		components: import('@/views/login/loginPlan'),
+		component: LoginPlan,
 		hidden: true
 	},
 	{
 		path: '/jlmap3d/edit',
-		components: import('@/views/jlmap3d/jlmap3dedit'),
+		component: Jlmap3dedit,
 		hidden: true
 	},
 	{
 		path: '/401',
-		components: import('@/views/error-page/401'),
+		component: Error401,
 		hidden: true
 	},
 
 	{
 		path: '/404',
-		components: import('@/views/error-page/404'),
+		component: Errpr404,
 		hidden: true
 	},
 
 	{
 		path: '/',
-		components: Layout,
+		component: Layout,
 		redirect: '/dashboard',
 		children: [{
 			path: 'dashboard',
-			components: import('@/views/dashboard/index'),
+			component: Dashboard,
 			meta: {
 				i18n: 'router.homePage',
 				icon: 'dashboard'
@@ -195,38 +284,38 @@ export const constantRoutes = [
 export const asyncRouter = [
 	{
 		path: '/',
-		components: Layout,
+		component: Layout,
 		redirect: '/dashboard',
 		hidden: true,
 		children: [
 			{
 				path: 'dashboard',
-				components: import('@/views/dashboard/index.vue')
+				component: Dashboard1
 			}
 		]
 	},
 	{
 		path: '/display/:mode',
-		components: import('@/views/display/index'),
+		component: Display,
 		meta: {
 		},
 		hidden: true
 	},
 	{
 		path: '/trainroom',
-		components: import('@/views/trainRoom/index'),
+		component: TrainRoom,
 		meta: {
 		},
 		hidden: true
 	},
 	{
 		path: '/jointTraining',
-		components: import('@/views/jointTraining/index'),
+		component: JointTraining,
 		hidden: true
 	},
 	{
 		path: '/jlmap3d',
-		components: import('@/views/jlmap3d/index'),
+		component: Jlmap3d,
 		meta: {
 		},
 		hidden: true
@@ -237,11 +326,11 @@ export const asyncRouter = [
 			i18n: 'router.mapManage',
 			roles: [admin, mapCreater]
 		},
-		components: Layout,
+		component: Layout,
 		children: [
 			{
 				path: 'skinStyle',
-				components: import('@/views/map/skinStyle/index'),
+				component: SkinStyle,
 				meta: {
 					i18n: 'router.skinManage'
 				}
@@ -249,19 +338,19 @@ export const asyncRouter = [
 			{
 				path: 'skinStyle/draft/:mode/:skinStyleId',
 				hidden: true,
-				components: import('@/views/map/skinStyle/draft')
+				component: SkinStyleDraft
 			},
 			{
 				path: 'draw',
 				redirect: '/map/draw/0/draft',
-				components: import('@/views/map/mapdraft/index'),
+				component: Mapdraft,
 				meta: {
 					i18n: 'router.mapDraw'
 				},
 				children: [
 					{
 						path: ':mapId/:view',
-						components: import('@/views/map/mapdraft/mapedit/index'),
+						component: Mapedit,
 						hidden: true
 					}
 				]
@@ -269,19 +358,19 @@ export const asyncRouter = [
 			{
 				path: 'runPlan',
 				redirect: '/map/runPlan/view/draft',
-				components: import('@/views/map/runplan/index'),
+				component: Runplan,
 				meta: {
 					i18n: 'router.runPlanManage'
 				},
 				children: [{
 					path: 'view/:mode',
-					components: import('@/views/map/runplan/chart'),
+					component: RunplanView,
 					hidden: true
 				}]
 			},
 			{
 				path: 'product',
-				components: import('@/views/lesson/trainingcategory/index'),
+				component: Trainingcategory,
 				meta: {
 					i18n: 'router.productEdit'
 				}
@@ -290,7 +379,7 @@ export const asyncRouter = [
 	},
 	{
 		path: '/lesson',
-		components: Layout,
+		component: Layout,
 		meta: {
 			i18n: 'router.lessaonManage',
 			roles: [admin, lessonCreater]
@@ -299,28 +388,28 @@ export const asyncRouter = [
 			{
 				path: 'record',
 				redirect: '/lesson/record/training/0/null',
-				components: import('@/views/lesson/trainingrecord/index'),
+				component: Trainingrecord,
 				meta: {
 					i18n: 'router.trainingRecord'
 				},
 				children: [
 					{
 						path: 'training/:trainingId/:trainingName',
-						components: import('@/views/lesson/trainingrecord/manage/index'),
+						component: TrainingrecordManage,
 						hidden: true
 					}
 				]
 			},
 			{
 				path: 'manage/taskManage',
-				components: import('@/views/lesson/taskmanage/list'),
+				component: Taskmanage,
 				meta: {
 					i18n: 'router.taskManage'
 				}
 			},
 			{
 				path: 'manage/trainingRule',
-				components: import('@/views/lesson/trainingRule/list'),
+				component: TrainingRuleList,
 				meta: {
 					i18n: 'router.trainingRule'
 				}
@@ -328,20 +417,20 @@ export const asyncRouter = [
 			{
 				path: 'manage/trainingRule/detail',
 				hidden: true,
-				components: import('@/views/lesson/trainingRule/detail/index'),
+				component: TrainingRuleEdit,
 				meta: {
 				}
 			},
 			{
 				path: 'manage/training',
-				components: import('@/views/lesson/trainingmanage/index'),
+				component: Trainingmanage,
 				meta: {
 					i18n: 'router.trainingManage'
 				}
 			},
 			{
 				path: 'edit',
-				components: import('@/views/lesson/lessoncategory/index'),
+				component: Lessoncategory,
 				meta: {
 					i18n: 'router.lessonEdit'
 				}
@@ -350,14 +439,14 @@ export const asyncRouter = [
 	},
 	{
 		path: '/script',
-		components: Layout,
+		component: Layout,
 		meta: {
 			roles: [admin, lessonCreater]
 		},
 		children: [
 			{
 				path: 'scriptManage',
-				components: import('@/views/lesson/scriptmanage/list'),
+				component: Scriptmanage,
 				meta: {
 					i18n: 'router.scriptManage'
 				}
@@ -367,14 +456,14 @@ export const asyncRouter = [
 	{
 		path: '/teach',
 		redirect: '/teach/home',
-		components: import('@/views/teach/index'),
+		component: Teach,
 		meta: {
 			roles: [admin, userLesson, user]
 		},
 		children: [
 			{
 				path: 'home',
-				components: import('@/views/teach/home'),
+				component: TeachHome,
 				meta: {
 					i18n: 'router.teachSystem'
 				}
@@ -382,7 +471,7 @@ export const asyncRouter = [
 			{
 				// 课程详情
 				path: 'detail/:lessonId',
-				components: import('@/views/teach/detail/index'),
+				component: TeachDetail,
 				meta: {
 				},
 				hidden: true
@@ -390,14 +479,14 @@ export const asyncRouter = [
 			{
 				// 实训详情
 				path: 'practical/:trainingId/:lessonId',
-				components: import('@/views/teach/practical/index'),
+				component: TeachPractical,
 				meta: {
 				},
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				components: import('@/views/components/pay/index'),
+				component: Pay,
 				meta: {
 				},
 				hidden: true
@@ -407,14 +496,14 @@ export const asyncRouter = [
 	{
 		path: '/exam',
 		redirect: '/exam/home',
-		components: import('@/views/exam/index'),
+		component: Exam,
 		meta: {
 			roles: [admin, userExam, user]
 		},
 		children: [
 			{
 				path: 'home',
-				components: import('@/views/exam/home'),
+				component: ExamHome,
 				meta: {
 					i18n: 'router.examSystem'
 				}
@@ -422,40 +511,40 @@ export const asyncRouter = [
 			{
 				// 试卷详情
 				path: 'detail/:examId',
-				components: import('@/views/exam/detail/examDetail'),
+				component: ExamDetail,
 				hidden: true
 			},
 			{
 				path: 'course/:lessonId',
-				components: import('@/views/exam/detail/courseDetail'),
+				component: ExamCourseDetail,
 				hidden: true
 			},
 			{
 				// 规则管理
 				path: 'examRule/manage',
-				components: import('@/views/publish/examRule/index'),
+				component: PublishExamRule,
 				hidden: true
 			},
 			{
 				path: 'examRule/draft/:mode/:ruleId/:lessonId',
 				hidden: true,
-				components: import('@/views/publish/examRule/draft/index')
+				component: PublishExamRuleDraft
 			},
 			{
 				path: 'pay/:lessonId',
-				components: import('@/views/components/pay/index'),
+				component: Pay,
 				hidden: true
 			},
 			{
 				// 开始考试
 				path: 'questionDetail/:examQuestionId',
-				components: import('@/views/exam/detail/questionDetail'),
+				component: ExamQuestionDetail,
 				hidden: true
 			},
 			{
 				// 考试结果
 				path: 'result/:userExamId',
-				components: import('@/views/exam/result'),
+				component: ExamResult,
 				hidden: true
 			}
 		]
@@ -463,26 +552,26 @@ export const asyncRouter = [
 	{
 		path: '/demonstration',
 		redirect: '/demonstration/home',
-		components: import('@/views/demonstration/index'),
+		component: Demonstration,
 		meta: {
 			roles: [admin, userSimulation, user]
 		},
 		children: [
 			{
 				path: 'home',
-				components: import('@/views/demonstration/home'),
+				component: DemonstrationHome,
 				meta: {
 					i18n: 'router.demonstrationSystem'
 				}
 			},
 			{
 				path: 'detail/:mapId',
-				components: import('@/views/demonstration/detail/index'),
+				component: DemonstrationDetail,
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				components: import('@/views/components/pay/index'),
+				component: Pay,
 				hidden: true
 			}
 		]
@@ -490,14 +579,14 @@ export const asyncRouter = [
 	{
 		path: '/dp',
 		redirect: '/dp/home',
-		components: import('@/views/screenMonitor/index'),
+		component: ScreenMonitor,
 		meta: {
 			roles: [admin, userScreen, user]
 		},
 		children: [
 			{
 				path: 'home',
-				components: import('@/views/screenMonitor/home'),
+				component: ScreenMonitorHome,
 				meta: {
 					i18n: 'router.dpSystem'
 				},
@@ -505,19 +594,19 @@ export const asyncRouter = [
 			},
 			{
 				path: 'detail/:lessonId',
-				components: import('@/views/screenMonitor/detail/index'),
+				component: ScreenMonitorDetail,
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				components: import('@/views/components/pay/index'),
+				component: Pay,
 				hidden: true
 			}
 		]
 	},
 	{
 		path: '/plan/tool',
-		components: import('@/views/planMonitor/editTool/index'),
+		component: PlanMonitorEditTool,
 		meta: {
 		},
 		hidden: true
@@ -525,14 +614,14 @@ export const asyncRouter = [
 	{
 		path: '/plan',
 		redirect: '/plan/home',
-		components: import('@/views/planMonitor/index'),
+		component: PlanMonitor,
 		meta: {
 			roles: [admin, user]
 		},
 		children: [
 			{
 				path: 'home',
-				components: import('@/views/planMonitor/home'),
+				component: PlanMonitorHome,
 				meta: {
 					i18n: 'router.planSystem'
 				},
@@ -540,26 +629,26 @@ export const asyncRouter = [
 			},
 			{
 				path: 'detail/:lessonId',
-				components: import('@/views/planMonitor/detail'),
+				component: PlanMonitorDetail,
 				hidden: true
 			},
 			{
 				path: 'pay/:lessonId',
-				components: import('@/views/components/pay/index'),
+				component: Pay,
 				hidden: true
 			}
 		]
 	},
 	{
 		path: '/replay',
-		components: Layout,
+		component: Layout,
 		meta: {
 			roles: [admin]
 		},
 		children: [
 			{
 				path: 'manage',
-				components: import('@/views/replay/index'),
+				component: Replay,
 				meta: {
 					i18n: 'router.replayManage'
 				}
@@ -568,28 +657,28 @@ export const asyncRouter = [
 	},
 	{
 		path: '/permission',
-		components: Layout,
+		component: Layout,
 		meta: {
 			roles: [admin, user]
 		},
 		children: [
 			{
 				path: 'manage',
-				components: import('@/views/package/index'),
+				component: Package,
 				meta: {
 					i18n: 'router.permissionManage'
 				}
 			},
 			{
 				path: 'draft',
-				components: import('@/views/package/draft/ruleForm'),
+				component: PackageDraft,
 				hidden: true
 			}
 		]
 	},
 	{
 		path: '/publish',
-		components: Layout,
+		component: Layout,
 		meta: {
 			i18n: 'router.pulishManage',
 			roles: [admin]
@@ -597,85 +686,85 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'map',
-				components: import('@/views/publish/publishMap/index'),
+				component: PublishMap,
 				meta: {
 					i18n: 'router.publishMapManage'
 				}
 			},
 			{
 				path: 'product',
-				components: import('@/views/publish/productStatus/index'),
+				component: ProductStatus,
 				meta: {
 					i18n: 'router.productStateManage'
 				}
 			},
 			{
 				path: 'lesson',
-				components: import('@/views/publish/publishLesson/index'),
+				component: PublishLesson,
 				meta: {
 					i18n: 'router.publishLessonManage'
 				}
 			},
 			// {
 			// 	path: 'script',
-			// 	components: import('@/views/publish/simulationScript/index'),
+			// 	component: SimulationScript,
 			// 	meta: {
 			// 		title: '仿真脚本管理',
 			// 	}
 			// },
 			{
 				path: 'runPlan/template',
-				components: import('@/views/publish/runPlanTemplate/index'),
+				component: RunPlanTemplate,
 				meta: {
 					i18n: 'router.runPlanTemplateManage'
 				}
 			},
 			{
 				path: 'runPlan/common',
-				components: import('@/views/publish/runPlanCommon/index'),
+				component: RunPlanCommon,
 				meta: {
 					i18n: 'router.runPlanCommonManage'
 				}
 			},
 			{
 				path: 'runPlan/everyDay',
-				components: import('@/views/publish/runPlanEveryDay/index'),
+				component: RunPlanEveryDay,
 				meta: {
 					i18n: 'router.runPlanEveryDayManage'
 				}
 			},
 			{
 				path: 'examRule/manage',
-				components: import('@/views/publish/examRule/index'),
+				component: PublishExamRule,
 				meta: {
 					i18n: 'router.examRuleManage'
 				}
 			},
 			{
 				path: 'map/draft/:mode/:mapId',
-				components: import('@/views/publish/publishMap/draft'),
+				component: PublishMapDraft,
 				hidden: true
 			},
 			{
 				path: 'examRule/draft/:mode/:ruleId/:lessonId',
-				components: import('@/views/publish/examRule/draft/index'),
+				component: PublishExamRuleDraft,
 				hidden: true
 			},
 			{
 				path: 'runPlan/common/:mode',
-				components: import('@/views/publish/runPlanCommon/draft'),
+				component: RunPlanCommonDraft,
 				hidden: true
 			},
 			{
 				path: 'runPlan/view/:mode',
-				components: import('@/views/map/runplan/chart'),
+				component: RunplanView,
 				hidden: true
 			}
 		]
 	},
 	{
 		path: '/orderauthor',
-		components: Layout,
+		component: Layout,
 		meta: {
 			i18n: 'router.orderAuthorityManage',
 			roles: [admin]
@@ -683,28 +772,28 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'commodity/manage',
-				components: import('@/views/orderauthor/commodity/index'),
+				component: Commodity,
 				meta: {
 					i18n: 'router.commodityManage'
 				}
 			},
 			{
 				path: 'order/manage',
-				components: import('@/views/orderauthor/order/list'),
+				component: OrderList,
 				meta: {
 					i18n: 'router.orderManage'
 				}
 			},
 			{
 				path: 'author/manage',
-				components: import('@/views/orderauthor/author/index'),
+				component: Author,
 				meta: {
 					i18n: 'router.authorityManage'
 				}
 			},
 			{
 				path: 'transfer/manage',
-				components: import('@/views/orderauthor/permission/index'),
+				component: Permission,
 				meta: {
 					i18n: 'router.authorityTransferManage'
 				}
@@ -712,7 +801,7 @@ export const asyncRouter = [
 			{
 				path: 'commodity/draft/:mode/:commodityId',
 				hidden: true,
-				components: import('@/views/orderauthor/commodity/draft'),
+				component: CommodityDraft,
 				meta: {
 					i18n: 'router.addCommodity'
 				}
@@ -720,7 +809,7 @@ export const asyncRouter = [
 			{
 				path: 'order/draft/:mode/:orderId',
 				hidden: true,
-				components: import('@/views/orderauthor/order/draft'),
+				component: OrderDraft,
 				meta: {
 					i18n: 'router.addOrder'
 				}
@@ -728,26 +817,26 @@ export const asyncRouter = [
 			{
 				path: 'author/draft/:mode/:userId',
 				hidden: true,
-				components: import('@/views/orderauthor/author/draft'),
+				component: AuthorDraft,
 				meta: {
 					i18n: 'router.addCoursePermissions'
 				}
 			},
 			{
 				path: 'transfer/detail/:permissionId',
-				components: import('@/views/orderauthor/permission/detail'),
+				component: PermissionDetail,
 				hidden: true
 			},
 			{
 				path: 'transfer/package',
-				components: import('@/views/orderauthor/permission/draft/ruleForm'),
+				component: PermissionDraft,
 				hidden: true
 			}
 		]
 	},
 	{
 		path: '/system',
-		components: Layout,
+		component: Layout,
 		meta: {
 			i18n: 'router.systemManage',
 			roles: [admin]
@@ -755,7 +844,7 @@ export const asyncRouter = [
 		children: [
 			{
 				path: 'dictionary',
-				components: import('@/views/management/dictionary/index'),
+				component: Dictionary,
 				meta: {
 					i18n: 'router.dataDictionary'
 				}
@@ -763,42 +852,42 @@ export const asyncRouter = [
 			{
 				path: 'dictionary/detail',
 				hidden: true,
-				components: import('@/views/management/dictionaryDetail/index'),
+				component: DictionaryDetail,
 				meta: {
 					i18n: 'router.dataDictionaryDetails'
 				}
 			},
 			{
 				path: 'userManage',
-				components: import('@/views/management/userControl/index'),
+				component: UserControl,
 				meta: {
 					i18n: 'router.userManage'
 				}
 			},
 			{
 				path: 'userTrainingManage',
-				components: import('@/views/management/userTraining/index'),
+				component: UserTraining,
 				meta: {
 					i18n: 'router.userTrainingManage'
 				}
 			},
 			{
 				path: 'userExamManage',
-				components: import('@/views/management/userExam/index'),
+				component: UserExam,
 				meta: {
 					i18n: 'router.userExamManage'
 				}
 			},
 			{
 				path: 'userSimulationManage',
-				components: import('@/views/management/userSimulation/index'),
+				component: UserSimulation,
 				meta: {
 					i18n: 'router.userSimulationManage'
 				}
 			},
 			{
 				path: 'existingSimulation',
-				components: import('@/views/management/existingSimulation/index'),
+				component: ExistingSimulation,
 				meta: {
 					i18n: 'router.existingSimulation'
 				}
diff --git a/src/views/index.js b/src/views/index.js
deleted file mode 100644
index 55af6d062..000000000
--- a/src/views/index.js
+++ /dev/null
@@ -1,974 +0,0 @@
-/* eslint-disable no-unused-vars */
-import Vue from 'vue';
-import Router from 'vue-router';
-
-// in development-env not use lazy-loading, because lazy-loading too many pages will cause webpack hot update too slow. so only in production use lazy-loading;
-// detail: https://panjiachen.github.io/vue-element-admin-site/#/lazy-loading
-
-Vue.use(Router);
-
-/* Dashboard */
-import Dashboard from '@/views/dashboard/index.vue';
-
-/* Layout */
-import Layout from '@/views/layout/Layout';
-import Login from '@/views/login/index';
-import LoginNew from '@/views/login/loginNew';
-import Page404 from '@/views/404';
-
-import LoginScreen from '@/views/login/loginScreen';
-import LoginNewScreen from '@/views/login/loginNewScreen';
-
-import LoginPlan from '@/views/login/loginPlan';
-import LoginNewPlan from '@/views/login/loginNewPlan';
-
-
-//地图绘制
-import MapManage from '@/views/map/mapdraft/index';
-import MapEdit from '@/views/map/mapdraft/mapedit/index';
-import SkinStyle from '@/views/map/skinStyle/index';
-import SkinStyleDraft from '@/views/map/skinStyle/draft';
-
-//列车运行表
-import ListPlan from '@/views/map/runplan/index';
-//运行图视图
-import ViewPlan from '@/views/map/runplan/chart';
-
-//实训管理和编辑
-import TrainingManage from '@/views/lesson/trainingrecord/index';
-import TrainingEdit from '@/views/lesson/trainingrecord/manage/index';
-//产品管理
-import TrainingCategory from '@/views/lesson/trainingcategory/index';
-import ProductList from '@/views/map/product/list';
-import ProductDraft from '@/views/map/product/draft';
-
-//课程管理
-import LessonCategory from '@/views/lesson/lessoncategory/index';
-//自动生成实训
-import TrainingGeneration from '@/views/lesson/trainingmanage/index';
-import TrainingRule from '@/views/lesson/trainingRule/list';
-import TrainingRuleDetail from '@/views/lesson/trainingRule/detail/index';
-
-//购买页面
-import PayPage from '@/views/components/pay/index';
-
-//教学系统
-import Teach from '@/views/teach/index';
-import TeachHome from '@/views/teach/home';
-import TeachDetail from '@/views/teach/detail/index';
-import TeachPracticalDetail from '@/views/teach/practical/index';
-import TaskManageList from '@/views/lesson/taskmanage/list';
-import ScriptManage from '@/views/lesson/scriptmanage/list';
-
-//考试系统
-import Exam from '@/views/exam/index';
-import ExamHome from '@/views/exam/home';
-import ExamDetail from '@/views/exam/detail/examDetail';
-import ExamCourseDetail from '@/views/exam/detail/courseDetail';
-import ExamQuestionDetail from '@/views/exam/detail/questionDetail';
-import ExamResult from '@/views/exam/result';
-
-//考试规则
-import ExamRuleList from '@/views/publish/examRule/index';
-import ExamRuleDraft from '@/views/publish/examRule/draft/index';
-
-//仿真系统
-import Demonstration from '@/views/demonstration/index';
-import DemonstrationHome from '@/views/demonstration/home';
-import DemonstrationDetail from '@/views/demonstration/detail/index';
-
-//大屏系统
-import ScreenMonitor from '@/views/screenMonitor/index';
-import ScreenMonitorHome from '@/views/screenMonitor/home';
-import ScreenMonitorDetail from '@/views/screenMonitor/detail/index';
-
-//琏计划系统
-import PlanMonitor from '@/views/planMonitor/index';
-import PlanMonitorHome from '@/views/planMonitor/home';
-import PlanMonitorDetail from '@/views/planMonitor/detail';
-import PlanEditTool from '@/views/planMonitor/editTool/index';
-
-//回放管理
-import replay from '@/views/replay/index';
-
-//权限管理
-import PermissionList from '@/views/package/index';
-import PermissionDraft from '@/views/package/draft/ruleForm';
-
-// 产品状态管理
-import ProductStatus from '@/views/publish/productStatus/index';
-// 发布地图管理
-import PublishMap from '@/views/publish/publishMap/index';
-import PublishMapDraft from '@/views/publish/publishMap/draft';
-// 发布课程管理
-import PublishLesson from '@/views/publish/publishLesson/index';
-// 仿真脚本管理
-import SimulationScript from '@/views/publish/simulationScript/index';
-// 运行图模板管理
-import PlanTemplate from '@/views/publish/runPlanTemplate/index';
-import PlanCommon from '@/views/publish/runPlanCommon/index';
-import PlanCommonDraft from '@/views/publish/runPlanCommon/draft';
-// 运行图每日加载管理
-import PlanEveryDay from '@/views/publish/runPlanEveryDay/index';
-
-// 系统字典管理
-import Dictionary from '@/views/management/dictionary/index';
-import DictionaryDetail from '@/views/management/dictionaryDetail/index';
-// 用户考试管理
-import UserExam from '@/views/management/userExam/index';
-// 用户仿真管理
-import UserSimulation from '@/views/management/userSimulation/index';
-// 存在仿真管理
-import ExistingSimulation from '@/views/management/existingSimulation/index';
-// 用户实训管理
-import UserTraining from '@/views/management/userTraining/index';
-// 用户管理
-import UserControl from '@/views/management/userControl/index';
-
-// 商品管理
-import commodityList from '@/views/orderauthor/commodity/index';
-import CommodityDraft from '@/views/orderauthor/commodity/draft';
-
-//课程权限管理
-import LessonPermission from '@/views/orderauthor/author/index';
-import LessonPermissionDraft from '@/views/orderauthor/author/draft';
-
-//订单操作
-import OrderList from '@/views/orderauthor/order/list';
-import OrderDraft from '@/views/orderauthor/order/draft';
-import runPlan from '../store/modules/runplan';
-
-//打包管理
-import PackageMange from '@/views/orderauthor/permission/index';
-import PackageDetail from '@/views/orderauthor/permission/detail';
-import PackageDraft from '@/views/orderauthor/permission/draft/ruleForm';
-
-//综合演练
-import trainRoom from '@/views/trainRoom/index';
-import JointTrainingDraft from '@/views/jointTraining/index';
-
-import ThreeTest from '@/views/jlmap3d/index';//test
-import ThreeDrawTest from '@/views/jlmap3d/jlmap3dedit';//test
-import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
-
-export const UrlConfig = {
-	display: '/display',
-	examRuleDraft: '/examRule/draft',
-	examRuleManage: '/examRule/manage',
-	map: {
-		prefix: '/map',
-		draft: '/map/draw',
-		skinStyle: '/map/skinStyle',
-		skinStyleDraft: '/map/skinStyle/draft',
-		runPlan: '/map/runPlan',
-		runPlanView: '/map/runPlan/view',
-		product: '/map/product',
-		productDraft: '/map/product/draft',
-	},
-	lesson: {
-		prefix: '/lesson',
-		record: '/lesson/record/training',
-		manage: '/lesson/manage/training'
-	},
-	teach: {
-		prefix: '/teach',
-		detail: '/teach/detail',
-		practical: '/teach/practical',
-		pay: '/teach/pay',
-	},
-	exam: {
-		prefix: '/exam',
-		detail: '/exam/detail',
-		course: '/exam/course',
-		examRuleManage: '/exam/examRule/manage',
-		pay: '/exam/pay'
-	},
-	demonstration: {
-		prefix: '/demonstration',
-		detail: '/demonstration/detail',
-		pay: '/demonstration/pay'
-	},
-	dp: {
-		prefix: '/dp',
-		detail: '/dp/detail',
-		pay: '/dp/pay'
-
-	},
-	plan: {
-		prefix: '/plan',
-		tool: '/plan/tool',
-		detail: '/plan/detail',
-		pay: '/plan/pay'
-	},
-	replay: {
-		prefix: '/replay'
-	},
-	permission: {
-		prefix: '/permission',
-		permissionList: '/permission/manage',
-		permissionDraft: '/permission/draft',
-		permission: '/permission/restore'
-	},
-	publish: {
-		prefix: '/publish',
-		map: '/publish/map',
-		mapDraft: '/publish/map/draft',
-		runPlanEveryDay: '/publish/runPlan/everyDay',
-		runPlanTemplate: '/publish/runPlan/template',
-		runPlanCommon: '/publish/runPlan/common',
-		runPlanView: '/publish/runPlan/view',
-	},
-	orderauthor: {
-		prefix: '/orderauthor',
-		commodityManage: '/orderauthor/commodity/manage',
-		commodityDraft: '/orderauthor/commodity/draft',
-		orderManage: '/orderauthor/order/manage',
-		orderDraft: '/orderauthor/order/draft',
-		authorMange: '/orderauthor/author/manage',
-		authorDraft: '/orderauthor/author/draft',
-		transferDetail: '/orderauthor/transfer/detail',
-		trainferPackage: '/orderauthor/transfer/package'
-	}
-};
-
-export const constantRouterMap = [
-	{ path: '/dp/login', component: resolve => require(['@/views/login/loginNewScreen'], resolve), hidden: true },  //扫码登录
-	{ path: '/dp/login1', component: resolve => require(['@/views/login/loginScreen'], resolve), hidden: true },   	//密码登录
-
-	{ path: '/plan/login', component: resolve => require(['@/views/login/loginNewPlan'], resolve), hidden: true },	//扫码登录
-	{ path: '/plan/login1', component: resolve => require(['@/views/login/loginPlan'], resolve), hidden: true },	//密码登录
-
-	{ path: '/login', component: resolve => require(['@/views/login/loginNew'], resolve), hidden: true },			//扫码登录
-	{ path: '/login1', component: resolve => require(['@/views/login/index'], resolve), hidden: true },				//密码登录
-	{ path: '/jlmap3d/edit', component: resolve => require(['@/views/jlmap3d/jlmap3dedit'], resolve), hidden: true },
-	{ path: '/404', component: resolve => require(['@/views/404'], resolve), hidden: true },
-	{ path: '*', redirect: '/404', hidden: true }
-];
-
-export default new Router({
-	mode: 'history', 					//后端支持可开
-	scrollBehavior: () => ({ y: 0 }),
-	routes: constantRouterMap
-});
-
-export const user = '01';				// 普通用户
-export const mapCreater = '02';			// 地图创建权限
-export const lessonCreater = '03';		// 课程创建权限
-export const admin = '04';				// 管理员
-export const superAdmin = '05';			// 超级管理员
-
-export const userExam = '011';     		// 考试系统
-export const userLesson = '012';   		// 教学系统
-export const userSimulation = '013';	// 仿真系统
-export const userScreen = '014';   		// 大屏系统
-export const userPlan = '015';   		// 计划系统
-
-
-export const asyncRouterMap = [
-	{
-		path: '/',
-		component: resolve => require(['@/views/layout/Layout'], resolve),
-		redirect: '/dashboard',
-		name: 'Dashboard',
-		hidden: true,
-		children: [
-			{
-				path: 'dashboard',
-				component: resolve => require(['@/views/dashboard/index.vue'], resolve)
-			},
-		]
-	},
-	{
-		path: '/display/:mode',
-		component: resolve => require(['@/views/display/index'], resolve),
-		meta: {
-			title: '实训视图'
-		},
-		hidden: true
-	},
-	{
-		path: '/trainroom',
-		component: resolve => require(['@/views/trainRoom/index'], resolve),
-		meta: {
-			title: '综合演练房间'
-		},
-		hidden: true,
-	},
-	{
-		path: '/jointTraining',
-		name: '联合演练试图',
-		component: resolve => require(['@/views/jointTraining/index'], resolve),
-		hidden: true
-	},
-	{
-		path: '/jlmap3d',
-		name: '三维test',
-		component: resolve => require(['@/views/jlmap3d/index'], resolve),
-		meta: {
-			title: '三维test'
-		},
-		hidden: true
-	},
-	{
-		path: '/map',
-		name: '地图管理',
-		meta: {
-			title: '地图管理',
-			roles: [admin, mapCreater],
-		},
-		component: resolve => require(['@/views/layout/Layout'], resolve),
-		children: [
-			{
-				path: 'skinStyle',
-				name: '皮肤管理',
-				component: resolve => require(['@/views/map/skinStyle/index'], resolve),
-				meta: {
-					title: '皮肤管理',
-				},
-			},
-			{
-				path: 'skinStyle/draft/:mode/:skinStyleId',
-				name: '操作权限',
-				hidden: true,
-				component: resolve => require(['@/views/map/skinStyle/draft'], resolve),
-				meta: {
-					title: '操作权限'
-				}
-			},
-			{
-				path: 'draw',
-				redirect: '/map/draw/0/draft',
-				component: resolve => require(['@/views/map/mapdraft/index'], resolve),
-				meta: {
-					title: '地图绘制',
-				},
-				children: [
-					{
-						path: ':mapId/:view',
-						component: resolve => require(['@/views/map/mapdraft/mapedit/index'], resolve),
-						meta: {
-							title: '地图绘制',
-						},
-						hidden: true
-					}
-				]
-			},
-			{
-				path: 'runPlan',
-				redirect: '/map/runPlan/view/draft',
-				name: '运行图管理',
-				component: resolve => require(['@/views/map/runplan/index'], resolve),
-				meta: {
-					title: '运行图管理'
-				},
-				children: [{
-					path: 'view/:mode',
-					component: resolve => require(['@/views/map/runplan/chart'], resolve),
-					hidden: true
-				}],
-			},
-			{
-				path: 'product',
-				name: '产品编辑',
-				component: resolve => require(['@/views/lesson/trainingcategory/index'], resolve),
-				meta: {
-					title: '产品编辑',
-				}
-			}
-		]
-	},
-	{
-		path: '/lesson',
-		component: resolve => require(['@/views/layout/Layout'], resolve),
-		name: '课程管理',
-		meta: {
-			title: '课程管理',
-			roles: [admin, lessonCreater],
-		},
-		children: [
-			{
-				path: 'record',
-				redirect: '/lesson/record/training/0/null',
-				component: resolve => require(['@/views/lesson/trainingrecord/index'], resolve),
-				meta: {
-					title: '实训录制',
-				},
-				children: [
-					{
-						path: 'training/:trainingId/:trainingName',
-						component: resolve => require(['@/views/lesson/trainingrecord/manage/index'], resolve),
-						meta: {
-							title: '实训录制',
-						},
-						hidden: true
-					},
-				]
-			},
-			{
-				path: 'manage/taskmanage',
-				name: '任务管理',
-				component: resolve => require(['@/views/lesson/taskmanage/list'], resolve),
-				meta: {
-					title: '任务管理'
-				}
-			},
-			{
-				path: 'manage/trainingRule',
-				name: '操作定义',
-				component: resolve => require(['@/views/lesson/trainingRule/list'], resolve),
-				meta: {
-					title: '操作定义'
-				},
-			},
-			{
-				path: 'manage/trainingRule/detail',
-				name: '操作定义明细',
-				hidden: true,
-				component: resolve => require(['@/views/lesson/trainingRule/detail/index'], resolve),
-				meta: {
-					title: '操作定义明细'
-				}
-			},
-			{
-				path: 'manage/training',
-				name: '实训管理',
-				component: resolve => require(['@/views/lesson/trainingmanage/index'], resolve),
-				meta: {
-					title: '实训管理'
-				}
-			},
-			{
-				path: 'edit',
-				name: '课程编辑',
-				component: resolve => require(['@/views/lesson/lessoncategory/index'], resolve),
-				meta: {
-					title: '课程编辑',
-				}
-			},
-			{
-				path: 'manage/scriptmanage',
-				name: '剧本管理',
-				component: resolve => require(['@/views/lesson/scriptmanage/list'], resolve),
-				meta: {
-					title: '剧本管理'
-				}
-			}
-		]
-	},
-	{
-		path: '/teach',
-		redirect: '/teach/home',
-		name: '教学系统',
-		component: resolve => require(['@/views/teach/index'], resolve),
-		meta: {
-			roles: [admin, userLesson, user],
-		},
-		children: [
-			{
-				path: 'home',
-				component: resolve => require(['@/views/teach/home'], resolve),
-				meta: {
-					title: '教学系统'
-				},
-			},
-			{
-				path: 'detail/:lessonId',
-				name: '课程详情',
-				component: resolve => require(['@/views/teach/detail/index'], resolve),
-				meta: {
-					title: '课程详情'
-				},
-				hidden: true
-			},
-			{
-				path: 'practical/:trainingId/:lessonId',
-				name: '实训详情',
-				component: resolve => require(['@/views/teach/practical/index'], resolve),
-				meta: {
-					title: '实训详情'
-				},
-				hidden: true
-			},
-			{
-				path: 'pay/:lessonId',
-				component: resolve => require(['@/views/components/pay/index'], resolve),
-				meta: {
-				},
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/exam',
-		redirect: '/exam/home',
-		component: resolve => require(['@/views/exam/index'], resolve),
-		name: '考试系统',
-		meta: {
-			roles: [admin, userExam, user],
-		},
-		children: [
-			{
-				path: 'home',
-				component: resolve => require(['@/views/exam/home'], resolve),
-				meta: {
-					title: '考试系统'
-				},
-			},
-			{
-				path: 'detail/:examId',
-				name: '试卷详情',
-				component: resolve => require(['@/views/exam/detail/examDetail'], resolve),
-				meta: {
-					title: '试卷详情'
-				},
-				hidden: true,
-			},
-			{
-				path: 'course/:lessonId',
-				component: resolve => require(['@/views/exam/detail/courseDetail'], resolve),
-				meta: {
-				},
-				hidden: true,
-			},
-			{
-				path: 'examRule/manage',
-				name: '试题设置',
-				component: resolve => require(['@/views/publish/examRule/index'], resolve),
-				meta: {
-					title: '试题设置'
-				},
-				hidden: true,
-			},
-			{
-				path: 'examRule/draft/:mode/:ruleId/:lessonId',
-				hidden: true,
-				component: resolve => require(['@/views/publish/examRule/draft/index'], resolve),
-				meta: {
-					title: '添加订单'
-				}
-			},
-			{
-				path: 'pay/:lessonId',
-				component: resolve => require(['@/views/components/pay/index'], resolve),
-				meta: {
-				},
-				hidden: true
-			},
-			{
-				path: 'questionDetail/:examQuestionId',
-				name: '开始考试',
-				component: resolve => require(['@/views/exam/detail/questionDetail'], resolve),
-				meta: {
-					title: '开始考试',
-				},
-				hidden: true,
-			},
-			{
-				path: 'result/:userExamId',
-				name: '考试结果',
-				component: resolve => require(['@/views/exam/result'], resolve),
-				meta: {
-					title: '考试结果',
-				},
-				hidden: true
-			},
-		]
-	},
-	{
-		path: '/demonstration',
-		redirect: '/demonstration/home',
-		component: resolve => require(['@/views/demonstration/index'], resolve),
-		name: '仿真系统',
-		meta: {
-			roles: [admin, userSimulation, user],
-		},
-		children: [
-			{
-				path: 'home',
-				component: resolve => require(['@/views/demonstration/home'], resolve),
-				meta: {
-					title: '仿真系统'
-				},
-			},
-			{
-				path: 'detail/:mapId',
-				name: '地图详情',
-				component: resolve => require(['@/views/demonstration/detail/index'], resolve),
-				meta: {
-					title: '地图详情'
-				},
-				hidden: true
-			},
-			{
-				path: 'pay/:lessonId',
-				component: resolve => require(['@/views/components/pay/index'], resolve),
-				meta: {
-				},
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/dp',
-		redirect: '/dp/home',
-		component: resolve => require(['@/views/screenMonitor/index'], resolve),
-		name: '大屏系统',
-		meta: {
-			roles: [admin, userScreen],
-		},
-		children: [
-			{
-				path: 'home',
-				component: resolve => require(['@/views/screenMonitor/home'], resolve),
-				meta: {
-					title: '大屏系统'
-				},
-				target: true
-			},
-			{
-				path: 'detail/:lessonId',
-				component: resolve => require(['@/views/screenMonitor/detail/index'], resolve),
-				meta: {
-				},
-				hidden: true
-			},
-			{
-				path: 'pay/:lessonId',
-				component: resolve => require(['@/views/components/pay/index'], resolve),
-				meta: {
-				},
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/plan/tool',
-		component: resolve => require(['@/views/planMonitor/editTool/index'], resolve),
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/plan',
-		redirect: '/plan/home',
-		component: resolve => require(['@/views/planMonitor/index'], resolve),
-		name: '琏计划',
-		meta: {
-			roles: [admin, user],
-		},
-		children: [
-			{
-				path: 'home',
-				component: resolve => require(['@/views/planMonitor/home'], resolve),
-				meta: {
-					title: '琏计划'
-				},
-				target: true
-			},
-			{
-				path: 'detail/:lessonId',
-				component: resolve => require(['@/views/planMonitor/detail'], resolve),
-				meta: {
-				},
-				hidden: true
-			},
-			{
-				path: 'pay/:lessonId',
-				component: resolve => require(['@/views/components/pay/index'], resolve),
-				meta: {
-				},
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/replay',
-		component: resolve => require(['@/views/layout/Layout'], resolve),
-		meta: {
-			roles: [admin],
-		},
-		children: [
-			{
-				path: 'manage',
-				component: resolve => require(['@/views/replay/index'], resolve),
-				meta: {
-					title: '回放管理'
-				},
-			}
-		]
-	},
-	{
-		path: '/permission',
-		component: resolve => require(['@/views/layout/Layout'], resolve),
-		meta: {
-			roles: [admin, user],
-		},
-		children: [
-			{
-				path: 'manage',
-				component: resolve => require(['@/views/package/index'], resolve),
-				meta: {
-					title: '权限管理'
-				},
-			},
-			{
-				path: 'draft',
-				component: resolve => require(['@/views/package/draft/ruleForm'], resolve),
-				meta: {
-				},
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/publish',
-		name: '发布内容管理',
-		component: resolve => require(['@/views/layout/Layout'], resolve),
-		meta: {
-			title: '发布内容管理',
-			roles: [admin],
-		},
-		children: [
-			{
-				path: 'map',
-				name: '发布地图管理',
-				component: resolve => require(['@/views/publish/publishMap/index'], resolve),
-				meta: {
-					title: '发布地图管理',
-				}
-			},
-			{
-				path: 'product',
-				name: '产品状态管理',
-				component: resolve => require(['@/views/publish/productStatus/index'], resolve),
-				meta: {
-					title: '产品状态管理',
-				}
-			},
-			{
-				path: 'lesson',
-				name: '发布课程管理',
-				component: resolve => require(['@/views/publish/publishLesson/index'], resolve),
-				meta: {
-					title: '发布课程管理',
-				}
-			},
-			// {
-			// 	path: 'script',
-			// 	name: '仿真脚本管理',
-			// 	component: resolve => require(['@/views/publish/simulationScript/index'], resolve),
-			// 	meta: {
-			// 		title: '仿真脚本管理',
-			// 	}
-			// },
-			{
-				path: 'runPlan/template',
-				component: resolve => require(['@/views/publish/runPlanTemplate/index'], resolve),
-				meta: {
-					title: '运行图模板管理'
-				}
-			},
-			{
-				path: 'runPlan/common',
-				component: resolve => require(['@/views/publish/runPlanCommon/index'], resolve),
-				meta: {
-					title: '运行图通用管理'
-				}
-			},
-			{
-				path: 'runPlan/everyDay',
-				component: resolve => require(['@/views/publish/runPlanEveryDay/index'], resolve),
-				meta: {
-					title: '运行图每日管理'
-				}
-			},
-			{
-				path: 'examRule/manage',
-				name: '试题管理',
-				component: resolve => require(['@/views/publish/examRule/index'], resolve),
-				meta: {
-					title: '试题管理'
-				}
-			},
-			{
-				path: 'map/draft/:mode/:mapId',
-				component: resolve => require(['@/views/publish/publishMap/draft'], resolve),
-				meta: {
-				},
-				hidden: true
-			},
-			{
-				path: 'examRule/draft/:mode/:ruleId/:lessonId',
-				hidden: true,
-				component: resolve => require(['@/views/publish/examRule/draft/index'], resolve),
-				meta: {
-				}
-			},
-			{
-				path: 'runPlan/common/:mode',
-				component: resolve => require(['@/views/publish/runPlanCommon/draft'], resolve),
-				meta: {
-				},
-				hidden: true
-			},
-			{
-				path: 'runPlan/view/:mode',
-				component: resolve => require(['@/views/map/runplan/chart'], resolve),
-				meta: {
-				},
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/orderauthor',
-		component: resolve => require(['@/views/layout/Layout'], resolve),
-		name: '订单权限管理',
-		meta: {
-			title: '订单权限管理',
-			roles: [admin]
-		},
-		children: [
-			{
-				path: 'commodity/manage',
-				name: '商品管理',
-				component: resolve => require(['@/views/orderauthor/commodity/index'], resolve),
-				meta: {
-					title: '商品管理'
-				}
-			},
-			{
-				path: 'order/manage',
-				name: '订单管理',
-				component: resolve => require(['@/views/orderauthor/order/list'], resolve),
-				meta: {
-					title: '订单管理'
-				}
-			},
-			{
-				path: 'author/manage',
-				name: '权限管理',
-				component: resolve => require(['@/views/orderauthor/author/index'], resolve),
-				meta: {
-					title: '权限管理'
-				}
-			},
-			{
-				path: 'transfer/manage',
-				name: '权限分发管理',
-				component: resolve => require(['@/views/orderauthor/permission/index'], resolve),
-				meta: {
-					title: '权限分发管理'
-				}
-			},
-			{
-				path: 'commodity/draft/:mode/:commodityId',
-				name: '添加商品',
-				hidden: true,
-				component: resolve => require(['@/views/orderauthor/commodity/draft'], resolve),
-				meta: {
-					title: '添加商品'
-				}
-			},
-			{
-				path: 'order/draft/:mode/:orderId',
-				name: '添加订单',
-				hidden: true,
-				component: resolve => require(['@/views/orderauthor/order/draft'], resolve),
-				meta: {
-					title: '添加订单'
-				}
-			},
-			{
-				path: 'author/draft/:mode/:userId',
-				name: '添加课程权限',
-				hidden: true,
-				component: resolve => require(['@/views/orderauthor/author/draft'], resolve),
-				meta: {
-					title: '添加课程权限'
-				}
-			},
-			{
-				path: 'transfer/detail/:permissionId',
-				component: resolve => require(['@/views/orderauthor/permission/detail'], resolve),
-				meta: {
-				},
-				hidden: true
-			},
-			{
-				path: 'transfer/package',
-				component: resolve => require(['@/views/orderauthor/permission/draft/ruleForm'], resolve),
-				meta: {
-				},
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/system',
-		component: resolve => require(['@/views/layout/Layout'], resolve),
-		meta: {
-			title: '系统管理',
-			roles: [admin],
-		},
-		children: [
-			{
-				path: 'dictionary',
-				name: 'Dictionary',
-				component: resolve => require(['@/views/management/dictionary/index'], resolve),
-				meta: {
-					title: '数据字典'
-				}
-			},
-			{
-				path: 'dictionary/detail',
-				name: '数据字典明细',
-				hidden: true,
-				component: resolve => require(['@/views/management/dictionaryDetail/index'], resolve),
-				meta: {
-					title: '数据字典明细'
-				}
-			},
-			{
-				path: 'userManage',
-				name: '用户管理',
-				component: resolve => require(['@/views/management/userControl/index'], resolve),
-				meta: {
-					title: '用户管理',
-				}
-			},
-			{
-				path: 'userTrainingManage',
-				name: '用户实训管理',
-				component: resolve => require(['@/views/management/userTraining/index'], resolve),
-				meta: {
-					title: '用户实训管理',
-				}
-			},
-			{
-				path: 'userExamManage',
-				name: '用户考试管理',
-				component: resolve => require(['@/views/management/userExam/index'], resolve),
-				meta: {
-					title: '用户考试管理',
-				}
-			},
-			{
-				path: 'userSimulationManage',
-				name: '用户仿真管理',
-				component: resolve => require(['@/views/management/userSimulation/index'], resolve),
-				meta: {
-					title: '用户仿真管理',
-				}
-			},
-      {
-        path: 'existingSimulation',
-        name: '存在仿真管理',
-        component: resolve => require(['@/views/management/existingSimulation/index'], resolve),
-        meta: {
-          title: '存在仿真管理',
-        }
-      }
-		]
-	},
-];

From df1697e137372e3dd37089084227973cd42cdef3 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 12 Aug 2019 14:08:16 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/mapdraft/mapedit/index.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/map/mapdraft/mapedit/index.vue b/src/views/map/mapdraft/mapedit/index.vue
index d10951d93..78df97feb 100644
--- a/src/views/map/mapdraft/mapedit/index.vue
+++ b/src/views/map/mapdraft/mapedit/index.vue
@@ -243,9 +243,10 @@ export default {
 				x: em.clientX,
 				y: em.clientY
 			};
-			var menu = getDeviceMenuByDeviceType('Cancel');
-
-			this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
+			if (!em.deviceType) {
+                var menu = getDeviceMenuByDeviceType('Cancel');
+                this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
+            }
 		},
 		saveMapEvent() {
 			if (this.$refs.jlmapVisual) {

From be91b4f1c6732ee0c245a1bb813fa50f0d963e6d Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Mon, 12 Aug 2019 14:10:46 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index db2e58341..99c4decfd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,7 +27,7 @@ Vue.use(VueI18n);
 Vue.config.productionTip = false;
 
 export const i18n = new VueI18n({
-	locale: LangStorage.getLang('en'),
+	locale: LangStorage.getLang('zh'),
 	messages
 });
 

From 1b01141b88f8608a9527272cfec22116d18850aa Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 12 Aug 2019 14:21:32 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=A7=E6=9C=AC?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lesson/scriptmanage/create.vue | 4 ++--
 src/views/lesson/scriptmanage/list.vue   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/lesson/scriptmanage/create.vue b/src/views/lesson/scriptmanage/create.vue
index f89141290..98a9503c1 100644
--- a/src/views/lesson/scriptmanage/create.vue
+++ b/src/views/lesson/scriptmanage/create.vue
@@ -39,7 +39,7 @@
                     labelWidth: '100px',
                     items: [
                         { prop: 'name', label: '剧本名称', type: 'text', required: true},
-                        { prop: 'mapId', label: '地图类型', type: 'select', required: true, options: this.mapList,disabled:this.disabled},
+                        { prop: 'mapId', label: '地图', type: 'select', required: true, options: this.mapList,disabled:this.disabled},
                         { prop: 'description', label: '剧本描述', type: 'textarea', required: true},
                     ]
                 }
@@ -51,7 +51,7 @@
                         { required: true, message: '请输入剧本', trigger: 'blur' },
                     ],
                     mapId: [
-                        { required: true, message: '请选择地图类型', trigger: 'change' },
+                        { required: true, message: '请选择地图', trigger: 'change' },
                     ],
                     description:[
                         { required: true, message: '请输入剧本描述', trigger: 'blur' },
diff --git a/src/views/lesson/scriptmanage/list.vue b/src/views/lesson/scriptmanage/list.vue
index abac81e50..51952d2cb 100644
--- a/src/views/lesson/scriptmanage/list.vue
+++ b/src/views/lesson/scriptmanage/list.vue
@@ -39,7 +39,7 @@
                     queryObject: {
                         mapId: {
                             type: 'select',
-                            label: '地图类型',
+                            label: '地图',
                             config: {
                                 data: []
                             }
@@ -56,7 +56,7 @@
                             prop: 'name'
                         },
                         {
-                            title: '地图类型',
+                            title: '地图',
                             prop: 'mapId',
                             type: 'tag',
                             columnValue: (row) => {