Merge remote-tracking branch 'origin/dev' into test

# Conflicts:
#	src/router/index.js

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
     });

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'
 };

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!'
 };

src/i18n/langs/zh/publish.js

@@ -119,5 +119,9 @@ export default {
     // refreshFailed 刷新失败
     setTheProject: '设置归属项目',
     whetherItBelongsToTheProject: '是否归属项目',
-    belongsProject: '归属项目'
+    belongsProject: '归属项目',
+    theBelongsProjectCannotBeEmpty: '所属项目不能为空',
+    pleaseSelectTheBelongsProject: '请选择归属项目',
+    copyMapAs: '复制地图为',
+    whetherToCopyData: '是否复制数据'
 };

src/i18n/langs/zh/tip.js

@@ -215,5 +215,9 @@ export default {
     applyRunPlanFail:'提交运行图发布申请失败！',
     cancelRunPlanTips:'此操作将撤销发布运行图申请，是否继续？',
     cancelRunPlanSuccess:'撤销运行图发布申请成功！',
-    cancelRunPlanFail:'撤销运行图发布申请失败！'
+    cancelRunPlanFail:'撤销运行图发布申请失败！',
+    setProjectSuccess: '设置归属项目成功！',
+    setProjectFail: '设置归属项目失败！',
+    copyMapSuccess: '复制地图成功！',
+    copyMapFail: '复制地图失败！'
 };

src/router/index.js

@@ -19,7 +19,6 @@ import Error401 from '@/views/error-page/401';
 import Errpr404 from '@/views/error-page/404';
 
 import MapProduct from '@/views/system/product/index';
-import ibpDraw from '@/views/system/ibpDraw/index';
 import Dictionary from '@/views/system/dictionary/index';
 import DictionaryDetail from '@/views/system/dictionaryDetail/index';
 import UserControl from '@/views/system/userControl/index';
@@ -28,8 +27,9 @@ import UserExam from '@/views/system/userExam/index';
 import UserSimulation from '@/views/system/userSimulation/index';
 import ExistingSimulation from '@/views/system/existingSimulation/index';
 import CacheControl from '@/views/system/cacheControl/index';
-import SystemGenerate from '@/views/system/systemGenerate/index';
 import Trainingrecord from '@/views/system/trainingrecord/index';
+import SystemGenerate from '@/views/system/systemGenerate/index';
+import IbpDraw from '@/views/system/ibpDraw/index';
 
 import Mapedit from '@/views/mapdraft/index';
 
@@ -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';
@@ -308,22 +307,12 @@ export const asyncRouter = [
                         meta: {
                         }
                     },
-                    {
+                    { // 运行图设计
-                        path: 'map/draw/:mapId/:view',
-                        component: Mapedit,
-                        hidden: true
-                    },
-                    {
-                        path: 'lesson/edit/:type',
-                        component: LessonEdit,
-                        hidden: true
-                    },
-                    {
                         path: 'runPlan/detail/:mapId',
                         component: PlanMonitorDetail,
                         hidden: true
                     },
-                    {
+                    { // 剧本
                         path: 'script/home/:mapId',
                         component: ScriptmanageHome,
                         meta: {
@@ -331,13 +320,37 @@ export const asyncRouter = [
                         },
                         hidden: true
                     },
-                    {
+                    { // 课程列表
                         path: 'lesson/home/:mapId',
-                        // /:skinCode
                         component: LessonHome,
                         hidden: true
                     },
-                    {
+                    { // 操作定义
+                        path: 'lesson/trainingRule',
+                        component: TrainingRuleList,
+                        hidden: true
+                    },
+                    { // 操作定义步骤
+                        path: 'lesson/trainingRule/detail',
+                        hidden: true,
+                        component: TrainingRuleEdit
+                    },
+                    { // 任务管理
+                        path: 'lesson/taskManage',
+                        component: Taskmanage,
+                        hidden: true
+                    },
+                    { // 实训管理
+                        path: 'lesson/trainingManage',
+                        component: Trainingmanage,
+                        hidden: true
+                    },
+                    { // 创建课程
+                        path: 'lesson/edit/:type',
+                        component: LessonEdit,
+                        hidden: true
+                    },
+                    { // 课程详情
                         path: 'lesson/details',
                         component: LessonDetail,
                         hidden: true,
@@ -354,32 +367,7 @@ export const asyncRouter = [
                         component: TrainingrecordManage,
                         hidden: true
                     },
-                    {
+                    { // 地图预览
-                        path: 'lesson/taskManage',
-                        component: Taskmanage,
-                        hidden: true
-                    },
-                    {
-                        path: 'lesson/trainingRule',
-                        component: TrainingRuleList,
-                        hidden: true
-                    },
-                    {
-                        path: 'lesson/trainingRule/detail',
-                        hidden: true,
-                        component: TrainingRuleEdit
-                    },
-                    {
-                        path: 'lesson/trainingManage/:skinCode',
-                        component: Trainingmanage,
-                        hidden: true
-                    },
-                    {
-                        path: 'lesson/training/:trainingId/:trainingName',
-                        component: TrainingrecordManage,
-                        hidden: true
-                    },
-                    {
                         path: 'mapPreview/:mapId',
                         component: MapPreview,
                         hidden: true
@@ -412,38 +400,15 @@ export const asyncRouter = [
                         meta: {
                         }
                     },
-                    {
+                    { // 地图绘制
                         path: 'map/draw/:mapId/:view',
                         component: Mapedit,
                         hidden: true
                     },
-                    {
+                    { // 运行图设计
-                        path: 'lesson/edit/:type',
-                        component: LessonEdit,
-                        hidden: true
-                    },
-                    {
                         path: 'runPlan/detail/:mapId',
                         component: PlanMonitorDetail,
                         hidden: true
-                    },
-                    {
-                        path: 'script/home/:mapId',
-                        component: ScriptmanageHome,
-                        meta: {
-                            i18n: 'router.scriptManage'
-                        },
-                        hidden: true
-                    },
-                    {
-                        path: 'lesson/home/:mapId',
-                        component: LessonHome,
-                        hidden: true
-                    },
-                    {
-                        path: 'lesson/training/:trainingId/:trainingName',
-                        component: TrainingrecordManage,
-                        hidden: true
                     }
                 ]
             }
@@ -503,71 +468,71 @@ export const asyncRouter = [
                 meta: {
                 },
                 children: [
-                    {
+                    { // 仿真详情
                         path: 'detail/:subSystem',
                         component: DemonstrationDetail,
                         hidden: true
                     },
-                    {
+                    { // 教学系统 课程列表
                         path: 'teachHome/:subSystem',
                         component: TeachHome,
                         hidden: true
                     },
-                    {
+                    { // 课程详情
                         path: 'teach/:subSystem',
                         component: TeachDetail,
                         hidden: true
                     },
-                    {
+                    { // 试卷列表
-                        path: 'examHome/:subSystem',
-                        component: ExamHome,
-                        hidden: true
-                    },
-                    {
-                        path: 'exam/:examId',
-                        component: ExamDetail,
-                        hidden: true
-                    },
-                    {
-                        path: 'pay/:lessonId',
-                        component: Pay,
-                        hidden: true
-                    },
-                    {
                         path: 'course/:subSystem',
                         component: ExamCourseDetail,
                         hidden: true
                     },
-                    {
+                    { // 考试系统 课程列表
-                        path: 'result/:userExamId',
+                        path: 'examHome/:subSystem',
-                        component: ExamResult,
+                        component: ExamHome,
                         hidden: true
                     },
-                    {
+                    { // 试卷详情
-                        path: 'permission/:mapId',
+                        path: 'exam/:examId',
-                        component: Package,
+                        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,
@@ -772,7 +737,7 @@ export const asyncRouter = [
         children: [
             {
                 path: 'ibp/edit',
-                component: ibpDraw,
+                component: IbpDraw,
                 meta: {
                     i18n: 'router.ibpDraw'
                 }

src/views/demonstration/detail/index.vue

@@ -1,9 +1,9 @@
 <template>
-  <el-card v-loading="loading">
+  <div v-loading="loading" class="joylink-card">
-    <div slot="header" style="text-align: center;">
+    <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';
@@ -82,12 +83,6 @@ export default {
         },
         mapId() {
             return this.$route.query.mapId;
-		},
-		// prodId() {
-		// 	return this.$route.query.prodId;
-		// },
-		height() {
-			return this.$store.state.app.height - 50;
         }
     },
     watch: {
@@ -261,15 +256,23 @@ export default {
     }
 };
 </script>
-<style scoped>
+
-    ::-webkit-scrollbar {
+<style rel="stylesheet/scss" lang="scss" scoped>
-        width: 3px;
+    .joylink-card{
-        height: 3px;
+        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;
+        padding: 10px 0;
-        transform: translateY(-20px);
     }
 
     .el-tabs--border-card>.el-tabs__header .el-tabs__item {

src/views/demonstration/home.vue

@@ -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>

src/views/demonstration/index.vue

@@ -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>

src/views/demonstration/list/demonList.vue

@@ -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>

src/views/exam/detail/examDetail.vue

@@ -1,10 +1,10 @@
 <template>
-  <el-card>
+  <div class="joylink-card">
-    <div slot="header" style="text-align: center;">
+    <div class="card-title">
       <b>{{ $t('exam.nameOfTestPaper') +': ' + examDetails.name }}</b>
     </div>
-    <div style="margin:50px; overflow-y: auto;">
+    <div style="padding:50px; padding-right: 0; height: 100%;">
-      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: height - 190 +'px' }">
+      <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>
-      </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>
+      </el-scrollbar>
+    </div>
+  </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;
+        margin-bottom: 20px;
-        transform: translateY(-20px);
     }
 </style>

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() {
+        queryFunction(params) {
-            this.loading = true;
+            return getLessonDrftList(this.$route.params.mapId, params);
-            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;
-            });
         },
         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'), {

src/views/lesson/lessoncategory/category/operateMenu.vue

@@ -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>

src/views/lesson/lessoncategory/category/tree.vue

@@ -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>

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-form-item :label="this.$t('lesson.mapName')" prop="mapId">
-            <el-select v-model="courseModel.skinCode" :placeholder="$t('rules.pleaseSelect')" :disabled="true">
+            <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,8 +59,8 @@
 <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';
+import { UrlConfig } from '@/router/index';
 
 export default {
     name: 'CourseEdit',
@@ -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: [
+                mapId: [
-                    { required: true, message: this.$t('rules.inputSkinType'), trigger: 'change' }
+                    { 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 = [];
+        this.mapIdList = [];
-        getSkinCodeList().then(response => {
+        listPublishMap().then(response => {
-            this.skinCodeList = response.data;
+            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,8 +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} });
-            this.$router.go(-1);
         }
     }
 };

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) {
+                        if (section.linkCode == model.linkCode && model.code != section.code && section.type == '01') {
-                            // debugger;
                             const lastIndex = this.oldPoint.length - 1;
                             if (this.oldPoint[0].x == section.points[section.points.length - 1].x && this.oldPoint[0].y == section.points[section.points.length - 1].y) {
                                 section.points[section.points.length - 1].x = model.points[0].x;
                                 section.points[section.points.length - 1].y = model.points[0].y;
+                                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);
                         }

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>

src/views/package/draft/ruleForm.vue

@@ -1,20 +1,18 @@
 <template>
-  <el-card>
+  <div class="joylink-card pack-box">
-    <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">
+      <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%"
+          style="width: 100%; min-height: 300px;"
-            :height="height-300"
         >
           <el-table-column prop="permissionType" :label="$t('permission.permissionType')" width="80">
             <template slot-scope="scope">
@@ -46,7 +44,7 @@
             </template>
           </el-table-column>
         </el-table>
-        </el-card>
+      </div>
       <div class="draft">
         <el-button-group>
           <el-button v-if="!urlInfo.url" type="primary" @click="packForm">{{ $t('permission.package') }}</el-button>
@@ -63,10 +61,9 @@
         @addRuleForm="addRuleForm"
       />
     </el-scrollbar>
-    </div>
     <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;

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>

src/views/planMonitor/home.vue

@@ -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>

src/views/planMonitor/index.vue

@@ -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>

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: 'name', label: this.$t('publish.mapName'), type: 'text', required: true},
-                    { prop: 'copyOtherData', label: '是否复制数据', type: 'switch', 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'));
             });
         }
     }

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;

src/views/teach/detail/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <el-card>
+  <div class="joylink-card card_hidden_box">
-    <div slot="header" style="text-align: center;">
+    <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>
         </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;
+    padding: 10px 0;
-    transform: translateY(-20px);
   }
   .custom-tree-node {
       flex: 1;

src/views/teach/index.vue

@@ -6,23 +6,10 @@
       </div>
     </el-card>
     <el-card v-loading="loading">
-      <el-table
+      <el-table :data="tableData" border style="width: 100%">
-        :data="tableData"
+        <el-table-column prop="name" :label="this.$t('teach.courseName')" />
-        border
+        <el-table-column prop="remarks" show-overflow-tooltip :label="this.$t('teach.courseDescription')" />
-        style="width: 100%"
+        <el-table-column :label="this.$t('global.operate')">
-      >
-        <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') }}

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;
                     }
                 });