Browse Source

修改返回

11wqe1 2 weeks ago
parent
commit
ed5eee6d05

+ 16 - 1
src/components/sidebarL.vue

@@ -195,6 +195,11 @@ import { myMixin } from "@/mixins/mixin.js"
                         index: num, 
                     }
                 });
+                try {
+                    window.topU.gotype = '' 
+                } catch (error) {
+                    console.log(error);
+                }
             },
             mouGet(val){
                 
@@ -205,6 +210,11 @@ import { myMixin } from "@/mixins/mixin.js"
             // 点击一级导航
             async goto(index,val = null){
                 // console.log('goto',val);
+                try {
+                    window.topU.gotype = '' 
+                } catch (error) {
+                    console.log(error);
+                }
 
                // 清空二级菜单选中状态
                 this.activeLTwo = ''
@@ -311,7 +321,12 @@ import { myMixin } from "@/mixins/mixin.js"
             // 点击二级导航
             async levTwo(val,index,aInd){     
                 // console.log('val,index,aInd',val,index,aInd);
-                
+                try {
+                    window.topU.gotype = '' 
+                } catch (error) {
+                    console.log(error);
+                }
+
                 
                 this.activeL = ''
                 this.activeL = aInd +1

+ 1 - 0
src/store/modules/user.js

@@ -170,6 +170,7 @@ const actions = {
             setToken(_token);
           }
           getUser({ userid: _token })
+          // getUser({ userid: state.token })
             .then((response) => {
               console.log(response);
               // const { data } = response

+ 3 - 3
src/views/kanBan/components/dataBoardNew/baseData/chartList/levChart.vue

@@ -100,9 +100,9 @@ export default {
           top:'10%',
           formatter: (name) => {
             const dataInfo = {
-              [this.lang.highfrequency]: `${this.lang.highfrequency} ${((this.chartData[0].high / total) * 100).toFixed(2)}% (${this.chartData[0].high}${this.langl.person})`,
-              [this.lang.interfrequency]: `${this.lang.interfrequency} ${((this.chartData[0].mid / total) * 100).toFixed(2)}% (${this.chartData[0].mid}${this.langl.person})`,
-              [this.lang.lowfrequency]: `${this.lang.lowfrequency} ${((this.chartData[0].low / total) * 100).toFixed(2)}% (${this.chartData[0].low}${this.langl.person})`,
+              [this.lang.highfrequency]: `${this.lang.highfrequency} ${((this.chartData[0].high / total) * 100).toFixed(2)}% (${this.chartData[0].high}${this.lang.person})`,
+              [this.lang.interfrequency]: `${this.lang.interfrequency} ${((this.chartData[0].mid / total) * 100).toFixed(2)}% (${this.chartData[0].mid}${this.lang.person})`,
+              [this.lang.lowfrequency]: `${this.lang.lowfrequency} ${((this.chartData[0].low / total) * 100).toFixed(2)}% (${this.chartData[0].low}${this.lang.person})`,
             };
             return dataInfo[name] || '';
           }

+ 7 - 2
src/views/kanBan/components/dataBoardNew/index.vue

@@ -48,7 +48,7 @@ export default {
   },
   data() {
     return {
-      gotype:sessionStorage.getItem('gotype'),
+      gotype: (window.topU && window.topU.gotype) ?  window.topU.gotype : '',
       oidL: this.$route.query.oid,
       orgL: this.$route.query.org,
       useridL: this.$route.query.userid,
@@ -72,7 +72,12 @@ export default {
       }else{
         window.location.href = `https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/aiOffice?userid=${this.userid}&oid=${this.oid}&org=${this.org}&role=${this.role}&tType=${this.tType}`
       }
-      sessionStorage.removeItem('gotype');
+      try {
+        window.topU.gotype = '' 
+      } catch (error) {
+        console.log(error);
+      }
+      // sessionStorage.removeItem('gotype');
     }
   }
 };