From fb9e8f0325afa2812045665e81c3b7f2450b54e2 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Fri, 31 Jul 2020 18:49:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=8F=8A=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/training.js | 20 +-- src/utils/baseUrl.js | 4 +- src/views/newMap/chatView/chatBox.vue | 132 +++++++++--------- .../newMap/displayNew/chatView/chatBox.vue | 12 +- src/views/newMap/displayNew/index.vue | 3 +- src/views/newMap/displayNew/menuDemon.vue | 71 ++++++++-- src/views/newMap/displayNew/menuLesson.vue | 2 +- src/views/newMap/displayNew/menuTrainList.vue | 10 +- src/views/newMap/jlmapNew/index.vue | 6 +- .../jointTrainingNew/chatView/chatBox.vue | 12 +- src/views/newMap/jointTrainingNew/index.vue | 5 +- .../newMap/jointTrainingNew/menuDemon.vue | 119 ++++++++-------- .../newMap/jointTrainingNew/menuTrainList.vue | 12 +- 13 files changed, 252 insertions(+), 156 deletions(-) diff --git a/src/store/modules/training.js b/src/store/modules/training.js index a04f333e4..dd6844d63 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -313,7 +313,7 @@ const training = { reset: ({ commit }) => { commit('over'); commit('resetOrder'); - commit('stopCountTime'); + // commit('stopCountTime'); // 清空计时器以及得分 commit('resetUsedTime'); @@ -330,7 +330,7 @@ const training = { OperateHandler.cleanOperates(); Handler.clear(); // 两种方式 // 清空计时器以及得分 - commit('stopCountTime'); + // commit('stopCountTime'); commit('resetUsedTime'); commit('resetScore'); commit('start'); @@ -342,7 +342,7 @@ const training = { over: ({ commit }) => { commit('over'); commit('resetOrder'); - commit('stopCountTime'); + // commit('stopCountTime'); }, /** @@ -358,7 +358,7 @@ const training = { * 停止计时 */ setStopCountTime: ({ commit }) => { - commit('stopCountTime'); + // commit('stopCountTime'); }, /** @@ -392,16 +392,20 @@ const training = { commit('changeMode', opts.mode); if (opts.start) { // 清空计时器以及得分 - commit('stopCountTime'); + // commit('stopCountTime'); commit('resetUsedTime'); commit('resetScore'); // 开始实训 commit('start'); commit('next'); - // 开始计时 - commit('countUsedTime'); + // // 开始计时 + // commit('countUsedTime'); } }, + countUsedTime({ commit }) { + // 开始计时 + commit('countUsedTime'); + }, /** * 开始实训（模式变更和开始的混合操作） @@ -603,7 +607,7 @@ const training = { end: ({ commit }, mode) => { commit('over'); commit('resetOrder'); - commit('stopCountTime'); + // commit('stopCountTime'); commit('changeMode', mode); }, diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index c59924e25..778caeb7b 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,9 +2,9 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 - BASE_API = 'http://192.168.3.6:9000'; // 旭强 + // BASE_API = 'http://192.168.3.6:9000'; // 旭强 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue index e56edc006..bc937baa1 100644 --- a/src/views/newMap/chatView/chatBox.vue +++ b/src/views/newMap/chatView/chatBox.vue @@ -1,63 +1,65 @@ @@ -99,7 +106,9 @@ export default { jl3dstation: this.$t('display.demon.threeDimensionalStation'), jl3dmodel: this.$t('display.demon.deviceView'), isShow3dmodel :false, - isGoback: false + isGoback: false, + hoverBtn: false, + btnWidth: 0 }; }, computed: { @@ -151,6 +160,11 @@ export default { clearTimeout(this.time); } }, + mounted() { + this.$nextTick(() => { + this.menuClick(); + }); + }, methods: { async initLoadPage() { try { @@ -317,6 +331,15 @@ export default { this.jl3dname = this.$t('display.demon.threeDimensionalView'); // 三维视图 this.isShow3dmodel = true; } + }, + menuClick() { + this.hoverBtn = !this.hoverBtn; + if (this.hoverBtn) { + // this.$refs.button_group_box.$el.clientWidth || + this.btnWidth = 500; // 默认宽度 + } else { + this.btnWidth = 0; + } } } }; @@ -359,7 +382,6 @@ export default { diff --git a/src/views/newMap/displayNew/menuLesson.vue b/src/views/newMap/displayNew/menuLesson.vue index d827e9a40..17361f7a7 100644 --- a/src/views/newMap/displayNew/menuLesson.vue +++ b/src/views/newMap/displayNew/menuLesson.vue @@ -185,7 +185,7 @@ export default { } }, endCommit() { - this.$store.dispatch('training/setStopCountTime'); + // this.$store.dispatch('training/setStopCountTime'); const mode = { mode: this.demoMode, id: this.trainingObj.id, diff --git a/src/views/newMap/displayNew/menuTrainList.vue b/src/views/newMap/displayNew/menuTrainList.vue index 9cdc1e6bc..cf7e4b9e8 100644 --- a/src/views/newMap/displayNew/menuTrainList.vue +++ b/src/views/newMap/displayNew/menuTrainList.vue @@ -1,7 +1,9 @@