347617796@qq.com 3 years ago
parent
commit
91b3eca701
3 changed files with 21 additions and 17 deletions
  1. 2 0
      src/App.vue
  2. 17 14
      src/components/body/statistics.vue
  3. 2 3
      src/main.js

+ 2 - 0
src/App.vue

@@ -298,6 +298,8 @@ export default {
     )
   },
   created () {
+    localStorage.removeItem('menuCommon')
+    localStorage.removeItem('menu')
     if (navigator.userAgent.indexOf('Android') > 0) {
       this.$setCache('isAndroid', 1)
     } else {

+ 17 - 14
src/components/body/statistics.vue

@@ -140,10 +140,10 @@ export default {
       getRole_two: '',
       getRole_four: '',
 
-      
+
       common_menu: [],
       total: 0,
-      
+
       review_count: 0,
       task_count: 0,
       new_list:[
@@ -178,7 +178,7 @@ export default {
       var myChart1 = ECharts.init(this.$refs.situationChart)
       myChart1.resize()
     })
-    
+
     this.$store.dispatch('getMenu').then(res => {
       this.getMenu(res)
     })
@@ -262,7 +262,7 @@ export default {
       // 指定图表的配置项和数据
       var reward = [],
         deduction = []
-        
+
       let items = []
       if (data.length > 0) {
         data.forEach((item, index) => {
@@ -304,7 +304,7 @@ export default {
               // 坐标轴指示器,坐标轴触发有效
               type: 'shadow' // 默认为直线,可选为:'line' | 'shadow'
             },
-            
+
             formatter: (params) => {
               var htmlStr ='<div>';
               for(let i in params){
@@ -376,12 +376,12 @@ export default {
                 fontSize: 10,
                 align: 'center'
               },
-              
+
               // type: 'category',
               // boundaryGap: false,
               // data: employee_name,
 
-              
+
               // type: 'category',
               data: employee_name,
               axisPointer: {
@@ -532,7 +532,7 @@ export default {
       }
     },
 
-    
+
     // 下载安装包
     url_jump (app) {
       let url = app.url
@@ -589,12 +589,15 @@ export default {
   keep_alive_update: {
     // 运用缓存更新方法来完成返回后的更新
     update_common_menu_list: function (vm, data) {
-      if(this.getRole_two) {
-        vm.new_list.forEach((item)=>{
-          data.unshift(item)
-        })
-      }
-      vm.common_menu = data
+      // if(this.getRole_two) {
+      //   vm.new_list.forEach((item)=>{
+      //     data.unshift(item)
+      //   })
+      // }
+      vm.$store.dispatch('getMenu').then(res => {
+        vm.getMenu(res)
+      })
+      // vm.common_menu = data
     },
 
     update_approval_list: function (vm, data) {

+ 2 - 3
src/main.js

@@ -8,8 +8,8 @@ import './utils/validator'
 import '../css/reset.css'
 import echarts from 'echarts'
 
-import VConsole from 'vconsole'
-new VConsole()
+// import VConsole from 'vconsole'
+// new VConsole()
 
 import {
   Tabbar,Empty, TabbarItem,Grid, GridItem,Field,NavBar,Row, Col,Cell, CellGroup,Toast,Popup,Dialog,RadioGroup, Radio,Notify,
@@ -19,7 +19,6 @@ import Icon1 from 'vue2-svg-icon/Icon'
 
 import VueScroller from '@/components/common/scroller/src'
 import noData from '@/components/common/noData'
-
 import {getTypes, getUserData, isPt_id, getCache, setCache } from '@/utils/auth'
 
 Vue.prototype.$userInfo=getUserData;