报表去掉平均、修复F5刷新权限异常的问题。

git-svn-id: https://202.107.226.68:8443/svn/Services/ResistanceMonitor@97 a05970a1-87b9-9d4f-9ee5-fa77e2ec115b

2.Web/src/store/index.js

@@ -9,7 +9,9 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
  state: {
   user_name: '' || localStorage.getItem('user_name'),
-  admin: localStorage.getItem('admin') || false,
+  admin: localStorage.getItem('admin')
+   ? localStorage.getItem('admin') == 'true' || localStorage.getItem('admin') == 1
+   : false,
   token: '' || localStorage.getItem('token'),
   name: '' || localStorage.getItem('name'),
   backend_type: localStorage.getItem('backend_type') || '1', // 1:站机端、2:中心端

2.Web/src/views/ReportStatistical.vue

@@ -62,24 +62,24 @@
      <el-table-column align="center" label="定扳反-峰值">
       <el-table-column align="center" prop="d_convert_resist_max" label="最大"> </el-table-column>
       <el-table-column align="center" prop="d_convert_resist_min" label="最小"> </el-table-column>
-      <el-table-column align="center" prop="d_convert_resist_avg" label="平均"> </el-table-column>
+      <!-- <el-table-column align="center" prop="d_convert_resist_avg" label="平均"> </el-table-column> -->
      </el-table-column>
      <el-table-column align="center" label="反扳定-峰值">
       <el-table-column align="center" prop="f_convert_resist_max" label="最大"> </el-table-column>
       <el-table-column align="center" prop="f_convert_resist_min" label="最小"> </el-table-column>
-      <el-table-column align="center" prop="f_convert_resist_avg" label="平均"> </el-table-column>
+      <!-- <el-table-column align="center" prop="f_convert_resist_avg" label="平均"> </el-table-column> -->
      </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="锁闭力">
      <el-table-column align="center" label="定位">
       <el-table-column align="center" prop="d_suobi_lock_max" label="最大"> </el-table-column>
       <el-table-column align="center" prop="d_suobi_lock_min" label="最小"> </el-table-column>
-      <el-table-column align="center" prop="d_suobi_lock_avg" label="平均"> </el-table-column>
+      <!-- <el-table-column align="center" prop="d_suobi_lock_avg" label="平均"> </el-table-column> -->
      </el-table-column>
      <el-table-column align="center" label="反位">
       <el-table-column align="center" prop="f_suobi_lock_max" label="最大"> </el-table-column>
       <el-table-column align="center" prop="f_suobi_lock_min" label="最小"> </el-table-column>
-      <el-table-column align="center" prop="f_suobi_lock_avg" label="平均"> </el-table-column>
+      <!-- <el-table-column align="center" prop="f_suobi_lock_avg" label="平均"> </el-table-column> -->
      </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="保持力">
@@ -114,24 +114,24 @@
      <el-table-column align="center" label="定扳反-峰值">
       <el-table-column align="center" prop="d_convert_resist_max" label="最大"> </el-table-column>
       <el-table-column align="center" prop="d_convert_resist_min" label="最小"> </el-table-column>
-      <el-table-column align="center" prop="d_convert_resist_avg" label="平均"> </el-table-column>
+      <!-- <el-table-column align="center" prop="d_convert_resist_avg" label="平均"> </el-table-column> -->
      </el-table-column>
      <el-table-column align="center" label="反扳定-峰值">
       <el-table-column align="center" prop="f_convert_resist_max" label="最大"> </el-table-column>
       <el-table-column align="center" prop="f_convert_resist_min" label="最小"> </el-table-column>
-      <el-table-column align="center" prop="f_convert_resist_avg" label="平均"> </el-table-column>
+      <!-- <el-table-column align="center" prop="f_convert_resist_avg" label="平均"> </el-table-column> -->
      </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="锁闭力">
      <el-table-column align="center" label="定位">
       <el-table-column align="center" prop="d_suobi_lock_max" label="最大"> </el-table-column>
       <el-table-column align="center" prop="d_suobi_lock_min" label="最小"> </el-table-column>
-      <el-table-column align="center" prop="d_suobi_lock_avg" label="平均"> </el-table-column>
+      <!-- <el-table-column align="center" prop="d_suobi_lock_avg" label="平均"> </el-table-column> -->
      </el-table-column>
      <el-table-column align="center" label="反位">
       <el-table-column align="center" prop="f_suobi_lock_max" label="最大"> </el-table-column>
       <el-table-column align="center" prop="f_suobi_lock_min" label="最小"> </el-table-column>
-      <el-table-column align="center" prop="f_suobi_lock_avg" label="平均"> </el-table-column>
+      <!-- <el-table-column align="center" prop="f_suobi_lock_avg" label="平均"> </el-table-column> -->
      </el-table-column>
     </el-table-column>
     <el-table-column align="center" label="保持力">