Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new

src/router/index_Common.js

@@ -62,7 +62,7 @@ const LessonHome = () => import('@/views/lesson/home');
 const LessonDetail = () => import('@/views/lesson/details');
 
 const ScriptmanageHome = () => import('@/views/scriptManage/home');
-const ScriptDisplay = () => import('@/views/scriptManage/display/index');
+const ScriptDisplay = () => import('@/views/oldMap/scriptManage/display/index');
 const PracticeDisplayNew = () => import('@/views/competitionManage/practiceList/display/index');
 
 const IbpHome = () => import('@/views/ibp/home');

src/router/index_HEB.js

@@ -53,7 +53,7 @@ const BigScreen = () => import('@/views/designPlatform/bigScreen');
 const BigSplitScreen = () => import('@/views/designPlatform/bigSplitScreen');
 
 const ScriptmanageHome = () => import('@/views/scriptManage/home');
-const ScriptDisplay = () => import('@/views/scriptManage/display/index');
+const ScriptDisplay = () => import('@/views/oldMap/scriptManage/display/index');
 
 const IbpHome = () => import('@/views/ibp/home');
 const IbpDraw = () => import('@/views/ibp/ibpDraw/index');

src/store/modules/training.js

@@ -184,12 +184,12 @@ const training = {
                 state.initTime += 1000;
             }, 1000);
         },
-        stopCountTime: (state) => {
+        // stopCountTime: (state) => {
-            if (state.timeInterval) {
+        //     if (state.timeInterval) {
-                clearInterval(state.timeInterval);
+        //         clearInterval(state.timeInterval);
-                state.timeInterval = null;
+        //         state.timeInterval = null;
-            }
+        //     }
-        },
+        // },
         setOperate: (state, operate) => {
             state.operate = operate;
         },
@@ -357,9 +357,9 @@ const training = {
         /**
          * 停止计时
          */
-        setStopCountTime: ({ commit }) => {
+        // setStopCountTime: ({ commit }) => {
-            // commit('stopCountTime');
+        // commit('stopCountTime');
-        },
+        // },
 
         /**
 		 * 主动判断是否结束
@@ -402,8 +402,8 @@ const training = {
                 // commit('countUsedTime');
             }
         },
+        // 开始计时
         countUsedTime({ commit }) {
-            // 开始计时
             commit('countUsedTime');
         },
 

src/views/newMap/chatView/chatBox.vue

@@ -350,7 +350,7 @@ export default {
     align-items: center;
     text-align: center;
     justify-content: center;
-	padding: 5px 3px;
+	padding: 7px 4px;
 	.el-icon-more{
 		font-size: 20px;
 		margin-top: 9px;

src/views/newMap/displayNew/chatView/chatBox.vue

@@ -596,7 +596,7 @@ export default {
     align-items: center;
     text-align: center;
     justify-content: center;
-	padding: 5px 3px;
+	padding: 7px 4px;
 	.el-icon-more{
 		font-size: 20px;
 		margin-top: 9px;

src/views/newMap/displayNew/menuLesson.vue

@@ -169,6 +169,7 @@ export default {
                 startTrainingNew(this.trainingObj, this.group).then(response => {
                     this.$store.dispatch('map/clearJlmapTrainView').then(() => {
                         this.$store.dispatch('training/teachModeStart');
+                        this.$store.dispatch('training/countUsedTime'); // 开始计时
                         this.$store.dispatch('training/setMapDefaultState').then(() => {
                             this.$store.dispatch('training/emitTipFresh');
                             this.tipInfo({ color: 'green', message: this.$t('global.pleaseOpearte') });

src/views/newMap/displayNew/menuScript.vue

@@ -17,7 +17,7 @@
 <!-- 单人仿真 -->
 <script>
 import ChatBox from './chatView/chatBox';
-import TipScriptRecordNew from '@/views/scriptManage/display/tipScriptRecordNew';
+import TipScriptRecordNew from '@/views/scriptManage/tipScriptRecord';
 import SetTime from './demon/setTime';
 import { Notification } from 'element-ui';
 import { ranAsPlan, exitRunPlan } from '@/api/simulation';

src/views/newMap/displayNew/menuTrainList.vue

@@ -145,29 +145,20 @@ export default {
 	}
 }
 .menuTrainListBtn{
-    width: 20px;
-    height: 40px;
     background: #fff;
     text-align: center;
     border-radius: 6px 0px 0px 6px;
     position: absolute;
     top: 45%;
     z-index: 2;
-	transform: translateX(-20px);
+	transform: translateX(-23px);
     cursor: pointer;
 	display: flex;
     flex-direction: column;
     align-items: center;
     text-align: center;
     justify-content: center;
-	padding: 5px 3px;
+	padding: 7px 4px;
-	.el-icon-more{
-		font-size: 20px;
-		margin-top: 9px;
-		transform-origin: 50% 50%;
-		transform: rotate(90deg);
-		margin-left:0px;
-	}
 }
 .menuTrainList_box{
 	height: 100%;

src/views/newMap/jointTrainingNew/chatView/chatBox.vue

@@ -700,7 +700,7 @@ export default {
     align-items: center;
     text-align: center;
     justify-content: center;
-	padding: 5px 3px;
+	padding: 7px 4px;
 	.el-icon-more{
 		font-size: 20px;
 		margin-top: 9px;

src/views/newMap/jointTrainingNew/menuTrainList.vue

@@ -140,21 +140,14 @@ export default {
     position: absolute;
     top: 45%;
     z-index: 2;
-	transform: translateX(-20px);
+	transform: translateX(-23px);
     cursor: pointer;
 	display: flex;
     flex-direction: column;
     align-items: center;
     text-align: center;
     justify-content: center;
-	padding: 5px 3px;
+	padding: 7px 4px;
-	.el-icon-more{
-		font-size: 20px;
-		margin-top: 9px;
-		transform-origin: 50% 50%;
-		transform: rotate(90deg);
-		margin-left:0px;
-	}
 }
 .menuTrainList_box{
 	height: 100%;

src/views/scriptManage/tipScriptRecord.vue

@@ -34,14 +34,14 @@
 </template>
 <script>
 import Vue from 'vue';
-import GetActionNew from '../scriptRecord/getActionNew';
+import GetActionNew from './getAction';
 import {getSimulationMemberList, executeScriptNew, dumpScriptDataNew, saveScriptDataNew, saveScriptScenesNew, updateMapLocationNew, simulationPause} from '@/api/simulation';
 import ConstConfig from '@/scripts/ConstConfig';
 import {getDraftScriptByGroupNew, changeScriptRole} from '@/api/script';
 import Cookies from 'js-cookie';
 
 export default {
-    name:'TipScriptRecordNew',
+    name:'TipScriptRecord',
     components: {
         GetActionNew
     },