seimin 1 year ago
parent
commit
3b11a2ac1c
2 changed files with 5 additions and 5 deletions
  1. 4 4
      src/components/AppHeader.vue
  2. 1 1
      src/main.js

+ 4 - 4
src/components/AppHeader.vue

@@ -7,7 +7,7 @@
7
       <div class="app-header__main--leftBottom"></div>
7
       <div class="app-header__main--leftBottom"></div>
8
       <div class="app-header__main--rightBottom"></div>
8
       <div class="app-header__main--rightBottom"></div>
9
       <h1 class="app-header__title">
9
       <h1 class="app-header__title">
10
-        <img class="app-header__logo" :src="logoUrl">
10
+        <img class="app-header__logo" :src="faviconUrl">
11
         {{logoTitle}}
11
         {{logoTitle}}
12
       </h1>
12
       </h1>
13
     </div>
13
     </div>
@@ -34,7 +34,7 @@ export default {
34
   data () {
34
   data () {
35
     return {
35
     return {
36
       logoTitle: '',
36
       logoTitle: '',
37
-      logoUrl: '',
37
+      faviconUrl: '',
38
       time: new Date().getTime(), // 时间戳
38
       time: new Date().getTime(), // 时间戳
39
       timer: null, // 时间定时器
39
       timer: null, // 时间定时器
40
       week: ''// 星期
40
       week: ''// 星期
@@ -74,8 +74,8 @@ export default {
74
       get('/auth/getSysNameAndLogo')
74
       get('/auth/getSysNameAndLogo')
75
         .then((result) => {
75
         .then((result) => {
76
           this.logoTitle = result.largeScreenName || ''
76
           this.logoTitle = result.largeScreenName || ''
77
-          this.logoUrl = result.favicon || ''
78
-          document.querySelector('#favicon').href = result.favicon || ''
77
+          this.faviconUrl = location.origin + '/file' + result.favicon || ''
78
+          document.querySelector('#favicon').href = this.faviconUrl
79
           document.title = this.logoTitle
79
           document.title = this.logoTitle
80
         })
80
         })
81
     }
81
     }

+ 1 - 1
src/main.js

@@ -14,7 +14,7 @@ Vue.use(fullScreenContainer)
14
 Vue.prototype.$moment = moment
14
 Vue.prototype.$moment = moment
15
 
15
 
16
 Vue.config.productionTip = false
16
 Vue.config.productionTip = false
17
-console.info('v2.4.2')
17
+console.info('v2.4.3')
18
 
18
 
19
 new Vue({
19
 new Vue({
20
   router,
20
   router,