From ff9e69585d92016e1d28dd9ccae0b57b1e84de52 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 1 Aug 2019 15:19:24 +0800
Subject: [PATCH] =?UTF-8?q?desc:=20=E8=B0=83=E6=95=B4=E5=89=A7=E6=9C=AC?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=EF=BC=8C=E5=88=A0=E9=99=A4=E5=9F=8E=E5=B8=82?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quest.js                          |  53 +-
 src/jmap/config/deviceStyle.js            |   3 +-
 src/utils/baseUrl.js                      |   8 +-
 src/views/display/demon/addQuest.vue      | 324 +++++---
 src/views/display/index.vue               | 969 +++++++++++-----------
 src/views/display/menuSchema.vue          | 278 ++++---
 src/views/display/tipQuestDetail.vue      | 151 ++--
 src/views/map/mapdraft/mapmanage/edit.vue |  10 +-
 vue.config.js                             |  38 +-
 9 files changed, 965 insertions(+), 869 deletions(-)

diff --git a/src/api/quest.js b/src/api/quest.js
index 6491751e3..690ec938f 100644
--- a/src/api/quest.js
+++ b/src/api/quest.js
@@ -2,39 +2,46 @@ import request from '@/utils/request';
 
 /** 分页查找仿真任务*/
 export function getQuestPageList(params) {
-    return request({
-        url: `/api/quest/paging`,
-        method: 'get',
-        params: params
-    });
+	return request({
+		url: `/api/quest/paging`,
+		method: 'get',
+		params: params
+	});
 }
 /** 创建任务 */
 export function createQuest(data) {
-    return request({
-        url: `/api/quest`,
-        method: 'post',
-        data
-    });
+	return request({
+		url: `/api/quest`,
+		method: 'post',
+		data
+	});
 }
 /** 根据任务id删除任务 */
 export function deleteQuest(id) {
-    return request({
-        url: `/api/quest/${id}`,
-        method: 'delete'
-    });
+	return request({
+		url: `/api/quest/${id}`,
+		method: 'delete'
+	});
 }
 /** 根据id查询任务基础信息 */
 export function getQuestById(id) {
-    return request({
-        url: `/api/quest/${id}`,
-        method: 'get',
-    });
+	return request({
+		url: `/api/quest/${id}`,
+		method: 'get'
+	});
+}
+/** 根据id查询任务基础信息 */
+export function getQuestByIdList(id) {
+	return request({
+		url: `/api/quest/${id}/detail`,
+		method: 'get'
+	});
 }
 /** 更新任务基本信息 */
 export function updateQuest(id, data) {
-    return request({
-        url: `/api/quest/${id}`,
-        method: 'put',
-        data
-    });
+	return request({
+		url: `/api/quest/${id}`,
+		method: 'put',
+		data
+	});
 }
diff --git a/src/jmap/config/deviceStyle.js b/src/jmap/config/deviceStyle.js
index 207dcb820..93bc1b125 100644
--- a/src/jmap/config/deviceStyle.js
+++ b/src/jmap/config/deviceStyle.js
@@ -1,8 +1,9 @@
 const mapDeviceStyle = {
+	// '01': 'chengdu_04',
 	'02': 'fuzhou_01',
 	'03': 'bejing_01',
 	'04': 'chengdu_03',
-	'05': 'batong_01'
+	'05': 'batong_01' // 暂时没有画北京八通线
 };
 
 export function selectSkinStyle(code) {
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index d4448b37e..3f8bc9aeb 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -1,14 +1,14 @@
 
 export function getBaseUrl() {
-	let BASE_API
+	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:9010' // 袁琪
-		// BASE_API = 'http://192.168.3.6:9010' // 旭强
+		// BASE_API = 'http://192.168.3.6:9010'; // 旭强
 		// BASE_API = 'http://192.168.3.4:9010' // 琰培
 	} else {
-		BASE_API = process.env.VUE_APP_BASE_API
+		BASE_API = process.env.VUE_APP_BASE_API;
 	}
-	return BASE_API
+	return BASE_API;
 }
diff --git a/src/views/display/demon/addQuest.vue b/src/views/display/demon/addQuest.vue
index 6c93cd7e4..d66c957cc 100644
--- a/src/views/display/demon/addQuest.vue
+++ b/src/views/display/demon/addQuest.vue
@@ -1,137 +1,211 @@
 <template>
-    <el-dialog title="任务列表" :visible.sync="show" top="50px" width="70%" :before-doClose="doClose"
-        :close-on-click-modal="false">
-        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList">
-        </QueryListPage>
+  <div>
+    <el-dialog
+      title="任务列表"
+      :visible.sync="show"
+      top="50px"
+      width="70%"
+      :before-do-close="doClose"
+      :close-on-click-modal="false"
+      :z-index="2000"
+    >
+      <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     </el-dialog>
+    <el-dialog
+      title="角色选择"
+      :visible.sync="roleShow"
+      top="50px"
+      width="350px"
+      :before-do-close="roleDoClose"
+      :close-on-click-modal="false"
+      :z-index="5000"
+    >
+      <div>
+        <el-form ref="ruleForm" :model="form" :rules="rules" label-width="50px">
+          <el-form-item label="角色" prop="role">
+            <el-select v-model="form.role" placeholder="请选择">
+              <el-option
+                v-for="item in memberList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                :disabled="item.role != 'Dispatcher'"
+              />
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="roleDoClose">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+
 </template>
 
 <script>
-    import { getQuestPageList } from '@/api/quest';
-    import { getSkinStyleList } from '@/api/management/mapskin'
+import { getQuestPageList, getQuestByIdList } from '@/api/quest';
+import { getSkinStyleList } from '@/api/management/mapskin';
 
-    export default {
-        name: 'addQuest',
-        props: {
-            trainings: {
-                type: Array,
-            },
-            detail: {
-                type: Object,
-            }
-        },
-        data() {
-            return {
-                show: false,
-                skinCodeList: [],
-                pagerConfig: {
-                    pageSize: 'pageSize',
-                    pageIndex: 'pageNum'
-                },
-                queryForm: {
-                    labelWidth: '80px',
-                    reset: false,
-                    show: false,
-                    queryObject: {
+export default {
+	name: 'AddQuest',
+	props: {
+		trainings: {
+			type: Array,
+			default: () => {
+				return [];
+			}
+		},
+		detail: {
+			type: Object,
+			default: () => {
+				return {};
+			}
+		}
+	},
+	data() {
+		return {
+			show: false,
+			roleShow: false,
+			skinCodeList: [],
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum'
+			},
+			row: {},
+			memberList: [],
+			form: {
+				role: ''
+			},
+			rules: {
+				role: [
+					{ required: true, message: '请选择', trigger: 'change' }
+				]
+			},
+			queryForm: {
+				labelWidth: '80px',
+				reset: false,
+				show: false,
+				queryObject: {
 
-                    }
-                },
-                queryList: {
-                    query: this.listQuest,
-                    selectCheckShow: false,
-                    indexShow: true,
-                    columns: [
-                        {
-                            title: '任务名称',
-                            prop: 'name'
-                        },
-                        {
-                            title: '皮肤类型',
-                            prop: 'skinCode',
-                            type: 'tag',
-                            columnValue: (row) => { return this.convertField(row.skinCode, this.skinCodeList, ['code', 'name']) },
-                            tagType: (row) => { return 'success' }
-                        },
-                        {
-                            title: '创建时间',
-                            prop: 'createTime',
-                        },
-                        {
-                            type: 'button',
-                            title: '操作',
-                            width: '250',
-                            buttons: [
-                                {
-                                    name: '加载任务',
-                                    type: 'primary',
-                                    handleClick: this.handleLoad
-                                },
-                            ]
-                        }
-                    ],
-                    actions: [
-                    ]
-                },
+				}
+			},
+			queryList: {
+				query: this.listQuest,
+				selectCheckShow: false,
+				indexShow: true,
+				columns: [
+					{
+						title: '任务名称',
+						prop: 'name'
+					},
+					{
+						title: '皮肤类型',
+						prop: 'skinCode',
+						type: 'tag',
+						columnValue: (row) => { return this.convertField(row.skinCode, this.skinCodeList, ['code', 'name']); },
+						tagType: (row) => { return 'success'; }
+					},
+					{
+						title: '创建时间',
+						prop: 'createTime'
+					},
+					{
+						type: 'button',
+						title: '操作',
+						width: '250',
+						buttons: [
+							{
+								name: '加载剧本',
+								type: 'primary',
+								handleClick: this.handleLoad
+							}
+						]
+					}
+				],
+				actions: [
+				]
+			},
 
-                currentModel: {}
-            }
-        },
-        created() {
-            this.loadInitData();
-        },
-        methods: {
-            doShow() {
-                this.show = true;
-                this.reloadTable();
-            },
-            doClose() {
-                this.show = false;
-            },
-            listQuest(params) {
-                params['skinCode'] = this.$route.query.skinStyle;
-                return getQuestPageList(params);
-            },
-            convertList(FromList, ToList, ChecktypeFunction) {
-                if (FromList) {
-                    ToList.length = 0;
-                    FromList.forEach(elem => {
-                        if (ChecktypeFunction(elem)) {
-                            ToList.push({ value: elem.code, label: elem.name });
-                        }
-                    });
-                }
-            },
-            async loadInitData() {
-                // 皮肤类型
-                this.skinCodeList = [];
-                getSkinStyleList().then(response => {
-                    this.skinCodeList = response.data;
-                })
-            },
+			currentModel: {}
+		};
+	},
+	created() {
+		this.loadInitData();
+	},
+	methods: {
+		doShow() {
+			this.show = true;
+			this.reloadTable();
+		},
+		doClose() {
+			this.show = false;
+		},
+		listQuest(params) {
+			params['skinCode'] = this.$route.query.skinStyle;
+			return getQuestPageList(params);
+		},
+		convertList(FromList, ToList, ChecktypeFunction) {
+			if (FromList) {
+				ToList.length = 0;
+				FromList.forEach(elem => {
+					if (ChecktypeFunction(elem)) {
+						ToList.push({ value: elem.code, label: elem.name });
+					}
+				});
+			}
+		},
+		async loadInitData() {
+			// 皮肤类型
+			this.skinCodeList = [];
+			getSkinStyleList().then(response => {
+				this.skinCodeList = response.data;
+			});
+		},
 
-            convertField(fieldValue, enumList, converFormat) {
-                if (converFormat && converFormat.length >= 2) {
-                    let value = converFormat[0];
-                    let label = converFormat[1];
-                    for (let i = 0; enumList && i < enumList.length; i++) {
-                        if ('' + fieldValue === '' + enumList[i][value]) {
-                            return enumList[i][label];
-                        }
-                    }
-                }
-            },
+		convertField(fieldValue, enumList, converFormat) {
+			if (converFormat && converFormat.length >= 2) {
+				const value = converFormat[0];
+				const label = converFormat[1];
+				for (let i = 0; i < enumList.length; i++) {
+					if ('' + fieldValue === '' + enumList[i][value]) {
+						return enumList[i][label];
+					}
+				}
+			}
+		},
 
+		async handleLoad(index, row) {
+			this.row = row;
+			const res = await getQuestByIdList(row.id);
+			if (res.code == 200) {
+				this.memberList = res.data.memberVOList;
+				this.memberList.unshift({id: '', name: '观众', role: 'Dispatcher'});
+			}
+			this.roleShow = true;
+		},
 
-            handleLoad(index, row) {
-                this.$emit('selectQuest', row);
-                this.doClose();
-            },
+		reloadTable() {
+			if (this.queryList && this.queryList.reload) {
+				this.queryList.reload();
+			}
+		},
 
-            reloadTable() {
-                if (this.queryList && this.queryList.reload) {
-                    this.queryList.reload();
-                }
-            },
-        }
-    }
-</script>
\ No newline at end of file
+		confirm() {
+			this.$refs['ruleForm'].validate((valid) => {
+				if (valid) {
+					this.$emit('selectQuest', this.row, this.form.role);
+					this.doClose();
+					this.roleDoClose();
+				}
+			});
+		},
+
+		roleDoClose() {
+			this.$refs['ruleForm'].resetFields();
+			this.roleShow = false;
+		}
+	}
+};
+</script>
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index 640b6570c..f7ce253bd 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -1,525 +1,536 @@
 <template>
-    <div class="main" :style="{width: canvasWidth+'px'}" @mousemove="mousemove">
-        <div v-show="panelShow" :panelShow="panelShow">
-            <transition name="el-zoom-in-bottom">
-                <map-system-draft ref="mapCanvas" @back="back"></map-system-draft>
-            </transition>
+  <div class="main" :style="{width: canvasWidth+'px'}" @mousemove="mousemove">
+    <div v-show="panelShow" :panelShow="panelShow">
+      <transition name="el-zoom-in-bottom">
+        <map-system-draft ref="mapCanvas" @back="back" />
+      </transition>
 
-            <menu-exam ref="menuExam" v-if="isExam" :offset="offset" :group="group"></menu-exam>
+      <menu-exam v-if="isExam" ref="menuExam" :offset="offset" :group="group" />
 
-            <menu-lesson ref="lessonMenu" v-if="isLesson" :offset="offset" :group="group" :trainingObj="trainingObj">
-            </menu-lesson>
+      <menu-lesson v-if="isLesson" ref="lessonMenu" :offset="offset" :group="group" :training-obj="trainingObj" />
 
-            <menu-demon ref="menuDemon" v-if="isDemon" :offset="offset" :group="group" :questId="questId"
-                @tryTime='tryTime' @hidepanel="hidepanel" @quitQuest="quitQuest">
+      <menu-demon
+        v-if="isDemon"
+        ref="menuDemon"
+        :offset="offset"
+        :group="group"
+        :quest-id="questId"
+        @tryTime="tryTime"
+        @hidepanel="hidepanel"
+        @quitQuest="quitQuest"
+      />
 
-            </menu-demon>
+      <menu-screen v-if="isScreen" ref="menuScreen" :offset="offset" :group="group" @tryTime="tryTime" />
 
-            <menu-screen ref="menuScreen" v-if="isScreen" :offset="offset" :group="group" @tryTime='tryTime'>
-            </menu-screen>
+      <menu-plan v-if="isPlan" ref="menuPlan" :offset="offset" :group="group" />
 
-            <menu-plan ref="menuPlan" v-if="isPlan" :offset="offset" :group="group"></menu-plan>
+      <menu-replay v-if="isReplay" ref="menuReplay" :offset="offset" :group="group" />
 
-            <menu-replay ref="menuReplay" v-if="isReplay" :offset="offset" :group="group"></menu-replay>
+      <menu-script v-if="isTask" ref="menuScript" :offset="offset" :group="group" />
 
-            <menu-script ref="menuScript" v-if="isTask" :offset="offset" :group="group"></menu-script>
+      <menu-schema
+        v-if="isDemon || isPlan || isTask "
+        ref="menuSchema"
+        :offset="offset"
+        :group="group"
+        @runPlanLoadShow="runPlanLoadShow"
+        @runPlanViewShow="runPlanViewShow"
+        @faultChooseShow="faultChooseShow"
+        @runQuestLoadShow="runQuestLoadShow"
+        @switchMode="switchMode"
+      />
 
-            <menu-schema ref="menuSchema" v-if="isDemon || isPlan || isTask " :offset="offset" :group="group"
-                @runPlanLoadShow="runPlanLoadShow" @runPlanViewShow="runPlanViewShow" @faultChooseShow="faultChooseShow"
-                @runQuestLoadShow="runQuestLoadShow" @switchMode="switchMode">
-            </menu-schema>
+      <menu-system-time ref="menuSystemTime" :offset="offset" :group="group" />
+    </div>
 
-            <menu-system-time ref="menuSystemTime" :offset="offset" :group="group"></menu-system-time>
-        </div>
-
-        <!-- <Three-Test v-show="simulationShow" :panelShow="simulationShow" ref="ThreeTest" @showpanel="showpanel">
+    <!-- <Three-Test v-show="simulationShow" :panelShow="simulationShow" ref="ThreeTest" @showpanel="showpanel">
         </Three-Test>
         <Jl3d-Simulation v-show="drivingShow" :panelShow="drivingShow" ref="Jl3dSimulation" @showdriving="showdriving">
         </Jl3d-Simulation> -->
 
-        <fault-choose ref="faultChoose" :group="group"></fault-choose>
-        <run-plan-Load ref="runPlanLoad" :group="group"></run-plan-Load>
-        <run-plan-view ref="runPlanView" :group="group"></run-plan-view>
-        <add-quest ref="addQuest" @selectQuest="selectQuest"></add-quest>
-    </div>
+    <fault-choose ref="faultChoose" :group="group" />
+    <run-plan-Load ref="runPlanLoad" :group="group" />
+    <run-plan-view ref="runPlanView" :group="group" />
+    <add-quest ref="addQuest" @selectQuest="selectQuest" />
+  </div>
 </template>
 
 <script>
-    import RunPlanLoad from './demon/runPlanLoad';
-    import RunPlanView from './demon/runPlanView';
-    import FaultChoose from './demon/faultChoose';
-    import MapSystemDraft from '@/views/mapsystem/index';
-    import MenuExam from '@/views/display/menuExam';
-    import MenuLesson from '@/views/display/menuLesson';
-    import MenuReplay from '@/views/display/menuReplay';
-    import MenuDemon from '@/views/display/menuDemon';
-    import MenuScreen from '@/views/display/menuScreen';
-    import MenuSchema from '@/views/display/menuSchema';
-    import MenuSystemTime from '@/views/display/menuSystemTime';
-    import MenuPlan from '@/views/display/menuPlan';
-    import MenuScript from '@/views/display/menuScript';
-    import WindowResizeHandler from '@/mixin/WindowResizeHandler';
-    import AddQuest from './demon/addQuest';
-    import { mapGetters } from 'vuex';
-    import { getTrainingStepsDetail } from '@/api/jmap/training';
-    import { setGoodsTryUse } from '@/api/management/goods';
-    import { getProductDetail } from '@/api/management/mapprd';
-    import { simulationNotify, bitScreenNotify, runDiagramQuit, loadQuest, getSimulationInfo } from '@/api/simulation';
-    import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
-    import { checkLoginLine } from '@/api/login';
-    import { isFullscreen } from '@/utils/screen';
-    import { loadMapData } from '@/utils/loaddata';
-    import { handleToken } from '@/utils/auth';
+import RunPlanLoad from './demon/runPlanLoad';
+import RunPlanView from './demon/runPlanView';
+import FaultChoose from './demon/faultChoose';
+import MapSystemDraft from '@/views/mapsystem/index';
+import MenuExam from '@/views/display/menuExam';
+import MenuLesson from '@/views/display/menuLesson';
+import MenuReplay from '@/views/display/menuReplay';
+import MenuDemon from '@/views/display/menuDemon';
+import MenuScreen from '@/views/display/menuScreen';
+import MenuSchema from '@/views/display/menuSchema';
+import MenuSystemTime from '@/views/display/menuSystemTime';
+import MenuPlan from '@/views/display/menuPlan';
+import MenuScript from '@/views/display/menuScript';
+import WindowResizeHandler from '@/mixin/WindowResizeHandler';
+import AddQuest from './demon/addQuest';
+import { mapGetters } from 'vuex';
+import { getTrainingStepsDetail } from '@/api/jmap/training';
+import { setGoodsTryUse } from '@/api/management/goods';
+import { getProductDetail } from '@/api/management/mapprd';
+import { simulationNotify, bitScreenNotify, runDiagramQuit, loadQuest, getSimulationInfo } from '@/api/simulation';
+import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
+import { checkLoginLine } from '@/api/login';
+import { isFullscreen } from '@/utils/screen';
+import { loadMapData } from '@/utils/loaddata';
+import { handleToken } from '@/utils/auth';
 
-    //三维
-    // import ThreeTest from '@/views/jlmap3d/index';
-    // import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
+// 三维
+// import ThreeTest from '@/views/jlmap3d/index';
+// import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
 
-    export default {
-        name: 'DisplayDraft',
-        components: {
-            RunPlanLoad,
-            RunPlanView,
-            FaultChoose,
-            AddQuest,
-            MenuExam,
-            MenuLesson,
-            MenuReplay,
-            MapSystemDraft,
-            MenuPlan,
-            MenuDemon,
-            MenuScreen,
-            MenuScript,
-            MenuSchema,
-            MenuSystemTime,
-            // ThreeTest,
-            // Jl3dSimulation
-        },
-        mixins: [WindowResizeHandler],
-        data() {
-            return {
-                mode: '',
-                trainingObj: {},
-                timeDemonNum: 0,
-                checkLine: null,
-                offset: 15,
-                mouseNum: 1,
-                ierval: null,
-                mouseNumTime: 0,
-                mapBox: null,
-                mapBoxP: null,
-                panelShow: true,
-                simulationShow: false,
-                drivingShow: false,
-                questId: 0,     //加载任务的Id
-                group: '',
-                prdTypeMap: {
-                    '01': '01', //现地 => 现地
-                    '02': '02', //行调 => 行调
-                    '04': '02', //司机加实 => 行调
-                }
-            }
-        },
-        computed: {
-            ...mapGetters([
-                'canvasWidth',
-                'canvasHeight'
-            ]),
-            ...mapGetters('map', [
-                'map',
-                'mapDeviceStatus'
-            ]),
-            ...mapGetters('training', [
-                'offsetStationCode'
-            ]),
-            ...mapGetters('config', [
-                'canvasId'
-            ]),
-            isLesson() {
-                return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
-            },
-            isExam() {
-                return this.mode === 'exam';
-            },
-            isDemon() {
-                return this.mode === 'demon';
-            },
-            isScreen() {
-                return this.mode === 'dp';
-            },
-            isReplay() {
-                return this.mode === 'replay';
-            },
-            isTask() {
-                return this.mode === 'script';
-            },
-            isPlan() {
-                return this.mode === 'plan';
-            },
-            isDrive() {
-                return this.$route.query.prdType == "04";
-            }
-        },
-        watch: {
-            '$store.state.config.menuBarLoadedCount': function (val) {
-                this.setPosition();
-            },
-            '$store.state.map.mapViewLoadedCount': function (val) {
-                this.mapBoxP = document.getElementById(this.canvasId).children[0];
-                this.mapBox = document.getElementsByTagName('canvas');
-            },
-            '$store.state.socket.permissionOver': function () {
-                this.$alert('用户权限已被收回', '提示', {
-                    confirmButtonText: '确定',
-                    callback: action => {
-                        this.back();
-                    }
-                });
-            },
-            $route() {
-                this.initLoadData();
-            }
-        },
-        async created() {
-            this.group = this.$route.query.group || '';
-        },
-        async mounted() {
-            this.mode = this.$route.params.mode;
-            eventBus.$on('clearCheckLogin', () => {
-                this.clearCheckLogin();
-            });
+export default {
+	name: 'DisplayDraft',
+	components: {
+		RunPlanLoad,
+		RunPlanView,
+		FaultChoose,
+		AddQuest,
+		MenuExam,
+		MenuLesson,
+		MenuReplay,
+		MapSystemDraft,
+		MenuPlan,
+		MenuDemon,
+		MenuScreen,
+		MenuScript,
+		MenuSchema,
+		MenuSystemTime
+		// ThreeTest,
+		// Jl3dSimulation
+	},
+	mixins: [WindowResizeHandler],
+	data() {
+		return {
+			mode: '',
+			trainingObj: {},
+			timeDemonNum: 0,
+			checkLine: null,
+			offset: 15,
+			mouseNum: 1,
+			ierval: null,
+			mouseNumTime: 0,
+			mapBox: null,
+			mapBoxP: null,
+			panelShow: true,
+			simulationShow: false,
+			drivingShow: false,
+			questId: 0, // 加载任务的Id
+			group: '',
+			prdTypeMap: {
+				'01': '01', // 现地 => 现地
+				'02': '02', // 行调 => 行调
+				'04': '02' // 司机加实 => 行调
+			}
+		};
+	},
+	computed: {
+		...mapGetters([
+			'canvasWidth',
+			'canvasHeight'
+		]),
+		...mapGetters('map', [
+			'map',
+			'mapDeviceStatus'
+		]),
+		...mapGetters('training', [
+			'offsetStationCode'
+		]),
+		...mapGetters('config', [
+			'canvasId'
+		]),
+		isLesson() {
+			return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
+		},
+		isExam() {
+			return this.mode === 'exam';
+		},
+		isDemon() {
+			return this.mode === 'demon';
+		},
+		isScreen() {
+			return this.mode === 'dp';
+		},
+		isReplay() {
+			return this.mode === 'replay';
+		},
+		isTask() {
+			return this.mode === 'script';
+		},
+		isPlan() {
+			return this.mode === 'plan';
+		},
+		isDrive() {
+			return this.$route.query.prdType == '04';
+		}
+	},
+	watch: {
+		'$store.state.config.menuBarLoadedCount': function (val) {
+			this.setPosition();
+		},
+		'$store.state.map.mapViewLoadedCount': function (val) {
+			this.mapBoxP = document.getElementById(this.canvasId).children[0];
+			this.mapBox = document.getElementsByTagName('canvas');
+		},
+		'$store.state.socket.permissionOver': function () {
+			this.$alert('用户权限已被收回', '提示', {
+				confirmButtonText: '确定',
+				callback: action => {
+					this.back();
+				}
+			});
+		},
+		$route() {
+			this.initLoadData();
+		}
+	},
+	async created() {
+		this.group = this.$route.query.group || '';
+	},
+	async mounted() {
+		this.mode = this.$route.params.mode;
+		eventBus.$on('clearCheckLogin', () => {
+			this.clearCheckLogin();
+		});
 
-            await this.initLoadData();
-        },
-        async beforeDestroy() {
-            await this.clearAllTimer();
-            if (!this.isReplay) {
-                await this.quit();
-            }
-            await this.$store.dispatch('training/reset');
-            await this.$store.dispatch('map/mapClear');
-            eventBus.$off('clearCheckLogin');
-        },
-        methods: {
-            resizeHandler() {
-                let width = this._clientWidth;
-                let height = this._clientHeight;
+		await this.initLoadData();
+	},
+	async beforeDestroy() {
+		await this.clearAllTimer();
+		if (!this.isReplay) {
+			await this.quit();
+		}
+		await this.$store.dispatch('training/reset');
+		await this.$store.dispatch('map/mapClear');
+		eventBus.$off('clearCheckLogin');
+	},
+	methods: {
+		resizeHandler() {
+			const width = this._clientWidth;
+			const height = this._clientHeight;
 
-                this.$store.dispatch('config/resize', { width, height });
+			this.$store.dispatch('config/resize', { width, height });
 
-                this.$nextTick(() => {
-                    this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-                });
-            },
-            // 清除检查在线定时器
-            clearAllTimer() {
-                if (this.ierval) {
-                    clearTimeout(this.ierval);
-                    this.ierval = null;
-                }
+			this.$nextTick(() => {
+				this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
+			});
+		},
+		// 清除检查在线定时器
+		clearAllTimer() {
+			if (this.ierval) {
+				clearTimeout(this.ierval);
+				this.ierval = null;
+			}
 
-                if (this.checkLine) {
-                    clearTimeout(this.checkLine);
-                    this.checkLine = null;
-                }
-            },
-            // 设置检查在线定时器
-            checkLoginLineTimer() {
-                if (this.checkLine) {
-                    clearTimeout(this.checkLine);
-                }
+			if (this.checkLine) {
+				clearTimeout(this.checkLine);
+				this.checkLine = null;
+			}
+		},
+		// 设置检查在线定时器
+		checkLoginLineTimer() {
+			if (this.checkLine) {
+				clearTimeout(this.checkLine);
+			}
 
-                this.checkLine = setInterval(() => {
-                    checkLoginLine();
-                }, 5000 * 60);
-            },
-            // 设置手标显示状态
-            checkMouseStatusTimer() {
-                if (this.ierval) {
-                    clearTimeout(this.ierval);
-                }
+			this.checkLine = setInterval(() => {
+				checkLoginLine();
+			}, 5000 * 60);
+		},
+		// 设置手标显示状态
+		checkMouseStatusTimer() {
+			if (this.ierval) {
+				clearTimeout(this.ierval);
+			}
 
-                this.ierval = setInterval(() => {
-                    if (this.mouseNum) {
-                        this.mouseNum = 0;
-                        this.mouseNumTime = 0;
-                    } else {
-                        this.mouseNumTime += 1;
-                    }
-                    if (this.mapBox) {
-                        if (this.mouseNumTime >= 15) {
-                            for (let i = 0; i < this.mapBox.length; i++) {
-                                this.mapBox[i].style.cursor = 'none';
-                            }
-                        } else {
-                            for (let i = 0; i < this.mapBox.length; i++) {
-                                this.mapBox[i].style.cursor = '';
-                            }
-                        }
-                    }
-                }, 1000)
-            },
-            mousemove(e) {
-                this.mouseNum = 1;
-            },
-            setPosition() {
-                this.$nextTick(() => {
-                    let offset = 15;
-                    let menuBar = document.getElementById('menuBar');
-                    let menuTool = document.getElementById('menuTool');
-                    if (menuBar) {
-                        offset += (menuBar.offsetHeight || 0);
-                    }
-                    if (menuTool) {
-                        offset += (menuTool.offsetHeight || 0);
-                    }
+			this.ierval = setInterval(() => {
+				if (this.mouseNum) {
+					this.mouseNum = 0;
+					this.mouseNumTime = 0;
+				} else {
+					this.mouseNumTime += 1;
+				}
+				if (this.mapBox) {
+					if (this.mouseNumTime >= 15) {
+						for (let i = 0; i < this.mapBox.length; i++) {
+							this.mapBox[i].style.cursor = 'none';
+						}
+					} else {
+						for (let i = 0; i < this.mapBox.length; i++) {
+							this.mapBox[i].style.cursor = '';
+						}
+					}
+				}
+			}, 1000);
+		},
+		mousemove(e) {
+			this.mouseNum = 1;
+		},
+		setPosition() {
+			this.$nextTick(() => {
+				let offset = 15;
+				const menuBar = document.getElementById('menuBar');
+				const menuTool = document.getElementById('menuTool');
+				if (menuBar) {
+					offset += (menuBar.offsetHeight || 0);
+				}
+				if (menuTool) {
+					offset += (menuTool.offsetHeight || 0);
+				}
 
-                    if (this.offset != offset) {
-                        this.offset = offset;
-                    }
-                })
-            },
-            // 结束加载状态
-            endViewLoading(isSuccess) {
-                if (!isSuccess) {
-                    this.$store.dispatch('map/mapClear');
-                }
+				if (this.offset != offset) {
+					this.offset = offset;
+				}
+			});
+		},
+		// 结束加载状态
+		endViewLoading(isSuccess) {
+			if (!isSuccess) {
+				this.$store.dispatch('map/mapClear');
+			}
 
-                this.$nextTick(() => {
-                    eventBus.$emit('viewLoading', false);
-                })
-            },
-            // 加载仿真信息
-            async loadSimulationInfo() {
-                let resp = await getSimulationInfo(this.group);
-                if (resp && resp.code == 200) {
-                    this.questId = resp.data.questId || 0;
-                }
-            },
-            // 加载地图数据
-            async initLoadData() {
-                let width = document.documentElement.clientWidth;
-                let height = document.documentElement.clientHeight + 200;
-                this.$store.dispatch('config/resize', { width, height });
-                this.$store.dispatch('training/reset');
+			this.$nextTick(() => {
+				eventBus.$emit('viewLoading', false);
+			});
+		},
+		// 加载仿真信息
+		async loadSimulationInfo() {
+			const resp = await getSimulationInfo(this.group);
+			if (resp && resp.code == 200) {
+				this.questId = Number(resp.data.questId) || 0;
+			}
+		},
+		// 加载地图数据
+		async initLoadData() {
+			const width = document.documentElement.clientWidth;
+			const height = document.documentElement.clientHeight + 200;
+			this.$store.dispatch('config/resize', { width, height });
+			this.$store.dispatch('training/reset');
 
-                try {
-                    await this.loadSimulationInfo();
+			try {
+				await this.loadSimulationInfo();
 
-                    if (this.isReplay) {
-                        await this.initLoadReplayData();
-                    } else if (this.isDemon) {
-                        await this.initLoadDemonData();
-                    } else if (this.isScreen) {
-                        await this.initLoadScreenData();
-                    } else if (this.isPlan) {
-                        await this.initLoadTestRunData();
-                    } else if (this.isTask) {
-                        await this.initLoadTaskData();
-                    } else {
-                        await this.initLoadLessonOrExamData();
-                    }
+				if (this.isReplay) {
+					await this.initLoadReplayData();
+				} else if (this.isDemon) {
+					await this.initLoadDemonData();
+				} else if (this.isScreen) {
+					await this.initLoadScreenData();
+				} else if (this.isPlan) {
+					await this.initLoadTestRunData();
+				} else if (this.isTask) {
+					await this.initLoadTaskData();
+				} else {
+					await this.initLoadLessonOrExamData();
+				}
 
-                    this.checkLoginLineTimer();
-                    this.checkMouseStatusTimer();
-                } catch (error) {
-                    this.$messageBox(`初始化失败: ${error.message}`);
-                    this.endViewLoading();
-                }
-            },
-            // 课程和考试系统
-            async initLoadLessonOrExamData() {
-                this.$store.dispatch('training/end', null);
-                this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); //默认为正常模式
+				this.checkLoginLineTimer();
+				this.checkMouseStatusTimer();
+			} catch (error) {
+				this.$messageBox(`初始化失败: ${error.message}`);
+				this.endViewLoading();
+			}
+		},
+		// 课程和考试系统
+		async initLoadLessonOrExamData() {
+			this.$store.dispatch('training/end', null);
+			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
 
-                let trainingId = this.$route.query.trainingId;
-                if (parseInt(trainingId)) {
-                    // 设置地图数据
-                    // 设置实训数据
-                    let resp = await getTrainingStepsDetail(trainingId, { group: this.group });
-                    if (resp && resp.code == 200) {
-                        let stepdData = this.trainingObj = resp.data;
-                        let rest = await getProductDetail(stepdData.prdCode);
-                        if (rest && rest.code == 200) {
-                            await this.$store.dispatch('training/setPrdType', rest.data.prdType);
-                            await this.loadMapData(resp.data.skinStyle);
-                            await this.$store.dispatch('training/setTrainingData', stepdData);
-                        }
-                    } else {
-                        this.$messageBox(`获取实训步骤数据失败`);
-                        this.endViewLoading();
-                    }
-                } else {
-                    this.endViewLoading();
-                }
-            },
-            // 回放系统
-            async initLoadReplayData() {
-                this.$store.dispatch('training/end', TrainingMode.NORMAL);
-                this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); //默认为正常模式
-                this.$store.dispatch('training/setPrdType', '');
+			const trainingId = this.$route.query.trainingId;
+			if (parseInt(trainingId)) {
+				// 设置地图数据
+				// 设置实训数据
+				const resp = await getTrainingStepsDetail(trainingId, { group: this.group });
+				if (resp && resp.code == 200) {
+					const stepdData = this.trainingObj = resp.data;
+					const rest = await getProductDetail(stepdData.prdCode);
+					if (rest && rest.code == 200) {
+						await this.$store.dispatch('training/setPrdType', rest.data.prdType);
+						await this.loadMapData(resp.data.skinStyle);
+						await this.$store.dispatch('training/setTrainingData', stepdData);
+					}
+				} else {
+					this.$messageBox(`获取实训步骤数据失败`);
+					this.endViewLoading();
+				}
+			} else {
+				this.endViewLoading();
+			}
+		},
+		// 回放系统
+		async initLoadReplayData() {
+			this.$store.dispatch('training/end', TrainingMode.NORMAL);
+			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+			this.$store.dispatch('training/setPrdType', '');
 
-                let skinStyle = this.$route.query.skinStyle;
-                if (parseInt(skinStyle)) {
-                    await this.loadMapData(skinStyle);
+			const skinStyle = this.$route.query.skinStyle;
+			if (parseInt(skinStyle)) {
+				await this.loadMapData(skinStyle);
 
-                } else {
-                    this.endViewLoading();
-                }
-            },
-            // 仿真系统
-            async initLoadDemonData() {
-                this.$store.dispatch('training/end', TrainingMode.NORMAL);
-                this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); //默认为正常模式
-                this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.$route.query.prdType]);
+			} else {
+				this.endViewLoading();
+			}
+		},
+		// 仿真系统
+		async initLoadDemonData() {
+			this.$store.dispatch('training/end', TrainingMode.NORMAL);
+			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+			this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.$route.query.prdType]);
 
-                let skinStyle = this.$route.query.skinStyle;
-                if (parseInt(skinStyle)) {
-                    await this.loadMapData(skinStyle);
+			const skinStyle = this.$route.query.skinStyle;
+			if (parseInt(skinStyle)) {
+				await this.loadMapData(skinStyle);
 
-                } else {
-                    this.endViewLoading();
-                }
-            },
-            // 大屏系统请求
-            async initLoadScreenData() {
-                this.$store.dispatch('training/end', TrainingMode.NORMAL);
-                this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); //默认为正常模式
-                this.$store.dispatch('training/setPrdType', '01');
+			} else {
+				this.endViewLoading();
+			}
+		},
+		// 大屏系统请求
+		async initLoadScreenData() {
+			this.$store.dispatch('training/end', TrainingMode.NORMAL);
+			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+			this.$store.dispatch('training/setPrdType', '01');
 
-                let skinStyle = this.$route.query.skinStyle;
-                if (parseInt(skinStyle)) {
-                    await this.loadMapData(skinStyle);
+			const skinStyle = this.$route.query.skinStyle;
+			if (parseInt(skinStyle)) {
+				await this.loadMapData(skinStyle);
 
-                } else {
-                    this.endViewLoading();
-                }
-            },
-            // 任务录制系统
-            async initLoadTaskData() {
-                this.$store.dispatch('training/end', TrainingMode.NORMAL);
-                this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); //默认为正常模式
-                this.switchMode('01');
+			} else {
+				this.endViewLoading();
+			}
+		},
+		// 任务录制系统
+		async initLoadTaskData() {
+			this.$store.dispatch('training/end', TrainingMode.NORMAL);
+			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+			this.switchMode('01');
 
-                let skinStyle = this.$route.query.skinStyle;
-                if (parseInt(skinStyle)) {
-                    await this.loadMapData(skinStyle);
+			const skinStyle = this.$route.query.skinStyle;
+			if (parseInt(skinStyle)) {
+				await this.loadMapData(skinStyle);
 
-                } else {
-                    this.endViewLoading();
-                }
-            },
-            // 测试跑车
-            async initLoadTestRunData() {
-                this.$store.dispatch('training/end', TrainingMode.NORMAL);
-                this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); //默认为正常模式
-                this.$store.dispatch('training/setPrdType', '01');
+			} else {
+				this.endViewLoading();
+			}
+		},
+		// 测试跑车
+		async initLoadTestRunData() {
+			this.$store.dispatch('training/end', TrainingMode.NORMAL);
+			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+			this.$store.dispatch('training/setPrdType', '01');
 
-                let skinStyle = this.$route.query.skinStyle;
-                if (parseInt(skinStyle)) {
-                    await this.loadMapData(skinStyle);
+			const skinStyle = this.$route.query.skinStyle;
+			if (parseInt(skinStyle)) {
+				await this.loadMapData(skinStyle);
 
-                } else {
-                    this.endViewLoading();
-                }
-            },
-            // 加载剧情
-            async runQuestLoadShow() {
-                this.$refs.addQuest.doShow();
-            },
-            // 选择脚本
-            async selectQuest(row) {
-                let res = await loadQuest(row.id, this.group);
-                if (res && res.code == 200) {
-                    this.questId = parseInt(row.id);
-                }
+			} else {
+				this.endViewLoading();
+			}
+		},
+		// 加载剧本
+		async runQuestLoadShow() {
+			this.$refs.addQuest.doShow();
+		},
+		// 选择脚本
+		async selectQuest(row, role) {
+			const res = await loadQuest(row.id, this.group);
+			if (res && res.code == 200) {
+				this.questId = parseInt(row.id);
+			}
 
-                if (this.$refs.menuDemon) {
-                    this.$refs.menuDemon.InitLoadPage();
-                }
+			if (this.$refs.menuDemon) {
+				this.$refs.menuDemon.InitLoadPage();
+			}
 
-                if (this.$refs.menuScript) {
-                    this.$refs.menuScript.InitLoadPage();
-                }
-            },
-            // 退出脚本
-            async quitQuest() {
-                this.questId = 0;
-            },
-            // 加载地图数据
-            async loadMapData(skinStyle) {
-                try {
-                    await loadMapData(skinStyle);
-                    await this.$store.dispatch('training/setMapDefaultState');
-                } catch (error) {
-                    this.$messageBox(`获取地图数据失败: ${error.message}`);
-                    this.endViewLoading();
-                }
-            },
-            // 销毁仿真
-            async quit() {
-                await runDiagramQuit(this.group);
-                await this.$store.dispatch('training/over');
-            },
-            // 仿真错误时，被动退出时调用
-            async back() {
-                if (this.isExam) {
-                    await this.$refs.menuExam.back();
-                } else if (this.isLesson) {
-                    await this.$refs.lessonMenu.back();
-                } else if (this.isDemon) {
-                    await this.$refs.menuDemon.back();
-                } else if (this.isScreen) {
-                    await this.$refs.menuScreen.back();
-                } else if (this.isPlan) {
-                    await this.$refs.menuPlan.back();
-                } else if (this.isTask) {
-                    await this.$refs.menuScript.back();
-                }
-            },
-            // 设置使用时间
-            async tryTime(param) {
-                let data = {
-                    goodsId: param.goodsId,
-                    time: param.time
-                }
-                if (data.goodsId) {
-                    await setGoodsTryUse(data);
-                }
-            },
-            switchMode(prdType) {
-                this.$store.dispatch('training/setPrdType', prdType);
-            },
-            hidepanel() {
-                if (this.isDrive) {
-                    this.panelShow = false;
-                    this.drivingShow = true;
-                    this.$refs.Jl3dSimulation.show(this.$route.query.skinStyle);
-                } else {
-                    this.panelShow = false;
-                    this.simulationShow = true;
-                    this.$refs.ThreeTest.show(this.$route.query.skinStyle);
-                }
-            },
-            showpanel() {
-                this.panelShow = true;
-                this.simulationShow = false;
-            },
-            showdriving() {
-                this.panelShow = true;
-                this.drivingShow = false;
-            },
-            runPlanViewShow() {
-                this.$refs.runPlanView.doShow();
-            },
-            runPlanLoadShow() {
-                this.$refs.runPlanLoad.doShow();
-            },
-            faultChooseShow() {
-                this.$refs.faultChoose.doShow();
-            }
-        }
-    }
+			if (this.$refs.menuScript) {
+				this.$refs.menuScript.InitLoadPage();
+			}
+		},
+		// 退出脚本
+		async quitQuest() {
+			this.questId = 0;
+		},
+		// 加载地图数据
+		async loadMapData(skinStyle) {
+			try {
+				await loadMapData(skinStyle);
+				await this.$store.dispatch('training/setMapDefaultState');
+			} catch (error) {
+				this.$messageBox(`获取地图数据失败: ${error.message}`);
+				this.endViewLoading();
+			}
+		},
+		// 销毁仿真
+		async quit() {
+			await runDiagramQuit(this.group);
+			await this.$store.dispatch('training/over');
+		},
+		// 仿真错误时，被动退出时调用
+		async back() {
+			if (this.isExam) {
+				await this.$refs.menuExam.back();
+			} else if (this.isLesson) {
+				await this.$refs.lessonMenu.back();
+			} else if (this.isDemon) {
+				await this.$refs.menuDemon.back();
+			} else if (this.isScreen) {
+				await this.$refs.menuScreen.back();
+			} else if (this.isPlan) {
+				await this.$refs.menuPlan.back();
+			} else if (this.isTask) {
+				await this.$refs.menuScript.back();
+			}
+		},
+		// 设置使用时间
+		async tryTime(param) {
+			const data = {
+				goodsId: param.goodsId,
+				time: param.time
+			};
+			if (data.goodsId) {
+				await setGoodsTryUse(data);
+			}
+		},
+		switchMode(prdType) {
+			this.$store.dispatch('training/setPrdType', prdType);
+		},
+		hidepanel() {
+			if (this.isDrive) {
+				this.panelShow = false;
+				this.drivingShow = true;
+				this.$refs.Jl3dSimulation.show(this.$route.query.skinStyle);
+			} else {
+				this.panelShow = false;
+				this.simulationShow = true;
+				this.$refs.ThreeTest.show(this.$route.query.skinStyle);
+			}
+		},
+		showpanel() {
+			this.panelShow = true;
+			this.simulationShow = false;
+		},
+		showdriving() {
+			this.panelShow = true;
+			this.drivingShow = false;
+		},
+		runPlanViewShow() {
+			this.$refs.runPlanView.doShow();
+		},
+		runPlanLoadShow() {
+			this.$refs.runPlanLoad.doShow();
+		},
+		faultChooseShow() {
+			this.$refs.faultChoose.doShow();
+		}
+	}
+};
 </script>
 <style>
     .main {
@@ -536,4 +547,4 @@
         -ms-user-select: none;
         user-select: none;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/display/menuSchema.vue b/src/views/display/menuSchema.vue
index 4876d3757..c6e58933f 100644
--- a/src/views/display/menuSchema.vue
+++ b/src/views/display/menuSchema.vue
@@ -1,145 +1,149 @@
 <template>
-    <div class="schema" :style="{top: offset+'px'}">
-        <el-select size="small" v-model="swch" v-if="isScript" @change="switchMode" placeholder="请选择产品类型">
-            <el-option v-for="item in swchList" :key="item.value" :label="item.name" :value="item.value">
-            </el-option>
-        </el-select>
+  <div class="schema" :style="{top: offset+'px'}">
+    <el-select v-if="isScript" v-model="swch" size="small" placeholder="请选择产品类型" @change="switchMode">
+      <el-option v-for="item in swchList" :key="item.value" :label="item.name" :value="item.value" />
+    </el-select>
 
-        <el-button-group>
-            <el-button size="small" @click="viewRunQuest" v-if="isDemon" :disabled="viewDisabled" type="success">加载任务
-            </el-button>
-            <el-button size="small" @click="viewRunPlan" v-if="runing" :disabled="viewDisabled">运行图预览</el-button>
-            <el-button size="small" @click="loadRunPlan" v-if="!runing && !isPlan" :disabled="viewDisabled"
-                type="warning">运行图加载</el-button>
-            <el-button size="small" @click="setFault" v-if="mode==OperateMode.FAULT" type="danger">故障设置</el-button>
-        </el-button-group>
+    <el-button-group>
+      <el-button v-if="isDemon" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">加载剧本
+      </el-button>
+      <el-button v-if="runing" size="small" :disabled="viewDisabled" @click="viewRunPlan">运行图预览</el-button>
+      <el-button
+        v-if="!runing && !isPlan"
+        size="small"
+        :disabled="viewDisabled"
+        type="warning"
+        @click="loadRunPlan"
+      >运行图加载</el-button>
+      <el-button v-if="mode==OperateMode.FAULT" size="small" type="danger" @click="setFault">故障设置</el-button>
+    </el-button-group>
 
-        <el-radio-group size="small" v-model="mode" v-if="!isPlan" @change="changeOperateMode(mode)">
-            <el-radio-button class="mode" :label="OperateMode.NORMAL">正常操作</el-radio-button>
-            <el-radio-button class="mode" :label="OperateMode.FAULT">故障操作</el-radio-button>
-        </el-radio-group>
-    </div>
+    <el-radio-group v-if="!isPlan" v-model="mode" size="small" @change="changeOperateMode(mode)">
+      <el-radio-button class="mode" :label="OperateMode.NORMAL">正常操作</el-radio-button>
+      <el-radio-button class="mode" :label="OperateMode.FAULT">故障操作</el-radio-button>
+    </el-radio-group>
+  </div>
 </template>
 <script>
-    import { mapGetters } from 'vuex';
-    import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
-    import { getStationListBySkinStyle, queryRunPlan } from '@/api/runplan';
-    import { getEveryDayRunPlanData } from '@/api/simulation';
+import { mapGetters } from 'vuex';
+import { OperateMode } from '@/scripts/ConstDic';
+import { getStationListBySkinStyle, queryRunPlan } from '@/api/runplan';
+import { getEveryDayRunPlanData } from '@/api/simulation';
 
-    export default {
-        name: 'MenuSchema',
-        props: {
-            group: {
-                type: String,
-                required: true
-            },
-            offset: {
-                type: Number,
-                required: true
-            }
-        },
-        data() {
-            return {
-                mode: OperateMode.NORMAL,
-                OperateMode: OperateMode,
-                viewDisabled: true,
-                runing: false,
-                swch: '02',
-                swchList: [
-                    { value: '01', name: '现地' },
-                    { value: '02', name: '行调' },
-                ]
-            }
-        },
-        computed: {
-            ...mapGetters('runPlan', [
-                'stations',
-            ]),
-            isPlan() {
-                return this.$route.params.mode === 'plan';
-            },
-            isScript() {
-                return this.$route.params.mode === 'script';
-            },
-            isDemon() {
-                return this.$route.params.mode === 'demon';
-            },
-        },
-        watch: {
-            '$store.state.training.started': function (val) {
-                this.setRuning(val);
-            },
-            '$store.state.training.switchcount': async function () {
-                if (this.group) {
-                    let started = this.$store.state.training.started;
-                    if (started) {
-                        await this.loadRunData(this.$route.query);
-                    }
-                }
-            },
-        },
-        async mounted() {
-            await this.loadRunData(this.$route.query);
-        },
-        methods: {
-            loadRunData(opt) {
-                this.$store.dispatch('runPlan/clear').then(() => {
-                    if (opt && opt.skinStyle) {
-                        this.viewDisabled = true;
-                        getStationListBySkinStyle(opt.skinStyle).then(response => {
-                            this.$store.dispatch('runPlan/setStations', response.data).then(() => {
-                                if (this.$route.params.mode == 'plan') {
-                                    // 测试运行图功能
-                                    queryRunPlan(this.$route.query.planId).then(resp => {
-                                        this.$store.dispatch('runPlan/setPlanData', resp.data);
-                                        this.viewDisabled = false;
-                                    }).catch(error => {
-                                        this.$store.dispatch('runPlan/setPlanData', []);
-                                        this.$messageBox(`获取运行图数据失败`);
-                                    })
-                                } else {
-                                    getEveryDayRunPlanData(this.group).then(resp => {
-                                        this.$store.dispatch('runPlan/setPlanData', resp.data);
-                                        this.viewDisabled = false;
-                                    }).catch(error => {
-                                        this.$store.dispatch('runPlan/setPlanData', []);
-                                        if (error.code == 30001) {
-                                            this.$messageBox(`今日运行图未加载`);
-                                        } else {
-                                            this.$messageBox(`获取运行图数据失败`);
-                                        }
-                                    })
-                                }
-                            })
-                        }).catch(error => {
-                            this.$messageBox(`获取车站列表失败`);
-                        });
-                    }
-                })
-            },
-            changeOperateMode(handle) {
-                this.$store.dispatch('training/changeOperateMode', { mode: handle });
-            },
-            setRuning(run) {
-                this.runing = run;
-            },
-            setFault() {
-                this.$emit('faultChooseShow')
-            },
-            loadRunPlan() {
-                this.$emit('runPlanLoadShow');
-            },
-            viewRunPlan() {
-                this.$emit('runPlanViewShow');
-            },
-            viewRunQuest() {
-                this.$emit('runQuestLoadShow');
-            },
-            switchMode(swch) {
-                this.$emit('switchMode', swch);
-            }
-        }
-    }
+export default {
+	name: 'MenuSchema',
+	props: {
+		group: {
+			type: String,
+			required: true
+		},
+		offset: {
+			type: Number,
+			required: true
+		}
+	},
+	data() {
+		return {
+			mode: OperateMode.NORMAL,
+			OperateMode: OperateMode,
+			viewDisabled: true,
+			runing: false,
+			swch: '02',
+			swchList: [
+				{ value: '01', name: '现地' },
+				{ value: '02', name: '行调' }
+			]
+		};
+	},
+	computed: {
+		...mapGetters('runPlan', [
+			'stations'
+		]),
+		isPlan() {
+			return this.$route.params.mode === 'plan';
+		},
+		isScript() {
+			return this.$route.params.mode === 'script';
+		},
+		isDemon() {
+			return this.$route.params.mode === 'demon';
+		}
+	},
+	watch: {
+		'$store.state.training.started': function (val) {
+			this.setRuning(val);
+		},
+		'$store.state.training.switchcount': async function () {
+			if (this.group) {
+				const started = this.$store.state.training.started;
+				if (started) {
+					await this.loadRunData(this.$route.query);
+				}
+			}
+		}
+	},
+	async mounted() {
+		await this.loadRunData(this.$route.query);
+	},
+	methods: {
+		loadRunData(opt) {
+			this.$store.dispatch('runPlan/clear').then(() => {
+				if (opt && opt.skinStyle) {
+					this.viewDisabled = true;
+					getStationListBySkinStyle(opt.skinStyle).then(response => {
+						this.$store.dispatch('runPlan/setStations', response.data).then(() => {
+							if (this.$route.params.mode == 'plan') {
+								// 测试运行图功能
+								queryRunPlan(this.$route.query.planId).then(resp => {
+									this.$store.dispatch('runPlan/setPlanData', resp.data);
+									this.viewDisabled = false;
+								}).catch(() => {
+									this.$store.dispatch('runPlan/setPlanData', []);
+									this.$messageBox(`获取运行图数据失败`);
+								});
+							} else {
+								getEveryDayRunPlanData(this.group).then(resp => {
+									this.$store.dispatch('runPlan/setPlanData', resp.data);
+									this.viewDisabled = false;
+								}).catch(error => {
+									this.$store.dispatch('runPlan/setPlanData', []);
+									if (error.code == 30001) {
+										this.$messageBox(`今日运行图未加载`);
+									} else {
+										this.$messageBox(`获取运行图数据失败`);
+									}
+								});
+							}
+						});
+					}).catch(() => {
+						this.$messageBox(`获取车站列表失败`);
+					});
+				}
+			});
+		},
+		changeOperateMode(handle) {
+			this.$store.dispatch('training/changeOperateMode', { mode: handle });
+		},
+		setRuning(run) {
+			this.runing = run;
+		},
+		setFault() {
+			this.$emit('faultChooseShow');
+		},
+		loadRunPlan() {
+			this.$emit('runPlanLoadShow');
+		},
+		viewRunPlan() {
+			this.$emit('runPlanViewShow');
+		},
+		viewRunQuest() {
+			this.$emit('runQuestLoadShow');
+		},
+		switchMode(swch) {
+			this.$emit('switchMode', swch);
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     .schema {
@@ -152,4 +156,4 @@
     /deep/ .el-button+.el-button {
         margin-left: 0px;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/display/tipQuestDetail.vue b/src/views/display/tipQuestDetail.vue
index e46d91c86..61a6d5944 100644
--- a/src/views/display/tipQuestDetail.vue
+++ b/src/views/display/tipQuestDetail.vue
@@ -1,85 +1,84 @@
 <template>
-    <div class="reminder-drag" v-drag>
-        <div class="reminder-box" ref="drapBox">
-            <div class="tip-title">
-                <i class="icon el-icon-minus" @click="shrink" v-show="isShrink"></i>
-                <i class="icon el-icon-plus" @click="shrink" v-show="!isShrink"></i>
-                <p style="color: #fff;" v-if="isShrink">
-                    <span>{{ formModel.name }}</span>
-                </p>
-            </div>
-            <div class="tip-body-box" ref="dragBody">
-                <div class="tip-body">
-                    <el-scrollbar wrapClass="scrollbar-wrapper">
-                        <p class="list-item">
-                            <span class="list-label">任务描述：</span>
-                            <span class="list-elem">{{ formModel.description }}</span>
-                        </p>
-                    </el-scrollbar>
-                </div>
-                <div class="drag-right"></div>
-                <div class="drag-left"></div>
-                <div class="drag-bottom"></div>
-                <div class="drag-top"></div>
-            </div>
+  <div v-drag class="reminder-drag">
+    <div ref="drapBox" class="reminder-box">
+      <div class="tip-title">
+        <i v-show="isShrink" class="icon el-icon-minus" @click="shrink" />
+        <i v-show="!isShrink" class="icon el-icon-plus" @click="shrink" />
+        <p v-if="isShrink" style="color: #fff;">
+          <span>{{ formModel.name }}</span>
+        </p>
+      </div>
+      <div ref="dragBody" class="tip-body-box">
+        <div class="tip-body">
+          <el-scrollbar wrap-class="scrollbar-wrapper">
+            <p class="list-item">
+              <span class="list-label">任务描述：</span>
+              <span class="list-elem">{{ formModel.description }}</span>
+            </p>
+          </el-scrollbar>
         </div>
+        <div class="drag-right" />
+        <div class="drag-left" />
+        <div class="drag-bottom" />
+        <div class="drag-top" />
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { getQuestById } from '@/api/quest';
+import { getQuestById } from '@/api/quest';
 
-    export default {
-        name: 'TipQuestDetail',
-        props: {
-            questId: {
-                type: Number,
-                required: true
-            }
-        },
-        data() {
-            return {
-                isShrink: true,
-                formModel: {
-                    name: '',
-                    description: ''
-                }
-            }
-        },
-        computed: {
-        },
-        watch: {
-            'questId': function (val) {
-                this.loadInitData(val);
-            }
-        },
-        mounted() { },
-        methods: {
-            loadInitData(questId) {
-                if (questId) {
-                    getQuestById(questId).then(resp => {
-                        this.formModel = resp.data;
-                    }).catch(error => {
-                        this.$messageBox('获取任务信息失败');
-                    });
-                }
-            },
-            shrink() {
-                let height = this.$refs.dragBody.offsetHeight + 40;
-                let top = this.$refs.drapBox.style.top;
-                if (this.isShrink) {
-                    this.$refs.drapBox.style.height = '40px';
-                    this.$refs.drapBox.style.top = '';
-                    this.isShrink = false;
-                } else {
-                    this.$refs.drapBox.style.height = height + 'px';
-                    this.$refs.drapBox.style.top = top;
-                    this.isShrink = true;
-                }
-            }
-        }
-    }
+export default {
+	name: 'TipQuestDetail',
+	props: {
+		questId: {
+			type: Number,
+			required: true
+		}
+	},
+	data() {
+		return {
+			isShrink: true,
+			formModel: {
+				name: '',
+				description: ''
+			}
+		};
+	},
+	computed: {
+	},
+	watch: {
+		'questId': function (val) {
+			this.loadInitData(val);
+		}
+	},
+	mounted() { },
+	methods: {
+		loadInitData(questId) {
+			if (questId) {
+				getQuestById(questId).then(resp => {
+					this.formModel = resp.data;
+				}).catch(() => {
+					this.$messageBox('获取任务信息失败');
+				});
+			}
+		},
+		shrink() {
+			const height = this.$refs.dragBody.offsetHeight + 40;
+			const top = this.$refs.drapBox.style.top;
+			if (this.isShrink) {
+				this.$refs.drapBox.style.height = '40px';
+				this.$refs.drapBox.style.top = '';
+				this.isShrink = false;
+			} else {
+				this.$refs.drapBox.style.height = height + 'px';
+				this.$refs.drapBox.style.top = top;
+				this.isShrink = true;
+			}
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -201,4 +200,4 @@
             }
         }
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/map/mapdraft/mapmanage/edit.vue b/src/views/map/mapdraft/mapmanage/edit.vue
index facdba2f5..f02838695 100644
--- a/src/views/map/mapdraft/mapmanage/edit.vue
+++ b/src/views/map/mapdraft/mapmanage/edit.vue
@@ -215,11 +215,11 @@ export default {
 		},
 		initLoadData() {
 			this.cityList = [];
-			// this.$Dictionary.cityType().then(list => {
-			// 	this.cityList = list;
-			// }).catch(() => {
-			// 	this.$messageBox('加载城市列表失败');
-			// });
+			this.$Dictionary.cityType().then(list => {
+				this.cityList = list;
+			}).catch(() => {
+				this.$messageBox('加载城市列表失败');
+			});
 
 			this.skinStyleList = [];
 			getSkinStyleList().then(response => {
diff --git a/vue.config.js b/vue.config.js
index d17fb6992..7ad04f226 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,15 +1,15 @@
-'use strict'
+;
 // import { getBasePathConfig } from '@/utils/baseUrl'
 
-const path = require('path')
-const defaultSettings = require('./src/settings.js')
+const path = require('path');
+const defaultSettings = require('./src/settings.js');
 
 function resolve(dir) {
-	return path.join(__dirname, dir)
+	return path.join(__dirname, dir);
 }
 
-const name = defaultSettings.title // page title
-const port = 9527 // dev port
+const name = defaultSettings.title; // page title
+const port = 9527; // dev port
 
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -56,14 +56,14 @@ module.exports = {
 		}
 	},
 	chainWebpack(config) {
-		config.plugins.delete('preload') // TODO: need test
-		config.plugins.delete('prefetch') // TODO: need test
+		config.plugins.delete('preload'); // TODO: need test
+		config.plugins.delete('prefetch'); // TODO: need test
 
 		// set svg-sprite-loader
 		config.module
 			.rule('svg')
 			.exclude.add(resolve('src/icons'))
-			.end()
+			.end();
 		config.module
 			.rule('icons')
 			.test(/\.svg$/)
@@ -74,7 +74,7 @@ module.exports = {
 			.options({
 				symbolId: 'icon-[name]'
 			})
-			.end()
+			.end();
 
 		// set preserveWhitespace
 		config.module
@@ -82,16 +82,16 @@ module.exports = {
 			.use('vue-loader')
 			.loader('vue-loader')
 			.tap(options => {
-				options.compilerOptions.preserveWhitespace = true
-				return options
+				options.compilerOptions.preserveWhitespace = true;
+				return options;
 			})
-			.end()
+			.end();
 
 		config
 			// https://webpack.js.org/configuration/devtool/#development
 			.when(process.env.NODE_ENV === 'development',
 				config => config.devtool('cheap-source-map')
-			)
+			);
 
 		config
 			.when(process.env.NODE_ENV !== 'development',
@@ -103,7 +103,7 @@ module.exports = {
 							// `runtime` must same as runtimeChunk name. default is `runtime`
 							inline: /runtime\..*\.js$/
 						}])
-						.end()
+						.end();
 					config
 						.optimization.splitChunks({
 							chunks: 'all',
@@ -127,9 +127,9 @@ module.exports = {
 									reuseExistingChunk: true
 								}
 							}
-						})
-					config.optimization.runtimeChunk('single')
+						});
+					config.optimization.runtimeChunk('single');
 				}
-			)
+			);
 	}
-}
+};