Эх сурвалжийг харах

3.0.88 修复头像不显示bug

liuyanpeng 2 жил өмнө
parent
commit
3d8ab1a925

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.86",
+  "version": "3.0.88",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

+ 3 - 0
src/client/TopNavigation.vue

@@ -90,6 +90,9 @@ export default {
     getLocalStorage: function () {
       var json = localStorage.getItem('#LoginInfo');
       this.loginInfo = JSON.parse(json);
+      if (this.loginInfo && this.loginInfo.userImageUrl) {
+        this.$store.commit('updateImageSrc', this.loginInfo.userImageUrl);
+      }
     },
     showMenu:function(){
       this.visible = !this.visible;

+ 5 - 0
src/client/UserParameters.vue

@@ -174,6 +174,7 @@ import {requestFailed, requestSuccess} from '../common/request-result.js';
 import {notificationSuccess} from '../common/notification.js';
 import PasswordService from '../common/PasswordService.js';
 import {Notify, Uuid} from 'pc-component-v3';
+import store from '../store/index.js';
 
 export default {
   components: {
@@ -369,6 +370,10 @@ export default {
         if (successData.errorCode !== 0) {
           requestFailed(successData);
         } else {
+          let data = JSON.parse(localStorage.getItem('#LoginInfo'));
+          const newData = {...data,userImageUrl:this.loginUserDto.imageName};
+          localStorage.setItem('#LoginInfo',JSON.stringify(newData));
+          this.$store.commit('updateImageSrc', this.loginUserDto.imageName);
           notificationSuccess('用户图片上传成功', '操作成功');
         }
       }, errorData => {

+ 1 - 1
src/client/top-nav-message.vue

@@ -84,7 +84,7 @@ export default {
       if (newValue != null) {
         this.getMessage();
         this.getMessageCount();
-        this.openWebSocket();
+        // this.openWebSocket();
       }
     },
   },

+ 20 - 12
src/client/top-nav-user-info.vue

@@ -12,16 +12,19 @@
         aria-haspopup="true"
         aria-expanded="false"
       >
-
         {{ loginInfo != undefined ? loginInfo.userName : "" }}
         <span class="caret" />
       </a>
       <ul class="dropdown-menu">
         <li>
-          <a @click="setUserParameters">{{ $t("lang.top-nav-user-info.personalSettings") }}</a>
+          <a @click="setUserParameters">{{
+            $t("lang.top-nav-user-info.personalSettings")
+          }}</a>
         </li>
         <li>
-          <a @click="logout"><i class="fa fa-sign-out pull-right" />{{ $t("lang.top-nav-user-info.cancellation") }}</a>
+          <a @click="logout"><i class="fa fa-sign-out pull-right" />{{
+            $t("lang.top-nav-user-info.cancellation")
+          }}</a>
         </li>
       </ul>
     </li>
@@ -31,12 +34,13 @@
 <script>
 import Common from '../common/Common.js';
 import AuthSettingResource from '../api/commom/AuthSettingResource.js';
+import store from '../store/index.js';
 
 export default {
   props: {
     loginInfo: {
       type: Object,
-      default: function(){
+      default: function () {
         return null;
       },
     },
@@ -44,16 +48,20 @@ export default {
 
   data: function () {
     this.Common = Common;
-    return {
-    };
+    return {};
   },
 
   computed: {
     userImageSrc: function () {
-      if (this.loginInfo == null || this.loginInfo.imageName == null) {
+      if (this.loginInfo == null || this.loginInfo.userImageUrl == null) {
         return null;
       }
-      return Common.getThumbnailImageSrc('com.leanwo.prodog.base.model.User', this.loginInfo.imageName);
+
+      return Common.getResourceUrl(
+        'image',
+        'com.leanwo.prodog.base.model.User',
+        store.state.downloadStore.imageSrc,
+      );
     },
   },
 
@@ -106,9 +114,9 @@ export default {
 
 <style scoped>
 .user-profile-img {
-    width: 29px;
-    height: 29px;
-    border-radius: 50%;
-    margin-top: 10px;
+  width: 29px;
+  height: 29px;
+  border-radius: 50%;
+  margin-top: 10px;
 }
 </style>

+ 4 - 0
src/store/modules/downloadStore.js

@@ -7,9 +7,13 @@ export default {
     tempText:'新建模版',
     templateVal:'',
     templateId:'',
+    imageSrc:'',
   },
 
   mutations: {
+    updateImageSrc(state,val){
+      state.imageSrc = val;
+    },
     changeStep(state,val){
       state.step = val;
     },