bug修改

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -559,6 +559,7 @@ export default {
       getTotalAgeCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
           var ageCount =  response.data.data.ageCount
+          console.log("ageCount",ageCount)
           var arr = []
           arr =  ageCount.sort(this.compare('age'))
           this.ageCount = arr

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckPersonal.vue

@@ -278,11 +278,14 @@ export default {
             res.map(item => {
               this.modesData.series.push(parseInt(item.Count));
             })
-
+             console.log("this=====",this.tableData)
             for (const key in this.tableData) {
               this.modesData.xAxis.push(this.tableData[key].project_name);
+               let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
+               let day = parseInt(time / (1000 * 60 * 60 * 24))
+              this.obj.push(Math.round(day / this.tableData[key].inspection_frequency))
             }
- 
+            
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
           }

src/xt_permission.js

@@ -1,59 +1,59 @@
-import router from "./router";
-import store from "./store";
-import NProgress from "nprogress"; // progress bar
-import "nprogress/nprogress.css"; // progress bar style
+import router from './router'
+import store from './store'
+import NProgress from 'nprogress' // progress bar
+import 'nprogress/nprogress.css' // progress bar style
 
 NProgress.configure({
   showSpinner: false
-}); // NProgress Configuration
+}) // NProgress Configuration
 
-const loginWhiteList = ["/token/verify", "/401", "/404"]; // 登录验证白名单
-const permissionWhiteList = loginWhiteList.concat(["/"]); // 权限验证白名单
+const loginWhiteList = ['/token/verify', '/401', '/404'] // 登录验证白名单
+const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //  store.dispatch('VerifyConfigList', []).then(() => {
-  //    next()
-  // })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //  store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //    next()
-  //  })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
 
-  NProgress.start();
+  NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))
   // alert('path:' + to.path)
   // 如果 url 带有 lt (login_token)参数，则跳转到验证 token 时等待的页面
   if (to.query.lt != null && to.query.lt.length > 0) {
     // alert('will go to verify token: ' + to.query.lt)
     next({
-      path: "/token/verify",
+      path: '/token/verify',
       query: {
         token: to.query.lt
       }
-    });
+    })
 
     // 否则 如果没有 user 信息，则前往 sso 登录
   } else if (store.getters.xt_user.user.id === 0) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
       // alert('登录白名单内，跳过登录')
-      next();
+      next()
     } else {
       // alert('前往登录')
-      window.location.href = process.env.BASE_API + "/login"; // sso 地址
+      window.location.href = process.env.BASE_API + '/login' // sso 地址
     }
 
     // 否则 如果当前 url 不需要验证访问权限，则通过
   } else if (permissionWhiteList.indexOf(to.path) !== -1) {
     // alert('权限验证白名单内，直接进入')
-    next();
+    next()
 
     // 否则 如果拥有当前 url 的权限，则通过
     // } else if (store.getters.current_role_urls.indexOf(to.path) !== -1) {
@@ -65,11 +65,11 @@ router.beforeEach((to, from, next) => {
     // console.log(store.getters.current_role_urls)
     // console.log(store.getters.current_role_urls.indexOf(to.path))
     // alert('401')
-    next();
+    next()
     // next({ path: '/404' })
   }
-});
+})
 
 router.afterEach(() => {
-  NProgress.done();
-});
+  NProgress.done()
+})