From 5e4bed2d67b26eeb7eab4d176bfabe3f527836e4 Mon Sep 17 00:00:00 2001
From: yj <2077506045@qq.com>
Date: 星期五, 19 七月 2024 13:48:29 +0800
Subject: [PATCH] 修复答题刷新与CAQ分片2从第2题开始bug
---
src/layout/index.vue | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/layout/index.vue b/src/layout/index.vue
index ca5a298..0805f89 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,6 +1,6 @@
<template>
<el-container>
- <el-header height="60" class="student-header header" :style="{'background-color': logo!='none'?'#fff':'#409eff'}">
+ <el-header height="60" class="student-header header" :style="{'background-color': backgroundColor}">
<div class="head-language" v-if="langFlag">
<!--<lang-select class="right-menu-item" />-->
<!--鍥介檯鍖栫殑璇█閫夋嫨-->
@@ -8,11 +8,14 @@
</div>
<div class="head-user" style="float:left;">
<el-dropdown trigger="click" placement="bottom">
+ <!--
<el-image v-if="productType=='API_Fan'" :style="{'max-height': isMobile?'50px':'50px','margin-top':'5px','height':logoHeight+'px'}" :src="require('@/assets/logo-apifan.png')" fit="fill"></el-image>
<el-image @load="imageLoad" @error="imageError" v-else-if="logo!='none'" :style="{'max-height': isMobile?'50px':'50px','margin-top':'5px','height':logoHeight+'px'}" :src="logo" fit="fill"></el-image>
<el-badge v-else-if="logo=='none'" style="height: 50px;">
<el-avatar class="el-dropdown-avatar" size="medium" :src="userInfo.imagePath === null ? require('@/assets/logo-t.jpg') : userInfo.imagePath"></el-avatar>
</el-badge>
+ -->
+ <el-image v-if="logoUrl != null" :style="{'max-height': isMobile?'50px':'50px','margin-top':'5px','height':logoHeight+'px'}" :src="logoUrl" fit="fill"></el-image>
<el-dropdown-menu slot="dropdown">
<!-- <el-dropdown-item divided>淇濆瓨閫�鍑�</el-dropdown-item>-->
</el-dropdown-menu>
@@ -36,20 +39,52 @@
return {
defaultUrl: '/index',
logoHeight: 50,
- logoUrl: null,
+ backgroundColor: '#fff',
userInfo: {
imagePath: null
},
+ logoUrl: null,
langSelect: 'langSelect',
isMobile: /Mobile|iP(hone|od)|Android|BlackBerry|IEMobile|Kindle|Silk-Accelerated|(hpw|web)OS|Opera M(obile|ini)/.test(navigator.userAgent)
}
},
created () {
},
- computed: {
-
+ watch: {
+ logo: function (val) {
+ let sessionLogoUrl = localStorage.getItem('logoUrl')
+ if (this.productType === 'API_Fan') {
+ this.logoUrl = require('@/assets/logo-apifan.png')
+ } else if (val === 'none') {
+ this.backgroundColor = '#409eff'
+ this.logoUrl = require('@/assets/logo-t.png')
+ } else if (val !== null) {
+ this.logoUrl = val
+ this.backgroundColor = '#fff'
+ } else if (sessionLogoUrl !== null) {
+ this.logoUrl = sessionLogoUrl
+ }
+ localStorage.setItem('logoUrl', this.logoUrl)
+ localStorage.setItem('backgroundColor', this.backgroundColor)
+ }
+ },
+ mounted () {
+ let sessionLogoUrl = localStorage.getItem('logoUrl')
+ let sessionBackgroundColor = localStorage.getItem('backgroundColor')
+ if (sessionLogoUrl !== null) {
+ this.logoUrl = sessionLogoUrl
+ this.backgroundColor = sessionBackgroundColor
+ }
+ localStorage.setItem('backgroundColor', this.backgroundColor)
+ window.addEventListener('beforeunload', this.handleBeforeUnload)
+ },
+ beforeDestroy () {
+ window.removeEventListener('beforeunload', this.handleBeforeUnload)
},
methods: {
+ handleBeforeUnload: function () {
+ localStorage.setItem('logoUrl', this.logoUrl)
+ },
logout: function () {
window.opener = null
window.open('about:blank', '_top').close()
@@ -58,7 +93,6 @@
},
imageLoad: function (e) {
- sessionStorage.setItem('logoUrl', this.logo)
let that = this
var img = new Image()
img.onload = function () {
@@ -70,9 +104,6 @@
img.src = that.logo
},
imageError: function (e) {
- if (this.logo === null) {
- this.setLogo(sessionStorage.getItem('logoUrl'))
- }
},
...mapMutations('user', ['setLogo'])
},
@@ -80,6 +111,21 @@
'langSelect': LangSelect
},
computed: {
+ // logoUrl: function () {
+ // console.log('this.logo')
+ // console.log(this.logo)
+ // let sessionLogoUrl = this.setLogo(localStorage.getItem('logoUrl'))
+ // if (this.productType === 'API_Fan') {
+ // return require('@/assets/logo-apifan.png')
+ // } else if (this.logo === 'none') {
+ // return require('@/assets/logo-t.jpg')
+ // } else if (this.logo === null && sessionLogoUrl !== null) {
+ // return sessionLogoUrl
+ // } else {
+ // localStorage.setItem('logoUrl', this.logo)
+ // return this.logo
+ // }
+ // },
...mapState('user', { langFlag: state => state.langFlag }),
...mapState('user', { logo: state => state.logo }),
...mapState('exam', { productType: state => state.productType })
--
Gitblit v1.9.1