From 40909b073ee8f05abbf998f033c5fbd8e98a687c Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 21 Apr 2021 17:55:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demonstration/deomonList/index.vue | 70 +++++---------------
 src/views/demonstration/detail/index.vue     |  5 +-
 2 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/src/views/demonstration/deomonList/index.vue b/src/views/demonstration/deomonList/index.vue
index 5acbc62e9..786e1b5ed 100644
--- a/src/views/demonstration/deomonList/index.vue
+++ b/src/views/demonstration/deomonList/index.vue
@@ -7,30 +7,21 @@
     width="600px"
     :before-close="doClose"
     :z-index="2000"
+    class="synthesisTrain"
     :modal="false"
     :close-on-click-modal="false"
   >
-    <el-scrollbar wrap-class="scrollbar-wrapper" :style="{height: height+'px'}">
-      <el-tree
-        ref="tree"
-        node-key="group"
-        class="filter-tree"
-        default-expand-all
-        :data="trainingList"
-        :props="{label: 'roomName'}"
-        :filter-node-method="filterNode"
-        :style="{height: height+'px'}"
-      >
-        <div slot-scope="{ data }" class="list-elem custom-tree-node">
-          <span>{{ '['+data.map.name+']'+($t('global.trainingHasStart').replace('{name}', data.creator.nickname)) }}</span>
-          <el-button
-            type="text"
-            size="mini"
-            @click="handleJoinRoom(data)"
-          >进入</el-button>
-        </div>
-      </el-tree>
-    </el-scrollbar>
+    <div class="synthesisTrainTree">
+      <div v-for="(training,index) in trainingList" :key="index" class="synthesisTrainBody">
+        <span>{{ '['+training.map.name+']'+($t('global.trainingHasStart').replace('{name}', training.creator.nickname)) }}</span>
+        <el-button
+          type="text"
+          size="mini"
+          class="synthesisTrainBtn"
+          @click="handleJoinRoom(training)"
+        >进入</el-button>
+      </div>
+    </div>
     <span
       slot="footer"
       class="dialog-footer"
@@ -50,17 +41,12 @@ export default {
     data() {
         return {
             dialogShow: false,
-            height: 120,
             trainingList: [],
             loading: false,
             pageLoading: false
         };
     },
     methods: {
-        filterNode(value, data) {
-            if (!value) return true;
-            return data.label.indexOf(value) !== -1;
-        },
         async doShow() {
             try {
                 this.pageLoading = true;
@@ -99,30 +85,10 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-	/deep/ {
-		.el-dialog__body {
-			padding: 0px 30px !important;
-		}
-
-		.el-tree {
-			overflow: auto !important;
-			.list-elem {
-				height: 30px;
-				line-height: 30px;
-			}
-		}
-
-		.el-tree-node.is-current>.el-tree-node__content {
-			background-color: #e4e3e3 !important;
-		}
-	}
-	.custom-tree-node {
-		flex: 1;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		font-size: 14px;
-		padding-right: 8px;
-	}
+<style rel="stylesheet/scss" lang="scss">
+  .synthesisTrainTree{height:120px;overflow:auto;}
+  .synthesisTrainBody{height: 30px;line-height: 30px;cursor: pointer;padding:0px 10px;font-size: 14px;}
+  .synthesisTrainBody:hover{background-color: #e4e3e3}
+  .synthesisTrain .el-dialog__body{padding: 0px 30px}
+  .synthesisTrainBtn{float:right}
 </style>
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index f1f09639c..414fc3a5e 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading" class="joylink-card">
+  <div v-loading="loading" class="demonstrateDetail">
     <div class="card-title">
       {{ $t('demonstration.simulationName') + courseModel.name }}
     </div>
@@ -267,8 +267,9 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .joylink-card{
+    .demonstrateDetail{
         height: 100%;
+        border: 1px solid #EBEEF5;
         overflow: hidden;
         display:flex;
         flex-direction: column;

From 7ef86d0517d8ade85b050d753e92a30a34b1e187 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 22 Apr 2021 10:52:48 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demonstration/deomonTopic/index.vue | 20 +++---------
 src/views/designPlatform/bigScreen.vue        | 25 +++++++--------
 src/views/designPlatform/bigSplitScreen.vue   | 21 ++++++-------
 src/views/designPlatform/index.vue            | 21 ++++++-------
 src/views/designPlatform/mapPreviewNew.vue    | 25 +++++++--------
 .../iscs/iscsSystem/stationConfig/index.vue   | 31 +++++--------------
 6 files changed, 53 insertions(+), 90 deletions(-)

diff --git a/src/views/demonstration/deomonTopic/index.vue b/src/views/demonstration/deomonTopic/index.vue
index 958d70eec..05eb09278 100644
--- a/src/views/demonstration/deomonTopic/index.vue
+++ b/src/views/demonstration/deomonTopic/index.vue
@@ -4,6 +4,7 @@
     :title="$t('global.synthesisTrainingTitle')"
     :visible.sync="dialogShow"
     width="600px"
+    class="inviteRoom"
     :before-close="doClose"
     :z-index="2000"
     :modal="false"
@@ -63,20 +64,7 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .inviteJoinRoom{
-        height: 80px;
-        line-height: 80px;
-        font-size: 16px;
-        padding-left: 10px;
-    }
-    /deep/ {
-        .el-dialog__body {
-            padding: 0px 30px !important;
-        }
-
-        .el-tree-node.is-current>.el-tree-node__content {
-            background-color: #e4e3e3 !important;
-        }
-    }
+<style rel="stylesheet/scss" lang="scss">
+    .inviteRoom .inviteJoinRoom{height: 80px;line-height: 80px;font-size: 16px;padding-left: 10px;}
+    .inviteRoom .el-dialog__body {padding: 0px 30px;}
 </style>
diff --git a/src/views/designPlatform/bigScreen.vue b/src/views/designPlatform/bigScreen.vue
index 9b5523965..2257960e9 100644
--- a/src/views/designPlatform/bigScreen.vue
+++ b/src/views/designPlatform/bigScreen.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="map-view">
-    <div v-show="maskOpen" class="mask" :style="{'width': maskWidth}" />
+  <div class="bigScreen">
+    <div v-show="maskOpen" class="bigScreenMask" />
     <jlmap-visual ref="jlmapVisual" />
-    <div v-show="disPlay" class="display-draft">
+    <div v-show="disPlay" class="bigScreenBack">
       <el-button-group>
-        <el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
+        <el-button type="primary" @click="back">返回</el-button>
       </el-button-group>
     </div>
   </div>
@@ -18,7 +18,7 @@ import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
 import { getToken } from '@/utils/auth';
 
 export default {
-    name: 'MapPreview',
+    name: 'BigScreen',
     components: {
         JlmapVisual
     },
@@ -31,7 +31,6 @@ export default {
     data() {
         return {
             maskOpen: false,
-            maskWidth: 'calc(100% - 450px)',
             disPlay: false
         };
     },
@@ -85,7 +84,7 @@ export default {
         await this.setWindowSize();
         await this.initLoadData();
         this.disPlay = true;
-        if (this.$route.path.includes('design/bigScreen') || this.$route.query.noPreLogout || this.$route.query.projectDevice || this.$route.path.includes('displayIscs')) {
+        if (this.$route.path.includes('design/bigScreen') || this.$route.query.noPreLogout || this.$route.query.projectDevice) {
             this.disPlay = false;
         }
     },
@@ -106,13 +105,11 @@ export default {
             this.$nextTick(() => {
                 if (this.widthLeft) {
                     const width = this.$store.state.app.width - (this.widthLeft) - 2;
-                    this.maskWidth = `calc(100% - ${this.widthLeft}px)`;
                     const height = this.height;
                     this.$store.dispatch('config/resize', { width, height });
                 } else {
                     const width = this.$store.state.app.width - 2;
                     const height = this.$store.state.app.height;
-                    this.maskWidth = `100%`;
                     this.$store.dispatch('config/resize', { width, height });
                 }
                 this.handleUpdateScreen();
@@ -176,12 +173,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-    .map-view {
-        // float: left;
-        width: auto;
+    .bigScreen {
+        width: 100%;
 		overflow: hidden;
+        position: relative;
     }
-	.mask{
+	.bigScreenMask{
         opacity: 1;
         background: #000;
         position: absolute;
@@ -191,7 +188,7 @@ export default {
         height: 100%;
         z-index: 9;
     }
-	.display-draft {
+	.bigScreenBack {
         position: absolute;
         float: right;
         right: 15px;
diff --git a/src/views/designPlatform/bigSplitScreen.vue b/src/views/designPlatform/bigSplitScreen.vue
index 54696d037..0ec30cb25 100644
--- a/src/views/designPlatform/bigSplitScreen.vue
+++ b/src/views/designPlatform/bigSplitScreen.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="map-view">
-    <div v-show="maskOpen" class="mask" :style="{'width': maskWidth}" />
-    <div v-show="disPlay" class="display-draft display-select">
+  <div class="bigSplitScreen">
+    <div v-show="maskOpen" class="bigSplitScreenMask" />
+    <div v-show="disPlay" class="bigSplitScreenSelect">
       <el-select v-model="value" placeholder="请选择" style="width: 125px;" @change="changeSplit">
         <el-option
           v-for="item in optionsList"
@@ -12,9 +12,9 @@
       </el-select>
     </div>
     <jlmap-visual ref="jlmapVisual" />
-    <div v-show="disPlay" class="display-draft">
+    <div v-show="disPlay" class="bigSplitScreenBack">
       <el-button-group>
-        <el-button type="primary" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
+        <el-button type="primary" @click="back">返回</el-button>
       </el-button-group>
     </div>
   </div>
@@ -39,7 +39,6 @@ export default {
     data() {
         return {
             maskOpen: false,
-            maskWidth: '100%',
             disPlay: false,
             value: 1,
             optionsList: []
@@ -146,7 +145,7 @@ export default {
                     const param = { value: index + 1, label: `第${index + 1}屏` };
                     this.optionsList.push(param);
                 }
-                console.log(this.optionsList, '======');
+                // console.log(this.optionsList, '======');
                 const size = {
                     width: this.$store.state.app.width * width,
                     height: this.$store.state.app.height * height,
@@ -193,11 +192,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-    .map-view {
+    .bigSplitScreen {
         float: left;
         width: auto;
     }
-	.mask{
+	.bigSplitScreenMask{
         opacity: 1;
         background: #000;
         position: absolute;
@@ -207,14 +206,14 @@ export default {
         height: 100%;
         z-index: 9;
     }
-	.display-draft {
+	.bigSplitScreenBack,.bigSplitScreenSelect {
         position: absolute;
         float: right;
         right: 15px;
         bottom: 15px;
 		z-index: 19;
     }
-	.display-select {
+	.bigSplitScreenSelect {
         top: 15px;
     }
 </style>
diff --git a/src/views/designPlatform/index.vue b/src/views/designPlatform/index.vue
index a314d144f..2e117b2b7 100644
--- a/src/views/designPlatform/index.vue
+++ b/src/views/designPlatform/index.vue
@@ -1,11 +1,10 @@
 <template>
-  <div class="app-wrapper">
-    <div class="examList" :style="{width: widthLeft+'px'}">
+  <div class="designPlatform" :style="'padding-left:'+(widthLeft)+'px'">
+    <div class="designPubMapList" :style="{width: widthLeft+'px'}">
       <demon-list ref="demonList" />
+      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
     </div>
-    <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
     <transition>
-      <!-- :product-list="productList"  -->
       <router-view :width-left="widthLeft" />
     </transition>
   </div>
@@ -26,8 +25,7 @@ export default {
     },
     data() {
         return {
-            widthLeft: Number(localStore.get('LeftWidth')) || 450,
-            productList: []
+            widthLeft: Number(localStore.get('LeftWidth')) || 450
         };
     },
     computed: {
@@ -70,18 +68,17 @@ export default {
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .app-wrapper {
-    @include clearfix;
+    .designPlatform {
         position: relative;
         height: 100%;
         width: 100%;
         overflow: hidden;
     }
 
-    .examList {
-        float: left;
+    .designPubMapList {
+        position:absolute;
+        left:0;
+        top:0;
         height: 100%;
     }
 </style>
diff --git a/src/views/designPlatform/mapPreviewNew.vue b/src/views/designPlatform/mapPreviewNew.vue
index fc7245bbd..e90d53f5a 100644
--- a/src/views/designPlatform/mapPreviewNew.vue
+++ b/src/views/designPlatform/mapPreviewNew.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="map-view">
+  <div class="mapPreview">
     <jlmap-visual ref="jlmapVisual" @onMenu="onContextmenu" />
-    <pop-menu ref="popMenu" :menu="menu" :pop-class="'preview_new_pop'" />
+    <pop-menu ref="popMenu" :menu="menu" pop-class="preview_new_pop" />
   </div>
 </template>
 <script>
@@ -162,16 +162,15 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-    .map-view {
-        float: left;
-        width: auto;
-	}
-	/deep/ {
-		.preview_new_pop{
-			background: #f1ecec;
-			.pop-menu {
-				background: #5F9EA0;
-			}
-		}
+    .mapPreview {
+        width: 100%;
 	}
+    .mapPreview .pop-menu{
+        background: #f1ecec;
+    }
+</style>
+<style lang="scss">
+    .mapPreview .container .preview_new_pop .pop-menu {
+        background: #f1ecec;
+    }
 </style>
diff --git a/src/views/iscs/iscsSystem/stationConfig/index.vue b/src/views/iscs/iscsSystem/stationConfig/index.vue
index 9a13604b6..3836281d0 100644
--- a/src/views/iscs/iscsSystem/stationConfig/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/index.vue
@@ -6,21 +6,7 @@
     <normal v-else-if="mode.includes('environment')" />
     <fas v-else-if="fasList.includes(mode)" />
     <signal-system v-else-if="mode === 'signal'" />
-    <!-- environmentThree -->
-    <!-- <normal v-else-if="mode=='environmentFour'" />
-    <normal v-else-if="mode=='environmentFive'" />
-    <normal v-else-if="mode=='environmentSix'" />
-    <normal v-else-if="mode=='environmentSeven'" />
-    <normal v-else-if="mode=='environmentEight'" />
-    <normal v-else-if="mode=='environmentNine'" />
-    <normal v-else-if="mode=='environmentTen'" />
-    <normal v-else-if="mode=='environmentThirteen'" />
-    <normal v-else-if="mode=='environmentEleven'" />
-    <normal v-else-if="mode=='environmentTwelve'" /> -->
-    <!-- <big-screen v-else-if="mode === 'signal'" /> -->
-    <!-- <big-screen v-else-if="mode === 'signal'" /> -->
     <ticket-or-entrance v-else-if="mode === 'autoTicket'||mode === 'afcTwo02'||mode === 'afcOne02'" />
-    <!--  -->
   </div>
 </template>
 <script>
@@ -30,9 +16,7 @@ import Normal from './environment/index.vue';
 import Schedule from './schedule';
 import Fas from './fas/index.vue';
 import SignalSystem from './signalSystem/index.vue';
-// import BigScreen from '@/views/designPlatform/bigScreen';
 import TicketOrEntrance from './ticketOrEntrance/index';
-// import BigScreen from '@/views/designPlatform/bigScreen';
 import { getSimulationInfoNew } from '@/api/simulation';
 import { getByGroupStationList } from '@/api/jmap/map';
 import { loadRunPlanData } from '@/utils/loaddata';
@@ -42,7 +26,6 @@ export default {
         PsdSystem,
         Substation,
         Normal,
-        // BigScreen,
         SignalSystem,
         Fas,
         TicketOrEntrance
@@ -52,13 +35,13 @@ export default {
             mode: 'index',
             deviceList: [],
             fasList:[
-				'sensing',
-				'gas',
-				'section',
-				'linkage',
-				'stationHall',
-				'platform'
-			]
+                'sensing',
+                'gas',
+                'section',
+                'linkage',
+                'stationHall',
+                'platform'
+            ]
         };
     },
     computed: {

From e1757e41148dd8e194ee8458d53d2eb3ebf26600 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 22 Apr 2021 11:30:07 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trainingPlatform/index.vue         | 14 +++--
 src/views/trainingPlatform/secondaryHome.vue | 61 +++++++-------------
 2 files changed, 30 insertions(+), 45 deletions(-)

diff --git a/src/views/trainingPlatform/index.vue b/src/views/trainingPlatform/index.vue
index 99c28aee2..1c513715b 100644
--- a/src/views/trainingPlatform/index.vue
+++ b/src/views/trainingPlatform/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="app-wrapper">
-    <div class="examList" :style="{width: widthLeft+'px'}">
+  <div class="trainingPlatform" :style="'padding-left:'+(widthLeft)+'px'">
+    <div class="trainingPubMapList" :style="{width: widthLeft+'px'}">
       <demon-list ref="demonList" @goRoutePath="goRoutePath" />
+      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
     </div>
-    <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
     <transition>
       <router-view />
     </transition>
@@ -61,14 +61,16 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
-    .app-wrapper {
+    .trainingPlatform {
         position: relative;
         height: 100%;
         width: 100%;
         overflow: hidden;
     }
-    .examList {
+    .trainingPubMapList {
+        position:absolute;
+        left:0;
+        top:0;
         height: 100%;
-        float: left;
     }
 </style>
diff --git a/src/views/trainingPlatform/secondaryHome.vue b/src/views/trainingPlatform/secondaryHome.vue
index 11afde3d1..02ff84a1f 100644
--- a/src/views/trainingPlatform/secondaryHome.vue
+++ b/src/views/trainingPlatform/secondaryHome.vue
@@ -1,18 +1,16 @@
 <template>
   <div class="joylink-card">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <div class="content_box">
-        <h1 class="title">{{ title }}</h1>
-        <div class="card-box">
-          <el-carousel :interval="4000" type="card" height="380px">
-            <el-carousel-item v-for="(item, index) in listImg" :key="index">
-              <img :src="item.src" alt="" height="100%" width="100%">
-            </el-carousel-item>
-          </el-carousel>
-        </div>
-        <!--<div class="brief-box">{{ $t('demonstration.simulationSystemDescription') }}</div>-->
+    <div class="content_box">
+      <h1 class="title">{{ title }}</h1>
+      <div class="card-box">
+        <el-carousel :interval="4000" type="card" height="380px">
+          <el-carousel-item v-for="(item, index) in listImg" :key="index">
+            <img :src="item.src" alt="" height="100%" width="100%">
+          </el-carousel-item>
+        </el-carousel>
       </div>
-    </el-scrollbar>
+      <!--<div class="brief-box">{{ $t('demonstration.simulationSystemDescription') }}</div>-->
+    </div>
   </div>
 </template>
 
@@ -36,7 +34,7 @@ export default {
                 { src: simulation4 },
                 { src: simulation5 }
             ],
-            teachImgList: [
+            lessonImgList: [
                 { src: teach1 }
             ],
             examImgList: [
@@ -46,26 +44,11 @@ export default {
     },
     computed: {
         listImg() {
-            if (this.$route.query.type === 'Simulation') {
-                return this.simulationImgList;
-            } else if (this.$route.query.type === 'Lesson') {
-                return this.teachImgList;
-            } else if (this.$route.query.type === 'Exam') {
-                return this.examImgList;
-            } else {
-                return [];
-            }
+            return this[(this.$route.query.type || '').toLowerCase() + 'ImgList'] || [];
         },
         title() {
-            if (this.$route.query.type === 'Simulation') {
-                return '仿真系统';
-            } else if (this.$route.query.type === 'Lesson') {
-                return '教学系统';
-            } else if (this.$route.query.type === 'Exam') {
-                return '考试系统';
-            } else {
-                return '';
-            }
+            const typeMap = {'Simulation':'仿真系统', 'Lesson':'教学系统', 'Exam':'考试系统'};
+            return typeMap[this.$route.query.type] || '';
         }
     }
 };
@@ -80,7 +63,7 @@ export default {
 	.joylink-card{
 		height: 100%;
 		font-family: 'Microsoft YaHei';
-		overflow: hidden;
+		overflow: auto;
 		.content_box{
 			padding: 0 100px 15px;
 		}
@@ -108,12 +91,12 @@ export default {
 			padding: 0 50px;
 		}
 
-		.brief-box {
-			font-size: 18px;
-			text-indent: 2em;
-			line-height: 32px;
-			padding: 40px 20px 0;
-			font-family: unset;
-		}
+		// .brief-box {
+		// 	font-size: 18px;
+		// 	text-indent: 2em;
+		// 	line-height: 32px;
+		// 	padding: 40px 20px 0;
+		// 	font-family: unset;
+		// }
 	}
 </style>

From e9b9345e951b59a2b12001d2b4b7b6b089b45949 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Thu, 22 Apr 2021 18:07:56 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=92=AD=E6=94=BE=E5=99=A8=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=AC=AC=E4=B8=80=E4=BA=BA=E7=A7=B0=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E7=A2=B0=E6=92=9E=E6=A3=80=E6=B5=8B=EF=BC=8C=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jlmap3d/lesson3d/lesson3dplayer.js        |  88 ++++
 .../lesson3d/manager/assetmodelmanager.js     | 160 ++++++
 .../lesson3d/manager/controlmanager.js        | 403 +++++++++++++++
 src/jlmap3d/lesson3d/math/Capsule.js          | 138 ++++++
 src/jlmap3d/lesson3d/math/Octree.js           | 460 ++++++++++++++++++
 src/jlmap3d/lesson3d/model/lessondata.js      | 177 +++++++
 .../lesson3d/toolsmodel/jobpanedata.js        | 307 ++++++++++++
 .../lesson3d/toolsmodel/lessontrigger.js      |  32 ++
 src/jlmap3d/lesson3dedit/model/lessondata.js  |  19 +-
 .../lesson3dedit/toolsmodel/jobpanedata.js    |  17 +-
 .../lesson3dedit/component/lessonprogress.vue |  11 +-
 .../lesson3dedit/component/property.vue       | 199 ++++++--
 .../jlmap3d/lesson3dedit/tools/jobpane.vue    |  34 +-
 .../jlmap3d/lesson3dedit/tools/toolbar.vue    |   2 +-
 .../jlmap3d/lesson3dplayer/lesson3dplayer.vue |  44 +-
 .../lesson3dplayer/tools/explainpane.vue      |  22 +-
 .../jlmap3d/lesson3dplayer/tools/jobpane.vue  |  93 ++--
 .../lesson3dplayer/tools/processlog.vue       |   4 +-
 .../lesson3dplayer/tools/stepstips.vue        |  17 +-
 .../jlmap3d/lesson3dplayer/tools/toolbar.vue  |  35 +-
 static/lesson3d/addbutton.png                 | Bin 0 -> 3530 bytes
 static/lesson3d/back.png                      | Bin 0 -> 4609 bytes
 static/lesson3d/bag.png                       | Bin 0 -> 4547 bytes
 static/lesson3d/guide.png                     | Bin 0 -> 4900 bytes
 static/lesson3d/jobpic.png                    | Bin 0 -> 8072 bytes
 static/lesson3d/lessonbg.png                  | Bin 0 -> 2192 bytes
 static/lesson3d/lkgw.png                      | Bin 0 -> 8179 bytes
 static/lesson3d/选项.png                      | Bin 0 -> 4138 bytes
 28 files changed, 2135 insertions(+), 127 deletions(-)
 create mode 100644 src/jlmap3d/lesson3d/lesson3dplayer.js
 create mode 100644 src/jlmap3d/lesson3d/manager/assetmodelmanager.js
 create mode 100644 src/jlmap3d/lesson3d/manager/controlmanager.js
 create mode 100644 src/jlmap3d/lesson3d/math/Capsule.js
 create mode 100644 src/jlmap3d/lesson3d/math/Octree.js
 create mode 100644 src/jlmap3d/lesson3d/model/lessondata.js
 create mode 100644 src/jlmap3d/lesson3d/toolsmodel/jobpanedata.js
 create mode 100644 src/jlmap3d/lesson3d/toolsmodel/lessontrigger.js
 create mode 100644 static/lesson3d/addbutton.png
 create mode 100644 static/lesson3d/back.png
 create mode 100644 static/lesson3d/bag.png
 create mode 100644 static/lesson3d/guide.png
 create mode 100644 static/lesson3d/jobpic.png
 create mode 100644 static/lesson3d/lessonbg.png
 create mode 100644 static/lesson3d/lkgw.png
 create mode 100644 static/lesson3d/选项.png

diff --git a/src/jlmap3d/lesson3d/lesson3dplayer.js b/src/jlmap3d/lesson3d/lesson3dplayer.js
new file mode 100644
index 000000000..5273dd56d
--- /dev/null
+++ b/src/jlmap3d/lesson3d/lesson3dplayer.js
@@ -0,0 +1,88 @@
+import store from '@/store/index';
+// import { Loading } from 'element-ui';
+import {Stats} from '@/jlmap3d/main/lib/stats.min.js';
+//静态资源文件路径
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+//loader
+import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
+//轨道视角控制
+import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
+//骨骼动画模型辅助工具
+import { SkeletonUtils } from '@/jlmap3d/main/utils/SkeletonUtils.js';
+
+import { AssetModelManager } from '@/jlmap3d/lesson3d/manager/assetmodelmanager.js';
+
+import { ControlManager } from '@/jlmap3d/lesson3d/manager/controlmanager.js';
+
+// import { AnimationManager } from '@/jlmap3d/lesson3d/manager/assetmodelmanager.js';
+
+
+//动画播放相关
+let clock = new THREE.Clock();
+let delta;
+
+let scene;
+
+export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
+
+	// let stats = new Stats();
+	// dom.appendChild( stats.dom );
+
+	let scope = this;
+  this.dom = dom;
+
+	//定义相机
+
+
+	//定义场景(渲染容器)
+	scene = new THREE.Scene();
+	scene.background = new THREE.Color(0xa0a0a0);
+
+	//定义全局光
+	let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
+	scene.add(ambientLight);
+	var light = new THREE.HemisphereLight( 0xffffff, 0x444444 );
+	light.position.set( 0, 4000, 0 );
+	scene.add( light );
+
+	let controlManager = new ControlManager( dom,scene,lessonData,lessonIndex);
+
+  let assetModelManager = new AssetModelManager(scene,controlManager);
+	assetModelManager.lessonAssetsLoader(lessonData.assetList,lessonData.modelList).then((result) => {
+		controlManager.initOctree(assetModelManager.loadAsset['default1'].mesh);
+
+		animate();
+		console.log(lessonData.lessonProgress[lessonIndex]);
+		if(lessonData.lessonProgress[lessonIndex].action.length>0){
+			controlManager.initNewEvent(lessonData.lessonProgress[lessonIndex].action,assetModelManager.lessonTriggerList);
+		}
+		resolve("loadeend");             //['成功了', 'success']
+	}).catch((error) => {
+		//console.log(error);
+	});;
+
+
+
+	this.actionRemove = function(actionModel){
+		assetModelManager.otherModel.remove(actionModel);
+	}
+
+
+
+	//循环渲染函数
+	function animate() {
+
+		if(controlManager.controlMode == "free"){
+			controlManager.updateOrbitControl();
+		}
+		if(controlManager.controlMode == "fps"){
+			controlManager.updateFpsControl();
+		}
+		// delta = clock.getDelta();
+		requestAnimationFrame(animate);
+
+	}
+
+	this.attachModel = function(selectModel){
+	}
+}
diff --git a/src/jlmap3d/lesson3d/manager/assetmodelmanager.js b/src/jlmap3d/lesson3d/manager/assetmodelmanager.js
new file mode 100644
index 000000000..81012032f
--- /dev/null
+++ b/src/jlmap3d/lesson3d/manager/assetmodelmanager.js
@@ -0,0 +1,160 @@
+import { BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
+
+export function AssetModelManager(scene) {
+  let scope = this;
+
+
+  this.assetList = [];
+
+  this.otherModel = new THREE.Group();
+
+  scene.add(this.otherModel);
+
+  this.loadAsset = [];
+
+  this.loadAsset['default1'] = {
+    modelId:'default1',
+    packageName:"车站",
+    url:"/MODEL/2021-04-06/1381-54584.FBX",
+    mesh:"",
+    assetType:'default',
+    isUse:true,
+    resourceType:"三维课程",
+  };
+
+  //场景中可触发事件模型
+  this.lessonTriggerList = [];
+
+  //加载课程资源
+  this.lessonAssetsLoader = function(assetList,modelList){
+      let initlist = [];
+      if(assetList){
+        for(let i = 0;i<assetList.length;i++){
+          assetList[i].mesh = "";
+          scope.loadAsset[assetList[i].modelId] = assetList[i];
+
+        }
+      }
+      for(let k in scope.loadAsset){
+        initlist.push(fbxpromise(scope.loadAsset[k]));
+
+      }
+
+      return new Promise(function(resolve, reject){
+        Promise.all(initlist).then((result) => {
+
+          initTriggerList();
+          for(let i=0;i<modelList.length;i++){
+            let newModelTrigger = scope.loadAsset[modelList[i].modelId].mesh.clone(true);
+            newModelTrigger.showType = "loadModel";
+            newModelTrigger.label = modelList[i].label;
+            newModelTrigger.modelId = modelList[i].modelId;
+            newModelTrigger.visible = modelList[i].visible;
+            newModelTrigger.position.x = modelList[i].pos.x;
+            newModelTrigger.position.y = modelList[i].pos.y;
+            newModelTrigger.position.z = modelList[i].pos.z;
+            newModelTrigger.rotation.x = modelList[i].rot.x;
+            newModelTrigger.rotation.y = modelList[i].rot.y;
+            newModelTrigger.rotation.z = modelList[i].rot.z;
+            scope.otherModel.add(newModelTrigger);
+            scope.lessonTriggerList.push(newModelTrigger);
+          }
+
+          updateTriggerList(scope.lessonTriggerList);
+          resolve("loaderassets");             //['成功了', 'success']
+        }).catch((error) => {
+          //console.log(error);
+        });
+
+      });
+      resolve("loaderassets");
+
+  }
+
+
+
+  // <el-option label="车站" value="standstation"></el-option>
+  // <el-option label="停车场" value="stopstation"></el-option>
+  // <el-option label="单体设备" value="device"></el-option>
+  // <el-option label="线路" value="xl"></el-option>
+  // <el-option label="道岔" value="dc"></el-option>
+  //FT 扶梯
+  //FTAN 扶梯按钮(急停)
+  //FTD 扶梯灯
+  //FTKG 扶梯开关（钥匙孔）
+  //FTTJ 扶梯台阶
+  function initTriggerList(){
+    
+    scope.loadAsset['default1'].mesh.getObjectByName("FTAN").showType = "default";
+    scope.loadAsset['default1'].mesh.getObjectByName("FTAN").label = "扶梯急停按钮";
+    scope.lessonTriggerList.push(scope.loadAsset['default1'].mesh.getObjectByName("FTAN"));
+
+    scope.loadAsset['default1'].mesh.getObjectByName("FTKG").showType = "default";
+    scope.loadAsset['default1'].mesh.getObjectByName("FTKG").label = "扶梯钥匙孔";
+    scope.lessonTriggerList.push(scope.loadAsset['default1'].mesh.getObjectByName("FTKG"));
+
+
+    // console.log(scope.loadAsset['default1'].mesh.getObjectByName("FTKG"));
+  }
+
+  //动态加载资源
+  this.lessonAssetsNewLoader = function(assetData,pos){
+    let isLoaded = false;
+
+    if(scope.loadAsset[assetData.id]){
+      let newModelTrigger = scope.loadAsset[assetData.id].mesh.clone(true);
+      newModelTrigger.modelId = assetData.id;
+      newModelTrigger.showType = "loadModel";
+      newModelTrigger.label = assetData.packageName;
+      newModelTrigger.position.copy(pos);
+      scope.otherModel.add(newModelTrigger);
+      scope.lessonTriggerList.push(newModelTrigger);
+      updateTriggerList(scope.lessonTriggerList);
+    }else{
+      scope.loadAsset[assetData.id] = {
+        modelId:assetData.id,
+        packageName:assetData.packageName,
+        url:assetData.url,
+        mesh:"",
+        assetType:'loadModel',
+        isUse:true,
+        resourceType:"三维课程",
+      };
+
+      fbxpromise(scope.loadAsset[assetData.id]).then(function(object){
+
+        let newModelTrigger = scope.loadAsset[assetData.id].mesh.clone(true);
+        newModelTrigger.showType = "loadModel";
+        newModelTrigger.modelId = assetData.id;
+        newModelTrigger.label = assetData.packageName;
+        newModelTrigger.position.copy(pos);
+        scope.otherModel.add(newModelTrigger);
+        scope.lessonTriggerList.push(newModelTrigger);
+
+        updateTriggerList(scope.lessonTriggerList);
+        // resolve("loadednew");
+      });
+    }
+  }
+
+
+  //fbx模型加载
+  function fbxpromise(asset){
+    return new Promise(function(resolve, reject){
+      var loader = new THREE.FBXLoader();
+      loader.load( BASE_ASSET_API+asset.url, function ( object ) {
+
+        if(asset.assetType == "default"){
+          scene.add(object);
+        }else if(asset.assetType == 'loadModel'){
+
+        }
+        object.label = asset.packageName;
+        asset.mesh = object;
+        resolve();
+      } );
+
+    });
+  }
+
+}
diff --git a/src/jlmap3d/lesson3d/manager/controlmanager.js b/src/jlmap3d/lesson3d/manager/controlmanager.js
new file mode 100644
index 000000000..e306df16b
--- /dev/null
+++ b/src/jlmap3d/lesson3d/manager/controlmanager.js
@@ -0,0 +1,403 @@
+
+import { Capsule } from '@/jlmap3d/lesson3d/math/Capsule.js';
+
+import { Octree } from '@/jlmap3d/lesson3d/math/Octree.js';
+
+export function ControlManager(dom,scene,lessonData,lessonIndex) {
+
+  let scope = this;
+  this.controlMode = "";
+  this.controls = {};
+  this.nowCamera = null;
+  this.eventHitMode = false;
+
+  let eventBoxs = [];
+
+
+
+  let renderer = new THREE.WebGLRenderer({ antialias: true });
+  renderer.setClearColor(new THREE.Color(0x000000));
+  renderer.setViewport( 0, 0, dom.offsetWidth, dom.offsetHeight);
+  renderer.setScissor( 0, 0, dom.offsetWidth, dom.offsetHeight);
+  renderer.setScissorTest( false );
+  renderer.setSize(dom.offsetWidth, dom.offsetHeight);
+  renderer.sortObjects = true;
+  dom.appendChild(renderer.domElement);
+
+  let orbitCamera = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.01, 1000);
+  orbitCamera.position.set(0, 80, 40);
+  orbitCamera.aspect = dom.offsetWidth / dom.offsetHeight;
+  orbitCamera.updateProjectionMatrix();
+
+  let oribitControl = new THREE.OrbitControls(orbitCamera,dom);
+  oribitControl.maxPolarAngle = Math.PI / 2;
+  oribitControl.minPolarangle = Math.PI / 5;
+  oribitControl.maxDistance = 800;
+  oribitControl.screenSpacePanning = true;
+  oribitControl.update();
+
+
+  let fpsCamera = new THREE.PerspectiveCamera( 75,dom.offsetWidth / dom.offsetHeight, 0.1, 1000 );
+  fpsCamera.aspect = dom.offsetWidth / dom.offsetHeight;
+	fpsCamera.rotation.order = 'YXZ';
+
+  let attachBox = new THREE.Mesh(
+    new THREE.BoxGeometry(1, 5, 1),
+    new THREE.MeshBasicMaterial({color: 0xff00000})//RED box
+  );
+  let hitBox = new THREE.Box3(new THREE.Vector3(), new THREE.Vector3());
+  hitBox.setFromObject(attachBox);
+  scene.add(attachBox);
+
+  //fps control
+  const GRAVITY = 30;
+
+	const NUM_SPHERES = 20;
+	const SPHERE_RADIUS = 0.2;
+
+	const sphereGeometry = new THREE.SphereGeometry( SPHERE_RADIUS, 32, 32 );
+	const sphereMaterial = new THREE.MeshStandardMaterial( { color: 0x888855, roughness: 0.8, metalness: 0.5 } );
+
+	const spheres = [];
+	let sphereIdx = 0;
+
+  for ( let i = 0; i < NUM_SPHERES; i ++ ) {
+
+		const sphere = new THREE.Mesh( sphereGeometry, sphereMaterial );
+
+
+		scene.add( sphere );
+
+		spheres.push( { mesh: sphere, collider: new THREE.Sphere( new THREE.Vector3( 0, - 100, 0 ), SPHERE_RADIUS ), velocity: new THREE.Vector3() } );
+
+	}
+
+  scope.controlMode = lessonData.lessonProgress[lessonIndex].controlMode;
+  // scope.controls = oribitControl;
+  if(scope.controlMode == "free"){
+    scope.nowCamera = orbitCamera;
+    scope.controls.enabled = true;
+  }else if(scope.controlMode == "fps"){
+    scope.nowCamera = fpsCamera;
+    scope.controls.enabled = false;
+  }
+
+
+
+  const worldOctree = new Octree();
+
+	const playerCollider = new Capsule( new THREE.Vector3( 0, 10, 0 ), new THREE.Vector3( 0, 11.9, 0 ), 1 );
+  playerCollider.set(
+    new THREE.Vector3(
+      lessonData.lessonProgress[lessonIndex].cameraPosition.x,
+      lessonData.lessonProgress[lessonIndex].cameraPosition.y,
+      lessonData.lessonProgress[lessonIndex].cameraPosition.z),
+      new THREE.Vector3(
+        lessonData.lessonProgress[lessonIndex].cameraPosition.x,
+        lessonData.lessonProgress[lessonIndex].cameraPosition.y+1.5,
+        lessonData.lessonProgress[lessonIndex].cameraPosition.z ), 1);
+  attachBox.position.x = lessonData.lessonProgress[lessonIndex].cameraPosition.x;
+  attachBox.position.y = lessonData.lessonProgress[lessonIndex].cameraPosition.y ;
+  attachBox.position.z = lessonData.lessonProgress[lessonIndex].cameraPosition.z;
+
+
+
+
+	const playerVelocity = new THREE.Vector3();
+	const playerDirection = new THREE.Vector3();
+
+	let playerOnFloor = false;
+
+	const keyStates = {};
+  let clock = new THREE.Clock();
+
+  this.updateOrbitControl = function(){
+    oribitControl.update();
+  };
+
+  this.updateFpsControl = function(){
+    const deltaTime = Math.min( 0.1, clock.getDelta() );
+
+		controls( deltaTime );
+
+		updatePlayer( deltaTime );
+
+		updateSpheres( deltaTime );
+
+    if(scope.eventHitMode == true){
+      if(eventBoxs.length>0){
+
+        attachBox.position.copy(fpsCamera.position);
+        for(let i=0;i<eventBoxs.length;i++){
+          hitBox.setFromObject(attachBox);
+          eventBoxs[i].setFromObject(eventBoxs[i].mesh);
+          // console.log(eventBoxs[i]);
+          if(hitBox.intersectsBox(eventBoxs[i])){
+           console.log("相交");
+           console.log(eventBoxs[i].action);
+           if(eventBoxs[i].action.actionMode == "jump"){
+             jumpEvent("action",eventBoxs[i].action);
+           }
+           if(eventBoxs[i].action.actionMode == "remove"){
+             actionEvent("remove",eventBoxs[i].action,eventBoxs[i].mesh);
+           }
+           eventBoxs.splice(i,1);
+           i--;
+          }
+        }
+      }else{
+        scope.eventHitMod = false;
+      }
+      // attachBox.position.copy(fpsCamera.position);
+      // hitBox.setFromObject(attachBox);
+      // eventTestBox.setFromObject(eventBox);
+      //
+      // if(hitBox.intersectsBox(eventTestBox)){
+      // 	//两个物体相交了
+      //    console.log("相交");
+      //    scope.eventHitMode = false;
+      // }
+      // else{
+      // 	 console.log("不相交");
+      // }
+    }
+
+    render();
+  };
+
+  this.initOctree = function(object){
+    worldOctree.fromGraphNode( object.getObjectByName("Object173") );
+    // scope.controlMode = lessonData.lessonProgress[lessonIndex].controlMode;
+  }
+
+  document.addEventListener( 'keydown', ( event ) => {
+
+		keyStates[ event.code ] = true;
+
+	} );
+
+	document.addEventListener( 'keyup', ( event ) => {
+
+		keyStates[ event.code ] = false;
+
+	} );
+  let fpsMouseStatus = false;
+	document.addEventListener( 'mousedown', () => {
+    fpsMouseStatus = true;
+		// document.body.requestPointerLock();
+	} );
+
+	document.body.addEventListener( 'mousemove', ( event ) => {
+    if(fpsMouseStatus == true){
+      fpsCamera.rotation.y -= event.movementX / 500;
+      fpsCamera.rotation.x -= event.movementY / 500;
+    }
+		// if ( document.pointerLockElement === document.body ) {
+		// }
+	} );
+
+  document.addEventListener( 'mouseup', () => {
+    fpsMouseStatus = false;
+  } );
+
+
+	function playerCollitions() {
+
+		const result = worldOctree.capsuleIntersect( playerCollider );
+
+		playerOnFloor = false;
+
+		if ( result ) {
+
+			playerOnFloor = result.normal.y > 0;
+
+			if ( ! playerOnFloor ) {
+
+				playerVelocity.addScaledVector( result.normal, - result.normal.dot( playerVelocity ) );
+
+			}
+
+			playerCollider.translate( result.normal.multiplyScalar( result.depth ) );
+
+		}
+
+	}
+
+	function updatePlayer( deltaTime ) {
+
+		if ( playerOnFloor ) {
+
+			const damping = Math.exp( - 3 * deltaTime ) - 1;
+			playerVelocity.addScaledVector( playerVelocity, damping );
+
+		} else {
+
+			playerVelocity.y -= GRAVITY * deltaTime;
+
+		}
+
+		const deltaPosition = playerVelocity.clone().multiplyScalar( deltaTime );
+		playerCollider.translate( deltaPosition );
+
+		playerCollitions();
+
+		fpsCamera.position.copy( playerCollider.end );
+
+	}
+
+	function spheresCollisions() {
+
+		for ( let i = 0; i < spheres.length; i ++ ) {
+
+			const s1 = spheres[ i ];
+
+			for ( let j = i + 1; j < spheres.length; j ++ ) {
+
+				const s2 = spheres[ j ];
+
+				const d2 = s1.collider.center.distanceToSquared( s2.collider.center );
+				const r = s1.collider.radius + s2.collider.radius;
+				const r2 = r * r;
+
+				if ( d2 < r2 ) {
+
+					const normal = s1.collider.clone().center.sub( s2.collider.center ).normalize();
+					const v1 = normal.clone().multiplyScalar( normal.dot( s1.velocity ) );
+					const v2 = normal.clone().multiplyScalar( normal.dot( s2.velocity ) );
+					s1.velocity.add( v2 ).sub( v1 );
+					s2.velocity.add( v1 ).sub( v2 );
+
+					const d = ( r - Math.sqrt( d2 ) ) / 2;
+
+					s1.collider.center.addScaledVector( normal, d );
+					s2.collider.center.addScaledVector( normal, - d );
+
+				}
+
+			}
+
+		}
+
+	}
+
+	function updateSpheres( deltaTime ) {
+
+		spheres.forEach( sphere =>{
+
+			sphere.collider.center.addScaledVector( sphere.velocity, deltaTime );
+
+			const result = worldOctree.sphereIntersect( sphere.collider );
+
+			if ( result ) {
+
+				sphere.velocity.addScaledVector( result.normal, - result.normal.dot( sphere.velocity ) * 1.5 );
+				sphere.collider.center.add( result.normal.multiplyScalar( result.depth ) );
+
+			} else {
+
+				sphere.velocity.y -= GRAVITY * deltaTime;
+
+			}
+
+			const damping = Math.exp( - 1.5 * deltaTime ) - 1;
+			sphere.velocity.addScaledVector( sphere.velocity, damping );
+
+			spheresCollisions();
+
+			sphere.mesh.position.copy( sphere.collider.center );
+
+		} );
+
+	}
+
+	function getForwardVector() {
+
+		fpsCamera.getWorldDirection( playerDirection );
+		playerDirection.y = 0;
+		playerDirection.normalize();
+
+		return playerDirection;
+
+	}
+
+	function getSideVector() {
+
+		fpsCamera.getWorldDirection( playerDirection );
+		playerDirection.y = 0;
+		playerDirection.normalize();
+		playerDirection.cross( fpsCamera.up );
+
+		return playerDirection;
+
+	}
+
+	function controls( deltaTime ) {
+
+		const speed = 25;
+
+		if ( playerOnFloor ) {
+
+			if ( keyStates[ 'KeyW' ] ) {
+
+				playerVelocity.add( getForwardVector().multiplyScalar( speed * deltaTime ) );
+
+			}
+
+			if ( keyStates[ 'KeyS' ] ) {
+
+				playerVelocity.add( getForwardVector().multiplyScalar( - speed * deltaTime ) );
+
+			}
+
+			if ( keyStates[ 'KeyA' ] ) {
+
+				playerVelocity.add( getSideVector().multiplyScalar( - speed * deltaTime ) );
+
+			}
+
+			if ( keyStates[ 'KeyD' ] ) {
+
+				playerVelocity.add( getSideVector().multiplyScalar( speed * deltaTime ) );
+
+			}
+
+
+
+		}
+
+	}
+
+  function render(){
+
+    if(scope.nowCamera){
+		    renderer.render( scene, scope.nowCamera );
+    }
+	}
+  window.onresize = function () {
+    renderer.setSize(dom.offsetWidth,dom.offsetHeight);
+  }
+
+  this.initNewEvent = function(actions,lessonTriggerList){
+    console.log(actions);
+    console.log(lessonTriggerList);
+    eventBoxs = [];
+    for(let i=0;i<actions.length;i++){
+      if(actions[i].actionType == "contact"){
+        for(let j=0;j<lessonTriggerList.length;j++){
+
+          if(lessonTriggerList[j].label == actions[i].actionModel){
+             let eventTestBox = new THREE.Box3(new THREE.Vector3(), new THREE.Vector3());
+             eventTestBox.setFromObject(lessonTriggerList[j]);
+             eventTestBox.mesh = lessonTriggerList[j];
+             eventTestBox.action = actions[i];
+             eventBoxs.push(eventTestBox);
+          }
+        }
+
+      }
+    }
+    scope.eventHitMode = true;
+
+  };
+  console.log(lessonData);
+}
diff --git a/src/jlmap3d/lesson3d/math/Capsule.js b/src/jlmap3d/lesson3d/math/Capsule.js
new file mode 100644
index 000000000..85e657fcb
--- /dev/null
+++ b/src/jlmap3d/lesson3d/math/Capsule.js
@@ -0,0 +1,138 @@
+var Capsule = ( function () {
+
+	var _v1 = new THREE.Vector3();
+	var _v2 = new THREE.Vector3();
+	var _v3 = new THREE.Vector3();
+
+	var EPS = 1e-10;
+
+	function Capsule( start, end, radius ) {
+
+		this.start = start == undefined ? new THREE.Vector3( 0, 0, 0 ) : start;
+		this.end = end == undefined ? new THREE.Vector3( 0, 1, 0 ) : end;
+		this.radius = radius == undefined ? 1 : radius;
+
+	}
+
+	Object.assign( Capsule.prototype, {
+
+		clone: function () {
+
+			return new Capsule( this.start.clone(), this.end.clone(), this.radius );
+
+		},
+
+		set: function ( start, end, radius ) {
+
+			this.start.copy( start );
+			this.end.copy( end );
+			this.radius = radius;
+
+		},
+
+		copy: function ( capsule ) {
+
+			this.start.copy( capsule.start );
+			this.end.copy( capsule.end );
+			this.radius = capsule.radius;
+
+		},
+
+		getCenter: function ( target ) {
+
+			return target.copy( this.end ).add( this.start ).multiplyScalar( 0.5 );
+
+		},
+
+		translate: function ( v ) {
+
+			this.start.add( v );
+			this.end.add( v );
+
+		},
+
+		checkAABBAxis: function ( p1x, p1y, p2x, p2y, minx, maxx, miny, maxy, radius ) {
+
+			return (
+				( minx - p1x < radius || minx - p2x < radius ) &&
+				( p1x - maxx < radius || p2x - maxx < radius ) &&
+				( miny - p1y < radius || miny - p2y < radius ) &&
+				( p1y - maxy < radius || p2y - maxy < radius )
+			);
+
+		},
+
+		intersectsBox: function ( box ) {
+
+			return (
+				this.checkAABBAxis(
+					this.start.x, this.start.y, this.end.x, this.end.y,
+					box.min.x, box.max.x, box.min.y, box.max.y,
+					this.radius ) &&
+				this.checkAABBAxis(
+					this.start.x, this.start.z, this.end.x, this.end.z,
+					box.min.x, box.max.x, box.min.z, box.max.z,
+					this.radius ) &&
+				this.checkAABBAxis(
+					this.start.y, this.start.z, this.end.y, this.end.z,
+					box.min.y, box.max.y, box.min.z, box.max.z,
+					this.radius )
+			);
+
+		},
+
+		lineLineMinimumPoints: function ( line1, line2 ) {
+
+			var r = _v1.copy( line1.end ).sub( line1.start );
+			var s = _v2.copy( line2.end ).sub( line2.start );
+			var w = _v3.copy( line2.start ).sub( line1.start );
+
+			var a = r.dot( s ),
+				b = r.dot( r ),
+				c = s.dot( s ),
+				d = s.dot( w ),
+				e = r.dot( w );
+
+			var t1, t2, divisor = b * c - a * a;
+
+			if ( Math.abs( divisor ) < EPS ) {
+
+				var d1 = - d / c;
+				var d2 = ( a - d ) / c;
+
+				if ( Math.abs( d1 - 0.5 ) < Math.abs( d2 - 0.5 ) ) {
+
+					t1 = 0;
+					t2 = d1;
+
+				} else {
+
+					t1 = 1;
+					t2 = d2;
+
+				}
+
+			} else {
+
+				t1 = ( d * a + e * c ) / divisor;
+				t2 = ( t1 * a - d ) / c;
+
+			}
+
+			t2 = Math.max( 0, Math.min( 1, t2 ) );
+			t1 = Math.max( 0, Math.min( 1, t1 ) );
+
+			var point1 = r.multiplyScalar( t1 ).add( line1.start );
+			var point2 = s.multiplyScalar( t2 ).add( line2.start );
+
+			return [ point1, point2 ];
+
+		}
+
+	} );
+
+	return Capsule;
+
+} )();
+
+export { Capsule };
diff --git a/src/jlmap3d/lesson3d/math/Octree.js b/src/jlmap3d/lesson3d/math/Octree.js
new file mode 100644
index 000000000..571ad0b66
--- /dev/null
+++ b/src/jlmap3d/lesson3d/math/Octree.js
@@ -0,0 +1,460 @@
+
+import { Capsule } from '@/jlmap3d/lesson3d/math/Capsule.js';
+var Octree = ( function () {
+
+	var _v1 = new THREE.Vector3();
+	var _v2 = new THREE.Vector3();
+	var _plane = new THREE.Plane();
+	var _line1 = new THREE.Line3();
+	var _line2 = new THREE.Line3();
+	var _sphere = new THREE.Sphere();
+	var _capsule = new Capsule();
+
+	function Octree( box ) {
+
+		this.triangles = [];
+		this.box = box;
+		this.subTrees = [];
+
+	}
+
+	Object.assign( Octree.prototype, {
+
+		addTriangle: function ( triangle ) {
+
+			if ( ! this.bounds ) this.bounds = new THREE.Box3();
+
+			this.bounds.min.x = Math.min( this.bounds.min.x, triangle.a.x, triangle.b.x, triangle.c.x );
+			this.bounds.min.y = Math.min( this.bounds.min.y, triangle.a.y, triangle.b.y, triangle.c.y );
+			this.bounds.min.z = Math.min( this.bounds.min.z, triangle.a.z, triangle.b.z, triangle.c.z );
+			this.bounds.max.x = Math.max( this.bounds.max.x, triangle.a.x, triangle.b.x, triangle.c.x );
+			this.bounds.max.y = Math.max( this.bounds.max.y, triangle.a.y, triangle.b.y, triangle.c.y );
+			this.bounds.max.z = Math.max( this.bounds.max.z, triangle.a.z, triangle.b.z, triangle.c.z );
+
+			this.triangles.push( triangle );
+
+			return this;
+
+		},
+
+		calcBox: function () {
+
+			this.box = this.bounds.clone();
+
+			// offset small ammount to account for regular grid
+			this.box.min.x -= 0.01;
+			this.box.min.y -= 0.01;
+			this.box.min.z -= 0.01;
+
+			return this;
+
+		},
+
+		split: function ( level ) {
+
+			if ( ! this.box ) return;
+
+			var subTrees = [],
+				halfsize = _v2.copy( this.box.max ).sub( this.box.min ).multiplyScalar( 0.5 ),
+				box, v, triangle;
+
+			for ( var x = 0; x < 2; x ++ ) {
+
+				for ( var y = 0; y < 2; y ++ ) {
+
+					for ( var z = 0; z < 2; z ++ ) {
+
+						box = new THREE.Box3();
+						v = _v1.set( x, y, z );
+
+						box.min.copy( this.box.min ).add( v.multiply( halfsize ) );
+						box.max.copy( box.min ).add( halfsize );
+
+						subTrees.push( new Octree( box ) );
+
+					}
+
+				}
+
+			}
+
+			while ( triangle = this.triangles.pop() ) {
+
+				for ( var i = 0; i < subTrees.length; i ++ ) {
+
+					if ( subTrees[ i ].box.intersectsTriangle( triangle ) ) {
+
+						subTrees[ i ].triangles.push( triangle );
+
+					}
+
+				}
+
+			}
+
+			for ( var i = 0; i < subTrees.length; i ++ ) {
+
+				var len = subTrees[ i ].triangles.length;
+
+				if ( len > 8 && level < 16 ) {
+
+					subTrees[ i ].split( level + 1 );
+
+				}
+
+				if ( len != 0 ) {
+
+					this.subTrees.push( subTrees[ i ] );
+
+				}
+
+			}
+
+			return this;
+
+		},
+
+		build: function () {
+
+			this.calcBox();
+			this.split( 0 );
+
+			return this;
+
+		},
+
+		getRayTriangles: function ( ray, triangles ) {
+
+			for ( var i = 0; i < this.subTrees.length; i ++ ) {
+
+				var subTree = this.subTrees[ i ];
+				if ( ! ray.intersectsBox( subTree.box ) ) continue;
+
+				if ( subTree.triangles.length > 0 ) {
+
+					for ( var j = 0; j < subTree.triangles.length; j ++ ) {
+
+						if ( triangles.indexOf( subTree.triangles[ j ] ) === - 1 ) triangles.push( subTree.triangles[ j ] );
+
+					}
+
+				} else {
+
+					subTree.getRayTriangles( ray, triangles );
+
+				}
+
+			}
+
+			return triangles;
+
+		},
+
+		triangleCapsuleIntersect: function ( capsule, triangle ) {
+
+			var point1, point2, line1, line2;
+
+			triangle.getPlane( _plane );
+
+			var d1 = _plane.distanceToPoint( capsule.start ) - capsule.radius;
+			var d2 = _plane.distanceToPoint( capsule.end ) - capsule.radius;
+
+			if ( ( d1 > 0 && d2 > 0 ) || ( d1 < - capsule.radius && d2 < - capsule.radius ) ) {
+
+				return false;
+
+			}
+
+			var delta = Math.abs( d1 / ( Math.abs( d1 ) + Math.abs( d2 ) ) );
+			var intersectPoint = _v1.copy( capsule.start ).lerp( capsule.end, delta );
+
+			if ( triangle.containsPoint( intersectPoint ) ) {
+
+				return { normal: _plane.normal.clone(), point: intersectPoint.clone(), depth: Math.abs( Math.min( d1, d2 ) ) };
+
+			}
+
+			var r2 = capsule.radius * capsule.radius;
+
+			line1 = _line1.set( capsule.start, capsule.end );
+
+			var lines = [
+				[ triangle.a, triangle.b ],
+				[ triangle.b, triangle.c ],
+				[ triangle.c, triangle.a ]
+			];
+
+			for ( var i = 0; i < lines.length; i ++ ) {
+
+				line2 = _line2.set( lines[ i ][ 0 ], lines[ i ][ 1 ] );
+
+				[ point1, point2 ] = capsule.lineLineMinimumPoints( line1, line2 );
+
+				if ( point1.distanceToSquared( point2 ) < r2 ) {
+
+					return { normal: point1.clone().sub( point2 ).normalize(), point: point2.clone(), depth: capsule.radius - point1.distanceTo( point2 ) };
+
+				}
+
+			}
+
+			return false;
+
+		},
+
+		triangleSphereIntersect: function ( sphere, triangle ) {
+
+			triangle.getPlane( _plane );
+
+			if ( ! sphere.intersectsPlane( _plane ) ) return false;
+
+			var depth = Math.abs( _plane.distanceToSphere( sphere ) );
+			var r2 = sphere.radius * sphere.radius - depth * depth;
+
+			var plainPoint = _plane.projectPoint( sphere.center, _v1 );
+
+			if ( triangle.containsPoint( sphere.center ) ) {
+
+				return { normal: _plane.normal.clone(), point: plainPoint.clone(), depth: Math.abs( _plane.distanceToSphere( sphere ) ) };
+
+			}
+
+			var lines = [
+				[ triangle.a, triangle.b ],
+				[ triangle.b, triangle.c ],
+				[ triangle.c, triangle.a ]
+			];
+
+			for ( var i = 0; i < lines.length; i ++ ) {
+
+				_line1.set( lines[ i ][ 0 ], lines[ i ][ 1 ] );
+				_line1.closestPointToPoint( plainPoint, true, _v2 );
+
+				var d = _v2.distanceToSquared( sphere.center );
+
+				if ( d < r2 ) {
+
+					return { normal: sphere.center.clone().sub( _v2 ).normalize(), point: _v2.clone(), depth: sphere.radius - Math.sqrt( d ) };
+
+				}
+
+			}
+
+			return false;
+
+		},
+
+		getSphereTriangles: function ( sphere, triangles ) {
+
+			for ( var i = 0; i < this.subTrees.length; i ++ ) {
+
+				var subTree = this.subTrees[ i ];
+
+				if ( ! sphere.intersectsBox( subTree.box ) ) continue;
+
+				if ( subTree.triangles.length > 0 ) {
+
+					for ( var j = 0; j < subTree.triangles.length; j ++ ) {
+
+						if ( triangles.indexOf( subTree.triangles[ j ] ) === - 1 ) triangles.push( subTree.triangles[ j ] );
+
+					}
+
+				} else {
+
+					subTree.getSphereTriangles( sphere, triangles );
+
+				}
+
+			}
+
+		},
+
+		getCapsuleTriangles: function ( capsule, triangles ) {
+
+			for ( var i = 0; i < this.subTrees.length; i ++ ) {
+
+				var subTree = this.subTrees[ i ];
+
+				if ( ! capsule.intersectsBox( subTree.box ) ) continue;
+
+				if ( subTree.triangles.length > 0 ) {
+
+					for ( var j = 0; j < subTree.triangles.length; j ++ ) {
+
+						if ( triangles.indexOf( subTree.triangles[ j ] ) === - 1 ) triangles.push( subTree.triangles[ j ] );
+
+					}
+
+				} else {
+
+					subTree.getCapsuleTriangles( capsule, triangles );
+
+				}
+
+			}
+
+		},
+
+		sphereIntersect( sphere ) {
+
+			_sphere.copy( sphere );
+
+			var triangles = [], result, hit = false;
+
+			this.getSphereTriangles( sphere, triangles );
+
+			for ( var i = 0; i < triangles.length; i ++ ) {
+
+				if ( result = this.triangleSphereIntersect( _sphere, triangles[ i ] ) ) {
+
+					hit = true;
+
+					_sphere.center.add( result.normal.multiplyScalar( result.depth ) );
+
+				}
+
+			}
+
+			if ( hit ) {
+
+				var collisionVector = _sphere.center.clone().sub( sphere.center );
+				var depth = collisionVector.length();
+
+				return { normal: collisionVector.normalize(), depth: depth };
+
+			}
+
+			return false;
+
+		},
+
+		capsuleIntersect: function ( capsule ) {
+
+			_capsule.copy( capsule );
+
+			var triangles = [], result, hit = false;
+
+			this.getCapsuleTriangles( _capsule, triangles );
+
+			for ( var i = 0; i < triangles.length; i ++ ) {
+
+				if ( result = this.triangleCapsuleIntersect( _capsule, triangles[ i ] ) ) {
+
+					hit = true;
+
+					_capsule.translate( result.normal.multiplyScalar( result.depth ) );
+
+				}
+
+			}
+
+			if ( hit ) {
+
+				var collisionVector = _capsule.getCenter( new THREE.Vector3() ).sub( capsule.getCenter( _v1 ) );
+				var depth = collisionVector.length();
+
+				return { normal: collisionVector.normalize(), depth: depth };
+
+			}
+
+			return false;
+
+		},
+
+		rayIntersect: function ( ray ) {
+
+			if ( ray.direction.length() === 0 ) return;
+
+			var triangles = [], triangle, position,
+				distance = 1e100,
+				result;
+
+			this.getRayTriangles( ray, triangles );
+
+			for ( var i = 0; i < triangles.length; i ++ ) {
+
+				result = ray.intersectTriangle( triangles[ i ].a, triangles[ i ].b, triangles[ i ].c, true, _v1 );
+
+				if ( result ) {
+
+					var newdistance = result.sub( ray.origin ).length();
+
+					if ( distance > newdistance ) {
+
+						position = result.clone().add( ray.origin );
+						distance = newdistance;
+						triangle = triangles[ i ];
+
+					}
+
+				}
+
+			}
+
+			return distance < 1e100 ? { distance: distance, triangle: triangle, position: position } : false;
+
+		},
+
+		fromGraphNode: function ( group ) {
+
+			group.traverse( ( obj ) => {
+
+				if ( obj.type === 'Mesh' ) {
+
+					obj.updateMatrix();
+					obj.updateWorldMatrix();
+
+					var geometry, isTemp = false;
+
+					if ( obj.geometry.index ) {
+
+						isTemp = true;
+						geometry = obj.geometry.clone().toNonIndexed();
+
+					} else {
+
+						geometry = obj.geometry;
+
+					}
+
+					var positions = geometry.attributes.position.array;
+					var transform = obj.matrixWorld;
+
+					for ( var i = 0; i < positions.length; i += 9 ) {
+
+						var v1 = new THREE.Vector3( positions[ i ], positions[ i + 1 ], positions[ i + 2 ] );
+						var v2 = new THREE.Vector3( positions[ i + 3 ], positions[ i + 4 ], positions[ i + 5 ] );
+						var v3 = new THREE.Vector3( positions[ i + 6 ], positions[ i + 7 ], positions[ i + 8 ] );
+
+						v1.applyMatrix4( transform );
+						v2.applyMatrix4( transform );
+						v3.applyMatrix4( transform );
+
+						this.addTriangle( new THREE.Triangle( v1, v2, v3 ) );
+
+					}
+
+					if ( isTemp ) {
+
+						geometry.dispose();
+
+					}
+
+				}
+
+			} );
+
+			this.build();
+
+			return this;
+
+		}
+
+	} );
+
+	return Octree;
+
+} )();
+
+export { Octree };
diff --git a/src/jlmap3d/lesson3d/model/lessondata.js b/src/jlmap3d/lesson3d/model/lessondata.js
new file mode 100644
index 000000000..96cc06a5b
--- /dev/null
+++ b/src/jlmap3d/lesson3d/model/lessondata.js
@@ -0,0 +1,177 @@
+
+export function LessonData() {
+  let scope = this;
+
+  this.lessonId = "";
+  this.lessonName = "";
+  this.lessonType = "";
+	this.lessonStatus = "";
+	this.lessonData = {
+		//资源列表
+    assetList:[],
+    //场景交互物体列表
+    modelList:[],
+		//课程组件启用状态
+		lessonTools:[],
+		dataType:"",
+    toolJobPane:[],
+		//课程内容
+		lessonProgress:[
+
+    ]
+	};
+
+  this.initLessonProgress = function(){
+    let newLessonProgress = {
+      id:generateUUID(),
+      progressName:"命名",
+      roleName:"",
+      roleUse:true,
+
+      progressScene:"",
+      nextCode:"",
+      nextNode:"",
+      triggerType:"",
+      triggerMode:"",
+      triggerTime:"",
+      triggerModel:"",
+      controlMode:"",
+      cameraMode:"",
+      changeCamera:false,
+      cameraPosition:{
+        x:0,
+        y:0,
+        z:0
+      },
+      cameraTarget:{
+        x:0,
+        y:0,
+        z:0
+      },
+      assetId:scope.lessonData.lessonProgress.length,
+      assetPos:"",
+      assetRot:"",
+      assetType:"",
+      index:"",
+      stepTipsData:{
+        tittle:"标题",
+        text:"内容",
+      },
+      explainPane:{
+        tittle:"标题",
+        picurl:"url",
+        text:"内容",
+      },
+      action:[],
+    };
+
+    scope.lessonData.lessonProgress.push(newLessonProgress);
+
+  }
+
+  this.loadLessonProgress = function(loadData){
+    console.log(loadData);
+    for(let i=0;i<loadData.length;i++){
+      let newLessonProgress = {
+        id:loadData[i].id,
+        progressName:loadData[i].progressName,
+        roleName:loadData[i].roleName,
+        roleUse:loadData[i].roleUse,
+        score:loadData[i].roleUse,
+        progressScene:loadData[i].progressScene,
+        nextCode:loadData[i].nextCode,
+        nextNode:loadData[i].nextNode,
+        triggerType:loadData[i].triggerType,
+        triggerMode:loadData[i].triggerMode,
+        triggerTime:loadData[i].triggerTime,
+        triggerModel:loadData[i].triggerModel,
+        controlMode:loadData[i].controlMode,
+        cameraMode:loadData[i].cameraMode,
+        changeCamera:loadData[i].changeCamera,
+        cameraPosition:loadData[i].cameraPosition,
+        cameraTarget:loadData[i].cameraTarget,
+        assetId:loadData[i].assetId,
+        assetPos:loadData[i].assetPos,
+        assetRot:loadData[i].assetRot,
+        assetType:loadData[i].assetType,
+        index:loadData[i].index,
+        stepTipsData:loadData[i].stepTipsData,
+        explainPane:loadData[i].explainPane,
+        action:loadData[i].action,
+        jobPane:[],
+      };
+
+      scope.lessonData.lessonProgress.push(newLessonProgress);
+    }
+  }
+
+  this.addLessonProgress = function(index){
+    let inheirIndex = index - 1;
+    let newLessonProgress = {
+      id:generateUUID(),
+      progressName:"命名",
+      roleName:scope.lessonData.lessonProgress[inheirIndex].roleName,
+      roleUse:scope.lessonData.lessonProgress[inheirIndex].roleUse,
+      score:0,
+      progressScene:scope.lessonData.lessonProgress[inheirIndex].progressScene,
+      nextCode:"",
+      nextNode:"",
+      triggerType:"",
+      triggerMode:"",
+      triggerTime:"",
+      triggerModel:"",
+      controlMode:scope.lessonData.lessonProgress[inheirIndex].controlMode,
+      cameraMode:scope.lessonData.lessonProgress[inheirIndex].cameraMode,
+      changeCamera:scope.lessonData.lessonProgress[inheirIndex].changeCamera,
+      cameraPosition:scope.lessonData.lessonProgress[inheirIndex].cameraPosition,
+      cameraTarget:scope.lessonData.lessonProgress[inheirIndex].cameraTarget,
+      assetId:scope.lessonData.lessonProgress.length,
+      assetPos:"",
+      assetRot:"",
+      assetType:"",
+      index:"",
+      triger:[
+
+      ],
+      stepTipsData:{
+        tittle:"标题",
+        text:"内容",
+      },
+      explainPane:{
+        tittle:"标题",
+        picurl:"url",
+        text:"内容",
+      },
+      action:[
+
+      ],
+      jobPane:[],
+    };
+
+    scope.lessonData.lessonProgress.push(newLessonProgress);
+
+  }
+
+  this.changeLessonProgress = function(){
+
+  }
+
+  this.removeLessonProgress = function(index){
+    scope.lessonData.lessonProgress.splice(index,1);
+  }
+
+  function generateUUID() {
+    var d = new Date().getTime();
+    if (window.performance && typeof window.performance.now === "function") {
+        d += performance.now(); //use high-precision timer if available
+    }
+    var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        var r = (d + Math.random() * 16) % 16 | 0;
+        d = Math.floor(d / 16);
+        return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+    });
+    return uuid;
+  }
+
+
+}
diff --git a/src/jlmap3d/lesson3d/toolsmodel/jobpanedata.js b/src/jlmap3d/lesson3d/toolsmodel/jobpanedata.js
new file mode 100644
index 000000000..e9452de06
--- /dev/null
+++ b/src/jlmap3d/lesson3d/toolsmodel/jobpanedata.js
@@ -0,0 +1,307 @@
+
+export function JobPaneData() {
+  let scope = this;
+
+  // let
+  this.dataList = [
+    {
+      name:"值班站长",
+      value:"zbzz",
+      text:"执行分公司、部、中心、车站的有关规章制度，加强班组管理，掌握列车运行情况，安排车站行车组织工作",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"行车值班员",
+      value:"xczby",
+      text:"在本班组值班站长的指挥下开展工作，负责本班组车站综合控制室，负责车站行车工作，监视列车到、发情况及乘客上下车、候车动态，监控设备运作状况。",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"客运值班员",
+      value:"kyzby",
+      text:"在值班站长的领导下，主管车站客运、票务管理，组织站务员从事客运服务工作",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"票厅员",
+      value:"spy",
+      text:"执行分公司、部、中心、车站的有关规章制度，在客运值班员领导下，负责车站售票工作。",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"站台岗",
+      value:"ztg",
+      text:"",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"站长",
+      value:"zz",
+      text:"在站务中心（副）主任领导下，组织领导站内员工开展车站各项工作。负责车站员工的日常管理，定期进行员工教育，掌握员工思想状况。",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"分部助理",
+      value:"fbzl",
+      text:"",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"行车调度",
+      value:"xcdd",
+      text:"",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"生产调度",
+      value:"scdd",
+      text:"",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"平台岗",
+      value:"ptg",
+      text:"负责站厅乘客服务，设备的巡视、紧急情况下事件的处理等。",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"地铁公安",
+      value:"110",
+      text:"",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"120",
+      value:"120",
+      text:"",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+    {
+      name:"119",
+      value:"119",
+      text:"",
+      picurl:"",
+      controlList:[
+        //联控
+        {
+          name:"联控",
+          data:[],
+        },
+        //动作
+        {
+          name:"动作",
+          data:[],
+        },
+        //口呼
+        {
+          name:"口呼",
+          data:[],
+        },
+      ],
+    },
+  ];
+}
diff --git a/src/jlmap3d/lesson3d/toolsmodel/lessontrigger.js b/src/jlmap3d/lesson3d/toolsmodel/lessontrigger.js
new file mode 100644
index 000000000..40d9aedf1
--- /dev/null
+++ b/src/jlmap3d/lesson3d/toolsmodel/lessontrigger.js
@@ -0,0 +1,32 @@
+
+export function LessonTrigger() {
+
+  let scope = this;
+
+  this.dataList = [
+
+  ];
+  // let
+  this.triggerList = [
+    {
+      name:"移动触发器",
+      type:"movetrigger",
+      picurl:"",
+    },
+    {
+      name:"置物触发器",
+      type:"placetrigger",
+      picurl:"",
+    },
+
+  ];
+
+  this.createTrigger = function(type){
+
+
+  }
+
+  this.deleteTrigger = function(selected){
+
+  }
+}
diff --git a/src/jlmap3d/lesson3dedit/model/lessondata.js b/src/jlmap3d/lesson3dedit/model/lessondata.js
index 51240ee95..96cc06a5b 100644
--- a/src/jlmap3d/lesson3dedit/model/lessondata.js
+++ b/src/jlmap3d/lesson3dedit/model/lessondata.js
@@ -24,7 +24,7 @@ export function LessonData() {
   this.initLessonProgress = function(){
     let newLessonProgress = {
       id:generateUUID(),
-      progressName:"",
+      progressName:"命名",
       roleName:"",
       roleUse:true,
 
@@ -37,8 +37,17 @@ export function LessonData() {
       triggerModel:"",
       controlMode:"",
       cameraMode:"",
-      cameraPosition:"",
-      cameraTarget:"",
+      changeCamera:false,
+      cameraPosition:{
+        x:0,
+        y:0,
+        z:0
+      },
+      cameraTarget:{
+        x:0,
+        y:0,
+        z:0
+      },
       assetId:scope.lessonData.lessonProgress.length,
       assetPos:"",
       assetRot:"",
@@ -78,6 +87,7 @@ export function LessonData() {
         triggerModel:loadData[i].triggerModel,
         controlMode:loadData[i].controlMode,
         cameraMode:loadData[i].cameraMode,
+        changeCamera:loadData[i].changeCamera,
         cameraPosition:loadData[i].cameraPosition,
         cameraTarget:loadData[i].cameraTarget,
         assetId:loadData[i].assetId,
@@ -99,7 +109,7 @@ export function LessonData() {
     let inheirIndex = index - 1;
     let newLessonProgress = {
       id:generateUUID(),
-      progressName:"",
+      progressName:"命名",
       roleName:scope.lessonData.lessonProgress[inheirIndex].roleName,
       roleUse:scope.lessonData.lessonProgress[inheirIndex].roleUse,
       score:0,
@@ -112,6 +122,7 @@ export function LessonData() {
       triggerModel:"",
       controlMode:scope.lessonData.lessonProgress[inheirIndex].controlMode,
       cameraMode:scope.lessonData.lessonProgress[inheirIndex].cameraMode,
+      changeCamera:scope.lessonData.lessonProgress[inheirIndex].changeCamera,
       cameraPosition:scope.lessonData.lessonProgress[inheirIndex].cameraPosition,
       cameraTarget:scope.lessonData.lessonProgress[inheirIndex].cameraTarget,
       assetId:scope.lessonData.lessonProgress.length,
diff --git a/src/jlmap3d/lesson3dedit/toolsmodel/jobpanedata.js b/src/jlmap3d/lesson3dedit/toolsmodel/jobpanedata.js
index ce9f5919d..e9452de06 100644
--- a/src/jlmap3d/lesson3dedit/toolsmodel/jobpanedata.js
+++ b/src/jlmap3d/lesson3dedit/toolsmodel/jobpanedata.js
@@ -6,6 +6,7 @@ export function JobPaneData() {
   this.dataList = [
     {
       name:"值班站长",
+      value:"zbzz",
       text:"执行分公司、部、中心、车站的有关规章制度，加强班组管理，掌握列车运行情况，安排车站行车组织工作",
       picurl:"",
       controlList:[
@@ -28,6 +29,7 @@ export function JobPaneData() {
     },
     {
       name:"行车值班员",
+      value:"xczby",
       text:"在本班组值班站长的指挥下开展工作，负责本班组车站综合控制室，负责车站行车工作，监视列车到、发情况及乘客上下车、候车动态，监控设备运作状况。",
       picurl:"",
       controlList:[
@@ -50,6 +52,7 @@ export function JobPaneData() {
     },
     {
       name:"客运值班员",
+      value:"kyzby",
       text:"在值班站长的领导下，主管车站客运、票务管理，组织站务员从事客运服务工作",
       picurl:"",
       controlList:[
@@ -71,7 +74,8 @@ export function JobPaneData() {
       ],
     },
     {
-      name:"票厅岗",
+      name:"票厅员",
+      value:"spy",
       text:"执行分公司、部、中心、车站的有关规章制度，在客运值班员领导下，负责车站售票工作。",
       picurl:"",
       controlList:[
@@ -94,6 +98,7 @@ export function JobPaneData() {
     },
     {
       name:"站台岗",
+      value:"ztg",
       text:"",
       picurl:"",
       controlList:[
@@ -116,6 +121,7 @@ export function JobPaneData() {
     },
     {
       name:"站长",
+      value:"zz",
       text:"在站务中心（副）主任领导下，组织领导站内员工开展车站各项工作。负责车站员工的日常管理，定期进行员工教育，掌握员工思想状况。",
       picurl:"",
       controlList:[
@@ -138,6 +144,7 @@ export function JobPaneData() {
     },
     {
       name:"分部助理",
+      value:"fbzl",
       text:"",
       picurl:"",
       controlList:[
@@ -160,6 +167,7 @@ export function JobPaneData() {
     },
     {
       name:"行车调度",
+      value:"xcdd",
       text:"",
       picurl:"",
       controlList:[
@@ -182,6 +190,7 @@ export function JobPaneData() {
     },
     {
       name:"生产调度",
+      value:"scdd",
       text:"",
       picurl:"",
       controlList:[
@@ -203,7 +212,8 @@ export function JobPaneData() {
       ],
     },
     {
-      name:"厅巡岗",
+      name:"平台岗",
+      value:"ptg",
       text:"负责站厅乘客服务，设备的巡视、紧急情况下事件的处理等。",
       picurl:"",
       controlList:[
@@ -226,6 +236,7 @@ export function JobPaneData() {
     },
     {
       name:"地铁公安",
+      value:"110",
       text:"",
       picurl:"",
       controlList:[
@@ -248,6 +259,7 @@ export function JobPaneData() {
     },
     {
       name:"120",
+      value:"120",
       text:"",
       picurl:"",
       controlList:[
@@ -270,6 +282,7 @@ export function JobPaneData() {
     },
     {
       name:"119",
+      value:"119",
       text:"",
       picurl:"",
       controlList:[
diff --git a/src/views/jlmap3d/lesson3dedit/component/lessonprogress.vue b/src/views/jlmap3d/lesson3dedit/component/lessonprogress.vue
index b28729e54..a2510d828 100644
--- a/src/views/jlmap3d/lesson3dedit/component/lessonprogress.vue
+++ b/src/views/jlmap3d/lesson3dedit/component/lessonprogress.vue
@@ -6,11 +6,13 @@
       <el-tab-pane label="课程场景" name="progresslist" >
         <draggable v-model="lessonData.lessonData.lessonProgress" group="people" @start="drag=true" @end="drag=false" >
           <div class="progressdiv"  v-for="(element,index) in lessonData.lessonData.lessonProgress">
-            <div class="changeprogressdiv" @click="changeProgressView(index)">{{element.assetId}}</div>
+            <div class="changeprogressdiv" @click="changeProgressView(index)">{{element.progressName}}</div>
             <div class="delprogressdiv" @click="removeProgress(index)" >X</div>
           </div>
         </draggable>
-        <div class="progressdiv " icon="el-icon-folder-add" @click="addProgress"></div>
+        <div class="progressdiv "
+          :style="{'background-image': 'url('+localstatic+'/lesson3d/addbutton.png)'}"
+          icon="el-icon-folder-add" @click="addProgress"></div>
       </el-tab-pane>
 
       <el-tab-pane label="课程三维资源列表" name="assetlist" >
@@ -33,6 +35,7 @@
   import localStore from 'storejs';
 
   import draggable from 'vuedraggable';
+	import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 
   export default {
     name: 'LessonProgress',
@@ -42,6 +45,7 @@
     },
     data() {
       return {
+        localstatic:JL3D_LOCAL_STATIC,
         activeName: 'progresslist',
         progressList:[
 
@@ -89,7 +93,7 @@
       deleteModel(selectedModel){
         this.$emit('deleteModel',selectedModel);
       },
-    
+
 
     },
 
@@ -122,6 +126,7 @@
     margin: 20px;
     float:left;
     border:solid 2px #000;
+    background-size: 100%;
   }
 
 .changeprogressdiv{
diff --git a/src/views/jlmap3d/lesson3dedit/component/property.vue b/src/views/jlmap3d/lesson3dedit/component/property.vue
index 241450d19..0f4c85944 100644
--- a/src/views/jlmap3d/lesson3dedit/component/property.vue
+++ b/src/views/jlmap3d/lesson3dedit/component/property.vue
@@ -4,53 +4,83 @@
     <el-tabs v-model="activeName" class="activediv" type="card" @tab-click="handleClick">
       <el-tab-pane label="当前场景信息" name="cameraproperty">
         <el-form ref="form" class="camerapropertydiv"  size="mini" v-if="selectLesson3dControl">
+
+          <el-form-item label="场景名称:"  v-if="lessonData.lessonData.lessonProgress[lessonEditIndex].progressName" disabled="true">
+              <el-input v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].progressName" ></el-input>
+          </el-form-item>
+
+
+
+          <el-form-item label="三维场景设置：">
             <el-select v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].progressScene" placeholder="请选择场景">
-              <el-option label="车站" value="standstation"></el-option>
-              <el-option label="停车场" value="stopstation"></el-option>
-              <el-option label="单体设备" value="device"></el-option>
-              <el-option label="线路" value="xl"></el-option>
-              <el-option label="道岔" value="dc"></el-option>
+              <el-option v-for="sceneItem in sceneDataList" :label="sceneItem.label" :value="sceneItem.value"></el-option>
             </el-select>
+          </el-form-item>
+
+            <el-form-item label="课程角色：">
+              <el-switch
+                v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].roleUse"
+                active-text="启用角色"
+                inactive-text="禁用角色">
+              </el-switch>
+            </el-form-item>
+
+            <el-form-item label="场景角色设置：">
+
+              <el-select v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].roleName" :disabled="!lessonData.lessonData.lessonProgress[lessonEditIndex].roleUse" placeholder="请选择步骤归属角色">
+                <el-option v-for="jobItem in jobDataList" :label="jobItem.name" :value="jobItem.value"></el-option>
+
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="课程场景相机设置：">
+              <el-switch
+                v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].changeCamera"
+                active-text="场景改变视角"
+                inactive-text="禁用改变视角">
+              </el-switch>
+            </el-form-item>
 
-            <el-switch
-              v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].roleUse"
-              active-text="启用角色"
-              inactive-text="禁用角色">
-            </el-switch>
 
-            <el-select v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].roleName" :disabled="!lessonData.lessonData.lessonProgress[lessonEditIndex].roleUse" placeholder="请选择步骤归属角色">
-              <el-option label="车站" value="standstation"></el-option>
-              <el-option label="停车场" value="stopstation"></el-option>
-              <el-option label="单体设备" value="device"></el-option>
-              <el-option label="线路" value="xl"></el-option>
-              <el-option label="道岔" value="dc"></el-option>
-            </el-select>
 
             <el-form-item label="相机坐标："  v-if="selectLesson3dControl.object.position" disabled="true">
-
                 <el-input v-model="selectLesson3dControl.object.position.x" ></el-input>
                 <el-input v-model="selectLesson3dControl.object.position.y" ></el-input>
                 <el-input v-model="selectLesson3dControl.object.position.z" ></el-input>
             </el-form-item>
 
             <el-form-item label="相机角度:"  v-if="selectLesson3dControl.target" disabled="true">
-
                 <el-input v-model="selectLesson3dControl.target.x" ></el-input>
                 <el-input v-model="selectLesson3dControl.target.y" ></el-input>
                 <el-input v-model="selectLesson3dControl.target.z" ></el-input>
             </el-form-item>
 
-            <el-select v-model="value" placeholder="当前场景镜头控制模式">
-             <el-option
-               v-for="item in cameraMode"
-               :key="item.value"
-               :label="item.label"
-               :value="item.value">
-             </el-option>
-           </el-select>
+            <el-form-item label="该场景中用户操作模式:">
+              <el-select v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].controlMode" placeholder="当前场景镜头控制模式">
+               <el-option
+                 v-for="item in cameraMode"
+                 :key="item.value"
+                 :label="item.label"
+                 :value="item.value">
+               </el-option>
+             </el-select>
+            </el-form-item>
+
 
            <el-button v-if="selectLesson3dControl" @click="resetCamera">重置镜头位置</el-button>
-            <el-button v-if="selectLesson3dControl" @click="recordCamera">记录初始镜头位置</el-button>
+           <el-button v-if="selectLesson3dControl" @click="recordCamera">记录初始镜头位置</el-button>
+           <el-form-item label="保存的相机坐标："  v-if="lessonData.lessonData.lessonProgress[lessonEditIndex].cameraPosition" disabled="true">
+               <el-input v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].cameraPosition.x" ></el-input>
+               <el-input v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].cameraPosition.y" ></el-input>
+               <el-input v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].cameraPosition.z" ></el-input>
+           </el-form-item>
+
+           <el-form-item label="保存的相机角度:"  v-if="lessonData.lessonData.lessonProgress[lessonEditIndex].cameraTarget" disabled="true">
+               <el-input v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].cameraTarget.x" ></el-input>
+               <el-input v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].cameraTarget.y" ></el-input>
+               <el-input v-model="lessonData.lessonData.lessonProgress[lessonEditIndex].cameraTarget.z" ></el-input>
+           </el-form-item>
+
         </el-form>
       </el-tab-pane>
 
@@ -59,7 +89,9 @@
           <div class="addmodeleventdiv"
           v-for="(actionitem,actionindex) in lessonData.lessonData.lessonProgress[lessonEditIndex].action"
           @click="selsectAction(actionitem)">{{actionitem.actionName}}</div>
-          <div class="addmodeleventdiv" @click="addaction()">添加</div>
+          <div class="addmodeleventdiv"
+            :style="{'background-image': 'url('+localstatic+'/lesson3d/addbutton.png)'}"
+            @click="addaction()"></div>
         </div>
         <el-form>
 
@@ -69,12 +101,12 @@
 
           <el-form-item label="操作的模型:" >
             <el-select v-model="selectedAction.actionModel" placeholder="选择操作的模型">
-             <el-option
-               v-for="(item,index) in triggerList"
-               :label="item.label"
-               :value="item.label">
-             </el-option>
-           </el-select>
+              <el-option
+                v-for="(item,index) in triggerList"
+                :label="item.label"
+                :value="item.label">
+              </el-option>
+            </el-select>
           </el-form-item>
 
           <el-form-item label="事件类型:" >
@@ -82,7 +114,7 @@
               <el-option label="接触" value="contact"></el-option>
               <el-option label="自动" value="auto"></el-option>
               <el-option label="开关" value="switch"></el-option>
-              <el-option label="跳转" value="jump"></el-option>
+
             </el-select>
           </el-form-item>
 
@@ -91,6 +123,7 @@
               <el-option label="播放动画" value="play"></el-option>
               <el-option label="显示模型" value="show"></el-option>
               <el-option label="隐藏模型" value="remove"></el-option>
+              <el-option label="跳转" value="jump"></el-option>
             </el-select>
           </el-form-item>
 
@@ -98,17 +131,19 @@
 
 
 
-          <el-form-item label="跳转节点:"  v-if="selectedAction.actionType == 'jump'">
+          <el-form-item label="跳转节点:"  v-if="selectedAction.actionMode == 'jump'">
             <el-select v-model="selectedAction.jumpNode" placeholder="当前场景镜头控制模式">
              <el-option
                v-for="(item,index) in lessonData.lessonData.lessonProgress"
                :key="index"
-               :label="index"
+               :label="item.progressName+'/'+index"
                :value="index">
              </el-option>
            </el-select>
           </el-form-item>
 
+          <el-button @click="deleteEventItem(selectedAction)" v-if="selectedAction">删除事件</el-button>
+
         </el-form>
       </el-tab-pane>
 
@@ -118,6 +153,12 @@
               <el-input v-model="selected.tittle" ></el-input>
           </el-form-item>
 
+          <el-form-item label="发起联控角色:"  v-if="selected.explainRole" >
+            <el-select v-model="selected.explainRole" placeholder="请选择步骤归属角色">
+              <el-option v-for="jobItem in jobDataList" :label="jobItem.name" :value="jobItem.value"></el-option>
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="内容:"  v-if="selected.text">
               <el-input v-model="selected.text" ></el-input>
           </el-form-item>
@@ -131,19 +172,21 @@
              <el-option
                v-for="(item,index) in lessonData.lessonData.lessonProgress"
                :key="index"
-               :label="index"
+               :label="item.progressName+'/'+index"
                :value="index">
              </el-option>
            </el-select>
           </el-form-item>
 
+
+
           <el-form-item label="触发的场景:"  v-if="selected.sceneIndex ||selected.sceneIndex == 0">
               <el-input v-model="selected.sceneIndex" ></el-input>
           </el-form-item>
 
 
-
-          <el-button @click="updateData">保存修改</el-button>
+          <el-button @click="deleteJobItem(selected)" v-if="selected.explainRole">删除联控信息</el-button>
+          <!-- <el-button @click="updateData">保存修改</el-button> -->
         </el-form>
 
         <el-form ref="form" class="camerapropertydiv" label-width="130px" size="mini" v-if="selectType == 'modelproperty'">
@@ -156,6 +199,7 @@
               <el-option label="隐藏" :value=false></el-option>
             </el-select>
 
+
           <el-form-item label="模型坐标："  v-if="selected.position" disabled="true">
               <el-input v-model="selected.position.x" ></el-input>
               <el-input v-model="selected.position.y" ></el-input>
@@ -184,6 +228,8 @@
   import Vue from 'vue';
   import localStore from 'storejs';
 
+  import { JobPaneData } from '@/jlmap3d/lesson3dedit/toolsmodel/jobpanedata.js';
+	import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 
   export default {
     name: 'ProPerty',
@@ -193,6 +239,7 @@
     },
     data() {
       return {
+        localstatic:JL3D_LOCAL_STATIC,
         activeName: 'cameraproperty',
         selectLesson3dControl:"",
         selected:"",
@@ -204,6 +251,7 @@
           actionType:"事件操作类型",
           actionMode:"触发事件类型",
         },
+        revisionList:[],
         selectType:"",
         cameraMode:[
           {
@@ -217,6 +265,29 @@
             label: '自由视角控制'
           }
         ],
+        sceneDataList:[
+          {
+            label:"车站",
+            value:"standstation",
+          },
+          {
+            label:"停车场",
+            value:"stopstation",
+          },
+          {
+            label:"单体设备",
+            value:"device",
+          },
+          {
+            label:"线路",
+            value:"xl",
+          },
+          {
+            label:"道岔",
+            value:"dc",
+          },
+        ],
+        jobDataList:[],
         value:'',
       }
     },
@@ -230,6 +301,9 @@
       window.lesson3dUpdateControl = this.lesson3dUpdateControl;
       window.lesson3dSelect = this.lesson3dSelect;
       window.lesson3dUpdatePicurl = this.lesson3dUpdatePicurl;
+
+      let jobList = new JobPaneData();
+      this.jobDataList = jobList.dataList;
     },
     beforeDestroy() {
 
@@ -247,7 +321,7 @@
         console.log("reset");
         this.activeName = 'cameraproperty';
       },
-      lesson3dSelect(mode,type,obj){
+      lesson3dSelect(mode,type,obj,revisionlist){
         this.activeName = mode;
         this.selectType = type;
         // console.log(this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].stepTipsData);
@@ -263,6 +337,7 @@
 
         if(type == "jobpane"){
           this.selected = obj;
+          this.revisionList = revisionlist;
         }
 
         if(type == "modelproperty"){
@@ -274,11 +349,46 @@
       updateData(){
         // this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].stepTipsData;
       },
+      deleteJobItem(selectedJob){
+        console.log(selectedJob);
+        for(let i=0;i<this.revisionList.data.length;i++){
+          if(this.revisionList.data[i].cname == selectedJob.cname){
+            console.log(selectedJob);
+            this.revisionList.data.splice(i,1);
+            break;
+          }
+        }
+      },
+      deleteEventItem(deleteAction){
+        console.log(this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].action);
+        console.log(deleteAction);
+        for(let i=0;i<this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].action.length;i++){
+          if(this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].action[i].actionName == deleteAction.actionName){
+            this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].action.splice(i,1);
+            break;
+          }
+        }
+      },
       resetCamera(){
-
+        this.selectLesson3dControl.object.position.x = 40;
+        this.selectLesson3dControl.object.position.y = 80;
+        this.selectLesson3dControl.object.position.z = 0;
+        this.selectLesson3dControl.target = new THREE.Vector3(0,0,0);
       },
       recordCamera(){
+        let newPos = {
+          x:this.selectLesson3dControl.object.position.x,
+          y:this.selectLesson3dControl.object.position.y,
+          z:this.selectLesson3dControl.object.position.z,
+        };
+        this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].cameraPosition = newPos;
 
+        let newTarget = {
+          x:this.selectLesson3dControl.target.x,
+          y:this.selectLesson3dControl.target.y,
+          z:this.selectLesson3dControl.target.z,
+        };
+        this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].cameraTarget = newTarget;
       },
       lesson3dUpdatePicurl(picAsset){
         if(this.selectType == "explainpane"){
@@ -350,9 +460,10 @@
 
   .addmodeleventdiv{
     width:98%;
-    height:50px;
+    height:64px;
     margin: 1%;
     border:solid 2px #000;
+    background-repeat: no-repeat;
   }
 
 </style>
diff --git a/src/views/jlmap3d/lesson3dedit/tools/jobpane.vue b/src/views/jlmap3d/lesson3dedit/tools/jobpane.vue
index 11c0375e3..cb0ee8957 100644
--- a/src/views/jlmap3d/lesson3dedit/tools/jobpane.vue
+++ b/src/views/jlmap3d/lesson3dedit/tools/jobpane.vue
@@ -13,8 +13,12 @@
       <div class="eltabpaneover" >
         <el-tabs >
           <el-tab-pane v-for="(item,index) in selectedJob.controlList" label-width="33%" :key="item.name" :label="item.name" >
-            <div class="addjobdivs" v-for="(itemin,indexin) in selectedJob.controlList[index].data" @click="selsectJobTool(itemin)">{{itemin.text}}</div>
-            <div class="addjobdiv" @click="addjob(index)">添加</div>
+            <div class="addjobdivs" v-for="(itemin,indexin) in selectedJob.controlList[index].data" @click="selsectJobTool(itemin,selectedJob.controlList[index])">
+                {{itemin.text}}
+            </div>
+            <div class="addjobdiv"
+              :style="{'background-image': 'url('+localstatic+'/lesson3d/addbutton.png)'}"
+              @click="addjob(index)"></div>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -39,6 +43,7 @@
     },
     data() {
       return {
+        localstatic:JL3D_LOCAL_STATIC,
         jobList:[],
         showJobList:false,
         showJob:false,
@@ -79,17 +84,30 @@
       },
       addjob(index){
         this.selectedJob.controlList[index].data.push({
-          cname:"1",
+          cname:this.generateUUID(),
           text:"123",
+          explainRole:"角色",
           nextNode:"null",
           sceneId:this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].id,
           type:"",
         });
       },
-      selsectJobTool(selectTool){
-        lesson3dSelect('toolproperty','jobpane',selectTool);
+      selsectJobTool(selectTool,jobList){
+        lesson3dSelect('toolproperty','jobpane',selectTool,jobList);
         console.log(selectTool);
       },
+      generateUUID() {
+        var d = new Date().getTime();
+        if (window.performance && typeof window.performance.now === "function") {
+            d += performance.now(); //use high-precision timer if available
+        }
+        var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+            var r = (d + Math.random() * 16) % 16 | 0;
+            d = Math.floor(d / 16);
+            return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+        });
+        return uuid;
+      },
     },
 
   }
@@ -195,12 +213,16 @@
     border:solid 2px #000;
   }
 
+
   .addjobdiv{
     width:98%;
-    height:50px;
+    height:64px;
     margin: 1%;
     border:solid 2px #000;
+    background-repeat: no-repeat;
   }
 
 
+
+
 </style>
diff --git a/src/views/jlmap3d/lesson3dedit/tools/toolbar.vue b/src/views/jlmap3d/lesson3dedit/tools/toolbar.vue
index 0ca06a3d0..9ea25ca9d 100644
--- a/src/views/jlmap3d/lesson3dedit/tools/toolbar.vue
+++ b/src/views/jlmap3d/lesson3dedit/tools/toolbar.vue
@@ -135,7 +135,7 @@
     bottom:0;
     border-radius:10px;
     border:solid 2px #000;
-    background-color: #fff;
+    // background-color: #fff;
     z-index:1;
   }
 
diff --git a/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue b/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue
index 8d60af054..aa1c5dce7 100644
--- a/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue
+++ b/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue
@@ -5,29 +5,29 @@
     <div class="lesson3dplayer">
       <Step-Tips
         :lessonData='lessonData'
-        :lessonEditIndex='lessonEditIndex'
-        v-show="lessonTools[0].isShow && lessonData.lessonData.lessonProgress[lessonEditIndex].progressScene == 'standstation'">
+        :lessonPlayIndex='lessonPlayIndex'
+        v-show="lessonTools[0].isShow && lessonData.lessonData.lessonProgress[lessonPlayIndex].progressScene == 'standstation'">
       </Step-Tips>
 
       <Process-Log
-        v-show="lessonTools[1].isShow && lessonData.lessonData.lessonProgress[lessonEditIndex].progressScene == 'standstation'">
+        v-show="lessonTools[1].isShow && lessonData.lessonData.lessonProgress[lessonPlayIndex].progressScene == 'standstation'">
       </Process-Log>
 
       <Explain-Pane
         :lessonData='lessonData'
-        :lessonEditIndex='lessonEditIndex'
-        v-show="lessonTools[2].isShow && lessonData.lessonData.lessonProgress[lessonEditIndex].progressScene == 'standstation'">
+        :lessonPlayIndex='lessonPlayIndex'
+        v-show="lessonTools[2].isShow && lessonData.lessonData.lessonProgress[lessonPlayIndex].progressScene == 'standstation'">
       </Explain-Pane>
 
       <Job-Pane
         :jobPaneData='jobPaneData'
         :lessonData='lessonData'
-        :lessonEditIndex='lessonEditIndex'
+        :lessonPlayIndex='lessonPlayIndex'
         ref="jobpane"
-        v-show="lessonTools[3].isShow && lessonData.lessonData.lessonProgress[lessonEditIndex].progressScene == 'standstation'">
+        v-show="lessonTools[3].isShow && lessonData.lessonData.lessonProgress[lessonPlayIndex].progressScene == 'standstation'">
       </Job-Pane>
 
-      <Tool-Bar v-show="lessonTools[4].isShow && lessonData.lessonData.lessonProgress[lessonEditIndex].progressScene == 'standstation'"></Tool-Bar>
+      <Tool-Bar v-show="lessonTools[4].isShow && lessonData.lessonData.lessonProgress[lessonPlayIndex].progressScene == 'standstation'"></Tool-Bar>
 
       <div id="lesson3ddraw" class="lesson3ddraw">
       </div>
@@ -50,10 +50,10 @@
   import ToolBar from '@/views/jlmap3d/lesson3dplayer/tools/toolbar';
 
 
-  import { Lesson3dEditor } from '@/jlmap3d/lesson3dedit/lesson3deditor.js';
+  import { Lesson3dPlayer } from '@/jlmap3d/lesson3d/lesson3dplayer.js';
 
-  import { LessonData } from '@/jlmap3d/lesson3dedit/model/lessondata.js';
-  import { JobPaneData } from '@/jlmap3d/lesson3dedit/toolsmodel/jobpanedata.js';
+  import { LessonData } from '@/jlmap3d/lesson3d/model/lessondata.js';
+  import { JobPaneData } from '@/jlmap3d/lesson3d/toolsmodel/jobpanedata.js';
 
   import { getLesson3dData,updateLesson3dData } from '@/api/jmap/lesson3d';
   export default {
@@ -85,7 +85,7 @@
           }
         },
         jobPaneData:{},
-        lessonEditIndex:0,
+        lessonPlayIndex:0,
         lessonTools:[
           {
             name:"步骤组件",
@@ -118,7 +118,8 @@
     },
     mounted() {
       window.updateTriggerList = this.updateTriggerList;
-
+      window.jumpEvent = this.jumpEvent;
+      window.actionEvent = this.actionEvent;
       this.init(this.$route.query.lessonId);
     },
     beforeDestroy() {
@@ -138,7 +139,6 @@
           let loadData;
           if(data.data.data){
             loadData = JSON.parse(data.data.data);
-            console.log(loadData);
 
             this.jobPaneData.dataList = loadData.toolJobPane;
             this.$refs.jobpane.initJobList(this.jobPaneData.dataList);
@@ -151,7 +151,7 @@
           }
           console.log("loaddata----------------");
           console.log(loadData);
-          this.jl3d = new Lesson3dEditor(dom,loadData);
+          this.jl3d = new Lesson3dPlayer(dom,loadData,this.lessonPlayIndex);
         }).catch(() => {
         });
       },
@@ -173,7 +173,19 @@
         });
       },
 
-
+      jumpEvent(type,action){
+        if(type == "action"){
+          this.lessonPlayIndex = action.jumpNode;
+        }
+        if(type == "tools"){
+          this.lessonPlayIndex = action.nextNode;
+        }
+      },
+      actionEvent(type,action,mesh){
+        if(type == "remove"){
+          this.jl3d.actionRemove(mesh);
+        }
+      },
       updateTriggerList(newTriggerList){
         this.triggerList = newTriggerList;
         console.log(this.triggerList);
diff --git a/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue b/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue
index e24bb0413..16a517781 100644
--- a/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue
+++ b/src/views/jlmap3d/lesson3dplayer/tools/explainpane.vue
@@ -1,13 +1,16 @@
 <template>
-  <div class="explainpanediv" v-if="lessonData.lessonData.lessonProgress[lessonEditIndex]" @click="selectTool">
+  <div class="explainpanediv"
+    v-if="lessonData.lessonData.lessonProgress[lessonPlayIndex]"
+    @click="selectTool"
+    :style="{'background-image': 'url('+lessonbg+')'}">
     <div class="explainpanetittle" >
-      {{lessonData.lessonData.lessonProgress[lessonEditIndex].explainPane.tittle}}
+      {{lessonData.lessonData.lessonProgress[lessonPlayIndex].explainPane.tittle}}
     </div>
-    <div class="explainpanepic" :style="{'background-image': 'url('+localStatic+lessonData.lessonData.lessonProgress[lessonEditIndex].explainPane.picurl+')'}" >
+    <div class="explainpanepic" :style="{'background-image': 'url('+localStatic+lessonData.lessonData.lessonProgress[lessonPlayIndex].explainPane.picurl+')'}" >
 
     </div>
     <div class="explainpanetext" >
-      {{lessonData.lessonData.lessonProgress[lessonEditIndex].explainPane.text}}
+      {{lessonData.lessonData.lessonProgress[lessonPlayIndex].explainPane.text}}
     </div>
   </div>
 </template>
@@ -19,13 +22,14 @@
 
   export default {
     name: 'ExplainPane',
-    props:['lessonData','lessonEditIndex'],
+    props:['lessonData','lessonPlayIndex'],
     components: {
 
     },
     data() {
       return {
         localStatic:BASE_ASSET_API,
+        lessonbg:JL3D_LOCAL_STATIC+"/lesson3d/lessonbg.png",
       }
     },
     computed: {
@@ -60,7 +64,7 @@
     top:0;
     border-radius:10px;
     border:solid 2px #000;
-    background-color: #fff;
+    color:#fff;
     z-index:1;
   }
   .explainpanetittle{
@@ -70,12 +74,18 @@
   }
 
   .explainpanepic{
+    position:relative;
+    width:90%;
+    left:5%;
     height:65%;
     border:solid 2px #000;
     background-size: 100%;
   }
 
   .explainpanetext{
+    position:relative;
+    left:5%;
+    width:90%;
     font-size: 14px;
     // height:20%;
   }
diff --git a/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue b/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue
index 11c0375e3..a06bf00a2 100644
--- a/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue
+++ b/src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue
@@ -1,20 +1,36 @@
 <template>
 
   <div class="jobpanediv">
-    <div class="jobshowbutton" @click="openList">岗位联络</div>
-    <div class="joblistdiv" v-show="showJobList">
-      <div class="jobdiv" v-for="(jobitem,index) in jobList" @click="selectJob(jobitem)" >{{jobitem.name}}</div>
+    <div class="jobshowbutton" @click="openList"
+    :style="{'background-image': 'url('+lessonbg+')'}">
+      <div class="jobshowbuttonpic" :style="{'background-image': 'url('+lkgwbg+')'}">
+
+      </div>
     </div>
-    <div class="jobtab" v-if="selectedJob">
+
+    <div class="joblistdiv" v-show="showJobList"
+    :style="{'background-image': 'url('+lessonbg+')'}">
+      <div class="jobdiv"  v-for="(jobitem,index) in jobList" @click="selectJob(jobitem)" >
+        <img :src="jobpic" />
+        <div class="jobdivtext" >{{jobitem.name}}</div>
+
+      </div>
+    </div>
+    <div class="jobtab" v-if="selectedJob"
+    :style="{'background-image': 'url('+lessonbg+')'}">
       <div class="jobtabmsg" >
-        <div class="jobtabmsgdiv" >{{selectedJob.name}}</div>
+        <div class="jobtabmsgdiv" >
+          <img :src="jobpic" />
+          <div class="jobdivtext" >{{selectedJob.name}}</div>
+        </div>
         <div class="jobtabmsgtext" >{{selectedJob.text}}</div>
       </div>
       <div class="eltabpaneover" >
         <el-tabs >
-          <el-tab-pane v-for="(item,index) in selectedJob.controlList" label-width="33%" :key="item.name" :label="item.name" >
+          <el-tab-pane v-for="(item,index) in selectedJob.controlList"
+            style="color:#fff"label-width="33%" :key="item.name" :label="item.name" >
             <div class="addjobdivs" v-for="(itemin,indexin) in selectedJob.controlList[index].data" @click="selsectJobTool(itemin)">{{itemin.text}}</div>
-            <div class="addjobdiv" @click="addjob(index)">添加</div>
+
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -32,13 +48,16 @@
   //岗位
   export default {
     name: 'JobPane',
-    props:['jobPaneData','lessonData','lessonEditIndex'],
+    props:['jobPaneData','lessonData','lessonPlayIndex'],
 
     components: {
 
     },
     data() {
       return {
+        lessonbg:JL3D_LOCAL_STATIC+"/lesson3d/lessonbg.png",
+        lkgwbg:JL3D_LOCAL_STATIC+"/lesson3d/lkgw.png",
+        jobpic:JL3D_LOCAL_STATIC+"/lesson3d/jobpic.png",
         jobList:[],
         showJobList:false,
         showJob:false,
@@ -70,25 +89,20 @@
       },
       initJobList(data){
         this.jobList = data;
-        console.log(data);
       },
       selectJob(item){
         console.log(item);
         this.selectedJob = item;
+      },
 
-      },
-      addjob(index){
-        this.selectedJob.controlList[index].data.push({
-          cname:"1",
-          text:"123",
-          nextNode:"null",
-          sceneId:this.lessonData.lessonData.lessonProgress[this.lessonEditIndex].id,
-          type:"",
-        });
-      },
       selsectJobTool(selectTool){
-        lesson3dSelect('toolproperty','jobpane',selectTool);
         console.log(selectTool);
+        console.log(this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex]);
+        let nowProgress = this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex];
+        if(selectTool.sceneId == nowProgress.id){
+          jumpEvent("tools",selectTool);
+        }
+        // console.log(this.lessonData.lessonProgress[this.lessonPlayIndex]);
       },
     },
 
@@ -105,10 +119,18 @@
     right:0;
     top:0;
     // border:solid 2px #000;
-
+    text-align: center;
     z-index:1;
   }
 
+  .jobshowbuttonpic{
+    width: 100%;
+    height: 100%;
+    background-size: 100%;
+    background-size: cover;
+    background-repeat: no-repeat;
+  }
+
   .jobshowbutton{
     position: absolute;
     width:100px;
@@ -116,9 +138,12 @@
     right:0;
     top:0;
     border:solid 2px #000;
-    background-color: #fff;
+    // background-color: #fff;
+    color:#fff;
+  }
+  .el-tabs__item{
+    color:'#fff'
   }
-
   .joblistdiv{
     position: absolute;
     width:100px;
@@ -128,16 +153,22 @@
     border:solid 2px #000;
     overflow-y: auto;
     overflow-x: hidden;
-    background-color: #fff;
+    color:#fff;
   }
 
   .jobdiv{
     width:75px;
-    height:75px;
+    height:90px;
     margin-top: 5px;
     margin-left: 2px;
     border:solid 2px #000;
-    background-color: #fff;
+    color:#fff;
+  }
+  .jobdivtext{
+    // position: absolute;
+    bottom: 0;
+    font-size: 13px;
+    text-align: center;
   }
 
 
@@ -148,7 +179,7 @@
     top:50px;
     width: 300px;
     height:450px;
-    background-color: #fff;
+    color:#fff;
   }
 
   .eltabpaneover{
@@ -167,21 +198,21 @@
 
   .jobtabmsgdiv{
     width:80px;
-    height:80px;
+    height:90px;
     position:absolute;
     top:10px;
     left:5px;
     border:solid 2px #000;
-    background-color: #fff;
+    color:#fff;
   }
 
   .jobtabmsgtext{
     width:200px;
-    height:80px;
+    height:90px;
     // margin-top: 5px;
     // margin-left: 2px;
     border:solid 2px #000;
-    background-color: #fff;
+    color:#fff;
     position: absolute;
     font-size: 12px;
     right:10px;
diff --git a/src/views/jlmap3d/lesson3dplayer/tools/processlog.vue b/src/views/jlmap3d/lesson3dplayer/tools/processlog.vue
index 9398a7b21..149b96933 100644
--- a/src/views/jlmap3d/lesson3dplayer/tools/processlog.vue
+++ b/src/views/jlmap3d/lesson3dplayer/tools/processlog.vue
@@ -68,7 +68,9 @@
     bottom:0;
     // border-radius:10px;
     border:solid 2px #000;
-    background-color: #fff;
+    background-color: #000080;
+    opacity: 0.6;
+    color:#fff;
     z-index:1;
   }
   .processtext{
diff --git a/src/views/jlmap3d/lesson3dplayer/tools/stepstips.vue b/src/views/jlmap3d/lesson3dplayer/tools/stepstips.vue
index cbdf43c93..801d057ab 100644
--- a/src/views/jlmap3d/lesson3dplayer/tools/stepstips.vue
+++ b/src/views/jlmap3d/lesson3dplayer/tools/stepstips.vue
@@ -1,10 +1,13 @@
 <template>
-  <div class="stepstipsdiv" v-if="lessonData.lessonData.lessonProgress[lessonEditIndex]" @click="selectTool">
+  <div class="stepstipsdiv"
+    v-if="lessonData.lessonData.lessonProgress[lessonPlayIndex]"
+    @click="selectTool"
+    :style="{'background-image': 'url('+lessonbg+')'}">
     <div class="stepstipstittle" >
-      {{lessonData.lessonData.lessonProgress[lessonEditIndex].stepTipsData.tittle}}
+      {{lessonData.lessonData.lessonProgress[lessonPlayIndex].stepTipsData.tittle}}
     </div>
     <div class="stepstipstext" >
-      {{lessonData.lessonData.lessonProgress[lessonEditIndex].stepTipsData.text}}
+      {{lessonData.lessonData.lessonProgress[lessonPlayIndex].stepTipsData.text}}
     </div>
   </div>
 </template>
@@ -15,13 +18,13 @@
   //步骤提示
   export default {
     name: 'StepTips',
-    props:['lessonData','lessonEditIndex'],
+    props:['lessonData','lessonPlayIndex'],
     components: {
 
     },
     data() {
       return {
-
+        lessonbg:JL3D_LOCAL_STATIC+"/lesson3d/lessonbg.png",
       }
     },
     computed: {
@@ -60,7 +63,9 @@
     top:0;
     border-radius:10px;
     border:solid 2px #000;
-    background-color: #fff;
+    // background-color: #223458;
+    // opacity: 0.6;
+    color:#fff;
     z-index:1;
   }
   .stepstipstittle{
diff --git a/src/views/jlmap3d/lesson3dplayer/tools/toolbar.vue b/src/views/jlmap3d/lesson3dplayer/tools/toolbar.vue
index 0ca06a3d0..72f804dbd 100644
--- a/src/views/jlmap3d/lesson3dplayer/tools/toolbar.vue
+++ b/src/views/jlmap3d/lesson3dplayer/tools/toolbar.vue
@@ -1,17 +1,32 @@
 <template>
-  <div class="toolbardiv" >
-    <div class="toolbarbutton" @click="openGuide"></div>
-    <div class="toolbarbutton" @click="openBag"></div>
-    <div class="toolbarbutton" ></div>
+  <div class="toolbardiv" :style="{'background-image': 'url('+lessonbg+')'}">
 
-    <div class="toolbarguides" v-show="showGuide">
+    <div class="toolbarbutton"
+      :style="{'background-image': 'url('+localstatic+'/lesson3d/guide.png)'}"
+      @click="openGuide">
+    </div>
+
+    <div class="toolbarbutton"
+      :style="{'background-image': 'url('+localstatic+'/lesson3d/bag.png)'}"
+      @click="openBag">
+    </div>
+
+    <div class="toolbarbutton"
+      :style="{'background-image': 'url('+localstatic+'/lesson3d/back.png)'}">
+    </div>
+
+    <div class="toolbarguides"
+      :style="{'background-image': 'url('+lessonbg+')'}"
+      v-show="showGuide">
       <div class="toolbarguide" v-for="(guide,index) in guideList">
         {{guide.name}}
       </div>
     </div>
 
 
-    <div class="toolbarbag" v-show="showBag">
+    <div class="toolbarbag"
+      :style="{'background-image': 'url('+lessonbg+')'}"
+      v-show="showBag">
       <div class="toolbarplaid"  v-for="(tool,index) in toolsList"></div>
     </div>
   </div>
@@ -28,6 +43,8 @@
     },
     data() {
       return {
+        localstatic:JL3D_LOCAL_STATIC,
+        lessonbg:JL3D_LOCAL_STATIC+"/lesson3d/lessonbg.png",
         tipsTittle:"步骤一",
         tipsText:"步骤一",
         guideList:[],
@@ -135,7 +152,6 @@
     bottom:0;
     border-radius:10px;
     border:solid 2px #000;
-    background-color: #fff;
     z-index:1;
   }
 
@@ -146,6 +162,7 @@
     border-radius:10px;
     border:solid 2px #000;
     margin: 2px;
+    background-repeat: no-repeat;
   }
 
   .toolbarguides{
@@ -157,14 +174,18 @@
     overflow-y: auto;
     overflow-x: hidden;
     border-radius:10px;
+    color: #fff;
     border:solid 2px #000;
+    text-align: center;
   }
 
   .toolbarguide{
+    margin-top: 5px;
     width: 90px;
     height: 30px;
     border-radius:10px;
     border:solid 2px #000;
+    font-size: 20px;
     margin: 5px;
   }
 
diff --git a/static/lesson3d/addbutton.png b/static/lesson3d/addbutton.png
new file mode 100644
index 0000000000000000000000000000000000000000..0373c96f0f5ae336ddad3fd9b761ccba2c5fc0a8
GIT binary patch
literal 3530
zcmd5<U1%Id9KW<$wI6D!lu|^N?Sn0KZfEv;mt6C4*EWG(8j?s;DcISW+1!%5-R<rs
zxdgG%7Zp+QMQrIq1wrva5c^~)1(kwSr9P;jA{N27>Psn7X?6BKHkXhzvG&1*yWO4n
z&HrnD|NnpXmEoa-TQ=_8n9Jq13=Wh=_`Ns%J-C7Yf8d??ncp4?2ad+M+@@{muPb-@
z%#K`c^K;(Vcrso-WRswl$24$QzFrGCI+yG2sfU<MvP5v$gy$E;Kh9qi1&<cQBU%}j
z!y>DA19K4@of{e>bCblPV$VLIyKZv<HI`tZUaR`CT`!0Yxi)`Jhb2*HK$6LV*q164
z#>>M(F^HI;=OG{v%7S6#k*=zy`II0-8A{NQ5CpPpL*3RCp>>H|TSQ%Zq;#OAi@z1b
zN|J=OB+bms<Y$z85KTzPvMdS8k}Ly`0P(D!;5zW*U2O>^7L&*e6EE<ER3dhQsiYus
zOPem#!c43mx5C5&Ce?8$p*&1oY5*z8aN$%`Z78QiVpUdSeiCym%CJ02<#GmJR&1@7
zq2px#G`Fbb+p_3*Y&K-l2#bTMh_L<BT;r~`VR16T7DBUz<s6<Z4l6+t#Fb!$AY{{v
zLXmjx3JTMiMNn4vR)D5688ozu5yMFkjRirq&7I-4Z9=igxq>WV_Yu#h!A!g-^}V%*
zm2koeV#*}|HBO{41Z_pL6=N?nZ3vstGG`~n3C_R>K(ztZY>jhISp*KK=gzJQrNnlF
zsD}C8c{M!2q|l#eXe*cPK|fBgPuO6oAaYalo=3S+CV?77Kt`$zsG(W_Gv)#vL&vos
zg|bT9>q`NdN_my8Z>AUx2$zv<h^-l#<wB|f$FUe-uBriy3>l~f*P$5{F_*Qa9gaMn
z<+$1@HMNRziHI34#f}0TS>slzDgjuwTmTgrxw?WaSyn}1L2ogr22nYnJmyO0_+YU(
z90jgd<rDG9!G2+Ie^E!4t^+xbL?LB{&F$bm;WQTuVta5rrFC_xIcUg`U%VpltF`Fp
zD)S4|Px~I<3t1FWZrKe(M|qj!260`Dv0<;ys^cY(hc<2+A)B33N0&^cH80I&d%%l1
zJ7-%}X_TF4JykuSk-j!2O$SKIW5)NfIqWUNgSADxxqha?c&P3`?j|e_+++qvtZ#zH
zcP;rNtz>_Ur|)dNB|9!sGzI7kxxj=e?}$MFB^ar$O9-Ky7b{thY^d2PY-ihDTHg{+
zD%hW3ylF||-TR}srlq-x4iv?qfWegiF5#H~4b@<TB8alx%yy%rdLU#Y{a^Vb%Xuj5
zPWKd=$jsOBT!q|fhNgr}TX0R;RTah1(H^0*=rzN&7Pm>@PqV0lh#`(JZ_zA@3!)nZ
zH35fV)gz5ul%{>!>U>$A3rQd>RJ9euOIhS~5T;X0W`b}J^{q-zsv?XjLVzM-0A{Kf
zShC^*jZh03ilyp0FAz)U`M=-JRoz}&Z&}&xMLlp$S$U6HETw0&W?hw*mfYrhsY$g1
zDR~=b9(%dsy4G~&haj7`)K!|SY$Ag|#RQBh2xyGAY?C4i90q06bRgDr-ejBB1pl?k
zrb(9NpWW`&ef$)W_MW&^vHS5vR=fALn>aL0&4r8si#iyXSXFrwcT510qZukQO~&Nz
zMu@8(U)^|W3X<-uv4QM3Lbn(5b9wrheGu@M?304|yd+2bgW=`dO8Sj*eX!IwRzGv?
z?Y@nl!bfu-JGcM-rT6<+pLneAv+W0dIyLFZo4w1r94Ei^Z@RK$e*0OJ1HB~o%>1R?
zx!h}Am9CxZudGwAtv|NcIQaRELj3iy$qN_WI`u60^OJzR8=PFXxp(<>r{6y`vh~gL
z+pfNMYx=v(UvAy{tNHq^kFF1Sk3T<f=8NCwzP<Hh&$<m~@2~vu!0wCpoxHkt_??}{
z|5D~I9scIY7o7PUZ_Kxqr=U(Pqc`{5eB@kD*V6H})n9EX9Mh+EJp593`n5H<f2j0f
I|M3_90h3H(dH?_b

literal 0
HcmV?d00001

diff --git a/static/lesson3d/back.png b/static/lesson3d/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..3eb9afd5b38142ef029d98701b26bfd2d2cbda38
GIT binary patch
literal 4609
zcmd5=Yg7~07ET~4sHhcNM6Ha$3O**8N1h`=lz<>c5wT*6mdQLIl4L>>NEE9eQbiDz
z`a;nbTeVe-UDYbBR#97OZ?#@^wL(SZ`UDFtTD?AM<(>%;&?S}Cdw<-?N-}fycfP&P
zKHu5rBzdt@Ci?Uo)Kef3_(Vr(<G^<q|Muz*K6e_@E`cv^OVlizK+wyVe+va0O9l!A
zy-7oSf;~YunV>k6grqq=BXOE604)%NjB{E@DwVNAdM4Rm)`)*Qcti{tXpMNLT!-i^
z;Y^AlYQB}3K7UF)H9wV7)8cWVP>7QN1SZB#LQa#>Y$Kc+v5S`g_k6Qd47nioRE>B%
z?+{AR#X{knm4Orz1f~!KgOq9ss*uT4sxc6TV2Bh^N>K#HFal8!avW;C#K4=CW{Eg$
zWUDXmq!Fjs?G{2RbvPUn2QJ~P$x>9UR!b2~ieWH7z_xj2JL!bYw!k(9En}ms28-Rm
znIWE$)N|=}jTl7QG6a*wO>4HbrU@iW>Le{vRD$qBasg?|jkBa%jV|XjC1s3^i80%4
z0E@b@AWJ%(8~$8clgW*?*&{MQM6F|cF4`79&%#LK7#o*vrI?5e;4!c*Fq=J&X-`cT
zx&yeovn7SIbG8(&lO(v!Po=_cU^{WhTb_b4PD3Y9-r|N@h;S=I+Bs`H#~ItS6WbOW
z6dn$=f~uk5nFce>Icy{OvA6bNw4|NUh<Po+h#Uwh9z_UTPT<PXh>Adv7N`!WlP2w?
z8;rt;%mtPcC`zD;r@$O-VCTIMN>c>OSxqFEJA;W#W~3H#vdf!JM?{-#cG65S(OQid
zgeox@Xo8lZBuS$vOrw+%W>hi~R%18|%PCroC~>t+p}^YuYdI>N*A?HtWr@)o1vuOj
zLf|qzEh8xftjB@wm9$I`tMs%QrYN<7QtEN=qT1M|S`A>8lg5s$d{i`GL>VPZlX@K1
zV{#0pWikpTF*OS#IEJzcoK$0&OboUA4d;xURmagF=Xl5V=<x7ZE5{m)z+j7;I01@|
z2v?wLg#yMTs2JjvL4Y{Gm`HvtYQ$}g3B0V0=`D>)3;`FY2;ge%H0uTScJmCg0n7!+
zA+IgM73g$O=0HHem#Zz-;AD&mS_4R}ttALd)zLKT853Xg__a(#8EinE^IEIYbSAC!
z&S-#K%a<UjmH|+_ju~3q+H81^4!V}{7FtIN15))D;%<T2IM(hUt<3mjkl(JXA8BXt
z+sKT+j$V!FSrnJ!u!2EZScS;sFi9yXn5IZn#<CPe(LfiSMUN7QoRA@HtL<+_-%3xV
zkmh6tY+6$B-yaXos?>58SHL)~r(p)+_0LjZB_K+flA&l6LEW?Io{i3`N0-KfVG;xi
z=I0bqp(=?<0$gCNo1sdIstAZxVXO?tl?rqu)UoKb(066n6lcz0tQ~}CA+03Xq8Y1A
zBWA6f2_h{Pqk(d*MQMhaZr%CZ>m0IkP<vJDG`%!qHFOY6M=$OWp#P!27s|71MfMqa
z{y$Bpls}}j6d38VwWsA-+miE0eimJuKk>XO(^XxA(*ObXmKW?cm<m-=2(E$|8b@I{
zBU8gF8l_=9gJ3F^9wFrlhF|qO8~5MtHoV&0LL}lDr+qRx4=A^_W=$ZI+pAYQ&V`u*
zM6MBE-*X6@BkPv!?6^U>>^xaVdk0}Zm#HqN05DxI$nAuw-Toq``m8*_RA2f<Crs`3
z7ctcxS;NP)X-g+e?RK8YrKgsZN!y3`R8n1#4(H^yUf}S}-?~rz;KBX7fiZ)+YX!dw
za#c%G1%hso(c1Cx&XUGWr}BqH46IzVC-0?`etRpSQOou&?h(;9b-<B6M`t&U7^?6)
znsY+3SlEr!T<cqvn|K#0U##`&?|2QZ^<#6qU((Q5$4@(2H*`33dsVb7a#qd4ka)*_
z{DS7<jEnfyvOmI5eD(}(hUU+OGtyT^UuiD*<&h?PA+<Sc5Ys67x93})oN&dLqL{5G
z;=^^-bMFW*WKk74AE)lPu&_s9@dw4}#&aKs_DxTzP$U(u&A-^K=FObPWm`uH$7WAW
z%RhB&?eaSZ3rC5J!a|R}$ulO+_e=N)IucYhu!`%^G^{E1^=%(|vWlV2ca<l5ua=)U
zp<U)XL=fuvj`fybcA)Cs<$j@`Gf{7NNH$hat#DK*!*+e5TjhKAwWP6@lE>fN_gJ4D
zkbS&jY=ye+RpIY<9k(0HMGc;p*4elDk(M)=OMcalZ6c6fHLr*(W_l`wK__lMe!Egy
zo_Ouh)E)hT%3prq<qX;JB%s!_cIvG>fnZbG>YJg&j;e8jse&Wx)|FhV-oh;X@buah
z!OOSiOdBw3Kt$=CJtL<Lcq!t{ilU6@pM&Zb{7_Y7KRGdDZJw#<Zp6~O1#!5rKJ`Ep
zAvTOmZt%+-FDU9hd~;pcv6$In=nLT=wn|NqA;!OY#(fXJtf1`a>U+h-dR>BO&e6t*
zpVLM+8U2T)H*{~VTy4QV_|@)nC;wBwo0fA(ZGGHVzr>y?uNhwd>AFVi>u2AQYz&K=
zd^Wo`o-iu#V43G?(Wc=SeUjMAo-yfOx*Ju)&J7lZve$2vA-&J*!ivA^{(VE151Zk=
zUi#rQRo*`vEvKi2)%9;0JK8(=>z%5XB_Hd?-`GFOD>%<IZ1Yb&g$|)|i9K<&sNhP*
z&PyL%^!};-&zP;kkmHk9F4{l&=I8GVGqW?XvLkP8w>8cSTX}oHuMMTIuFsyB#pR23
zvp&wDstwZ}Yx?Ie{c(qIaN5$(s0y3f^hQPFngyd?z9RA|4=8{4QQ@KGl^1%~2t$@n
zZ~R1UYOaV_a(3ml30_YB`vVWn+)1qoB#uSoT%B`FqpM|WmGAY@9E*sSMiDeSr?l$4
zcj%4k!+xr64c#yGs&CjOJb$&M;C|UI*6TrkmFSRAJF~AUL|&1fRo-aEGktCvGOvr8
zkC_~&uM92NB09W$&+N@_p7&13PdJqq3nv7<f7!QA`IC3uebJ*8=^niLKe)>VZ%&Mw
zyJ6O@aNC}Y^y5JXMsD^h_AlC4?ze4FMON|W!+pNh4N5aqGQm%V$o9VPH{vyUR&?T{
z*;*QVBC}K`ud+(}k2%n+Uid)uO7joLbIXVPp6HmrJF>^ac>^T}M|3+JfDB$#xPNwl
zuzT7@l2r&olGwmf(Z1r-N#jQ@IzQb@-LJUvt5+|D*8Vv5BKvx}X~P>8y+>ajXZFYp
zR;-@9W(2hVTmPD4gDa4xxjVme-pcgd05z4-rKc|M3w&_eKXk;ZG4nkf!PSL%<tMk5
zonrRwTAo|=_3l0ow|OtqJRDl$E!cPEBf%8-rp2*v3$u9p!<EOs@3EoUIQLAg%%f(u
z|N4Ddz1|e;E&bOX@E-|Rd3p4a1Br6q$>O8MRTC4#r}Wr#FLF#k$=<<*G1rIh`p5Az
zbpP7N$3qIUUXjEX3h|=Ile<5|3&Qngt+%GS=P>9C-|+HpMocTs``z;@yT9M2NoTiX
zadY2W3fY=;xj|`LLRTzVGAwD-;dT9r`XLOvR}}W-K!)hOy4ux>!tG~Ic}KrnbR%Z_
zj#F2P=^s8R_6k0e5h>9H+>6eATb?u^Wn*>xmy$V2pZR}x>%xi!kYDJey$i=&`px_9
c;AW2#%g$A&{MM(O|C1&<Vv4qGLek>@0AxCfaR2}S

literal 0
HcmV?d00001

diff --git a/static/lesson3d/bag.png b/static/lesson3d/bag.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e9a4b1b39c8db852df5f2dfc10687b70d477487
GIT binary patch
literal 4547
zcmd5=dsq`!7N3A3r6Qmxh!*1@Eodj1nY>3q9-)G3s0s+8R)%>%gk)k8AfPCq6>PC<
zi?&svD)j{@YQ_4%M{F&!eqFV-_Tf^EqShzSUD5j9I{^ZArTTUEkDc!enVIvuzkANP
zzjN*lODD%paCh@_gCNK~CR#lee24KLR~PWNT08d~_<G3@J>3LBFAw5B0%&!)F9h``
zwed;jB+Vp(;&dXC=297vMP~qL2pTuuVj!su#w<)_(zN;zxV8Q;EY#8=aH33uY7CJ~
zx;8q`$i(Hv##4D2l!}JOhYH782tc4?%%sqw%ha0)O9*V|CBQxZS_}*A5OYQd9L`TD
zOwvpiMsh|*C>Nm!g`&7np%P(osZ^<aU5KMNDn=Dz3`KC9K;?u?BJ8|iFq@HPiK*&0
zI_CmUA#l3cY#_wqoSYm{jzq*6)5Mrcr4pmK7{?KSKuo!MGigEerhqO6HDjWTT7y~3
z>4iKanaX9ELtx-(M+iEDgH~_qOcO|$*g_h_m<Z)VvIA+#fiq+oGwqYpl$gn6bd26?
z0$9v}1zFN)9Pnq->U0jY$sCmpJnD??nP^jdu7MFxWlUU_kz%5<!HfZ2j+x9;neNoQ
zz;FO}3^t^5X3mt(^^ydK`KeTxwQMgF@|LHdj78fEl(#sb1|rhPkY>&p&vBVu+L_$t
zn=mpGXa!RVgA%oRn#(Z-^Rai1Vbr9V34wVnA*c)pDIP-!iHwja#-K_9MLVDxpiY`J
zlMXP3pi(<nMqn5rlRgFJXf2!jTqsQuEN9e_VC}RzGK~=%^lA3lG#VmCZ!(j5iiuH&
zz`#|JR!b8KiA;gYWelQ_DkwybN+~22$CZeT!C4Yxa9T#OUE|dpmBs6dAKy`8G)Dmr
z$AS<fhN(!DW)O^#OAt&ZRU#@zi6L?c!(uF}lrtFK#rCFA3#y#V?8(Y|MFU2RQLr?b
zDgnO8aD<iuuSi_QBB%t%Sh<8$;kXnQcF!BhWpYLhM}wS8dcKc|jGS!bSZyXSn5IsM
z5XMAB$}yE(j^H8;7V^p<fFB?xlCQ-Oxa(ySFYC;#j+Y7?1sCWD;OZPS{W<n-bAnzA
z)&fM$Ym2Zu8VA}Oa0tw0e>YicVKS4{T98^(hZDH6r)m1{OnlGdYnh1Fnt(cUJG)XG
zGq>|DQ!BKWFF{fr0Z_b-85-_<t$l_LUM%Asv^nVvNYx*Ry8~w8SaS|(WWv)xeqW@1
z#J%}%BD4S4dljC_ViK7I0Rm$YB`TF6Bn9+LQzRy3S&E`)po`wT#|TtLNYSop`;*>x
z(o^ZAK8*pJmKgr?@!*((!sQH&;4DV-RVe}bXBh-lkusW*Di}~%{}E4b-Q$Jg!Eq5P
z4C2=mRbon!PK2Qt-nkhn#h8*1vPztlN+b$77A)-9^g8HYBy5V)XEVkgLNt&@5^T|o
z(G&u+MouRr4TelDWv@kXww~_X`5bjFG;_l4uGVXMX~wASA()=CI9w3^59fQXJYTHI
z{!X6%Ps=Ih4=EiDM*REU)A6kC$oU)mD%v-H;#pnhMRg5M0|eMxp0nHFN>C=KM2Rr8
z1Oq#kRD~#MP%o(riYt|=C@GUOe3kHQ+<&{<@M?1ik%(t3=1F8OP;O_>iXhXvyH_{P
zj)?^#4}mXlKLE~=S4*mUZcuhRPuA1kL)gz`y1J+oFkLQvyBDTz`}3Ht6)Xiz*Vgar
zg{j;AJf^FMSMWZq`J@-7ZadFp*HcHz#N8o2l~g;V$2qxc6gYhIw~kXkcyRn~VDzBx
z8o{rEK#TMq1od@|QHRG{%5SYcpYckR_p$MD|4?s?-;+{@Rb}aR7nOK!9p5%##J4_E
zZXXHV(z<8cW5Lop34ys)SIe%g;XXLvJ$ulG<Z#b`cPh1kzaCrEciTSiy4(FO|Ay{5
zSaxvU>57V7ch999MsGI#{8MZBy_QwG((b(H<@NaFk4;}48fcrI;_d5{y|>vD?cXGr
z=@jcU0$Q8>)o8D(`leUmW9myqi!Vfa{WNt?{-!IzZGGCX9lI_*dadB2!kT24%R8$?
zsWx|;soKNe7HA6@oI$J;d02)is~hjaZA;<vvhPM(XIRG`FJI_1uW%E-{l2%d=&|j{
zq2TMbg!Y1bYj8@~yJ&HZHNfhzdPB1R4)<ZVZupI}YOM8VHzYd^@7t1aG1)^5d87}V
z<GN$8Wme(l*IQ1HI_+tjyVdpQFSfk8Y6*0AjA5~D3ACE_t2q+#R{mh+R_pY|UN+zS
zpn?%A_c+fM91d=~GWX~!6QnWJW-GK~Ois(b=o7Jx7HUYMu4HhELLUC>lwxR+b;0(~
z4N=3#SU)K;J@`g5?Q>}R&N~S;L;9ss)^kOs8HIs1kDI@2JK6N>q?i*rYne5!_NKG`
zZ@Y)~9kOT}61EjO)NkgI&~5#{wAR!X3?4P8c@z@f;_^wufcryjBhPM5@Xv1+EEv#+
zv|S~1#f6D81<H3Hx$dutI6TMcXals+ZT?V8>ws!^|NH8Kf9zcQnPk3K+C<O$5zzTZ
zPXveFtqbgv|C)8Etu=Z^1p0NmGZTE&)pqj9=_J9N2MgAI$=XEjmA-=PdF_EYH#hlg
z*>E)3fBC`Fi2=Vwtp6;idUOG)8+f~H?Bl^{v7UL?1p(G=wIb`u+6AJsmFTd_DGAUM
z_qMTyBWLPWeS!J$oYuO;)=mAkTypaBx4nGo@4lzv1P`ITm(JAR^E)u;?S+-qZp+^+
z!p(8eqFECstUqqFKzolp$bTt%RzCXuy0Dvl7AzgP1-8EWecp*GUuW2>A}?{3lTTqQ
zHFlbHu=mX^e$Juq+)5I>R`9Q#qY@O+P5tLPkMqq4iz@HeP;fb^vfAI^_2AKApSTOd
z+s3&qD&Bj>w%tlu*I57R*D$kRTH)Qo;wcXwZrV2?efjrJF~dG8TzErRJ8yIP`A<(&
zR1R}y<la6_WhIRVO1>^>{J3ONN#oX%NoUf33HQ2pwteM_^x67Mrmw+Sa}d5LdZ%&4
z166bX3ZM5c<4asz(boG(L*B1b&&v{gxDjeOtNupjwQ7pr!@bA$UC#_2T>~3Yb;0u8
z)=}FI?tclLaf%)AvCFgq7q=(2{hKS=cSry7=!@nS-@3JXS3t36T(WIdV~32)S~AMI
zxc+Vd#*RE1wEg^~t9_EthT%bTs8TI^E@@*KzVX7o^IPk#94K)waSv{oANc9kS=!Co
zkG@=yv38`pZ{oFJv^eWVREpaT_Snz6myC@){m)WwC0#nbYBb=CQol!q1UFaQUR_#0
zaL?O^N+<5Sv(b}@uV1Ds|JLompapC8k6Y(jOq3@seHgWTciiaq6SHfI^JZ1W|LEI1
zY|8a(eor<<Tk>lad%e^BsL$)?O`OXGd7uq-x4eBGEIIyG*##`^(*~$D8J7P=vti|^
zWjO&Zm)17;%9DS%AkYZsVkw1p8rPmWKK_HE8x>v`1+kaE*gR4`zH#0C5$k_!k6Kk8
zwqd2ucUJ^uubg<3S~>ejXrRoOx>BIpxr+R7*_ChlOe@90bB`?ZfDg*o{qUQIXI|L+
U`Nu*t_<ys+M8&FWBT|a~4QQ8wLjV8(

literal 0
HcmV?d00001

diff --git a/static/lesson3d/guide.png b/static/lesson3d/guide.png
new file mode 100644
index 0000000000000000000000000000000000000000..a33e5bb20b104c29c0d44c2478e4fe914bec905f
GIT binary patch
literal 4900
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
P|5yQjQxsqOgfIRNN9rf<

literal 0
HcmV?d00001

diff --git a/static/lesson3d/jobpic.png b/static/lesson3d/jobpic.png
new file mode 100644
index 0000000000000000000000000000000000000000..82461e4fdc8822d3ec1a8ed7ee9fd8015cb5a69f
GIT binary patch
literal 8072
zcmdUUc{r5&`~TSYJxfAkD8!f<GsX}hd$Kg45tUgUOqdxnlOYMA$Wr2<I208ragLBJ
zQc)y|B!mcAO0rb8z7H+ue7@H?*E!ek`uy?x&UHOA&vU=;{eIo|`~6%K=j>=BCafq7
zfk4FUY%THNui4rq$Pa!OQUm+JA0dXVI|~94ky*RAAQ!R}KxQqf3xQ2=*lk3n2j~(h
zbP}K&9KZm%ArNEJU<Q%w2e6?ez=ujRflXJ}!Jt%%32dLf1JZ$E0r*mFk1~P1M;%?r
zNBzi#6qxA_sBy3ns2~7f6QRKY{xp_RunBBkuMv2^Mn=G(>nv<P6PWp$K`6n&8EQdi
z0#K|j5>7@U^`HiZx+p9LgTv`S^^kf<1kwP3Lc;a*jF4C(eKhp@2L@VWQoN1ume${G
zflnqdUpAXzgg|gO99<4tm(KJ-pbQNS5lB6Ro*o?JfU`nqY+^8+#!~yC!4hDRnN$Xw
zN~b~BG!jYlBWx2G=;^l*0vHYsKNZth-xCF<3=vFZAW*tUL_ok=T<hE{wp9=){N0Ve
z<Yu{qFaQJ|V9}2-$$(W5Kx3=@A&v+Bh~i&}gX}+rDdeAq8Aq7@>(Nul2*4i*0Bx{9
zS5ZIxWcbqAbe1oj@l)hKjQw0*kMD<fU~T`J{YN5xFtVxMe-p*p%75qtf~kMQy0-F@
z6|8}gC7pa^EfPD+AE=_x$yAEbPiKuN08x)f0nuWJ!=m6QLktN{BpTr0B#O5l3S)@E
zQBb%wAJ??m(O7IEjSQ@511Y*xP!kG?Ly{;+6r6~o7{HNei~$^n)hEFLLvKT@H-It3
z;*dY&otRXxF^K+u_R7N2(h$27Wxi9-+`<rPU~Yx7Ft@;>cH(gQ26~p(plu4-$eYd#
zAc7d71`vG!1cT-SgZ>eL1>K*{bf8lJ6Bzo>bUO<RXC~d7>JKigdthY21c+?F61+@c
zYkdMo>cdfbE=WToG|~u#)kflskl&m&0`*b7Lw>TN;7APEPcA5=5e8$VhyD*%ut_OI
zHt}CEue(5Jy3pzVKib*(2d<!cdb&uc=9*_n915o!po>DH^uBjA4uQfMLA`N$-WW96
z0E^OsLN)hMX%sq#r3HhoVZ_L8Ej#<D6t=Gk45yF!Gj%sW^I0RW7h|1y-6}X=m{hVI
zjSVmvOfZbKh6YpfT@ox82%Yc5AL{lJ0~r1Q%NbxgQ-c982r%dC3JGiN>3`&#3Ii|%
zBoZ7#;OG0g`#-GzvFu8tg0%*{Sc9{X75L=_Fj?!aA@$IpBkT0_vhM{aE?7*gzCK$2
zJAK_Pf+ZD%{WqEQRIH1vFS-9|X)PUVBX}L%wp13I&J6iJB=-V=-|zgX(De~zL?nL;
zjztUtD6sED>R<E(35hY(N1@PgJsd_4jz(j=;Uoa(4M&j-&`2y9>5bO&{vprt1=doI
z)cXN35RLjcBNXNb#J<^P(Y@ImA`>w80Za1VM9w$$WM3l92LQJ!1Pt+aVUy{!Ab`pK
zBXkClNdyrD*2V<p&7=oFzqRLK2H*o_)1gEL!=FlChYuo%M)|%8{OsGmH$(xL)IVkT
z&t`u50R3+o{KtYK$tWxdqi+b;Hw1?y5rsj*NoX<&jwAtkC~$6)uow`2-%|O1r=b5B
zwmuQSp!Bd9I0lLG27|>=z}fDNgj4hZeQ!N|B9;Vz-S{_Q|L;-xe+b9_fZR23|FIMO
zZNL0`82@+d{bM=*-B$hoaXArdXU%Ve8S%eo_P1xtZ==I{Z5pxI;7QNuujcc=#r2vz
zcwYL46O^Gh2}?#}z~SJnX9x#pKN5~3>0{wYzz_rA(BQHjc#8Sv4gLS+1hj^*^(}TM
zmA$s{e%pfoVxQW9GhR=TKlSGf|0mL)Q~H-S)*1eE-Ul_WlfajVwcDR>FW|$^_aA@;
z?j%g`?dEi(q96n!&1Yw6?h>5!JToM<bKfsbrqe5jCnqLqw~JveUv!rdJa_g$2PxrX
z#2&P}S8iNmvXXNC0jA!J((vOrjp6fl3By^pY%v0M&iAKMVt7;i-%0Oo=Z$V}*Eyi$
zFujC-?pntgJ9EgD<2t|7)nEoUz`C$`K6IKhP&-iZs={*%EFqFKC{ll<e&<D{4@tkw
zOe;uT+=vsb;Wid$U-rRMd3^^x>N$}Omp_?AtZ->9n&0LAm~x!MH6XCM33-ohr9P9c
z0c(qoDv0%$N_L8~g=)2Zt*A5WI|+wL$M-HA>vOZD+~y<Hiw_Rh@9`2VS@PfasKM34
zxKZIs*_E=ES*h)ErS}yid-qshBejgICI~inKh?0hOn>7SgFjjq`zp6=%c=5knr6!o
zf<GIwEplI^A6KueQ;kT|=ahO^v*8T^$`V}lvR|*qnx^d0A#J;VacF#nI^K#4+b&G8
zucr;(tKW_*@8?@Ki?c;BcpviUj_GtQpYStC7x|ouZ?U>xoLXgm(ac<hkbVM6Vq~AU
zb+Iu|q6U<0BAWu0o;Fj2sm|8}ef{TR_P0cua@E#@DdTXN@*d|qrt6{Bf%<yE0j(o%
z-dnI`*SJ1+N93%sMT)9=9Uij(b;7;#=339SVBz>(0j|5I<z6#Zk`k&K5rO`-9&ryH
zv$oD?d3iKm(I7t6co9k}&yN4yEuu{Bwq>-^6?UJ>FN={<yiu_!usEe%d2D7s@5Ym8
zsl3#~{3{vw!`Gj6Dj)mO^^o^vG1qaCnnKIVLO$7TJd0aD`)-gcK6YO={!t7+D;{;U
z2<3e>uV5!t<O)X9`EBsK6AD}j9doDPoCM{}Xi8QxuNlYJ-sI}7dBQ7uzf~j0E{LPN
zuN#astZ?vb<v63ic|P7@ces`!`B$kFgWTx6%g=;UM-+<B$#O(F`y)DLT!#jD-Gw#^
z1>vVuGI^VVH4bRSJX=h~8$%}YkMwpWJcl2R@Z6Fl_v*6Ij$zUlAM6_&(v8IER+Hp{
z^Vd@yse?k??b~R(hc>oB`MD(XH{o>SI$X2lB-<p^EH88N?suae$2fNG5SKXodHa<c
z^O`HeRq3>w_UJ1jnh#G$Jh+b4ks`l;H)-JaAfo)7sH5-Yte$;uU(4z4O6*2pn|&=c
z667tV%OreF@Uz=gO`pOT`<<larSt8n+N(t=9ecD_f5k6F^iGx+g>atnW>tJlb`5&G
z`r7Qi&a()`yv%J^%rUuH>|fgN67GH7eC>!$n3~<m2SuG}zo_pOJ0mvZWSzZjCehkY
zq{!u&!nq#TRJ>SyA{h4amh%y88;WQ2y@hf@C$4OVql!;q{HMUU3jVyv;8FvjcVZ`!
zoT5;8PY9RHCRIY}-pp+%;Btyr>Tpx8WG~fSII-d4oS+a)Z&Rl>j%O9Ax3zu@usM|K
zx7X%<oGNz@@OrjNOKV~8{-J!5cZB=Maba#1X005}K6y$N_v(ODQumzrecW>+v$t&1
z)>a-id*SH|nZ|MlX%XQq>R&eWe7S^C;4!M)V(VCyv{6R#!z|Uy{?KNF2TkSZ`oWpo
z=lAR}8_9x=K55QZAF!yOZU~_Ilabs}Qkk)EFWw?qm5Qw|{E~AfuU@XVuyPlV*B0@e
z5R^GQG3Femk-w>Wd|YVz=;2MjnM>Z{mfftL5YeRw3`NNXrMvZ=y$QHQ4L&fq(Kfl+
z%kNN*d(l?tr5iP8<9A@9;-4U{Vg@WI58HcWUw4lmcl`BzUQt*?f4@1u08G@1)QyVr
zYTq^dkq~T5W3KEF7G`N`&+awUuAlk{>DYA)ax2KDn{y+RvwG~pNpirwj(ogaGv4=#
zxrZ+%7rsH%H-J_g`la0GT;~+5*B#>ZMQqcqrKQ%Cu$58r_^|nLVuaH{lXUI0RH$`<
z>GP&T3l%cLN80=QPbtR(`1=_TAI;$1(%Me&UD5F%SdPqjLKc+9NllwB;iMFch8#13
zxP*)1s9O%<ZVx9Nx)PVA#08NLJ9_W&YDtK<SG(s0g?D3!!oj4rC-;8G)D84Dzc)2t
zRt0wQKX#9NF$Q$qAniCB!q*}%$Ms>(uPNkR+2ZX_<Bz%1T25Eqa_4+7m{i$hv0FZ6
z3&iVXKGsD%x)mKIRXTM-<jKh9eQm_HWZnJ(v8O%HV$iY*_59WHQwLK`B)^6$#2V$P
zkH@PsmWAR!X9*fb5JJ58>bG&Xy!^G)llDX`?f1nA=$OFl%gXBWW2>Ca{ETXL=WyVw
zK(D1L_;3bNpBo}q+*1OTM%67oo|o4d;9UH*ibrEui~Fe?l1H;zV(R!=WQJx&T$kps
znft|>izZ%tlKWH%F@ww+PEK13kk02m8wZ^X4?D{<os-(<`Dtt+pqe$wi?7Z&3n>lS
zf$5WQ^>`|=!!$e9p4MH0Jj`6}dHQnFElA;{V=f6UIVli_3KDaYRlFr}BMYZ`W$=9C
zGGB*Kw#UQm)e_;yr$r8JEFP74%PqW>aPWM{!_~H(D@|L^eSE??WP;mJHW{0>bG|N7
z(OB@Q<5|@m3d4bKE^x(`Ti|%ZLZQ#<#~W$hjuQTl>pv4OFLI3*(#>v3QavHH_Lth?
z{p-X+?<&P&Ny<wTgq_D$>+@DL#Elbn=Z56)#m14uI``;ld~W>IbzpVG|Biznm%Ks4
zIY-}G*{U?$bi)J2Tt_==BzPxtmOJy6E_^r(b<9hlf5l4kyo!=0;`jG0Zq_}gU!NOu
ze(_awekFA8K+Y%r#oy>j8gDq6Zk+T~SEbkoxtCLru6Rpc^6qCHA@qd1v4bs-fUX+t
z0YnjD@wa^Jv3IThBl$sGNBl%*LwEvaK5enNR4Y9`mwU8ot2D-kHd3@d(;?qUr4}g{
zpIa6KRF?G7ETM9VFz>mGZ#$t+QVTZhsvc?~CO%WFcya0(%@U&`VR^4M;_jrjy0dY<
zK}EsPYr^B3FYk<Nx4u-A7{6Ikd0*_D$VYua@rKj+s_ZRO)uL~#=I94AZM&PkzJAY4
zH~8SB{4QW%f=1UVd#9??62<(oCv9^}iU2{gB?c~cBBn#orfXS}ha6>ze9Gmy?Q~N>
zto1ztZ8PnVP-HGu$HTKZi*@7c^60OAchDQ}Z45QM5!iL(rlaOzi;)V|u`KRzG&?6S
zI&}W!sSETwvylR{nuT4;hm&3nFmmIsrUg}PH;Q}E(0x@Ty(Q*8Mp&ex*W~y8Xnr+p
zH%jzG3*UPs(}Q0P-@F+?=fQG@BF<1BsCcJWKb+ro>#F~`MhWt+r1s$MJ1Y+aBEu7V
zcH&4KrV4qc{<tosOZkWfvpNTRdqnNZil~?s%G%8R&F9+GbY4xZIsE=KC!jLDPf4WM
zCS^FVyqY~xP{tZ*o-{?-=~rhkEG!rJE|R4%*o$4|fL4vDnRZOml|9GhH8UgHVw6i!
zC`PDGpOgeY5_Jla^CEs=dMjd3b%36nNq+r_s$+6>=4^Q-YU6IR`d?XRM-vOqEGv{P
zJk=RF3egcuvl+IMc^HT)>W(j65=RCw74sVmT)C)8?X9H{F*n`lIzgLs*n&KYb4RQ-
z?Csc@-DUNq36F}4hi(11iUv-65T$&&kUR;wq@C<A9XW<Us##R>>~+<#h|b>zZI$?(
z{xyQYwOpd~vX-Q-S|{Z?KdbX5JG+pyk<^^uP37(D<YJpmH*VnWtf|;D5N0e=DYn;j
zitg&zqfpYx=O+HFlAHTofjw3&wAey%^loEi!N@6e>QcXp?2^YXDOi5q4YAhnW#v?w
zHT{}Z_Nxg0YQ+V%k1A*LlMu33p>Q@=_0?^IJb}@Wa(eg--{4}Y7FsOd?PksK(G7Q|
zNeyCBA-4s;JV<=l*lZ{Fp;NuCWrI_en5xW_pp`7XLUdd=`|^}eAYl~>HN%!ZyKTFP
zcVE+zzfk)^AZ3ZO$9@|UF~HZ4JleZ)?A7RKhuq+u4-N4m6O$4F)030#q1X)$C-Fze
zeh1{0jW_-N?7-_@Rebc6Cx2K=R?$0)ih3{A=;{ar04<fw2)y;%rwaww*;V)z>-$fZ
zhn)C>CrhrgIwq@&LnhCNZQoh;d~Z*nof@=@r%__%g#~^2u)n%|(klosonuERDfC`_
z@#4U8yH9c9?VC*N>`fP|Jy>(TS4+pvqr#5zaddW!rA28}(cSgxN;C+rrF`8=g+<w&
z3CIN<=$T_Yv(LY7e01dQ^@4d$-p!+Q9o4&q7q$(m3|2je*Pgq&bko+(G!SO#;W0^>
zvyU9u?6tZa^Y*iHu5IUNp+}CrdR-!`_uVy74=edRZ!T7GW8aunkW0kojQP-q(=l&F
zaYIh&k~azs4G6BYun${H6x)|R<&ZcBCMGI#hde*dmR6m>2&<e)Z*C5`*T`c$zZmyM
zCw=I#Xq|}LbI*)xeJ<Q@_!5mLtriw9zIEt4ZR0G9P>phUI9d6~J<3)81y?BJ=8G$X
z8cv=0a=Egs(Z^d%>yUeE@q_b=?j>GQv`@BY^!c-o1wOtxPaJ&b<=XlJoou3Iqe*aO
zp`ScxMtzdm@PX30>qG}$*<8w(N*$UTx3)f%rL^h61K@F%p^Wx;k7)f}XM>7YE4}Ej
z<KYG6ivvw|lcb@POTS6oD0CM#Zsg6>;`R@w&2>fMoe%CvoPFZ4+x?{>RsIHk4}s8-
zYc(b#%5Sq#qU6Zf%<j&WieMly{?TqHi6K!*ncVUPh5Y?Z{c<0^Ff;W1uu|8f57=N%
z?Kf7M{>UoO&pFT}(j8d9yU$T5((K@~l{%?8am$dE)|0#ESN4<?Hlh!b+<1AfA8w9J
zz^ameQ}|jIGWYme+1||R1#HO?AMH@_-kRTDjL!31Fjdi;GF7}<X7k(3^MgqSLAg!c
zf}UUdi2MTR9Vf3t+!E3=0z@)WS`ET`p4Tsl9Z-v*ije*H@4pbTI4{?bocwZ|5zf{h
zc|ti+`u(`7QcTk!ze~l%;Tf2S#&WKM!CHPAjQ7DpFQwbF10D^8vkxt|+mI6+SS)l=
zQIX4&T^C#|ZTsYoycZOX3VR~t92%;<vZAJL{2~5R91#B8+q1S526gc`AkmqFB1=z5
z=+AVmVl71-930p|LC$!5gM+rW#G%u2<n6QjrBCt;+-A9+&CMlMRaYx0C=9kgIv7;@
z{H(*wATJ>yG<T$r^!W4WX2{pHB7TXLV~8~^9L}Eo`>pNlw8l0pxmT4iaA%|f9Z&gh
z+O9aFCZFc)_Et^uVO~K&tgZUv71J<-d-bO`7=t~cGU;i-W6e{9d+NIJU4Qi9>p76)
zX^H$APV5g8)yk>qPI<R)^H%gG#xh<3*L-+(`RP<_svBsXXt~<tlopevWZJfTDJJU3
zOWu=^4+2?&x7oZ5an1euPZnhBZAvAV+v=TufBMG9V^XO1ppL!7cJr|`fzRzBR>8Hp
z!lzGbW?&PaogUwvV-kN?HNVg*+GIY!e|cop|1^&V@~~?``OzEKKc+Y3EMYz{mz#>t
z?-GCR)_bXEqL`}!WsMvnC@3X-{B?8Psem)Lh(#Bx5xaEw%iRbE5zQms(9xmV;iP_L
z6RGzhZv%3lCJ5Y79o#Y4;~a3L4Ht4pA^c8mU`>^7mUHFE`800H!lKnJj+F6xxTx0X
z?uzLR9vrObR~6CTTjdgwT~8Ezc~K`6?q$oITs6<6zo@Yf^`LK^P#C0oQNd;j1wESK
zHc9943+(&q5O@1-XoLWxVN{naEg%lg8Oz)6(j#Y^TE^yYhb#;1+iR$HhMZVyTv93C
z^6qYW&Kc7>NDK2AUy;7mt<sS=PLs?pW@;ru-3o<8JAzKubby+?xd-@Fl(ZQi1;s5=
z#B<iB#_3YE8fk)cPZhC$nd-mTFI!V{Jy|*2w}BbT82dc)WhHpI63U+g%r?(f$41-e
z>u^ml7C+n9KM^{-eWN^2U1Q+slRO$J<WsW|J`B$TcV9ja+YlW8lq+GQ8o@OszGF&`
z$36mzTuN#S*ThLC*I&DO-1wk`b#)*$u_?#CQ#0v>!AXhtraciI+bja}K5<uDls!M+
zf47zICZvnY;PvjXIzHNcp$m$##sRN+od)bDKHknOJvQ!SS(B`~y-9rtkY>Ov?*rFj
zd#?!OJ4bKTm%JgO5xi)l&UYeT=B$|zV|&Tz<PTp0_ql}UE5P)R9Y-UZRToXiGp6EQ
Umo(be{wue$a<sg;)9b|l0JR4gpa1{>

literal 0
HcmV?d00001

diff --git a/static/lesson3d/lessonbg.png b/static/lesson3d/lessonbg.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a3acf4a762def1692c7963aea75f718bf68d517
GIT binary patch
literal 2192
zcmeHJL2ukd7<E93Af!?yF2HHzN~jTxJu@DAZL6C$&4wfr4k2Bs>5cJtylZ9cacw8N
z*;C+vKuDYs%8fhXf;jX*1>8U&amWuqToHFJFy8fU3reFLdgy_bydK-%yzhPQdo%XO
zyE~g#mR?)ZH0{dvR%cJ0PwL}^MfLyvD*I8LUd*@dm74a_%k{CKeSZ3irY-)SboZ<M
z;BBAF)L@Yeg)vHV6|HGEZjN%s4@3n*(Mz(n{^x^lb&y1D{jMFLAYT{#WNTcAJL8=$
zA0Kcp(r>PU8zWx<q@rSAln%1eAGP%fuCK=RZBqx6km{hVuhj{`ey|JHWg&oLAjlCS
zpye6Zq11KX1OyReqLzsfB*aIKZ(E@G=_*?h#r|IBttOYcYU}-~%6-!u4u{6jGGx&+
zvFCXvA|@eFMZoentJnx;<+T|?N0hus@+y%Ts1aEx539DWm`+Pb^Eqr*HZm!}%n{2?
zY@oWNSzr)c9Ga%{=(5^4Qdt_l=K`1A<6M|~qLhaP7aK<+tFFzG<$YPnvM-;&ZT|RQ
z3?n{Im>(8{i98WE#XzJAyHv4w!Y}vN3&AQ`bfp~38nrvi2naC{xL)@Lx!5&Q10zhD
zUb!ZAeGt1Ork2%m@CpFe?<QF!hviDmy@3`TR*AN*Ffc?^HMfhgPb?qXZy?u4Xc`(Q
z$3(1RmkX9r5+7eCGzk3dtgKkZ#dfEyD^f<1L_WnWPHozPo`^k&JW65cMhHft#XTV~
zVXimfrRH}eKdd#Y=T8kDNv<&Fy8A3f7-Pht7h?*kO9^Dm;gGj1%qaC7Lih~rogz_d
zj13+~tyx71(Gl2giI~8chBmZAYD4Bw40()^h(qqQn9#wayz6oxi$F$7T}uZM_hVV4
zOgSw{Sx=aG)~kK5&{Y*%NvWEA+^nQK;(jw4Bw%7spYeKCv~^zFK}33UJ2^+a%kiAT
z4*NoZUeNq$SSjOb$O^I6Q%XNY8=6llvt&mX7kN30JQGDWt>S%_^@Q5CO}#GLtT(u6
zqs{+%;E{)BK3r2Pq;^Qz2zHzG=F+X6Z+kBe9d1z%+A;B9h$w<?Xgd%Ij|$gPkBK{F
zF-T^7rm*J4`6tXD+p1@i)&5@(=Pw?0F@JT5Och?J7t{Fahwp0I!rpdgtvfpX<5#@!
z5NHp-!Yln-%V+r~%b&i!G_HR7`j^eKzx|VMmaq0s+~<FI75uE-U;N0rb-M7||F_Op
b;=y0vJ-7M(*=JwW-wfLuJDo3YzxTmE3#Fuj

literal 0
HcmV?d00001

diff --git a/static/lesson3d/lkgw.png b/static/lesson3d/lkgw.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a8355283e218ac9f583812c17766c58ddf0096d
GIT binary patch
literal 8179
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
E1cdrGG5`Po

literal 0
HcmV?d00001

diff --git a/static/lesson3d/选项.png b/static/lesson3d/选项.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1c25886380dc6258b2108a2ed7d814150ddb5b2
GIT binary patch
literal 4138
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
Qpnc7!CTG|VB^Ipx4^+gd;s5{u

literal 0
HcmV?d00001