From ba666eb334f32a9f94d6c6eb806e640dc83ba90d Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 14 Apr 2020 14:51:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=B9=B3=E5=8F=B0=E6=95=99?= =?UTF-8?q?=E5=AD=A6=20=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/newMap/displayNew/LeftSlider.vue | 25 ++++-- src/views/newMap/displayNew/index.vue | 8 +- src/views/newMap/displayNew/menuLesson.vue | 23 +++-- .../newMap/displayNew/tipTrainingDetail.vue | 84 +++++++++++-------- 4 files changed, 90 insertions(+), 50 deletions(-) diff --git a/src/views/newMap/displayNew/LeftSlider.vue b/src/views/newMap/displayNew/LeftSlider.vue index 0a089e8d6..6343b6f7a 100644 --- a/src/views/newMap/displayNew/LeftSlider.vue +++ b/src/views/newMap/displayNew/LeftSlider.vue @@ -10,7 +10,7 @@ {{ $t('display.lesson.fold') }}
- + { + // document.querySelector('.left-slider').style.height = document.querySelector('.left-slider').offsetHeight - this.offsetBottom + 'px'; + // }); }, methods: { initLoadPage() { @@ -70,10 +79,10 @@ export default { this.$emit('overallTranslation', flag); const slider = document.getElementById('leftSlider'); if (flag) { - slider.setAttribute('style', 'transform: translateX(0)'); + slider.style.transform = 'translateX(0)'; this.show = false; } else { - slider.setAttribute('style', ''); + slider.style.transform = ''; this.show = true; } }, @@ -83,9 +92,9 @@ export default { this.disabled = true; trainingNotifyNew({ trainingId: obj.id }).then(resp => { const query = { - group: resp.data, trainingId: obj.id, lessonId: this.$route.query.lessonId, mapId: this.$route.query.mapId + group: resp.data, trainingId: obj.id, lessonId: this.$route.query.lessonId, mapId: this.$route.query.mapId, lineCode:this.$route.query.lineCode }; - this.$router.push({ path: `${UrlConfig.displayNew}/teach`, query: query }); + this.$router.replace({ path: `${UrlConfig.displayNew}/teach`, query: query }); launchFullscreen(); }).catch(error => { this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`); @@ -123,7 +132,11 @@ export default { position: absolute; left: 400px; top: 50%; - color: #fff; + background: #fff; + color: #000; + border-radius: 3px; + box-shadow: 3px 1px 5px #000; + padding: 3px; } .tip-title { width: 100%; diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index 5811e421e..c22161d1e 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -67,7 +67,7 @@
- + @@ -584,12 +584,12 @@ export default { }); }, overallTranslation(flag) { - const panel = document.getElementById('panel'); + const panel = document.getElementById('leftSlider'); this.$refs.lessonMenu.handelGroupButtonTranslate(flag); if (flag) { - panel.setAttribute('style', 'transform: translateX(400px)'); + panel.style.transform = 'translateX(400px)'; } else { - panel.setAttribute('style', ''); + panel.style.transform = ''; } }, switchStationMode(val) { diff --git a/src/views/newMap/displayNew/menuLesson.vue b/src/views/newMap/displayNew/menuLesson.vue index df4991610..e64f1de7f 100644 --- a/src/views/newMap/displayNew/menuLesson.vue +++ b/src/views/newMap/displayNew/menuLesson.vue @@ -16,7 +16,7 @@
- {{ $t('display.startBtn') }} + {{ $t('display.startBtn') }} {{ $t('display.endBtn') }} {{ $t('display.backBtn') }} @@ -111,6 +111,13 @@ export default { this.isDisable = false; }, + '$store.state.map.mapViewLoadedCount': function (val) { + this.$store.dispatch('training/end', null); + this.$store.dispatch('training/reset'); + this.$store.dispatch('training/emitTipFresh'); + this.$store.dispatch('menuOperation/setButtonOperation', null); + this.isDisable = false; + }, '$store.state.training.operateErrMsg': function (val) { this.tipInfo({ color: val.color, message: val.errMsg }); } @@ -216,12 +223,12 @@ export default { } }, handelGroupButtonTranslate(flag) { - const buttons = document.getElementById('teachGroupButton'); - if (flag) { - buttons.setAttribute('style', 'transform: translateX(-400px)'); - } else { - buttons.setAttribute('style', ''); - } + // const buttons = document.getElementById('teachGroupButton'); + // if (flag) { + // buttons.style.transform = 'translateX(-400px)'; + // } else { + // buttons.style.transform = 'translateX(0px)'; + // } }, switchStationMode(val) { this.$emit('switchStationMode', val); @@ -297,6 +304,8 @@ export default { z-index: 100000; } + .start,.end{z-index:2} + /deep/ .el-button { font-weight: bold; } diff --git a/src/views/newMap/displayNew/tipTrainingDetail.vue b/src/views/newMap/displayNew/tipTrainingDetail.vue index 66b94dc12..4a44860a8 100644 --- a/src/views/newMap/displayNew/tipTrainingDetail.vue +++ b/src/views/newMap/displayNew/tipTrainingDetail.vue @@ -2,38 +2,41 @@
-
- - -

- {{ lessonName }} -

-
-
-
- -

- {{ $t('display.training.trainingName') }} - {{ courseModel.name }} -

-

- {{ $t('display.training.bestTime') }} - {{ courseModel.minDuration }} {{ $t('display.seconds') }} -

-

- {{ $t('display.training.maximumTime') }} - {{ courseModel.maxDuration }} {{ $t('display.seconds') }} -

-

- {{ $t('display.training.trainingInstructions') }} - {{ courseModel.remarks }} -

- +
+
+
+ + +

+ {{ lessonName }} +

+
+
+
+ +

+ {{ $t('display.training.trainingName') }} + {{ courseModel.name }} +

+

+ {{ $t('display.training.bestTime') }} + {{ courseModel.minDuration }} {{ $t('display.seconds') }} +

+

+ {{ $t('display.training.maximumTime') }} + {{ courseModel.maxDuration }} {{ $t('display.seconds') }} +

+

+ {{ $t('display.training.trainingInstructions') }} + {{ courseModel.remarks }} +

+ +
+
+
+
+
-
-
-
-
@@ -163,6 +166,21 @@ export default { display:inline-block;width:77%;line-height:26px;margin-top:-4px; } + .zhezhao{ + width: 100%; + height: 100%; + filter: blur(8px); + background: rgba(255,255,255,0.9); + } + .reminder-box-content{ + position: absolute; + width: 100%; + height: 100%; + left: 0; + top: 0; + z-index: 2; + background: rgba(255,255,255,0.8); + } .reminder-box { position: absolute; float: left; @@ -170,7 +188,7 @@ export default { bottom: 15px; width: 500px; height: 300px; - background-color: #fff; + background: transparent; border-radius: 5px; overflow: hidden; z-index: 10; @@ -183,7 +201,7 @@ export default { display: flex; align-items: center; flex-direction: row-reverse; - background-color: #409EFF; + background-color: rgba(64, 158, 255,0.8); border-radius: 5px 5px 0 0; justify-content: space-between; padding: 0 10px;