diff --git a/src/router/index_Common.js b/src/router/index_Common.js index 00956a4e4..1e499b4a1 100644 --- a/src/router/index_Common.js +++ b/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'); diff --git a/src/router/index_HEB.js b/src/router/index_HEB.js index 5f23cfc41..e7757f2f3 100644 --- a/src/router/index_HEB.js +++ b/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'); diff --git a/src/store/modules/training.js b/src/store/modules/training.js index dd6844d63..f9df1cea6 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -184,12 +184,12 @@ const training = { state.initTime += 1000; }, 1000); }, - stopCountTime: (state) => { - if (state.timeInterval) { - clearInterval(state.timeInterval); - state.timeInterval = null; - } - }, + // stopCountTime: (state) => { + // if (state.timeInterval) { + // clearInterval(state.timeInterval); + // state.timeInterval = null; + // } + // }, setOperate: (state, operate) => { state.operate = operate; }, @@ -357,9 +357,9 @@ const training = { /** * 停止计时 */ - setStopCountTime: ({ commit }) => { - // commit('stopCountTime'); - }, + // setStopCountTime: ({ commit }) => { + // commit('stopCountTime'); + // }, /** * 主动判断是否结束 @@ -402,8 +402,8 @@ const training = { // commit('countUsedTime'); } }, + // 开始计时 countUsedTime({ commit }) { - // 开始计时 commit('countUsedTime'); }, diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue index bc937baa1..69c3acb0d 100644 --- a/src/views/newMap/chatView/chatBox.vue +++ b/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; diff --git a/src/views/newMap/displayNew/chatView/chatBox.vue b/src/views/newMap/displayNew/chatView/chatBox.vue index f8845e03e..f2524ee2a 100644 --- a/src/views/newMap/displayNew/chatView/chatBox.vue +++ b/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; diff --git a/src/views/newMap/displayNew/menuLesson.vue b/src/views/newMap/displayNew/menuLesson.vue index 17361f7a7..2c7ff67c9 100644 --- a/src/views/newMap/displayNew/menuLesson.vue +++ b/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') }); diff --git a/src/views/newMap/displayNew/menuScript.vue b/src/views/newMap/displayNew/menuScript.vue index f218bf1fe..153787b30 100644 --- a/src/views/newMap/displayNew/menuScript.vue +++ b/src/views/newMap/displayNew/menuScript.vue @@ -17,7 +17,7 @@