From ad97697406cafc97d02e50827aa6317d790d0797 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 31 Oct 2019 15:56:07 +0800
Subject: [PATCH 1/3] =?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/api/jmap/lessondraft.js                   |  10 +-
 src/router/index.js                           |   2 +-
 src/views/lesson/home.vue                     |  43 +---
 .../lessoncategory/category/operateMenu.vue   | 114 -----------
 .../lesson/lessoncategory/category/tree.vue   | 188 ------------------
 .../lessoncategory/edit/lesson/index.vue      |  31 ++-
 6 files changed, 28 insertions(+), 360 deletions(-)
 delete mode 100644 src/views/lesson/lessoncategory/category/operateMenu.vue
 delete mode 100644 src/views/lesson/lessoncategory/category/tree.vue

diff --git a/src/api/jmap/lessondraft.js b/src/api/jmap/lessondraft.js
index a199cbb53..69b47b7c1 100644
--- a/src/api/jmap/lessondraft.js
+++ b/src/api/jmap/lessondraft.js
@@ -1,9 +1,9 @@
 import request from '@/utils/request';
 
-/** 获取课程树*/
-export function getLessonTree(skinCode) {
+// /** 获取课程树*/
+export function getLessonTree(lessonId) {
     return request({
-        url: `/api/lessonDraft/${skinCode}/tree`,
+        url: `/api/lessonDraft/${lessonId}/tree`,
         method: 'get'
     });
 }
@@ -95,9 +95,9 @@ export function dragSortLessonChapter(data) {
     });
 }
 
-export function getLessonDrftList(params) {
+export function getLessonDrftList(mapId, params) {
     return request({
-        url: `/api/lessonDraft`,
+        url: `/api/lessonDraft/${mapId}/list`,
         method: 'get',
         params: params
     });
diff --git a/src/router/index.js b/src/router/index.js
index fbdf03a01..a5c2ddafa 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -374,7 +374,7 @@ export const asyncRouter = [
                         component: TrainingRuleEdit
                     },
                     {
-                        path: 'lesson/trainingManage/:skinCode',
+                        path: 'lesson/trainingManage',
                         component: Trainingmanage,
                         hidden: true
                     },
diff --git a/src/views/lesson/home.vue b/src/views/lesson/home.vue
index 32c97532b..7b0097233 100644
--- a/src/views/lesson/home.vue
+++ b/src/views/lesson/home.vue
@@ -24,7 +24,7 @@ import { getLessonDrftList } from '@/api/jmap/lessondraft';
 import { UrlConfig } from '@/router/index';
 import PublishCreate from './lessoncategory/edit/create';
 import PublishLesson from './lessoncategory/edit/lesson/publish';
-import { delLesson, getLessonTree } from '@/api/jmap/lessondraft';
+import { delLesson } from '@/api/jmap/lessondraft';
 import LessonDetail from '@/views/approval/lesson/detail';
 import ConstConfig from '@/scripts/ConstConfig';
 
@@ -37,9 +37,7 @@ export default {
     },
     data() {
         return {
-            tableData: [],
             loading: false,
-            showEdit: false,
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -48,7 +46,7 @@ export default {
                 show: false
             },
             queryList: {
-                query: getLessonDrftList,
+                query: this.queryFunction,
                 selectCheckShow: false,
                 indexShow: true,
                 columns: [
@@ -158,35 +156,8 @@ export default {
     mounted() {
     },
     methods: {
-        loadInitData() {
-            this.loading = true;
-            getLessonTree(this.$route.params.skinCode).then(response=> {
-                response.data.forEach(elem => {
-                    if (elem.children) {
-                        elem.children.forEach( it => {
-                            it.parentId = elem.id;
-                        } );
-                    }
-                });
-                this.tableData = response.data;
-                this.loading = false;
-            }).catch(( ) => {
-                this.$messageBox(this.$t('error.getDraftCourseDataFailed'));
-            });
-        },
-        refuse() {
-            this.loading = true;
-            getLessonTree(this.$route.params.skinCode).then(response=> {
-                response.data.forEach(elem => {
-                    if (elem.children) {
-                        elem.children.forEach( it => {
-                            it.parentId = elem.id;
-                        } );
-                    }
-                });
-                this.tableData = response.data;
-                this.loading = false;
-            });
+        queryFunction(params) {
+            return getLessonDrftList(this.$route.params.mapId, params);
         },
         handlerStatus(row) {
             let lessonStatus = '';
@@ -236,13 +207,13 @@ export default {
             this.$router.push({path: `${UrlConfig.design.lessonEdit}/treeSort`, query: {id: row.id}});
         },
         taskManage() {
-            this.$router.push({path: `${UrlConfig.design.taskManage}`, query: {mapId: this.$route.params.mapId, skinCode: this.$route.params.skinCode}});
+            this.$router.push({path: `${UrlConfig.design.taskManage}`, query: {mapId: this.$route.params.mapId}});
         },
         trainingManage() {
-            this.$router.push({path: `${UrlConfig.design.trainingManage}/${this.$route.params.skinCode}`, query: {mapId: this.$route.params.mapId}});
+            this.$router.push({path: `${UrlConfig.design.trainingManage}`, query: {mapId: this.$route.params.mapId}});
         },
         operationManage() {
-            this.$router.push({path: `${UrlConfig.design.trainingRule}`, query: {mapId: this.$route.params.mapId, skinCode: this.$route.params.skinCode}});
+            this.$router.push({path: `${UrlConfig.design.trainingRule}`, query: {mapId: this.$route.params.mapId}});
         },
         revertLesson(index, row) {
             this.$confirm(this.$t('tip.cancelCoursePublicationHint'), this.$t('global.tips'), {
diff --git a/src/views/lesson/lessoncategory/category/operateMenu.vue b/src/views/lesson/lessoncategory/category/operateMenu.vue
deleted file mode 100644
index 1179feb97..000000000
--- a/src/views/lesson/lessoncategory/category/operateMenu.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import { DeviceMenu } from '@/scripts/ConstDic';
-export default {
-    name: 'TrainingOperateMenu',
-    components: {
-        PopMenu
-    },
-    props: {
-        point: {
-            type: Object,
-            required: true
-        },
-        selected: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            menuShow: false,
-            operation: {
-                code: '',
-                title: '',
-                basicInfo: false
-            },
-            menu: [],
-            lessonMenu: [
-                {
-                    label: this.$t('lesson.createChapter'),
-                    handler: this.addSection
-                },
-                {
-                    label: this.$t('lesson.contentSorting'),
-                    handler: this.treeSort
-                }
-            ],
-            chapterMenu: [
-                {
-                    label: this.$t('lesson.createChapter'),
-                    handler: this.addSection
-                }
-            ]
-        };
-    },
-    watch: {
-        selected: function (val) {
-            if (val) {
-                if (val.type === 'lesson') {
-                    this.menu = this.lessonMenu;
-                } else if (val.type === 'chapter') {
-                    this.menu = this.chapterMenu;
-                }
-            }
-        },
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Lesson)) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    methods: {
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        doShow(point) {
-            this.menuShow = true;
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-            this.clickEvent();
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-            this.menuShow = false;
-        },
-        createLesson() {
-            this.$emit('lessonCreate');
-        },
-        createFromPublish() {
-            this.$emit('publishCreate');
-        },
-        addSection() {
-            this.$emit('chapterCreate');
-        },
-        treeSort() {
-            this.$emit('treeSort');
-        },
-        deleteObj() {
-            this.$confirm(this.$('tip.confirmDeletion'), this.$('global.tips'), {
-                confirmButtonText: this.$('global.confirm'),
-                cancelButtonText: this.$('global.cancel'),
-                type: 'warning'
-            }).then(() => {
-            }).catch(() => {
-                this.$messageBox(this.$('tip.cancelledDelete'));
-            });
-        }
-    }
-};
-</script>
diff --git a/src/views/lesson/lessoncategory/category/tree.vue b/src/views/lesson/lessoncategory/category/tree.vue
deleted file mode 100644
index e715d3a8f..000000000
--- a/src/views/lesson/lessoncategory/category/tree.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <el-card v-loading="loading" class="map-list-main">
-    <div slot="header" class="clearfix">
-      <span>{{ $t('lesson.courseList') }}</span>
-      <el-button type="text" style="float: right; padding: 3px 0" @click="publishCreate">{{ $t('lesson.createNewCoursesFromRelease') }}</el-button>
-    </div>
-    <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
-    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height: (height - 55) + 'px'}">
-      <el-tree
-        ref="lessonTree"
-        :data="treeData"
-        :props="defaultProps"
-        :filter-node-method="filterNode"
-        draggable
-        :allow-drop="allowDrop"
-        :allow-drag="allowDrag"
-        expand-on-click-node
-        highlight-current
-        :span="22"
-        @node-contextmenu="showContextMenu"
-        @node-drag-end="handleDragEnd"
-        @node-click="clickEvent"
-      >
-        <span slot-scope="{ node }">
-          <span v-if="node.data.type === 'skin'" class="el-icon-news" />
-          <span v-if="node.data.type === 'lesson'" class="el-icon-tickets" />
-          <span v-if="node.data.type === 'chapter'" class="el-icon-document" />
-          <span>&nbsp;{{ node.label }}</span>
-        </span>
-      </el-tree>
-    </el-scrollbar>
-    <tree-operate-menu
-      ref="treeOperateMenu"
-      :point="point"
-      :selected="selected"
-      @refresh="refresh"
-      @lessonCreate="lessonCreate"
-      @chapterCreate="chapterCreate"
-      @treeSort="treeSort"
-    />
-  </el-card>
-</template>
-<script>
-import { getLessonTree, dragSortLessonChapter } from '@/api/jmap/lessondraft';
-import { DeviceMenu } from '@/scripts/ConstDic';
-import TreeOperateMenu from './operateMenu';
-
-export default {
-    name: 'TrainingOperate',
-    components: {
-        TreeOperateMenu
-    },
-    props: {
-        height: {
-            type: Number
-        }
-    },
-    data() {
-        return {
-            loading: true,
-            defaultProps: {
-                children: 'children',
-                label: 'name'
-            },
-            filterText: '',
-            node: {},
-            selected: {},
-            menuoper: {},
-            treeData: [],
-            point: {
-                x: 0,
-                y: 0
-            }
-        };
-    },
-    watch: {
-        filterText(val) {
-            this.$refs.lessonTree.filter(val);
-        }
-    },
-    mounted() {
-        this.refresh();
-    },
-    methods: {
-        filterNode(value, data) {
-            if (!value) return true;
-            return data.name.indexOf(value) !== -1;
-        },
-        allowDrop(draggingNode, dropNode, type) {
-            if (draggingNode && draggingNode.data.type === 'chapter') {
-                return dropNode && dropNode.data.type === 'chapter';
-            } else if (draggingNode && draggingNode.data.type === 'training') {
-                return dropNode && dropNode.data.type === 'training' && type !== 'inner' && draggingNode.parent == dropNode.parent;
-            }
-        },
-        allowDrag(draggingNode) {
-            return draggingNode && (draggingNode.data.type === 'chapter' || draggingNode.data.type === 'training');
-        },
-        handleDragEnd(draggingNode, dropNode, dropType, ev) {
-            if (draggingNode && dropNode && dropType !== 'none') {
-                const lesson = this.getLeesonId(dropNode);
-                const lessonId = lesson.data.id;
-                const model = {
-                    location: dropType,
-                    sourceId: draggingNode.data.id,
-                    sourceType: draggingNode.data.type,
-                    targetId: dropNode.data.id,
-                    targetType: dropNode.data.type,
-                    lessonId: lessonId,
-                    chapterId: dropNode.parent.data.id
-                };
-                dragSortLessonChapter(model).then(response => {
-                });
-            }
-        },
-        getLeesonId(node) {
-            if (node.parent.parent !== null) {
-                return this.getLeesonId(node.parent);
-            } else {
-                return node;
-            }
-        },
-        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;
-                this.selected = obj;
-                const menu = DeviceMenu.Lesson;
-                this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
-            }
-        },
-        clickEvent(obj, node, vueElem) {
-            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-            if (obj.type === 'skin') {
-                this.$emit('lessonCreate', node);
-            } else if (obj.type === 'lesson') {
-                this.$emit('lessonEdit', node);
-            } else if (obj.type === 'chapter') {
-                this.$emit('chapterEdit', node);
-            }
-        },
-        chapterCreate() {
-            this.$emit('chapterCreate', this.node);
-        },
-        lessonCreate() {
-            this.$emit('lessonCreate', this.node);
-        },
-        publishCreate() {
-            this.$emit('publishCreate', this.node);
-        },
-        treeSort() {
-            this.$emit('treeSort', this.node);
-        },
-        convertTreeData(list) {
-            const tree = [];
-            if (list && list.length) {
-                /* 去除列表的training节点*/
-                list.forEach(elem => {
-                    elem.children = this.convertTreeData(elem.children);
-                    if (elem.type !== 'training') {
-                        tree.push(elem);
-                    }
-                });
-            }
-            return tree;
-        },
-        refresh() {
-            this.loading = true;
-            getLessonTree().then(response => {
-                this.treeData = this.convertTreeData(response.data);
-                this.$nextTick(() => { this.loading = false; });
-            }).catch(() => {
-                this.$messageBox(this.$t('error.refreshFailed'));
-                this.loading = false;
-            });
-        }
-    }
-};
-</script>
-<style>
-    .el-tree-node.is-current>.el-tree-node__content {
-        background-color: #e4e3e3 !important;
-    }
-</style>
diff --git a/src/views/lesson/lessoncategory/edit/lesson/index.vue b/src/views/lesson/lessoncategory/edit/lesson/index.vue
index e233494a9..bd76ed4f0 100644
--- a/src/views/lesson/lessoncategory/edit/lesson/index.vue
+++ b/src/views/lesson/lessoncategory/edit/lesson/index.vue
@@ -10,13 +10,13 @@
           <el-form-item :label="this.$t('lesson.courseName')+this.$t('global.colon')" prop="name">
             <el-input v-model="courseModel.name" />
           </el-form-item>
-          <el-form-item :label="this.$t('lesson.associatedSkin')" prop="skinCode">
-            <el-select v-model="courseModel.skinCode" :placeholder="$t('rules.pleaseSelect')" :disabled="true">
+          <el-form-item :label="this.$t('lesson.mapName')" prop="mapId">
+            <el-select v-model="courseModel.mapId" :placeholder="$t('rules.pleaseSelect')" :disabled="true">
               <el-option
-                v-for="(item,index) in skinCodeList"
+                v-for="(item,index) in mapIdList"
                 :key="index"
                 :label="item.name"
-                :value="item.code"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>
@@ -44,7 +44,7 @@
     <div class="draft">
       <el-button-group>
         <template v-if="!isEdit">
-          <el-button v-if="courseModel.skinCode" type="primary" @click="create">{{ $t('global.create') }}</el-button>
+          <el-button v-if="courseModel.mapId" type="primary" @click="create">{{ $t('global.create') }}</el-button>
           <el-button type="primary" @click="back">{{ $t('global.back') }}</el-button>
         </template>
         <template v-else>
@@ -59,7 +59,7 @@
 <script>
 import { createLesson, updateLesson, getLessonDetail } from '@/api/jmap/lessondraft';
 import { getCommodityMapProduct } from '@/api/management/mapprd';
-import { getSkinCodeList } from '@/api/management/mapskin';
+import { listPublishMap } from '@/api/jmap/map';
 import { UrlConfig } from '@/router/index';
 
 export default {
@@ -71,12 +71,12 @@ export default {
             isEdit: false,
             display: 1,
             productList: [],
-            skinCodeList: [],
+            mapIdList: [],
             courseModel: {
                 id: '',
                 prdCode: '',
                 product: [],
-                skinCode: '',
+                mapId: '',
                 name: '',
                 remarks: ''
             }
@@ -91,8 +91,8 @@ export default {
                 name: [
                     { required: true, message: this.$t('rules.enterCourseName'), trigger: 'change' }
                 ],
-                skinCode: [
-                    { required: true, message: this.$t('rules.inputSkinType'), trigger: 'change' }
+                mapId: [
+                    { required: true, message: this.$t('rules.selectMapName'), trigger: 'change' }
                 ],
                 prdCode: [
                     { required: true, message: this.$t('rules.selectAssociatedProduct'), trigger: 'change' }
@@ -105,9 +105,9 @@ export default {
         }
     },
     mounted() {
-        this.skinCodeList = [];
-        getSkinCodeList().then(response => {
-            this.skinCodeList = response.data;
+        this.mapIdList = [];
+        listPublishMap().then(response => {
+            this.mapIdList = response.data;
         });
     },
     methods: {
@@ -117,7 +117,6 @@ export default {
             if (!isNew) {
                 this.refresh(data);
             } else {
-                this.courseModel.skinCode = this.$route.query.skinCode;
                 this.courseModel.mapId = this.$route.query.mapId;
             }
             getCommodityMapProduct(this.$route.query.mapId).then(response => {
@@ -176,7 +175,7 @@ export default {
                     const data = response.data;
                     this.courseModel = {
                         id: data.id,
-                        skinCode: this.$route.query.skinCode,
+                        mapId: this.$route.query.mapId,
                         prdCode: data.prdCode,
                         name: data.name,
                         remarks: data.remarks
@@ -187,7 +186,7 @@ export default {
             }
         },
         back() {
-            this.$router.push({ path: `${UrlConfig.design.lessonHome}/${this.$route.query.mapId}/${this.$route.query.skinCode}`, query: {cityCode: this.$route.query.cityCode} });
+            this.$router.push({ path: `${UrlConfig.design.lessonHome}/${this.$route.query.mapId}`, query: {cityCode: this.$route.query.cityCode} });
         }
     }
 };

From 7455fb17ea5dcdd380d36b76d5ce47b32f2d11e0 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 31 Oct 2019 16:52:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0ibp=E8=A7=92=E8=89=B2=E5=A4=9A?=
 =?UTF-8?q?=E4=BA=BA=E6=97=B6disable=E4=B8=BAtrue=20=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/publish.js             |  6 +++++-
 src/i18n/langs/en/tip.js                 |  6 +++++-
 src/i18n/langs/zh/publish.js             |  6 +++++-
 src/i18n/langs/zh/tip.js                 |  6 +++++-
 src/views/ibpsystem/index.vue            | 12 ++++++------
 src/views/publish/publishMap/copy.vue    | 14 +++++++-------
 src/views/publish/publishMap/project.vue |  8 ++++----
 src/views/trainRoom/index.vue            |  2 +-
 8 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/i18n/langs/en/publish.js b/src/i18n/langs/en/publish.js
index 3a40da98d..424d202db 100644
--- a/src/i18n/langs/en/publish.js
+++ b/src/i18n/langs/en/publish.js
@@ -115,5 +115,9 @@ export default {
     enterRunPlanName: 'Please enter the name of the diagram',
     setTheProject: 'Set the project',
     whetherItBelongsToTheProject: 'Whether it belongs to the project',
-    belongsProject: 'Belongs project'
+    belongsProject: 'Belongs project',
+    theBelongsProjectCannotBeEmpty: 'The belongs project cannot be empty',
+    pleaseSelectTheBelongsProject: 'Please select the belongs project',
+    copyMapAs: 'Copy map as',
+    whetherToCopyData: 'Whether to copy data'
 };
diff --git a/src/i18n/langs/en/tip.js b/src/i18n/langs/en/tip.js
index 734c20a1e..211760601 100644
--- a/src/i18n/langs/en/tip.js
+++ b/src/i18n/langs/en/tip.js
@@ -215,5 +215,9 @@ export default {
     applyRunPlanFail:'Submit run plan to publish fail!',
     cancelRunPlanTips:'This action will revoke the run plan request, whether to continue?',
     cancelRunPlanSuccess:'Revoke run plan success!',
-    cancelRunPlanFail:'Revoke run plan fail!'
+    cancelRunPlanFail:'Revoke run plan fail!',
+    setProjectSuccess: 'Set belongs project success!',
+    setProjectFail: 'Set belongs project fail!',
+    copyMapSuccess: 'Copy map success!',
+    copyMapFail: 'Copy map fail!'
 };
diff --git a/src/i18n/langs/zh/publish.js b/src/i18n/langs/zh/publish.js
index 57e213ee0..645ea2f94 100644
--- a/src/i18n/langs/zh/publish.js
+++ b/src/i18n/langs/zh/publish.js
@@ -119,5 +119,9 @@ export default {
     // refreshFailed 刷新失败
     setTheProject: '设置归属项目',
     whetherItBelongsToTheProject: '是否归属项目',
-    belongsProject: '归属项目'
+    belongsProject: '归属项目',
+    theBelongsProjectCannotBeEmpty: '所属项目不能为空',
+    pleaseSelectTheBelongsProject: '请选择归属项目',
+    copyMapAs: '复制地图为',
+    whetherToCopyData: '是否复制数据'
 };
diff --git a/src/i18n/langs/zh/tip.js b/src/i18n/langs/zh/tip.js
index 74b53796f..b0449577d 100644
--- a/src/i18n/langs/zh/tip.js
+++ b/src/i18n/langs/zh/tip.js
@@ -215,5 +215,9 @@ export default {
     applyRunPlanFail:'提交运行图发布申请失败！',
     cancelRunPlanTips:'此操作将撤销发布运行图申请，是否继续？',
     cancelRunPlanSuccess:'撤销运行图发布申请成功！',
-    cancelRunPlanFail:'撤销运行图发布申请失败！'
+    cancelRunPlanFail:'撤销运行图发布申请失败！',
+    setProjectSuccess: '设置归属项目成功！',
+    setProjectFail: '设置归属项目失败！',
+    copyMapSuccess: '复制地图成功！',
+    copyMapFail: '复制地图失败！'
 };
diff --git a/src/views/ibpsystem/index.vue b/src/views/ibpsystem/index.vue
index a4ac6a3d1..941dcf23b 100644
--- a/src/views/ibpsystem/index.vue
+++ b/src/views/ibpsystem/index.vue
@@ -91,15 +91,15 @@ export default {
     },
     methods: {
         show (deviceCode, ibpPart) {
-		    if (!deviceCode) {
-		        return;
+            if (!deviceCode) {
+                return;
             }
             this.stationCode = deviceCode;
             document.getElementById(this.ibpId).oncontextmenu = function (e) {
                 return false;
             };
-		    let offsetX = 0;
-		    if (ibpPart === 'left') {
+            let offsetX = 0;
+            if (ibpPart === 'left') {
                 offsetX = 0;
             } else if (ibpPart === 'right') {
                 offsetX = 1920;
@@ -140,14 +140,14 @@ export default {
         },
         // 点击选择事件
         onSelected(em) {
-		    if (em.deviceModel.mean) {
+            if (em.deviceModel.mean) {
                 const params = { operate:IbpOperation[em.deviceModel.mean].operate, stationCode:this.stationCode };
                 handlerIbpEvent(this.$route.query.group, params);
             }
         },
         // 右键点击事件
         onContextMenu(em) {
-		    this.$store.dispatch('ibp/setUpdateDeviceData', em.eventTarget.model);
+            this.$store.dispatch('ibp/setUpdateDeviceData', em.eventTarget.model);
         },
         // 绘图时调用，元素可拖拽
         drawIbpInit() {
diff --git a/src/views/publish/publishMap/copy.vue b/src/views/publish/publishMap/copy.vue
index 624eacce6..22a4987fd 100644
--- a/src/views/publish/publishMap/copy.vue
+++ b/src/views/publish/publishMap/copy.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-dialogDrag title="复制地图为" :visible.sync="dialogVisible" width="30%" center>
+  <el-dialog v-dialogDrag :title="this.$t('publish.copyMapAs')" :visible.sync="dialogVisible" width="30%" 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>
@@ -24,16 +24,16 @@ export default {
             form:{
                 labelWidth: '100px',
                 items: [
-                    { prop: 'name', label: '地图名称', type: 'text', required: true},
-                    { prop: 'copyOtherData', label: '是否复制数据', type: 'switch', required: true}
+                    { prop: 'name', label: this.$t('publish.mapName'), type: 'text', required: true},
+                    { prop: 'copyOtherData', label: this.$t('publish.whetherToCopyData'), type: 'switch', required: true}
                 ]
             },
             rules: {
                 name: [
-                    { required: true, message: '请输入地图名称', trigger: 'blur' }
+                    { required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'blur' }
                 ],
                 copyOtherData: [
-                    { required: true, message: '请选择', trigger: 'change' }
+                    { required: true, message: this.$t('global.choose'), trigger: 'change' }
                 ]
             }
         };
@@ -52,13 +52,13 @@ export default {
             }
             this.loading = true;
             copyMapAs(this.mapId, this.formModel).then(resp =>{
-                this.$message.success('复制地图成功！');
+                this.$message.success(this.$t('tip.copyMapSuccess'));
                 this.loading = false;
                 this.dialogVisible = false;
                 this.$emit('refresh');
             }).catch(() => {
                 this.loading = false;
-                this.$messageBox(`复制地图失败！`);
+                this.$messageBox(this.$t('tip.copyMapFail'));
             });
         }
     }
diff --git a/src/views/publish/publishMap/project.vue b/src/views/publish/publishMap/project.vue
index 17143a1b9..5a2cee717 100644
--- a/src/views/publish/publishMap/project.vue
+++ b/src/views/publish/publishMap/project.vue
@@ -15,10 +15,10 @@
         :label="this.$t('publish.belongsProject')"
         prop="projectCode"
         :rules="{
-          required: true, message: '归属项目不能为空', trigger: 'change'
+          required: true, message: this.$t('publish.theBelongsProjectCannotBeEmpty'), trigger: 'change'
         }"
       >
-        <el-select v-model="formModel.projectCode" placeholder="请选择归属项目">
+        <el-select v-model="formModel.projectCode" :placeholder="this.$t('publish.pleaseSelectTheBelongsProject')">
           <el-option label="西铁院" value="XTY" />
         </el-select>
       </el-form-item>
@@ -69,12 +69,12 @@ export default {
                     }
                     this.loading = true;
                     setMapProject(this.formModel).then(resp =>{
-                        this.$message.success('设置归属项目成功！');
+                        this.$message.success(this.$t('tip.setProjectSuccess'));
                         this.loading = false;
                         this.dialogVisible = false;
                         this.$emit('refresh');
                     }).catch( ()=>{
-                        this.$messageBox(`设置归属项目失败！`);
+                        this.$messageBox(this.$t('tip.setProjectFail'));
                     });
                 } else {
                     return false;
diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue
index 698c86f6f..f8d0bda51 100644
--- a/src/views/trainRoom/index.vue
+++ b/src/views/trainRoom/index.vue
@@ -859,7 +859,7 @@ export default {
             stationList.forEach(item => {
                 item.disabled = false;
                 list.forEach(nor => {
-                    if (item.code === nor.deviceCode[0]) {
+                    if (item.value === nor.deviceCode[0]) {
                         item.disabled = true;
                     }
                 });

From 7ec68a75e3547b04153d9e027526cacf6c9b2e75 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Thu, 31 Oct 2019 17:30:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?desc:=20=E5=88=A0=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E6=96=87=E4=BB=B6=EF=BC=8C=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  71 ++-
 src/views/demonstration/deomonList/index.vue  | 148 +++---
 src/views/demonstration/deomonTopic/index.vue |  92 ++--
 src/views/demonstration/detail/index.vue      | 475 +++++++++---------
 src/views/demonstration/home.vue              |  97 ----
 src/views/demonstration/index.vue             |  74 ---
 src/views/demonstration/list/demonList.vue    | 146 ------
 src/views/exam/detail/examDetail.vue          |  34 +-
 src/views/exam/index.vue                      |  64 +--
 src/views/exam/result.vue                     | 150 +++---
 src/views/mapdraft/mapoperate/section.vue     |   5 +-
 src/views/package/detail.vue                  | 140 +++---
 src/views/package/draft/ruleForm.vue          | 138 +++--
 src/views/package/index.vue                   | 308 ++++++------
 src/views/planMonitor/editTool/index.vue      | 198 ++++----
 src/views/planMonitor/home.vue                |  94 ----
 src/views/planMonitor/index.vue               |  70 ---
 src/views/teach/detail/index.vue              |  41 +-
 src/views/teach/index.vue                     |  21 +-
 19 files changed, 943 insertions(+), 1423 deletions(-)
 delete mode 100644 src/views/demonstration/home.vue
 delete mode 100644 src/views/demonstration/index.vue
 delete mode 100644 src/views/demonstration/list/demonList.vue
 delete mode 100644 src/views/planMonitor/home.vue
 delete mode 100644 src/views/planMonitor/index.vue

diff --git a/src/router/index.js b/src/router/index.js
index ebf2f5efb..410be165d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -48,6 +48,7 @@ import ScriptDisplay from '@/views/scriptManage/display/index';
 import TeachDetail from '@/views/teach/detail/index';
 import TeachHome from '@/views/teach/index';
 import Pay from '@/views/components/pay/index';
+
 import ExamDetail from '@/views/exam/detail/examDetail';
 import ExamHome from '@/views/exam/index';
 import ExamCourseDetail from '@/views/exam/detail/courseDetail';
@@ -57,8 +58,6 @@ import DemonstrationDetail from '@/views/demonstration/detail/index';
 
 import PlanMonitorEditTool from '@/views/planMonitor/editTool/index';
 import PlanMonitorEditUserTool from '@/views/planMonitor/editTool/userindex';
-// import PlanMonitor from '@/views/planMonitor/index';
-// import PlanMonitorHome from '@/views/planMonitor/home';
 import PlanMonitorDetail from '@/views/planMonitor/detail';
 
 import DesignPlatformHome from '@/views/designPlatform/home';
@@ -484,56 +483,56 @@ export const asyncRouter = [
                         component: TeachDetail,
                         hidden: true
                     },
-                    {
-                        path: 'examHome/:subSystem',
-                        component: ExamHome,
-                        hidden: true
-                    },
-                    {
-                        path: 'exam/:examId',
-                        component: ExamDetail,
-                        hidden: true
-                    },
-                    {
-                        path: 'pay/:lessonId',
-                        component: Pay,
-                        hidden: true
-                    },
-                    {
+                    { // 试卷列表
                         path: 'course/:subSystem',
                         component: ExamCourseDetail,
                         hidden: true
                     },
-                    {
-                        path: 'result/:userExamId',
-                        component: ExamResult,
+                    { // 考试系统 课程列表
+                        path: 'examHome/:subSystem',
+                        component: ExamHome,
                         hidden: true
                     },
-                    {
-                        path: 'permission/:mapId',
-                        component: Package,
+                    { // 试卷详情
+                        path: 'exam/:examId',
+                        component: ExamDetail,
                         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: 'pay/:lessonId',
+                        component: Pay,
+                        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: 'runPlan/manage/:mapId',
                         component: PlanMonitorDetail,
diff --git a/src/views/demonstration/deomonList/index.vue b/src/views/demonstration/deomonList/index.vue
index 0f8ed57c8..1818646c9 100644
--- a/src/views/demonstration/deomonList/index.vue
+++ b/src/views/demonstration/deomonList/index.vue
@@ -42,80 +42,80 @@ import { getPublishMapInfo } from '@/api/jmap/map';
 import { launchFullscreen } from '@/utils/screen';
 
 export default {
-	name: 'DeomonList',
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			height: 120,
-			trainingList: [],
-			defaultProps: {
-				label: 'roomName'
-			},
-			group: '',
-			state: '',
-			mapId: ''
-		};
-	},
-	computed: {
-		show() {
-			return this.dialogShow;
-		},
-		title() {
-			return this.$t('global.synthesisTrainingTitle');
-		},
-		isWatch() {
-			return true;
-		},
-		isjoin() {
-			return true;
-		}
-	},
-	methods: {
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.label.indexOf(value) !== -1;
-		},
-		clickEvent(obj, node, data) {
-			this.state = obj.state;
-			this.group = obj.group;
-			this.mapId = obj.mapId;
-		},
-		async getList() {
-			try {
-				const res = await getjointTrainList();
-				this.trainingList = res.data;
-			} catch (error) {
-				console.error(error);
-			}
-		},
-		doShow() {
-			this.getList();
-			this.loading = false;
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-		},
-		async handleJoin() {
-			if (this.group) {
-				await getjointTraining(this.group);
-				if (this.state == '02') {
-					launchFullscreen();
-					await putJointTrainingSimulationEntrance(this.group);
-					const rest = await getPublishMapInfo(this.mapId);
-					const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.group, subSystem: this.$route.query.subSystem };
-					this.$router.push({ path: `/jointTraining`, query: query });
-				} else if (this.state == '01') {
-					const query = { group: this.group };
-					this.$router.push({ path: `/trainroom`, query: query });
-				}
-			} else {
-				this.$message.info(this.$t('global.pleaseChooseRoom'));
-			}
-		}
-	}
+    name: 'DeomonList',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            height: 120,
+            trainingList: [],
+            defaultProps: {
+                label: 'roomName'
+            },
+            group: '',
+            state: '',
+            mapId: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow;
+        },
+        title() {
+            return this.$t('global.synthesisTrainingTitle');
+        },
+        isWatch() {
+            return true;
+        },
+        isjoin() {
+            return true;
+        }
+    },
+    methods: {
+        filterNode(value, data) {
+            if (!value) return true;
+            return data.label.indexOf(value) !== -1;
+        },
+        clickEvent(obj, node, data) {
+            this.state = obj.state;
+            this.group = obj.group;
+            this.mapId = obj.mapId;
+        },
+        async getList() {
+            try {
+                const res = await getjointTrainList();
+                this.trainingList = res.data;
+            } catch (error) {
+                console.error(error);
+            }
+        },
+        doShow() {
+            this.getList();
+            this.loading = false;
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        async handleJoin() {
+            if (this.group) {
+                await getjointTraining(this.group);
+                if (this.state == '02') {
+                    launchFullscreen();
+                    await putJointTrainingSimulationEntrance(this.group);
+                    const rest = await getPublishMapInfo(this.mapId);
+                    const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.group, subSystem: this.$route.query.subSystem };
+                    this.$router.push({ path: `/jointTraining`, query: query });
+                } else if (this.state == '01') {
+                    const query = { group: this.group };
+                    this.$router.push({ path: `/trainroom`, query: query });
+                }
+            } else {
+                this.$message.info(this.$t('global.pleaseChooseRoom'));
+            }
+        }
+    }
 };
 </script>
 
diff --git a/src/views/demonstration/deomonTopic/index.vue b/src/views/demonstration/deomonTopic/index.vue
index 8cfc77656..e75c5e6c3 100644
--- a/src/views/demonstration/deomonTopic/index.vue
+++ b/src/views/demonstration/deomonTopic/index.vue
@@ -23,52 +23,52 @@ import { getPublishMapInfo } from '@/api/jmap/map';
 import { launchFullscreen } from '@/utils/screen';
 
 export default {
-	name: 'DeomonList',
-	data() {
-		return {
-			dialogShow: false,
-			group: '',
-			roomName: '',
-			state: '',
-			mapId: ''
-		};
-	},
-	computed: {
-		show() {
-			return this.dialogShow;
-		},
-		title() {
-			return this.$t('global.synthesisTrainingTitle');
-		}
-	},
-	mounted() {
-	},
-	methods: {
-		doShow(data) {
-			this.roomName = data.creator.nickName;
-			this.group = data.group;
-			this.state = data.state;
-			this.mapId = data.mapId;
-			this.dialogShow = true;
-		},
-		doClose() {
-			this.dialogShow = false;
-		},
-		async handleJoin() {
-			if (this.state == '02') {
-				launchFullscreen();
-				await putJointTrainingSimulationEntrance(this.group);
-				const rest = await getPublishMapInfo(this.mapId);
-				const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.group };
-				this.$router.push({ path: `/jointTraining`, query: query });
-			} else if (this.state == '01') {
-				const query = { group: this.group };
-				this.$router.push({ path: `/trainroom`, query: query });
-			}
-			this.dialogShow = false;
-			getjointTraining(this.group);
-		}
-	}
+    name: 'DeomonList',
+    data() {
+        return {
+            dialogShow: false,
+            group: '',
+            roomName: '',
+            state: '',
+            mapId: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow;
+        },
+        title() {
+            return this.$t('global.synthesisTrainingTitle');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow(data) {
+            this.roomName = data.creator.nickName;
+            this.group = data.group;
+            this.state = data.state;
+            this.mapId = data.mapId;
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.dialogShow = false;
+        },
+        async handleJoin() {
+            if (this.state == '02') {
+                launchFullscreen();
+                await putJointTrainingSimulationEntrance(this.group);
+                const rest = await getPublishMapInfo(this.mapId);
+                const query = { skinCode: rest.data.skinCode, mapId: this.mapId, group: this.group };
+                this.$router.push({ path: `/jointTraining`, query: query });
+            } else if (this.state == '01') {
+                const query = { group: this.group };
+                this.$router.push({ path: `/trainroom`, query: query });
+            }
+            this.dialogShow = false;
+            getjointTraining(this.group);
+        }
+    }
 };
 </script>
 
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index b26865016..0762e2b2a 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <el-card v-loading="loading">
-    <div slot="header" style="text-align: center;">
+  <div v-loading="loading" class="joylink-card">
+    <div class="card-title">
       <span><b>{{ $t('demonstration.simulationName') + courseModel.name }}</b></span>
     </div>
-    <div class="simulation-detail" :style="{ height: height-230 +'px' }">
+    <div class="simulation-detail">
       <p class="list-item">
         <span class="list-label">{{ $t('demonstration.productDescription') }}</span>
         <span class="list-elem">{{ courseModel.remarks }}</span>
@@ -21,8 +21,9 @@
       <el-button v-show="isCreateRoom" :loading="buttonLoading" type="primary" @click="start">{{ $t('demonstration.createRoom') }}</el-button>
       <el-button v-show="isInRoom" :loading="buttonLoading" type="primary" @click="joinRoom">{{ $t('demonstration.enterRoom') }}</el-button>
     </div>
-  </el-card>
+  </div>
 </template>
+
 <script>
 // import { getPublishMapInfo } from '@/api/jmap/map';
 import { getGoodsTryUse } from '@/api/management/goods';
@@ -35,241 +36,243 @@ import LimitList from '@/views/components/limits/index';
 import { getSubSystemDetail } from '@/api/trainingPlatform';
 
 export default {
-	name: 'ExamDetailList',
-	components: {
-		LimitList
-	},
-	data() {
-		return {
-			tryTime: 0,
-			goodsId: '',
-			tryUser: 0,
-			loading: true,
-			buttonLoading: false,
-			currentLessonId: '',
-			currentPrdCode: '',
-			productList: [],
-			courseModel: {
-				id: '',
-				name: '',
-				mapId: '',
-				skinCode: '',
-				remarks: '',
-				prdType: '',
-				prdCode: '',
-				pmsList: []
-			},
-			jointShow: false,
-			jointGroup: ''
-		};
-	},
-	computed: {
-		hasPermssion() {
-			let isShow = false;
-			if (this.courseModel.pmsList && this.courseModel.pmsList.length) {
-				isShow = true;
-			}
-			return isShow;
-		},
-		isStartDemon() {
-			return this.courseModel.prdType !== '03' && (this.hasPermssion || this.tryTime > 0);
-		},
-		isCreateRoom() {
-			return this.courseModel.prdType === '03' && this.hasPermssion && !this.jointShow;
-		},
-		isInRoom() {
-			return this.courseModel.prdType === '03' && this.hasPermssion && this.jointShow;
-		},
-		mapId() {
-			return this.$route.query.mapId;
-		},
-		// prodId() {
-		// 	return this.$route.query.prodId;
-		// },
-		height() {
-			return this.$store.state.app.height - 50;
-		}
-	},
-	watch: {
-		'$route': function (val) {
-			this.loadInitData();
-		}
-	},
-	async mounted() {
-		this.loadInitData();
-	},
-	methods: {
-		async loadInitData() {
-			this.loading = true;
-			try {
-				const resp = await getSubSystemDetail(this.$route.params.subSystem);
-				this.tryUser = 0;
-				this.loading = false;
-				if (resp.data.mapPrd) {
-					this.courseModel = {
-						id: resp.data.mapPrd.id,
-						name: resp.data.mapPrd.name,
-						mapId: this.mapId,
-						skinCode: resp.data.mapPrd.skinCode,
-						remarks: resp.data.mapPrd.remarks,
-						prdType: resp.data.mapPrd.prdType,
-						prdCode: resp.data.mapPrd.code,
-						pmsList: resp.data.permissionList || [],
-						PermissionType: PermissionType.SIMULATION
-					};
-					this.currentPrdCode = resp.data.mapPrd.code;
-					if (resp.data.mapPrd.prdType === '03') {
-						this.getJointTrainingList();
-					}
-				}
-				if (!this.courseModel.pmsList) {
-					this.tryUser = 1;
-					const paras = {
-						mapId: this.mapId,
-						prdCode: this.courseModel.prdCode,
-						permissionType: PermissionType.SIMULATION
-					};
+    name: 'ExamDetailList',
+    components: {
+        LimitList
+    },
+    data() {
+        return {
+            tryTime: 0,
+            goodsId: '',
+            tryUser: 0,
+            loading: true,
+            buttonLoading: false,
+            currentLessonId: '',
+            currentPrdCode: '',
+            productList: [],
+            courseModel: {
+                id: '',
+                name: '',
+                mapId: '',
+                skinCode: '',
+                remarks: '',
+                prdType: '',
+                prdCode: '',
+                pmsList: []
+            },
+            jointShow: false,
+            jointGroup: ''
+        };
+    },
+    computed: {
+        hasPermssion() {
+            let isShow = false;
+            if (this.courseModel.pmsList && this.courseModel.pmsList.length) {
+                isShow = true;
+            }
+            return isShow;
+        },
+        isStartDemon() {
+            return this.courseModel.prdType !== '03' && (this.hasPermssion || this.tryTime > 0);
+        },
+        isCreateRoom() {
+            return this.courseModel.prdType === '03' && this.hasPermssion && !this.jointShow;
+        },
+        isInRoom() {
+            return this.courseModel.prdType === '03' && this.hasPermssion && this.jointShow;
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        }
+    },
+    watch: {
+        '$route': function (val) {
+            this.loadInitData();
+        }
+    },
+    async mounted() {
+        this.loadInitData();
+    },
+    methods: {
+        async loadInitData() {
+            this.loading = true;
+            try {
+                const resp = await getSubSystemDetail(this.$route.params.subSystem);
+                this.tryUser = 0;
+                this.loading = false;
+                if (resp.data.mapPrd) {
+                    this.courseModel = {
+                        id: resp.data.mapPrd.id,
+                        name: resp.data.mapPrd.name,
+                        mapId: this.mapId,
+                        skinCode: resp.data.mapPrd.skinCode,
+                        remarks: resp.data.mapPrd.remarks,
+                        prdType: resp.data.mapPrd.prdType,
+                        prdCode: resp.data.mapPrd.code,
+                        pmsList: resp.data.permissionList || [],
+                        PermissionType: PermissionType.SIMULATION
+                    };
+                    this.currentPrdCode = resp.data.mapPrd.code;
+                    if (resp.data.mapPrd.prdType === '03') {
+                        this.getJointTrainingList();
+                    }
+                }
+                if (!this.courseModel.pmsList) {
+                    this.tryUser = 1;
+                    const paras = {
+                        mapId: this.mapId,
+                        prdCode: this.courseModel.prdCode,
+                        permissionType: PermissionType.SIMULATION
+                    };
 
-					try {
-						const resr = await getGoodsTryUse(paras);
-						if (resr.data.tryTime <= 0) {
-							this.tryTime = 0;
-						} else {
-							this.tryTime = resr.data.tryTime;
-							this.goodsId = resr.data.goodsId;
-						}
-					} catch (error) {
-						this.tryTime = 0;
-					}
-				}
-			} catch (error) {
-				this.loading = false;
-				this.$messageBox(this.$t('error.refreshFailed'));
-			}
-		},
-		async getJointTrainingList() {
-			try {
-				if (this.mapId) {
-					const res = await checkRoomExist({ mapId: this.mapId });
-					this.jointGroup = res.data;
-					this.jointShow = false;
-					if (res.data) {
-						this.jointShow = true;
-					}
-				}
-			} catch (error) {
-				console.error(error, '获取是否拥有综合演练房间');
-			}
-		},
-		async joinRoom() {
-			await getjointTraining(this.jointGroup);
-			const query = { skinCode: this.courseModel.skinCode, group: this.jointGroup, subSystem: this.$route.params.subSystem};
-			this.$router.push({ path: `/trainroom`, query: query });
-		},
-		async createRoom() {
-			try {
-				this.buttonLoading = true;
-				const param = {
-					mapId: Number(this.mapId),
-					prdCode: this.courseModel.prdCode
-				};
-				const res = await postCreateRoom(param);
-				if (res && res.code == 200) {
-					const query = { skinCode: this.courseModel.skinCode, group: res.data, subSystem: this.$route.params.subSystem };
-					this.$router.push({ path: `/trainroom`, query: query });
-				}
-			} catch (error) {
-				this.buttonLoading = false;
-				if (error.code == 20001) {
-					this.$confirm(this.$t('tip.createRoomFailedHint'), this.$t('global.tips'), {
-						confirmButtonText: this.$t('global.confirm'),
-						cancelButtonText: this.$t('global.cancel'),
-						type: 'warning'
-					}).then(() => {}).catch(() => {});
-				}
-				if (error.code == 500009) {
-					this.$messageBox(error.message);
-				}
-			}
-		},
-		async start() {
-			if (this.courseModel.prdType == '05') {
-				this.jumpScheduling();
-			} else if (this.courseModel.prdType == '03') {
-				this.createRoom();
-			} else {
-				if (this.courseModel.pmsList && this.courseModel.pmsList.length) {
-					this.jump();
-				} else {
-					if (this.tryTime <= 1) {
-						this.$confirm(this.$t('tip.noPermissionHint'), this.$t('global.tips'), {
-							confirmButtonText: this.$t('global.confirm'),
-							cancelButtonText: this.$t('global.cancel'),
-							type: 'warning'
-						}).then(() => {
-							this.buy();
-						}).catch(() => { this.buttonLoading = false; });
-					} else {
-						this.jump();
-					}
-				}
-			}
-		},
-		jumpScheduling() {
-			this.buttonLoading = true;
-			const data = { mapId: this.courseModel.mapId, code: this.currentPrdCode };
-			schedulingNotify(data).then(resp => {
-				const query = { skinCode: this.courseModel.skinCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdCode, goodsId: this.goodsId, try: this.tryUser };
-				this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
-				launchFullscreen();
-			}).catch(error => {
-				this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
-				this.buttonLoading = false;
-			});
-		},
-		jump() {
-			const data = { mapId: this.courseModel.mapId, code: this.currentPrdCode };
-			this.buttonLoading = true;
-			simulationNotify(data).then(resp => {
-				const query = { skinCode: this.courseModel.skinCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdCode, goodsId: this.goodsId, try: this.tryUser };
-				this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
-				launchFullscreen();
-			}).catch(error => {
-				this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
-				this.buttonLoading = false;
-			});
-		},
-		buy() {
-			this.buttonLoading = true;
-			this.$router.push({
-				path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`,
-				query: { permissionType: PermissionType.SIMULATION, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem }
-			});
-		},
-		transfer() {
-			this.buttonLoading = false;
-			if (this.$refs) {
-				this.$refs[`limit`].transfer(this.courseModel);
-			}
-		},
-		distribute() {
-			this.buttonLoading = false;
-			if (this.$refs) {
-				this.$refs[`limit`].distribute(this.courseModel);
-			}
-		}
-	}
+                    try {
+                        const resr = await getGoodsTryUse(paras);
+                        if (resr.data.tryTime <= 0) {
+                            this.tryTime = 0;
+                        } else {
+                            this.tryTime = resr.data.tryTime;
+                            this.goodsId = resr.data.goodsId;
+                        }
+                    } catch (error) {
+                        this.tryTime = 0;
+                    }
+                }
+            } catch (error) {
+                this.loading = false;
+                this.$messageBox(this.$t('error.refreshFailed'));
+            }
+        },
+        async getJointTrainingList() {
+            try {
+                if (this.mapId) {
+                    const res = await checkRoomExist({ mapId: this.mapId });
+                    this.jointGroup = res.data;
+                    this.jointShow = false;
+                    if (res.data) {
+                        this.jointShow = true;
+                    }
+                }
+            } catch (error) {
+                console.error(error, '获取是否拥有综合演练房间');
+            }
+        },
+        async joinRoom() {
+            await getjointTraining(this.jointGroup);
+            const query = { skinCode: this.courseModel.skinCode, group: this.jointGroup, subSystem: this.$route.params.subSystem};
+            this.$router.push({ path: `/trainroom`, query: query });
+        },
+        async createRoom() {
+            try {
+                this.buttonLoading = true;
+                const param = {
+                    mapId: Number(this.mapId),
+                    prdCode: this.courseModel.prdCode
+                };
+                const res = await postCreateRoom(param);
+                if (res && res.code == 200) {
+                    const query = { skinCode: this.courseModel.skinCode, group: res.data, subSystem: this.$route.params.subSystem };
+                    this.$router.push({ path: `/trainroom`, query: query });
+                }
+            } catch (error) {
+                this.buttonLoading = false;
+                if (error.code == 20001) {
+                    this.$confirm(this.$t('tip.createRoomFailedHint'), this.$t('global.tips'), {
+                        confirmButtonText: this.$t('global.confirm'),
+                        cancelButtonText: this.$t('global.cancel'),
+                        type: 'warning'
+                    }).then(() => {}).catch(() => {});
+                }
+                if (error.code == 500009) {
+                    this.$messageBox(error.message);
+                }
+            }
+        },
+        async start() {
+            if (this.courseModel.prdType == '05') {
+                this.jumpScheduling();
+            } else if (this.courseModel.prdType == '03') {
+                this.createRoom();
+            } else {
+                if (this.courseModel.pmsList && this.courseModel.pmsList.length) {
+                    this.jump();
+                } else {
+                    if (this.tryTime <= 1) {
+                        this.$confirm(this.$t('tip.noPermissionHint'), this.$t('global.tips'), {
+                            confirmButtonText: this.$t('global.confirm'),
+                            cancelButtonText: this.$t('global.cancel'),
+                            type: 'warning'
+                        }).then(() => {
+                            this.buy();
+                        }).catch(() => { this.buttonLoading = false; });
+                    } else {
+                        this.jump();
+                    }
+                }
+            }
+        },
+        jumpScheduling() {
+            this.buttonLoading = true;
+            const data = { mapId: this.courseModel.mapId, code: this.currentPrdCode };
+            schedulingNotify(data).then(resp => {
+                const query = { skinCode: this.courseModel.skinCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdCode, goodsId: this.goodsId, try: this.tryUser };
+                this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
+                launchFullscreen();
+            }).catch(error => {
+                this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                this.buttonLoading = false;
+            });
+        },
+        jump() {
+            const data = { mapId: this.courseModel.mapId, code: this.currentPrdCode };
+            this.buttonLoading = true;
+            simulationNotify(data).then(resp => {
+                const query = { skinCode: this.courseModel.skinCode, group: resp.data, prdType: this.courseModel.prdType, mapId: this.courseModel.mapId, code: this.currentPrdCode, goodsId: this.goodsId, try: this.tryUser };
+                this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
+                launchFullscreen();
+            }).catch(error => {
+                this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                this.buttonLoading = false;
+            });
+        },
+        buy() {
+            this.buttonLoading = true;
+            this.$router.push({
+                path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`,
+                query: { permissionType: PermissionType.SIMULATION, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem }
+            });
+        },
+        transfer() {
+            this.buttonLoading = false;
+            if (this.$refs) {
+                this.$refs[`limit`].transfer(this.courseModel);
+            }
+        },
+        distribute() {
+            this.buttonLoading = false;
+            if (this.$refs) {
+                this.$refs[`limit`].distribute(this.courseModel);
+            }
+        }
+    }
 };
 </script>
-<style scoped>
-    ::-webkit-scrollbar {
-        width: 3px;
-        height: 3px;
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .joylink-card{
+        height: 100%;
+        overflow: hidden;
+        .card-title{
+            height: 47px;
+            line-height: 47px;
+            text-align: center;
+            border-bottom: 1px solid #d6d6d6;
+        }
     }
-</style>
-<style>
     .simulation-detail {
-        margin: 50px;
+        padding: 50px;
+        padding-bottom: 0;
+        height: calc(100% - 107px);
+        overflow: auto;
     }
 
     .list-item {
@@ -289,10 +292,8 @@ export default {
     }
 
     .btn-buy {
-        position: relative;
         text-align: center;
-        justify-content: center;
-        transform: translateY(-20px);
+        padding: 10px 0;
     }
 
     .el-tabs--border-card>.el-tabs__header .el-tabs__item {
diff --git a/src/views/demonstration/home.vue b/src/views/demonstration/home.vue
deleted file mode 100644
index 0b346aee1..000000000
--- a/src/views/demonstration/home.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-  <el-card :style="{height: height+'px'}">
-    <div class="home-box" :style="{height: height+'px'}">
-      <el-scrollbar wrap-class="scrollbar-wrapper">
-        <h1 class="title">
-          {{ $t('demonstration.simulationSystem') }}
-          <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>
-    </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;
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ .el-carousel {
-        overflow: hidden;
-    }
-
-    .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;
-
-            .logo-img {
-                position: absolute;
-                right: 0;
-                top: 0;
-                width: 55px;
-            }
-        }
-
-        .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;
-        }
-    }
-</style>
diff --git a/src/views/demonstration/index.vue b/src/views/demonstration/index.vue
deleted file mode 100644
index e5f360f13..000000000
--- a/src/views/demonstration/index.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<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" :height="height" />
-      </div>
-      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
-      <transition>
-        <router-view :product-list="productList" />
-      </transition>
-    </el-scrollbar>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import demonList from './list/demonList';
-import drapLeft from '@/views/components/drapLeft/index';
-import localStore from 'storejs';
-
-export default {
-	name: 'Exam',
-	components: {
-		demonList,
-		drapLeft
-	},
-	data() {
-		return {
-			listShow: true,
-			widthLeft: 450,
-			productList: []
-		};
-	},
-	computed: {
-		...mapGetters([
-			'lessonbar'
-		]),
-		height() {
-			return this.$store.state.app.height - 50;
-		}
-	},
-	watch: {
-		'lessonbar.opened': function (val) {
-			this.listShow = val;
-		}
-	},
-	mounted() {
-		this.widthLeft = Number(localStore.get('LeftWidth'));
-	},
-	methods: {
-		refresh() {
-			this.$refs && this.$refs.demonList && this.$refs.demonList.refresh();
-		},
-		drapWidth(width) {
-			this.widthLeft = Number(width);
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .app-wrapper {
-        @include clearfix;
-        position: relative;
-        height: 100%;
-        width: 100%;
-        overflow: hidden;
-    }
-
-    .examList {
-        float: left;
-    }
-</style>
diff --git a/src/views/demonstration/list/demonList.vue b/src/views/demonstration/list/demonList.vue
deleted file mode 100644
index c60d45d40..000000000
--- a/src/views/demonstration/list/demonList.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-  <el-card v-loading="loading" class="map-list-main">
-    <div slot="header" class="clearfix">
-      <span>{{ $t('global.mapList') }}</span>
-    </div>
-    <filter-city ref="filerCity" filter-empty :query-function="queryFunction" @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 :style="{color: data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span>
-        </span>
-      </el-tree>
-    </el-scrollbar>
-  </el-card>
-</template>
-<script>
-import { getPublishMapTree } from '@/api/management/mapprd';
-import { UrlConfig } from '@/router/index';
-import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/utils/auth';
-import FilterCity from '@/views/components/filterCity';
-
-export default {
-    name: 'ExamDetailList',
-    components: {
-        FilterCity
-    },
-    props: {
-        height: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            loading: true,
-            defaultShowKeys: [],
-            queryFunction: getPublishMapTree,
-            filterText: '',
-            treeData: [],
-            treeList: [],
-            selected: {},
-            defaultProps: {
-                children: 'children',
-                label: 'name'
-            },
-            node: {
-            }
-        };
-    },
-    computed: {
-        role() {
-            return this.$store.state.user.roles.includes('04') ||
-                    this.$store.state.user.roles.includes('05') ||
-                    this.$store.state.user.roles.includes('01');
-        }
-    },
-    watch: {
-        filterText(val) {
-            this.treeList = this.treeData.filter((res) => {
-                return res.name.includes(val);
-            });
-        }
-    },
-    beforeDestroy () {
-        removeSessionStorage('demonList');
-    },
-    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) {
-            if (obj.type == 'Map') {
-                setSessionStorage('demonList', obj.id);
-                this.$router.push({ path: `${UrlConfig.demonstration.detail}/${obj.id}` });
-            }
-        },
-        async refresh(filterSelect) {
-            this.loading = true;
-            this.treeData = this.treeList = [];
-            try {
-                const res = await getPublishMapTree(filterSelect);
-                this.treeData = res.data;
-                this.treeList = this.filterText
-                    ? res.data.filter(elem => { return elem.name.includes(this.filterText); })
-                    : res.data;
-
-                if (this.treeData.length > 0) {
-                    this.treeData.forEach(v => {
-                        v.children = [];
-                    });
-
-                }
-                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'));
-            }
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .back-home {
-        float: right;
-        cursor: pointer;
-
-        &:hover {
-            color: #3ea726;
-        }
-    }
-</style>
-<style>
-    .el-tree {
-        overflow-x: hidden;
-    }
-
-    .el-tree-node.is-current>.el-tree-node__content {
-        background-color: #e4e3e3 !important;
-    }
-</style>
diff --git a/src/views/exam/detail/examDetail.vue b/src/views/exam/detail/examDetail.vue
index e65b2de98..706485a61 100644
--- a/src/views/exam/detail/examDetail.vue
+++ b/src/views/exam/detail/examDetail.vue
@@ -1,10 +1,10 @@
 <template>
-  <el-card>
-    <div slot="header" style="text-align: center;">
+  <div class="joylink-card">
+    <div class="card-title">
       <b>{{ $t('exam.nameOfTestPaper') +': ' + examDetails.name }}</b>
     </div>
-    <div style="margin:50px; overflow-y: auto;">
-      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: height - 190 +'px' }">
+    <div style="padding:50px; padding-right: 0; height: 100%;">
+      <el-scrollbar wrap-class="scrollbar-wrapper">
         <p class="list-item">
           <span class="list-label">{{ $t('exam.examStartTime') +':' }}</span>
           <span v-if="examDetails.startTime" class="list-elem">
@@ -40,13 +40,13 @@
             </p>
           </span>
         </p>
+        <div class="btn-start">
+          <el-button :loading="loading" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
+          <el-button @click="back">{{ $t('global.back') }}</el-button>
+        </div>
       </el-scrollbar>
     </div>
-    <div class="btn-start">
-      <el-button :loading="loading" type="primary" @click="exmaStart">{{ $t('exam.startTheExam') }}</el-button>
-      <el-button @click="back">{{ $t('global.back') }}</el-button>
-    </div>
-  </el-card>
+  </div>
 </template>
 <script>
 import { examNotify } from '@/api/simulation';
@@ -223,6 +223,16 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
+    .joylink-card{
+        height: 100%;
+        overflow: hidden;
+        .card-title{
+            height: 47px;
+            line-height: 47px;
+            text-align: center;
+            border-bottom: 1px solid #e6e6e6;
+        }
+    }
 
     .menu li {
         border-right: solid white 1px;
@@ -279,7 +289,7 @@ export default {
     .list-table {
         padding-top: 10px;
         padding-left: 120px;
-        width: calc(100%);
+        width: calc(100% - 80px);
     }
 
     .list-elem {
@@ -287,9 +297,7 @@ export default {
     }
 
     .btn-start {
-        position: relative;
         text-align: center;
-        justify-content: center;
-        transform: translateY(-20px);
+        margin-bottom: 20px;
     }
 </style>
diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue
index caf1cafde..f04d75329 100644
--- a/src/views/exam/index.vue
+++ b/src/views/exam/index.vue
@@ -40,37 +40,37 @@ import { UrlConfig } from '@/router/index';
 import localStore from 'storejs';
 
 export default {
-	name: 'ExamHome',
-	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('examDetail'+this.$route.params.subSystem, `${UrlConfig.trainingPlatform.course}/${this.$route.params.subSystem}?lessonId=${row.id}`);
-			this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${this.$route.params.subSystem}`, query: {lessonId: row.id}});
-		}
-	}
+    name: 'ExamHome',
+    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('examDetail' + this.$route.params.subSystem, `${UrlConfig.trainingPlatform.course}/${this.$route.params.subSystem}?lessonId=${row.id}`);
+            this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${this.$route.params.subSystem}`, query: {lessonId: row.id}});
+        }
+    }
 };
 </script>
diff --git a/src/views/exam/result.vue b/src/views/exam/result.vue
index f277c59db..8c6f93e6c 100644
--- a/src/views/exam/result.vue
+++ b/src/views/exam/result.vue
@@ -45,82 +45,82 @@ import { submitExam } from '@/api/management/userexam';
 import { UrlConfig } from '@/router/index';
 
 export default {
-	name: 'ExamResult',
-	props: {
-		examDetails: {
-			type: Object,
-			default: null
-		}
-	},
-	data() {
-		return {
-			resultModel: {
-				trainingName: '',
-				score: 0
-			},
-			loading: true
-		};
-	},
-	computed: {
-		height() {
-			return this.$store.state.app.height - 50;
-		}
-	},
-	mounted() {
-		this.submitExamData();
-	},
-	methods: {
-		getSummaries(param) {
-			const { columns, data } = param;
-			const sums = [];
-			columns.forEach((column, index) => {
-				if (index === 0) {
-					sums[index] = this.$t('exam.totalScore');
-					return;
-				}
-				const values = data.map(item => Number(item[column.property]));
-				if (!values.every(value => isNaN(value))) {
-					sums[index] = values.reduce((prev, curr) => {
-						const value = Number(curr);
-						if (!isNaN(value)) {
-							return prev + curr;
-						} else {
-							return prev;
-						}
-					}, 0);
-					sums[index] += this.$t('exam.points');
-				} else {
-					sums[index] = 'N/A';
-				}
-			});
-			return sums;
-		},
-		submitExamData() {
-			this.loading = true;
-			let count = 3;
-			const userExamId = this.$route.params.userExamId;
-			let interval = setInterval(() => {
-				submitExam(userExamId).then(response => {
-					this.loading = false;
-					this.resultModel = response.data;
-					clearInterval(interval);
-					interval = null;
-				}).catch(() => {
-					if (count-- < 0) {
-						this.loading = false;
-						clearInterval(interval);
-						interval = null;
-						this.$messageBox(this.$t('error.submitExamFailed'));
-					}
-				});
-			}, 1000);
+    name: 'ExamResult',
+    props: {
+        examDetails: {
+            type: Object,
+            default: null
+        }
+    },
+    data() {
+        return {
+            resultModel: {
+                trainingName: '',
+                score: 0
+            },
+            loading: true
+        };
+    },
+    computed: {
+        height() {
+            return this.$store.state.app.height - 50;
+        }
+    },
+    mounted() {
+        this.submitExamData();
+    },
+    methods: {
+        getSummaries(param) {
+            const { columns, data } = param;
+            const sums = [];
+            columns.forEach((column, index) => {
+                if (index === 0) {
+                    sums[index] = this.$t('exam.totalScore');
+                    return;
+                }
+                const values = data.map(item => Number(item[column.property]));
+                if (!values.every(value => isNaN(value))) {
+                    sums[index] = values.reduce((prev, curr) => {
+                        const value = Number(curr);
+                        if (!isNaN(value)) {
+                            return prev + curr;
+                        } else {
+                            return prev;
+                        }
+                    }, 0);
+                    sums[index] += this.$t('exam.points');
+                } else {
+                    sums[index] = 'N/A';
+                }
+            });
+            return sums;
+        },
+        submitExamData() {
+            this.loading = true;
+            let count = 3;
+            const userExamId = this.$route.params.userExamId;
+            let interval = setInterval(() => {
+                submitExam(userExamId).then(response => {
+                    this.loading = false;
+                    this.resultModel = response.data;
+                    clearInterval(interval);
+                    interval = null;
+                }).catch(() => {
+                    if (count-- < 0) {
+                        this.loading = false;
+                        clearInterval(interval);
+                        interval = null;
+                        this.$messageBox(this.$t('error.submitExamFailed'));
+                    }
+                });
+            }, 1000);
 
-		},
-		back() {
-			const examId = this.resultModel.examId;
-			this.$router.push({path: `${UrlConfig.trainingPlatform.examDetail}/${examId}`,  query: { subSystem: this.$route.query.subSystem }});
-		}
-	}
+        },
+        back() {
+            const examId = this.resultModel.examId;
+            this.$router.push({path: `${UrlConfig.trainingPlatform.examDetail}/${examId}`, query: { subSystem: this.$route.query.subSystem }});
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/mapdraft/mapoperate/section.vue b/src/views/mapdraft/mapoperate/section.vue
index d67818d11..5f7965592 100644
--- a/src/views/mapdraft/mapoperate/section.vue
+++ b/src/views/mapdraft/mapoperate/section.vue
@@ -877,16 +877,17 @@ export default {
                             section.trainPosType = model.trainPosType;
                             edits.push(section);
                         }
-                        if (section.linkCode == model.linkCode && model.code != section.code) {
-                            // debugger;
+                        if (section.linkCode == model.linkCode && model.code != section.code && section.type == '01') {
                             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;
+                                section.offsetRight = model.offsetLeft;
                             }
                             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;
+                                section.offsetLeft = model.offsetRight;
                             }
                             edits.push(section);
                         }
diff --git a/src/views/package/detail.vue b/src/views/package/detail.vue
index fbbc41378..63fa8f7ce 100644
--- a/src/views/package/detail.vue
+++ b/src/views/package/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 100%; overflow: auto;">
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <div class="draft">
       <el-button-group>
@@ -13,76 +13,76 @@
 import { getPermissonDetail } from '@/api/management/author';
 
 export default {
-	name: 'Author',
-	components: {
-	},
-	data() {
-		return {
-			PermissionTypeList: [],
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				labelWidth: '140px',
-				reset: true,
-				show: false,
-				queryObject: {
-				}
-			},
-			queryList: {
-				query: this.queryFunction,
-				selectCheckShow: false,
-				indexShow: true,
-				columns: [
-					{
-						title: this.$t('orderAuthor.permissionName'),
-						prop: 'name'
-					},
-					{
-						title: this.$t('orderAuthor.permissionType'),
-						prop: 'type',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.type, this.PermissionTypeList, ['value', 'label']); },
-						tagType: (row) => { return ''; }
-					},
-					{
-						type: 'button',
-						title: this.$t('global.operate'),
-						width: '150',
-						buttons: [
-						]
-					}
-				],
-				actions: [
-				]
-			}
-		};
-	},
+    name: 'Author',
+    components: {
+    },
+    data() {
+        return {
+            PermissionTypeList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '140px',
+                reset: true,
+                show: false,
+                queryObject: {
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: this.$t('orderAuthor.permissionName'),
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('orderAuthor.permissionType'),
+                        prop: 'type',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.type, this.PermissionTypeList, ['value', 'label']); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '150',
+                        buttons: [
+                        ]
+                    }
+                ],
+                actions: [
+                ]
+            }
+        };
+    },
 
-	mounted() {
-		this.loadInitData();
-	},
-	methods: {
-		loadInitData() {
-			this.$Dictionary.permissionType().then(list => {
-				this.$convertList(list, this.PermissionTypeList, elem => {
-					return true;
-				});
-			});
-		},
-		queryFunction() {
-			return getPermissonDetail(this.$route.params.id);
-		},
-		reloadTable() {
-			if (this.queryList && this.queryList.reload) {
-				this.queryList.reload();
-			}
-		},
-		turnback() {
-			this.$router.go(-1);
-		}
-	}
+    mounted() {
+        this.loadInitData();
+    },
+    methods: {
+        loadInitData() {
+            this.$Dictionary.permissionType().then(list => {
+                this.$convertList(list, this.PermissionTypeList, elem => {
+                    return true;
+                });
+            });
+        },
+        queryFunction() {
+            return getPermissonDetail(this.$route.params.id);
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        turnback() {
+            this.$router.go(-1);
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/package/draft/ruleForm.vue b/src/views/package/draft/ruleForm.vue
index c210cdbf2..39f110694 100644
--- a/src/views/package/draft/ruleForm.vue
+++ b/src/views/package/draft/ruleForm.vue
@@ -1,72 +1,69 @@
 <template>
-  <el-card>
-    <div class="pack-box" :style="{ height: height +'px' }">
-      <el-scrollbar wrap-class="scrollbar-wrapper" style="">
-        <el-steps class="steps" :active="display">
-          <el-step :title="$t('permission.customPackageRules')" icon="el-icon-edit" />
-          <el-step icon="el-icon-setting" />
-        </el-steps>
-        <el-card class="forms pack-rule">
-          <el-button class="addList" size="small" @click="dialogAdd">{{ $t('permission.addRules') }}</el-button>
-          <el-table
-            :data="ruleList"
-            border
-            show-summary
-            :summary-method="getSummaries"
-            style="width: 100%"
-            :height="height-300"
-          >
-            <el-table-column prop="permissionType" :label="$t('permission.permissionType')" width="80">
-              <template slot-scope="scope">
-                {{ computedName(PermissionTypeList, scope.row.permissionType) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="mapId" :label="$t('permission.mapName')">
-              <template slot-scope="scope">
-                {{ computedName(PublishMapList, scope.row.mapId) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="mapProductCode" :label="$t('permission.mapProductName')" width="100">
-              <template slot-scope="scope">
-                {{ computedName(mapProductList, scope.row.prdCode) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="lessonId" :label="$t('permission.lessonName')">
-              <template slot-scope="scope">
-                {{ computedName(PublisLessonList, scope.row.lessonId) }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="startTime" :label="$t('permission.startTime')" width="80" />
-            <el-table-column prop="endTime" :label="$t('permission.endTime')" width="80" />
-            <el-table-column prop="amount" label="权限个数" width="90" />
-            <el-table-column label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button type="text" size="small" @click="dialogEdit(scope.row)">{{ $t('global.edit') }}</el-button>
-                <el-button type="text" size="small" @click="deleteForm(scope.row)">{{ $t('global.delete') }}</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-card>
-        <div class="draft">
-          <el-button-group>
-            <el-button v-if="!urlInfo.url" type="primary" @click="packForm">{{ $t('permission.package') }}</el-button>
-            <el-button v-if="urlInfo.url" type="primary" @click="qrcodeShow">{{ $t('permission.getQrcode') }}</el-button>
-            <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
-          </el-button-group>
-        </div>
-        <edit-rule
-          ref="addRule"
-          :permission-type-list="PermissionTypeList"
-          :publis-lesson-list="PublisLessonList"
-          :publish-map-list="PublishMapList"
-          @editRuleForm="editRuleForm"
-          @addRuleForm="addRuleForm"
-        />
-      </el-scrollbar>
-    </div>
+  <div class="joylink-card pack-box">
+    <el-scrollbar wrap-class="scrollbar-wrapper" style="">
+      <el-steps class="steps" :active="display">
+        <el-step :title="$t('permission.customPackageRules')" icon="el-icon-edit" />
+        <el-step icon="el-icon-setting" />
+      </el-steps>
+      <div class="joylink-card forms pack-rule">
+        <el-button class="addList" size="small" @click="dialogAdd">{{ $t('permission.addRules') }}</el-button>
+        <el-table
+          :data="ruleList"
+          border
+          show-summary
+          :summary-method="getSummaries"
+          style="width: 100%; min-height: 300px;"
+        >
+          <el-table-column prop="permissionType" :label="$t('permission.permissionType')" width="80">
+            <template slot-scope="scope">
+              {{ computedName(PermissionTypeList, scope.row.permissionType) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="mapId" :label="$t('permission.mapName')">
+            <template slot-scope="scope">
+              {{ computedName(PublishMapList, scope.row.mapId) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="mapProductCode" :label="$t('permission.mapProductName')" width="100">
+            <template slot-scope="scope">
+              {{ computedName(mapProductList, scope.row.prdCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="lessonId" :label="$t('permission.lessonName')">
+            <template slot-scope="scope">
+              {{ computedName(PublisLessonList, scope.row.lessonId) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="startTime" :label="$t('permission.startTime')" width="80" />
+          <el-table-column prop="endTime" :label="$t('permission.endTime')" width="80" />
+          <el-table-column prop="amount" label="权限个数" width="90" />
+          <el-table-column label="操作" width="100">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="dialogEdit(scope.row)">{{ $t('global.edit') }}</el-button>
+              <el-button type="text" size="small" @click="deleteForm(scope.row)">{{ $t('global.delete') }}</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="draft">
+        <el-button-group>
+          <el-button v-if="!urlInfo.url" type="primary" @click="packForm">{{ $t('permission.package') }}</el-button>
+          <el-button v-if="urlInfo.url" type="primary" @click="qrcodeShow">{{ $t('permission.getQrcode') }}</el-button>
+          <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
+        </el-button-group>
+      </div>
+      <edit-rule
+        ref="addRule"
+        :permission-type-list="PermissionTypeList"
+        :publis-lesson-list="PublisLessonList"
+        :publish-map-list="PublishMapList"
+        @editRuleForm="editRuleForm"
+        @addRuleForm="addRuleForm"
+      />
+    </el-scrollbar>
     <qr-code ref="qrCode" />
     <can-transfer ref="canDistribute" @distribute="distribute" />
-  </el-card>
+  </div>
 </template>
 
 <script>
@@ -96,11 +93,6 @@ export default {
             ruleList: []
         };
     },
-    computed: {
-        height() {
-            return this.$store.state.app.height - 63;
-        }
-    },
     mounted() {
         this.loadInitData();
     },
@@ -262,6 +254,8 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
     .pack-box {
         padding-top: 10px;
+        height: 100%;
+        overflow: hidden;
 
         /deep/ {
             .el-step__icon.is-icon {
@@ -289,6 +283,8 @@ export default {
     }
 
     .pack-rule {
+        width: 980px;
+        margin: 0 auto;
         .addList {
             float: right;
             font-size: 14px;
diff --git a/src/views/package/index.vue b/src/views/package/index.vue
index da6dae030..df8dc596f 100644
--- a/src/views/package/index.vue
+++ b/src/views/package/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 100%; overflow: auto;">
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <select-role ref="selectRole" @reloadTable="reloadTable" />
   </div>
@@ -12,159 +12,159 @@ import { superAdmin, admin } from '@/router';
 import selectRole from './selectRole/list';
 
 export default {
-	name: 'Author',
-	components: {
-		selectRole
-	},
-	data() {
-		return {
-			param: '',
-			WhetherTypeList: [],
-			// EffectiveTypeList: [],
-			PermissionTypeList: [],
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				labelWidth: '140px',
-				reset: true,
-				leftSpan: 18,
-				queryObject: {
-					'canDistribute': {
-						type: 'select',
-						label: this.$t('permission.permissionUseType'),
-						config: {
-							data: []
-						}
-					}
-				}
-			},
-			queryList: {
-				query: this.queryFunction,
-				selectCheckShow: false,
-				indexShow: true,
-				columns: [
-					{
-						title: this.$t('permission.permissionName'),
-						width: '210',
-						prop: 'permissionName'
-					},
-					{
-						title: this.$t('permission.permissionType'),
-						prop: 'permissionType',
-						type: 'tag',
-						columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
-						tagType: (row) => { return ''; }
-					},
-					{
-						title: this.$t('permission.permissionUseType'),
-						prop: 'canDistribute',
-						type: 'tag',
-						columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList'); },
-						tagType: (row) => {
-							switch (row.canDistribute) {
-							case true: return 'success';
-							case false: return 'danger';
-							}
-						}
-					},
-					{
-						title: this.$t('permission.permissionTotal'),
-						prop: 'amount'
-					},
-					{
-						title: this.$t('permission.permissionRemains'),
-						prop: 'remains'
-					},
-					{
-						title: this.$t('permission.startTime'),
-						prop: 'startTime',
-						type: 'formatter',
-						formatter: this.formatterDate
+    name: 'Author',
+    components: {
+        selectRole
+    },
+    data() {
+        return {
+            param: '',
+            WhetherTypeList: [],
+            // EffectiveTypeList: [],
+            PermissionTypeList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '140px',
+                reset: true,
+                leftSpan: 18,
+                queryObject: {
+                    'canDistribute': {
+                        type: 'select',
+                        label: this.$t('permission.permissionUseType'),
+                        config: {
+                            data: []
+                        }
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: this.$t('permission.permissionName'),
+                        width: '210',
+                        prop: 'permissionName'
+                    },
+                    {
+                        title: this.$t('permission.permissionType'),
+                        prop: 'permissionType',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.permissionType, this.PermissionTypeList, ['value', 'label']); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('permission.permissionUseType'),
+                        prop: 'canDistribute',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.canDistribute, 'PermissionUseList'); },
+                        tagType: (row) => {
+                            switch (row.canDistribute) {
+                            case true: return 'success';
+                            case false: return 'danger';
+                            }
+                        }
+                    },
+                    {
+                        title: this.$t('permission.permissionTotal'),
+                        prop: 'amount'
+                    },
+                    {
+                        title: this.$t('permission.permissionRemains'),
+                        prop: 'remains'
+                    },
+                    {
+                        title: this.$t('permission.startTime'),
+                        prop: 'startTime',
+                        type: 'formatter',
+                        formatter: this.formatterDate
 
-					},
-					{
-						title: this.$t('permission.endTime'),
-						prop: 'endTime',
-						type: 'formatter',
-						formatter: this.formatterDate
-					},
-					{
-						title: this.$t('permission.belonger'),
-						prop: 'ownerName',
-						isShow: () => { return this.$store.state.user.roles.indexOf(superAdmin) > 0 || this.$store.state.user.roles.indexOf(admin) > 0; }
-					},
-					{
-						type: 'button',
-						title: this.$t('global.operate'),
-						width: '300',
-						hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0 || this.$store.state.user.roles.indexOf(admin) < 0; },
-						buttons: [
-							{
-								name: this.$t('permission.setBelonger'),
-								handleClick: this.handleRoleVest,
-								type: ''
-							},
-							{
-								name: this.$t('orderAuthor.packingDetails'),
-								handleClick: this.handleDetail,
-								type: '',
-								showControl: (row) => { return !row.permissionType; }
-							}
-						]
-					}
-				],
-				actions: [
-					{ 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();
-	},
-	methods: {
-		handleRoleVest(index, row) {
-			this.$refs.selectRole.doShow(row.id);
-		},
-		handleDetail(index, row) {
-			this.$router.push({ path: `${UrlConfig.trainingPlatform.permissionDetails}/${row.permissionId}` });
-		},
-		loadInitData() {
-			this.queryForm.queryObject.canDistribute.config.data = this.$ConstSelect.PermissionUseList;
-			this.$Dictionary.permissionType().then(list => {
-				list.forEach(elem => {
-					elem.value = elem.code;
-					elem.label = elem.name;
-				});
-				this.$convertList(list, this.PermissionTypeList, elem => {
-					return true;
-				});
-			});
-		},
-		formatterDate(row, porpInfo) {
-			return row[porpInfo.property] ? row[porpInfo.property] : '---';
-		},
-		queryFunction(params) {
-			if (this.$route.params.mapId) {
-				params.mapId = this.$route.params.mapId;
-			}
-			return listUserPermision(params);
-		},
-		handlePermissionPack() {
-			this.$router.push({ path: `${UrlConfig.trainingPlatform.draft}` });
-		},
-		reloadTable() {
-			if (this.queryList && this.queryList.reload) {
-				this.queryList.reload();
-			}
-		}
-	}
+                    },
+                    {
+                        title: this.$t('permission.endTime'),
+                        prop: 'endTime',
+                        type: 'formatter',
+                        formatter: this.formatterDate
+                    },
+                    {
+                        title: this.$t('permission.belonger'),
+                        prop: 'ownerName',
+                        isShow: () => { return this.$store.state.user.roles.indexOf(superAdmin) > 0 || this.$store.state.user.roles.indexOf(admin) > 0; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '300',
+                        hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0 || this.$store.state.user.roles.indexOf(admin) < 0; },
+                        buttons: [
+                            {
+                                name: this.$t('permission.setBelonger'),
+                                handleClick: this.handleRoleVest,
+                                type: ''
+                            },
+                            {
+                                name: this.$t('orderAuthor.packingDetails'),
+                                handleClick: this.handleDetail,
+                                type: '',
+                                showControl: (row) => { return !row.permissionType; }
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { 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();
+    },
+    methods: {
+        handleRoleVest(index, row) {
+            this.$refs.selectRole.doShow(row.id);
+        },
+        handleDetail(index, row) {
+            this.$router.push({ path: `${UrlConfig.trainingPlatform.permissionDetails}/${row.permissionId}` });
+        },
+        loadInitData() {
+            this.queryForm.queryObject.canDistribute.config.data = this.$ConstSelect.PermissionUseList;
+            this.$Dictionary.permissionType().then(list => {
+                list.forEach(elem => {
+                    elem.value = elem.code;
+                    elem.label = elem.name;
+                });
+                this.$convertList(list, this.PermissionTypeList, elem => {
+                    return true;
+                });
+            });
+        },
+        formatterDate(row, porpInfo) {
+            return row[porpInfo.property] ? row[porpInfo.property] : '---';
+        },
+        queryFunction(params) {
+            if (this.$route.params.mapId) {
+                params.mapId = this.$route.params.mapId;
+            }
+            return listUserPermision(params);
+        },
+        handlePermissionPack() {
+            this.$router.push({ path: `${UrlConfig.trainingPlatform.draft}` });
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        }
+    }
 };
 </script>
diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue
index ceb2d2a8d..6eee0fad5 100644
--- a/src/views/planMonitor/editTool/index.vue
+++ b/src/views/planMonitor/editTool/index.vue
@@ -23,13 +23,13 @@
     />
     <edit-smooth-run-time ref="editSmoothRunTime" @dispatchDialog="dispatchDialog" />
     <add-smooth-run-time ref="addSmoothRunTime" @dispatchDialog="dispatchDialog" />
-    <duplicate-train ref="duplicateTrain" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" @refresh="refresh"/>
+    <duplicate-train ref="duplicateTrain" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" @refresh="refresh" />
     <modifying-routing ref="modifyingRouting" @dispatchDialog="dispatchDialog" />
     <modifying-begin-time ref="modifyingBeginTime" />
 
     <systerm-out ref="systermOut" />
-    <add-task ref="addTask" @dispatchOperate="dispatchOperate" @refresh="refresh"/>
-    <delete-task ref="deleteTask" @dispatchOperate="dispatchOperate" @refresh="refresh"/>
+    <add-task ref="addTask" @dispatchOperate="dispatchOperate" @refresh="refresh" />
+    <delete-task ref="deleteTask" @dispatchOperate="dispatchOperate" @refresh="refresh" />
     <modifying-task ref="modifyingTask" @dispatchOperate="dispatchOperate" />
 
     <edit-station-between-time ref="editStationBetweenTime" />
@@ -64,109 +64,109 @@ import { deletePlanService } from '@/api/runplan';
 import { checkLoginLine } from '@/api/login';
 
 export default {
-	name: 'Menus',
-	components: {
-		MenuBar,
-		StatusBar,
-		Schedule,
-		// OpenRunPlan,
-		// CreateEmptyPlan,
-		Parameter,
-		OffLine,
-		AddPlanningTrain,
-		EditPlanningTrain,
-		DuplicateTrain,
-		SystermOut,
-		AddTask,
-		DeleteTask,
-		ModifyingTask,
-		ModifyingRouting,
-		ModifyingBeginTime,
-		EditStationBetweenTime,
-		AddSmoothRunTime,
-		EditSmoothRunTime,
-		ModifyingStationIntervalTime
-	},
-	data() {
-		return {
-			PlanConvert: {},
-			timeDemon: null
-		};
-	},
-	computed: {
-		skinCode() {
-			return this.$route.query.skinCode || '02';
-		},
-		width() {
-			return this.$store.state.app.width;
-		},
-		height() {
-			return this.$store.state.app.height;
-		}
-	},
-	created() {
-		this.PlanConvert = this.$theme.loadPlanConvert(this.skinCode);
+    name: 'Menus',
+    components: {
+        MenuBar,
+        StatusBar,
+        Schedule,
+        // OpenRunPlan,
+        // CreateEmptyPlan,
+        Parameter,
+        OffLine,
+        AddPlanningTrain,
+        EditPlanningTrain,
+        DuplicateTrain,
+        SystermOut,
+        AddTask,
+        DeleteTask,
+        ModifyingTask,
+        ModifyingRouting,
+        ModifyingBeginTime,
+        EditStationBetweenTime,
+        AddSmoothRunTime,
+        EditSmoothRunTime,
+        ModifyingStationIntervalTime
+    },
+    data() {
+        return {
+            PlanConvert: {},
+            timeDemon: null
+        };
+    },
+    computed: {
+        skinCode() {
+            return this.$route.query.skinCode || '02';
+        },
+        width() {
+            return this.$store.state.app.width;
+        },
+        height() {
+            return this.$store.state.app.height;
+        }
+    },
+    created() {
+        this.PlanConvert = this.$theme.loadPlanConvert(this.skinCode);
 
-	},
-	mounted() {
-		this.timeDemon = setInterval(() => {
-			checkLoginLine();
-		}, 3000 * 60);
-	},
-	beforeDestroy() {
-		if (this.timeDemon) {
-			clearTimeout(this.timeDemon);
-		}
-	},
-	methods: {
-		setPosition() {
-			this.$nextTick(() => {
-				this.$refs.schedule.setPosition();
-			});
-		},
-		dispatchDialog(dialogObj) {
-			this.$nextTick(() => {
-				if (this.$refs[dialogObj.name]) {
-					this.$refs[dialogObj.name].doShow(dialogObj.params);
-				}
-			});
-		},
-		dispatchOperate(operateObj) {
-			this.$nextTick(() => {
-				if (this.$refs[operateObj.dialogName]) {
-					this.$refs[operateObj.dialogName][operateObj.operate](operateObj.params);
-				}
-			});
-		},
-		handleConfirm(params) {
-			if (params.operate == 'AddPlanningTrain') {
-				// 添加计划
-				this.$refs.addPlanningTrain.handleConfirm();
-			} else if (params.operate == 'DeletePlanningTrain') {
-				// 删除计划
-				const model = {
-					planId: this.$route.query.planId,
-					serviceNumber: params.serviceNumber
+    },
+    mounted() {
+        this.timeDemon = setInterval(() => {
+            checkLoginLine();
+        }, 3000 * 60);
+    },
+    beforeDestroy() {
+        if (this.timeDemon) {
+            clearTimeout(this.timeDemon);
+        }
+    },
+    methods: {
+        setPosition() {
+            this.$nextTick(() => {
+                this.$refs.schedule.setPosition();
+            });
+        },
+        dispatchDialog(dialogObj) {
+            this.$nextTick(() => {
+                if (this.$refs[dialogObj.name]) {
+                    this.$refs[dialogObj.name].doShow(dialogObj.params);
+                }
+            });
+        },
+        dispatchOperate(operateObj) {
+            this.$nextTick(() => {
+                if (this.$refs[operateObj.dialogName]) {
+                    this.$refs[operateObj.dialogName][operateObj.operate](operateObj.params);
+                }
+            });
+        },
+        handleConfirm(params) {
+            if (params.operate == 'AddPlanningTrain') {
+                // 添加计划
+                this.$refs.addPlanningTrain.handleConfirm();
+            } else if (params.operate == 'DeletePlanningTrain') {
+                // 删除计划
+                const model = {
+                    planId: this.$route.query.planId,
+                    serviceNumber: params.serviceNumber
                 };
-				deletePlanService(model).then(resp => {
-					this.$message.success(this.$t('tip.deletePlanSuccessfully'));
+                deletePlanService(model).then(resp => {
+                    this.$message.success(this.$t('tip.deletePlanSuccessfully'));
                     this.$store.dispatch('runPlan/setSelected', {});
                     this.$store.dispatch('runPlan/refresh');
-					// this.$refs.openRunPlan.loadRunPlanData(Object.assign({refresh: true}, this.$route.query));
-				}).catch(() => {
-					this.$messageBox(this.$t('tip.deletePlanFailed'));
-				});
-			}
-		},
-		showTrain() {
-			if (this.$refs.schedule) {
-				this.$refs.schedule.displayTrain();
-			}
+                    // this.$refs.openRunPlan.loadRunPlanData(Object.assign({refresh: true}, this.$route.query));
+                }).catch(() => {
+                    this.$messageBox(this.$t('tip.deletePlanFailed'));
+                });
+            }
         },
-        refresh(){
+        showTrain() {
+            if (this.$refs.schedule) {
+                this.$refs.schedule.displayTrain();
+            }
+        },
+        refresh() {
             this.$store.dispatch('runPlan/refresh');
         }
-	}
+    }
 };
 </script>
 
diff --git a/src/views/planMonitor/home.vue b/src/views/planMonitor/home.vue
deleted file mode 100644
index b7c4d894a..000000000
--- a/src/views/planMonitor/home.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-  <el-card :style="{height: height+'px'}">
-    <div class="home-box" :style="{height: height+'px'}">
-      <el-scrollbar wrap-class="scrollbar-wrapper" style="margin-top:5px;">
-        <h1 class="title">
-          {{ $t('planMonitor.lianPlanSystem') }}
-          <img :src="logo" alt="" class="logo-img">
-        </h1>
-        <div class="card-box">
-          <el-carousel :interval="4000" type="card" height="370px">
-            <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('planMonitor.lianPlanDescription') }}
-        </div>
-      </el-scrollbar>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import logo from '@/assets/logo.png';
-import home1 from '@/assets/home/plan1.png';
-import home2 from '@/assets/home/plan2.png';
-import home3 from '@/assets/home/plan3.png';
-
-export default {
-    name: 'Home',
-    data() {
-        return {
-            listImg: [
-                { src: home1 },
-                { src: home2 },
-                { src: home3 }
-            ],
-            logo: logo
-        };
-    },
-    computed: {
-        height() {
-            return this.$store.state.app.height;
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    /deep/ .el-carousel {
-        overflow: hidden;
-    }
-
-    .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;
-
-            .logo-img {
-                position: absolute;
-                right: 0;
-                top: 0;
-                width: 55px;
-            }
-        }
-
-        .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;
-        }
-    }
-</style>
diff --git a/src/views/planMonitor/index.vue b/src/views/planMonitor/index.vue
deleted file mode 100644
index 79c18c59f..000000000
--- a/src/views/planMonitor/index.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-  <div class="app-wrapper">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <div v-show="listShow" class="map-list" :style="{width: widthLeft+'px'}">
-        <plan-list ref="planList" :height="height" />
-      </div>
-      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
-      <transition>
-        <router-view />
-      </transition>
-    </el-scrollbar>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import planList from './planmanage/planList';
-import drapLeft from '@/views/components/drapLeft/index';
-import localStore from 'storejs';
-
-export default {
-    name: 'Exam',
-    components: {
-        planList,
-        drapLeft
-    },
-    data() {
-        return {
-            listShow: true,
-            widthLeft: Number(localStore.get('LeftWidth')) || 450
-        };
-    },
-    computed: {
-        ...mapGetters([
-            'lessonbar'
-        ]),
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    watch: {
-        'lessonbar.opened': function (val) {
-            this.listShow = val;
-        }
-    },
-    methods: {
-        refresh() {
-            this.$refs && this.$refs.planList && this.$refs.planList.refresh();
-        },
-        drapWidth(width) {
-            this.widthLeft = Number(width);
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .app-wrapper {
-        @include clearfix;
-        position: relative;
-        height: 100%;
-        width: 100%;
-        overflow: hidden;
-    }
-
-    .map-list {
-        float: left;
-    }
-</style>
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index 14603be37..f8387f326 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -1,12 +1,12 @@
 <template>
-  <el-card>
-    <div slot="header" style="text-align: center;">
+  <div class="joylink-card card_hidden_box">
+    <div class="card-title">
       <b>{{ $t('teach.courseName') }}: {{ courseModel.name }}</b>
     </div>
-    <div style="margin:50px" :style="{ height: height - 230 +'px' }">
+    <div class="content_box" style="">
       <el-tabs v-model="activeName">
         <el-tab-pane :label="$t('teach.courseDetails')" name="first">
-          <div :style="{ height: height - 270 +'px' }">
+          <div>
             <el-scrollbar wrap-class="scrollbar-wrapper">
               <el-tree
                 ref="tree"
@@ -32,11 +32,7 @@
           </div>
         </el-tab-pane>
         <el-tab-pane :label="$t('teach.permissionsDetails')" name="second">
-          <div :style="{ height: height - 270 +'px' }">
-            <el-scrollbar wrap-class="scrollbar-wrapper">
-              <limit-list ref="limitList" :course-model="courseModel" @initLoadPage="initLoadPage" />
-            </el-scrollbar>
-          </div>
+          <limit-list ref="limitList" :course-model="courseModel" @initLoadPage="initLoadPage" />
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -46,7 +42,7 @@
       <el-button v-if="hasPermssion" type="primary" @click="transfer">{{ $t('teach.authorityTransferred') }}</el-button>
       <el-button type="primary" @click="backLessonList">{{ $t('teach.returnCourseList') }}</el-button>
     </div>
-  </el-card>
+  </div>
 </template>
 
 <script>
@@ -86,9 +82,6 @@ export default {
     computed: {
         hasPermssion() {
             return this.courseModel.pmsList.length > 0;
-        },
-        height() {
-            return this.$store.state.app.height - 50;
         }
     },
     watch: {
@@ -214,6 +207,24 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
   @import "src/styles/mixin.scss";
+  .joylink-card{
+      height: 100%;
+      .card-title{
+          height: 47px;
+          line-height: 47px;
+          text-align: center;
+          border-bottom: 1px solid #e6e6e6;
+      }
+  }
+  .content_box{
+      padding: 50px;
+      height: calc(100% - 107px);
+      overflow: auto;
+      padding-bottom: 0;
+  }
+  .card_hidden_box{
+    overflow: hidden;
+  }
 
   .menu li {
     border-right: solid white 1px;
@@ -225,10 +236,8 @@ export default {
   }
 
   .btn-buy {
-    position: relative;
     text-align: center;
-    justify-content: center;
-    transform: translateY(-20px);
+    padding: 10px 0;
   }
   .custom-tree-node {
       flex: 1;
diff --git a/src/views/teach/index.vue b/src/views/teach/index.vue
index e57869db2..3bf35888a 100644
--- a/src/views/teach/index.vue
+++ b/src/views/teach/index.vue
@@ -6,23 +6,10 @@
       </div>
     </el-card>
     <el-card v-loading="loading">
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="name"
-          :label="this.$t('teach.courseName')"
-        />
-        <el-table-column
-          prop="remarks"
-          show-overflow-tooltip
-          :label="this.$t('teach.courseDescription')"
-        />
-        <el-table-column
-          :label="this.$t('global.operate')"
-        >
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column prop="name" :label="this.$t('teach.courseName')" />
+        <el-table-column prop="remarks" show-overflow-tooltip :label="this.$t('teach.courseDescription')" />
+        <el-table-column :label="this.$t('global.operate')">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="goLesson(scope.row)">
               {{ $t('teach.enterTheCourse') }}