From 9c99b2f451ff447af0a38f0f7c8606925b4cd90d Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 28 Oct 2019 10:26:33 +0800
Subject: [PATCH 01/21] =?UTF-8?q?queryform=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/QueryListPage/QueryForm.vue    | 18 +++++++++++-----
 .../QueryListPage/QueryListPage.vue           |  1 +
 src/views/package/index.vue                   | 21 ++++++++++---------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue
index 338a89472..743a3775c 100644
--- a/src/components/QueryListPage/QueryForm.vue
+++ b/src/components/QueryListPage/QueryForm.vue
@@ -10,7 +10,7 @@
         style="padding-top: 18px;"
       >
         <el-row>
-          <el-col :span="18">
+          <el-col :span="leftSpan">
             <template v-for="(colNum, rIndex) in rowColumnList">
               <el-row :key="rIndex" :gutter="20">
                 <template v-for="(field, name, index) in queryObject">
@@ -127,8 +127,8 @@
               </el-row>
             </template>
           </el-col>
-          <el-col :span="5" :offset="1">
-            <el-button type="primary" size="small" :disabled="!canQuery" @click="query">{{ $t('global.query') }}</el-button>
+          <el-col :span="24-leftSpan-1" :offset="1">
+            <el-button style="margin-right: 10px" type="primary" size="small" :disabled="!canQuery" @click="query">{{ $t('global.query') }}</el-button>
             <el-button v-if="queryForm.reset" type="primary" size="small" :disabled="!canQuery" @click="doClean">{{ $t('global.reset') }}</el-button>
             <el-button v-if="exportFlag" type="primary" size="small" :disabled="!canQuery" @click="doExport">{{ $t('global.export') }}</el-button>
             <template v-for="(button, index) in queryList.actions">
@@ -138,8 +138,8 @@
                 :type="button.type ? button.type: 'primary'"
                 size="small"
                 :style="button.style"
-                @click="button.handler"
                 class="button_style"
+                @click="button.handler"
               >{{ button.text }}</el-button>
             </template>
           </el-col>
@@ -173,6 +173,12 @@ export default {
 		canQuery: {
 			type: Boolean,
 			required: true
+		},
+		leftSpan: {
+			type: Number,
+			default() {
+				return 18;
+			}
 		}
 	},
 	data() {
@@ -481,7 +487,9 @@ export default {
         max-width: 240px;
         min-width: 100px;
     }
-    .button_style {
+    .el-button+.el-button {
+        margin-right:10px;
+        margin-left: 0;
         margin-bottom: 10px;
     }
 </style>
diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index 74dcf9d36..6747c5ae9 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -4,6 +4,7 @@
       v-show="!(queryForm.show === false)"
       ref="queryForm"
       :query-form="queryForm"
+      :left-span="queryForm.leftSpan"
       :query-list="queryList"
       :before-query="queryForm.beforeQuery"
       :can-query="canQuery"
diff --git a/src/views/package/index.vue b/src/views/package/index.vue
index 69210d2c6..da6dae030 100644
--- a/src/views/package/index.vue
+++ b/src/views/package/index.vue
@@ -29,6 +29,7 @@ export default {
 			queryForm: {
 				labelWidth: '140px',
 				reset: true,
+				leftSpan: 18,
 				queryObject: {
 					'canDistribute': {
 						type: 'select',
@@ -106,7 +107,7 @@ export default {
 								type: ''
 							},
 							{
-								name: '打包详情',
+								name: this.$t('orderAuthor.packingDetails'),
 								handleClick: this.handleDetail,
 								type: '',
 								showControl: (row) => { return !row.permissionType; }
@@ -115,19 +116,19 @@ export default {
 					}
 				],
 				actions: [
-					{ text: this.$t('permission.permissionPack'), btnCode: 'employee_insert', handler: this.handlePermissionPack },
+					{ text: this.$t('permission.permissionPack'), btnCode: 'employee_insert', handler: this.handlePermissionPack }
 				]
 			}
 		};
 	},
+	watch: {
+		'$route.params.mapId': function (val) {
+			this.$refs.queryListPage.refresh(true);
+		}
+	},
 	mounted() {
 		this.loadInitData();
 	},
-    watch: {
-        '$route.params.mapId': function (val) {
-            this.$refs.queryListPage.refresh(true);
-        }
-    },
 	methods: {
 		handleRoleVest(index, row) {
 			this.$refs.selectRole.doShow(row.id);
@@ -151,9 +152,9 @@ export default {
 			return row[porpInfo.property] ? row[porpInfo.property] : '---';
 		},
 		queryFunction(params) {
-            if (this.$route.params.mapId) {
-                params.mapId = this.$route.params.mapId;
-            }
+			if (this.$route.params.mapId) {
+				params.mapId = this.$route.params.mapId;
+			}
 			return listUserPermision(params);
 		},
 		handlePermissionPack() {

From 7ed9387731fb864d181a41b40bf7b91deb5717a1 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 28 Oct 2019 10:29:17 +0800
Subject: [PATCH 02/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BF=A1=E6=81=AF=20=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88bug=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jmap/lesson.js                    | 10 +++
 src/api/jmap/map.js                       |  4 +-
 src/components/QueryListPage/DataForm.vue |  1 +
 src/i18n/langs/en/publish.js              |  1 +
 src/i18n/langs/en/rules.js                |  1 +
 src/i18n/langs/zh/publish.js              |  1 +
 src/i18n/langs/zh/rules.js                |  1 +
 src/views/designPlatform/mapPreview.vue   |  2 +-
 src/views/publish/publishLesson/draft.vue | 80 +++++++++++++++++++++++
 src/views/publish/publishLesson/index.vue | 25 ++++++-
 src/views/publish/publishMap/index.vue    |  4 +-
 11 files changed, 123 insertions(+), 7 deletions(-)
 create mode 100644 src/views/publish/publishLesson/draft.vue

diff --git a/src/api/jmap/lesson.js b/src/api/jmap/lesson.js
index dcb7a1f23..240794ae5 100644
--- a/src/api/jmap/lesson.js
+++ b/src/api/jmap/lesson.js
@@ -65,3 +65,13 @@ export function getCommodityProductLesson(prdCode) {
 		method: 'get'
 	});
 }
+
+/** 更新发布课程信息*/
+export function updatePublishLesson(data) {
+	return request({
+		url: `/api/lesson/${data.id}`,
+		// update
+		method: 'put',
+		data: data
+	});
+}
diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index 1349bd726..12aba59c8 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -115,7 +115,7 @@ export function updatePublishMapName(data) {
 	});
 }
 
-/** 修改发布地图名称*/
+/** 获取发布地图详情*/
 export function getPublishMapDetailList(params, code) {
 	return request({
 		url: `/api/map/${code}/versions`,
@@ -132,7 +132,7 @@ export function hasDoorStationList(mapId) {
 	});
 }
 
-/** 修改发布地图名称*/
+/** 修改发布地图城市*/
 export function updatePublishMapCity(data) {
 	return request({
 		url: `/api/map/${data.mapId}/city`,
diff --git a/src/components/QueryListPage/DataForm.vue b/src/components/QueryListPage/DataForm.vue
index ad0f2ea5e..ffaa8418a 100644
--- a/src/components/QueryListPage/DataForm.vue
+++ b/src/components/QueryListPage/DataForm.vue
@@ -39,6 +39,7 @@
           <el-input
             v-model="formModel[item.prop]"
             type="textarea"
+            :autosize='item.isAutoSize||false'
             :placeholder="item.placeholder"
             :disabled="item.disabled"
             :style="{width: item.tooltip ? 'calc(100% - 50px)' : '100%'}"
diff --git a/src/i18n/langs/en/publish.js b/src/i18n/langs/en/publish.js
index a4c833605..3a972e112 100644
--- a/src/i18n/langs/en/publish.js
+++ b/src/i18n/langs/en/publish.js
@@ -5,6 +5,7 @@ export default {
 	lessonName: 'Lesson Name',
 	updateMapName: 'Update Map Name',
 	updateCityName: 'Update City',
+	updateLesson: 'Modify Lesson',
 	updateTime: 'Update Time',
 	operationSuccess: 'Operate successfully',
 	deleteSuccess: 'Delete successfully',
diff --git a/src/i18n/langs/en/rules.js b/src/i18n/langs/en/rules.js
index 10922c1ae..7ef1cb4ab 100644
--- a/src/i18n/langs/en/rules.js
+++ b/src/i18n/langs/en/rules.js
@@ -232,6 +232,7 @@ export default {
 	enterCourseName: 'Please enter the course name',
 	selectAssociatedProduct: 'Please select the associated product',
 	enterCourseDescription: 'Please enter the course description',
+	pleaseLessonIntroduction: 'Please enter the course description',
 	courseIdIsEmpty: 'Course Id is empty',
 	selectCity: 'Please select city',
 	enterStandardTime: 'Please enter standard time',
diff --git a/src/i18n/langs/zh/publish.js b/src/i18n/langs/zh/publish.js
index 5e4b5a2bc..9cf6fc87a 100644
--- a/src/i18n/langs/zh/publish.js
+++ b/src/i18n/langs/zh/publish.js
@@ -6,6 +6,7 @@ export default {
 	updateMapName: '更新地图名称',
 	updateCityName: '更新城市',
 	updateTime: '更新时间',
+	updateLesson: '修改课程',
 	operationSuccess: '操作成功',
 	deleteSuccess: '删除成功',
 	wellDelType: '此操作将删除该类型, 是否继续?',
diff --git a/src/i18n/langs/zh/rules.js b/src/i18n/langs/zh/rules.js
index eb7197fe9..d433d85ef 100644
--- a/src/i18n/langs/zh/rules.js
+++ b/src/i18n/langs/zh/rules.js
@@ -242,6 +242,7 @@ export default {
 	enterCourseName: '请输入课程名称',
 	selectAssociatedProduct: '请选择关联产品',
 	enterCourseDescription: '请输入课程说明',
+	pleaseLessonIntroduction: '请输入课程简介',
 	courseIdIsEmpty: '课程Id为空',
 	selectCity: '请选择城市',
 	enterStandardTime: '请输入标准用时',
diff --git a/src/views/designPlatform/mapPreview.vue b/src/views/designPlatform/mapPreview.vue
index 05e464475..1956134dc 100644
--- a/src/views/designPlatform/mapPreview.vue
+++ b/src/views/designPlatform/mapPreview.vue
@@ -103,7 +103,7 @@
             },
             setWindowSize() {
                 this.$nextTick(() => {
-                    const width = this.$store.state.app.width-this.widthLeft;
+                    const width = this.$store.state.app.width-(this.widthLeft||450);
                     const height = this.height;
                     this.$store.dispatch('config/resize', { width, height });
                     // this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
diff --git a/src/views/publish/publishLesson/draft.vue b/src/views/publish/publishLesson/draft.vue
new file mode 100644
index 000000000..0c0de292c
--- /dev/null
+++ b/src/views/publish/publishLesson/draft.vue
@@ -0,0 +1,80 @@
+<template>
+	<div>
+        <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+            <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="doCreate">{{$t('global.confirm')}}</el-button>
+                <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'PublishLessonDraft',
+        data() {
+            return {
+				dialogVisible: false,
+				cityList:[],
+                formModel:{
+                    id:'',
+                    remarks:'',
+					name:'',
+                }
+            }
+		},
+        props: {
+            title: String
+		},
+		computed: {
+            form() {
+				let form={
+						labelWidth: '150px',
+						items: [
+                            { prop: 'name', label: this.$t('publish.lessonName'), type: 'text', required: true},
+                            { prop: 'remarks', label: this.$t('publish.lessonIntroduction'), type: 'textarea', required: true,isAutoSize:{ minRows:1, maxRows:5 }},
+						]
+					}
+                return form
+            },
+            rules() {
+				let crules ={
+                    name:[
+                        { required: true, message: this.$t('rules.pleaseInputLessonName'), trigger: 'blur',max:100 },
+                        { required: true, message: this.$t('rules.pleaseInputLessonName'), trigger: 'change',max:100 },
+                    ],
+                    remarks:[
+                        { required: true, message: this.$t('rules.pleaseLessonIntroduction'), trigger: 'blur',max:300 },
+                        { required: true, message: this.$t('rules.pleaseLessonIntroduction'), trigger: 'change',max:300 },
+                    ]
+                }
+                return crules
+            },
+		},
+		methods: {
+            doShow(row) {
+				this.formModel.id=row.id;
+                this.formModel.remarks=row.remarks;
+                this.formModel.name=row.name;
+                this.dialogVisible = true   
+            },
+            doCreate() {
+                let self = this
+                this.$refs.dataform.validateForm(() => {
+                    self.$emit('create', Object.assign({}, this.formModel));
+                    self.doClose()
+                })
+            },
+            doClose() {
+                // this.$refs.dataform.resetForm();
+                this.isShow = false;
+                this.dialogVisible = false
+            }
+        }
+    };
+</script>
+<style lang="scss" scoped>
+/deep/ .el-dialog--center .el-dialog__body{
+    padding: 15px 65px 10px 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/publish/publishLesson/index.vue b/src/views/publish/publishLesson/index.vue
index bb60a847d..b0c61661b 100644
--- a/src/views/publish/publishLesson/index.vue
+++ b/src/views/publish/publishLesson/index.vue
@@ -1,16 +1,22 @@
 <template>
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+	<update-operate ref='updateLesson' @create="handleUpdate" :title="$t('publish.updateLesson')">
+    </update-operate>
   </div>
 </template>
 
 <script>
-import { publishLessonList, delPublishLesson, putLessonOnLine, putLessonOffLine } from '@/api/jmap/lesson';
+import { publishLessonList, delPublishLesson, putLessonOnLine, putLessonOffLine,updatePublishLesson } from '@/api/jmap/lesson';
 import { getSkinCodeList } from '@/api/management/mapskin';
 import localStore from 'storejs';
+import UpdateOperate from './draft.vue';
 
 export default {
 	name: 'PublishMap',
+	components:{
+		UpdateOperate
+	},
 	data() {
 		return {
 			cityList: [],
@@ -74,6 +80,12 @@ export default {
 								type: 'warning',
 								showControl: (row) => { return row.status == 1; }
 							},
+							{
+								name: this.$t('global.edit'),
+								handleClick: this.handleEdit,
+								type: 'primary',
+								showControl: () => { return this.isShow != -1; }
+							},
 							{
 								name: this.$t('global.delete'),
 								handleClick: this.handleDelete,
@@ -115,8 +127,17 @@ export default {
 		},
 		// 编辑
 		handleEdit(index, row) {
+			this.$refs.updateLesson.doShow(row);
+		},
+		// 确认编辑
+		handleUpdate(data){
+			updatePublishLesson(data).then(response => {
+				this.reloadTable();
+				this.$message.success(this.$t('publish.updateSuccess'));
+			}).catch(() => {
+				this.$messageBox(this.$t('error.updateFailed'));
+			});
 		},
-
 		// 删除
 		handleDelete(index, row) {
 			this.$confirm(this.$t('publish.wellDelType'), this.$t('global.tips'), {
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index e99707ab9..1711733f7 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-	<update-operate ref='updateMapName' @reloadTable="reloadTable" @create="handleUpdateMap" :title="$t('publish.updateMapName')" type="updateMapName">
+	<update-operate ref='updateMapName' @create="handleUpdateMap" :title="$t('publish.updateMapName')" type="updateMapName">
     </update-operate>
-	<update-operate ref='updateCityName' @reloadTable="reloadTable" @create="handleCityUpdate" :title="$t('publish.updateCityName')" type="updateCityName">
+	<update-operate ref='updateCityName' @create="handleCityUpdate" :title="$t('publish.updateCityName')" type="updateCityName">
     </update-operate>
   </div>
 </template>

From 9bd9e7fd8aeaabd2d3d9dfb173f45db3d68b76ea Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 28 Oct 2019 10:36:20 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jmap/lesson.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/api/jmap/lesson.js b/src/api/jmap/lesson.js
index 240794ae5..96b83ca1b 100644
--- a/src/api/jmap/lesson.js
+++ b/src/api/jmap/lesson.js
@@ -69,8 +69,7 @@ export function getCommodityProductLesson(prdCode) {
 /** 更新发布课程信息*/
 export function updatePublishLesson(data) {
 	return request({
-		url: `/api/lesson/${data.id}`,
-		// update
+		url: `/api/lesson/${data.id}/nameAndRemarks`,
 		method: 'put',
 		data: data
 	});

From 285b80ffb76fb6e8c4718a8cca49c1e3d70a68e3 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 28 Oct 2019 11:07:33 +0800
Subject: [PATCH 04/21] =?UTF-8?q?desc:=20=E8=B0=83=E6=95=B4=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E9=AB=98=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue                       |  24 ++-
 src/utils/baseUrl.js                       |   4 +-
 src/views/designPlatform/demonList.vue     |  90 ++++-----
 src/views/designPlatform/home.vue          | 150 +++++++-------
 src/views/designPlatform/index.vue         |  15 +-
 src/views/designPlatform/mapPreview.vue    | 217 +++++++++++----------
 src/views/designPlatform/userDemonList.vue |   4 +-
 src/views/designPlatform/userIndex.vue     |   1 +
 8 files changed, 253 insertions(+), 252 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 5fa3876c6..41c752b36 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -2,7 +2,14 @@
   <div class="app-wrapper" :class="classObj">
     <div class="main-container">
       <navbar />
-      <app-main :style="{width: width+'px', height: height+'px'}" />
+      <!-- <app-main :style="{width: width+'px', height: height+'px'}" /> -->
+      <section class="app-main" :style="{height: height+'px'}">
+        <el-scrollbar wrap-class="scrollbar-wrapper app_scrollbar_box">
+          <transition name="fade" mode="out-in">
+            <router-view />
+          </transition>
+        </el-scrollbar>
+      </section>
       <el-footer style="height:30px;text-align:right;line-height: 30px;">
         <span style="font-size:14px;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</span>
       </el-footer>
@@ -11,13 +18,13 @@
 </template>
 
 <script>
-import { Navbar, AppMain } from './components'; // Sidebar
+import { Navbar } from './components'; // Sidebar
 
 export default {
 	name: 'Layout',
 	components: {
-		Navbar,
-		AppMain
+		Navbar
+		// AppMain
 	},
 	data() {
 		return {
@@ -40,7 +47,7 @@ export default {
 			return this.$store.state.app.width;
 		},
 		height() {
-			return this.$store.state.app.height-60-30;
+			return this.$store.state.app.height - 90;
 		}
 	},
 	created() {
@@ -81,3 +88,10 @@ export default {
         z-index: 999;
     }
 </style>
+<style rel="stylesheet/scss" lang="scss">
+	.app_scrollbar_box{
+		.el-scrollbar__view{
+			height: 100%;
+		}
+	}
+</style>
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 5935e41a6..871e8ec9c 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,9 +3,9 @@ export function getBaseUrl() {
 	let BASE_API;
 	if (process.env.NODE_ENV === 'development') {
 		// BASE_API = 'https://joylink.club/jlcloud';
-		// BASE_API = 'https://test.joylink.club/jlcloud';
+		BASE_API = 'https://test.joylink.club/jlcloud';
 		// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-		BASE_API = 'http://192.168.3.6:9000'; // 旭强
+		// BASE_API = 'http://192.168.3.6:9000'; // 旭强
 		// BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
 	} else {
 		BASE_API = process.env.VUE_APP_BASE_API;
diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue
index f34787d33..79039d803 100644
--- a/src/views/designPlatform/demonList.vue
+++ b/src/views/designPlatform/demonList.vue
@@ -4,23 +4,10 @@
       <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
       <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
       <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-125) +'px' }">
-        <el-tree
-          ref="tree"
-          :data="treeList"
-          node-key="id"
-          :props="defaultProps"
-          highlight-current
-          :span="22"
-          :filter-node-method="filterNode"
-          @node-click="clickEvent"
-        >
-          <!-- @node-contextmenu="showContextMenu" -->
-          <span slot-scope="{ node:tnode, data }" >
-            <span
-              class="el-icon-tickets"
-              :style="{color: data.valid ? 'green':''}"
-            ></span>
-			<span>&nbsp;{{ tnode.label }}</span>
+        <el-tree ref="tree" :data="treeList" node-key="id" :props="defaultProps" highlight-current :span="22" :filter-node-method="filterNode" @node-click="clickEvent">
+          <span slot-scope="{ node:tnode, data }">
+            <span class="el-icon-tickets" :style="{color: data.valid ? 'green':''}" />
+            <span>&nbsp;{{ tnode.label }}</span>
           </span>
         </el-tree>
       </el-scrollbar>
@@ -41,10 +28,6 @@ export default {
 		FilterCity
 	},
 	props: {
-		height: {
-			type: Number,
-			required: true
-		},
 		width: {
 			type: Number,
 			required: true
@@ -74,6 +57,11 @@ export default {
 			cityCode: ''
 		};
 	},
+	computed: {
+		height() {
+			return this.$store.state.app.height - 93;
+		}
+	},
 	watch: {
 		filterText(val) {
 			this.treeList = this.treeData.filter((res) => {
@@ -97,29 +85,29 @@ export default {
 		},
 		clickEvent(obj, data, ele) {
 			switch (obj.type) {
-				case 'scriptDesign': {
-					setSessionStorage('designType', 'scriptDesign');
-					this.$router.push({ path: `${UrlConfig.design.scriptHome}/${obj.mapId}?skinCode=${obj.skinCode}` });
-					break;
-				}
-				case 'lessonDesign': {
-					setSessionStorage('designType', 'lessonDesign');
-					this.$router.push({ path: `${UrlConfig.design.lessonHome}/${obj.mapId}/${obj.skinCode}`, query: {cityCode: this.cityCode} });
-					break;
-				}
-				case 'runPlanDesign': {
-					setSessionStorage('designType', 'runPlanDesign');
-					this.$router.push({ path: `${UrlConfig.design.runPlan}/${obj.mapId}?skinCode=${obj.skinCode}` });
-					break;
-				}
-				case 'map': {
-					setSessionStorage('demonList', obj.id);
-					break;
-				}
-				case 'mapPreview':{
-					this.$router.push({ path: `${UrlConfig.design.mapPreview}/${obj.mapId}` });
-					break;
-				}
+			case 'scriptDesign': {
+				setSessionStorage('designType', 'scriptDesign');
+				this.$router.push({ path: `${UrlConfig.design.scriptHome}/${obj.mapId}?skinCode=${obj.skinCode}` });
+				break;
+			}
+			case 'lessonDesign': {
+				setSessionStorage('designType', 'lessonDesign');
+				this.$router.push({ path: `${UrlConfig.design.lessonHome}/${obj.mapId}/${obj.skinCode}`, query: {cityCode: this.cityCode} });
+				break;
+			}
+			case 'runPlanDesign': {
+				setSessionStorage('designType', 'runPlanDesign');
+				this.$router.push({ path: `${UrlConfig.design.runPlan}/${obj.mapId}?skinCode=${obj.skinCode}` });
+				break;
+			}
+			case 'map': {
+				setSessionStorage('demonList', obj.id);
+				break;
+			}
+			case 'mapPreview': {
+				this.$router.push({ path: `${UrlConfig.design.mapPreview}/${obj.mapId}` });
+				break;
+			}
 			}
 			// this.$refs.menu.doClose();
 		},
@@ -134,17 +122,16 @@ export default {
 				const res = await listPublishMap({cityCode: filterSelect});
 
 				res.data.forEach(elem=>{
-					// debugger;
 					// elem.children.find(n => { return n.name.includes("行调")})
 					elem.children=[
 						{
-						    id:'1',
-						    name:this.$t('designPlatform.mapPreview'),
-							type:'mapPreview',
+							id: '1',
+							name: this.$t('designPlatform.mapPreview'),
+							type: 'mapPreview',
 							mapId: elem.id
 						}
 					];
-					this.isAdministrator()?elem.children.push({id: '2',name: this.$t('designPlatform.lessonDesign'),type: 'lessonDesign',mapId: elem.id,skinCode: elem.skinCode}):'';
+					this.isAdministrator()?elem.children.push({id: '2', name: this.$t('designPlatform.lessonDesign'), type: 'lessonDesign', mapId: elem.id, skinCode: elem.skinCode}):'';
 					elem.children.push(
 						{
 							id: '3',
@@ -186,10 +173,7 @@ export default {
 		},
 		isAdministrator() {
 			return this.$store.state.user.roles.includes(superAdmin) || this.$store.state.user.roles.includes(admin);
-		},
-		// createMap() {
-		//     this.$emit("createMap");
-		// },
+		}
 	}
 };
 </script>
diff --git a/src/views/designPlatform/home.vue b/src/views/designPlatform/home.vue
index d4c5d5fd9..f6a68034f 100644
--- a/src/views/designPlatform/home.vue
+++ b/src/views/designPlatform/home.vue
@@ -1,53 +1,53 @@
 <template>
-    <el-card :style="{height: height+'px'}">
-        <div class="home-box" :style="{height: height+'px'}">
-            <el-scrollbar wrap-class="scrollbar-wrapper">
-                <h1 class="title">
-                    城市轨道交通设计平台
-                    <!-- <img :src="logo" alt="" class="logo-img"> -->
-                </h1>
-                <div class="card-box">
-                    <el-carousel :interval="4000" type="card" height="380px">
-                        <el-carousel-item v-for="(item, index) in listImg" :key="index">
-                            <img :src="item.src" alt="" height="100%" width="100%">
-                        </el-carousel-item>
-                    </el-carousel>
-                </div>
-                <div class="brief-box">{{ $t('demonstration.simulationSystemDescription') }}</div>
-            </el-scrollbar>
+  <el-card>
+    <div class="home-box" :style="{height: height+'px'}">
+      <el-scrollbar wrap-class="scrollbar-wrapper">
+        <div class="content_box">
+          <h1 class="title">
+            城市轨道交通设计平台
+          </h1>
+          <div class="card-box">
+            <el-carousel :interval="4000" type="card" height="380px">
+              <el-carousel-item v-for="(item, index) in listImg" :key="index">
+                <img :src="item.src" alt="" height="100%" width="100%">
+              </el-carousel-item>
+            </el-carousel>
+          </div>
+          <div class="brief-box">{{ $t('demonstration.simulationSystemDescription') }}</div>
         </div>
-    </el-card>
+      </el-scrollbar>
+    </div>
+  </el-card>
 </template>
 
 <script>
-    import logo from '@/assets/logo.png';
-    import home1 from '@/assets/home/home1.png';
-    import home2 from '@/assets/home/home2.png';
-    import home3 from '@/assets/home/demon1.jpg';
-    import home4 from '@/assets/home/tring1.png';
-    import home5 from '@/assets/home/tring4.jpg';
-    import home6 from '@/assets/home/demon2.jpg';
-    export default {
-        name: 'Home',
-        data() {
-            return {
-                listImg: [
-                    { src: home1 },
-                    { src: home2 },
-                    { src: home3 },
-                    { src: home4 },
-                    { src: home5 },
-                    { src: home6 }
-                ],
-                logo: logo
-            };
-        },
-        computed: {
-            height() {
-                return this.$store.state.app.height - 50-30;
-            }
-        }
-    };
+import home1 from '@/assets/home/home1.png';
+import home2 from '@/assets/home/home2.png';
+import home3 from '@/assets/home/demon1.jpg';
+import home4 from '@/assets/home/tring1.png';
+import home5 from '@/assets/home/tring4.jpg';
+import home6 from '@/assets/home/demon2.jpg';
+
+export default {
+	name: 'Home',
+	data() {
+		return {
+			listImg: [
+				{ src: home1 },
+				{ src: home2 },
+				{ src: home3 },
+				{ src: home4 },
+				{ src: home5 },
+				{ src: home6 }
+			]
+		};
+	},
+	computed: {
+		height() {
+			return this.$store.state.app.height - 93;
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
@@ -57,41 +57,43 @@
     }
 
     .home-box {
-        padding: 15px 100px;
         float: left;
         width: 100%;
         font-family: 'Microsoft YaHei';
 
-    .title {
-        font-size: 35px;
-        width: 100%;
-        text-align: center;
-        font-weight: 400;
-        margin-top: 55px;
-        border-bottom: 2px dashed #333;
-        padding-bottom: 15px;
-        margin-bottom: 70px;
-        position: relative;
+        .content_box{
+            padding: 0 100px 15px;
+        }
+        .title {
+            font-size: 35px;
+            width: 100%;
+            text-align: center;
+            font-weight: 400;
+            margin-top: 55px;
+            border-bottom: 2px dashed #333;
+            padding-bottom: 15px;
+            margin-bottom: 70px;
+            position: relative;
 
-    .logo-img {
-        position: absolute;
-        right: 0;
-        top: 0;
-        width: 55px;
-    }
-    }
+            .logo-img {
+                position: absolute;
+                right: 0;
+                top: 0;
+                width: 55px;
+            }
+        }
 
-    .card-box {
-        width: 100%;
-        padding: 0 50px;
-    }
+        .card-box {
+            width: 100%;
+            padding: 0 50px;
+        }
 
-    .brief-box {
-        font-size: 18px;
-        text-indent: 2em;
-        line-height: 32px;
-        padding: 40px 20px 0;
-        font-family: unset;
-    }
+        .brief-box {
+            font-size: 18px;
+            text-indent: 2em;
+            line-height: 32px;
+            padding: 40px 20px 0;
+            font-family: unset;
+        }
     }
 </style>
diff --git a/src/views/designPlatform/index.vue b/src/views/designPlatform/index.vue
index 932a76f6c..076c54c76 100644
--- a/src/views/designPlatform/index.vue
+++ b/src/views/designPlatform/index.vue
@@ -2,11 +2,11 @@
   <div class="app-wrapper">
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
-        <demon-list ref="demonList" :height="height" :width="widthLeft" />
+        <demon-list ref="demonList" :width="widthLeft" />
       </div>
       <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
       <transition>
-        <router-view :product-list="productList" :widthLeft="widthLeft"/>
+        <router-view :product-list="productList" :width-left="widthLeft" />
       </transition>
     </el-scrollbar>
   </div>
@@ -39,9 +39,6 @@ export default {
 		...mapGetters([
 			'lessonbar'
 		]),
-		height() {
-			return this.$store.state.app.height - 50-30;
-		},
 		width() {
 			return this.$store.state.app.width;
 		}
@@ -77,14 +74,14 @@ export default {
 		resize() {
 			this.widthLeft = Number(localStore.get('LeftWidth')) || this.widthLeft;
 			const width = this.$store.state.app.width - 521 - this.widthLeft;
-			const height = this.$store.state.app.height - 90;
-			this.$store.dispatch('config/resize', { width: width, height: height });
+			// const height = this.$store.state.app.height - 90;
+			this.$store.dispatch('config/resize', { width: width });
 		},
 		setMapResize(LeftWidth) {
 			this.currentWidth=this.$store.state.app.width - this.widthLeft;
 			const widths = this.$store.state.app.width - 521 - LeftWidth;
-			const heights = this.$store.state.app.height - 90;
-			this.$store.dispatch('config/resize', { width: widths, height: heights });
+			// const heights = this.$store.state.app.height - 90;
+			this.$store.dispatch('config/resize', { width: widths });
 		}
 
 	}
diff --git a/src/views/designPlatform/mapPreview.vue b/src/views/designPlatform/mapPreview.vue
index 05e464475..de512f67d 100644
--- a/src/views/designPlatform/mapPreview.vue
+++ b/src/views/designPlatform/mapPreview.vue
@@ -1,116 +1,119 @@
 <template>
-    <div class="map-view">
-        <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="onContextmenu" />
-    </div>
+  <div class="map-view">
+    <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="onContextmenu" />
+  </div>
 </template>
 <script>
-    import JlmapVisual from '@/views/jlmap/index';
-    import { loadMapData, loadMapDataById } from '@/utils/loaddata';
-    export default {
-        name: 'mapPreview',
-        components: {
-            JlmapVisual
-        },
-        data(){
-            return{
-                size: {
-                    width: document.documentElement.clientWidth - 400,
-                    height: document.documentElement.clientHeight-80
-                },
-            }
-        },
-        props: {
-            widthLeft: {
-                required: true
-            }
-        },
-        computed: {
-            mapId() {
-                return this.$route.params.mapId;
-            },
-            height() {
-                return this.$store.state.app.height - 50-30;
-            }
-        },
-        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');
-        },
-        watch: {
-            widthLeft(val){
-                this.setWindowSize();
-            },
-            $route() {
-                this.$nextTick(() => {
-                    this.initLoadData();
-                });
-            },
-            // '$store.state.map.mapViewLoadedCount': function (val) {
-            //     // this.subscribe();
-            //     debugger;
-            //     this.$store.dispatch('map/setTrainWindowShow', false);
-            // },
-            '$store.state.app.windowSizeCount': function() {
-                this.setWindowSize();
-            },
-        },
-        async mounted() {
-            await this.setWindowSize();
-            await this.initLoadData();
-        },
-        methods:{
-            async initLoadData(){
-                if (parseInt(this.mapId)) {
-                    await this.loadMapDataById(this.mapId);
-                } else {
-                    this.endViewLoading();
-                }
-            },
-            // 通过id加载地图数据
-            async loadMapDataById(mapId) {
-                try {
-                    await this.$store.dispatch('training/changeMode', { mode: null });
-                    await loadMapDataById(mapId);
-                    await this.$store.dispatch('training/over');
-                    await this.$store.dispatch('training/setMapDefaultState');
-                    await this.$store.dispatch('map/clearJlmapTrainView');
-                    await this.$store.dispatch('map/setTrainWindowShow', false);
-                } catch (error) {
-                    this.$messageBox(`获取地图数据失败: ${error.message}`);
-                    this.endViewLoading();
-                }
-            },
-            // 结束加载状态
-            endViewLoading(isSuccess) {
-                if (!isSuccess) {
-                    this.$store.dispatch('map/mapClear');
-                }
+import JlmapVisual from '@/views/jlmap/index';
+import { loadMapDataById } from '@/utils/loaddata';
+import { EventBus } from '@/scripts/event-bus';
 
-                this.$nextTick(() => {
-                    EventBus.$emit('viewLoading', false);
-                });
-            },
-            clickEvent(em){
+export default {
+	name: 'MapPreview',
+	components: {
+		JlmapVisual
+	},
+	props: {
+		widthLeft: {
+			type: Number,
+			required: true
+		}
+	},
+	data() {
+		return {
+			size: {
+				width: document.documentElement.clientWidth - 400,
+				height: document.documentElement.clientHeight - 80
+			}
+		};
+	},
+	computed: {
+		mapId() {
+			return this.$route.params.mapId;
+		},
+		height() {
+			return this.$store.state.app.height - 50-30;
+		}
+	},
+	watch: {
+		widthLeft(val) {
+			this.setWindowSize();
+		},
+		$route() {
+			this.$nextTick(() => {
+				this.initLoadData();
+			});
+		},
+		// '$store.state.map.mapViewLoadedCount': function (val) {
+		//     // this.subscribe();
+		//     debugger;
+		//     this.$store.dispatch('map/setTrainWindowShow', false);
+		// },
+		'$store.state.app.windowSizeCount': function() {
+			this.setWindowSize();
+		}
+	},
+	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');
+	},
+	async mounted() {
+		await this.setWindowSize();
+		await this.initLoadData();
+	},
+	methods: {
+		async initLoadData() {
+			if (parseInt(this.mapId)) {
+				await this.loadMapDataById(this.mapId);
+			} else {
+				this.endViewLoading();
+			}
+		},
+		// 通过id加载地图数据
+		async loadMapDataById(mapId) {
+			try {
+				await this.$store.dispatch('training/changeMode', { mode: null });
+				await loadMapDataById(mapId);
+				await this.$store.dispatch('training/over');
+				await this.$store.dispatch('training/setMapDefaultState');
+				await this.$store.dispatch('map/clearJlmapTrainView');
+				await this.$store.dispatch('map/setTrainWindowShow', false);
+			} catch (error) {
+				this.$messageBox(`获取地图数据失败: ${error.message}`);
+				this.endViewLoading();
+			}
+		},
+		// 结束加载状态
+		endViewLoading(isSuccess) {
+			if (!isSuccess) {
+				this.$store.dispatch('map/mapClear');
+			}
 
-            },
-            onContextmenu(em){
+			this.$nextTick(() => {
+				EventBus.$emit('viewLoading', false);
+			});
+		},
+		clickEvent(em) {
 
-            },
-            setWindowSize() {
-                this.$nextTick(() => {
-                    const width = this.$store.state.app.width-this.widthLeft;
-                    const height = this.height;
-                    this.$store.dispatch('config/resize', { width, height });
-                    // this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-                });
-            }
-        }
-    };
+		},
+		onContextmenu(em) {
+
+		},
+		setWindowSize() {
+			this.$nextTick(() => {
+				const width = this.$store.state.app.width-this.widthLeft;
+				const height = this.height;
+				this.$store.dispatch('config/resize', { width, height });
+				// this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
+			});
+		}
+	}
+};
 </script>
 <style lang="scss" scoped>
     .map-view {
diff --git a/src/views/designPlatform/userDemonList.vue b/src/views/designPlatform/userDemonList.vue
index 0c6988922..e5b379ee9 100644
--- a/src/views/designPlatform/userDemonList.vue
+++ b/src/views/designPlatform/userDemonList.vue
@@ -17,8 +17,8 @@
           <span
             class="el-icon-tickets"
             :style="{color: data.valid ? 'green':''}"
-          ></span>
-		  <span>&nbsp;{{ tnode.label }}</span>
+          />
+          <span>&nbsp;{{ tnode.label }}</span>
         </span>
       </el-tree>
     </el-scrollbar>
diff --git a/src/views/designPlatform/userIndex.vue b/src/views/designPlatform/userIndex.vue
index 6bd97a13e..b1c1ef93b 100644
--- a/src/views/designPlatform/userIndex.vue
+++ b/src/views/designPlatform/userIndex.vue
@@ -26,6 +26,7 @@ import { launchFullscreen } from '@/utils/screen';
 import localStore from 'storejs';
 import { getSessionStorage, setSessionStorage } from '@/utils/auth';
 import MapCreate from '@/views/map/mapdraft/mapmanage/create';
+import { UrlConfig } from '@/router/index';
 
 export default {
 	name: 'DesignPlatform',

From 7ee5cbcab36db0626da222c70d0f71b8fa203046 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 28 Oct 2019 15:00:50 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/designPlatform/demonList.vue  | 22 +++-------------------
 src/views/designPlatform/mapPreview.vue |  7 -------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue
index f34787d33..c2206bf18 100644
--- a/src/views/designPlatform/demonList.vue
+++ b/src/views/designPlatform/demonList.vue
@@ -121,11 +121,7 @@ export default {
 					break;
 				}
 			}
-			// this.$refs.menu.doClose();
 		},
-		// async myrefresh(filterSelect){
-
-		// },
 		async refresh(filterSelect) {
 			this.cityCode=filterSelect;
 			this.loading = true;
@@ -187,25 +183,13 @@ export default {
 		isAdministrator() {
 			return this.$store.state.user.roles.includes(superAdmin) || this.$store.state.user.roles.includes(admin);
 		},
-		// createMap() {
-		//     this.$emit("createMap");
-		// },
 	}
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .back-home {
-        float: right;
-        cursor: pointer;
-
-    &:hover {
-         color: #3ea726;
-     }
-    }
-
-    .map-list-main{
-        text-align:left;
-    }
+	.map-list-main{
+		text-align:left;
+	}
 </style>
 <style>
     .el-tree {
diff --git a/src/views/designPlatform/mapPreview.vue b/src/views/designPlatform/mapPreview.vue
index 1956134dc..25868167b 100644
--- a/src/views/designPlatform/mapPreview.vue
+++ b/src/views/designPlatform/mapPreview.vue
@@ -33,13 +33,7 @@
             }
         },
         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');
         },
         watch: {
             widthLeft(val){
@@ -106,7 +100,6 @@
                     const width = this.$store.state.app.width-(this.widthLeft||450);
                     const height = this.height;
                     this.$store.dispatch('config/resize', { width, height });
-                    // this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
                 });
             }
         }

From 42cdacbcd04c61eec19f793f1cb7e3ce2b352a0f Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 28 Oct 2019 17:08:22 +0800
Subject: [PATCH 06/21] =?UTF-8?q?=E8=A5=BF=E9=93=81=E9=99=A2=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=B7=AF=E7=94=B1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Entry.vue | 32 +++++++++++++++++++++++++++-----
 src/permission.js               | 24 +++++++++++++-----------
 src/router/index.js             |  5 +++++
 src/scripts/ConstDic.js         |  3 ++-
 src/store/modules/permission.js |  2 +-
 src/views/login/index.vue       |  6 +++---
 6 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/layout/components/Entry.vue b/src/layout/components/Entry.vue
index cbc0506dc..aa144fd80 100644
--- a/src/layout/components/Entry.vue
+++ b/src/layout/components/Entry.vue
@@ -26,17 +26,18 @@ export default {
 		Qcode
 	},
 	data() {
+
 		return {
 			entryList: [
 				{
 					name: 'global.designPlatformEntrance',
 					handle: this.goToDesign,
-					hidden: getSessionStorage('project') === 'design'
+					hidden: getSessionStorage('project').startsWith('design')
 				},
 				{
 					name: 'global.trainingPlatformEntrance',
 					handle: this.goToTraining,
-					hidden: getSessionStorage('project') !== 'design'
+					hidden: !getSessionStorage('project').startsWith('design')
 				},
 				{
 					name: 'global.scan',
@@ -46,7 +47,7 @@ export default {
 				{
 					name: 'global.quickEntry',
 					handle: this.quickEntry,
-					hidden: getSessionStorage('project') === 'design'
+					hidden: getSessionStorage('project').startsWith('design')
 				},
 				{
 					name: LangStorage.getLang('zh')==='zh'?'English':'中文',
@@ -62,6 +63,9 @@ export default {
 	computed: {
 		username() {
 			return this.$store.state.user.nickname;
+		},
+		project() {
+			return getSessionStorage('project');
 		}
 	},
 	watch: {
@@ -81,19 +85,37 @@ export default {
 		},
 		goToDesign() {
 			const routeData = this.$router.resolve({
-				path: '/design'
+				path: this.getPath()
 			});
 			window.open(routeData.href, '_blank');
 		},
 		goToTraining() {
 			const routeData = this.$router.resolve({
-				path: '/'
+				path: this.getPath()
 			});
 			window.open(routeData.href, '_blank');
 		},
 		switchLanguage() {
 			this.$i18n.locale = this.lang;
 			LangStorage.setLang(this.lang);
+		},
+		getPath() {
+			let path = '/';
+			switch (this.project) {
+			case 'login':
+				path = '/design/login';
+				break;
+			case 'xty':
+				path='/designxty/login';
+				break;
+			case 'design':
+				path = '/login';
+				break;
+			case 'designxty':
+				path= '/xty/login';
+				break;
+			}
+			return path;
 		}
 	}
 };
diff --git a/src/permission.js b/src/permission.js
index 61af63641..bdf3c6012 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -15,7 +15,7 @@ function hasPermission(roles, permissionRoles) {
 	return roles.some(role => permissionRoles.indexOf(role) >= 0);
 }
 
-const whiteList = ['/login', '/design/login', '/xty/login']; // 不重定向白名单
+const whiteList = ['/login', '/design/login', '/xty/login', '/designxty/login']; // 不重定向白名单
 
 const loginPage = whiteList[0];
 
@@ -23,19 +23,25 @@ const loginDesignPage = whiteList[1];
 
 const loginXtyPage = whiteList[2];
 
+const loginDesignXtyPage = whiteList[3];
+
 // 获取路径数据
 function getRouteInfo(to) {
 	let loginPath = '/';
 	let getTokenInfo = () => { };
 	let clientId = '';
 	const toRoutePath = to.redirectedFrom || to.path;
-	if (/^\/design/.test(toRoutePath) || /^\/scriptDisplay/.test(toRoutePath) || /^\/publish/.test(toRoutePath) || /^\/orderauthor/.test(toRoutePath) || /^\/system/.test(toRoutePath)|| /^\/display\/record/.test(toRoutePath) || /^\/display\/manage/.test(toRoutePath) || /^\/apply/.test(toRoutePath)) {
-		loginPath = loginDesignPage;
+	if (/^\/designxty/.test(toRoutePath)) {
+		loginPath = loginDesignXtyPage;
+		getTokenInfo = getDesignToken;
+		clientId = LoginParams.Design.clientId;
+	} else if (/^\/design/.test(toRoutePath) || /^\/scriptDisplay/.test(toRoutePath) || /^\/publish/.test(toRoutePath) || /^\/orderauthor/.test(toRoutePath) || /^\/system/.test(toRoutePath)|| /^\/display\/record/.test(toRoutePath) || /^\/display\/manage/.test(toRoutePath) || /^\/apply/.test(toRoutePath)) {
+		loginPath = getSessionStorage('project')==='designxty'?loginDesignXtyPage:loginDesignPage;
 		getTokenInfo = getDesignToken;
 		clientId = LoginParams.Design.clientId;
 	} else if (/^\/plan/.test(toRoutePath) || /^\/display\/plan/.test(toRoutePath)) {
-		if (getSessionStorage('project')==='design') {
-			loginPath = loginDesignPage;
+		if (getSessionStorage('project').startsWith('design')) {
+			loginPath = getSessionStorage('project')==='designxty'?loginDesignXtyPage:loginDesignPage;
 			getTokenInfo = getDesignToken;
 			clientId = LoginParams.Design.clientId;
 		} else {
@@ -62,7 +68,7 @@ function handleRoute(to, from, next, routeInfo) {
 		store.dispatch('GetInfo', routeInfo.getTokenInfo).then(res => {
 			// 根据roles权限生成可访问的路由表
 			const roles = res.roles;
-			if (getSessionStorage('project')==='design') {
+			if (getSessionStorage('project').startsWith('design')) {
 				roles.push(userDesign);
 			}
 			store.dispatch('GenerateRoutes', { roles, clientId: routeInfo.clientId }).then(() => {
@@ -86,11 +92,7 @@ function handleRoute(to, from, next, routeInfo) {
 		// 除没有动态改变权限的需求可直接next() 删下方权限判断
 		if (hasPermission(store.getters.roles, to.meta.roles)) {
 			if (to.path==='/404' && to.redirectedFrom==='/') {
-				if (getSessionStorage('project') === 'design') {
-					next('/design/home');
-				} else {
-					next(localStore.get('trainingPlatformRoute'+store.getters.id) ||'/trainingPlatform');
-				}
+				next(localStore.get('trainingPlatformRoute'+store.getters.id) ||'/trainingPlatform');
 			} else {
 				next();
 			}
diff --git a/src/router/index.js b/src/router/index.js
index 1c5bdd649..7f63259d2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -285,6 +285,11 @@ export const constantRoutes = [
 		component: Login,
 		hidden: true
 	},
+	{
+		path: '/designxty/login',
+		component: Login,
+		hidden: true
+	},
 	{
 		path: '/design/jlmap3d/edit',
 		component: Jlmap3dedit,
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index ae90a8762..83d7eec49 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -2200,5 +2200,6 @@ export const IbpOperation = {
 export const loginTitle = {
 	xty: '西铁院实训平台',
 	login: '城市轨道交通实训平台',
-	design: '城市轨道交通设计平台'
+	design: '城市轨道交通设计平台',
+	designxty: '西铁院设计平台'
 };
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index b9d1900d3..b0d59ea0a 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -48,7 +48,7 @@ function hasPermission(roles, route, parentsRoles) {
 		// 	}
 		// }
 		// return roles.some(role => route.meta.roles.indexOf(role) >= 0);
-		if (getSessionStorage('project')==='design') {
+		if (getSessionStorage('project').startsWith('design')) {
 			roles= roles.filter(function (role) {
 				return route.meta.roles.indexOf(role) >= 0;
 			});
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index a15cc89d0..894fa41c7 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="login-container" :style="{'background-image': 'url('+bgImg+')'}">
-    <div v-if="project==='xty'" class="text-box">{{ title }}</div>
+    <div v-if="project.endsWith('xty')" class="text-box">{{ title }}</div>
     <div class="language_box">
       <el-tooltip effect="dark" :content="this.$t('login.clickSwitchLanguage')" placement="bottom-end">
         <el-button class="language_btn" type="text" @click="handleLanguage">{{ language }}</el-button>
@@ -187,7 +187,7 @@ export default {
 	},
 	methods: {
 		computedAttribute() {
-			if (this.project === 'design') {
+			if (this.project.startsWith('design')) {
 				this.cookiesName = 'UserDesignName';
 				this.cookiesToken = 'UserDesignToken';
 				this.modelType = 'design';
@@ -238,7 +238,7 @@ export default {
 			this.clearTimer(this.checkLogin);
 			this.checkLogin = setTimeout(() => {
 				checkLoginStatus(self.sessionId).then(response => {
-					if (this.project === 'design') {
+					if (this.project.startsWith('design')) {
 						setDesignToken(response.data.token);
 
 					} else {

From 178e49187de55126790c505f93dd96bd9411f81f Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 28 Oct 2019 17:51:59 +0800
Subject: [PATCH 07/21] =?UTF-8?q?desc:=20=E8=B0=83=E6=95=B4=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E8=87=AA=E9=80=82=E5=BA=94=EF=BC=8C=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=88=B6=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=8C=BA=E6=AE=B5=EF=BC=8C=E9=81=93=E5=B2=94=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/tip.js                      |  3 +-
 src/i18n/langs/zh/tip.js                      |  3 +-
 src/layout/components/AppMain.vue             | 17 -----
 src/layout/components/index.js                |  2 +-
 src/layout/index.vue                          | 61 ++++++++++++++--
 src/views/designPlatform/demonList.vue        | 31 +++++---
 src/views/designPlatform/index.vue            | 18 ++---
 src/views/designPlatform/userDemonList.vue    | 73 +++++++++----------
 src/views/designPlatform/userIndex.vue        | 26 ++-----
 .../mapedit/mapoperate/config/data.vue        |  4 +-
 .../mapedit/mapoperate/config/list.vue        |  4 +-
 .../map/mapdraft/mapedit/mapoperate/line.vue  |  2 +-
 .../mapdraft/mapedit/mapoperate/section.vue   | 30 ++++----
 .../mapdraft/mapedit/mapoperate/switch.vue    | 25 ++++---
 14 files changed, 165 insertions(+), 134 deletions(-)
 delete mode 100644 src/layout/components/AppMain.vue

diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js
index 0906d6b29..d02b978a2 100644
--- a/src/i18n/langs/en/tip.js
+++ b/src/i18n/langs/en/tip.js
@@ -205,5 +205,6 @@ export default {
 	publishTheCourseHint: 'This operation will publish the course. Are you sure?',
 	rejectedCourseReleaseApplicationSuccessful: 'Rejected course release application successful!',
 	rejectedCourseReleaseApplicationFailed: 'Rejected course release application failed!',
-	duplicatePlanFailedTips: 'The interval needs to be more than 30 seconds or the times is more than 1'
+	duplicatePlanFailedTips: 'The interval needs to be more than 30 seconds or the times is more than 1',
+	createSwitchPortion: 'The relevant turnout is not formed'
 };
diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js
index a84170e28..d4e308a98 100644
--- a/src/i18n/langs/zh/tip.js
+++ b/src/i18n/langs/zh/tip.js
@@ -205,5 +205,6 @@ export default {
 	publishTheCourseHint: '此操作将发布课程，是否确定？',
 	rejectedCourseReleaseApplicationSuccessful: '驳回课程发布申请成功！',
 	rejectedCourseReleaseApplicationFailed: '驳回课程发布申请失败！',
-	duplicatePlanFailedTips: '间隔时间需要大于30秒或次数大于1'
+	duplicatePlanFailedTips: '间隔时间需要大于30秒或次数大于1',
+	createSwitchPortion: '相关道岔未生成'
 };
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
deleted file mode 100644
index 98c839e9f..000000000
--- a/src/layout/components/AppMain.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <section class="app-main">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <transition name="fade" mode="out-in">
-        <router-view />
-      </transition>
-    </el-scrollbar>
-  </section>
-</template>
-
-<script>
-export default {
-	name: 'AppMain',
-	computed: {
-	}
-};
-</script>
diff --git a/src/layout/components/index.js b/src/layout/components/index.js
index 6744940ba..4cd35432d 100644
--- a/src/layout/components/index.js
+++ b/src/layout/components/index.js
@@ -1,3 +1,3 @@
 export { default as Navbar } from './Navbar';
 export { default as Sidebar } from './Sidebar';
-export { default as AppMain } from './AppMain';
+// export { default as AppMain } from './AppMain';
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 41c752b36..764245aa6 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -2,13 +2,12 @@
   <div class="app-wrapper" :class="classObj">
     <div class="main-container">
       <navbar />
-      <!-- <app-main :style="{width: width+'px', height: height+'px'}" /> -->
       <section class="app-main" :style="{height: height+'px'}">
-        <el-scrollbar wrap-class="scrollbar-wrapper app_scrollbar_box">
-          <transition name="fade" mode="out-in">
-            <router-view />
-          </transition>
-        </el-scrollbar>
+        <!-- <el-scrollbar wrap-class="scrollbar-wrapper app_scrollbar_box"> -->
+        <transition name="fade" mode="out-in">
+          <router-view />
+        </transition>
+        <!-- </el-scrollbar> -->
       </section>
       <el-footer style="height:30px;text-align:right;line-height: 30px;">
         <span style="font-size:14px;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</span>
@@ -24,7 +23,6 @@ export default {
 	name: 'Layout',
 	components: {
 		Navbar
-		// AppMain
 	},
 	data() {
 		return {
@@ -77,6 +75,10 @@ export default {
         overflow: hidden;
     }
 
+	.app-main{
+		overflow-y: auto;
+	}
+
     .drawer-bg {
         background: #000;
         opacity: 0.3;
@@ -94,4 +96,49 @@ export default {
 			height: 100%;
 		}
 	}
+
+	// 定义公共card样式
+	.joylink-card{
+		border: 1px solid #EBEEF5;
+		background-color: #FFF;
+		color: #303133;
+		transition: .3s;
+		box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
+	}
+
+	// 谷歌、safari、qq浏览器、360浏览器滚动条样式
+	// 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
+	::-webkit-scrollbar {
+		width: 6px;
+		height: 110px;
+		background-color: #FFFFFF;
+	}
+	/*定义滚动条轨道 内阴影+圆角*/
+	::-webkit-scrollbar-track {
+		// box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+		border-radius: 10px;
+		background-color: #FFFFFF;;
+	}
+	/*定义滑块 内阴影+圆角*/
+	::-webkit-scrollbar-thumb {
+		border-radius: 10px;
+		// box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+		background-color: #eaeaea;
+	}
+	/*滑块效果*/
+	::-webkit-scrollbar-thumb:hover {
+		border-radius: 5px;
+		// box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+		background: rgba(0,0,0,0.4);
+	}
+	/*IE滚动条颜色*/
+	html {
+		scrollbar-face-color:#bfbfbf;/*滚动条颜色*/
+		scrollbar-highlight-color:#000;
+		scrollbar-3dlight-color:#000;
+		scrollbar-darkshadow-color:#000;
+		scrollbar-Shadow-color:#adadad;/*滑块边色*/
+		scrollbar-arrow-color:rgba(0,0,0,0.4);/*箭头颜色*/
+		scrollbar-track-color:#eeeeee;/*背景颜色*/
+	}
 </style>
diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue
index 79039d803..2c306d3a3 100644
--- a/src/views/designPlatform/demonList.vue
+++ b/src/views/designPlatform/demonList.vue
@@ -1,17 +1,20 @@
 <template>
-  <div>
-    <el-card v-loading="loading" class="map-list-main" :header="$t('map.publishedMapList')">
+  <div v-loading="loading" class="joylink-card map-list-main">
+    <div class="clearfix">
+      <span>{{ $t('map.publishedMapList') }}</span>
+    </div>
+    <div class="text_item" style="height: calc(100% - 47px);">
       <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
       <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
-      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-125) +'px' }">
-        <el-tree ref="tree" :data="treeList" node-key="id" :props="defaultProps" highlight-current :span="22" :filter-node-method="filterNode" @node-click="clickEvent">
+      <div style="height: calc(100% - 76px);">
+        <el-tree ref="tree" class="tree_box" :data="treeList" node-key="id" :props="defaultProps" highlight-current :span="22" :filter-node-method="filterNode" @node-click="clickEvent">
           <span slot-scope="{ node:tnode, data }">
             <span class="el-icon-tickets" :style="{color: data.valid ? 'green':''}" />
             <span>&nbsp;{{ tnode.label }}</span>
           </span>
         </el-tree>
-      </el-scrollbar>
-    </el-card>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -57,11 +60,6 @@ export default {
 			cityCode: ''
 		};
 	},
-	computed: {
-		height() {
-			return this.$store.state.app.height - 93;
-		}
-	},
 	watch: {
 		filterText(val) {
 			this.treeList = this.treeData.filter((res) => {
@@ -189,7 +187,18 @@ export default {
 
     .map-list-main{
         text-align:left;
+		height: 100%;
     }
+	.clearfix{
+		padding: 0 20px;
+		border-bottom: 1px solid #EBEEF5;
+		box-sizing: border-box;
+		height: 47px;
+		line-height: 47px;
+	}
+	.tree_box{
+		height: 100%;
+	}
 </style>
 <style>
     .el-tree {
diff --git a/src/views/designPlatform/index.vue b/src/views/designPlatform/index.vue
index 076c54c76..1ea37bff7 100644
--- a/src/views/designPlatform/index.vue
+++ b/src/views/designPlatform/index.vue
@@ -1,14 +1,12 @@
 <template>
   <div class="app-wrapper">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
-        <demon-list ref="demonList" :width="widthLeft" />
-      </div>
-      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
-      <transition>
-        <router-view :product-list="productList" :width-left="widthLeft" />
-      </transition>
-    </el-scrollbar>
+    <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
+      <demon-list ref="demonList" :width="widthLeft" />
+    </div>
+    <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
+    <transition>
+      <router-view :product-list="productList" :width-left="widthLeft" />
+    </transition>
   </div>
 </template>
 
@@ -99,8 +97,6 @@ export default {
     }
 
     .examList {
-        // position: fixed;
-        // top: 61px;
         float: left;
         height: 100%;
     }
diff --git a/src/views/designPlatform/userDemonList.vue b/src/views/designPlatform/userDemonList.vue
index e5b379ee9..3d2dff52c 100644
--- a/src/views/designPlatform/userDemonList.vue
+++ b/src/views/designPlatform/userDemonList.vue
@@ -1,39 +1,25 @@
 <template>
-  <el-card v-loading="loading" class="map-list-main" :header="$t('map.myMapList')">
-    <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
-    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-185) +'px' }">
-      <el-tree
-        ref="tree"
-        :data="treeList"
-        node-key="id"
-        :props="defaultProps"
-        highlight-current
-        :span="22"
-        :filter-node-method="filterNode"
-        @node-click="clickEvent"
-        @node-contextmenu="showContextMenu"
-      >
-        <span slot-scope="{ node:tnode, data }">
-          <span
-            class="el-icon-tickets"
-            :style="{color: data.valid ? 'green':''}"
-          />
-          <span>&nbsp;{{ tnode.label }}</span>
-        </span>
-      </el-tree>
-    </el-scrollbar>
-    <div class="buttonList">
-      <el-button size="small" type="primary" class="eachButton uploadDemo ">
-        <input
-          ref="files"
-          type="file"
-          class="file_box"
-          accept=".json, application/json"
-          @change="importf"
-        >
-        {{ $t('map.importMap') }}
-      </el-button>
-      <el-button size="small" type="primary" class="eachButton" @click="createMap">{{ $t('map.newConstruction') }}</el-button>
+  <div v-loading="loading" class="joylink-card map-list-main">
+    <div class="clearfix">
+      <span>{{ $t('map.myMapList') }}</span>
+    </div>
+    <div class="text_item" style="height: calc(100% - 47px);">
+      <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
+      <div style="height: calc(100% - 89px); overflow-y: auto;">
+        <el-tree ref="tree" :data="treeList" node-key="id" :props="defaultProps" highlight-current :span="22" :filter-node-method="filterNode" @node-click="clickEvent" @node-contextmenu="showContextMenu">
+          <span slot-scope="{ node:tnode, data }">
+            <span class="el-icon-tickets" :style="{color: data.valid ? 'green':''}" />
+            <span>&nbsp;{{ tnode.label }}</span>
+          </span>
+        </el-tree>
+      </div>
+      <div class="buttonList">
+        <el-button size="small" type="primary" class="eachButton uploadDemo ">
+          <input ref="files" type="file" class="file_box" accept=".json, application/json" @change="importf">
+          {{ $t('map.importMap') }}
+        </el-button>
+        <el-button size="small" type="primary" class="eachButton" @click="createMap">{{ $t('map.newConstruction') }}</el-button>
+      </div>
     </div>
     <map-operate-menu
       ref="menu"
@@ -43,7 +29,7 @@
       @refresh="loadInitData"
       @jlmap3d="jlmap3d"
     />
-  </el-card>
+  </div>
 </template>
 <script>
 import { DeviceMenu } from '@/scripts/ConstDic';
@@ -59,10 +45,6 @@ export default {
 		MapOperateMenu
 	},
 	props: {
-		height: {
-			type: Number,
-			required: true
-		},
 		width: {
 			type: Number,
 			required: true
@@ -223,6 +205,16 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+	.clearfix{
+		padding: 0 20px;
+		border-bottom: 1px solid #EBEEF5;
+		box-sizing: border-box;
+		height: 47px;
+		line-height: 47px;
+	}
+	.tree_box{
+		height: 100%;
+	}
     .buttonList{
         padding: 8px 0px 8px 0px;
         border-top: 1px #ccc solid;
@@ -249,5 +241,6 @@ export default {
     }
     .map-list-main{
         text-align:left;
+		height: 100%;
     }
 </style>
diff --git a/src/views/designPlatform/userIndex.vue b/src/views/designPlatform/userIndex.vue
index b1c1ef93b..a856f93e6 100644
--- a/src/views/designPlatform/userIndex.vue
+++ b/src/views/designPlatform/userIndex.vue
@@ -1,20 +1,13 @@
 <template>
-  <div class="app-wrapper">
+  <div class="app-wrapper" style="height: 100%;">
     <map-create ref="mapCreate" :skin-code="skinCode" @refresh="refresh1" @editmap="handleNodeClick" />
-    <!-- <el-scrollbar wrap-class="scrollbar-wrapper"> -->
-    <div>
-      <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
-        <demon-list ref="demonList" :height="height" :width="widthLeft" @createMap="createMap" />
-      </div>
-      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
-      <transition>
-        <!-- position:'relative', -->
-        <!-- :style="{left:widthLeft+'px', width: (width - widthLeft)+'px'}"  -->
-        <router-view :product-list="productList" />
-      </transition>
+    <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
+      <demon-list ref="demonList" :width="widthLeft" @createMap="createMap" />
     </div>
-
-    <!-- </el-scrollbar> -->
+    <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
+    <transition>
+      <router-view :product-list="productList" />
+    </transition>
   </div>
 </template>
 
@@ -47,9 +40,6 @@ export default {
 		...mapGetters([
 			'lessonbar'
 		]),
-		height() {
-			return this.$store.state.app.height - 50;
-		},
 		width() {
 			return this.$store.state.app.width;
 		}
@@ -140,8 +130,6 @@ export default {
     }
 
     .examList {
-        // position: fixed;
-        // top: 61px;
         float: left;
         height: 100%;
     }
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue b/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
index 263a90896..0e1572878 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/config/data.vue
@@ -104,6 +104,7 @@
           <div class="point-section">
             <template v-for="(point, index) in formModel[item.prop]">
               <div :key="index" style="overflow: hidden;">
+                <span style="display: table; margin-right: 3px; font-size: 14px; float: left; line-height: 28px;">{{ index == 0 ? '(起点)' : index == formModel[item.prop].length - 1 ? '(终点)' : `(中点${index})` }}</span>
                 <el-form-item
                   label=""
                   :prop="'points[' + index + '].x'"
@@ -120,7 +121,7 @@
                   label=""
                   :prop="'points[' + index + '].y'"
                   style="display: table; float: left; margin-right: 5px;"
-                  label-width="10px"
+                  label-width="4px"
                 >
                   <el-input-number v-model="point.y" :disabled="item.pointDisabled" />
                 </el-form-item>
@@ -136,6 +137,7 @@
                   :disabled="index == 0 || index == formModel[item.prop].length - 1"
                   circle
                   class="point-button"
+                  style="margin-left: 4px;"
                   @click="item.delPoint(index)"
                 />
               </div>
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue b/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
index 1898eb398..19d25c0ed 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/config/list.vue
@@ -107,6 +107,7 @@
               <div class="point-section" :style="{ width: `calc(100% - 10px - ${item.width})` }">
                 <template v-for="(point, index) in formModel[item.prop]">
                   <div :key="index" style="overflow: hidden;">
+                    <span style="display: table; margin-right: 3px; font-size: 14px; float: left; line-height: 28px;" :style="{'margin-right': index == 0 || index == formModel[item.prop].length - 1 ? '9px' : '5px'}">{{ index == 0 ? '起 点' : index == formModel[item.prop].length - 1 ? '终 点' : `中点${index}` }}</span>
                     <el-form-item
                       label=""
                       :prop="'points[' + index + '].x'"
@@ -123,7 +124,7 @@
                       label=""
                       :prop="'points[' + index + '].y'"
                       style="display: table; float: left; margin-right: 5px;"
-                      label-width="10px"
+                      label-width="4px"
                     >
                       <el-input-number v-model="point.y" :disabled="item.pointDisabled" />
                     </el-form-item>
@@ -139,6 +140,7 @@
                       :disabled="index == 0 || index == formModel[item.prop].length - 1"
                       circle
                       class="point-button"
+                      style="margin-left: 4px;"
                       @click="item.delPoint(index)"
                     />
                   </div>
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/line.vue b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
index c3476f8c1..0ab514631 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/line.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
@@ -161,7 +161,7 @@ export default {
 							{ prop: 'code', label: this.$t('map.lineCoding'), type: 'select', optionLabel: 'code', optionValue: 'code', options: this.lineList, change: true, deviceChange: this.deviceChange },
 							{ prop: 'type', label: this.$t('map.lineType'), type: 'select', optionLabel: 'name', optionValue: 'code', options: this.LineTypeList },
 							{ prop: 'width', label: this.$t('map.lineWidth'), type: 'number', min: 1, placeholder: 'px' },
-							{ prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '120px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint }
+							{ prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '100px', isHidden: !this.isPointsShow, addPoint: this.addPoint, delPoint: this.delPoint }
 						]
 					},
 					map: {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/section.vue b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
index e96b8fcea..a4566e08d 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/section.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
@@ -130,7 +130,7 @@
       <el-tab-pane class="view-control" label="批量删除" name="five" :style="{ height: cardHeight + 30 +'px' }">
         <div class="link_box_select">
           <span style="margin-right: 12px;">选择link:</span>
-          <el-select v-model="linkCode" filterable size="mini">
+          <el-select v-model="linkCode" filterable multiple size="mini">
             <el-option
               v-for="item in linkList"
               :key="item.code"
@@ -343,7 +343,7 @@ export default {
 								{ prop: 'segmentationPosition.y', firstLevel: 'segmentationPosition', secondLevel: 'y', label: 'y:', type: 'number', labelWidth: '20px', disabled: true }
 							] },
 							{ prop: 'isCurve', label: this.$t('map.isCurve'), type: 'checkbox', isHidden: !this.isSectionType },
-							{ prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '140px', isHidden: !this.isPointsShow, pointDisabled: this.pointDisabledName, addPoint: this.addPoint, delPoint: this.delPoint }
+							{ prop: 'points', label: this.$t('map.segmentCoordinates'), type: 'points', width: '100px', isHidden: !this.isPointsShow, pointDisabled: this.pointDisabledName, addPoint: this.addPoint, delPoint: this.delPoint }
 						]
 					},
 					map: {
@@ -836,7 +836,6 @@ export default {
 						}
 					}
 				});
-				console.log(models, remove);
 
 				const _that = this;
 				this.$confirm(this.$t('tip.confirmBatchGeneration'), this.$t('tip.hint'), {
@@ -1101,17 +1100,19 @@ export default {
 		delRelevanceSection() {
 			const selected = [];
 			const switchList = [];
-			this.sectionList.forEach(section => {
-				if (section.linkCode == this.linkCode) {
-					const selectedSection = this.$store.getters['map/getDeviceByCode'](section.code);
-					selected.push(selectedSection);
-					this.switchList.forEach(switchEle => {
-						if (section.relSwitchCode == switchEle.code) {
-							const selectedSwitch = this.$store.getters['map/getDeviceByCode'](switchEle.code);
-							switchList.push(selectedSwitch);
-						}
-					});
-				}
+			this.linkCode.forEach(linkCode => {
+				this.sectionList.forEach(section => {
+					if (section.linkCode == linkCode) {
+						const selectedSection = this.$store.getters['map/getDeviceByCode'](section.code);
+						selected.push(selectedSection);
+						this.switchList.forEach(switchEle => {
+							if (section.relSwitchCode == switchEle.code) {
+								const selectedSwitch = this.$store.getters['map/getDeviceByCode'](switchEle.code);
+								switchList.push(selectedSwitch);
+							}
+						});
+					}
+				});
 			});
 			this.$confirm(this.$t('tip.confirmDeletion'), this.$t('tip.hint'), {
 				confirmButtonText: this.$t('tip.confirm'),
@@ -1123,6 +1124,7 @@ export default {
 				});
 				await this.$emit('delMapModel', selected);
 				this.deviceSelect();
+				this.linkCode = '';
 			}).catch(() => {
 				this.$message.info(this.$t('tip.cancelledDelete'));
 			});
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
index 08b6eb31f..979639b0f 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
@@ -171,15 +171,15 @@ export default {
 		create() { // 一键生成道岔
 			this.questionList = []; // 有问题区段列表
 			const models = [];
-			// const remove = [];
 			const linkObj = {};
 			this.linkList.forEach(link => {
 				if (link && link.leftFdCode && link.leftSdCode) { // 左侧同时都有关联link
 					linkObj[`${link.code}`] = { name: '', num: 0 };
 				} else if (link && link.rightFdCode && link.rightSdCode) { // 右侧同时都有关联link
 					linkObj[`${link.code}`] = { name: '', num: 0 };
+				} else if (link && link.leftFdCode && !link.leftSdCode && link.rightFdCode && !link.rightSdCode) { // 左右正向link关联，侧向link不关联检测
+					linkObj[`${link.code}`] = { name: '', num: 0 };
 				}
-
 			});
 			this.sectionList.forEach(section => {
 				for (const link in linkObj) {
@@ -227,7 +227,7 @@ export default {
 								}
 							};
 							const swch = this.findSwitchData(model.sectionACode, model.sectionBCode, model.sectionCCode);
-							!swch && models.push(model);
+							!swch && models.push(model); // 已有的道岔不在创建
 						}
 					}
 				}
@@ -273,6 +273,16 @@ export default {
 					}
 				}
 			});
+			const createArr = [];
+			models.forEach((item) => {
+				const sectionA = this.$store.getters['map/getDeviceByCode'](item.sectionACode);
+				const sectionB = this.$store.getters['map/getDeviceByCode'](item.sectionBCode);
+				const sectionC = this.$store.getters['map/getDeviceByCode'](item.sectionCCode);
+				if (linkObj[sectionA.linkCode].num != 1 && linkObj[sectionB.linkCode].num != 1 && linkObj[sectionC.linkCode].num != 1 ) {
+					createArr.push(item);
+				}
+			});
+			// console.log(models, createArr, '创建道岔list');
 			this.$confirm(this.$t('tip.confirmBatchGeneration'), this.$t('tip.hint'), {
 				confirmButtonText: this.$t('tip.confirm'),
 				cancelButtonText: this.$t('tip.cancel'),
@@ -280,14 +290,11 @@ export default {
 			}).then(() => {
 				for (const link in linkObj) {
 					if (linkObj[link].num == 1) {
-						this.questionList.push(`${this.$t('map.section')}${linkObj[link].name}${this.$t('tip.linkNoneSplit')}`);
+						this.questionList.push(`${this.$t('map.section')}${linkObj[link].name}${this.$t('tip.linkNoneSplit')}, ${this.$t('tip.createSwitchPortion')}`);
 					}
 				}
-				if (!this.questionList.length) { // 没有问题list 再去创建
-					// this.$emit('delMapModel', remove);
-					this.$emit('addOrUpdateMapModel', models);
-					this.createSwitchSection(models);
-				}
+				this.$emit('addOrUpdateMapModel', createArr);
+				this.createSwitchSection(createArr);
 			}).catch(() => {
 				this.$message({
 					type: 'info',

From 60c58fe290ae0a4820eadc1a3253a2cd978c9a9e Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 28 Oct 2019 18:42:31 +0800
Subject: [PATCH 08/21] =?UTF-8?q?desc:=20=E8=B0=83=E6=95=B4=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=88=B6=20=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E6=BB=9A=E8=BD=AE=E4=BA=8B=E4=BB=B6,=20=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E7=BB=98=E5=88=B6=E5=8C=BA=E6=AE=B5=E5=9D=90=E6=A0=87?=
 =?UTF-8?q?=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmap/map.js                                |  2 ++
 src/views/designPlatform/mapPreview.vue        |  5 +----
 src/views/jlmap/index.vue                      |  9 ++++++++-
 .../mapdraft/mapedit/mapoperate/section.vue    | 18 +++++++++++++++++-
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/jmap/map.js b/src/jmap/map.js
index 5800b8714..cd50c6fb3 100644
--- a/src/jmap/map.js
+++ b/src/jmap/map.js
@@ -40,6 +40,7 @@ class Jlmap {
 	initMapInstance(opts) {
 		const width = opts.dom.clientWidth;
 		const height = opts.dom.clientHeight;
+		this.zoomOnMouseWheel = opts.options.zoomOnMouseWheel;
 
 		this.$zr = zrender.init(opts.dom, deepAssign({ renderer, devicePixelRatio, width, height }, opts.config));
 
@@ -125,6 +126,7 @@ class Jlmap {
 		if (this.$options.disabled == true) {
 			this.$mouseController.disable();
 		} else {
+			opts['zoomOnMouseWheel'] = this.zoomOnMouseWheel;
 			this.$mouseController.enable(opts);
 		}
 
diff --git a/src/views/designPlatform/mapPreview.vue b/src/views/designPlatform/mapPreview.vue
index 206646eaf..3307c0814 100644
--- a/src/views/designPlatform/mapPreview.vue
+++ b/src/views/designPlatform/mapPreview.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="map-view">
-    <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="onContextmenu" />
+    <jlmap-visual ref="jlmapVisual" />
   </div>
 </template>
 <script>
@@ -97,9 +97,6 @@ export default {
 			this.$nextTick(() => {
 				EventBus.$emit('viewLoading', false);
 			});
-		},
-		clickEvent(em) {
-
 		},
 		setWindowSize() {
 			this.$nextTick(() => {
diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue
index b93312fc2..397fac459 100644
--- a/src/views/jlmap/index.vue
+++ b/src/views/jlmap/index.vue
@@ -131,6 +131,12 @@ export default {
 			document.getElementById(this.canvasId).oncontextmenu = function (e) {
 				return false;
 			};
+			// 默认个人地图绘制可以滚轮放大缩小 其他地图显示不允许此操作
+			const path = window.location.href;
+			let flag = false;
+			if (path.includes('design/userlist/map/draw')) {
+				flag = true;
+			}
 
 			Vue.prototype.$jlmap = new Jlmap({
 				dom: document.getElementById(this.canvasId),
@@ -142,7 +148,8 @@ export default {
 				options: {
 					scaleRate: 1,
 					offsetX: 0,
-					offsetY: 0
+					offsetY: 0,
+					zoomOnMouseWheel: flag
 				},
 				methods: {
 					dataLoaded: this.handleDataLoaded,
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/section.vue b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
index a4566e08d..19a493752 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/section.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
@@ -225,6 +225,7 @@ export default {
 			},
 			linkCode: '',
 			tableData: [],
+			oldPoint: [], // 区段未修改前 坐标
 			addModel: {
 				code: '',
 				splitNumber: 2,
@@ -565,6 +566,7 @@ export default {
 					this.editModel.logicSectionNum = selected.type === '01' ? selected.logicSectionNum : [0];
 					this.editModel.isSegmentation = selected.isSegmentation || false;
 					this.editModel.points = JSON.parse(JSON.stringify(selected.points));
+					this.oldPoint = JSON.parse(JSON.stringify(selected.points));
 
 					this.addModel.splitOffsetMax = Math.sqrt(new JTriangle(selected.points[0], selected.points[selected.points.length - 1]).abspowz);
 					this.addModel.splitOffset = this.addModel.splitOffsetMax / 2;
@@ -864,7 +866,7 @@ export default {
 			this.$refs['dataform'].validate((valid) => {
 				if (valid) {
 					const edits = [];
-					const model = Object.assign({_type: 'Section'}, this.editModel);
+					const model = Object.assign({_type: 'Section'}, this.editModel); // 修改元素model
 					model.leftStopPointOffset = Number(model.leftStopPointOffset);
 					model.rightStopPointOffset = Number(model.rightStopPointOffset);
 					this.sectionList.forEach(section => {
@@ -873,10 +875,24 @@ export default {
 							section.trainPosType = model.trainPosType;
 							edits.push(section);
 						}
+						if (section.linkCode == model.linkCode && model.code != section.code) {
+							// debugger;
+							const lastIndex = this.oldPoint.length - 1;
+							if (this.oldPoint[0].x == section.points[section.points.length -1].x && this.oldPoint[0].y == section.points[section.points.length -1].y) {
+								section.points[section.points.length -1].x = model.points[0].x;
+								section.points[section.points.length -1].y = model.points[0].y;
+							}
+							if (this.oldPoint[lastIndex].x == section.points[0].x && this.oldPoint[lastIndex].y == section.points[0].y) {
+								section.points[0].x = model.points[model.points.length -1].x;
+								section.points[0].y = model.points[model.points.length -1].y;
+							}
+							edits.push(section);
+						}
 					});
 					edits.push(model);
 					this.fieldS = '';
 					this.$emit('addOrUpdateMapModel', edits);
+					this.oldPoint = JSON.parse(JSON.stringify(model.points));
 				}
 			});
 		},

From d056b8bfc861edb23d7e3183256765dfd56d7c6d Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Mon, 28 Oct 2019 19:01:29 +0800
Subject: [PATCH 09/21] =?UTF-8?q?desc:=20=20=E8=B0=83=E6=95=B4=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/userInfo.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/userInfo.vue b/src/layout/components/userInfo.vue
index 827b24a74..f2f523c4f 100644
--- a/src/layout/components/userInfo.vue
+++ b/src/layout/components/userInfo.vue
@@ -119,7 +119,7 @@
 <script>
 import md5 from 'js-md5';
 import { getInfo } from '@/api/login';
-import { getDesignToken } from '@/utils/auth'; // 验权
+import { getDesignToken, getToken } from '@/utils/auth'; // 验权
 import { getUserinfoName, getUserinfoNickname, getUserinfoMobile, getUserinfoMobileCode, getUserinfoEmailCode, getUserinfoEmail, getUserinfoPassword } from '@/api/management/user';
 import { setInterval, clearInterval } from 'timers';
 
@@ -187,7 +187,8 @@ export default {
 		},
 		doShow() {
 			this.visible = true;
-			getInfo(getDesignToken()).then(response => {
+			const token = getToken() || getDesignToken();
+			getInfo(token).then(response => {
 				const user = response.data;
 				this.userInfo = {
 					name: user.name,

From b5a8b10e4e18ecddae4705f03a381cb6980e5108 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 28 Oct 2019 19:12:31 +0800
Subject: [PATCH 10/21] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/approval/script/index.vue     | 4 ++--
 src/views/designPlatform/mapPreview.vue | 5 ++++-
 src/views/display/demon/addQuest.vue    | 4 ++--
 src/views/display/designIndex.vue       | 6 ++++--
 src/views/display/menuDemon.vue         | 6 +++++-
 src/views/login/index.vue               | 2 +-
 src/views/scriptManage/home.vue         | 7 ++-----
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/views/approval/script/index.vue b/src/views/approval/script/index.vue
index a6c1c4ac1..a8836334a 100644
--- a/src/views/approval/script/index.vue
+++ b/src/views/approval/script/index.vue
@@ -8,7 +8,7 @@
 <script>
     import { launchFullscreen } from '@/utils/screen';
     import { UrlConfig } from '@/router/index';
-    import { scriptRecordNotify } from '@/api/simulation';
+    import { scriptDraftRecordNotify } from '@/api/simulation';
     import ScriptOperate from './operate';
     import { reviewScriptList,publishScript,rejectScript } from '@/api/designPlatform';
     import { listPublishMap } from '@/api/jmap/map';
@@ -148,7 +148,7 @@
             },
             scriptPreview(index,row){
                 let mapInfo=this.allMapList.find(elem=>{return elem.id==row.mapId});
-                scriptRecordNotify(row.id).then(resp => {
+                scriptDraftRecordNotify(row.id).then(resp => {
                     const query = { mapId: row.mapId, group: resp.data, scriptId: row.id,skinCode:mapInfo.skinCode,try:0};
                     this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
                     launchFullscreen();
diff --git a/src/views/designPlatform/mapPreview.vue b/src/views/designPlatform/mapPreview.vue
index 206646eaf..d91307ba8 100644
--- a/src/views/designPlatform/mapPreview.vue
+++ b/src/views/designPlatform/mapPreview.vue
@@ -100,7 +100,10 @@ export default {
 		},
 		clickEvent(em) {
 
-		},
+        },
+        onContextmenu(em){
+
+        },
 		setWindowSize() {
 			this.$nextTick(() => {
 				const width = this.$store.state.app.width-(this.widthLeft||450);
diff --git a/src/views/display/demon/addQuest.vue b/src/views/display/demon/addQuest.vue
index d5c2947fb..912936d11 100644
--- a/src/views/display/demon/addQuest.vue
+++ b/src/views/display/demon/addQuest.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { getScriptPageListOnline, getScriptById,getDraftScriptById } from '@/api/script';
+import { getScriptPageListOnline, getScriptById,getDraftScriptByGroup } from '@/api/script';
 
 export default {
 	name: 'AddQuest',
@@ -154,7 +154,7 @@ export default {
 		},
 		async handleLoad(index, row) {
 			this.row = row;
-			const res = this.$route.fullPath.includes('design/display/demon')?await getDraftScriptById(row.id):await getScriptById(row.id);
+			const res = this.$route.fullPath.includes('design/display/demon')?await getDraftScriptByGroup(row.group):await getScriptById(row.id);
 			let newMemberList = [];
 			if (res.code == 200) {
 				if (res.data.playerVOList && res.data.playerVOList.length > 0) {
diff --git a/src/views/display/designIndex.vue b/src/views/display/designIndex.vue
index 8fa96b575..f0861581f 100644
--- a/src/views/display/designIndex.vue
+++ b/src/views/display/designIndex.vue
@@ -258,6 +258,7 @@ export default {
 
 		await this.setWindowSize();
 		await this.initLoadData();
+		this.switchMode('');
 	},
 	async beforeDestroy() {
 		await this.clearAllTimer();
@@ -480,7 +481,8 @@ export default {
 		},
 		async runAddRolesLoadShow() {
 			// this.$refs.addQuest.doShow();
-			const row={id: this.$route.query.scriptId};
+			// const row={id: this.$route.query.scriptId};
+			const row={group: this.$route.query.group,id: this.$route.query.scriptId};
 			this.$refs.addQuest.handleLoad(1, row);
 		},
 		// 选择脚本
@@ -506,7 +508,7 @@ export default {
 				}
 				}
 				this.switchMode(prdType);
-				const res = await loadDraftScript(row.id, id, this.group);
+				const res = await loadDraftScript(row.id,id, this.group);
 				if (res && res.code == 200) {
 					this.questId = parseInt(row.id);
 					if (mapLocation) {
diff --git a/src/views/display/menuDemon.vue b/src/views/display/menuDemon.vue
index af85bd1fb..771735cdc 100644
--- a/src/views/display/menuDemon.vue
+++ b/src/views/display/menuDemon.vue
@@ -10,7 +10,8 @@
         <el-button v-if="isShowScheduling" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
         <el-button type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
         <template v-if="isShowQuest">
-          <el-button type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
+			<!-- && !isDesignPlatform  -->
+          <el-button v-if="!isDesignPlatform " type="danger" @click="handleQuitQuest">{{ $t('display.demon.exitScript') }}</el-button>
         </template>
         <template v-else>
           <el-button type="success" :disabled="isDisable" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
@@ -81,6 +82,9 @@ export default {
 		},
 		isShowScheduling() {
 			return this.$route.query.prdType == '05';
+		},
+		isDesignPlatform(){
+			return this.$route.fullPath.includes('design/display/demon');
 		}
 	},
 	watch: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index a15cc89d0..0656bb4a9 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -131,7 +131,7 @@ export default {
 				password: ''
 			},
 			loginRules: {
-				username: [{ required: true, trigger: 'blur', validator: validateUsername }, { required: true, trigger: 'change', validator: validateUsername }],
+				username: [{ required: true, trigger: 'blur', validator: validateUsername }],
 				password: [{ required: true, trigger: 'blur', validator: validatePass }]
 			},
 			loading: false,
diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue
index 39f44bca5..b07ee437c 100644
--- a/src/views/scriptManage/home.vue
+++ b/src/views/scriptManage/home.vue
@@ -22,7 +22,7 @@ import { mapGetters } from 'vuex';
 import { admin, superAdmin} from '@/router';
 import { getQuestPageList,createQuest,deleteQuest,updateQuest,publishQuest,retractQuest} from '@/api/quest';
 import { launchFullscreen } from '@/utils/screen';
-import { scriptRecordNotify } from '@/api/simulation';
+import { scriptDraftRecordNotify,scriptRecordNotify } from '@/api/simulation';
 import CreateScript from './create';
 import ScriptPublish from './publish';
 
@@ -124,9 +124,6 @@ export default {
 			this.reloadTable();
 		}
 	},
-	mounted() {
-		this.reloadTable();
-	},
 	methods: {
 		queryFunction(params) {
             return getQuestPageList(this.$route.params.mapId,params);
@@ -266,7 +263,7 @@ export default {
 			}).catch(() => { });
 		},
 		previewScript(index,row){
-			scriptRecordNotify(row.id).then(resp => {
+			scriptDraftRecordNotify(row.id).then(resp => {
 				const query = { mapId: row.mapId, group: resp.data, scriptId: row.id,skinCode:this.$route.query.skinCode,try:0};
 				this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });
 				launchFullscreen();

From 7246568801f4439a8b236f7b8a8f5f2eb46538ff Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 28 Oct 2019 19:16:07 +0800
Subject: [PATCH 11/21] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/designPlatform/mapPreview.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/views/designPlatform/mapPreview.vue b/src/views/designPlatform/mapPreview.vue
index a7c73cf73..3307c0814 100644
--- a/src/views/designPlatform/mapPreview.vue
+++ b/src/views/designPlatform/mapPreview.vue
@@ -98,12 +98,6 @@ export default {
 				EventBus.$emit('viewLoading', false);
 			});
 		},
-		clickEvent(em) {
-
-        },
-        onContextmenu(em){
-
-        },
 		setWindowSize() {
 			this.$nextTick(() => {
 				const width = this.$store.state.app.width-(this.widthLeft||450);

From 8ad40cf99878ce9cf39b78d11527a742aa734fa6 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 29 Oct 2019 09:43:56 +0800
Subject: [PATCH 12/21] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 764245aa6..43d209c28 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -110,7 +110,7 @@ export default {
 	// 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
 	::-webkit-scrollbar {
 		width: 6px;
-		height: 110px;
+		// height: 110px;
 		background-color: #FFFFFF;
 	}
 	/*定义滚动条轨道 内阴影+圆角*/

From 9fc78c18c3c8052e1aecd57e824f2f28c017d79e Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 29 Oct 2019 13:06:55 +0800
Subject: [PATCH 13/21] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4=20?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E5=8F=91=E5=B8=83=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/approval.js                 |  4 ++++
 src/i18n/langs/zh/approval.js                 |  6 ++++++
 src/views/approval/runPlan/index.vue          | 10 +++++-----
 .../lessoncategory/edit/sorttree/index.vue    | 19 ++++++++++++++-----
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/i18n/langs/en/approval.js b/src/i18n/langs/en/approval.js
index 682cb4c02..93a1320bc 100644
--- a/src/i18n/langs/en/approval.js
+++ b/src/i18n/langs/en/approval.js
@@ -21,6 +21,10 @@ export default {
 	passedScriptFailed: 'Passed script failed',
 	rejectScriptSuccess: 'Reject script success',
 	rejectScriptFailed: 'Reject script failed',
+	passedRunPlanSuccess: 'Passed run plan success',
+	passedRunPlanFailed: 'Passed run plan failed',
+	rejectRunPlanSuccess: 'reject run plan success',
+	rejectRunPlanFailed: 'reject run plan failed',
 	runPlanName: 'Run Plan Name',
 	passedRunPlan: 'Passed Run Plan',
 	rejectRunPlan: 'Reject Run Plan',
diff --git a/src/i18n/langs/zh/approval.js b/src/i18n/langs/zh/approval.js
index 59e2c3755..ad8b66f1f 100644
--- a/src/i18n/langs/zh/approval.js
+++ b/src/i18n/langs/zh/approval.js
@@ -21,6 +21,12 @@ export default {
 	passedScriptFailed: '通过剧本失败',
 	rejectScriptSuccess: '驳回剧本成功',
 	rejectScriptFailed: '驳回剧本失败',
+
+	passedRunPlanSuccess: '通过剧本成功',
+	passedRunPlanFailed: '通过剧本失败',
+	rejectRunPlanSuccess: '驳回剧本成功',
+	rejectRunPlanFailed: '驳回剧本失败',
+
 	runPlanName: '运行图名称',
 	passedRunPlan: '通过运行图',
 	rejectRunPlan: '驳回运行图',
diff --git a/src/views/approval/runPlan/index.vue b/src/views/approval/runPlan/index.vue
index c84e6ac3b..6c26a3f60 100644
--- a/src/views/approval/runPlan/index.vue
+++ b/src/views/approval/runPlan/index.vue
@@ -158,22 +158,22 @@
             handleConfirmPass(data){
                 publishRunPlan(data.id,data).then(resp => {
                     if(resp.data.length<=0){
-                        this.$message.success(this.$t('approval.passedScriptSuccess'));
+                        this.$message.success(this.$t('approval.passedRunPlanSuccess'));
                     }
                     else{
-                        this.$messageBox(`${this.$t('approval.passedScriptFailed')}: ${resp.data[0]}`);
+                        this.$messageBox(`${this.$t('approval.passedRunPlanFailed')}: ${resp.data[0]}`);
                     }
                     this.reloadTable();
                 }).catch(error => {
-                    this.$messageBox(`${this.$t('approval.passedScriptFailed')}: ${error.message}`);
+                    this.$messageBox(`${this.$t('approval.passedRunPlanFailed')}: ${error.message}`);
                 })
             },
             handleConfirmReject(data){
                 rejectRunPlan(data.id,data).then(resp => {
                     this.reloadTable();
-                    this.$message.success(this.$t('approval.rejectScriptSuccess'));
+                    this.$message.success(this.$t('approval.rejectRunPlanSuccess'));
                 }).catch(error => {
-                    this.$messageBox(`${this.$t('approval.rejectScriptFailed')}: ${error.message}`);
+                    this.$messageBox(`${this.$t('approval.rejectRunPlanFailed')}: ${error.message}`);
                 })
             },
         }
diff --git a/src/views/lesson/lessoncategory/edit/sorttree/index.vue b/src/views/lesson/lessoncategory/edit/sorttree/index.vue
index 8757651b4..54eb21e64 100644
--- a/src/views/lesson/lessoncategory/edit/sorttree/index.vue
+++ b/src/views/lesson/lessoncategory/edit/sorttree/index.vue
@@ -82,14 +82,23 @@ export default {
 		},
 		allowDrop(draggingNode, dropNode, type) {
 			if (draggingNode && draggingNode.data.type === 'Chapter') {
-				return dropNode && draggingNode.parent == dropNode.parent && (
-					dropNode.data.type === 'Chapter' && type !== 'Inner');
-			} else if (draggingNode && draggingNode.data.type === 'Training') {
-				return dropNode && draggingNode.parent == dropNode.parent && (
-					dropNode.data.type === 'Training' && type !== 'Inner');
+				// debugger;
+				return dropNode && (dropNode.data.type === 'Chapter');
+			// 	return dropNode && draggingNode.parent == dropNode.parent && (
+			// 		dropNode.data.type === 'Chapter' && type !== 'Inner');
+			}
+			 else if (draggingNode && draggingNode.data.type === 'Training') {
+				//  dropNode.data.type === 'Chapter' || 
+				 return dropNode && (dropNode.data.type === 'Training' && type !== 'Inner' );
+			// 	return dropNode && draggingNode.parent == dropNode.parent && (
+			// 		dropNode.data.type === 'Training' && type !== 'Inner');
+			}
+			else{
+				return true;
 			}
 		},
 		allowDrag(draggingNode) {
+			// debugger;
 			return draggingNode && (draggingNode.data.type === 'Chapter' || draggingNode.data.type === 'Training');
 		},
 		getLeesonId(node) {

From c08e2afaaa83d9a8993cdf05d8d5ef44d032ff99 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Tue, 29 Oct 2019 13:15:57 +0800
Subject: [PATCH 14/21] =?UTF-8?q?desc:=20=E8=B0=83=E6=95=B4=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                                  |   59 +-
 .../QueryListPage/QueryListPage.vue           |  597 +++---
 src/router/index.js                           | 1790 ++++++++---------
 src/utils/baseUrl.js                          |   22 +-
 src/views/lesson/details.vue                  |  184 +-
 src/views/lesson/trainingRule/addBatch.vue    |  225 ++-
 src/views/lesson/trainingRule/addEdit.vue     |  562 +++---
 src/views/lesson/trainingRule/list.vue        |  522 ++---
 src/views/lesson/trainingRule/saveAs.vue      |  211 +-
 src/views/lesson/trainingmanage/index.vue     |  470 ++---
 10 files changed, 2382 insertions(+), 2260 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 8a6e863bc..01fef3a03 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -25,31 +25,31 @@ module.exports = {
     "vue/no-v-html": "off",
     'accessor-pairs': 2,
     "arrow-spacing": 0,//=>的前/后括号
-    'block-spacing': [2, 'always'],
-    'brace-style': [2, '1tbs', {
+    'block-spacing': [2, 'always'], // 禁止或强制在代码块中开括号前和闭括号后有空格  { return 11 }
+    'brace-style': [2, '1tbs', { // 强制在代码块中使用一致的大括号风格
       'allowSingleLine': true
     }],
-    'camelcase': [0, {
+    'camelcase': [0, { // 强制使用驼峰拼写法命名规定
       'properties': 'always'
     }],
-    'comma-dangle': [2, 'never'],
-    'comma-spacing': [2, {
+    'comma-dangle': [2, 'never'], // 要求或禁止末尾逗号
+    'comma-spacing': [2, { // 强制在逗号前后使用一致的空格
       'before': false,
       'after': true
     }],
-    'comma-style': [2, 'last'],
-    'constructor-super': 2,
-    'curly': [2, 'multi-line'],
-    'dot-location': [2, 'property'],
-    'eol-last': 2,
+    'comma-style': [2, 'last'], // 强制在逗号前后使用一致的空格
+    'constructor-super': 2, // 要求在构造函数中有super()调用
+    'curly': [2, 'multi-line'], // 强制所有控制语句使用一致的括号风格
+    'dot-location': [2, 'property'], // 强制在点号之前和之后一致的换行
+    'eol-last': 2, // 禁止文件末尾存在空行禁止文件末尾存在空行
     'generator-star-spacing': [2, {
       'before': true,
       'after': true
     }],
     'handle-callback-err': [2, '^(err|error)$'],
-    'indent': ["error", "tab"],
-    'jsx-quotes': [2, 'prefer-single'],
-    'key-spacing': [2, {
+    'indent': [2, 4], // 强制使用一致的缩进
+    'jsx-quotes': [2, 'prefer-single'], // 强制在JSX属性中一致地使用双引号或单引号
+    'key-spacing': [0, {  // 强制要求在对象字面量的属性中键和值之间使用一致的间距
       'beforeColon': false,
       'afterColon': true
     }],
@@ -58,8 +58,8 @@ module.exports = {
       'after': true
     }],
     "new-cap": 2,//函数名首行大写必须使用new方式调用，首行小写必须用不带new方式调用
-    'new-parens': 2,
-    'no-array-constructor': 2,
+    'new-parens': 2, // 要求构造无参构造函数时有圆括号
+    'no-array-constructor': 2, // 禁用Array构造函数
     'no-caller': 2,
     'no-console': 'off',
     'no-class-assign': 2,
@@ -94,9 +94,10 @@ module.exports = {
     }],
     'no-lone-blocks': 2,
     "no-mixed-spaces-and-tabs": [2, false],//禁止混用tab和空格
-    "no-multi-spaces": 1,//不能用多余的空格
+    "no-multi-spaces": 1,// 不能用多余的空格
     'no-multi-str': 2,
-    'no-multiple-empty-lines': [2, {
+    'no-multiple-empty-lines': [2, { // 禁止出现多行空行
+      // 最大连续空行数
       'max': 1
     }],
     'no-native-reassign': 2,
@@ -121,7 +122,7 @@ module.exports = {
     'no-sparse-arrays': 2,
     'no-this-before-super': 2,
     'no-throw-literal': 2,
-    "no-trailing-spaces": 1,//一行结束后面不要有空格
+    "no-trailing-spaces": 1,// 禁止行尾空格
     'no-undef': 2,
     'no-undef-init': 2,
     'no-unexpected-multiline': 2,
@@ -139,7 +140,7 @@ module.exports = {
     'no-useless-computed-key': 2,
     'no-useless-constructor': 2,
     'no-useless-escape': 0,
-    'no-whitespace-before-property': 2,
+    'no-whitespace-before-property': 2, // 禁止属性前有空白
     'no-with': 2,
     'one-var': [2, {
       'initialized': 'never'
@@ -150,21 +151,21 @@ module.exports = {
         ':': 'before'
       }
     }],
-    "padded-blocks": 0,//块语句内行首行尾是否要空行
+    "padded-blocks": 0, // 块语句内行首行尾是否要空行
     'quotes': [2, 'single', {
       'avoidEscape': true,
       'allowTemplateLiterals': true
     }],
-    'semi': [2, 'always'], //语句强制分号结尾
-    'semi-spacing': [2, {
+    'semi': [2, 'always'], // 语句强制分号结尾
+    'semi-spacing': [2, { // 强制分号之前和之后使用一致的空格
       'before': false,
       'after': true
     }],
     "strict": 2,//使用严格模式
-    'space-before-blocks': [2, 'always'], //不以新行开始的块{前面要不要有空格
-    "space-before-function-paren": [0, "always"],//函数定义时括号前面要不要有空格
-    "space-in-parens": [0, "never"],//小括号里面要不要有空格
-    "space-infix-ops": 0,//中缀操作符周围要不要有空格
+    'space-before-blocks': [2, 'always'], // 不以新行开始的块{前面要不要有空格  强制在块之前使用一致的空格
+    "space-before-function-paren": [0, "always"],// 函数定义时括号前面要不要有空格
+    "space-in-parens": [0, "never"],// 小括号里面要不要有空格
+    "space-infix-ops": 2,// 要求操作符周围有空格
     'space-unary-ops': [2, {
       'words': true,
       'nonwords': false
@@ -172,7 +173,7 @@ module.exports = {
     'spaced-comment': [2, 'always', {
       'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
     }], //注释风格要不要有空格什么的
-    'template-curly-spacing': [2, 'never'],
+    // 'template-curly-spacing': [2, 'never'],
     'use-isnan': 2, //禁止比较时使用NaN，只能用isNaN()
     'valid-typeof': 2, //必须使用合法的typeof的值
     "wrap-iife": [2, "inside"],//立即执行函数表达式的小括号风格
@@ -180,7 +181,7 @@ module.exports = {
     'yoda': [2, 'never'], //禁止尤达条件
     'prefer-const': 2,
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    "object-curly-spacing": [0, "never"],//大括号内是否允许不必要的空格
-    "array-bracket-spacing": [2, "never"], //是否允许非空数组里面有多余的空格
+    "object-curly-spacing": [0, "never"], // 强制在大括号中使用一致的空格
+    "array-bracket-spacing": [2, "never"], // 禁止或强制在括号内使用空格
   }
 }
diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index 6747c5ae9..49c2a6892 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="query-list-page" :style="{height: queryList.height ? 'auto' : listPageHeight}">
+  <!--  :style="{height: queryList.height ? 'auto' : listPageHeight}" -->
+  <div class="query-list-page">
     <query-form
       v-show="!(queryForm.show === false)"
       ref="queryForm"
@@ -152,315 +153,315 @@
 // import { mapGetters } from 'vuex'
 
 export default {
-	components: {
-		QueryForm: resolve => { require(['@/components/QueryListPage/QueryForm'], resolve); } // 懒加载
-	},
-	props: {
-		queryForm: {
-			type: Object,
-			required: true
-		},
-		pagerConfig: {
-			type: Object,
-			default() {
-				return {};
-			}
-		},
-		queryList: {
-			type: Object,
-			required: true
-		}
-	},
-	data() {
-		return {
-			loading: false,
-			choose: null,
-			queryData: {},
-			currentpagerConfig: {},
-			headerCellStyle: {
-				// "background-color ": 'rgba(48, 60, 86, 1)',
-				// color: 'white'
-			},
-			listPageHeight: '100%',
-			tableHeight: 0,
-			pageSize: 10,
-			pageIndex: 1,
-			pageOffset: 0,
-			canQuery: true, // 查询按钮是否可点
-			thirdQRCodeMakeUrl: 'http://s.jiathis.com/qrcode.php?url='
-		};
-	},
-	computed: {
-		globalPagerConfig: function() {
-			const pagerConfig = {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNow'
-			};
-			return pagerConfig;
-		}
-	},
-	created() {
-		const self = this;
-		// queryList 如果没有data属性,就创建并赋值为[]
-		if (!this.queryList.data) {
-			this.$set(this.queryList, 'data', []);
-		}
-		// queryList 如果没有total属性,就创建并赋值为0
-		if (!this.queryList.total) {
-			this.$set(this.queryList, 'total', 0);
-		}
-		// 如果设置了pageConfig就使用它,否则使用globalPageConfig
-		if (!this.pagerConfig) {
-			this.currentpagerConfig = Object.assign({}, this.globalPagerConfig);
-		} else {
-			this.currentpagerConfig = Object.assign({}, this.pagerConfig);
-		}
-		// queryList 如果没有selection属性,就创建并赋值为[]
-		if (!this.queryList.selection) {
-			this.$set(this.queryList, 'selection', []);
-		}
-		// 给queryList添加数据重载的方法
-		this.queryList.reload = function() {
-			return self.commitQuery();
-		};
-	},
-	mounted() {
-		// this.commitQuery();
-		// this.tableHeight = this.$refs.table2.$el.offsetHeight + 23;
-	},
-	methods: {
-		// 根据类型显示
-		checkColumnTyep(column, typeName) {
-			if (column.show === false) {
-				return false;
-			} else if (column.isShow) {
-				return column.isShow();
-			}
-			if (typeof column.type === 'undefined') {
-				if (column.formatter instanceof Function) {
-					column.type = 'formatter';
-				} else {
-					column.type = 'basic';
-				}
-			}
-			// 类型是否匹配
-			const typeFlag = column.type === typeName;
-			return typeFlag;
-		},
-		isTableBtnDisabled(button, index, row) {
-			if (button.isDisabled) {
-				return button.isDisabled(index, row);
-			} else {
-				return false;
-			}
-		},
-		// 计算列表的列为链接时显示的名称，可能为列对象的字段
-		getTableBtnName(btnName, index, row) {
-			if (typeof btnName.trim() === 'function') {
-				return btnName(index, row);
-			} else {
-				return btnName;
-			}
-		},
-		// 按钮查询
-		query(queryData) {
-			this.queryData = queryData;
-			this.queryList.reload();
-		},
-		// 导出操作
-		queryExport(queryData) {
-			const self = this;
-			self.disableQuery();
-			self.queryData = queryData;
+    components: {
+        QueryForm: resolve => { require(['@/components/QueryListPage/QueryForm'], resolve); } // 懒加载
+    },
+    props: {
+        queryForm: {
+            type: Object,
+            required: true
+        },
+        pagerConfig: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        queryList: {
+            type: Object,
+            required: true
+        }
+    },
+    data() {
+        return {
+            loading: false,
+            choose: null,
+            queryData: {},
+            currentpagerConfig: {},
+            headerCellStyle: {
+                // "background-color ": 'rgba(48, 60, 86, 1)',
+                // color: 'white'
+            },
+            listPageHeight: '100%',
+            tableHeight: 0,
+            pageSize: 10,
+            pageIndex: 1,
+            pageOffset: 0,
+            canQuery: true, // 查询按钮是否可点
+            thirdQRCodeMakeUrl: 'http://s.jiathis.com/qrcode.php?url='
+        };
+    },
+    computed: {
+        globalPagerConfig: function() {
+            const pagerConfig = {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNow'
+            };
+            return pagerConfig;
+        }
+    },
+    created() {
+        const self = this;
+        // queryList 如果没有data属性,就创建并赋值为[]
+        if (!this.queryList.data) {
+            this.$set(this.queryList, 'data', []);
+        }
+        // queryList 如果没有total属性,就创建并赋值为0
+        if (!this.queryList.total) {
+            this.$set(this.queryList, 'total', 0);
+        }
+        // 如果设置了pageConfig就使用它,否则使用globalPageConfig
+        if (!this.pagerConfig) {
+            this.currentpagerConfig = Object.assign({}, this.globalPagerConfig);
+        } else {
+            this.currentpagerConfig = Object.assign({}, this.pagerConfig);
+        }
+        // queryList 如果没有selection属性,就创建并赋值为[]
+        if (!this.queryList.selection) {
+            this.$set(this.queryList, 'selection', []);
+        }
+        // 给queryList添加数据重载的方法
+        this.queryList.reload = function() {
+            return self.commitQuery();
+        };
+    },
+    mounted() {
+        // this.commitQuery();
+        // this.tableHeight = this.$refs.table2.$el.offsetHeight + 23;
+    },
+    methods: {
+        // 根据类型显示
+        checkColumnTyep(column, typeName) {
+            if (column.show === false) {
+                return false;
+            } else if (column.isShow) {
+                return column.isShow();
+            }
+            if (typeof column.type === 'undefined') {
+                if (column.formatter instanceof Function) {
+                    column.type = 'formatter';
+                } else {
+                    column.type = 'basic';
+                }
+            }
+            // 类型是否匹配
+            const typeFlag = column.type === typeName;
+            return typeFlag;
+        },
+        isTableBtnDisabled(button, index, row) {
+            if (button.isDisabled) {
+                return button.isDisabled(index, row);
+            } else {
+                return false;
+            }
+        },
+        // 计算列表的列为链接时显示的名称，可能为列对象的字段
+        getTableBtnName(btnName, index, row) {
+            if (typeof btnName.trim() === 'function') {
+                return btnName(index, row);
+            } else {
+                return btnName;
+            }
+        },
+        // 按钮查询
+        query(queryData) {
+            this.queryData = queryData;
+            this.queryList.reload();
+        },
+        // 导出操作
+        queryExport(queryData) {
+            const self = this;
+            self.disableQuery();
+            self.queryData = queryData;
 			import('@/utils/Export2Excel').then(excel => {
-				const tHeader = self.queryForm.exportConfig.header;
-				self.prepareExportData().then(data => {
-					excel.export_json_to_excel(tHeader, data, self.queryForm.exportConfig.filename);
-					self.enableQuery();
-				}).catch(error => {
-					self.enableQuery();
-					self.$message.error(`${this.$t('error.exportFailed')}: ${error.message}`);
-				});
+			    const tHeader = self.queryForm.exportConfig.header;
+			    self.prepareExportData().then(data => {
+			        excel.export_json_to_excel(tHeader, data, self.queryForm.exportConfig.filename);
+			        self.enableQuery();
+			    }).catch(error => {
+			        self.enableQuery();
+			        self.$message.error(`${this.$t('error.exportFailed')}: ${error.message}`);
+			    });
 			});
-		},
-		// 导出数据准备
-		prepareExportData() {
-			return new Promise((resolve, reject) => {
-				const filterVals = this.queryForm.exportConfig.filterVals;
-				this.queryExportData().then(result => {
-					const list = result.list;
-					const data = this.formatJson(filterVals, list);
-					resolve(data);
-				}).catch(error => {
-					reject(error);
-				});
-			});
-		},
-		// 格式化数据列表
-		formatJson(filterVals, list) {
-			return list.map(v => filterVals.map(fv => {
-				let keys = [];
-				if (typeof (fv) === 'string') {
-					keys = fv.split('.');
-				} else {
-					keys = fv.key.split('.');
-				}
-				let obj = v;
-				keys.forEach(element => {
-					obj = obj[element];
-				});
-				if (fv.type === 'date') {
-					const format = fv.format || 'yyyy-MM-dd';
-					return new Date(obj).Format(format);
-				} else if (fv.formatter instanceof Function) {
-					return fv.formatter(v);
-				} else {
-					return obj;
-				}
-			}));
-		},
-		// 查询需要导出的数据列表
-		queryExportData() {
-		},
-		/**
+        },
+        // 导出数据准备
+        prepareExportData() {
+            return new Promise((resolve, reject) => {
+                const filterVals = this.queryForm.exportConfig.filterVals;
+                this.queryExportData().then(result => {
+                    const list = result.list;
+                    const data = this.formatJson(filterVals, list);
+                    resolve(data);
+                }).catch(error => {
+                    reject(error);
+                });
+            });
+        },
+        // 格式化数据列表
+        formatJson(filterVals, list) {
+            return list.map(v => filterVals.map(fv => {
+                let keys = [];
+                if (typeof (fv) === 'string') {
+                    keys = fv.split('.');
+                } else {
+                    keys = fv.key.split('.');
+                }
+                let obj = v;
+                keys.forEach(element => {
+                    obj = obj[element];
+                });
+                if (fv.type === 'date') {
+                    const format = fv.format || 'yyyy-MM-dd';
+                    return new Date(obj).Format(format);
+                } else if (fv.formatter instanceof Function) {
+                    return fv.formatter(v);
+                } else {
+                    return obj;
+                }
+            }));
+        },
+        // 查询需要导出的数据列表
+        queryExportData() {
+        },
+        /**
 		 * 翻页方法
 		 * pageIndex: 翻页后是第几页
 		 * params: 查询条件
 		 **/
-		changePage(pageIndex, params) {
-			this.pageIndex = pageIndex;
-			this.pageOffset = (this.pageIndex - 1) * this.pageSize;
-			if (params) {
-				// 如果是点查询按钮到这来的，不用混合分页信息，已经有默认的第一页信息
-				this.queryData = params;
-				// 以防pageSize改变, 重新赋值
-				this.queryData[this.currentpagerConfig.pageSize] = this.pageSize;
-			} else {
-				// 如果是点翻页按钮到这来的，把分页信息混合到this.queryData里
-				this.mixinBackPageInfoToQueryData();
-			}
-			// 加时间戳
-			// this.queryData._time = this.$moment()._d.getTime();
-			this.queryList.reload();
-		},
-		/**
+        changePage(pageIndex, params) {
+            this.pageIndex = pageIndex;
+            this.pageOffset = (this.pageIndex - 1) * this.pageSize;
+            if (params) {
+                // 如果是点查询按钮到这来的，不用混合分页信息，已经有默认的第一页信息
+                this.queryData = params;
+                // 以防pageSize改变, 重新赋值
+                this.queryData[this.currentpagerConfig.pageSize] = this.pageSize;
+            } else {
+                // 如果是点翻页按钮到这来的，把分页信息混合到this.queryData里
+                this.mixinBackPageInfoToQueryData();
+            }
+            // 加时间戳
+            // this.queryData._time = this.$moment()._d.getTime();
+            this.queryList.reload();
+        },
+        /**
 		 * 改变分页大小回调函数，执行完毕后，iview会自动触发changePage事件，去查第一页数据
 		 */
-		pageSizeChange(newPageSize) {
-			if (newPageSize) {
-				this.pageSize = newPageSize;
-				this.changePage(1, this.queryData);
-			}
-		},
-		/**
+        pageSizeChange(newPageSize) {
+            if (newPageSize) {
+                this.pageSize = newPageSize;
+                this.changePage(1, this.queryData);
+            }
+        },
+        /**
 		 * 把分页信息混合到this.queryData里
 		 */
-		mixinBackPageInfoToQueryData() {
-			// 当前的分页信息
-			const pagerParams = {
-				pageSize: this.pageSize,
-				pageIndex: this.pageIndex,
-				pageOffset: this.pageOffset
-			};
-			const tempPagerParams = {};
-			// 肯定要有pageSize
-			tempPagerParams[this.currentpagerConfig.pageSize] = pagerParams.pageSize || this.queryData[this.currentpagerConfig.pageSize];
-			// 判断使用 pageIndex 还是 pageOffset
-			if (this.currentpagerConfig.pageIndex) {
-				// 使用 pageIndex
-				tempPagerParams[this.currentpagerConfig.pageIndex] = pagerParams.pageIndex || this.queryData[this.currentpagerConfig.pageIndex];
-			} else {
-				// 使用 pageOffset
-				tempPagerParams[this.currentpagerConfig.pageOffset] = pagerParams.pageOffset !== undefined ? pagerParams.pageOffset : this.queryData[this.currentpagerConfig.pageOffset];
-			}
-			// 将分页信息封装到查询条件中
-			this.queryData = { ...this.queryData, ...tempPagerParams };
-		},
-		preCommitQueryHandler() {
-			// 填充表单
-			// this.$refs.form2.initFormData(this.queryData);
-			// 预设分页组件
-			this.pageIndex = parseInt(this.queryData[this.currentpagerConfig.pageIndex] || this.pageIndex);
-			this.pageSize = parseInt(this.queryData[this.currentpagerConfig.pageSize]);
-		},
-		commitQuery() {
-			const self = this;
-			return new Promise((resolve, reject) => {
-				self.disableQuery();
-				self.mixinBackPageInfoToQueryData();
-				const postData = this.queryData;
-				if (postData === false) {
-					self.enableQuery();
-					return;
-				}
-				if (this.queryList.query instanceof Function) {
-					this.queryList.query(this.queryData).then(response => {
-						self.enableQuery();
-						if (this.queryList.afterQuery && this.queryList.afterQuery instanceof Function) {
-							this.queryList.afterQuery(response.data);
-						}
+        mixinBackPageInfoToQueryData() {
+            // 当前的分页信息
+            const pagerParams = {
+                pageSize: this.pageSize,
+                pageIndex: this.pageIndex,
+                pageOffset: this.pageOffset
+            };
+            const tempPagerParams = {};
+            // 肯定要有pageSize
+            tempPagerParams[this.currentpagerConfig.pageSize] = pagerParams.pageSize || this.queryData[this.currentpagerConfig.pageSize];
+            // 判断使用 pageIndex 还是 pageOffset
+            if (this.currentpagerConfig.pageIndex) {
+                // 使用 pageIndex
+                tempPagerParams[this.currentpagerConfig.pageIndex] = pagerParams.pageIndex || this.queryData[this.currentpagerConfig.pageIndex];
+            } else {
+                // 使用 pageOffset
+                tempPagerParams[this.currentpagerConfig.pageOffset] = pagerParams.pageOffset !== undefined ? pagerParams.pageOffset : this.queryData[this.currentpagerConfig.pageOffset];
+            }
+            // 将分页信息封装到查询条件中
+            this.queryData = { ...this.queryData, ...tempPagerParams };
+        },
+        preCommitQueryHandler() {
+            // 填充表单
+            // this.$refs.form2.initFormData(this.queryData);
+            // 预设分页组件
+            this.pageIndex = parseInt(this.queryData[this.currentpagerConfig.pageIndex] || this.pageIndex);
+            this.pageSize = parseInt(this.queryData[this.currentpagerConfig.pageSize]);
+        },
+        commitQuery() {
+            const self = this;
+            return new Promise((resolve, reject) => {
+                self.disableQuery();
+                self.mixinBackPageInfoToQueryData();
+                const postData = this.queryData;
+                if (postData === false) {
+                    self.enableQuery();
+                    return;
+                }
+                if (this.queryList.query instanceof Function) {
+                    this.queryList.query(this.queryData).then(response => {
+                        self.enableQuery();
+                        if (this.queryList.afterQuery && this.queryList.afterQuery instanceof Function) {
+                            this.queryList.afterQuery(response.data);
+                        }
 
-						const resultData = response.data;
-						this.$set(this.queryList, 'data', resultData.list);
-						this.$set(this.queryList, 'total', resultData.total);
-					}).catch(error => {
-						self.enableQuery();
-						this.$message.error(`${this.$t('error.getListFailed')}：${error.message}`);
-					});
-				} else {
-					const data = this.queryList.data;
-					if (data) {
-						self.enableQuery();
-						if (this.queryList.afterQuery && this.queryList.afterQuery instanceof Function) {
-							this.queryList.afterQuery(data);
-						}
-						this.$set(this.queryList, 'data', data);
+                        const resultData = response.data;
+                        this.$set(this.queryList, 'data', resultData.list);
+                        this.$set(this.queryList, 'total', resultData.total);
+                    }).catch(error => {
+                        self.enableQuery();
+                        this.$message.error(`${this.$t('error.getListFailed')}：${error.message}`);
+                    });
+                } else {
+                    const data = this.queryList.data;
+                    if (data) {
+                        self.enableQuery();
+                        if (this.queryList.afterQuery && this.queryList.afterQuery instanceof Function) {
+                            this.queryList.afterQuery(data);
+                        }
+                        this.$set(this.queryList, 'data', data);
 
-						let total = this.queryList.total;
-						if (!total) {
-							total = this.queryList.data.length;
-						}
-						this.$set(this.queryList, 'total', total);
-					}
-				}
-			});
-		},
-		enableQuery() {
-			this.canQuery = true;
-			this.loading = false;
-		},
-		disableQuery() {
-			// 禁止查询按钮
-			this.canQuery = false;
-			this.loading = true;
-			// 清空表格的数据
-			// this.queryList.data = [];
-		},
-		onSelect(selection, row) {
-			this.queryList.onSelect && this.queryList.onSelect(selection, row);
-			this.queryList.selection = selection;
-		},
-		onSelectAll(selection) {
-			this.queryList.onSelectAll && this.queryList.onSelectAll(selection);
-			this.queryList.selection = selection;
-		},
-		onSelectionChange(selection) {
-			this.queryList.onSelectionChange && this.queryList.onSelectionChange(selection);
-			this.queryList.selection = selection;
-		},
-		onRowClick(row) {
-			this.choose = row;
-		},
-		currentChoose() {
-			return this.choose;
-		},
-		refresh(flag) {
-			if (flag) {
-				this.commitQuery();
-			}
-			this.queryList.data = [...this.queryList.data];
-		}
-	}
+                        let total = this.queryList.total;
+                        if (!total) {
+                            total = this.queryList.data.length;
+                        }
+                        this.$set(this.queryList, 'total', total);
+                    }
+                }
+            });
+        },
+        enableQuery() {
+            this.canQuery = true;
+            this.loading = false;
+        },
+        disableQuery() {
+            // 禁止查询按钮
+            this.canQuery = false;
+            this.loading = true;
+            // 清空表格的数据
+            // this.queryList.data = [];
+        },
+        onSelect(selection, row) {
+            this.queryList.onSelect && this.queryList.onSelect(selection, row);
+            this.queryList.selection = selection;
+        },
+        onSelectAll(selection) {
+            this.queryList.onSelectAll && this.queryList.onSelectAll(selection);
+            this.queryList.selection = selection;
+        },
+        onSelectionChange(selection) {
+            this.queryList.onSelectionChange && this.queryList.onSelectionChange(selection);
+            this.queryList.selection = selection;
+        },
+        onRowClick(row) {
+            this.choose = row;
+        },
+        currentChoose() {
+            return this.choose;
+        },
+        refresh(flag) {
+            if (flag) {
+                this.commitQuery();
+            }
+            this.queryList.data = [...this.queryList.data];
+        }
+    }
 
 };
 
diff --git a/src/router/index.js b/src/router/index.js
index 1c5bdd649..cf803f88e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -147,118 +147,118 @@ export const userLesson = '012'; 		// 教学系统
 export const userSimulation = '013';	// 仿真系统
 export const userScreen = '014'; 		// 大屏系统
 export const userPlan = '015'; 			// 计划系统
-export const userDesign='016';			// 设计系统
+export const userDesign = '016';			// 设计系统
 const isDev = process.env.NODE_ENV === 'development';
 
 export const UrlConfig = {
-	display: '/display',
-	scriptDisplay: '/scriptDisplay',
-	examRuleDraft: '/examRule/draft',
-	examRuleManage: '/examRule/manage',
-	map: {
-		prefix: '/map',
-		draft: '/map/draw',
-		skinCode: '/system/skinCode',
-		skinCodeDraft: '/system/skinCode/draft',
-		runPlan: '/map/runPlan',
-		runPlanView: '/map/runPlan/view',
-		product: '/map/product',
-		productDraft: '/map/product/draft'
-	},
-	lesson: {
-		prefix: '/lesson',
-		record: '/system/record/training',
-		manage: '/lesson/manage/training'
-	},
-	dp: {
-		prefix: '/dp',
-		detail: '/dp/detail',
-		pay: '/dp/pay'
+    display: '/display',
+    scriptDisplay: '/scriptDisplay',
+    examRuleDraft: '/examRule/draft',
+    examRuleManage: '/examRule/manage',
+    map: {
+        prefix: '/map',
+        draft: '/map/draw',
+        skinCode: '/system/skinCode',
+        skinCodeDraft: '/system/skinCode/draft',
+        runPlan: '/map/runPlan',
+        runPlanView: '/map/runPlan/view',
+        product: '/map/product',
+        productDraft: '/map/product/draft'
+    },
+    lesson: {
+        prefix: '/lesson',
+        record: '/system/record/training',
+        manage: '/lesson/manage/training'
+    },
+    dp: {
+        prefix: '/dp',
+        detail: '/dp/detail',
+        pay: '/dp/pay'
 
-	},
-	plan: {
-		prefix: '/plan',
-		tool: '/plan/tool',
-		usertool: '/plan/usertool',
-		detail: '/plan/detail',
-		pay: '/plan/pay'
-	},
-	design: {
-		prefix: '/design/home',
-		mapDraw: '/design/map/draw',
-		lessonEdit: '/design/lesson/edit',
-		lessonHome: '/design/lesson/home',
-		lessonManage: '/design/lesson/manage',
-		taskManage: '/design/lesson/taskManage',
-		trainingRule: '/design/lesson/trainingRule',
-		trainingRuleDetail: '/design/lesson/trainingRule/detail',
-		trainingManage: '/design/lesson/trainingManage',
-		lessonTraining: '/design/lesson/training',
-		trainingRecord: '/design/lesson/training',
-		runPlan: '/design/runPlan/detail',
-		scriptHome: '/design/script/home',
-		display: '/design/display',
-		mapPreview: '/design/mapPreview'
-	},
-	designUser: {
-		prefix: '/design/userlist/home',
-		scriptHome: '/design/userlist/script/home',
-		mapDraw: '/design/userlist/map/draw',
-		lessonHome: '/design/userlist/lesson/home',
-		runPlan: '/design/userlist/runPlan/detail'
-	},
-	replay: {
-		prefix: '/replay'
-	},
-	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',
-		authorDetail: '/orderauthor/author/detail',
-		authorDraft: '/orderauthor/author/draft',
-		transferDetail: '/orderauthor/transfer/detail',
-		trainferPackage: '/orderauthor/transfer/package',
-		createPackage: '/orderauthor/transfer/create'
-	},
-	script: {
-		prefix: '/script',
-		detail: '/script/detail',
-		display: '/script/display'
-	},
-	ibp: {
-		prefix: 'ibp',
-		draft: '/ibp/draft',
-		edit: 'ibp/edit'
-	},
-	trainingPlatform: {
-		trainingPlatform: '/trainingPlatform',
-		prodDetail: '/trainingPlatform/detail',
-		teachDetail: '/trainingPlatform/teach',
-		teachHome: '/trainingPlatform/teachHome',
-		examDetail: '/trainingPlatform/exam',
-		examHome: '/trainingPlatform/examHome',
-		examRuleManage: '/trainingPlatform/examRule/manage',
-		examRuleDraft: '/trainingPlatform/examRule/Draft',
-		course: '/trainingPlatform/course',
-		practical: '/trainingPlatform/practical',
-		permission: '/trainingPlatform/permission',
-		permissionDetails: '/trainingPlatform/permission/detail',
-		draft: '/trainingPlatform/draft',
-		pay: '/trainingPlatform/pay',
-		runPlan: '/trainingPlatform/runPlan/manage'
-	}
+    },
+    plan: {
+        prefix: '/plan',
+        tool: '/plan/tool',
+        usertool: '/plan/usertool',
+        detail: '/plan/detail',
+        pay: '/plan/pay'
+    },
+    design: {
+        prefix: '/design/home',
+        mapDraw: '/design/map/draw',
+        lessonEdit: '/design/lesson/edit',
+        lessonHome: '/design/lesson/home',
+        lessonManage: '/design/lesson/manage',
+        taskManage: '/design/lesson/taskManage',
+        trainingRule: '/design/lesson/trainingRule',
+        trainingRuleDetail: '/design/lesson/trainingRule/detail',
+        trainingManage: '/design/lesson/trainingManage',
+        lessonTraining: '/design/lesson/training',
+        trainingRecord: '/design/lesson/training',
+        runPlan: '/design/runPlan/detail',
+        scriptHome: '/design/script/home',
+        display: '/design/display',
+        mapPreview: '/design/mapPreview'
+    },
+    designUser: {
+        prefix: '/design/userlist/home',
+        scriptHome: '/design/userlist/script/home',
+        mapDraw: '/design/userlist/map/draw',
+        lessonHome: '/design/userlist/lesson/home',
+        runPlan: '/design/userlist/runPlan/detail'
+    },
+    replay: {
+        prefix: '/replay'
+    },
+    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',
+        authorDetail: '/orderauthor/author/detail',
+        authorDraft: '/orderauthor/author/draft',
+        transferDetail: '/orderauthor/transfer/detail',
+        trainferPackage: '/orderauthor/transfer/package',
+        createPackage: '/orderauthor/transfer/create'
+    },
+    script: {
+        prefix: '/script',
+        detail: '/script/detail',
+        display: '/script/display'
+    },
+    ibp: {
+        prefix: 'ibp',
+        draft: '/ibp/draft',
+        edit: 'ibp/edit'
+    },
+    trainingPlatform: {
+        trainingPlatform: '/trainingPlatform',
+        prodDetail: '/trainingPlatform/detail',
+        teachDetail: '/trainingPlatform/teach',
+        teachHome: '/trainingPlatform/teachHome',
+        examDetail: '/trainingPlatform/exam',
+        examHome: '/trainingPlatform/examHome',
+        examRuleManage: '/trainingPlatform/examRule/manage',
+        examRuleDraft: '/trainingPlatform/examRule/Draft',
+        course: '/trainingPlatform/course',
+        practical: '/trainingPlatform/practical',
+        permission: '/trainingPlatform/permission',
+        permissionDetails: '/trainingPlatform/permission/detail',
+        draft: '/trainingPlatform/draft',
+        pay: '/trainingPlatform/pay',
+        runPlan: '/trainingPlatform/runPlan/manage'
+    }
 };
 
 /**
@@ -267,806 +267,806 @@ export const UrlConfig = {
  * all roles can be accessed
  */
 export const constantRoutes = [
-	// 实训平台登录
-	{
-		path: '/login',
-		component: Login,
-		hidden: true
-	},
-	// 项目系统登录
-	{
-		path: '/xty/login',
-		component: Login,
-		hidden: true
-	},
-	// 设计平台登录
-	{
-		path: '/design/login',
-		component: Login,
-		hidden: true
-	},
-	{
-		path: '/design/jlmap3d/edit',
-		component: Jlmap3dedit,
-		hidden: true
-	},
-	{
-		path: '/401',
-		component: Error401,
-		hidden: true
-	},
+    // 实训平台登录
+    {
+        path: '/login',
+        component: Login,
+        hidden: true
+    },
+    // 项目系统登录
+    {
+        path: '/xty/login',
+        component: Login,
+        hidden: true
+    },
+    // 设计平台登录
+    {
+        path: '/design/login',
+        component: Login,
+        hidden: true
+    },
+    {
+        path: '/design/jlmap3d/edit',
+        component: Jlmap3dedit,
+        hidden: true
+    },
+    {
+        path: '/401',
+        component: Error401,
+        hidden: true
+    },
 
-	{
-		path: '/404',
-		component: Errpr404,
-		hidden: true
-	},
-	{ path: '*', redirect: '/404', hidden: true }
+    {
+        path: '/404',
+        component: Errpr404,
+        hidden: true
+    },
+    { path: '*', redirect: '/404', hidden: true }
 ];
 
 export const asyncRouter = [
-	{
-		path: '/design',
-		component: Layout,
-		redirect: '/design/home',
-		meta: {
-			roles: [admin, user, userDesign]
-		},
-		children: [
-			{
-				path: '',
-				redirect: '/design/home',
-				component: DesignPlatform,
-				meta: {
-					i18n: 'router.designhomePage',
-					icon: 'design'
-				},
-				children: [
-					{
-						path: 'home',
-						component: DesignPlatformHome,
-						meta: {
-						}
-					},
-					{
-						path: 'map/draw/:mapId/:view',
-						component: Mapedit,
-						hidden: true
-					},
-					{
-						path: 'lesson/edit/:type',
-						component: LessonEdit,
-						hidden: true
-					},
-					{
-						path: 'runPlan/detail/:mapId',
-						component: PlanMonitorDetail,
-						hidden: true
-					},
-					{
-						path: 'script/home/:mapId',
-						component: ScriptmanageHome,
-						meta: {
-							i18n: 'router.scriptManage'
-						},
-						hidden: true
-					},
-					{
-						path: 'lesson/home/:mapId/:skinCode',
-						component: LessonHome,
-						hidden: true
-					},
-					{
-						path: 'lesson/details',
-						component: LessonDetail,
-						hidden: true,
-						children: [
-							{
-								path: 'edit/:type',
-								component: LessonEdit,
-								hidden: true
-							}
-						]
-					},
-					{
-						path: 'lesson/training/:trainingId/:trainingName',
-						component: TrainingrecordManage,
-						hidden: true
-					},
-					{
-						path: 'lesson/taskManage',
-						component: Taskmanage,
-						hidden: true
-					},
-					{
-						path: 'lesson/trainingRule',
-						component: TrainingRuleList,
-						hidden: true
-					},
-					{
-						path: 'lesson/trainingRule/detail',
-						hidden: true,
-						component: TrainingRuleEdit
-					},
-					{
-						path: 'lesson/trainingManage/:skinCode',
-						component: Trainingmanage,
-						hidden: true
-					},
-					{
-						path: 'lesson/training/:trainingId/:trainingName',
-						component: TrainingrecordManage,
-						hidden: true
-					},
-					{
-						path: 'mapPreview/:mapId',
-						component: MapPreview,
-						hidden: true
+    {
+        path: '/design',
+        component: Layout,
+        redirect: '/design/home',
+        meta: {
+            roles: [admin, user, userDesign]
+        },
+        children: [
+            {
+                path: '',
+                redirect: '/design/home',
+                component: DesignPlatform,
+                meta: {
+                    i18n: 'router.designhomePage',
+                    icon: 'design'
+                },
+                children: [
+                    {
+                        path: 'home',
+                        component: DesignPlatformHome,
+                        meta: {
+                        }
+                    },
+                    {
+                        path: 'map/draw/:mapId/:view',
+                        component: Mapedit,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/edit/:type',
+                        component: LessonEdit,
+                        hidden: true
+                    },
+                    {
+                        path: 'runPlan/detail/:mapId',
+                        component: PlanMonitorDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'script/home/:mapId',
+                        component: ScriptmanageHome,
+                        meta: {
+                            i18n: 'router.scriptManage'
+                        },
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/home/:mapId/:skinCode',
+                        component: LessonHome,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/details',
+                        component: LessonDetail,
+                        hidden: true,
+                        children: [
+                            {
+                                path: 'edit/:type',
+                                component: LessonEdit,
+                                hidden: true
+                            }
+                        ]
+                    },
+                    {
+                        path: 'lesson/training/:trainingId/:trainingName',
+                        component: TrainingrecordManage,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/taskManage',
+                        component: Taskmanage,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/trainingRule',
+                        component: TrainingRuleList,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/trainingRule/detail',
+                        hidden: true,
+                        component: TrainingRuleEdit
+                    },
+                    {
+                        path: 'lesson/trainingManage/:skinCode',
+                        component: Trainingmanage,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/training/:trainingId/:trainingName',
+                        component: TrainingrecordManage,
+                        hidden: true
+                    },
+                    {
+                        path: 'mapPreview/:mapId',
+                        component: MapPreview,
+                        hidden: true
 
-					}
-				]
-			}
-		]
-	},
-	{
-		path: '/design/userlist',
-		redirect: '/design/userlist/home',
-		component: Layout,
-		meta: {
-			roles: [admin, user, userDesign]
-		},
-		children: [
-			{
-				path: '',
-				redirect: '/design/userlist/home',
-				component: DesignPlatformUser,
-				meta: {
-					i18n: 'router.designUserPage',
-					icon: 'design'
-				},
-				children: [
-					{
-						path: 'home',
-						component: DesignPlatformHome,
-						meta: {
-						}
-					},
-					{
-						path: 'map/draw/:mapId/:view',
-						component: Mapedit,
-						hidden: true
-					},
-					{
-						path: 'lesson/edit/:type',
-						component: LessonEdit,
-						hidden: true
-					},
-					{
-						path: 'runPlan/detail/:mapId',
-						component: PlanMonitorDetail,
-						hidden: true
-					},
-					{
-						path: 'script/home/:mapId',
-						component: ScriptmanageHome,
-						meta: {
-							i18n: 'router.scriptManage'
-						},
-						hidden: true
-					},
-					{
-						path: 'lesson/home/:mapId',
-						component: LessonHome,
-						hidden: true
-					},
-					{
-						path: 'lesson/training/:trainingId/:trainingName',
-						component: TrainingrecordManage,
-						hidden: true
-					}
-				]
-			}
-		]
-	},
-	{
-		path: '/display/:mode',
-		component: Display,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/design/display/:mode',
-		component: DesignDisplay,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/scriptDisplay/:mode',
-		component: ScriptDisplay,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/trainroom',
-		component: TrainRoom,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/jointTraining',
-		component: JointTraining,
-		hidden: true
-	},
-	{
-		path: '/jlmap3d',
-		component: Jlmap3d,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/map',
-		meta: {
-			i18n: 'router.mapManage',
-			roles: [admin, mapCreater, userDesign]
-		},
-		hidden: true,
-		component: Layout,
-		children: [
-			{
-				path: 'draw',
-				redirect: '/map/draw/0/draft',
-				component: Mapdraft,
-				meta: {
-					i18n: 'router.mapDraw'
-				},
-				children: [
-					{
-						path: ':mapId/:view',
-						component: Mapedit,
-						hidden: true
-					}
-				]
-			},
-			{
-				path: 'runPlan',
-				redirect: '/map/runPlan/view/draft',
-				component: Runplan,
-				meta: {
-					i18n: 'router.runPlanManage'
-				},
-				children: [{
-					path: 'view/:mode',
-					component: RunplanView,
-					hidden: true
-				}]
-			}
-		]
-	},
-	{
-		path: '/trainingPlatform',
-		component: Layout,
-		hidden: true,
-		meta: {
-			roles: [admin, userSimulation, user]
-		},
-		children: [
-			{
-				path: '',
-				redirect: '/trainingPlatform/permission/14',
-				component: TrainingPlatform,
-				meta: {
-				},
-				children: [
-					{
-						path: 'detail/:subSystem',
-						component: DemonstrationDetail,
-						hidden: true
-					},
-					{
-						path: 'teachHome/:subSystem',
-						component: TeachHome,
-						hidden: true
-					},
-					{
-						path: 'teach/:subSystem',
-						component: TeachDetail,
-						hidden: true
-					},
-					{
-						path: 'examHome/:subSystem',
-						component: ExamHome,
-						hidden: true
-					},
-					{
-						path: 'exam/:examId',
-						component: ExamDetail,
-						hidden: true
-					},
-					{
-						path: 'practical/:trainingId/:lessonId',
-						component: TeachPractical,
-						hidden: true
-					},
-					{
-						path: 'pay/:lessonId',
-						component: Pay,
-						hidden: true
-					},
-					{
-						path: 'course/:subSystem',
-						component: ExamCourseDetail,
-						hidden: true
-					},
-					{
-						path: 'result/:userExamId',
-						component: ExamResult,
-						hidden: true
-					},
-					{
-						path: 'permission/:mapId',
-						component: Package,
-						hidden: true
-					},
-					{
-						path: 'permission/detail/:id',
-						component: PackageDetail,
-						hidden: true
-					},
-					{
-						path: 'draft',
-						component: PackageDraft,
-						hidden: true
-					},
-					{
-						path: 'examRule/manage',
-						component: PublishExamRule,
-						hidden: true
-					},
-					{
-						path: 'examRule/draft/:mode/:ruleId/:lessonId',
-						component: PublishExamRuleDraft,
-						hidden: true
-					},
-					{
-						path: 'runPlan/manage/:mapId',
-						component: PlanMonitorDetail,
-						hidden: true
-					}
-				]
-			}
-		]
-	},
-	{
-		path: '/dp',
-		hidden: true,
-		redirect: '/dp/home',
-		component: ScreenMonitor,
-		meta: {
-			roles: [admin, userScreen, user]
-		},
-		children: [
-			{
-				path: 'home',
-				component: ScreenMonitorHome,
-				meta: {
-					i18n: 'router.dpSystem'
-				},
-				target: true
-			},
-			{
-				path: 'detail/:lessonId',
-				component: ScreenMonitorDetail,
-				hidden: true
-			},
-			{
-				path: 'pay/:lessonId',
-				component: Pay,
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/plan/usertool',
-		component: PlanMonitorEditUserTool,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/plan/tool',
-		component: PlanMonitorEditTool,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/plan',
-		redirect: '/plan/home',
-		component: PlanMonitor,
-		hidden: true,
-		meta: {
-			roles: [admin, user, userDesign]
-		},
-		children: [
-			{
-				path: 'home',
-				component: PlanMonitorHome,
-				meta: {
-					i18n: 'router.planSystem'
-				},
-				target: true
-			},
-			{
-				path: 'detail/:lessonId',
-				component: PlanMonitorDetail,
-				hidden: true
-			},
-			{
-				path: 'pay/:lessonId',
-				component: Pay,
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/replay',
-		component: Layout,
-		hidden: true,
-		meta: {
-			roles: [admin, userDesign]
-		},
-		children: [
-			{
-				path: 'manage',
-				component: Replay,
-				meta: {
-					i18n: 'router.replayManage'
-				}
-			}
-		]
-	},
-	{
-		path: '/publish',
-		component: Layout,
-		meta: {
-			i18n: 'router.pulishManage',
-			roles: [admin, userDesign]
-		},
-		children: [
-			{
-				path: 'map',
-				component: PublishMap,
-				meta: {
-					i18n: 'router.publishMapManage'
-				}
-			},
-			{
-				path: 'map/detail',
-				hidden: true,
-				component: PublishMapDetail
-			},
-			{
-				path: 'product',
-				component: ProductStatus,
-				meta: {
-					i18n: 'router.productStateManage'
-				}
-			},
-			{
-				path: 'lesson',
-				component: PublishLesson,
-				meta: {
-					i18n: 'router.publishLessonManage'
-				}
-			},
-			{
-				path: 'runPlan/template',
-				component: RunPlanTemplate,
-				meta: {
-					i18n: 'router.runPlanTemplateManage'
-				}
-			},
-			{
-				path: 'runPlan/common',
-				component: RunPlanCommon,
-				meta: {
-					i18n: 'router.runPlanCommonManage'
-				}
-			},
-			{
-				path: 'runPlan/everyDay',
-				component: RunPlanEveryDay,
-				meta: {
-					i18n: 'router.runPlanEveryDayManage'
-				}
-			},
-			{
-				path: 'examRule/manage',
-				component: PublishExamRule,
-				meta: {
-					i18n: 'router.examRuleManage'
-				}
-			},
-			{
-				path: 'map/draft/:mode/:mapId',
-				component: PublishMapDraft,
-				hidden: true
-			},
-			{
-				path: 'examRule/draft/:mode/:ruleId/:lessonId',
-				component: PublishExamRuleDraft,
-				hidden: true
-			},
-			{
-				path: 'runPlan/common/:mode',
-				component: RunPlanCommonDraft,
-				hidden: true
-			},
-			{
-				path: 'runPlan/view/:mode',
-				component: RunplanView,
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/orderauthor',
-		component: Layout,
-		meta: {
-			i18n: 'router.orderAuthorityManage',
-			roles: [admin, userDesign]
-		},
-		children: [
-			{
-				path: 'author/manage',
-				component: Author,
-				meta: {
-					i18n: 'router.authorityManage'
-				}
-			},
-			{
-				path: 'commodity/manage',
-				component: Commodity,
-				meta: {
-					i18n: 'router.commodityManage'
-				}
-			},
-			{
-				path: 'order/manage',
-				component: OrderList,
-				meta: {
-					i18n: 'router.orderManage'
-				}
-			},
-			{
-				path: 'transfer/manage',
-				component: Permission,
-				meta: {
-					i18n: 'router.authorityTransferManage'
-				}
-			},
-			{
-				path: 'rules/manage',
-				component: UserRules,
-				meta: {
-					i18n: 'router.userRulesManage'
-				}
-			},
-			{
-				path: 'rules/manage/detail/:id',
-				hidden: true,
-				component: UserRulesDetail,
-				meta: {
-					i18n: 'router.userRulesManage'
-				}
-			},
-			{
-				path: 'commodity/draft/:mode/:commodityId',
-				hidden: true,
-				component: CommodityDraft,
-				meta: {
-					i18n: 'router.addCommodity'
-				}
-			},
-			{
-				path: 'order/draft/:mode/:orderId',
-				hidden: true,
-				component: OrderDraft,
-				meta: {
-					i18n: 'router.addOrder'
-				}
-			},
-			{
-				path: 'author/manage/rules',
-				hidden: true,
-				component: AuthorDraft,
-				meta: {
-					i18n: 'router.addCoursePermissions'
-				}
-			},
-			{
-				path: 'transfer/detail/:permissionId',
-				component: PermissionDetail,
-				hidden: true
-			},
-			{
-				path: 'transfer/package',
-				component: PermissionDraft,
-				hidden: true
-			},
-			{
-				path: 'transfer/create',
-				component: PermissionCreate,
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/system',
-		component: Layout,
-		meta: {
-			i18n: 'router.systemManage',
-			roles: [admin, userDesign]
-		},
-		children: [
-			{
-				path: 'skinCode',
-				component: SkinCode,
-				meta: {
-					i18n: 'router.skinManage'
-				}
-			},
-			{
-				path: 'skinCode/draft/:mode/:skinCodeId',
-				hidden: true,
-				component: SkinCodeDraft
-			},
-			{
-				path: 'ibp/edit',
-				component: IbpEdit,
-				meta: {
-					i18n: 'router.ibpDraw'
-				}
-			},
-			{
-				path: 'dictionary',
-				component: Dictionary,
-				meta: {
-					i18n: 'router.dataDictionary'
-				}
-			},
-			{
-				path: 'dictionary/detail',
-				hidden: true,
-				component: DictionaryDetail,
-				meta: {
-					i18n: 'router.dataDictionaryDetails'
-				}
-			},
-			{
-				path: 'userManage',
-				component: UserControl,
-				meta: {
-					i18n: 'router.userManage'
-				}
-			},
-			{
-				path: 'cache',
-				component: CacheControl,
-				meta: {
-					i18n: 'router.cacheManage'
-				}
-			},
-			{
-				path: 'userTrainingManage',
-				component: UserTraining,
-				meta: {
-					i18n: 'router.userTrainingManage'
-				}
-			},
-			{
-				path: 'userExamManage',
-				component: UserExam,
-				meta: {
-					i18n: 'router.userExamManage'
-				}
-			},
-			{
-				path: 'userSimulationManage',
-				component: UserSimulation,
-				meta: {
-					i18n: 'router.userSimulationManage'
-				}
-			},
-			{
-				path: 'existingSimulation',
-				component: ExistingSimulation,
-				meta: {
-					i18n: 'router.existingSimulation'
-				}
-			},
-			{
-				path: 'systemGenerate',
-				component: SystemGenerate,
-				meta: {
-					i18n: 'router.subsystemGeneration'
-				}
-			},
-			{
-				path: 'product',
-				component: MapProduct,
-				meta: {
-					i18n: 'router.productEdit'
-				}
-			},
-			{
-				path: 'record',
-				redirect: 'record/training/0/null',
-				component: Trainingrecord,
-				meta: {
-					i18n: 'router.trainingRecord'
-				},
-				hidden: !isDev,
-				children: [
-					{
-						path: 'training/:trainingId/:trainingName',
-						component: TrainingrecordManage,
-						hidden: true
-					}
-				]
-			}
-		]
-	},
-	{
-		path: '/apply',
-		component: Layout,
-		meta: {
-			i18n: 'router.releaseApplication',
-			roles: [admin, userDesign]
-		},
-		children: [
-			{
-				path: 'lesson',
-				component: LessonApproval,
-				meta: {
-					i18n: 'router.courseApplication'
-				}
-			},
-			{
-				path: 'script',
-				component: ScriptApproval,
-				meta: {
-					i18n: 'router.scriptReleaseApplication'
-				}
-			},
-			{
-				path: 'runGraph',
-				component: RunPlanApproval,
-				meta: {
-					i18n: 'router.runGraphReleaseApplication'
-				}
-			}
-		]
-	}
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        path: '/design/userlist',
+        redirect: '/design/userlist/home',
+        component: Layout,
+        meta: {
+            roles: [admin, user, userDesign]
+        },
+        children: [
+            {
+                path: '',
+                redirect: '/design/userlist/home',
+                component: DesignPlatformUser,
+                meta: {
+                    i18n: 'router.designUserPage',
+                    icon: 'design'
+                },
+                children: [
+                    {
+                        path: 'home',
+                        component: DesignPlatformHome,
+                        meta: {
+                        }
+                    },
+                    {
+                        path: 'map/draw/:mapId/:view',
+                        component: Mapedit,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/edit/:type',
+                        component: LessonEdit,
+                        hidden: true
+                    },
+                    {
+                        path: 'runPlan/detail/:mapId',
+                        component: PlanMonitorDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'script/home/:mapId',
+                        component: ScriptmanageHome,
+                        meta: {
+                            i18n: 'router.scriptManage'
+                        },
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/home/:mapId',
+                        component: LessonHome,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/training/:trainingId/:trainingName',
+                        component: TrainingrecordManage,
+                        hidden: true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        path: '/display/:mode',
+        component: Display,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/design/display/:mode',
+        component: DesignDisplay,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/scriptDisplay/:mode',
+        component: ScriptDisplay,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/trainroom',
+        component: TrainRoom,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/jointTraining',
+        component: JointTraining,
+        hidden: true
+    },
+    {
+        path: '/jlmap3d',
+        component: Jlmap3d,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/map',
+        meta: {
+            i18n: 'router.mapManage',
+            roles: [admin, mapCreater, userDesign]
+        },
+        hidden: true,
+        component: Layout,
+        children: [
+            {
+                path: 'draw',
+                redirect: '/map/draw/0/draft',
+                component: Mapdraft,
+                meta: {
+                    i18n: 'router.mapDraw'
+                },
+                children: [
+                    {
+                        path: ':mapId/:view',
+                        component: Mapedit,
+                        hidden: true
+                    }
+                ]
+            },
+            {
+                path: 'runPlan',
+                redirect: '/map/runPlan/view/draft',
+                component: Runplan,
+                meta: {
+                    i18n: 'router.runPlanManage'
+                },
+                children: [{
+                    path: 'view/:mode',
+                    component: RunplanView,
+                    hidden: true
+                }]
+            }
+        ]
+    },
+    {
+        path: '/trainingPlatform',
+        component: Layout,
+        hidden: true,
+        meta: {
+            roles: [admin, userSimulation, user]
+        },
+        children: [
+            {
+                path: '',
+                redirect: '/trainingPlatform/permission/14',
+                component: TrainingPlatform,
+                meta: {
+                },
+                children: [
+                    {
+                        path: 'detail/:subSystem',
+                        component: DemonstrationDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'teachHome/:subSystem',
+                        component: TeachHome,
+                        hidden: true
+                    },
+                    {
+                        path: 'teach/:subSystem',
+                        component: TeachDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'examHome/:subSystem',
+                        component: ExamHome,
+                        hidden: true
+                    },
+                    {
+                        path: 'exam/:examId',
+                        component: ExamDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'practical/:trainingId/:lessonId',
+                        component: TeachPractical,
+                        hidden: true
+                    },
+                    {
+                        path: 'pay/:lessonId',
+                        component: Pay,
+                        hidden: true
+                    },
+                    {
+                        path: 'course/:subSystem',
+                        component: ExamCourseDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'result/:userExamId',
+                        component: ExamResult,
+                        hidden: true
+                    },
+                    {
+                        path: 'permission/:mapId',
+                        component: Package,
+                        hidden: true
+                    },
+                    {
+                        path: 'permission/detail/:id',
+                        component: PackageDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'draft',
+                        component: PackageDraft,
+                        hidden: true
+                    },
+                    {
+                        path: 'examRule/manage',
+                        component: PublishExamRule,
+                        hidden: true
+                    },
+                    {
+                        path: 'examRule/draft/:mode/:ruleId/:lessonId',
+                        component: PublishExamRuleDraft,
+                        hidden: true
+                    },
+                    {
+                        path: 'runPlan/manage/:mapId',
+                        component: PlanMonitorDetail,
+                        hidden: true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        path: '/dp',
+        hidden: true,
+        redirect: '/dp/home',
+        component: ScreenMonitor,
+        meta: {
+            roles: [admin, userScreen, user]
+        },
+        children: [
+            {
+                path: 'home',
+                component: ScreenMonitorHome,
+                meta: {
+                    i18n: 'router.dpSystem'
+                },
+                target: true
+            },
+            {
+                path: 'detail/:lessonId',
+                component: ScreenMonitorDetail,
+                hidden: true
+            },
+            {
+                path: 'pay/:lessonId',
+                component: Pay,
+                hidden: true
+            }
+        ]
+    },
+    {
+        path: '/plan/usertool',
+        component: PlanMonitorEditUserTool,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/plan/tool',
+        component: PlanMonitorEditTool,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/plan',
+        redirect: '/plan/home',
+        component: PlanMonitor,
+        hidden: true,
+        meta: {
+            roles: [admin, user, userDesign]
+        },
+        children: [
+            {
+                path: 'home',
+                component: PlanMonitorHome,
+                meta: {
+                    i18n: 'router.planSystem'
+                },
+                target: true
+            },
+            {
+                path: 'detail/:lessonId',
+                component: PlanMonitorDetail,
+                hidden: true
+            },
+            {
+                path: 'pay/:lessonId',
+                component: Pay,
+                hidden: true
+            }
+        ]
+    },
+    {
+        path: '/replay',
+        component: Layout,
+        hidden: true,
+        meta: {
+            roles: [admin, userDesign]
+        },
+        children: [
+            {
+                path: 'manage',
+                component: Replay,
+                meta: {
+                    i18n: 'router.replayManage'
+                }
+            }
+        ]
+    },
+    {
+        path: '/publish',
+        component: Layout,
+        meta: {
+            i18n: 'router.pulishManage',
+            roles: [admin, userDesign]
+        },
+        children: [
+            {
+                path: 'map',
+                component: PublishMap,
+                meta: {
+                    i18n: 'router.publishMapManage'
+                }
+            },
+            {
+                path: 'map/detail',
+                hidden: true,
+                component: PublishMapDetail
+            },
+            {
+                path: 'product',
+                component: ProductStatus,
+                meta: {
+                    i18n: 'router.productStateManage'
+                }
+            },
+            {
+                path: 'lesson',
+                component: PublishLesson,
+                meta: {
+                    i18n: 'router.publishLessonManage'
+                }
+            },
+            {
+                path: 'runPlan/template',
+                component: RunPlanTemplate,
+                meta: {
+                    i18n: 'router.runPlanTemplateManage'
+                }
+            },
+            {
+                path: 'runPlan/common',
+                component: RunPlanCommon,
+                meta: {
+                    i18n: 'router.runPlanCommonManage'
+                }
+            },
+            {
+                path: 'runPlan/everyDay',
+                component: RunPlanEveryDay,
+                meta: {
+                    i18n: 'router.runPlanEveryDayManage'
+                }
+            },
+            {
+                path: 'examRule/manage',
+                component: PublishExamRule,
+                meta: {
+                    i18n: 'router.examRuleManage'
+                }
+            },
+            {
+                path: 'map/draft/:mode/:mapId',
+                component: PublishMapDraft,
+                hidden: true
+            },
+            {
+                path: 'examRule/draft/:mode/:ruleId/:lessonId',
+                component: PublishExamRuleDraft,
+                hidden: true
+            },
+            {
+                path: 'runPlan/common/:mode',
+                component: RunPlanCommonDraft,
+                hidden: true
+            },
+            {
+                path: 'runPlan/view/:mode',
+                component: RunplanView,
+                hidden: true
+            }
+        ]
+    },
+    {
+        path: '/orderauthor',
+        component: Layout,
+        meta: {
+            i18n: 'router.orderAuthorityManage',
+            roles: [admin, userDesign]
+        },
+        children: [
+            {
+                path: 'author/manage',
+                component: Author,
+                meta: {
+                    i18n: 'router.authorityManage'
+                }
+            },
+            {
+                path: 'commodity/manage',
+                component: Commodity,
+                meta: {
+                    i18n: 'router.commodityManage'
+                }
+            },
+            {
+                path: 'order/manage',
+                component: OrderList,
+                meta: {
+                    i18n: 'router.orderManage'
+                }
+            },
+            {
+                path: 'transfer/manage',
+                component: Permission,
+                meta: {
+                    i18n: 'router.authorityTransferManage'
+                }
+            },
+            {
+                path: 'rules/manage',
+                component: UserRules,
+                meta: {
+                    i18n: 'router.userRulesManage'
+                }
+            },
+            {
+                path: 'rules/manage/detail/:id',
+                hidden: true,
+                component: UserRulesDetail,
+                meta: {
+                    i18n: 'router.userRulesManage'
+                }
+            },
+            {
+                path: 'commodity/draft/:mode/:commodityId',
+                hidden: true,
+                component: CommodityDraft,
+                meta: {
+                    i18n: 'router.addCommodity'
+                }
+            },
+            {
+                path: 'order/draft/:mode/:orderId',
+                hidden: true,
+                component: OrderDraft,
+                meta: {
+                    i18n: 'router.addOrder'
+                }
+            },
+            {
+                path: 'author/manage/rules',
+                hidden: true,
+                component: AuthorDraft,
+                meta: {
+                    i18n: 'router.addCoursePermissions'
+                }
+            },
+            {
+                path: 'transfer/detail/:permissionId',
+                component: PermissionDetail,
+                hidden: true
+            },
+            {
+                path: 'transfer/package',
+                component: PermissionDraft,
+                hidden: true
+            },
+            {
+                path: 'transfer/create',
+                component: PermissionCreate,
+                hidden: true
+            }
+        ]
+    },
+    {
+        path: '/system',
+        component: Layout,
+        meta: {
+            i18n: 'router.systemManage',
+            roles: [admin, userDesign]
+        },
+        children: [
+            {
+                path: 'skinCode',
+                component: SkinCode,
+                meta: {
+                    i18n: 'router.skinManage'
+                }
+            },
+            {
+                path: 'skinCode/draft/:mode/:skinCodeId',
+                hidden: true,
+                component: SkinCodeDraft
+            },
+            {
+                path: 'ibp/edit',
+                component: IbpEdit,
+                meta: {
+                    i18n: 'router.ibpDraw'
+                }
+            },
+            {
+                path: 'dictionary',
+                component: Dictionary,
+                meta: {
+                    i18n: 'router.dataDictionary'
+                }
+            },
+            {
+                path: 'dictionary/detail',
+                hidden: true,
+                component: DictionaryDetail,
+                meta: {
+                    i18n: 'router.dataDictionaryDetails'
+                }
+            },
+            {
+                path: 'userManage',
+                component: UserControl,
+                meta: {
+                    i18n: 'router.userManage'
+                }
+            },
+            {
+                path: 'cache',
+                component: CacheControl,
+                meta: {
+                    i18n: 'router.cacheManage'
+                }
+            },
+            {
+                path: 'userTrainingManage',
+                component: UserTraining,
+                meta: {
+                    i18n: 'router.userTrainingManage'
+                }
+            },
+            {
+                path: 'userExamManage',
+                component: UserExam,
+                meta: {
+                    i18n: 'router.userExamManage'
+                }
+            },
+            {
+                path: 'userSimulationManage',
+                component: UserSimulation,
+                meta: {
+                    i18n: 'router.userSimulationManage'
+                }
+            },
+            {
+                path: 'existingSimulation',
+                component: ExistingSimulation,
+                meta: {
+                    i18n: 'router.existingSimulation'
+                }
+            },
+            {
+                path: 'systemGenerate',
+                component: SystemGenerate,
+                meta: {
+                    i18n: 'router.subsystemGeneration'
+                }
+            },
+            {
+                path: 'product',
+                component: MapProduct,
+                meta: {
+                    i18n: 'router.productEdit'
+                }
+            },
+            {
+                path: 'record',
+                redirect: 'record/training/0/null',
+                component: Trainingrecord,
+                meta: {
+                    i18n: 'router.trainingRecord'
+                },
+                hidden: !isDev,
+                children: [
+                    {
+                        path: 'training/:trainingId/:trainingName',
+                        component: TrainingrecordManage,
+                        hidden: true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        path: '/apply',
+        component: Layout,
+        meta: {
+            i18n: 'router.releaseApplication',
+            roles: [admin, userDesign]
+        },
+        children: [
+            {
+                path: 'lesson',
+                component: LessonApproval,
+                meta: {
+                    i18n: 'router.courseApplication'
+                }
+            },
+            {
+                path: 'script',
+                component: ScriptApproval,
+                meta: {
+                    i18n: 'router.scriptReleaseApplication'
+                }
+            },
+            {
+                path: 'runGraph',
+                component: RunPlanApproval,
+                meta: {
+                    i18n: 'router.runGraphReleaseApplication'
+                }
+            }
+        ]
+    }
 ];
 
 const createRouter = () => new Router({
-	mode: 'history', // require service support
-	scrollBehavior: () => ({ y: 0 }),
-	routes: constantRoutes
+    mode: 'history', // require service support
+    scrollBehavior: () => ({ y: 0 }),
+    routes: constantRoutes
 });
 
 const router = createRouter();
 
 router.beforeEach((to, from, next) => {
-	const project = getSessionStorage('project');
-	document.title = loginTitle[project||'login'];
-	next();
+    const project = getSessionStorage('project');
+    document.title = loginTitle[project || 'login'];
+    next();
 });
 
 export default router;
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index f997f31f4..cbc51f6c4 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -1,14 +1,14 @@
 
 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 = 'http://192.168.3.6:9000'; // 旭强
-		// BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
-	} else {
-		BASE_API = process.env.VUE_APP_BASE_API;
-	}
-	return 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:9000'; // 袁琪
+        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        // BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
+    } else {
+        BASE_API = process.env.VUE_APP_BASE_API;
+    }
+    return BASE_API;
 }
diff --git a/src/views/lesson/details.vue b/src/views/lesson/details.vue
index 2c381e182..1e8e9e2b5 100644
--- a/src/views/lesson/details.vue
+++ b/src/views/lesson/details.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card>
+  <el-card style="height: 100%; overflow-y: auto;">
     <div slot="header" style="text-align: center;">
       <b>{{ $t('lesson.courseName') + ':  '+ name }}</b>
     </div>
@@ -38,98 +38,98 @@ import { getLessonTree } from '@/api/jmap/lessondraft';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import OperateMenu from './operateMenu';
 export default {
-	name: 'LessonDetail',
-	components: {
-		OperateMenu
-	},
-	data() {
-		return {
-			treeList: [],
-			defaultProps: {
-				children: 'children',
-				label: 'name'
-			},
-			name: '',
-			lessonId: '',
-			expandList: [],
-			point: {
-				x: 0,
-				y: 0
-			},
-			node: {
-			}
-		};
-	},
-	computed: {
-		width() {
-			return this.$store.state.app.width - 481 - this.widthLeft;
-		},
-		height() {
-			return this.$store.state.app.height - 120;
-		}
-	},
-	mounted() {
-		this.initPageData();
-	},
-	methods: {
-		initPageData() {
-			getLessonTree(this.$route.query.lessonId || this.$route.query.id).then(resp => {
-				if (resp.data && resp.data[0]) {
-					this.name = resp.data[0].name;
-					this.lessonId = resp.data[0].id;
-					this.treeList = resp.data;
-				}
-				this.editLesson();
-			});
+    name: 'LessonDetail',
+    components: {
+        OperateMenu
+    },
+    data() {
+        return {
+            treeList: [],
+            defaultProps: {
+                children: 'children',
+                label: 'name'
+            },
+            name: '',
+            lessonId: '',
+            expandList: [],
+            point: {
+                x: 0,
+                y: 0
+            },
+            node: {
+            }
+        };
+    },
+    computed: {
+        width() {
+            return this.$store.state.app.width - 481 - this.widthLeft;
+        },
+        height() {
+            return this.$store.state.app.height - 120;
+        }
+    },
+    mounted() {
+        this.initPageData();
+    },
+    methods: {
+        initPageData() {
+            getLessonTree(this.$route.query.lessonId || this.$route.query.id).then(resp => {
+                if (resp.data && resp.data[0]) {
+                    this.name = resp.data[0].name;
+                    this.lessonId = resp.data[0].id;
+                    this.treeList = resp.data;
+                }
+                this.editLesson();
+            });
 
-		},
-		clickEvent(obj, node, ele) {
-		},
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		editLesson() {
-			this.$router.push( {path: `/design/lesson/details/edit/lessonEdit`, query: {id: this.lessonId, skinCode: this.$route.query.skinCode, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId}} );
-		},
-		createChapte(node) {
-			this.$router.push({path: `/design/lesson/details/edit/chapterCreate`, query: {id: node.data.id, lessonId: this.lessonId, skinCode: this.$route.query.skinCode, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId}});
-		},
-		updateChapte(node) {
-			this.$router.push( {path: `/design/lesson/details/edit/chapterEdit`, query: {id: node.data.id, skinCode: this.$route.query.skinCode, lessonId: this.lessonId, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId}});
-		},
-		showContextMenu(e, obj, node, vueElem) {
-			if (obj && obj.type === 'Lesson' || obj.type === 'Chapter') {
-				e.preventDefault();
-				this.point = {
-					x: e.clientX,
-					y: e.clientY
-				};
-				this.node = node;
-				const menu = DeviceMenu.Lesson;
-				this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
-			}
-		},
-		changeRouter(params) {
-			switch (params.event) {
-			case '01':
-				this.editLesson();
-				break;
-			case '02':
-				this.createChapte(params.node);
-				break;
-			case '03':
-				this.updateChapte(params.node);
-				break;
-			case '04':
-				this.createChapte(params.node);
-				break;
-			}
-		},
-		refresh() {
-			this.initPageData();
-		}
-	}
+        },
+        clickEvent(obj, node, ele) {
+        },
+        filterNode(value, data) {
+            if (!value) return true;
+            return data.name.indexOf(value) !== -1;
+        },
+        editLesson() {
+            this.$router.push( {path: `/design/lesson/details/edit/lessonEdit`, query: {id: this.lessonId, skinCode: this.$route.query.skinCode, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId}} );
+        },
+        createChapte(node) {
+            this.$router.push({path: `/design/lesson/details/edit/chapterCreate`, query: {id: node.data.id, lessonId: this.lessonId, skinCode: this.$route.query.skinCode, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId}});
+        },
+        updateChapte(node) {
+            this.$router.push( {path: `/design/lesson/details/edit/chapterEdit`, query: {id: node.data.id, skinCode: this.$route.query.skinCode, lessonId: this.lessonId, cityCode: this.$route.query.cityCode, mapId: this.$route.query.mapId}});
+        },
+        showContextMenu(e, obj, node, vueElem) {
+            if (obj && obj.type === 'Lesson' || obj.type === 'Chapter') {
+                e.preventDefault();
+                this.point = {
+                    x: e.clientX,
+                    y: e.clientY
+                };
+                this.node = node;
+                const menu = DeviceMenu.Lesson;
+                this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
+            }
+        },
+        changeRouter(params) {
+            switch (params.event) {
+            case '01':
+                this.editLesson();
+                break;
+            case '02':
+                this.createChapte(params.node);
+                break;
+            case '03':
+                this.updateChapte(params.node);
+                break;
+            case '04':
+                this.createChapte(params.node);
+                break;
+            }
+        },
+        refresh() {
+            this.initPageData();
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/lesson/trainingRule/addBatch.vue b/src/views/lesson/trainingRule/addBatch.vue
index 7021d52f8..59ab132ed 100644
--- a/src/views/lesson/trainingRule/addBatch.vue
+++ b/src/views/lesson/trainingRule/addBatch.vue
@@ -1,5 +1,12 @@
 <template>
-  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="25%" :before-close="handleClose" center>
+  <el-dialog
+    v-dialogDrag
+    :title="title"
+    :visible.sync="dialogVisible"
+    width="25%"
+    :before-close="handleClose"
+    center
+  >
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
@@ -14,102 +21,126 @@ import { OperationList } from '@/scripts/OperationConfig';
 import { getSkinCodeList } from '@/api/management/mapskin';
 
 export default {
-	name: 'AddBatch',
-	data() {
-		return {
-			loading: false,
-			dialogVisible: false,
-			formModel: {
-				skinCode: this.$route.query.skinCode
-			},
-			skinCodeList: [],
-			isShow: false
-		};
-	},
-	computed: {
-		form() {
-			this.type === 'ADD';
-			const form = {
-				labelWidth: '120px',
-				items: [
-					{ prop: 'skinCode', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList, disabled: true }
-				]
-			};
-			return form;
-		},
-		rules() {
-			const crules = {
-				skinCode: [
-					{ required: true, message: this.$t('rules.inputSkinType'), trigger: 'change' }
-				]
-			};
-			return crules;
-		},
-		title() {
-			return this.$t('lesson.generationOperation');
-		}
-	},
-	mounted() {
-		this.init();
-	},
-	methods: {
-		init() {
-			// 获取皮肤列表
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data.map(item => {
-					const params = {};
-					params.label = item.name;
-					params.value = item.code;
-					return params;
-				});
-			});
-		},
-		show(total) {
-			if (total) {
-				this.isShow = true;
-			}
-
-			this.loading = false;
-			this.dialogVisible = true;
-		},
-		doSave() {
-			const self = this;
-			this.$refs.dataform.validateForm(() => {
-				if (this.isShow) {
-					this.$confirm(this.$t('lesson.wellClearOperate'), this.$t('global.tips'), {
-						confirmButtonText: this.$t('global.confirm'),
-						cancelButtonText: this.$t('global.cancel'),
-						type: 'warning'
-					}).then(() => {
-						self.create();
-					}).catch(() => { });
-				} else {
-					self.create();
-				}
-			});
-		},
-		create() {
-			const self = this;
-			this.loading = true;
-			addTrainingRulesList(this.formModel.skinCode, OperationList[this.formModel.skinCode].list).then(response => {
-				self.loading = false;
-				self.$message.success(this.$t('lesson.batchCreateSuccess'));
-				self.handleClose();
-				self.$emit('reloadTable'); // 刷新列表
-			}).catch(error => {
-				self.loading = false;
-				self.$message.error(`${this.$('error.batchCreateFailed')}:${error.message}`);
-			});
-		},
-		handleClose() {
-			this.formModel = {
+    name: 'AddBatch',
+    data() {
+        return {
+            loading: false,
+            dialogVisible: false,
+            formModel: {
                 skinCode: this.$route.query.skinCode
-			};
-			this.$refs.dataform.resetForm();
-			this.isShow = false;
-			this.dialogVisible = false;
-		}
-	}
+            },
+            skinCodeList: [],
+            isShow: false
+        };
+    },
+    computed: {
+        form() {
+            this.type === 'ADD';
+            const form = {
+                labelWidth: '120px',
+                items: [
+                    {
+                        prop: 'skinCode',
+                        label: this.$t('lesson.skinType'),
+                        type: 'select',
+                        required: true,
+                        options: this.skinCodeList,
+                        disabled: true
+                    }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                skinCode: [
+                    {
+                        required: true,
+                        message: this.$t('rules.inputSkinType'),
+                        trigger: 'change'
+                    }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return this.$t('lesson.generationOperation');
+        }
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            // 获取皮肤列表
+            this.skinCodeList = [];
+            getSkinCodeList().then(response => {
+                this.skinCodeList = response.data.map(item => {
+                    const params = {};
+                    params.label = item.name;
+                    params.value = item.code;
+                    return params;
+                });
+            });
+        },
+        show(total) {
+            if (total) {
+                this.isShow = true;
+            }
+
+            this.loading = false;
+            this.dialogVisible = true;
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                if (this.isShow) {
+                    this.$confirm(
+                        this.$t('lesson.wellClearOperate'),
+                        this.$t('global.tips'),
+                        {
+                            confirmButtonText: this.$t('global.confirm'),
+                            cancelButtonText: this.$t('global.cancel'),
+                            type: 'warning'
+                        }
+                    )
+                        .then(() => {
+                            self.create();
+                        })
+                        .catch(() => {});
+                } else {
+                    self.create();
+                }
+            });
+        },
+        create() {
+            const self = this;
+            this.loading = true;
+            addTrainingRulesList(
+                this.formModel.skinCode,
+                OperationList[this.formModel.skinCode].list
+            )
+                .then(response => {
+                    self.loading = false;
+                    self.$message.success(this.$t('lesson.batchCreateSuccess'));
+                    self.handleClose();
+                    self.$emit('reloadTable'); // 刷新列表
+                })
+                .catch(error => {
+                    self.loading = false;
+                    self.$message.error(
+                        `${this.$('error.batchCreateFailed')}:${error.message}`
+                    );
+                });
+        },
+        handleClose() {
+            this.formModel = {
+                skinCode: this.$route.query.skinCode
+            };
+            this.$refs.dataform.resetForm();
+            this.isShow = false;
+            this.dialogVisible = false;
+        }
+    }
 };
 </script>
diff --git a/src/views/lesson/trainingRule/addEdit.vue b/src/views/lesson/trainingRule/addEdit.vue
index a108b400c..d49288aa7 100644
--- a/src/views/lesson/trainingRule/addEdit.vue
+++ b/src/views/lesson/trainingRule/addEdit.vue
@@ -13,289 +13,289 @@ import { postTrainingRulesData, putTrainingRulesData, getPlaceholderList } from
 import { getSkinCodeList } from '@/api/management/mapskin';
 
 export default {
-	name: 'TrainingEdit',
-	props: {
-		type: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			loading: false,
-			dialogVisible: false,
-			formModel: {
-				trainingName: '',
-				trainingType: '',
-				operateType: '',
-				skinCode: '',
-				minDuration: '',
-				maxDuration: '',
-				trainingRemark: '',
-				productTypes: []
-			},
-			skinCodeList: [],
-			trainingTypeList: [],
-			trainingOperateTypeMap: {},
-			placeholderList: []
-		};
-	},
-	computed: {
-		form() {
-			const isAdd = this.type === 'ADD';
-			const form = {
-				labelWidth: '120px',
-				items: [
-					{ prop: 'skinCode', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList, disabled: true },
-					{ prop: 'trainingType', label: this.$t('lesson.trainingType'), type: 'select', required: true, options: this.trainingTypeList, disabled: !isAdd, change: true, onChange: this.changeList },
-					{ prop: 'operateType', label: this.$t('lesson.operationType'), type: 'select', required: true, options: this.trainingOperateTypeMap[this.formModel.trainingType], disabled: !isAdd },
-					{ label: '', type: 'button', options: this.placeholderList, style: 'margin-bottom: 0; margin-top: -10px;', typeBtn: 'info', click: this.addTrainName },
-					{ prop: 'trainingName', label: this.$t('lesson.trainingName'), type: 'text', required: true, rightWidth: true, tooltip: true, info: this.$t('lesson.tipNamePlaceholderInfo') },
-					{ prop: 'minDuration', label: this.$t('lesson.minDuration'), type: 'text', required: true },
-					{ prop: 'maxDuration', label: this.$t('lesson.maxDuration'), type: 'text', required: true },
-					{ label: '', type: 'button', options: this.placeholderList, style: 'margin-bottom: 0; margin-top: -10px;', typeBtn: 'info', click: this.addTrainRemark },
-					{ prop: 'trainingRemark', label: this.$t('lesson.trainingRemark'), type: 'textarea', required: true, tooltip: true, info: this.$t('lesson.tipExplainPlaceholderInfo') }
-				]
-			};
-			return form;
-		},
-		rules() {
-			const crules = {
-				trainingName: [
-					{ required: true, message: this.$t('rules.inputTrainingName'), trigger: 'blur' }
-				],
-				trainingType: [
-					{ required: true, message: this.$t('rules.inputTrainingType'), trigger: 'change' }
-				],
-				operateType: [
-					{ required: true, message: this.$t('rules.inputOperationType'), trigger: 'change' }
-				],
-				skinCode: [
-					{ required: true, message: this.$t('rules.inputSkinType'), trigger: 'change' }
-				],
-				minDuration: [
-					{ required: true, message: this.$t('rules.inputMinDuration'), trigger: 'blur' }
-				],
-				maxDuration: [
-					{ required: true, message: this.$t('rules.inputMaxDuration'), trigger: 'blur' }
-				],
-				trainingRemark: [
-					{ required: true, max: 500, message: this.$t('rules.inputTrainingRemark'), trigger: 'blur' }
-				]
-			};
-			return crules;
-		},
-		title() {
-			if (this.type === 'ADD') {
-				return this.$t('lesson.createOperateRule');
-			} else {
-				return this.$t('lesson.editOperateRule');
-			}
-		}
-	},
-	mounted() {
-		this.init();
-	},
-	methods: {
-		init() {
-			// 获取皮肤列表
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data.map(item => {
-					const params = {};
-					params.label = item.name;
-					params.value = item.code;
-					return params;
-				});
-			});
-
-			// 获取实训类型
-			this.trainingTypeList = [];
-			this.$Dictionary.trainingType().then(list => {
-				this.trainingTypeList = list.map(item => {
-					const params = {};
-					params.label = item.name;
-					params.value = item.code;
-					return params;
-				});
-			});
-			// 获取实训操作类型
-			this.trainingOperateTypeMap = {};
-			this.$Dictionary.stationControl().then(list => {
-				this.trainingOperateTypeMap['01'] = list.map(item => {
-					const params = {};
-					params.label = item.name;
-					params.value = item.code;
-					return params;
-				}); // 控制权实训
-			});
-			this.$Dictionary.signalOperation().then(list => {
-				this.trainingOperateTypeMap['02'] = list.map(item => {
-					const params = {};
-					params.label = item.name;
-					params.value = item.code;
-					return params;
-				}); // 信号机实训
-			});
-			this.$Dictionary.switchOperation().then(list => {
-				this.trainingOperateTypeMap['03'] = list.map(item => {
-					const params = {};
-					params.label = item.name;
-					params.value = item.code;
-					return params;
-				}); // 道岔实训
-			});
-			this.$Dictionary.sectionOperation().then(list => {
-				this.trainingOperateTypeMap['04'] = list.map(item => {
-					const params = {};
-					params.label = item.name;
-					params.value = item.code;
-					return params;
-				}); // 区段实训
-			});
-			this.$Dictionary.stationStandOperation().then(list => {
-				this.trainingOperateTypeMap['05'] = list.map(item => {
-					const params = {};
-					params.label = item.name;
-					params.value = item.code;
-					return params;
-				}); // 站台实训
-			});
-			this.$Dictionary.trainPlanOperation().then(list => {
-				this.trainingOperateTypeMap['06'] = list.map(item => {
-					const params = {};
-					params.label = item.name;
-					params.value = item.code;
-					return params;
-				}); // 行车计划实训
-			});
-			this.$Dictionary.trainOperation().then(list => {
-				this.trainingOperateTypeMap['07'] = list.map(item => {
-					const params = {};
-					params.label = item.name;
-					params.value = item.code;
-					return params;
-				}); // 列车实训
-			});
-
-		},
-		async show(data) {
-			this.loading = false;
-			this.dialogVisible = true;
-			if (data && data.id) {
-				// 获取操作占位列表
-				const res = await getPlaceholderList({ trainingType: data.trainingType, skinCode: data.skinCode });
-				this.placeholderList = res.data;
-				this.formModel = {
-					id: data.id,
-					trainingName: this.repliceName(data.trainingName, this.placeholderList),
-					trainingType: data.trainingType,
-					operateType: data.operateType,
-					productTypes: data.productTypes,
-					skinCode: data.skinCode,
-					minDuration: data.minDuration,
-					maxDuration: data.maxDuration,
-					trainingRemark: this.repliceName(data.trainingRemark, this.placeholderList)
-				};
-			}else {
-			    this.formModel = {
-			        skinCode: this.$route.query.skinCode
-                }
+    name: 'TrainingEdit',
+    props: {
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            loading: false,
+            dialogVisible: false,
+            formModel: {
+                trainingName: '',
+                trainingType: '',
+                operateType: '',
+                skinCode: '',
+                minDuration: '',
+                maxDuration: '',
+                trainingRemark: '',
+                productTypes: []
+            },
+            skinCodeList: [],
+            trainingTypeList: [],
+            trainingOperateTypeMap: {},
+            placeholderList: []
+        };
+    },
+    computed: {
+        form() {
+            const isAdd = this.type === 'ADD';
+            const form = {
+                labelWidth: '120px',
+                items: [
+                    { prop: 'skinCode', label: this.$t('lesson.skinType'), type: 'select', required: true, options: this.skinCodeList, disabled: true },
+                    { prop: 'trainingType', label: this.$t('lesson.trainingType'), type: 'select', required: true, options: this.trainingTypeList, disabled: !isAdd, change: true, onChange: this.changeList },
+                    { prop: 'operateType', label: this.$t('lesson.operationType'), type: 'select', required: true, options: this.trainingOperateTypeMap[this.formModel.trainingType], disabled: !isAdd },
+                    { label: '', type: 'button', options: this.placeholderList, style: 'margin-bottom: 0; margin-top: -10px;', typeBtn: 'info', click: this.addTrainName },
+                    { prop: 'trainingName', label: this.$t('lesson.trainingName'), type: 'text', required: true, rightWidth: true, tooltip: true, info: this.$t('lesson.tipNamePlaceholderInfo') },
+                    { prop: 'minDuration', label: this.$t('lesson.minDuration'), type: 'text', required: true },
+                    { prop: 'maxDuration', label: this.$t('lesson.maxDuration'), type: 'text', required: true },
+                    { label: '', type: 'button', options: this.placeholderList, style: 'margin-bottom: 0; margin-top: -10px;', typeBtn: 'info', click: this.addTrainRemark },
+                    { prop: 'trainingRemark', label: this.$t('lesson.trainingRemark'), type: 'textarea', required: true, tooltip: true, info: this.$t('lesson.tipExplainPlaceholderInfo') }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                trainingName: [
+                    { required: true, message: this.$t('rules.inputTrainingName'), trigger: 'blur' }
+                ],
+                trainingType: [
+                    { required: true, message: this.$t('rules.inputTrainingType'), trigger: 'change' }
+                ],
+                operateType: [
+                    { required: true, message: this.$t('rules.inputOperationType'), trigger: 'change' }
+                ],
+                skinCode: [
+                    { required: true, message: this.$t('rules.inputSkinType'), trigger: 'change' }
+                ],
+                minDuration: [
+                    { required: true, message: this.$t('rules.inputMinDuration'), trigger: 'blur' }
+                ],
+                maxDuration: [
+                    { required: true, message: this.$t('rules.inputMaxDuration'), trigger: 'blur' }
+                ],
+                trainingRemark: [
+                    { required: true, max: 500, message: this.$t('rules.inputTrainingRemark'), trigger: 'blur' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            if (this.type === 'ADD') {
+                return this.$t('lesson.createOperateRule');
+            } else {
+                return this.$t('lesson.editOperateRule');
             }
-		},
-		repliceName(fieldValue, enumList) {
-			if (enumList && enumList.length > 0) {
-				for (let i = 0; i < enumList.length; i++) {
-					if (fieldValue.includes(`{${enumList[i].id}}`)) {
-						fieldValue = fieldValue.replace(`{${enumList[i].id}}`, `{${enumList[i].name}}`);
-					}
-				}
-				return fieldValue;
-			}
-		},
-		changeList(val) {
-			// 获取操作占位列表
-			getPlaceholderList({ trainingType: val, skinCode: '02' }).then(res => {
-				this.placeholderList = res.data;
-			});
-		},
-		addTrainName(val) {
-			this.formModel.trainingName = `${this.formModel.trainingName}{${val.name}}`;
-		},
-		addTrainRemark(val) {
-			this.formModel.trainingRemark = `${this.formModel.trainingRemark}{${val.name}}`;
-		},
-		doSave() {
-			const self = this;
-			this.$refs.dataform.validateForm(() => {
-				if (self.type === 'ADD') {
-					self.create();
-				} else {
-					self.update();
-				}
-			});
-		},
-		create() {
-			const self = this;
-			this.placeholderList.forEach(item => {
-				if (this.formModel.trainingName.includes(`{${item.name}}`)) {
-					const name = this.formModel.trainingName.replace(`{${item.name}}`, `{${item.id}}`);
-					this.formModel.trainingName = name;
-				}
-				if (this.formModel.trainingRemark.includes(`{${item.name}}`)) {
-					const remark = this.formModel.trainingRemark.replace(`{${item.name}}`, `{${item.id}}`);
-					this.formModel.trainingRemark = remark;
-				}
-			});
+        }
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            // 获取皮肤列表
+            this.skinCodeList = [];
+            getSkinCodeList().then(response => {
+                this.skinCodeList = response.data.map(item => {
+                    const params = {};
+                    params.label = item.name;
+                    params.value = item.code;
+                    return params;
+                });
+            });
 
-			this.loading = true;
-			postTrainingRulesData(this.formModel).then(response => {
-				self.loading = false;
-				self.$message.success(this.$t('lesson.createOperateSuccess'));
-				self.handleClose();
-				self.$emit('reloadTable');
-			}).catch(error => {
-				self.loading = false;
-				self.$message.error(`${this.$t('error.createOperateRuleFailed')}:${error.message}`);
-			});
-		},
-		update() {
-			const self = this;
-			this.placeholderList.forEach(item => {
-				if (this.formModel.trainingName.includes(`{${item.name}}`)) {
-					const name = this.formModel.trainingName.replace(`{${item.name}}`, `{${item.id}}`);
-					this.formModel.trainingName = name;
-				}
-				if (this.formModel.trainingRemark.includes(`{${item.name}}`)) {
-					const remark = this.formModel.trainingRemark.replace(`{${item.name}}`, `{${item.id}}`);
-					this.formModel.trainingRemark = remark;
-				}
-			});
+            // 获取实训类型
+            this.trainingTypeList = [];
+            this.$Dictionary.trainingType().then(list => {
+                this.trainingTypeList = list.map(item => {
+                    const params = {};
+                    params.label = item.name;
+                    params.value = item.code;
+                    return params;
+                });
+            });
+            // 获取实训操作类型
+            this.trainingOperateTypeMap = {};
+            this.$Dictionary.stationControl().then(list => {
+                this.trainingOperateTypeMap['01'] = list.map(item => {
+                    const params = {};
+                    params.label = item.name;
+                    params.value = item.code;
+                    return params;
+                }); // 控制权实训
+            });
+            this.$Dictionary.signalOperation().then(list => {
+                this.trainingOperateTypeMap['02'] = list.map(item => {
+                    const params = {};
+                    params.label = item.name;
+                    params.value = item.code;
+                    return params;
+                }); // 信号机实训
+            });
+            this.$Dictionary.switchOperation().then(list => {
+                this.trainingOperateTypeMap['03'] = list.map(item => {
+                    const params = {};
+                    params.label = item.name;
+                    params.value = item.code;
+                    return params;
+                }); // 道岔实训
+            });
+            this.$Dictionary.sectionOperation().then(list => {
+                this.trainingOperateTypeMap['04'] = list.map(item => {
+                    const params = {};
+                    params.label = item.name;
+                    params.value = item.code;
+                    return params;
+                }); // 区段实训
+            });
+            this.$Dictionary.stationStandOperation().then(list => {
+                this.trainingOperateTypeMap['05'] = list.map(item => {
+                    const params = {};
+                    params.label = item.name;
+                    params.value = item.code;
+                    return params;
+                }); // 站台实训
+            });
+            this.$Dictionary.trainPlanOperation().then(list => {
+                this.trainingOperateTypeMap['06'] = list.map(item => {
+                    const params = {};
+                    params.label = item.name;
+                    params.value = item.code;
+                    return params;
+                }); // 行车计划实训
+            });
+            this.$Dictionary.trainOperation().then(list => {
+                this.trainingOperateTypeMap['07'] = list.map(item => {
+                    const params = {};
+                    params.label = item.name;
+                    params.value = item.code;
+                    return params;
+                }); // 列车实训
+            });
 
-			this.loading = true;
-			putTrainingRulesData(this.formModel).then(response => {
-				self.loading = false;
-				self.$message.success(this.$t('lesson.createOperateSuccess'));
-				self.handleClose();
-				self.$emit('reloadTable');
-			}).catch(error => {
-				self.loading = false;
-				self.$message.error(`${this.$t('error.createOperateRuleFailed')}:${error.message}`);
-			});
-		},
-		handleClose() {
-			this.formModel = {
-				trainingName: '',
-				trainingType: '',
-				operateType: '',
-				skinCode: '',
-				minDuration: '',
-				maxDuration: '',
-				trainingRemark: ''
-			};
-			this.$refs.dataform.resetForm();
-			this.dialogVisible = false;
-		}
-	}
+        },
+        async show(data) {
+            this.loading = false;
+            this.dialogVisible = true;
+            if (data && data.id) {
+                // 获取操作占位列表
+                const res = await getPlaceholderList({ trainingType: data.trainingType, skinCode: data.skinCode });
+                this.placeholderList = res.data;
+                this.formModel = {
+                    id: data.id,
+                    trainingName: this.repliceName(data.trainingName, this.placeholderList),
+                    trainingType: data.trainingType,
+                    operateType: data.operateType,
+                    productTypes: data.productTypes,
+                    skinCode: data.skinCode,
+                    minDuration: data.minDuration,
+                    maxDuration: data.maxDuration,
+                    trainingRemark: this.repliceName(data.trainingRemark, this.placeholderList)
+                };
+            } else {
+                this.formModel = {
+                    skinCode: this.$route.query.skinCode
+                };
+            }
+        },
+        repliceName(fieldValue, enumList) {
+            if (enumList && enumList.length > 0) {
+                for (let i = 0; i < enumList.length; i++) {
+                    if (fieldValue.includes(`{${enumList[i].id}}`)) {
+                        fieldValue = fieldValue.replace(`{${enumList[i].id}}`, `{${enumList[i].name}}`);
+                    }
+                }
+                return fieldValue;
+            }
+        },
+        changeList(val) {
+            // 获取操作占位列表
+            getPlaceholderList({ trainingType: val, skinCode: '02' }).then(res => {
+                this.placeholderList = res.data;
+            });
+        },
+        addTrainName(val) {
+            this.formModel.trainingName = `${this.formModel.trainingName}{${val.name}}`;
+        },
+        addTrainRemark(val) {
+            this.formModel.trainingRemark = `${this.formModel.trainingRemark}{${val.name}}`;
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                if (self.type === 'ADD') {
+                    self.create();
+                } else {
+                    self.update();
+                }
+            });
+        },
+        create() {
+            const self = this;
+            this.placeholderList.forEach(item => {
+                if (this.formModel.trainingName.includes(`{${item.name}}`)) {
+                    const name = this.formModel.trainingName.replace(`{${item.name}}`, `{${item.id}}`);
+                    this.formModel.trainingName = name;
+                }
+                if (this.formModel.trainingRemark.includes(`{${item.name}}`)) {
+                    const remark = this.formModel.trainingRemark.replace(`{${item.name}}`, `{${item.id}}`);
+                    this.formModel.trainingRemark = remark;
+                }
+            });
+
+            this.loading = true;
+            postTrainingRulesData(this.formModel).then(response => {
+                self.loading = false;
+                self.$message.success(this.$t('lesson.createOperateSuccess'));
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                self.loading = false;
+                self.$message.error(`${this.$t('error.createOperateRuleFailed')}:${error.message}`);
+            });
+        },
+        update() {
+            const self = this;
+            this.placeholderList.forEach(item => {
+                if (this.formModel.trainingName.includes(`{${item.name}}`)) {
+                    const name = this.formModel.trainingName.replace(`{${item.name}}`, `{${item.id}}`);
+                    this.formModel.trainingName = name;
+                }
+                if (this.formModel.trainingRemark.includes(`{${item.name}}`)) {
+                    const remark = this.formModel.trainingRemark.replace(`{${item.name}}`, `{${item.id}}`);
+                    this.formModel.trainingRemark = remark;
+                }
+            });
+
+            this.loading = true;
+            putTrainingRulesData(this.formModel).then(response => {
+                self.loading = false;
+                self.$message.success(this.$t('lesson.createOperateSuccess'));
+                self.handleClose();
+                self.$emit('reloadTable');
+            }).catch(error => {
+                self.loading = false;
+                self.$message.error(`${this.$t('error.createOperateRuleFailed')}:${error.message}`);
+            });
+        },
+        handleClose() {
+            this.formModel = {
+                trainingName: '',
+                trainingType: '',
+                operateType: '',
+                skinCode: '',
+                minDuration: '',
+                maxDuration: '',
+                trainingRemark: ''
+            };
+            this.$refs.dataform.resetForm();
+            this.dialogVisible = false;
+        }
+    }
 };
 </script>
diff --git a/src/views/lesson/trainingRule/list.vue b/src/views/lesson/trainingRule/list.vue
index 6117bfc5e..5f3e4e483 100644
--- a/src/views/lesson/trainingRule/list.vue
+++ b/src/views/lesson/trainingRule/list.vue
@@ -1,20 +1,26 @@
 <template>
-  <div>
+  <div style="height: 100%; overflow-y: auto;">
+    <!-- <div style="height: calc(100% - 80px); overflow-y: auto;"> -->
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <!-- </div> -->
     <training-edit ref="create" type="ADD" @reloadTable="reloadTable" />
     <training-edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
     <add-batch ref="addBatch" @reloadTable="reloadTable" />
     <save-as ref="saveAs" @reloadTable="reloadTable" />
-      <div class="draft">
-          <el-button-group>
-              <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
-          </el-button-group>
-      </div>
+    <div class="draft">
+      <el-button-group>
+        <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
+      </el-button-group>
+    </div>
   </div>
 </template>
 
 <script>
-import { getTrainingRulesList, deleteTrainingRulesData, getPlaceholderList } from '@/api/management/operation';
+import {
+    getTrainingRulesList,
+    deleteTrainingRulesData,
+    getPlaceholderList
+} from '@/api/management/operation';
 import { getSkinCodeList } from '@/api/management/mapskin';
 import TrainingEdit from './addEdit';
 import AddBatch from './addBatch';
@@ -22,251 +28,301 @@ import SaveAs from './saveAs.vue';
 import { UrlConfig } from '@/router/index';
 
 export default {
-	name: 'TrainingRule',
-	components: {
-		TrainingEdit,
-		AddBatch,
+    name: 'TrainingRule',
+    components: {
+        TrainingEdit,
+        AddBatch,
         SaveAs
-	},
-	data() {
-		return {
-			placeholderMap: {},
-			trainingOperateTypeMap: {},
-			trainingTypeList: [],
-			skinCodeList: [],
-			totals: '',
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				labelWidth: '140px',
-				reset: true,
-				queryObject: {
-					trainingType: {
-						type: 'select',
-						label: this.$t('lesson.trainingType'),
-						config: {
-							data: []
-						}
-					},
-					trainingName: {
-						type: 'text',
-						label: this.$t('lesson.trainingName')
-					}
-				}
+    },
+    data() {
+        return {
+            placeholderMap: {},
+            trainingOperateTypeMap: {},
+            trainingTypeList: [],
+            skinCodeList: [],
+            totals: '',
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '140px',
+                reset: true,
+                queryObject: {
+                    trainingType: {
+                        type: 'select',
+                        label: this.$t('lesson.trainingType'),
+                        config: {
+                            data: []
+                        }
+                    },
+                    trainingName: {
+                        type: 'text',
+                        label: this.$t('lesson.trainingName')
+                    }
+                }
+            },
+            queryList: {
+                query: this.getList,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: this.$t('lesson.trainingName'),
+                        prop: 'trainingName',
+                        type: 'replicText',
+                        columnValue: row => {
+                            return this.repliceName(
+                                row.trainingName,
+                                this.placeholderMap[row.trainingType]
+                            );
+                        }
+                    },
+                    {
+                        title: this.$t('lesson.skinType'),
+                        prop: 'skinCode',
+                        type: 'tag',
+                        columnValue: row => {
+                            return this.$convertField(row.skinCode, this.skinCodeList, [
+                                'code',
+                                'name'
+                            ]);
+                        },
+                        tagType: row => {
+                            return '';
+                        }
+                    },
+                    {
+                        title: this.$t('lesson.trainingType'),
+                        prop: 'trainingType',
+                        type: 'tag',
+                        columnValue: row => {
+                            return this.$convertField(
+                                row.trainingType,
+                                this.trainingTypeList,
+                                ['code', 'name']
+                            );
+                        },
+                        tagType: row => {
+                            return 'success';
+                        }
+                    },
+                    {
+                        title: this.$t('lesson.operationType'),
+                        prop: 'operateType',
+                        type: 'tag',
+                        columnValue: row => {
+                            return this.$convertField(
+                                row.operateType,
+                                this.trainingOperateTypeMap[row.trainingType],
+                                ['code', 'name']
+                            );
+                        },
+                        tagType: row => {
+                            return 'success';
+                        }
+                    },
+                    {
+                        title: this.$t('lesson.minDuration'),
+                        prop: 'minDuration'
+                    },
+                    {
+                        title: this.$t('lesson.maxDuration'),
+                        prop: 'maxDuration'
+                    },
 
-			},
-			queryList: {
-				query: this.getList,
-				selectCheckShow: false,
-				indexShow: true,
-				columns: [
-					{
-						title: this.$t('lesson.trainingName'),
-						prop: 'trainingName',
-						type: 'replicText',
-						columnValue: (row) => { return this.repliceName(row.trainingName, this.placeholderMap[row.trainingType]); }
-					},
-					{
-						title: this.$t('lesson.skinType'),
-						prop: 'skinCode',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']); },
-						tagType: (row) => { return ''; }
-					},
-					{
-						title: this.$t('lesson.trainingType'),
-						prop: 'trainingType',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.trainingType, this.trainingTypeList, ['code', 'name']); },
-						tagType: (row) => { return 'success'; }
-					},
-					{
-						title: this.$t('lesson.operationType'),
-						prop: 'operateType',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.operateType, this.trainingOperateTypeMap[row.trainingType], ['code', 'name']); },
-						tagType: (row) => { return 'success'; }
-					},
-					{
-						title: this.$t('lesson.minDuration'),
-						prop: 'minDuration'
-					},
-					{
-						title: this.$t('lesson.maxDuration'),
-						prop: 'maxDuration'
-					},
-
-					{
-						title: this.$t('lesson.trainingRemark'),
-						prop: 'trainingRemark',
-						type: 'replicText',
-						columnValue: (row) => { return this.repliceName(row.trainingRemark, this.placeholderMap[row.trainingType]); }
-					},
-					{
-						type: 'button',
-						title: this.$t('global.operate'),
-						width: '250',
-						buttons: [
-							{
-								name: this.$t('lesson.stepDetail'),
-								handleClick: this.handleViewDetail
-							},
-							{
-								name: this.$t('global.edit'),
-								handleClick: this.handleEdit
-							},
-							{
-								name: this.$t('global.delete'),
-								handleClick: this.handleDelete,
-								type: 'danger'
-							}
-						]
-					}
-				],
-				actions: [
-					{ text: this.$t('global.add'), handler: this.handleAdd },
+                    {
+                        title: this.$t('lesson.trainingRemark'),
+                        prop: 'trainingRemark',
+                        type: 'replicText',
+                        columnValue: row => {
+                            return this.repliceName(
+                                row.trainingRemark,
+                                this.placeholderMap[row.trainingType]
+                            );
+                        }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '250',
+                        buttons: [
+                            {
+                                name: this.$t('lesson.stepDetail'),
+                                handleClick: this.handleViewDetail
+                            },
+                            {
+                                name: this.$t('global.edit'),
+                                handleClick: this.handleEdit
+                            },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDelete,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: this.$t('global.add'), handler: this.handleAdd },
                     { text: this.$t('lesson.generation'), handler: this.handleBatchAdd },
                     { text: this.$t('lesson.saveAs'), handler: this.handleSaveAs }
-				]
-			},
-			currentModel: {}
-		};
-	},
-	mounted() {
-		this.init();
-	},
-	methods: {
-		init() {
-			this.trainingOperateTypeMap = {};
-			this.$Dictionary.stationControl().then(list => {
-				this.trainingOperateTypeMap['01'] = list; // 控制权实训
-			});
-			this.$Dictionary.signalOperation().then(list => {
-				this.trainingOperateTypeMap['02'] = list; // 信号机实训
-			});
-			this.$Dictionary.switchOperation().then(list => {
-				this.trainingOperateTypeMap['03'] = list; // 道岔实训
-			});
-			this.$Dictionary.sectionOperation().then(list => {
-				this.trainingOperateTypeMap['04'] = list; // 区段实训
-			});
-			this.$Dictionary.stationStandOperation().then(list => {
-				this.trainingOperateTypeMap['05'] = list; // 站台实训
-			});
-			this.$Dictionary.trainPlanOperation().then(list => {
-				this.trainingOperateTypeMap['06'] = list; // 行车计划实训
-			});
-			this.$Dictionary.trainOperation().then(list => {
-				this.trainingOperateTypeMap['07'] = list; // 列车实训
-			});
-			this.$Dictionary.limitOperation().then(list => {
-				this.trainingOperateTypeMap['08'] = list; // 限速实训
-			});
-			this.placeholderMap = {};
-			getPlaceholderList({ skinCode: '', trainingType: '' }).then(res => {
-				res.data.forEach(item => {
-					if (!this.placeholderMap[item.trainingType]) {
-						this.placeholderMap[item.trainingType] = [];
-					}
-					this.placeholderMap[item.trainingType].push(item);
-				});
-			});
+                ]
+            },
+            currentModel: {}
+        };
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            this.trainingOperateTypeMap = {};
+            this.$Dictionary.stationControl().then(list => {
+                this.trainingOperateTypeMap['01'] = list; // 控制权实训
+            });
+            this.$Dictionary.signalOperation().then(list => {
+                this.trainingOperateTypeMap['02'] = list; // 信号机实训
+            });
+            this.$Dictionary.switchOperation().then(list => {
+                this.trainingOperateTypeMap['03'] = list; // 道岔实训
+            });
+            this.$Dictionary.sectionOperation().then(list => {
+                this.trainingOperateTypeMap['04'] = list; // 区段实训
+            });
+            this.$Dictionary.stationStandOperation().then(list => {
+                this.trainingOperateTypeMap['05'] = list; // 站台实训
+            });
+            this.$Dictionary.trainPlanOperation().then(list => {
+                this.trainingOperateTypeMap['06'] = list; // 行车计划实训
+            });
+            this.$Dictionary.trainOperation().then(list => {
+                this.trainingOperateTypeMap['07'] = list; // 列车实训
+            });
+            this.$Dictionary.limitOperation().then(list => {
+                this.trainingOperateTypeMap['08'] = list; // 限速实训
+            });
+            this.placeholderMap = {};
+            getPlaceholderList({ skinCode: '', trainingType: '' }).then(res => {
+                res.data.forEach(item => {
+                    if (!this.placeholderMap[item.trainingType]) {
+                        this.placeholderMap[item.trainingType] = [];
+                    }
+                    this.placeholderMap[item.trainingType].push(item);
+                });
+            });
 
-			// 获取皮肤列表
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data;
-			});
+            // 获取皮肤列表
+            this.skinCodeList = [];
+            getSkinCodeList().then(response => {
+                this.skinCodeList = response.data;
+            });
 
-			// 获取实训类型
-			this.trainingTypeList = [];
-			this.$Dictionary.trainingType().then(list => {
-				this.trainingTypeList = list;
-				list.forEach(elem => {
-					this.queryForm.queryObject.trainingType.config.data.push({ value: elem.code, label: elem.name });
-				});
-			});
+            // 获取实训类型
+            this.trainingTypeList = [];
+            this.$Dictionary.trainingType().then(list => {
+                this.trainingTypeList = list;
+                list.forEach(elem => {
+                    this.queryForm.queryObject.trainingType.config.data.push({
+                        value: elem.code,
+                        label: elem.name
+                    });
+                });
+            });
 
-			this.reloadTable();
-		},
-		repliceName(fieldValue, enumList) {
-			if (enumList && enumList.length > 0) {
-				for (let i = 0; i < enumList.length; i++) {
-					if (fieldValue.includes(`{${enumList[i].id}}`)) {
-						fieldValue = fieldValue.replace(`{${enumList[i].id}}`, `{${enumList[i].name}}`);
-					}
-				}
-				return fieldValue;
-			} else if (!enumList) {
-				return fieldValue;
-			}
-		},
-		// 选择实训类型下的操作类型 暂时不用
-		typeChoose(form) {
-			this.queryForm.queryObject.operateType.config.data = [];
-			if (form && form.trainingType) {
-				form.operateType = '';
-				this.trainingOperateTypeMap[form.trainingType].forEach(elem => {
-					this.queryForm.queryObject.operateType.config.data.push({ value: elem.code, label: elem.name });
-				});
-			}
-		},
-		async getList(params) {
+            this.reloadTable();
+        },
+        repliceName(fieldValue, enumList) {
+            if (enumList && enumList.length > 0) {
+                for (let i = 0; i < enumList.length; i++) {
+                    if (fieldValue.includes(`{${enumList[i].id}}`)) {
+                        fieldValue = fieldValue.replace(
+                            `{${enumList[i].id}}`,
+                            `{${enumList[i].name}}`
+                        );
+                    }
+                }
+                return fieldValue;
+            } else if (!enumList) {
+                return fieldValue;
+            }
+        },
+        // 选择实训类型下的操作类型 暂时不用
+        typeChoose(form) {
+            this.queryForm.queryObject.operateType.config.data = [];
+            if (form && form.trainingType) {
+                form.operateType = '';
+                this.trainingOperateTypeMap[form.trainingType].forEach(elem => {
+                    this.queryForm.queryObject.operateType.config.data.push({
+                        value: elem.code,
+                        label: elem.name
+                    });
+                });
+            }
+        },
+        async getList(params) {
             params['mapId'] = this.$route.query.mapId;
-			const res = await getTrainingRulesList(params);
-			this.totals = res.data.total;
-			return res;
-		},
-		handleViewDetail(index, row) {
-            this.$router.push({ path: `${UrlConfig.design.trainingRuleDetail}`, query: { id: row.id, type: row.trainingType, skinCode: row.skinCode } });
-		},
+            const res = await getTrainingRulesList(params);
+            this.totals = res.data.total;
+            return res;
+        },
+        handleViewDetail(index, row) {
+            this.$router.push({
+                path: `${UrlConfig.design.trainingRuleDetail}`,
+                query: { id: row.id, type: row.trainingType, skinCode: row.skinCode }
+            });
+        },
 
-		handleEdit(index, row) {
-			this.$refs.edit.show(row);
-		},
+        handleEdit(index, row) {
+            this.$refs.edit.show(row);
+        },
 
-		handleAdd() {
-			this.$refs.create.show();
-		},
+        handleAdd() {
+            this.$refs.create.show();
+        },
 
-		handleBatchAdd() {
-			this.$refs.addBatch.show(this.totals);
-		},
+        handleBatchAdd() {
+            this.$refs.addBatch.show(this.totals);
+        },
 
         handleSaveAs() {
             this.$refs.saveAs.show();
         },
 
         handleDelete(index, row) {
-			this.$confirm(this.$t('lesson.wellDelTrainingRule'), this.$t('global.tips'), {
-				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: this.$t('global.cancel'),
-				type: 'warning'
-			}).then(() => {
-				deleteTrainingRulesData(row.id).then(response => {
-					this.$message.success(this.$t('lesson.deleteSuccess'));
-					this.reloadTable();
-				}).catch(() => {
-					this.reloadTable();
-					this.$messageBox(this.$t('error.deleteFailed'));
-				});
-			});
-		},
-        turnback() {
-            this.$router.go(-1)
+            this.$confirm(
+                this.$t('lesson.wellDelTrainingRule'),
+                this.$t('global.tips'),
+                {
+                    confirmButtonText: this.$t('global.confirm'),
+                    cancelButtonText: this.$t('global.cancel'),
+                    type: 'warning'
+                }
+            ).then(() => {
+                deleteTrainingRulesData(row.id)
+                    .then(response => {
+                        this.$message.success(this.$t('lesson.deleteSuccess'));
+                        this.reloadTable();
+                    })
+                    .catch(() => {
+                        this.reloadTable();
+                        this.$messageBox(this.$t('error.deleteFailed'));
+                    });
+            });
         },
-		reloadTable() {
-			this.queryList.reload();
-		}
-	}
+        turnback() {
+            this.$router.go(-1);
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .draft {
-        width: 400px;
-        text-align: center;
-        margin: 20px auto;
-    }
+.draft {
+  width: 400px;
+  text-align: center;
+  margin: 20px auto;
+}
 </style>
diff --git a/src/views/lesson/trainingRule/saveAs.vue b/src/views/lesson/trainingRule/saveAs.vue
index d1e61f37e..2b28ea065 100644
--- a/src/views/lesson/trainingRule/saveAs.vue
+++ b/src/views/lesson/trainingRule/saveAs.vue
@@ -1,5 +1,12 @@
 <template>
-  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="25%" :before-close="handleClose" center>
+  <el-dialog
+    v-dialogDrag
+    :title="title"
+    :visible.sync="dialogVisible"
+    width="25%"
+    :before-close="handleClose"
+    center
+  >
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
@@ -13,94 +20,118 @@ import { postOperateSaveAs } from '@/api/management/operation';
 import { getSkinCodeList } from '@/api/management/mapskin';
 
 export default {
-	name: 'AddBatch',
-	data() {
-		return {
-			loading: false,
-			dialogVisible: false,
-			formModel: {
-				skinCodeFrom: '',
-				skinCodeTo: ''
-			},
-			skinCodeList: []
-		};
-	},
-	computed: {
-		form() {
-			this.type === 'ADD';
-			const form = {
-				labelWidth: '120px',
-				items: [
-					{ prop: 'skinCodeFrom', label: this.$t('lesson.skinTypeFrom'), type: 'select', required: true, options: this.skinCodeList },
-					{ prop: 'skinCodeTo', label: this.$t('lesson.skinTypeTo'), type: 'select', required: true, options: this.skinCodeList }
-				]
-			};
-			return form;
-		},
-		rules() {
-			const crules = {
-				skinCodeFrom: [
-					{ required: true, message: this.$t('rules.inputSkinType'), trigger: 'change' }
-				],
-				skinCodeTo: [
-					{ required: true, message: this.$t('rules.inputSkinType'), trigger: 'change' }
-				]
-			};
-			return crules;
-		},
-		title() {
-			return this.$t('lesson.copyLesson');
-		}
-	},
-	mounted() {
-		this.init();
-	},
-	methods: {
-		init() {
-			// 获取皮肤列表
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data.map(item => {
-					const params = {};
-					params.label = item.name;
-					params.value = item.code;
-					return params;
-				});
-			});
-		},
-		show() {
-			this.dialogVisible = true;
-		},
-		doSave() {
-			const self = this;
-			this.$refs.dataform.validateForm(() => {
-				if (this.formModel.skinCodeFrom != this.formModel.skinCodeTo) {
-					self.create();
-				} else {
-					this.$alert(this.$t('lesson.countSkinCode'), this.$t('global.tips'), {
-						confirmButtonText: this.$t('global.confirm'),
-						callback: () => { }
-					});
-				}
-			});
-		},
-		create() {
-			const self = this;
-			this.loading = true;
-			postOperateSaveAs(this.formModel.skinCodeFrom, this.formModel.skinCodeTo).then(response => {
-				self.loading = false;
-				self.$message.success(this.$t('lesson.batchCreateSuccess'));
-				self.handleClose();
-				self.$emit('reloadTable'); // 刷新列表
-			}).catch(error => {
-				self.loading = false;
-				self.$message.error(`${this.$('error.batchCreateFailed')}:${error.message}`);
-			});
-		},
-		handleClose() {
-			this.$refs.dataform.resetForm();
-			this.dialogVisible = false;
-		}
-	}
+    name: 'AddBatch',
+    data() {
+        return {
+            loading: false,
+            dialogVisible: false,
+            formModel: {
+                skinCodeFrom: '',
+                skinCodeTo: ''
+            },
+            skinCodeList: []
+        };
+    },
+    computed: {
+        form() {
+            this.type === 'ADD';
+            const form = {
+                labelWidth: '120px',
+                items: [
+                    {
+                        prop: 'skinCodeFrom',
+                        label: this.$t('lesson.skinTypeFrom'),
+                        type: 'select',
+                        required: true,
+                        options: this.skinCodeList
+                    },
+                    {
+                        prop: 'skinCodeTo',
+                        label: this.$t('lesson.skinTypeTo'),
+                        type: 'select',
+                        required: true,
+                        options: this.skinCodeList
+                    }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                skinCodeFrom: [
+                    {
+                        required: true,
+                        message: this.$t('rules.inputSkinType'),
+                        trigger: 'change'
+                    }
+                ],
+                skinCodeTo: [
+                    {
+                        required: true,
+                        message: this.$t('rules.inputSkinType'),
+                        trigger: 'change'
+                    }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return this.$t('lesson.copyLesson');
+        }
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        init() {
+            // 获取皮肤列表
+            this.skinCodeList = [];
+            getSkinCodeList().then(response => {
+                this.skinCodeList = response.data.map(item => {
+                    const params = {};
+                    params.label = item.name;
+                    params.value = item.code;
+                    return params;
+                });
+            });
+        },
+        show() {
+            this.dialogVisible = true;
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                if (this.formModel.skinCodeFrom != this.formModel.skinCodeTo) {
+                    self.create();
+                } else {
+                    this.$alert(this.$t('lesson.countSkinCode'), this.$t('global.tips'), {
+                        confirmButtonText: this.$t('global.confirm'),
+                        callback: () => {}
+                    });
+                }
+            });
+        },
+        create() {
+            const self = this;
+            this.loading = true;
+            postOperateSaveAs(this.formModel.skinCodeFrom, this.formModel.skinCodeTo)
+                .then(response => {
+                    self.loading = false;
+                    self.$message.success(this.$t('lesson.batchCreateSuccess'));
+                    self.handleClose();
+                    self.$emit('reloadTable'); // 刷新列表
+                })
+                .catch(error => {
+                    self.loading = false;
+                    self.$message.error(
+                        `${this.$('error.batchCreateFailed')}:${error.message}`
+                    );
+                });
+        },
+        handleClose() {
+            this.$refs.dataform.resetForm();
+            this.dialogVisible = false;
+        }
+    }
 };
 </script>
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index 63b30e624..0492b20cc 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -1,6 +1,8 @@
 <template>
-  <div>
+  <div style="height: 100%; overflow-y: auto;">
+    <!-- <div style="height: calc(100% - 80px); overflow-y: auto;"> -->
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <!-- </div> -->
     <training-draft
       ref="draftTrain"
       :skin-code-list="skinCodeList"
@@ -27,253 +29,253 @@ import TrainingDraft from './draft';
 import localStore from 'storejs';
 
 export default {
-	name: 'TrainingGeneration',
-	components: {
-		TrainingDraft
-	},
-	data() {
-		return {
-			skinCodeList: [],
-			trainingTypeList: [],
-			prdTypeList: [],
-			trainingOperateTypeMap: {},
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				labelWidth: '120px',
-				queryObject: {
-					prdCode: {
-						type: 'select',
-						label: this.$t('lesson.product'),
-						change: this.prdChoose,
-						config: {
-							data: []
-						}
-					},
-					type: {
-						type: 'select',
-						label: this.$t('lesson.trainingType'),
-						change: this.typeChoose,
-						config: {
-							data: []
-						}
-					},
-					operateType: {
-						type: 'select',
-						label: this.$t('lesson.operationType'),
-						config: {
-							data: []
-						}
-					},
-					/* generateType: {
+    name: 'TrainingGeneration',
+    components: {
+        TrainingDraft
+    },
+    data() {
+        return {
+            skinCodeList: [],
+            trainingTypeList: [],
+            prdTypeList: [],
+            trainingOperateTypeMap: {},
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '120px',
+                queryObject: {
+                    prdCode: {
+                        type: 'select',
+                        label: this.$t('lesson.product'),
+                        change: this.prdChoose,
+                        config: {
+                            data: []
+                        }
+                    },
+                    type: {
+                        type: 'select',
+                        label: this.$t('lesson.trainingType'),
+                        change: this.typeChoose,
+                        config: {
+                            data: []
+                        }
+                    },
+                    operateType: {
+                        type: 'select',
+                        label: this.$t('lesson.operationType'),
+                        config: {
+                            data: []
+                        }
+                    },
+                    /* generateType: {
 						type: 'select',
 						label: this.$t('lesson.automaticOrManual'),
 						config: {
 							data: [{ value: '02', label: this.$t('lesson.manual') }, { value: '01', label: this.$t('lesson.automatic') }]
 						}
 					},*/
-					name: {
-						type: 'text',
-						label: this.$t('lesson.trainingName')
-					}
-				}
-			},
-			queryList: {
-				query: this.queryFunction,
-				selectCheckShow: false,
-				indexShow: true,
-				columns: [
-					{
-						title: this.$t('lesson.trainingName'),
-						prop: 'name'
-					},
-					{
-						title: this.$t('lesson.skinType'),
-						prop: 'skinCode',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']); },
-						tagType: (row) => { return ''; }
-					},
-					{
-						title: this.$t('lesson.product'),
-						prop: 'prdCode',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.prdCode, this.prdTypeList, ['code', 'name']); },
-						tagType: (row) => { return 'success'; }
-					},
-					{
-						title: this.$t('lesson.trainingType'),
-						prop: 'type',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.type, this.trainingTypeList, ['code', 'name']); },
-						tagType: (row) => { return 'success'; }
-					},
-					{
-						title: this.$t('lesson.operationType'),
-						prop: 'operateType',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.operateType, this.trainingOperateTypeMap[row.type], ['code', 'name']); },
-						tagType: (row) => { return 'success'; }
-					},
-					{
-						title: this.$t('lesson.minDuration'),
-						prop: 'minDuration'
-					},
-					{
-						title: this.$t('lesson.maxDuration'),
-						prop: 'maxDuration'
-					},
-					{
-						title: this.$t('lesson.remarks'),
-						prop: 'remarks'
-					},
-					{
-						type: 'button',
-						title: this.$t('global.operate'),
-						width: '250',
-						buttons: [
-							{
-								name: this.$t('lesson.demonstration'),
-								handleClick: this.demoDisplay,
-								type: ''
-							}
-							/* {
+                    name: {
+                        type: 'text',
+                        label: this.$t('lesson.trainingName')
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: this.$t('lesson.trainingName'),
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('lesson.skinType'),
+                        prop: 'skinCode',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('lesson.product'),
+                        prop: 'prdCode',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.prdCode, this.prdTypeList, ['code', 'name']); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: this.$t('lesson.trainingType'),
+                        prop: 'type',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.type, this.trainingTypeList, ['code', 'name']); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: this.$t('lesson.operationType'),
+                        prop: 'operateType',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.operateType, this.trainingOperateTypeMap[row.type], ['code', 'name']); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: this.$t('lesson.minDuration'),
+                        prop: 'minDuration'
+                    },
+                    {
+                        title: this.$t('lesson.maxDuration'),
+                        prop: 'maxDuration'
+                    },
+                    {
+                        title: this.$t('lesson.remarks'),
+                        prop: 'remarks'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '250',
+                        buttons: [
+                            {
+                                name: this.$t('lesson.demonstration'),
+                                handleClick: this.demoDisplay,
+                                type: ''
+                            }
+                            /* {
 								name: this.$t('lesson.trainingRecord'),
 								handleClick: this.trainingRecord,
 								type: ''
 							}*/
-						]
-					}
-				],
-				actions: [
-					{ text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging },
-					{ text: this.$t('lesson.updateTraining'), btnCode: 'employee_edit', handler: this.editTrainingByType, type: 'warning'},
-					{ text: this.$t('lesson.deleteTraining'), btnCode: 'employee_delete', handler: this.delAutoMaticTrainging, type: 'danger'}
-					/* { text: this.$t('lesson.addTraining'), btnCode: 'employee_add', handler: this.addingTraining, type: 'primary' }*/
-				]
-			},
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: this.$t('lesson.generateTraining'), btnCode: 'employee_auto', handler: this.autoMaticTrainging },
+                    { text: this.$t('lesson.updateTraining'), btnCode: 'employee_edit', handler: this.editTrainingByType, type: 'warning'},
+                    { text: this.$t('lesson.deleteTraining'), btnCode: 'employee_delete', handler: this.delAutoMaticTrainging, type: 'danger'}
+                    /* { text: this.$t('lesson.addTraining'), btnCode: 'employee_add', handler: this.addingTraining, type: 'primary' }*/
+                ]
+            },
 
-			currentModel: {}
-		};
-	},
-	async created() {
-		await this.loadInitData();
-		const json = localStore.get(this.$route.path);
-		json.type = '';
-		json.prdCode = '';
-		json.operateType = '';
-	},
-	methods: {
-		async loadInitData() {
-			this.skinCodeList = [];
-			this.queryForm.queryObject.prdCode.config.data = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data;
-			});
-			getCommodityMapProduct(this.$route.params.skinCode).then((response) => {
-				const productList = response.data;
-				if (productList && productList.length > 0) {
-					productList.forEach(elem => {
-						// 过滤综合演练产品
-						if (elem.prdType != '03') {
-							this.queryForm.queryObject.prdCode.config.data.push({ value: elem.code, label: elem.name });
-						}
-					});
-				}
-			});
+            currentModel: {}
+        };
+    },
+    async created() {
+        await this.loadInitData();
+        const json = localStore.get(this.$route.path);
+        json.type = '';
+        json.prdCode = '';
+        json.operateType = '';
+    },
+    methods: {
+        async loadInitData() {
+            this.skinCodeList = [];
+            this.queryForm.queryObject.prdCode.config.data = [];
+            getSkinCodeList().then(response => {
+                this.skinCodeList = response.data;
+            });
+            getCommodityMapProduct(this.$route.params.skinCode).then((response) => {
+                const productList = response.data;
+                if (productList && productList.length > 0) {
+                    productList.forEach(elem => {
+                        // 过滤综合演练产品
+                        if (elem.prdType != '03') {
+                            this.queryForm.queryObject.prdCode.config.data.push({ value: elem.code, label: elem.name });
+                        }
+                    });
+                }
+            });
 
-			this.prdTypeList = [];
-			getProductList({ pageSize: 500, pageNum: 1 }).then(res => {
-				const list = res.data.list;
-				if (list && list.length > 0) {
-					this.prdTypeList = list.filter(elem => { return elem.prdType != '03'; });
-				}
-			});
+            this.prdTypeList = [];
+            getProductList({ pageSize: 500, pageNum: 1 }).then(res => {
+                const list = res.data.list;
+                if (list && list.length > 0) {
+                    this.prdTypeList = list.filter(elem => { return elem.prdType != '03'; });
+                }
+            });
 
-			// 获取实训类型
-			this.trainingTypeList = [];
-			this.$Dictionary.trainingType().then(list => {
-				this.trainingTypeList = list;
-				list.forEach(elem => {
-					this.queryForm.queryObject.type.config.data.push({ value: elem.code, label: elem.name });
-				});
-			});
+            // 获取实训类型
+            this.trainingTypeList = [];
+            this.$Dictionary.trainingType().then(list => {
+                this.trainingTypeList = list;
+                list.forEach(elem => {
+                    this.queryForm.queryObject.type.config.data.push({ value: elem.code, label: elem.name });
+                });
+            });
 
-			this.trainingOperateTypeMap = {};
-			const list01 = await this.$Dictionary.stationControl();
-			this.trainingOperateTypeMap['01'] = list01; // 控制权实训
-			const list02 = await this.$Dictionary.signalOperation();
-			this.trainingOperateTypeMap['02'] = list02; // 信号机实训
-			const list03 = await this.$Dictionary.switchOperation();
-			this.trainingOperateTypeMap['03'] = list03; // 道岔实训
-			const list04 = await this.$Dictionary.sectionOperation();
-			this.trainingOperateTypeMap['04'] = list04; // 区段实训
-			const list05 = await this.$Dictionary.stationStandOperation();
-			this.trainingOperateTypeMap['05'] = list05; // 站台实训
-			const list06 = await this.$Dictionary.trainPlanOperation();
-			this.trainingOperateTypeMap['06'] = list06; // 行车计划实训
-			const list07 = await this.$Dictionary.trainOperation();
-			this.trainingOperateTypeMap['07'] = list07; // 列车实训
-			const list08 = await this.$Dictionary.limitOperation();
-			this.trainingOperateTypeMap['08'] = list08; // 限速实训
-			this.reloadTable();
-		},
-		prdChoose(form) {
-			form.type = '';
-			form.operateType = '';
-		},
-		typeChoose(form) {
-			this.queryForm.queryObject.operateType.config.data = [];
-			form.operateType = '';
-			if (form && form.type) {
-				this.trainingOperateTypeMap[form.type].forEach(elem => {
-					this.queryForm.queryObject.operateType.config.data.push({ value: elem.code, label: elem.name });
-				});
-			}
-		},
-		autoMaticTrainging() {
-			this.$refs.draftTrain.show({ event: '01', title: this.$t('lesson.automaticGenerationOfTraining') });
-		},
-		editTrainingByType() {
-			this.$refs.draftTrain.show({ event: '02', title: this.$t('lesson.modifyTrainingByCategory') });
-		},
-		delAutoMaticTrainging() {
-			this.$refs.draftTrain.show({ event: '03', title: this.$t('lesson.deleteAutoGeneratedTraining') });
-		},
-		// addingTraining() {
-		// 	this.$refs.draftTrain.show({ event: '04', title: this.$t('lesson.addTraining') });
-		// },
-		demoDisplay(index, node) {
-			trainingNotify({ trainingId: node.id }).then(resp => {
-				/** 区分演示和正式，需要在演示时设置lessonId为0*/
-				const query = { group: resp.data, trainingId: node.id, lessonId: 0 };
-				this.$router.push({ path: `${UrlConfig.display}/manage`, query: query });
-				launchFullscreen();
-			}).catch(error => {
-				this.$messageBox(this.$t('error.createSimulationFailed') +error.message);
-			});
-		},
-		reloadTable() {
-			this.queryList.reload();
-		},
-		turnback() {
-			this.$router.go(-1);
-		},
-		trainingRecord(index, node) {
-			trainingNotify({ trainingId: node.id }).then(resp => {
-				this.group = resp.data;
-				this.$router.push({ path: `${UrlConfig.design.trainingRecord}/${node.id}/${node.name}`, query: { group: resp.data } });
-			}).catch(error => {
-				this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
-			});
-		},
-		queryFunction(params) {
-			params['mapId'] = this.$route.query.mapId;
-			return pageQueryTraining(params);
-		}
-	}
+            this.trainingOperateTypeMap = {};
+            const list01 = await this.$Dictionary.stationControl();
+            this.trainingOperateTypeMap['01'] = list01; // 控制权实训
+            const list02 = await this.$Dictionary.signalOperation();
+            this.trainingOperateTypeMap['02'] = list02; // 信号机实训
+            const list03 = await this.$Dictionary.switchOperation();
+            this.trainingOperateTypeMap['03'] = list03; // 道岔实训
+            const list04 = await this.$Dictionary.sectionOperation();
+            this.trainingOperateTypeMap['04'] = list04; // 区段实训
+            const list05 = await this.$Dictionary.stationStandOperation();
+            this.trainingOperateTypeMap['05'] = list05; // 站台实训
+            const list06 = await this.$Dictionary.trainPlanOperation();
+            this.trainingOperateTypeMap['06'] = list06; // 行车计划实训
+            const list07 = await this.$Dictionary.trainOperation();
+            this.trainingOperateTypeMap['07'] = list07; // 列车实训
+            const list08 = await this.$Dictionary.limitOperation();
+            this.trainingOperateTypeMap['08'] = list08; // 限速实训
+            this.reloadTable();
+        },
+        prdChoose(form) {
+            form.type = '';
+            form.operateType = '';
+        },
+        typeChoose(form) {
+            this.queryForm.queryObject.operateType.config.data = [];
+            form.operateType = '';
+            if (form && form.type) {
+                this.trainingOperateTypeMap[form.type].forEach(elem => {
+                    this.queryForm.queryObject.operateType.config.data.push({ value: elem.code, label: elem.name });
+                });
+            }
+        },
+        autoMaticTrainging() {
+            this.$refs.draftTrain.show({ event: '01', title: this.$t('lesson.automaticGenerationOfTraining') });
+        },
+        editTrainingByType() {
+            this.$refs.draftTrain.show({ event: '02', title: this.$t('lesson.modifyTrainingByCategory') });
+        },
+        delAutoMaticTrainging() {
+            this.$refs.draftTrain.show({ event: '03', title: this.$t('lesson.deleteAutoGeneratedTraining') });
+        },
+        // addingTraining() {
+        // 	this.$refs.draftTrain.show({ event: '04', title: this.$t('lesson.addTraining') });
+        // },
+        demoDisplay(index, node) {
+            trainingNotify({ trainingId: node.id }).then(resp => {
+                /** 区分演示和正式，需要在演示时设置lessonId为0*/
+                const query = { group: resp.data, trainingId: node.id, lessonId: 0 };
+                this.$router.push({ path: `${UrlConfig.display}/manage`, query: query });
+                launchFullscreen();
+            }).catch(error => {
+                this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+            });
+        },
+        reloadTable() {
+            this.queryList.reload();
+        },
+        turnback() {
+            this.$router.go(-1);
+        },
+        trainingRecord(index, node) {
+            trainingNotify({ trainingId: node.id }).then(resp => {
+                this.group = resp.data;
+                this.$router.push({ path: `${UrlConfig.design.trainingRecord}/${node.id}/${node.name}`, query: { group: resp.data } });
+            }).catch(error => {
+                this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
+            });
+        },
+        queryFunction(params) {
+            params['mapId'] = this.$route.query.mapId;
+            return pageQueryTraining(params);
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>

From b1c3e10eb1fb1dbb45634adfb42a2bc8001665b3 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 29 Oct 2019 13:43:23 +0800
Subject: [PATCH 15/21] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=8E=92=E5=BA=8F=E6=A0=B7=E5=BC=8F=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/views/lesson/lessoncategory/edit/sorttree/index.vue | 9 +++++----
 src/views/lesson/lessoncategory/index.vue               | 7 +++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/lesson/lessoncategory/edit/sorttree/index.vue b/src/views/lesson/lessoncategory/edit/sorttree/index.vue
index 54eb21e64..dc5a691f7 100644
--- a/src/views/lesson/lessoncategory/edit/sorttree/index.vue
+++ b/src/views/lesson/lessoncategory/edit/sorttree/index.vue
@@ -1,11 +1,12 @@
 <template>
-  <div class="card-box">
-    <el-steps class="steps" :active="display">
+  <div class="card-box steps">
+	  <!-- class="steps" -->
+    <el-steps  :active="display">
       <el-step :title="this.$t('lesson.trainingSequence')" icon="el-icon-edit-outline" />
       <el-step title="" icon="el-icon-upload" />
     </el-steps>
     <el-card class="forms">
-      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height: height -60 + 'px'}">
+      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height: height -60-30 + 'px'}">
         <el-tree
           ref="lessonTree"
           :data="treeData"
@@ -89,7 +90,7 @@ export default {
 			}
 			 else if (draggingNode && draggingNode.data.type === 'Training') {
 				//  dropNode.data.type === 'Chapter' || 
-				 return dropNode && (dropNode.data.type === 'Training' && type !== 'Inner' );
+				 return dropNode && (dropNode.data.type === 'Training' && type !== 'inner' );
 			// 	return dropNode && draggingNode.parent == dropNode.parent && (
 			// 		dropNode.data.type === 'Training' && type !== 'Inner');
 			}
diff --git a/src/views/lesson/lessoncategory/index.vue b/src/views/lesson/lessoncategory/index.vue
index 496b0030f..9c48f2b5c 100644
--- a/src/views/lesson/lessoncategory/index.vue
+++ b/src/views/lesson/lessoncategory/index.vue
@@ -148,6 +148,9 @@ export default {
     }
 
     .draftContext {
-        // float: left;
-    }
+        width:100%;
+	}
+	.mainContext{
+		display: -webkit-box;
+	}
 </style>

From 973168970cb882fdfc815acb4470c85f6aa085b3 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 29 Oct 2019 14:14:14 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E8=A5=BF=E9=93=81=E9=99=A2=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jmap/map.js                      |  17 ++
 src/api/trainingPlatform.js              |   8 +
 src/scripts/ConstDic.js                  |   5 +
 src/utils/baseUrl.js                     |   4 +-
 src/views/designPlatform/demonList.vue   |  43 +++--
 src/views/publish/publishMap/draft.vue   | 193 +++++++++++------------
 src/views/publish/publishMap/index.vue   |  31 ++--
 src/views/publish/publishMap/project.vue |  87 ++++++++++
 src/views/trainingPlatform/demonList.vue |  19 ++-
 9 files changed, 276 insertions(+), 131 deletions(-)
 create mode 100644 src/views/publish/publishMap/project.vue

diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index 12aba59c8..d242c5ea4 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -140,3 +140,20 @@ export function updatePublishMapCity(data) {
 		data: data
 	});
 }
+
+/** 设置归属项目 */
+export function setMapProject(data) {
+	return request({
+		url: `/api/map/${data.id}/project`,
+		method: 'put',
+		data: data
+	});
+}
+
+/** 根据定制项目编号查询地图列表 */
+export function getMapListByProjectCode(projectCode) {
+	return request({
+		url: `/api/map/project/${projectCode}/list`,
+		method: 'get'
+	});
+}
diff --git a/src/api/trainingPlatform.js b/src/api/trainingPlatform.js
index 1dd8282b3..455a5401b 100644
--- a/src/api/trainingPlatform.js
+++ b/src/api/trainingPlatform.js
@@ -85,3 +85,11 @@ export function deleteSubSystem(id) {
 	});
 }
 
+export function getSubSystemByProjectCode(projectCode) {
+	/** 根据项目编号查询地图子系统 */
+	return request({
+		url: `/api/mapSystem/project/${projectCode}`,
+		method: 'get'
+	});
+}
+
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index 83d7eec49..47dc188ca 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -2203,3 +2203,8 @@ export const loginTitle = {
 	design: '城市轨道交通设计平台',
 	designxty: '西铁院设计平台'
 };
+
+export const ProjectCode = {
+	xty: 'XTY',
+	designxty: 'XTY'
+};
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 871e8ec9c..5935e41a6 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,9 +3,9 @@ export function getBaseUrl() {
 	let BASE_API;
 	if (process.env.NODE_ENV === 'development') {
 		// BASE_API = 'https://joylink.club/jlcloud';
-		BASE_API = 'https://test.joylink.club/jlcloud';
+		// BASE_API = 'https://test.joylink.club/jlcloud';
 		// BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-		// BASE_API = 'http://192.168.3.6:9000'; // 旭强
+		BASE_API = 'http://192.168.3.6:9000'; // 旭强
 		// BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
 	} else {
 		BASE_API = process.env.VUE_APP_BASE_API;
diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue
index ad032c676..957a09686 100644
--- a/src/views/designPlatform/demonList.vue
+++ b/src/views/designPlatform/demonList.vue
@@ -4,8 +4,8 @@
       <span>{{ $t('map.publishedMapList') }}</span>
     </div>
     <div class="text_item" style="height: calc(100% - 47px);">
-      <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
-      <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
+      <filter-city v-if="project==='design'" ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
+      <el-input v-if="project==='design'" v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
       <div style="height: calc(100% - 76px);">
         <el-tree ref="tree" class="tree_box" :data="treeList" node-key="id" :props="defaultProps" highlight-current :span="22" :filter-node-method="filterNode" @node-click="clickEvent">
           <span slot-scope="{ node:tnode, data }">
@@ -18,12 +18,13 @@
   </div>
 </template>
 <script>
-import { listPublishMap } from '@/api/jmap/map';
+import { listPublishMap, getMapListByProjectCode } from '@/api/jmap/map';
 import { UrlConfig } from '@/router/index';
 import { superAdmin, admin } from '@/router';
 import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/auth';
 import FilterCity from '@/views/components/filterCity';
 import localStore from 'storejs';
+import { ProjectCode } from '@/scripts/ConstDic';
 
 export default {
 	name: 'PublicMapList',
@@ -56,10 +57,14 @@ export default {
 				y: 0
 			},
 			editModel: {},
-			localParamName: 'publish_cityCode',
-			cityCode: ''
+			localParamName: 'publish_cityCode'
 		};
 	},
+	computed: {
+		project() {
+			return getSessionStorage('project');
+		}
+	},
 	watch: {
 		filterText(val) {
 			this.treeList = this.treeData.filter((res) => {
@@ -70,6 +75,11 @@ export default {
 	beforeDestroy () {
 		removeSessionStorage('demonList');
 	},
+	mounted() {
+		if (this.project === 'designxty') {
+			this.refresh();
+		}
+	},
 	methods: {
 		filterNode(value, data) {
 			if (!value) return true;
@@ -90,7 +100,7 @@ export default {
 			}
 			case 'lessonDesign': {
 				setSessionStorage('designType', 'lessonDesign');
-				this.$router.push({ path: `${UrlConfig.design.lessonHome}/${obj.mapId}/${obj.skinCode}`, query: {cityCode: this.cityCode} });
+				this.$router.push({ path: `${UrlConfig.design.lessonHome}/${obj.mapId}/${obj.skinCode}`, query: {cityCode: obj.cityCode} });
 				break;
 			}
 			case 'runPlanDesign': {
@@ -109,30 +119,36 @@ export default {
 			}
 		},
 		async refresh(filterSelect) {
-			this.cityCode=filterSelect;
 			this.loading = true;
 			this.treeData = this.treeList = [];
 			try {
-				const res = await listPublishMap({cityCode: filterSelect});
+				let res = '';
+				if (this.project === 'designxty') {
+					res = await getMapListByProjectCode(ProjectCode[this.project]);
+				} else {
+					res = await listPublishMap({cityCode: filterSelect});
+				}
 
-				res.data.forEach(elem=>{
+				res.data && res.data.forEach(elem=>{
 					// elem.children.find(n => { return n.name.includes("行调")})
 					elem.children=[
 						{
 							id: '1',
 							name: this.$t('designPlatform.mapPreview'),
 							type: 'mapPreview',
-							mapId: elem.id
+							mapId: elem.id,
+							cityCode: elem.cityCode
 						}
 					];
-					this.isAdministrator()?elem.children.push({id: '2', name: this.$t('designPlatform.lessonDesign'), type: 'lessonDesign', mapId: elem.id, skinCode: elem.skinCode}):'';
+					this.isAdministrator()?elem.children.push({id: '2', name: this.$t('designPlatform.lessonDesign'), type: 'lessonDesign', mapId: elem.id, skinCode: elem.skinCode, cityCode: elem.cityCode}):'';
 					elem.children.push(
 						{
 							id: '3',
 							name: this.$t('designPlatform.scriptDesign'),
 							type: 'scriptDesign',
 							mapId: elem.id,
-							skinCode: elem.skinCode
+							skinCode: elem.skinCode,
+							cityCode: elem.cityCode
 							// code:elem.children.find(n => { return n.name.includes("行调")})
 						});
 					elem.children.push(
@@ -141,7 +157,8 @@ export default {
 							name: this.$t('designPlatform.runPlanDesign'),
 							type: 'runPlanDesign',
 							mapId: elem.id,
-							skinCode: elem.skinCode
+							skinCode: elem.skinCode,
+							cityCode: elem.cityCode
 						}
 					);
 				});
diff --git a/src/views/publish/publishMap/draft.vue b/src/views/publish/publishMap/draft.vue
index be7b6c459..5fcef1842 100644
--- a/src/views/publish/publishMap/draft.vue
+++ b/src/views/publish/publishMap/draft.vue
@@ -1,13 +1,13 @@
 <template>
-	<div>
-        <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
-            <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="doCreate">{{$t('global.confirm')}}</el-button>
-                <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
-            </span>
-        </el-dialog>
-    </div>
+  <div>
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+      <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
+        <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
+      </span>
+    </el-dialog>
+  </div>
   <!-- <div class="card-box">
     <el-steps class="steps" :active="display">
       <el-step :title="title" icon="el-icon-edit-outline" />
@@ -28,97 +28,96 @@
 </template>
 
 <script>
-	// import { updatePublishMapName } from '@/api/jmap/map';
-    export default {
-        name: 'PublishMapDraft',
-        data() {
-            return {
-				dialogVisible: false,
-				cityList:[],
-                formModel:{
-					mapId:'',
-                    cityCode:'',
-					name:'',
-                }
-            }
+// import { updatePublishMapName } from '@/api/jmap/map';
+export default {
+	name: 'PublishMapDraft',
+	props: {
+		title: String,
+		type: String
+	},
+	data() {
+		return {
+			dialogVisible: false,
+			cityList: [],
+			formModel: {
+				mapId: '',
+				cityCode: '',
+				name: ''
+			}
+		};
+	},
+	computed: {
+		form() {
+			let form={};
+			if (this.type=='updateMapName') {
+				form={
+					labelWidth: '150px',
+					items: [
+						{ prop: 'name', label: this.$t('publish.mapName'), type: 'text', required: true}
+					]
+				};
+			} else {
+				form={
+					labelWidth: '150px',
+					items: [
+						{ prop: 'cityCode', label: this.$t('publish.city'), type: 'select', required: true, options: this.cityList}
+					]
+				};
+			}
+			return form;
 		},
-		mounted(){
-			this.loadInitData();
+		rules() {
+			let crules ={};
+			if (this.type=='updateMapName') {
+				crules ={
+					name: [
+						{ required: true, message: this.$t('rules.pleaseInputMapName'), trigger: 'blur', max: 100 },
+						{ required: true, message: this.$t('rules.pleaseInputMapName'), trigger: 'change', max: 100 }
+					]
+				};
+			} else {
+				crules ={
+					id: [
+						{ required: true, message: this.$t('rules.pleaseSelectCity'), trigger: 'change', max: 100 }
+					]
+				};
+			}
+			return crules;
+		}
+	},
+	mounted() {
+		this.loadInitData();
+	},
+	methods: {
+		async loadInitData() {
+			this.cityList = [];
+			const res=await this.$Dictionary.cityType();
+			this.cityList = res.map(elem => { return { value: elem.code, label: elem.name }; });
 		},
-        props: {
-            title: String,
-            type:String,
-		},
-		computed: {
-            form() {
-				let form={};
-				if(this.type=="updateMapName"){
-					form={
-						labelWidth: '150px',
-						items: [
-							{ prop: 'name', label: this.$t('publish.mapName'), type: 'text', required: true},
-						]
-					}
-				}else{
-					form={
-						labelWidth: '150px',
-						items: [
-							{ prop: 'cityCode', label: this.$t('publish.city'), type: 'select', required: true,options:this.cityList},
-						]
-					}
-				}
-                return form
-            },
-            rules() {
-				let crules ={};
-				if(this.type=="updateMapName"){
-					crules ={
-						name:[
-							{ required: true, message: this.$t('rules.pleaseInputMapName'), trigger: 'blur',max:100 },
-							{ required: true, message: this.$t('rules.pleaseInputMapName'), trigger: 'change',max:100 },
-						]
-					}
-				}else{
-					crules ={
-						id:[
-							{ required: true, message: this.$t('rules.pleaseSelectCity'), trigger: 'change',max:100 },
-						]
-					}
-				}
-                return crules
-            },
-		},
-		methods: {
-			async loadInitData() {
-				this.cityList = [];
-				let res=await this.$Dictionary.cityType();
-                this.cityList = res.map(elem => { return { value: elem.code, label: elem.name } });
-            },
-            doShow(row) {
-				this.formModel.mapId=row.id;
-                if(this.type=="updateMapName"){
-					this.formModel.name=row.name;
-                }else{
-					this.formModel.cityCode=row.cityCode;
-				}
-                
-                this.dialogVisible = true   
-            },
-            doCreate() {
-                let self = this
-                this.$refs.dataform.validateForm(() => {
-                    self.$emit('create', Object.assign({}, this.formModel));
-                    self.doClose()
-                })
-            },
-            doClose() {
-                this.$refs.dataform.resetForm();
-                this.isShow = false;
-                this.dialogVisible = false
-            }
-        }
-	};
+		doShow(row) {
+			this.formModel.mapId=row.id;
+			if (this.type=='updateMapName') {
+				this.formModel.name=row.name;
+			} else {
+				this.formModel.cityCode=row.cityCode;
+			}
 
+			this.dialogVisible = true;
+		},
+		doCreate() {
+			const self = this;
+			this.$refs.dataform.validateForm(() => {
+				self.$emit('create', Object.assign({}, this.formModel));
+				self.doClose();
+			});
+		},
+		doClose() {
+			this.$refs.dataform.resetForm();
+			this.isShow = false;
+			this.dialogVisible = false;
+		}
+	}
+};
 
 // export default {
 // 	name: 'PublishMapDraft',
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index 1711733f7..b5579d767 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -1,24 +1,24 @@
 <template>
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-	<update-operate ref='updateMapName' @create="handleUpdateMap" :title="$t('publish.updateMapName')" type="updateMapName">
-    </update-operate>
-	<update-operate ref='updateCityName' @create="handleCityUpdate" :title="$t('publish.updateCityName')" type="updateCityName">
-    </update-operate>
+    <update-operate ref="updateMapName" :title="$t('publish.updateMapName')" type="updateMapName" @create="handleUpdateMap" />
+    <update-operate ref="updateCityName" :title="$t('publish.updateCityName')" type="updateCityName" @create="handleCityUpdate" />
+    <set-project ref="setProject" @refresh="reloadTable" />
   </div>
 </template>
 
 <script>
-import { getPublishMapList, delPublishMap, getPublishMapExport, putMapOnLine, putMapOffLine,updatePublishMapName,updatePublishMapCity } from '@/api/jmap/map';
+import { getPublishMapList, delPublishMap, getPublishMapExport, putMapOnLine, putMapOffLine, updatePublishMapName, updatePublishMapCity } from '@/api/jmap/map';
 import { getSkinCodeList } from '@/api/management/mapskin';
-import { UrlConfig } from '@/router/index';
 import localStore from 'storejs';
 import UpdateOperate from './draft.vue';
+import SetProject from './project';
 
 export default {
 	name: 'PublishMap',
-	components:{
-		UpdateOperate
+	components: {
+		UpdateOperate,
+		SetProject
 	},
 	data() {
 		return {
@@ -117,6 +117,10 @@ export default {
 								name: this.$t('global.export'),
 								handleClick: this.handleExportMapSame,
 								showControl: () => { return process.env.NODE_ENV === 'development'; }
+							},
+							{
+								name: '设置所属项目',
+								handleClick: this.handleSetProject
 							}
 						]
 					}
@@ -156,8 +160,11 @@ export default {
 			// this.$router.push({ path: `${UrlConfig.publish.mapDraft}/edit/${row.id}`, query: { name: row.name } });
 			this.$refs.updateMapName.doShow(row);
 		},
+		handleSetProject(index, row) {
+			this.$refs.setProject.doShow(row);
+		},
 		// 编辑城市
-		handleUpdateCity(index, row){
+		handleUpdateCity(index, row) {
 			this.$refs.updateCityName.doShow(row);
 		},
 		// 删除
@@ -177,7 +184,7 @@ export default {
 				});
 			}).catch(() => { });
 		},
-		handleUpdateMap(data){
+		handleUpdateMap(data) {
 			delete data.cityCode;
 			updatePublishMapName(data).then(response => {
 				this.reloadTable();
@@ -186,14 +193,14 @@ export default {
 				this.$messageBox(this.$t('error.updateFailed'));
 			});
 		},
-		handleCityUpdate(data){
+		handleCityUpdate(data) {
 			delete data.name;
 			updatePublishMapCity(data).then(response => {
 				this.reloadTable();
 				this.$message.success(this.$t('publish.updateSuccess'));
 			}).catch(() => {
 				this.$messageBox(this.$t('error.updateFailed'));
-			});	
+			});
 		},
 		reloadTable() {
 			this.queryList.reload();
diff --git a/src/views/publish/publishMap/project.vue b/src/views/publish/publishMap/project.vue
new file mode 100644
index 000000000..a3f76f43c
--- /dev/null
+++ b/src/views/publish/publishMap/project.vue
@@ -0,0 +1,87 @@
+<template>
+  <el-dialog v-dialogDrag title="设置归属项目" :visible.sync="dialogVisible" width="30%" center>
+    <el-form ref="form" :model="formModel" label-width="100px" label-position="left">
+      <el-form-item label="地图名称">
+        <span>{{ formModel.name }}</span>
+      </el-form-item>
+      <el-form-item label="是否归属项目" prop="project">
+        <el-radio-group v-model="formModel.project" @change="changeProject">
+          <el-radio :label="booleanValue.t">是</el-radio>
+          <el-radio :label="booleanValue.f">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        v-if="formModel.project"
+        label="归属项目"
+        prop="projectCode"
+        :rules="{
+          required: true, message: '归属项目不能为空', trigger: 'change'
+        }"
+      >
+        <el-select v-model="formModel.projectCode" placeholder="请选择归属项目">
+          <el-option label="西铁院" value="XTY" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { setMapProject } from '@/api/jmap/map';
+export default {
+	name: 'SetMapProject',
+	data() {
+		return {
+			dialogVisible: false,
+			formModel: {
+				id: '',
+				name: '',
+				cityCode: '',
+				skinCode: '',
+				project: false,
+				projectCode: ''
+			},
+			projectCodeShow: false,
+			booleanValue: {
+				t: true,
+				f: false
+			}
+		};
+	},
+	computed: {
+
+	},
+	methods: {
+		doShow(row) {
+			this.dialogVisible = true;
+			this.formModel.id = row.id;
+			this.formModel.name = row.name;
+			this.formModel.cityCode = row.cityCode;
+			this.formModel.skinCode = row.skinCode;
+		},
+		doSave() {
+			this.$refs['form'].validate((valid) => {
+				if (valid) {
+					setMapProject(this.formModel).then(resp =>{
+						this.$message.success('设置归属项目成功！');
+						this.dialogVisible = false;
+						this.$emit('refresh');
+					});
+				} else {
+					return false;
+				}
+			});
+
+		},
+		changeProject(val) {
+			if (!val) {
+				this.formModel.projectCode = '';
+			}
+		}
+	}
+};
+</script>
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index bdd9d2c73..156783b37 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -3,8 +3,8 @@
     <div slot="header" class="clearfix">
       <span>{{ $t('global.mapList') }}</span>
     </div>
-    <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
-    <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
+    <filter-city v-if="project==='login'" ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
+    <el-input v-if="project==='login'" v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
     <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-125) +'px' }">
       <el-tree
         ref="tree"
@@ -36,11 +36,12 @@
 </template>
 <script>
 import { getPublishMapTree } from '@/api/management/mapprd';
-import { getTrainingSystemList, getSubSystemInfo } from '@/api/trainingPlatform';
+import { getTrainingSystemList, getSubSystemInfo, getSubSystemByProjectCode } from '@/api/trainingPlatform';
 import { UrlConfig } from '@/router/index';
 import FilterCity from '@/views/components/filterCity';
 import localStore from 'storejs';
 import { getSessionStorage } from '@/utils/auth';
+import { ProjectCode } from '@/scripts/ConstDic';
 
 export default {
 	name: 'DemonList',
@@ -89,6 +90,9 @@ export default {
 	beforeDestroy () {
 	},
 	mounted() {
+		if (this.project === 'xty') {
+			this.refresh();
+		}
 	},
 	methods: {
 		filterNode(value, data) {
@@ -158,12 +162,13 @@ export default {
 			this.treeList = [];
 			this.filterSelect = filterSelect;
 			try {
-				let params={};
+				let res={};
 				if (this.project === 'xty') {
-					params={'customized': 'xty'};
+					res = await getSubSystemByProjectCode(ProjectCode[this.project]);
+				} else {
+					res = await getTrainingSystemList(filterSelect);
 				}
-				const res = await getTrainingSystemList(filterSelect, params);
-				res.data.forEach(item =>{
+				res.data && res.data.forEach(item =>{
 					item.key = item.id + item.type;
 					item.children && item.children.forEach(childrenItem => {
 						childrenItem.key = childrenItem.id + item.type;

From 27317bf24ad7d495bbf153938aae3e805c38f883 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 29 Oct 2019 14:41:47 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E8=A5=BF=E9=93=81=E9=99=A2=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/utils/baseUrl.js                     |   4 +-
 src/views/designPlatform/demonList.vue   | 316 +++++++++---------
 src/views/teach/index.vue                |  66 ++--
 src/views/trainingPlatform/demonList.vue | 402 ++++++++++++-----------
 4 files changed, 398 insertions(+), 390 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index cbc51f6c4..16e67023d 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,9 +3,9 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
diff --git a/src/views/designPlatform/demonList.vue b/src/views/designPlatform/demonList.vue
index 957a09686..6e1a4ece1 100644
--- a/src/views/designPlatform/demonList.vue
+++ b/src/views/designPlatform/demonList.vue
@@ -27,165 +27,165 @@ import localStore from 'storejs';
 import { ProjectCode } from '@/scripts/ConstDic';
 
 export default {
-	name: 'PublicMapList',
-	components: {
-		FilterCity
-	},
-	props: {
-		width: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			loading: true,
-			defaultShowKeys: [],
-			queryFunction: listPublishMap,
-			filterText: '',
-			treeData: [],
-			treeList: [],
-			selected: {},
-			defaultProps: {
-				children: 'children',
-				label: 'name'
-			},
-			node: {
-			},
-			point: {
-				x: 0,
-				y: 0
-			},
-			editModel: {},
-			localParamName: 'publish_cityCode'
-		};
-	},
-	computed: {
-		project() {
-			return getSessionStorage('project');
-		}
-	},
-	watch: {
-		filterText(val) {
-			this.treeList = this.treeData.filter((res) => {
-				return res.name.includes(val);
-			});
-		}
-	},
-	beforeDestroy () {
-		removeSessionStorage('demonList');
-	},
-	mounted() {
-		if (this.project === 'designxty') {
-			this.refresh();
-		}
-	},
-	methods: {
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		showContextMenu(e, obj, node, vueElem) {
-			if (obj) {
-				this.node = node;
-				this.selected = obj;
-			}
-		},
-		clickEvent(obj, data, ele) {
-			switch (obj.type) {
-			case 'scriptDesign': {
-				setSessionStorage('designType', 'scriptDesign');
-				this.$router.push({ path: `${UrlConfig.design.scriptHome}/${obj.mapId}?skinCode=${obj.skinCode}` });
-				break;
-			}
-			case 'lessonDesign': {
-				setSessionStorage('designType', 'lessonDesign');
-				this.$router.push({ path: `${UrlConfig.design.lessonHome}/${obj.mapId}/${obj.skinCode}`, query: {cityCode: obj.cityCode} });
-				break;
-			}
-			case 'runPlanDesign': {
-				setSessionStorage('designType', 'runPlanDesign');
-				this.$router.push({ path: `${UrlConfig.design.runPlan}/${obj.mapId}?skinCode=${obj.skinCode}` });
-				break;
-			}
-			case 'map': {
-				setSessionStorage('demonList', obj.id);
-				break;
-			}
-			case 'mapPreview': {
-				this.$router.push({ path: `${UrlConfig.design.mapPreview}/${obj.mapId}` });
-				break;
-			}
-			}
-		},
-		async refresh(filterSelect) {
-			this.loading = true;
-			this.treeData = this.treeList = [];
-			try {
-				let res = '';
-				if (this.project === 'designxty') {
-					res = await getMapListByProjectCode(ProjectCode[this.project]);
-				} else {
-					res = await listPublishMap({cityCode: filterSelect});
-				}
+    name: 'PublicMapList',
+    components: {
+        FilterCity
+    },
+    props: {
+        width: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            loading: true,
+            defaultShowKeys: [],
+            queryFunction: listPublishMap,
+            filterText: '',
+            treeData: [],
+            treeList: [],
+            selected: {},
+            defaultProps: {
+                children: 'children',
+                label: 'name'
+            },
+            node: {
+            },
+            point: {
+                x: 0,
+                y: 0
+            },
+            editModel: {},
+            localParamName: 'publish_cityCode'
+        };
+    },
+    computed: {
+        project() {
+            return getSessionStorage('project');
+        }
+    },
+    watch: {
+        filterText(val) {
+            this.treeList = this.treeData.filter((res) => {
+                return res.name.includes(val);
+            });
+        }
+    },
+    beforeDestroy () {
+        removeSessionStorage('demonList');
+    },
+    mounted() {
+        if (this.project === 'designxty') {
+            this.refresh();
+        }
+    },
+    methods: {
+        filterNode(value, data) {
+            if (!value) return true;
+            return data.name.indexOf(value) !== -1;
+        },
+        showContextMenu(e, obj, node, vueElem) {
+            if (obj) {
+                this.node = node;
+                this.selected = obj;
+            }
+        },
+        clickEvent(obj, data, ele) {
+            switch (obj.type) {
+            case 'scriptDesign': {
+                setSessionStorage('designType', 'scriptDesign');
+                this.$router.push({ path: `${UrlConfig.design.scriptHome}/${obj.mapId}?skinCode=${obj.skinCode}` });
+                break;
+            }
+            case 'lessonDesign': {
+                setSessionStorage('designType', 'lessonDesign');
+                this.$router.push({ path: `${UrlConfig.design.lessonHome}/${obj.mapId}/${obj.skinCode}`, query: {cityCode: obj.cityCode} });
+                break;
+            }
+            case 'runPlanDesign': {
+                setSessionStorage('designType', 'runPlanDesign');
+                this.$router.push({ path: `${UrlConfig.design.runPlan}/${obj.mapId}?skinCode=${obj.skinCode}` });
+                break;
+            }
+            case 'map': {
+                setSessionStorage('demonList', obj.id);
+                break;
+            }
+            case 'mapPreview': {
+                this.$router.push({ path: `${UrlConfig.design.mapPreview}/${obj.mapId}` });
+                break;
+            }
+            }
+        },
+        async refresh(filterSelect) {
+            this.loading = true;
+            this.treeData = this.treeList = [];
+            try {
+                let res = '';
+                if (this.project === 'designxty') {
+                    res = await getMapListByProjectCode(ProjectCode[this.project]);
+                } else {
+                    res = await listPublishMap({cityCode: filterSelect});
+                }
 
-				res.data && res.data.forEach(elem=>{
-					// elem.children.find(n => { return n.name.includes("行调")})
-					elem.children=[
-						{
-							id: '1',
-							name: this.$t('designPlatform.mapPreview'),
-							type: 'mapPreview',
-							mapId: elem.id,
-							cityCode: elem.cityCode
-						}
-					];
-					this.isAdministrator()?elem.children.push({id: '2', name: this.$t('designPlatform.lessonDesign'), type: 'lessonDesign', mapId: elem.id, skinCode: elem.skinCode, cityCode: elem.cityCode}):'';
-					elem.children.push(
-						{
-							id: '3',
-							name: this.$t('designPlatform.scriptDesign'),
-							type: 'scriptDesign',
-							mapId: elem.id,
-							skinCode: elem.skinCode,
-							cityCode: elem.cityCode
-							// code:elem.children.find(n => { return n.name.includes("行调")})
-						});
-					elem.children.push(
-						{
-							id: '4',
-							name: this.$t('designPlatform.runPlanDesign'),
-							type: 'runPlanDesign',
-							mapId: elem.id,
-							skinCode: elem.skinCode,
-							cityCode: elem.cityCode
-						}
-					);
-				});
-				this.treeData = res.data;
-				this.treeList = this.filterText
-					? res.data.filter(elem => { return elem.name.includes(this.filterText); })
-					: res.data;
-				this.$nextTick(() => {
-					const mapId = getSessionStorage('demonList') || null;
-					this.$refs.tree.setCurrentKey(mapId);
-					this.loading = false;
-				});
-			} catch (error) {
-				this.loading = false;
-				this.$messageBox(this.$t('error.refreshFailed'));
-			}
-		},
-		resize() {
-			this.widthLeft = Number(localStore.get('LeftWidth')) || this.widthLeft;
-			const width = this.$store.state.app.width - 521 - this.widthLeft;
-			const height = this.$store.state.app.height - 90;
-			this.$store.dispatch('config/resize', { width: width, height: height });
-		},
-		isAdministrator() {
-			return this.$store.state.user.roles.includes(superAdmin) || this.$store.state.user.roles.includes(admin);
-		}
-	}
+                res.data && res.data.forEach(elem=>{
+                    // elem.children.find(n => { return n.name.includes("行调")})
+                    elem.children = [
+                        {
+                            id: '1',
+                            name: this.$t('designPlatform.mapPreview'),
+                            type: 'mapPreview',
+                            mapId: elem.id,
+                            cityCode: elem.cityCode
+                        }
+                    ];
+                    this.isAdministrator() ? elem.children.push({id: '2', name: this.$t('designPlatform.lessonDesign'), type: 'lessonDesign', mapId: elem.id, skinCode: elem.skinCode, cityCode: elem.cityCode}) : '';
+                    elem.children.push(
+                        {
+                            id: '3',
+                            name: this.$t('designPlatform.scriptDesign'),
+                            type: 'scriptDesign',
+                            mapId: elem.id,
+                            skinCode: elem.skinCode,
+                            cityCode: elem.cityCode
+                            // code:elem.children.find(n => { return n.name.includes("行调")})
+                        });
+                    elem.children.push(
+                        {
+                            id: '4',
+                            name: this.$t('designPlatform.runPlanDesign'),
+                            type: 'runPlanDesign',
+                            mapId: elem.id,
+                            skinCode: elem.skinCode,
+                            cityCode: elem.cityCode
+                        }
+                    );
+                });
+                this.treeData = res.data;
+                this.treeList = this.filterText
+                    ? res.data.filter(elem => { return elem.name.includes(this.filterText); })
+                    : res.data;
+                this.$nextTick(() => {
+                    const mapId = getSessionStorage('demonList') || null;
+                    this.$refs.tree.setCurrentKey(mapId);
+                    this.loading = false;
+                });
+            } catch (error) {
+                this.loading = false;
+                this.$messageBox(this.$t('error.refreshFailed'));
+            }
+        },
+        resize() {
+            this.widthLeft = Number(localStore.get('LeftWidth')) || this.widthLeft;
+            const width = this.$store.state.app.width - 521 - this.widthLeft;
+            const height = this.$store.state.app.height - 90;
+            this.$store.dispatch('config/resize', { width: width, height: height });
+        },
+        isAdministrator() {
+            return this.$store.state.user.roles.includes(superAdmin) || this.$store.state.user.roles.includes(admin);
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/teach/index.vue b/src/views/teach/index.vue
index 2ef6435d7..e57869db2 100644
--- a/src/views/teach/index.vue
+++ b/src/views/teach/index.vue
@@ -40,37 +40,39 @@ import { UrlConfig } from '@/router/index';
 import localStore from 'storejs';
 
 export default {
-	name: 'TeachHome',
-	data() {
-		return {
-			tableData: [],
-			loading: false
-		};
-	},
-	watch: {
-		'$route.params.subSystem': function(newVal) {
-			this.loadInitPage();
-		}
-	},
-	mounted() {
-		this.loadInitPage();
-	},
-	methods: {
-		loadInitPage() {
-			if (this.$route.params.subSystem) {
-				getSubSystemDetail(this.$route.params.subSystem).then(resp =>{
-					if (resp.data) {
-						this.tableData = resp.data.lessonList;
-					}
-				}).catch(()=>{
-					this.$messageBox(this.$t('error.obtainCourseInformationFailed'));
-				});
-			}
-		},
-		goLesson(row) {
-			localStore.set('teachDetail'+this.$route.params.subSystem, `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}?lessonId=${row.id}&mapId=${row.mapId}&prdCode=${row.prdCode}`);
-			this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}`, query: {lessonId: row.id, mapId: row.mapId, prdCode: row.prdCode}});
-		}
-	}
+    name: 'TeachHome',
+    data() {
+        return {
+            tableData: [],
+            loading: false
+        };
+    },
+    watch: {
+        '$route.params.subSystem': function(newVal) {
+            this.loadInitPage();
+        }
+    },
+    mounted() {
+        this.loadInitPage();
+    },
+    methods: {
+        loadInitPage() {
+            if (this.$route.params.subSystem) {
+                getSubSystemDetail(this.$route.params.subSystem).then(resp =>{
+                    if (resp.data) {
+                        this.tableData = resp.data.lessonList;
+                    } else {
+                        this.tableData = [];
+                    }
+                }).catch(()=>{
+                    this.$messageBox(this.$t('error.obtainCourseInformationFailed'));
+                });
+            }
+        },
+        goLesson(row) {
+            localStore.set('teachDetail' + this.$route.params.subSystem, `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}?lessonId=${row.id}&mapId=${row.mapId}&prdCode=${row.prdCode}`);
+            this.$router.push({ path: `${UrlConfig.trainingPlatform.teachDetail}/${this.$route.params.subSystem}`, query: {lessonId: row.id, mapId: row.mapId, prdCode: row.prdCode}});
+        }
+    }
 };
 </script>
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index 156783b37..656813271 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -3,35 +3,38 @@
     <div slot="header" class="clearfix">
       <span>{{ $t('global.mapList') }}</span>
     </div>
-    <filter-city v-if="project==='login'" ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
-    <el-input v-if="project==='login'" v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
-    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-125) +'px' }">
-      <el-tree
-        ref="tree"
-        :data="treeList"
-        node-key="id"
-        :props="defaultProps"
-        highlight-current
-        :span="22"
-        :filter-node-method="filterNode"
-        :default-expanded-keys="expandList"
-        @node-click="clickEvent"
-        @node-contextmenu="showContextMenu"
-        @node-expand="nodeExpand"
-        @node-collapse="nodeCollapse"
-      >
-        <span slot-scope="{ node }">
-          <span
-            class="el-icon-tickets"
-          />
-          <span v-if="node.data.id ==='Simulation'">&nbsp;{{ node.data.name+ $t('global.simulationSystem') }}</span>
-          <span v-else-if="node.data.id ==='Lesson'">&nbsp;{{ node.data.name+ $t('global.lessonSystem') }}</span>
-          <span v-else-if="node.data.id ==='Exam'">&nbsp;{{ node.data.name+ $t('global.examSystem') }}</span>
-          <span v-else-if="node.data.id ==='Plan'">&nbsp;{{ node.data.name+ $t('global.runPlanSystem') }}</span>
-          <span v-else>&nbsp;{{ node.data.name }}</span>
-        </span>
-      </el-tree>
-    </el-scrollbar>
+    <div style="height: calc(100% - 47px);">
+      <filter-city v-if="project==='login'" ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
+      <el-input v-if="project==='login'" v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
+      <div style="height: 100%;">
+        <el-tree
+          ref="tree"
+          :data="treeList"
+          node-key="id"
+          :props="defaultProps"
+          highlight-current
+          :span="22"
+          :filter-node-method="filterNode"
+          :default-expanded-keys="expandList"
+          @node-click="clickEvent"
+          @node-contextmenu="showContextMenu"
+          @node-expand="nodeExpand"
+          @node-collapse="nodeCollapse"
+        >
+          <span slot-scope="{ node }">
+            <span
+              class="el-icon-tickets"
+            />
+            <span v-if="node.data.id ==='Simulation'">&nbsp;{{ node.data.name+ $t('global.simulationSystem') }}</span>
+            <span v-else-if="node.data.id ==='Lesson'">&nbsp;{{ node.data.name+ $t('global.lessonSystem') }}</span>
+            <span v-else-if="node.data.id ==='Exam'">&nbsp;{{ node.data.name+ $t('global.examSystem') }}</span>
+            <span v-else-if="node.data.id ==='Plan'">&nbsp;{{ node.data.name+ $t('global.runPlanSystem') }}</span>
+            <span v-else>&nbsp;{{ node.data.name }}</span>
+          </span>
+        </el-tree>
+      </div>
+    </div>
+
   </el-card>
 </template>
 <script>
@@ -44,174 +47,174 @@ import { getSessionStorage } from '@/utils/auth';
 import { ProjectCode } from '@/scripts/ConstDic';
 
 export default {
-	name: 'DemonList',
-	components: {
-		FilterCity
-	},
-	props: {
-		height: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			loading: true,
-			defaultShowKeys: [],
-			queryFunction: getPublishMapTree,
-			filterText: '',
-			treeList: [],
-			selected: {},
-			defaultProps: {
-				children: 'children',
-				label: 'name'
-			},
-			node: {
-			},
-			mapId: '',
-			expandList: [],
-			filterSelect: '',
-			localParamName: 'training_cityCode'
-		};
-	},
-	computed: {
-		userId() {
-			return this.$store.state.user.id;
-		},
-		project() {
-			return getSessionStorage('project');
-		}
-	},
-	watch: {
-		filterText(val) {
-			this.$refs.tree.filter(val);
-		}
-	},
-	beforeDestroy () {
-	},
-	mounted() {
-		if (this.project === 'xty') {
-			this.refresh();
-		}
-	},
-	methods: {
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		showContextMenu(e, obj, node, vueElem) {
-			if (obj) {
-				this.node = node;
-				this.selected = obj;
-			}
-		},
-		clickEvent(obj, data, ele) {
-			localStore.set('trainingPlatformCheckId'+this.filterSelect+this.userId, obj.id);
-			while (data) {
-				if (data.data.type === 'Map') {
-					this.mapId = data.data.id;
-					break;
-				}
-				data = data.parent;
-			}
-			if ( obj.type === 'Map') {
-				this.mapId = obj.id;
-				this.$router.push({ path: `${UrlConfig.trainingPlatform.permission}/${this.mapId}`});
-			} else if ( obj.type === 'MapSystem') {
-				getSubSystemInfo(obj.id).then(resp => {
-					let router = '';
-					switch (resp.data.type) {
-					case 'Exam':
-						this.setLocalRoute(`${UrlConfig.trainingPlatform.examHome}/${obj.id}`);
-						router = localStore.get('examDetail' + obj.id);
-						if (router) {
-							this.$router.push(router);
-						} else {
-							this.$router.push({ path: `${UrlConfig.trainingPlatform.examHome}/${obj.id}`});
-						}
-						break;
-					case 'Lesson':
-						this.setLocalRoute(`${UrlConfig.trainingPlatform.teachHome}/${obj.id}`);
-						router = localStore.get('teachDetail' + obj.id);
-						if (router) {
-							this.$router.push(router);
-						} else {
-							this.$router.push({ path: `${UrlConfig.trainingPlatform.teachHome}/${obj.id}`});
-						}
-						break;
-					case 'Simulation':
-						this.setLocalRoute(`${UrlConfig.trainingPlatform.prodDetail}/${obj.id}?mapId=${this.mapId}`);
-						this.$router.push({ path: `${UrlConfig.trainingPlatform.prodDetail}/${obj.id}`, query: { mapId: this.mapId}});
-						break;
-					case 'Plan':
-						this.$router.push({ path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}`, query: {skinCode: '02'} });
-						break;
-					}
-				}).catch((error) => {
-					if (error.code === '40004') {
-						this.$messageBox(this.$t('systemGenerate.getSubSystemInfoFail'));
-					}
-				});
-			}
-		},
-		setLocalRoute(path) {
-			localStore.set('trainingPlatformRoute'+this.userId, path);
-		},
-		async refresh(filterSelect) {
-			this.loading = true;
-			this.treeList = [];
-			this.filterSelect = filterSelect;
-			try {
-				let res={};
-				if (this.project === 'xty') {
-					res = await getSubSystemByProjectCode(ProjectCode[this.project]);
-				} else {
-					res = await getTrainingSystemList(filterSelect);
-				}
-				res.data && res.data.forEach(item =>{
-					item.key = item.id + item.type;
-					item.children && item.children.forEach(childrenItem => {
-						childrenItem.key = childrenItem.id + item.type;
-					});
-				});
-				this.treeList = res.data;
-				this.getExpandList(filterSelect);
-				// this.changeCityWithPage(this.treeList);
-				this.$nextTick(() => {
-					const checkId = localStore.get('trainingPlatformCheckId'+filterSelect+this.userId) || null;
-					this.$refs.tree && this.$refs.tree.setCurrentKey(checkId);
-					this.loading = false;
-				});
-			} catch (error) {
-				this.loading = false;
-				this.$messageBox(this.$t('error.refreshFailed'));
-			}
-		},
-		nodeExpand(obj, node, ele) {
-			const key = obj.id;
-			this.expandList = this.expandList.filter(item => item!==key);
-			this.expandList.push(key);
-			localStore.set('trainIngPlatformExpandList'+this.filterSelect+this.userId, this.expandList);
-		},
-		nodeCollapse(obj, node, ele) {
-			const key = obj.id;
-			this.expandList = this.expandList.filter(item => item!==key);
-			localStore.set('trainIngPlatformExpandList'+this.filterSelect+this.userId, this.expandList);
-		},
-		getExpandList(filterSelect) {
-			let expand = localStore.get('trainIngPlatformExpandList'+filterSelect+this.userId);
-			expand = expand?(expand+'').split(','):'';
-			if (expand instanceof Array) {
-				this.expandList = expand;
-			}
-		}
-		// changeCityWithPage(treeList) {
-		// 	if (treeList.length > 0) {
-		// 		this.$router.push({ path: `${UrlConfig.trainingPlatform.permission}/${treeList[0].id}`});
-		// 		this.$refs.tree.setCurrentKey(treeList[0].id);
-		// 	}
-		// }
-	}
+    name: 'DemonList',
+    components: {
+        FilterCity
+    },
+    props: {
+        height: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            loading: true,
+            defaultShowKeys: [],
+            queryFunction: getPublishMapTree,
+            filterText: '',
+            treeList: [],
+            selected: {},
+            defaultProps: {
+                children: 'children',
+                label: 'name'
+            },
+            node: {
+            },
+            mapId: '',
+            expandList: [],
+            filterSelect: '',
+            localParamName: 'training_cityCode'
+        };
+    },
+    computed: {
+        userId() {
+            return this.$store.state.user.id;
+        },
+        project() {
+            return getSessionStorage('project');
+        }
+    },
+    watch: {
+        filterText(val) {
+            this.$refs.tree.filter(val);
+        }
+    },
+    beforeDestroy () {
+    },
+    mounted() {
+        if (this.project === 'xty') {
+            this.refresh();
+        }
+    },
+    methods: {
+        filterNode(value, data) {
+            if (!value) return true;
+            return data.name.indexOf(value) !== -1;
+        },
+        showContextMenu(e, obj, node, vueElem) {
+            if (obj) {
+                this.node = node;
+                this.selected = obj;
+            }
+        },
+        clickEvent(obj, data, ele) {
+            localStore.set('trainingPlatformCheckId' + this.filterSelect + this.userId, obj.id);
+            while (data) {
+                if (data.data.type === 'Map') {
+                    this.mapId = data.data.id;
+                    break;
+                }
+                data = data.parent;
+            }
+            if ( obj.type === 'Map') {
+                this.mapId = obj.id;
+                this.$router.push({ path: `${UrlConfig.trainingPlatform.permission}/${this.mapId}`});
+            } else if ( obj.type === 'MapSystem') {
+                getSubSystemInfo(obj.id).then(resp => {
+                    let router = '';
+                    switch (resp.data.type) {
+                    case 'Exam':
+                        this.setLocalRoute(`${UrlConfig.trainingPlatform.examHome}/${obj.id}`);
+                        router = localStore.get('examDetail' + obj.id);
+                        if (router) {
+                            this.$router.push(router);
+                        } else {
+                            this.$router.push({ path: `${UrlConfig.trainingPlatform.examHome}/${obj.id}`});
+                        }
+                        break;
+                    case 'Lesson':
+                        this.setLocalRoute(`${UrlConfig.trainingPlatform.teachHome}/${obj.id}`);
+                        router = localStore.get('teachDetail' + obj.id);
+                        if (router) {
+                            this.$router.push(router);
+                        } else {
+                            this.$router.push({ path: `${UrlConfig.trainingPlatform.teachHome}/${obj.id}`});
+                        }
+                        break;
+                    case 'Simulation':
+                        this.setLocalRoute(`${UrlConfig.trainingPlatform.prodDetail}/${obj.id}?mapId=${this.mapId}`);
+                        this.$router.push({ path: `${UrlConfig.trainingPlatform.prodDetail}/${obj.id}`, query: { mapId: this.mapId}});
+                        break;
+                    case 'Plan':
+                        this.$router.push({ path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}`, query: {skinCode: '02'} });
+                        break;
+                    }
+                }).catch((error) => {
+                    if (error.code === '40004') {
+                        this.$messageBox(this.$t('systemGenerate.getSubSystemInfoFail'));
+                    }
+                });
+            }
+        },
+        setLocalRoute(path) {
+            localStore.set('trainingPlatformRoute' + this.userId, path);
+        },
+        async refresh(filterSelect) {
+            this.loading = true;
+            this.treeList = [];
+            this.filterSelect = filterSelect;
+            try {
+                let res = {};
+                if (this.project === 'xty') {
+                    res = await getSubSystemByProjectCode(ProjectCode[this.project]);
+                } else {
+                    res = await getTrainingSystemList(filterSelect);
+                }
+                res.data && res.data.forEach(item =>{
+                    item.key = item.id + item.type;
+                    item.children && item.children.forEach(childrenItem => {
+                        childrenItem.key = childrenItem.id + item.type;
+                    });
+                });
+                this.treeList = res.data;
+                this.getExpandList(filterSelect);
+                // this.changeCityWithPage(this.treeList);
+                this.$nextTick(() => {
+                    const checkId = localStore.get('trainingPlatformCheckId' + filterSelect + this.userId) || null;
+                    this.$refs.tree && this.$refs.tree.setCurrentKey(checkId);
+                    this.loading = false;
+                });
+            } catch (error) {
+                this.loading = false;
+                this.$messageBox(this.$t('error.refreshFailed'));
+            }
+        },
+        nodeExpand(obj, node, ele) {
+            const key = obj.id;
+            this.expandList = this.expandList.filter(item => item !== key);
+            this.expandList.push(key);
+            localStore.set('trainIngPlatformExpandList' + this.filterSelect + this.userId, this.expandList);
+        },
+        nodeCollapse(obj, node, ele) {
+            const key = obj.id;
+            this.expandList = this.expandList.filter(item => item !== key);
+            localStore.set('trainIngPlatformExpandList' + this.filterSelect + this.userId, this.expandList);
+        },
+        getExpandList(filterSelect) {
+            let expand = localStore.get('trainIngPlatformExpandList' + filterSelect + this.userId);
+            expand = expand ? (expand + '').split(',') : '';
+            if (expand instanceof Array) {
+                this.expandList = expand;
+            }
+        }
+        // changeCityWithPage(treeList) {
+        // 	if (treeList.length > 0) {
+        // 		this.$router.push({ path: `${UrlConfig.trainingPlatform.permission}/${treeList[0].id}`});
+        // 		this.$refs.tree.setCurrentKey(treeList[0].id);
+        // 	}
+        // }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
@@ -228,7 +231,10 @@ export default {
     .el-tree {
         overflow-x: hidden;
     }
-
+    .map-list-main{
+        text-align:left;
+        height: 100%;
+    }
     .el-tree-node.is-current>.el-tree-node__content {
         background-color: #e4e3e3 !important;
     }

From a6b0caab34b9c2f3bb0304e7133fb0b6d398c2ab Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 29 Oct 2019 15:06:15 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E8=A5=BF=E9=93=81=E9=99=A2=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/permission.js                        |  188 +--
 src/router/index.js                      | 1809 +++++++++++-----------
 src/views/trainingPlatform/demonList.vue |    1 +
 src/views/trainingPlatform/index.vue     |  109 +-
 4 files changed, 1060 insertions(+), 1047 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index bdf3c6012..3caafc04c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -10,9 +10,9 @@ import { getSessionStorage } from '@/utils/auth';
 import localStore from 'storejs';
 
 function hasPermission(roles, permissionRoles) {
-	if (roles.indexOf(admin) >= 0) return true;
-	if (!permissionRoles) return true;
-	return roles.some(role => permissionRoles.indexOf(role) >= 0);
+    if (roles.indexOf(admin) >= 0) return true;
+    if (!permissionRoles) return true;
+    return roles.some(role => permissionRoles.indexOf(role) >= 0);
 }
 
 const whiteList = ['/login', '/design/login', '/xty/login', '/designxty/login']; // 不重定向白名单
@@ -27,106 +27,106 @@ const loginDesignXtyPage = whiteList[3];
 
 // 获取路径数据
 function getRouteInfo(to) {
-	let loginPath = '/';
-	let getTokenInfo = () => { };
-	let clientId = '';
-	const toRoutePath = to.redirectedFrom || to.path;
-	if (/^\/designxty/.test(toRoutePath)) {
-		loginPath = loginDesignXtyPage;
-		getTokenInfo = getDesignToken;
-		clientId = LoginParams.Design.clientId;
-	} else if (/^\/design/.test(toRoutePath) || /^\/scriptDisplay/.test(toRoutePath) || /^\/publish/.test(toRoutePath) || /^\/orderauthor/.test(toRoutePath) || /^\/system/.test(toRoutePath)|| /^\/display\/record/.test(toRoutePath) || /^\/display\/manage/.test(toRoutePath) || /^\/apply/.test(toRoutePath)) {
-		loginPath = getSessionStorage('project')==='designxty'?loginDesignXtyPage:loginDesignPage;
-		getTokenInfo = getDesignToken;
-		clientId = LoginParams.Design.clientId;
-	} else if (/^\/plan/.test(toRoutePath) || /^\/display\/plan/.test(toRoutePath)) {
-		if (getSessionStorage('project').startsWith('design')) {
-			loginPath = getSessionStorage('project')==='designxty'?loginDesignXtyPage:loginDesignPage;
-			getTokenInfo = getDesignToken;
-			clientId = LoginParams.Design.clientId;
-		} else {
-			loginPath = getSessionStorage('project')==='xty'?loginXtyPage:loginPage;
-			getTokenInfo = getToken;
-			clientId = null;
-		}
-	} else if ( /^\/xty/.test(toRoutePath)) {
-		loginPath = loginXtyPage;
-		getTokenInfo = getToken;
-		clientId = null;
-	} else {
-		loginPath = getSessionStorage('project')==='xty'?loginXtyPage:loginPage;
-		getTokenInfo = getToken;
-		clientId = null;
-	}
+    let loginPath = '/';
+    let getTokenInfo = () => { };
+    let clientId = '';
+    const toRoutePath = to.redirectedFrom || to.path;
+    if (/^\/designxty/.test(toRoutePath)) {
+        loginPath = loginDesignXtyPage;
+        getTokenInfo = getDesignToken;
+        clientId = LoginParams.Design.clientId;
+    } else if (/^\/design/.test(toRoutePath) || /^\/scriptDisplay/.test(toRoutePath) || /^\/publish/.test(toRoutePath) || /^\/orderauthor/.test(toRoutePath) || /^\/system/.test(toRoutePath) || /^\/display\/record/.test(toRoutePath) || /^\/display\/manage/.test(toRoutePath) || /^\/apply/.test(toRoutePath)) {
+        loginPath = getSessionStorage('project') === 'designxty' ? loginDesignXtyPage : loginDesignPage;
+        getTokenInfo = getDesignToken;
+        clientId = LoginParams.Design.clientId;
+    } else if (/^\/plan/.test(toRoutePath) || /^\/display\/plan/.test(toRoutePath)) {
+        if (getSessionStorage('project').startsWith('design')) {
+            loginPath = getSessionStorage('project') === 'designxty' ? loginDesignXtyPage : loginDesignPage;
+            getTokenInfo = getDesignToken;
+            clientId = LoginParams.Design.clientId;
+        } else {
+            loginPath = getSessionStorage('project') === 'xty' ? loginXtyPage : loginPage;
+            getTokenInfo = getToken;
+            clientId = null;
+        }
+    } else if ( /^\/xty/.test(toRoutePath)) {
+        loginPath = loginXtyPage;
+        getTokenInfo = getToken;
+        clientId = null;
+    } else {
+        loginPath = getSessionStorage('project') === 'xty' ? loginXtyPage : loginPage;
+        getTokenInfo = getToken;
+        clientId = null;
+    }
 
-	return { clientId, loginPath, getTokenInfo };
+    return { clientId, loginPath, getTokenInfo };
 }
 
 function handleRoute(to, from, next, routeInfo) {
-	if (store.getters.roles.length === 0) {
-		// 拉取用户信息
-		store.dispatch('GetInfo', routeInfo.getTokenInfo).then(res => {
-			// 根据roles权限生成可访问的路由表
-			const roles = res.roles;
-			if (getSessionStorage('project').startsWith('design')) {
-				roles.push(userDesign);
-			}
-			store.dispatch('GenerateRoutes', { roles, clientId: routeInfo.clientId }).then(() => {
-				// 动态添加可访问路由表
-				router.addRoutes(store.getters.addRouters);
-				// router.addRoutes(asyncRouter1);
-				if (to.redirectedFrom) {
-					next({ path: to.redirectedFrom, replace: true });
-				} else {
-					next({ ...to, replace: true });
-				}
-			});
+    if (store.getters.roles.length === 0) {
+        // 拉取用户信息
+        store.dispatch('GetInfo', routeInfo.getTokenInfo).then(res => {
+            // 根据roles权限生成可访问的路由表
+            const roles = res.roles;
+            if (getSessionStorage('project').startsWith('design')) {
+                roles.push(userDesign);
+            }
+            store.dispatch('GenerateRoutes', { roles, clientId: routeInfo.clientId }).then(() => {
+                // 动态添加可访问路由表
+                router.addRoutes(store.getters.addRouters);
+                // router.addRoutes(asyncRouter1);
+                if (to.redirectedFrom) {
+                    next({ path: to.redirectedFrom, replace: true });
+                } else {
+                    next({ ...to, replace: true });
+                }
+            });
 
-		}).catch(() => {
-			store.dispatch('FedLogOut', routeInfo.clientId).then(() => {
-				Vue.prototype.$messageBox('验证失败，请重新登录！');
-				next({ path: routeInfo.loginPath });
-			});
-		});
-	} else {
-		// 除没有动态改变权限的需求可直接next() 删下方权限判断
-		if (hasPermission(store.getters.roles, to.meta.roles)) {
-			if (to.path==='/404' && to.redirectedFrom==='/') {
-				next(localStore.get('trainingPlatformRoute'+store.getters.id) ||'/trainingPlatform');
-			} else {
-				next();
-			}
-		} else {
-			next({ path: '/401', replace: true, query: { noGoBack: true } });
-		}
-	}
+        }).catch(() => {
+            store.dispatch('FedLogOut', routeInfo.clientId).then(() => {
+                Vue.prototype.$messageBox('验证失败，请重新登录！');
+                next({ path: routeInfo.loginPath });
+            });
+        });
+    } else {
+        // 除没有动态改变权限的需求可直接next() 删下方权限判断
+        if (hasPermission(store.getters.roles, to.meta.roles)) {
+            if (to.path === '/404' && to.redirectedFrom === '/') {
+                next(localStore.get('trainingPlatformRoute' + store.getters.id) || '/trainingPlatform');
+            } else {
+                next();
+            }
+        } else {
+            next({ path: '/401', replace: true, query: { noGoBack: true } });
+        }
+    }
 }
 
 router.beforeEach((to, from, next) => {
-	NProgress.start();
-	const routeInfo = getRouteInfo(to);
-	if (routeInfo.getTokenInfo()) {
-		// 已登录
-		if (to.path === routeInfo.loginPath) {
-			// 登录页面不拦截
-			next();
-		} else {
-			// 进入系统重新计算路由
-			handleRoute(to, from, next, routeInfo);
-		}
-	} else {
-		// 未登录情况下
-		if (whiteList.indexOf(to.path) !== -1) {
-			// 在免登录白名单，直接进入
-			next();
-		} else {
-			// 否则全部重定向到登录页
-			next(routeInfo.loginPath);
-		}
-	}
+    NProgress.start();
+    const routeInfo = getRouteInfo(to);
+    if (routeInfo.getTokenInfo()) {
+        // 已登录
+        if (to.path === routeInfo.loginPath) {
+            // 登录页面不拦截
+            next();
+        } else {
+            // 进入系统重新计算路由
+            handleRoute(to, from, next, routeInfo);
+        }
+    } else {
+        // 未登录情况下
+        if (whiteList.indexOf(to.path) !== -1) {
+            // 在免登录白名单，直接进入
+            next();
+        } else {
+            // 否则全部重定向到登录页
+            next(routeInfo.loginPath);
+        }
+    }
 });
 
 router.afterEach(() => {
-	// 结束Progress
-	NProgress.done();
+    // 结束Progress
+    NProgress.done();
 });
diff --git a/src/router/index.js b/src/router/index.js
index 7f63259d2..f948a4543 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -147,118 +147,118 @@ export const userLesson = '012'; 		// 教学系统
 export const userSimulation = '013';	// 仿真系统
 export const userScreen = '014'; 		// 大屏系统
 export const userPlan = '015'; 			// 计划系统
-export const userDesign='016';			// 设计系统
+export const userDesign = '016';			// 设计系统
 const isDev = process.env.NODE_ENV === 'development';
 
 export const UrlConfig = {
-	display: '/display',
-	scriptDisplay: '/scriptDisplay',
-	examRuleDraft: '/examRule/draft',
-	examRuleManage: '/examRule/manage',
-	map: {
-		prefix: '/map',
-		draft: '/map/draw',
-		skinCode: '/system/skinCode',
-		skinCodeDraft: '/system/skinCode/draft',
-		runPlan: '/map/runPlan',
-		runPlanView: '/map/runPlan/view',
-		product: '/map/product',
-		productDraft: '/map/product/draft'
-	},
-	lesson: {
-		prefix: '/lesson',
-		record: '/system/record/training',
-		manage: '/lesson/manage/training'
-	},
-	dp: {
-		prefix: '/dp',
-		detail: '/dp/detail',
-		pay: '/dp/pay'
+    display: '/display',
+    scriptDisplay: '/scriptDisplay',
+    examRuleDraft: '/examRule/draft',
+    examRuleManage: '/examRule/manage',
+    map: {
+        prefix: '/map',
+        draft: '/map/draw',
+        skinCode: '/system/skinCode',
+        skinCodeDraft: '/system/skinCode/draft',
+        runPlan: '/map/runPlan',
+        runPlanView: '/map/runPlan/view',
+        product: '/map/product',
+        productDraft: '/map/product/draft'
+    },
+    lesson: {
+        prefix: '/lesson',
+        record: '/system/record/training',
+        manage: '/lesson/manage/training'
+    },
+    dp: {
+        prefix: '/dp',
+        detail: '/dp/detail',
+        pay: '/dp/pay'
 
-	},
-	plan: {
-		prefix: '/plan',
-		tool: '/plan/tool',
-		usertool: '/plan/usertool',
-		detail: '/plan/detail',
-		pay: '/plan/pay'
-	},
-	design: {
-		prefix: '/design/home',
-		mapDraw: '/design/map/draw',
-		lessonEdit: '/design/lesson/edit',
-		lessonHome: '/design/lesson/home',
-		lessonManage: '/design/lesson/manage',
-		taskManage: '/design/lesson/taskManage',
-		trainingRule: '/design/lesson/trainingRule',
-		trainingRuleDetail: '/design/lesson/trainingRule/detail',
-		trainingManage: '/design/lesson/trainingManage',
-		lessonTraining: '/design/lesson/training',
-		trainingRecord: '/design/lesson/training',
-		runPlan: '/design/runPlan/detail',
-		scriptHome: '/design/script/home',
-		display: '/design/display',
-		mapPreview: '/design/mapPreview'
-	},
-	designUser: {
-		prefix: '/design/userlist/home',
-		scriptHome: '/design/userlist/script/home',
-		mapDraw: '/design/userlist/map/draw',
-		lessonHome: '/design/userlist/lesson/home',
-		runPlan: '/design/userlist/runPlan/detail'
-	},
-	replay: {
-		prefix: '/replay'
-	},
-	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',
-		authorDetail: '/orderauthor/author/detail',
-		authorDraft: '/orderauthor/author/draft',
-		transferDetail: '/orderauthor/transfer/detail',
-		trainferPackage: '/orderauthor/transfer/package',
-		createPackage: '/orderauthor/transfer/create'
-	},
-	script: {
-		prefix: '/script',
-		detail: '/script/detail',
-		display: '/script/display'
-	},
-	ibp: {
-		prefix: 'ibp',
-		draft: '/ibp/draft',
-		edit: 'ibp/edit'
-	},
-	trainingPlatform: {
-		trainingPlatform: '/trainingPlatform',
-		prodDetail: '/trainingPlatform/detail',
-		teachDetail: '/trainingPlatform/teach',
-		teachHome: '/trainingPlatform/teachHome',
-		examDetail: '/trainingPlatform/exam',
-		examHome: '/trainingPlatform/examHome',
-		examRuleManage: '/trainingPlatform/examRule/manage',
-		examRuleDraft: '/trainingPlatform/examRule/Draft',
-		course: '/trainingPlatform/course',
-		practical: '/trainingPlatform/practical',
-		permission: '/trainingPlatform/permission',
-		permissionDetails: '/trainingPlatform/permission/detail',
-		draft: '/trainingPlatform/draft',
-		pay: '/trainingPlatform/pay',
-		runPlan: '/trainingPlatform/runPlan/manage'
-	}
+    },
+    plan: {
+        prefix: '/plan',
+        tool: '/plan/tool',
+        usertool: '/plan/usertool',
+        detail: '/plan/detail',
+        pay: '/plan/pay'
+    },
+    design: {
+        prefix: '/design/home',
+        mapDraw: '/design/map/draw',
+        lessonEdit: '/design/lesson/edit',
+        lessonHome: '/design/lesson/home',
+        lessonManage: '/design/lesson/manage',
+        taskManage: '/design/lesson/taskManage',
+        trainingRule: '/design/lesson/trainingRule',
+        trainingRuleDetail: '/design/lesson/trainingRule/detail',
+        trainingManage: '/design/lesson/trainingManage',
+        lessonTraining: '/design/lesson/training',
+        trainingRecord: '/design/lesson/training',
+        runPlan: '/design/runPlan/detail',
+        scriptHome: '/design/script/home',
+        display: '/design/display',
+        mapPreview: '/design/mapPreview'
+    },
+    designUser: {
+        prefix: '/design/userlist/home',
+        scriptHome: '/design/userlist/script/home',
+        mapDraw: '/design/userlist/map/draw',
+        lessonHome: '/design/userlist/lesson/home',
+        runPlan: '/design/userlist/runPlan/detail'
+    },
+    replay: {
+        prefix: '/replay'
+    },
+    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',
+        authorDetail: '/orderauthor/author/detail',
+        authorDraft: '/orderauthor/author/draft',
+        transferDetail: '/orderauthor/transfer/detail',
+        trainferPackage: '/orderauthor/transfer/package',
+        createPackage: '/orderauthor/transfer/create'
+    },
+    script: {
+        prefix: '/script',
+        detail: '/script/detail',
+        display: '/script/display'
+    },
+    ibp: {
+        prefix: 'ibp',
+        draft: '/ibp/draft',
+        edit: 'ibp/edit'
+    },
+    trainingPlatform: {
+        trainingPlatform: '/trainingPlatform',
+        prodDetail: '/trainingPlatform/detail',
+        teachDetail: '/trainingPlatform/teach',
+        teachHome: '/trainingPlatform/teachHome',
+        examDetail: '/trainingPlatform/exam',
+        examHome: '/trainingPlatform/examHome',
+        examRuleManage: '/trainingPlatform/examRule/manage',
+        examRuleDraft: '/trainingPlatform/examRule/Draft',
+        course: '/trainingPlatform/course',
+        practical: '/trainingPlatform/practical',
+        permission: '/trainingPlatform/permission',
+        permissionDetails: '/trainingPlatform/permission/detail',
+        draft: '/trainingPlatform/draft',
+        pay: '/trainingPlatform/pay',
+        runPlan: '/trainingPlatform/runPlan/manage'
+    }
 };
 
 /**
@@ -267,811 +267,820 @@ export const UrlConfig = {
  * all roles can be accessed
  */
 export const constantRoutes = [
-	// 实训平台登录
-	{
-		path: '/login',
-		component: Login,
-		hidden: true
-	},
-	// 项目系统登录
-	{
-		path: '/xty/login',
-		component: Login,
-		hidden: true
-	},
-	// 设计平台登录
-	{
-		path: '/design/login',
-		component: Login,
-		hidden: true
-	},
-	{
-		path: '/designxty/login',
-		component: Login,
-		hidden: true
-	},
-	{
-		path: '/design/jlmap3d/edit',
-		component: Jlmap3dedit,
-		hidden: true
-	},
-	{
-		path: '/401',
-		component: Error401,
-		hidden: true
-	},
+    // 实训平台登录
+    {
+        path: '/login',
+        component: Login,
+        hidden: true
+    },
+    // 项目系统登录
+    {
+        path: '/xty/login',
+        component: Login,
+        hidden: true
+    },
+    {
+        path: '/xty',
+        redirect: '/xty/login',
+        hidden: true
+    },
+    // 设计平台登录
+    {
+        path: '/design/login',
+        component: Login,
+        hidden: true
+    },
+    {
+        path: '/designxty/login',
+        component: Login,
+        hidden: true
+    },
+    {
+        path: '/designxty',
+        redirect: '/designxty/login',
+        hidden: true
+    },
+    {
+        path: '/design/jlmap3d/edit',
+        component: Jlmap3dedit,
+        hidden: true
+    },
+    {
+        path: '/401',
+        component: Error401,
+        hidden: true
+    },
 
-	{
-		path: '/404',
-		component: Errpr404,
-		hidden: true
-	},
-	{ path: '*', redirect: '/404', hidden: true }
+    {
+        path: '/404',
+        component: Errpr404,
+        hidden: true
+    },
+    { path: '*', redirect: '/404', hidden: true }
 ];
 
 export const asyncRouter = [
-	{
-		path: '/design',
-		component: Layout,
-		redirect: '/design/home',
-		meta: {
-			roles: [admin, user, userDesign]
-		},
-		children: [
-			{
-				path: '',
-				redirect: '/design/home',
-				component: DesignPlatform,
-				meta: {
-					i18n: 'router.designhomePage',
-					icon: 'design'
-				},
-				children: [
-					{
-						path: 'home',
-						component: DesignPlatformHome,
-						meta: {
-						}
-					},
-					{
-						path: 'map/draw/:mapId/:view',
-						component: Mapedit,
-						hidden: true
-					},
-					{
-						path: 'lesson/edit/:type',
-						component: LessonEdit,
-						hidden: true
-					},
-					{
-						path: 'runPlan/detail/:mapId',
-						component: PlanMonitorDetail,
-						hidden: true
-					},
-					{
-						path: 'script/home/:mapId',
-						component: ScriptmanageHome,
-						meta: {
-							i18n: 'router.scriptManage'
-						},
-						hidden: true
-					},
-					{
-						path: 'lesson/home/:mapId/:skinCode',
-						component: LessonHome,
-						hidden: true
-					},
-					{
-						path: 'lesson/details',
-						component: LessonDetail,
-						hidden: true,
-						children: [
-							{
-								path: 'edit/:type',
-								component: LessonEdit,
-								hidden: true
-							}
-						]
-					},
-					{
-						path: 'lesson/training/:trainingId/:trainingName',
-						component: TrainingrecordManage,
-						hidden: true
-					},
-					{
-						path: 'lesson/taskManage',
-						component: Taskmanage,
-						hidden: true
-					},
-					{
-						path: 'lesson/trainingRule',
-						component: TrainingRuleList,
-						hidden: true
-					},
-					{
-						path: 'lesson/trainingRule/detail',
-						hidden: true,
-						component: TrainingRuleEdit
-					},
-					{
-						path: 'lesson/trainingManage/:skinCode',
-						component: Trainingmanage,
-						hidden: true
-					},
-					{
-						path: 'lesson/training/:trainingId/:trainingName',
-						component: TrainingrecordManage,
-						hidden: true
-					},
-					{
-						path: 'mapPreview/:mapId',
-						component: MapPreview,
-						hidden: true
+    {
+        path: '/design',
+        component: Layout,
+        redirect: '/design/home',
+        meta: {
+            roles: [admin, user, userDesign]
+        },
+        children: [
+            {
+                path: '',
+                redirect: '/design/home',
+                component: DesignPlatform,
+                meta: {
+                    i18n: 'router.designhomePage',
+                    icon: 'design'
+                },
+                children: [
+                    {
+                        path: 'home',
+                        component: DesignPlatformHome,
+                        meta: {
+                        }
+                    },
+                    {
+                        path: 'map/draw/:mapId/:view',
+                        component: Mapedit,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/edit/:type',
+                        component: LessonEdit,
+                        hidden: true
+                    },
+                    {
+                        path: 'runPlan/detail/:mapId',
+                        component: PlanMonitorDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'script/home/:mapId',
+                        component: ScriptmanageHome,
+                        meta: {
+                            i18n: 'router.scriptManage'
+                        },
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/home/:mapId/:skinCode',
+                        component: LessonHome,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/details',
+                        component: LessonDetail,
+                        hidden: true,
+                        children: [
+                            {
+                                path: 'edit/:type',
+                                component: LessonEdit,
+                                hidden: true
+                            }
+                        ]
+                    },
+                    {
+                        path: 'lesson/training/:trainingId/:trainingName',
+                        component: TrainingrecordManage,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/taskManage',
+                        component: Taskmanage,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/trainingRule',
+                        component: TrainingRuleList,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/trainingRule/detail',
+                        hidden: true,
+                        component: TrainingRuleEdit
+                    },
+                    {
+                        path: 'lesson/trainingManage/:skinCode',
+                        component: Trainingmanage,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/training/:trainingId/:trainingName',
+                        component: TrainingrecordManage,
+                        hidden: true
+                    },
+                    {
+                        path: 'mapPreview/:mapId',
+                        component: MapPreview,
+                        hidden: true
 
-					}
-				]
-			}
-		]
-	},
-	{
-		path: '/design/userlist',
-		redirect: '/design/userlist/home',
-		component: Layout,
-		meta: {
-			roles: [admin, user, userDesign]
-		},
-		children: [
-			{
-				path: '',
-				redirect: '/design/userlist/home',
-				component: DesignPlatformUser,
-				meta: {
-					i18n: 'router.designUserPage',
-					icon: 'design'
-				},
-				children: [
-					{
-						path: 'home',
-						component: DesignPlatformHome,
-						meta: {
-						}
-					},
-					{
-						path: 'map/draw/:mapId/:view',
-						component: Mapedit,
-						hidden: true
-					},
-					{
-						path: 'lesson/edit/:type',
-						component: LessonEdit,
-						hidden: true
-					},
-					{
-						path: 'runPlan/detail/:mapId',
-						component: PlanMonitorDetail,
-						hidden: true
-					},
-					{
-						path: 'script/home/:mapId',
-						component: ScriptmanageHome,
-						meta: {
-							i18n: 'router.scriptManage'
-						},
-						hidden: true
-					},
-					{
-						path: 'lesson/home/:mapId',
-						component: LessonHome,
-						hidden: true
-					},
-					{
-						path: 'lesson/training/:trainingId/:trainingName',
-						component: TrainingrecordManage,
-						hidden: true
-					}
-				]
-			}
-		]
-	},
-	{
-		path: '/display/:mode',
-		component: Display,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/design/display/:mode',
-		component: DesignDisplay,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/scriptDisplay/:mode',
-		component: ScriptDisplay,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/trainroom',
-		component: TrainRoom,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/jointTraining',
-		component: JointTraining,
-		hidden: true
-	},
-	{
-		path: '/jlmap3d',
-		component: Jlmap3d,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/map',
-		meta: {
-			i18n: 'router.mapManage',
-			roles: [admin, mapCreater, userDesign]
-		},
-		hidden: true,
-		component: Layout,
-		children: [
-			{
-				path: 'draw',
-				redirect: '/map/draw/0/draft',
-				component: Mapdraft,
-				meta: {
-					i18n: 'router.mapDraw'
-				},
-				children: [
-					{
-						path: ':mapId/:view',
-						component: Mapedit,
-						hidden: true
-					}
-				]
-			},
-			{
-				path: 'runPlan',
-				redirect: '/map/runPlan/view/draft',
-				component: Runplan,
-				meta: {
-					i18n: 'router.runPlanManage'
-				},
-				children: [{
-					path: 'view/:mode',
-					component: RunplanView,
-					hidden: true
-				}]
-			}
-		]
-	},
-	{
-		path: '/trainingPlatform',
-		component: Layout,
-		hidden: true,
-		meta: {
-			roles: [admin, userSimulation, user]
-		},
-		children: [
-			{
-				path: '',
-				redirect: '/trainingPlatform/permission/14',
-				component: TrainingPlatform,
-				meta: {
-				},
-				children: [
-					{
-						path: 'detail/:subSystem',
-						component: DemonstrationDetail,
-						hidden: true
-					},
-					{
-						path: 'teachHome/:subSystem',
-						component: TeachHome,
-						hidden: true
-					},
-					{
-						path: 'teach/:subSystem',
-						component: TeachDetail,
-						hidden: true
-					},
-					{
-						path: 'examHome/:subSystem',
-						component: ExamHome,
-						hidden: true
-					},
-					{
-						path: 'exam/:examId',
-						component: ExamDetail,
-						hidden: true
-					},
-					{
-						path: 'practical/:trainingId/:lessonId',
-						component: TeachPractical,
-						hidden: true
-					},
-					{
-						path: 'pay/:lessonId',
-						component: Pay,
-						hidden: true
-					},
-					{
-						path: 'course/:subSystem',
-						component: ExamCourseDetail,
-						hidden: true
-					},
-					{
-						path: 'result/:userExamId',
-						component: ExamResult,
-						hidden: true
-					},
-					{
-						path: 'permission/:mapId',
-						component: Package,
-						hidden: true
-					},
-					{
-						path: 'permission/detail/:id',
-						component: PackageDetail,
-						hidden: true
-					},
-					{
-						path: 'draft',
-						component: PackageDraft,
-						hidden: true
-					},
-					{
-						path: 'examRule/manage',
-						component: PublishExamRule,
-						hidden: true
-					},
-					{
-						path: 'examRule/draft/:mode/:ruleId/:lessonId',
-						component: PublishExamRuleDraft,
-						hidden: true
-					},
-					{
-						path: 'runPlan/manage/:mapId',
-						component: PlanMonitorDetail,
-						hidden: true
-					}
-				]
-			}
-		]
-	},
-	{
-		path: '/dp',
-		hidden: true,
-		redirect: '/dp/home',
-		component: ScreenMonitor,
-		meta: {
-			roles: [admin, userScreen, user]
-		},
-		children: [
-			{
-				path: 'home',
-				component: ScreenMonitorHome,
-				meta: {
-					i18n: 'router.dpSystem'
-				},
-				target: true
-			},
-			{
-				path: 'detail/:lessonId',
-				component: ScreenMonitorDetail,
-				hidden: true
-			},
-			{
-				path: 'pay/:lessonId',
-				component: Pay,
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/plan/usertool',
-		component: PlanMonitorEditUserTool,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/plan/tool',
-		component: PlanMonitorEditTool,
-		meta: {
-		},
-		hidden: true
-	},
-	{
-		path: '/plan',
-		redirect: '/plan/home',
-		component: PlanMonitor,
-		hidden: true,
-		meta: {
-			roles: [admin, user, userDesign]
-		},
-		children: [
-			{
-				path: 'home',
-				component: PlanMonitorHome,
-				meta: {
-					i18n: 'router.planSystem'
-				},
-				target: true
-			},
-			{
-				path: 'detail/:lessonId',
-				component: PlanMonitorDetail,
-				hidden: true
-			},
-			{
-				path: 'pay/:lessonId',
-				component: Pay,
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/replay',
-		component: Layout,
-		hidden: true,
-		meta: {
-			roles: [admin, userDesign]
-		},
-		children: [
-			{
-				path: 'manage',
-				component: Replay,
-				meta: {
-					i18n: 'router.replayManage'
-				}
-			}
-		]
-	},
-	{
-		path: '/publish',
-		component: Layout,
-		meta: {
-			i18n: 'router.pulishManage',
-			roles: [admin, userDesign]
-		},
-		children: [
-			{
-				path: 'map',
-				component: PublishMap,
-				meta: {
-					i18n: 'router.publishMapManage'
-				}
-			},
-			{
-				path: 'map/detail',
-				hidden: true,
-				component: PublishMapDetail
-			},
-			{
-				path: 'product',
-				component: ProductStatus,
-				meta: {
-					i18n: 'router.productStateManage'
-				}
-			},
-			{
-				path: 'lesson',
-				component: PublishLesson,
-				meta: {
-					i18n: 'router.publishLessonManage'
-				}
-			},
-			{
-				path: 'runPlan/template',
-				component: RunPlanTemplate,
-				meta: {
-					i18n: 'router.runPlanTemplateManage'
-				}
-			},
-			{
-				path: 'runPlan/common',
-				component: RunPlanCommon,
-				meta: {
-					i18n: 'router.runPlanCommonManage'
-				}
-			},
-			{
-				path: 'runPlan/everyDay',
-				component: RunPlanEveryDay,
-				meta: {
-					i18n: 'router.runPlanEveryDayManage'
-				}
-			},
-			{
-				path: 'examRule/manage',
-				component: PublishExamRule,
-				meta: {
-					i18n: 'router.examRuleManage'
-				}
-			},
-			{
-				path: 'map/draft/:mode/:mapId',
-				component: PublishMapDraft,
-				hidden: true
-			},
-			{
-				path: 'examRule/draft/:mode/:ruleId/:lessonId',
-				component: PublishExamRuleDraft,
-				hidden: true
-			},
-			{
-				path: 'runPlan/common/:mode',
-				component: RunPlanCommonDraft,
-				hidden: true
-			},
-			{
-				path: 'runPlan/view/:mode',
-				component: RunplanView,
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/orderauthor',
-		component: Layout,
-		meta: {
-			i18n: 'router.orderAuthorityManage',
-			roles: [admin, userDesign]
-		},
-		children: [
-			{
-				path: 'author/manage',
-				component: Author,
-				meta: {
-					i18n: 'router.authorityManage'
-				}
-			},
-			{
-				path: 'commodity/manage',
-				component: Commodity,
-				meta: {
-					i18n: 'router.commodityManage'
-				}
-			},
-			{
-				path: 'order/manage',
-				component: OrderList,
-				meta: {
-					i18n: 'router.orderManage'
-				}
-			},
-			{
-				path: 'transfer/manage',
-				component: Permission,
-				meta: {
-					i18n: 'router.authorityTransferManage'
-				}
-			},
-			{
-				path: 'rules/manage',
-				component: UserRules,
-				meta: {
-					i18n: 'router.userRulesManage'
-				}
-			},
-			{
-				path: 'rules/manage/detail/:id',
-				hidden: true,
-				component: UserRulesDetail,
-				meta: {
-					i18n: 'router.userRulesManage'
-				}
-			},
-			{
-				path: 'commodity/draft/:mode/:commodityId',
-				hidden: true,
-				component: CommodityDraft,
-				meta: {
-					i18n: 'router.addCommodity'
-				}
-			},
-			{
-				path: 'order/draft/:mode/:orderId',
-				hidden: true,
-				component: OrderDraft,
-				meta: {
-					i18n: 'router.addOrder'
-				}
-			},
-			{
-				path: 'author/manage/rules',
-				hidden: true,
-				component: AuthorDraft,
-				meta: {
-					i18n: 'router.addCoursePermissions'
-				}
-			},
-			{
-				path: 'transfer/detail/:permissionId',
-				component: PermissionDetail,
-				hidden: true
-			},
-			{
-				path: 'transfer/package',
-				component: PermissionDraft,
-				hidden: true
-			},
-			{
-				path: 'transfer/create',
-				component: PermissionCreate,
-				hidden: true
-			}
-		]
-	},
-	{
-		path: '/system',
-		component: Layout,
-		meta: {
-			i18n: 'router.systemManage',
-			roles: [admin, userDesign]
-		},
-		children: [
-			{
-				path: 'skinCode',
-				component: SkinCode,
-				meta: {
-					i18n: 'router.skinManage'
-				}
-			},
-			{
-				path: 'skinCode/draft/:mode/:skinCodeId',
-				hidden: true,
-				component: SkinCodeDraft
-			},
-			{
-				path: 'ibp/edit',
-				component: IbpEdit,
-				meta: {
-					i18n: 'router.ibpDraw'
-				}
-			},
-			{
-				path: 'dictionary',
-				component: Dictionary,
-				meta: {
-					i18n: 'router.dataDictionary'
-				}
-			},
-			{
-				path: 'dictionary/detail',
-				hidden: true,
-				component: DictionaryDetail,
-				meta: {
-					i18n: 'router.dataDictionaryDetails'
-				}
-			},
-			{
-				path: 'userManage',
-				component: UserControl,
-				meta: {
-					i18n: 'router.userManage'
-				}
-			},
-			{
-				path: 'cache',
-				component: CacheControl,
-				meta: {
-					i18n: 'router.cacheManage'
-				}
-			},
-			{
-				path: 'userTrainingManage',
-				component: UserTraining,
-				meta: {
-					i18n: 'router.userTrainingManage'
-				}
-			},
-			{
-				path: 'userExamManage',
-				component: UserExam,
-				meta: {
-					i18n: 'router.userExamManage'
-				}
-			},
-			{
-				path: 'userSimulationManage',
-				component: UserSimulation,
-				meta: {
-					i18n: 'router.userSimulationManage'
-				}
-			},
-			{
-				path: 'existingSimulation',
-				component: ExistingSimulation,
-				meta: {
-					i18n: 'router.existingSimulation'
-				}
-			},
-			{
-				path: 'systemGenerate',
-				component: SystemGenerate,
-				meta: {
-					i18n: 'router.subsystemGeneration'
-				}
-			},
-			{
-				path: 'product',
-				component: MapProduct,
-				meta: {
-					i18n: 'router.productEdit'
-				}
-			},
-			{
-				path: 'record',
-				redirect: 'record/training/0/null',
-				component: Trainingrecord,
-				meta: {
-					i18n: 'router.trainingRecord'
-				},
-				hidden: !isDev,
-				children: [
-					{
-						path: 'training/:trainingId/:trainingName',
-						component: TrainingrecordManage,
-						hidden: true
-					}
-				]
-			}
-		]
-	},
-	{
-		path: '/apply',
-		component: Layout,
-		meta: {
-			i18n: 'router.releaseApplication',
-			roles: [admin, userDesign]
-		},
-		children: [
-			{
-				path: 'lesson',
-				component: LessonApproval,
-				meta: {
-					i18n: 'router.courseApplication'
-				}
-			},
-			{
-				path: 'script',
-				component: ScriptApproval,
-				meta: {
-					i18n: 'router.scriptReleaseApplication'
-				}
-			},
-			{
-				path: 'runGraph',
-				component: RunPlanApproval,
-				meta: {
-					i18n: 'router.runGraphReleaseApplication'
-				}
-			}
-		]
-	}
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        path: '/design/userlist',
+        redirect: '/design/userlist/home',
+        component: Layout,
+        meta: {
+            roles: [admin, user, userDesign]
+        },
+        children: [
+            {
+                path: '',
+                redirect: '/design/userlist/home',
+                component: DesignPlatformUser,
+                meta: {
+                    i18n: 'router.designUserPage',
+                    icon: 'design'
+                },
+                children: [
+                    {
+                        path: 'home',
+                        component: DesignPlatformHome,
+                        meta: {
+                        }
+                    },
+                    {
+                        path: 'map/draw/:mapId/:view',
+                        component: Mapedit,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/edit/:type',
+                        component: LessonEdit,
+                        hidden: true
+                    },
+                    {
+                        path: 'runPlan/detail/:mapId',
+                        component: PlanMonitorDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'script/home/:mapId',
+                        component: ScriptmanageHome,
+                        meta: {
+                            i18n: 'router.scriptManage'
+                        },
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/home/:mapId',
+                        component: LessonHome,
+                        hidden: true
+                    },
+                    {
+                        path: 'lesson/training/:trainingId/:trainingName',
+                        component: TrainingrecordManage,
+                        hidden: true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        path: '/display/:mode',
+        component: Display,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/design/display/:mode',
+        component: DesignDisplay,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/scriptDisplay/:mode',
+        component: ScriptDisplay,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/trainroom',
+        component: TrainRoom,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/jointTraining',
+        component: JointTraining,
+        hidden: true
+    },
+    {
+        path: '/jlmap3d',
+        component: Jlmap3d,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/map',
+        meta: {
+            i18n: 'router.mapManage',
+            roles: [admin, mapCreater, userDesign]
+        },
+        hidden: true,
+        component: Layout,
+        children: [
+            {
+                path: 'draw',
+                redirect: '/map/draw/0/draft',
+                component: Mapdraft,
+                meta: {
+                    i18n: 'router.mapDraw'
+                },
+                children: [
+                    {
+                        path: ':mapId/:view',
+                        component: Mapedit,
+                        hidden: true
+                    }
+                ]
+            },
+            {
+                path: 'runPlan',
+                redirect: '/map/runPlan/view/draft',
+                component: Runplan,
+                meta: {
+                    i18n: 'router.runPlanManage'
+                },
+                children: [{
+                    path: 'view/:mode',
+                    component: RunplanView,
+                    hidden: true
+                }]
+            }
+        ]
+    },
+    {
+        path: '/trainingPlatform',
+        component: Layout,
+        hidden: true,
+        meta: {
+            roles: [admin, userSimulation, user]
+        },
+        children: [
+            {
+                path: '',
+                component: TrainingPlatform,
+                meta: {
+                },
+                children: [
+                    {
+                        path: 'detail/:subSystem',
+                        component: DemonstrationDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'teachHome/:subSystem',
+                        component: TeachHome,
+                        hidden: true
+                    },
+                    {
+                        path: 'teach/:subSystem',
+                        component: TeachDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'examHome/:subSystem',
+                        component: ExamHome,
+                        hidden: true
+                    },
+                    {
+                        path: 'exam/:examId',
+                        component: ExamDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'practical/:trainingId/:lessonId',
+                        component: TeachPractical,
+                        hidden: true
+                    },
+                    {
+                        path: 'pay/:lessonId',
+                        component: Pay,
+                        hidden: true
+                    },
+                    {
+                        path: 'course/:subSystem',
+                        component: ExamCourseDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'result/:userExamId',
+                        component: ExamResult,
+                        hidden: true
+                    },
+                    {
+                        path: 'permission/:mapId',
+                        component: Package,
+                        hidden: true
+                    },
+                    {
+                        path: 'permission/detail/:id',
+                        component: PackageDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'draft',
+                        component: PackageDraft,
+                        hidden: true
+                    },
+                    {
+                        path: 'examRule/manage',
+                        component: PublishExamRule,
+                        hidden: true
+                    },
+                    {
+                        path: 'examRule/draft/:mode/:ruleId/:lessonId',
+                        component: PublishExamRuleDraft,
+                        hidden: true
+                    },
+                    {
+                        path: 'runPlan/manage/:mapId',
+                        component: PlanMonitorDetail,
+                        hidden: true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        path: '/dp',
+        hidden: true,
+        redirect: '/dp/home',
+        component: ScreenMonitor,
+        meta: {
+            roles: [admin, userScreen, user]
+        },
+        children: [
+            {
+                path: 'home',
+                component: ScreenMonitorHome,
+                meta: {
+                    i18n: 'router.dpSystem'
+                },
+                target: true
+            },
+            {
+                path: 'detail/:lessonId',
+                component: ScreenMonitorDetail,
+                hidden: true
+            },
+            {
+                path: 'pay/:lessonId',
+                component: Pay,
+                hidden: true
+            }
+        ]
+    },
+    {
+        path: '/plan/usertool',
+        component: PlanMonitorEditUserTool,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/plan/tool',
+        component: PlanMonitorEditTool,
+        meta: {
+        },
+        hidden: true
+    },
+    {
+        path: '/plan',
+        redirect: '/plan/home',
+        component: PlanMonitor,
+        hidden: true,
+        meta: {
+            roles: [admin, user, userDesign]
+        },
+        children: [
+            {
+                path: 'home',
+                component: PlanMonitorHome,
+                meta: {
+                    i18n: 'router.planSystem'
+                },
+                target: true
+            },
+            {
+                path: 'detail/:lessonId',
+                component: PlanMonitorDetail,
+                hidden: true
+            },
+            {
+                path: 'pay/:lessonId',
+                component: Pay,
+                hidden: true
+            }
+        ]
+    },
+    {
+        path: '/replay',
+        component: Layout,
+        hidden: true,
+        meta: {
+            roles: [admin, userDesign]
+        },
+        children: [
+            {
+                path: 'manage',
+                component: Replay,
+                meta: {
+                    i18n: 'router.replayManage'
+                }
+            }
+        ]
+    },
+    {
+        path: '/publish',
+        component: Layout,
+        meta: {
+            i18n: 'router.pulishManage',
+            roles: [admin, userDesign]
+        },
+        children: [
+            {
+                path: 'map',
+                component: PublishMap,
+                meta: {
+                    i18n: 'router.publishMapManage'
+                }
+            },
+            {
+                path: 'map/detail',
+                hidden: true,
+                component: PublishMapDetail
+            },
+            {
+                path: 'product',
+                component: ProductStatus,
+                meta: {
+                    i18n: 'router.productStateManage'
+                }
+            },
+            {
+                path: 'lesson',
+                component: PublishLesson,
+                meta: {
+                    i18n: 'router.publishLessonManage'
+                }
+            },
+            {
+                path: 'runPlan/template',
+                component: RunPlanTemplate,
+                meta: {
+                    i18n: 'router.runPlanTemplateManage'
+                }
+            },
+            {
+                path: 'runPlan/common',
+                component: RunPlanCommon,
+                meta: {
+                    i18n: 'router.runPlanCommonManage'
+                }
+            },
+            {
+                path: 'runPlan/everyDay',
+                component: RunPlanEveryDay,
+                meta: {
+                    i18n: 'router.runPlanEveryDayManage'
+                }
+            },
+            {
+                path: 'examRule/manage',
+                component: PublishExamRule,
+                meta: {
+                    i18n: 'router.examRuleManage'
+                }
+            },
+            {
+                path: 'map/draft/:mode/:mapId',
+                component: PublishMapDraft,
+                hidden: true
+            },
+            {
+                path: 'examRule/draft/:mode/:ruleId/:lessonId',
+                component: PublishExamRuleDraft,
+                hidden: true
+            },
+            {
+                path: 'runPlan/common/:mode',
+                component: RunPlanCommonDraft,
+                hidden: true
+            },
+            {
+                path: 'runPlan/view/:mode',
+                component: RunplanView,
+                hidden: true
+            }
+        ]
+    },
+    {
+        path: '/orderauthor',
+        component: Layout,
+        meta: {
+            i18n: 'router.orderAuthorityManage',
+            roles: [admin, userDesign]
+        },
+        children: [
+            {
+                path: 'author/manage',
+                component: Author,
+                meta: {
+                    i18n: 'router.authorityManage'
+                }
+            },
+            {
+                path: 'commodity/manage',
+                component: Commodity,
+                meta: {
+                    i18n: 'router.commodityManage'
+                }
+            },
+            {
+                path: 'order/manage',
+                component: OrderList,
+                meta: {
+                    i18n: 'router.orderManage'
+                }
+            },
+            {
+                path: 'transfer/manage',
+                component: Permission,
+                meta: {
+                    i18n: 'router.authorityTransferManage'
+                }
+            },
+            {
+                path: 'rules/manage',
+                component: UserRules,
+                meta: {
+                    i18n: 'router.userRulesManage'
+                }
+            },
+            {
+                path: 'rules/manage/detail/:id',
+                hidden: true,
+                component: UserRulesDetail,
+                meta: {
+                    i18n: 'router.userRulesManage'
+                }
+            },
+            {
+                path: 'commodity/draft/:mode/:commodityId',
+                hidden: true,
+                component: CommodityDraft,
+                meta: {
+                    i18n: 'router.addCommodity'
+                }
+            },
+            {
+                path: 'order/draft/:mode/:orderId',
+                hidden: true,
+                component: OrderDraft,
+                meta: {
+                    i18n: 'router.addOrder'
+                }
+            },
+            {
+                path: 'author/manage/rules',
+                hidden: true,
+                component: AuthorDraft,
+                meta: {
+                    i18n: 'router.addCoursePermissions'
+                }
+            },
+            {
+                path: 'transfer/detail/:permissionId',
+                component: PermissionDetail,
+                hidden: true
+            },
+            {
+                path: 'transfer/package',
+                component: PermissionDraft,
+                hidden: true
+            },
+            {
+                path: 'transfer/create',
+                component: PermissionCreate,
+                hidden: true
+            }
+        ]
+    },
+    {
+        path: '/system',
+        component: Layout,
+        meta: {
+            i18n: 'router.systemManage',
+            roles: [admin, userDesign]
+        },
+        children: [
+            {
+                path: 'skinCode',
+                component: SkinCode,
+                meta: {
+                    i18n: 'router.skinManage'
+                }
+            },
+            {
+                path: 'skinCode/draft/:mode/:skinCodeId',
+                hidden: true,
+                component: SkinCodeDraft
+            },
+            {
+                path: 'ibp/edit',
+                component: IbpEdit,
+                meta: {
+                    i18n: 'router.ibpDraw'
+                }
+            },
+            {
+                path: 'dictionary',
+                component: Dictionary,
+                meta: {
+                    i18n: 'router.dataDictionary'
+                }
+            },
+            {
+                path: 'dictionary/detail',
+                hidden: true,
+                component: DictionaryDetail,
+                meta: {
+                    i18n: 'router.dataDictionaryDetails'
+                }
+            },
+            {
+                path: 'userManage',
+                component: UserControl,
+                meta: {
+                    i18n: 'router.userManage'
+                }
+            },
+            {
+                path: 'cache',
+                component: CacheControl,
+                meta: {
+                    i18n: 'router.cacheManage'
+                }
+            },
+            {
+                path: 'userTrainingManage',
+                component: UserTraining,
+                meta: {
+                    i18n: 'router.userTrainingManage'
+                }
+            },
+            {
+                path: 'userExamManage',
+                component: UserExam,
+                meta: {
+                    i18n: 'router.userExamManage'
+                }
+            },
+            {
+                path: 'userSimulationManage',
+                component: UserSimulation,
+                meta: {
+                    i18n: 'router.userSimulationManage'
+                }
+            },
+            {
+                path: 'existingSimulation',
+                component: ExistingSimulation,
+                meta: {
+                    i18n: 'router.existingSimulation'
+                }
+            },
+            {
+                path: 'systemGenerate',
+                component: SystemGenerate,
+                meta: {
+                    i18n: 'router.subsystemGeneration'
+                }
+            },
+            {
+                path: 'product',
+                component: MapProduct,
+                meta: {
+                    i18n: 'router.productEdit'
+                }
+            },
+            {
+                path: 'record',
+                redirect: 'record/training/0/null',
+                component: Trainingrecord,
+                meta: {
+                    i18n: 'router.trainingRecord'
+                },
+                hidden: !isDev,
+                children: [
+                    {
+                        path: 'training/:trainingId/:trainingName',
+                        component: TrainingrecordManage,
+                        hidden: true
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        path: '/apply',
+        component: Layout,
+        meta: {
+            i18n: 'router.releaseApplication',
+            roles: [admin, userDesign]
+        },
+        children: [
+            {
+                path: 'lesson',
+                component: LessonApproval,
+                meta: {
+                    i18n: 'router.courseApplication'
+                }
+            },
+            {
+                path: 'script',
+                component: ScriptApproval,
+                meta: {
+                    i18n: 'router.scriptReleaseApplication'
+                }
+            },
+            {
+                path: 'runGraph',
+                component: RunPlanApproval,
+                meta: {
+                    i18n: 'router.runGraphReleaseApplication'
+                }
+            }
+        ]
+    }
 ];
 
 const createRouter = () => new Router({
-	mode: 'history', // require service support
-	scrollBehavior: () => ({ y: 0 }),
-	routes: constantRoutes
+    mode: 'history', // require service support
+    scrollBehavior: () => ({ y: 0 }),
+    routes: constantRoutes
 });
 
 const router = createRouter();
 
 router.beforeEach((to, from, next) => {
-	const project = getSessionStorage('project');
-	document.title = loginTitle[project||'login'];
-	next();
+    const project = getSessionStorage('project');
+    document.title = loginTitle[project || 'login'];
+    next();
 });
 
 export default router;
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index 656813271..aa8991010 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -171,6 +171,7 @@ export default {
                 } else {
                     res = await getTrainingSystemList(filterSelect);
                 }
+                this.$emit('goRoutePath', res.data);
                 res.data && res.data.forEach(item =>{
                     item.key = item.id + item.type;
                     item.children && item.children.forEach(childrenItem => {
diff --git a/src/views/trainingPlatform/index.vue b/src/views/trainingPlatform/index.vue
index 50545a1ed..c1ba91af2 100644
--- a/src/views/trainingPlatform/index.vue
+++ b/src/views/trainingPlatform/index.vue
@@ -2,7 +2,7 @@
   <div class="app-wrapper">
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <div v-show="listShow" class="examList" :style="{width: widthLeft+'px'}">
-        <demon-list ref="demonList" :height="height" />
+        <demon-list ref="demonList" :height="height" @goRoutePath="goRoutePath" />
       </div>
       <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
       <transition>
@@ -21,58 +21,61 @@ import localStore from 'storejs';
 import { getSessionStorage, setSessionStorage } from '@/utils/auth';
 
 export default {
-	name: 'TrainingPlatform',
-	components: {
-		demonList,
-		drapLeft
-	},
-	data() {
-		return {
-			listShow: true,
-			widthLeft: 450,
-			productList: []
-		};
-	},
-	computed: {
-		...mapGetters([
-			'lessonbar'
-		]),
-		height() {
-			return this.$store.state.app.height - 50;
-		},
-		width() {
-			return this.$store.state.app.width;
-		},
-		userId() {
-			return this.$store.state.user.id;
-		}
-	},
-	watch: {
-		'lessonbar.opened': function (val) {
-			this.listShow = val;
-		}
-	},
-	mounted() {
-		const againEnter = getSessionStorage('againEnter') || null;
-		if (!againEnter) {
-			launchFullscreen();
-			const path = localStore.get('trainingPlatformRoute'+ this.userId);
-			if (path && path.startsWith('/trainingPlatform')) {
-				this.$router.push(path);
-			}
-			setSessionStorage('againEnter', true);
-		}
-
-		this.widthLeft = Number(localStore.get('LeftWidth'))?Number(localStore.get('LeftWidth')):450;
-	},
-	methods: {
-		refresh() {
-			this.$refs && this.$refs.demonList && this.$refs.demonList.refresh();
-		},
-		drapWidth(width) {
-			this.widthLeft = Number(width);
-		}
-	}
+    name: 'TrainingPlatform',
+    components: {
+        demonList,
+        drapLeft
+    },
+    data() {
+        return {
+            listShow: true,
+            widthLeft: 450,
+            productList: []
+        };
+    },
+    computed: {
+        ...mapGetters([
+            'lessonbar'
+        ]),
+        height() {
+            return this.$store.state.app.height - 50;
+        },
+        width() {
+            return this.$store.state.app.width;
+        },
+        userId() {
+            return this.$store.state.user.id;
+        }
+    },
+    watch: {
+        'lessonbar.opened': function (val) {
+            this.listShow = val;
+        }
+    },
+    mounted() {
+        this.widthLeft = Number(localStore.get('LeftWidth')) ? Number(localStore.get('LeftWidth')) : 450;
+    },
+    methods: {
+        refresh() {
+            this.$refs && this.$refs.demonList && this.$refs.demonList.refresh();
+        },
+        drapWidth(width) {
+            this.widthLeft = Number(width);
+        },
+        goRoutePath(data) {
+            const againEnter = getSessionStorage('againEnter') || null;
+            if (!againEnter) {
+                launchFullscreen();
+                const path = localStore.get('trainingPlatformRoute' + this.userId);
+                if (path && path.startsWith('/trainingPlatform')) {
+                    this.$router.push(path);
+                } else if (data && data[0]) {
+                    this.$router.push(`/trainingPlatform/permission/${data[0].id}`);
+                }
+                setSessionStorage('againEnter', true);
+            }
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>

From e3dccd58c81f2a11897f30494c0f3946d73843af Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 29 Oct 2019 15:48:38 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue                                |  5 +++--
 src/utils/baseUrl.js                                |  4 ++--
 src/views/jlmap/index.vue                           |  6 +++++-
 .../mapdraft/mapedit/mapoperate/ImageControl.vue    |  8 ++------
 .../map/mapdraft/mapedit/mapoperate/buttonDraft.vue |  5 -----
 .../map/mapdraft/mapedit/mapoperate/counter.vue     |  5 -----
 .../map/mapdraft/mapedit/mapoperate/delayunlock.vue |  5 -----
 src/views/map/mapdraft/mapedit/mapoperate/index.vue | 13 +++++++++++++
 .../map/mapdraft/mapedit/mapoperate/lcControl.vue   |  5 -----
 .../mapdraft/mapedit/mapoperate/limitControl.vue    |  5 -----
 src/views/map/mapdraft/mapedit/mapoperate/line.vue  |  5 -----
 src/views/map/mapdraft/mapedit/mapoperate/link.vue  |  6 ------
 .../map/mapdraft/mapedit/mapoperate/section.vue     |  5 -----
 .../map/mapdraft/mapedit/mapoperate/signal.vue      |  5 -----
 .../map/mapdraft/mapedit/mapoperate/station.vue     |  5 -----
 .../mapdraft/mapedit/mapoperate/stationcontrol.vue  |  5 -----
 .../mapdraft/mapedit/mapoperate/stationstand.vue    |  5 -----
 .../map/mapdraft/mapedit/mapoperate/switch.vue      |  5 -----
 src/views/map/mapdraft/mapedit/mapoperate/text.vue  |  5 -----
 .../map/mapdraft/mapedit/mapoperate/train/index.vue |  9 ++++++++-
 .../map/mapdraft/mapedit/mapoperate/trainwindow.vue |  5 -----
 .../map/mapdraft/mapedit/mapoperate/zcControl.vue   |  5 -----
 22 files changed, 33 insertions(+), 93 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 43d209c28..1af6d626b 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -9,8 +9,9 @@
         </transition>
         <!-- </el-scrollbar> -->
       </section>
-      <el-footer style="height:30px;text-align:right;line-height: 30px;">
-        <span style="font-size:14px;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</span>
+      <el-footer style="height:30px;line-height: 30px;">
+		<div style="font-size:14px;float:left;">北京玖琏科技有限公司 &nbsp;联系电话: 13201793090 </div>
+        <div style="font-size:14px;float:right;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</div>
       </el-footer>
     </div>
   </div>
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 16e67023d..cbc51f6c4 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,9 +3,9 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
diff --git a/src/views/jlmap/index.vue b/src/views/jlmap/index.vue
index 397fac459..45fb90284 100644
--- a/src/views/jlmap/index.vue
+++ b/src/views/jlmap/index.vue
@@ -290,7 +290,11 @@ export default {
     .zoom-view {
         // position: fixed;
 		position: absolute;
-        height: 28px;
+		bottom: 0;
+		background: #fff;
+		padding-top: 5px;
+		height: 42px;
+		border-bottom: 1px #f3f3f3 solid;
     }
 
     /deep/ {
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
index cad56f486..237990d34 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/ImageControl.vue
@@ -244,12 +244,8 @@ export default {
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
+	@import "src/styles/mixin.scss";
+	
     .coordinate {
         overflow: hidden;
 
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/buttonDraft.vue b/src/views/map/mapdraft/mapedit/mapoperate/buttonDraft.vue
index 22c6ffd37..7ee7bbca4 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/buttonDraft.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/buttonDraft.vue
@@ -255,11 +255,6 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
     .coordinate {
         overflow: hidden;
 
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
index a9d93108b..41be2eb76 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/counter.vue
@@ -247,9 +247,4 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
 </style>
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
index 1eac87546..a8abdb678 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/delayunlock.vue
@@ -229,9 +229,4 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
 </style>
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/index.vue b/src/views/map/mapdraft/mapedit/mapoperate/index.vue
index a6a5c6fdb..a524aee87 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/index.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/index.vue
@@ -398,6 +398,19 @@ export default {
         }
     }
 
+    /deep/ .button_box{
+        // width: 100%;
+        // background: #f0f0f0;
+        // overflow: hidden;
+        width: 100%;
+        background: #ffffff;
+        overflow: hidden;
+        border-top: 1px #f3f1f1 solid;
+        box-shadow: 4px 7px 10px #565656;
+        border-radius: 0;
+        border-bottom: 1px transparent solid;
+	  }
+
     /deep/ .map-draft-group {
         float: right;
         margin: 6px 5px;
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
index e2e2250af..deed9d0a0 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/lcControl.vue
@@ -225,11 +225,6 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
     .coordinate {
         overflow: hidden;
 
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
index 1506d8ea1..ba7c0a6a2 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/limitControl.vue
@@ -216,11 +216,6 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
     .coordinate {
         overflow: hidden;
 
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/line.vue b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
index 0ab514631..80638cd5b 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/line.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/line.vue
@@ -258,11 +258,6 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
     .view-control {
         overflow-y: auto;
     }
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/link.vue b/src/views/map/mapdraft/mapedit/mapoperate/link.vue
index 03664a569..617e3b0ea 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/link.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/link.vue
@@ -525,12 +525,6 @@ export default {
 		height: calc(100% - 100px);
 	}
 
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
-
     .coordinate {
         overflow: hidden;
 
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/section.vue b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
index 19a493752..48bd2813d 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/section.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/section.vue
@@ -1171,11 +1171,6 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
     .el-transfer {
         text-align: left;
     }
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
index 2aad07b56..d9d33e020 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/signal.vue
@@ -420,9 +420,4 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
 </style>
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/station.vue b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
index dfd59655b..e052cbb4b 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/station.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/station.vue
@@ -276,9 +276,4 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
 </style>
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
index 37259d76f..54fc33239 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
@@ -246,9 +246,4 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
 </style>
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
index f0b4b5b6a..ad4672743 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
@@ -300,9 +300,4 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
 </style>
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
index 979639b0f..dc25eaaef 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/switch.vue
@@ -492,11 +492,6 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
     .el-transfer {
         text-align: left;
     }
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/text.vue b/src/views/map/mapdraft/mapedit/mapoperate/text.vue
index a8fd66f90..8d2f13e8d 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/text.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/text.vue
@@ -236,11 +236,6 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
 	.coordinate {
         overflow: hidden;
 
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
index 369809086..e02192d2e 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/train/index.vue
@@ -196,8 +196,15 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 	.button_box{
+		// width: 100%;
+		// background: #f0f0f0;
+		// overflow: hidden;
 		width: 100%;
-		background: #f0f0f0;
+		background: #ffffff;
 		overflow: hidden;
+		border-top: 1px #f3f1f1 solid;
+		box-shadow: 4px 7px 10px #565656;
+		border-radius: 0;
+		border-bottom: 1px transparent solid;
 	}
 </style>
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
index 73aecced5..4b6d124a6 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
@@ -298,11 +298,6 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
 
 	/deep/ {
 		.card .el-transfer-panel__filter{
diff --git a/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue b/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
index e50761d15..3ab6e7aa4 100644
--- a/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
+++ b/src/views/map/mapdraft/mapedit/mapoperate/zcControl.vue
@@ -223,11 +223,6 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-	.button_box{
-		width: 100%;
-		background: #f0f0f0;
-		overflow: hidden;
-	}
     .coordinate {
         overflow: hidden;
 

From 462b0cfb6c1faba72ebe3ef79ecda65b96ba8371 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 29 Oct 2019 16:23:57 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue                                 | 12 ++++++++++--
 src/views/demonstration/detail/index.vue             |  2 +-
 .../lesson/lessoncategory/edit/sorttree/index.vue    |  2 +-
 src/views/planMonitor/detail.vue                     |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 1af6d626b..dddcd34e3 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -9,7 +9,7 @@
         </transition>
         <!-- </el-scrollbar> -->
       </section>
-      <el-footer style="height:30px;line-height: 30px;">
+      <el-footer class="footers" style="height:30px;">
 		<div style="font-size:14px;float:left;">北京玖琏科技有限公司 &nbsp;联系电话: 13201793090 </div>
         <div style="font-size:14px;float:right;">Copyright ©2018 北京玖琏科技有限公司 京ICP备18028522号</div>
       </el-footer>
@@ -89,7 +89,15 @@ export default {
         height: 100%;
         position: absolute;
         z-index: 999;
-    }
+	}
+	.footers{
+		line-height: 30px;
+		position: absolute;
+		width: 100%;
+		bottom: 0;
+		background: #fff;
+		border-top: 1px #ebeef5 solid;
+	}
 </style>
 <style rel="stylesheet/scss" lang="scss">
 	.app_scrollbar_box{
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index 3769fb6a9..b26865016 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -3,7 +3,7 @@
     <div slot="header" style="text-align: center;">
       <span><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span>
     </div>
-    <div class="simulation-detail" :style="{ height: height-190 +'px' }">
+    <div class="simulation-detail" :style="{ height: height-230 +'px' }">
       <p class="list-item">
         <span class="list-label">{{ $t('demonstration.productDescription') }}</span>
         <span class="list-elem">{{ courseModel.remarks }}</span>
diff --git a/src/views/lesson/lessoncategory/edit/sorttree/index.vue b/src/views/lesson/lessoncategory/edit/sorttree/index.vue
index dc5a691f7..8e4b93b9c 100644
--- a/src/views/lesson/lessoncategory/edit/sorttree/index.vue
+++ b/src/views/lesson/lessoncategory/edit/sorttree/index.vue
@@ -90,7 +90,7 @@ export default {
 			}
 			 else if (draggingNode && draggingNode.data.type === 'Training') {
 				//  dropNode.data.type === 'Chapter' || 
-				 return dropNode && (dropNode.data.type === 'Training' && type !== 'inner' );
+				 return dropNode && (dropNode.data.type === 'Training' && type !== 'inner' && draggingNode.parent == dropNode.parent );
 			// 	return dropNode && draggingNode.parent == dropNode.parent && (
 			// 		dropNode.data.type === 'Training' && type !== 'Inner');
 			}
diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue
index 57c22a84a..4ee238dca 100644
--- a/src/views/planMonitor/detail.vue
+++ b/src/views/planMonitor/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card :style="{height: height+'px'}">
+  <el-card :style="{height: height+'px'}" style="overflow-y:scroll;padding-bottom:20px;">
 	<div class="runPlanHeader" style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
 		<div class="runPlanList">{{$t('planMonitor.openRunPlan.runPlanList')}}</div>
 		<el-button size="small" type="primary" @click="handleCreate" class="createRunPlan" v-if="isCreate">{{$t('planMonitor.createRunningDiagram')}}</el-button>

From c45b991c224ac3807058fc42a7b1382e75cd4659 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 29 Oct 2019 16:49:48 +0800
Subject: [PATCH 21/21] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/exam/detail/courseDetail.vue | 2 +-
 src/views/teach/detail/index.vue       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/exam/detail/courseDetail.vue b/src/views/exam/detail/courseDetail.vue
index c9c4ea2c6..1baa757a3 100644
--- a/src/views/exam/detail/courseDetail.vue
+++ b/src/views/exam/detail/courseDetail.vue
@@ -3,7 +3,7 @@
     <div slot="header" style="text-align: center;">
       <b>{{ $t('exam.courseName') + ':  '+ courseModel.name }}</b>
     </div>
-    <div style=" margin:50px" :style="{ height: height - 150 +'px' }">
+    <div style=" margin:50px" :style="{ height: height - 190 +'px' }">
       <el-tabs v-model="activeName">
         <el-tab-pane :label="this.$t('exam.itemList')" name="first">
           <div v-if="courseModel.treeList.length != 0" :style="{ height: height - 230 +'px' }">
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index 76aa0d88d..1e03c7e2e 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -3,7 +3,7 @@
     <div slot="header" style="text-align: center;">
       <b>{{ $t('teach.courseName') }}: {{ courseModel.name }}</b>
     </div>
-    <div style="margin:50px" :style="{ height: height - 190 +'px' }">
+    <div style="margin:50px" :style="{ height: height - 230 +'px' }">
       <el-tabs v-model="activeName">
         <el-tab-pane :label="$t('teach.courseDetails')" name="first">
           <div :style="{ height: height - 270 +'px' }">