From d1cf8f2d21a7ad4366c2d6dba292acb0ffa74d62 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 20 Oct 2022 09:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=90=8D=E7=A7=B0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E6=88=91=E7=9A=84U?=
 =?UTF-8?q?=E5=B8=81=EF=BC=8C=E6=8E=92=E8=A1=8C=EF=BC=8C=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E4=BA=86=E5=90=8C=E4=B8=80=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js     |  4 +---
 src/views/ucurrency/Index.vue |  4 +++-
 src/views/user/ranking.vue    | 15 ++++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1075c5d0..2edadce3 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -49,9 +49,7 @@ const user = {
          // /用户触发事件
          userTrigger({ commit }, event) {
            event.source='page';
-            apiStat.sendEvent(event).then(res=>{
-                console.log(res,'userTrigger');
-            })
+            apiStat.sendEvent(event);
         },
         SetIntTimeNote({
             commit
diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue
index 03ca0ef9..6478d622 100644
--- a/src/views/ucurrency/Index.vue
+++ b/src/views/ucurrency/Index.vue
@@ -115,7 +115,7 @@
               :sex="currentUserRankingData.authorInfo.sex"></author-img> <span
               style="color: #0059FF;">{{currentUserRankingData.authorInfo.name}}</span>
           </div>
-          <div class="bm tab-bm" style="margin-left:30px;color: #0059FF;">{{currentUserRankingData.authorInfo.orgInfo}}
+          <div class="bm tab-bm" style="margin-left:30px;color: #0059FF;">{{cutOrgNamePath(currentUserRankingData.authorInfo.orgInfo)}}
           </div>
           <div class="jy tab-jy">
             <div v-if="cycle == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{currentUserRankingData.total}}</div>
@@ -195,6 +195,7 @@
   import authorImg from '@/components/Portal/authorImg.vue';
   import author from '@/components/Portal/authorInfo.vue';
   import apiUser from "@/api/system/user.js";
+  import {cutOrgNamePath} from "@/utils/tools.js";
   import * as echarts from 'echarts'
   import {
     translate,
@@ -211,6 +212,7 @@
     },
     data() {
       return {
+        cutOrgNamePath:cutOrgNamePath,
         chatData:[],
         isShowChart:false,
         current: {
diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue
index 57b7901d..728569f9 100644
--- a/src/views/user/ranking.vue
+++ b/src/views/user/ranking.vue
@@ -60,7 +60,7 @@
                     <author-img :avatar="ran.authorInfo.avatar" :aid="ran.authorInfo.aid" :sex="ran.authorInfo.sex"></author-img>
                     <div>
                         <span>{{ran.authorInfo.name}}</span>
-                        <div class="tab-bm">{{ran.authorInfo.orgInfo}}</div>
+                        <div class="tab-bm">{{cutOrgNamePath(ran.authorInfo.orgInfo)}}</div>
                     </div>
 
                      </div>
@@ -81,7 +81,7 @@
                     <author-img :avatar="userInfo.avatar" :aid="experience.data.authorInfo.aid" :sex="experience.data.authorInfo.sex"></author-img>
                     <div>
                         <span style="color: #0059FF;">{{experience.data.authorInfo.name}}</span>
-                        <div class="tab-bm" style="color: #0059FF;">{{experience.data.authorInfo.orgInfo}}</div>
+                        <div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(experience.data.authorInfo.orgInfo)}}</div>
                     </div>
                 </div>
 
@@ -147,7 +147,7 @@
                     <author-img :avatar="lan.authorInfo.avatar" :aid="lan.authorInfo.aid" :sex="lan.authorInfo.sex"></author-img>
                     <div>
                         <span>{{lan.authorInfo.name}}</span>
-                        <div class="tab-bm">{{lan.authorInfo.orgInfo}}</div>
+                        <div class="tab-bm">{{cutOrgNamePath(lan.authorInfo.orgInfo)}}</div>
                     </div>
                 </div>
                  <div class="jy tab-jy">
@@ -167,7 +167,7 @@
                     <author-img  :avatar="userInfo.avatar" :aid="learningDuration.data.authorInfo.aid" :sex="learningDuration.data.authorInfo.sex"></author-img>
                     <div>
                         <span style="color: #0059FF;">{{learningDuration.data.authorInfo.name}}</span>
-                        <div class="tab-bm" style="color: #0059FF;">{{learningDuration.data.authorInfo.orgInfo}}</div>
+                        <div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(learningDuration.data.authorInfo.orgInfo)}}</div>
                     </div>
                 </div>
                  <div class="jy tab-jy">
@@ -230,7 +230,7 @@
                     <author-img :avatar="day.authorInfo.avatar" :aid="day.authorInfo.aid" :sex="day.authorInfo.sex"></author-img>
                     <div>
                         <span>{{day.authorInfo.name}}</span>
-                        <div class="tab-bm">{{day.authorInfo.orgInfo}}</div>
+                        <div class="tab-bm">{{cutOrgNamePath(day.authorInfo.orgInfo)}}</div>
                     </div>
                 </div>
 
@@ -251,7 +251,7 @@
                     <author-img  :avatar="userInfo.avatar" :aid="learningDays.data.authorInfo.aid" :sex="learningDays.data.authorInfo.sex"></author-img>
                     <div>
                         <span style="color: #0059FF;">{{learningDays.data.authorInfo.name}}</span>
-                        <div class="tab-bm" style="color: #0059FF;">{{learningDays.data.authorInfo.orgInfo}}</div>
+                        <div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(learningDays.data.authorInfo.orgInfo)}}</div>
                     </div>
                 </div>
 
@@ -275,7 +275,7 @@
     import apiStat from '@/api/phase2/stat.js';
     import { mapGetters } from 'vuex';
     import authorImg from '@/components/Portal/authorImg.vue';
-    import {translate,experienceValue,formatSecondToHour} from "@/utils/tools.js";
+    import {translate,experienceValue,formatSecondToHour,cutOrgNamePath} from "@/utils/tools.js";
 export default {
     computed: {
       ...mapGetters(['userInfo']),
@@ -285,6 +285,7 @@ export default {
   data(){
       return{
         experienceValue,
+        cutOrgNamePath:cutOrgNamePath,
         current:{},
         currentUserRankingTotalData:{
           rankNo:0, // 经验值累计排名