Merge branch '20200710_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

config/dev.env.js

@@ -7,8 +7,7 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
-  BASE_API:'"http://localhost:9531"',
+  BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -195,7 +195,7 @@
               ? parseFloat(
               afterdialysis.weight_after -
               afterdialysis.additional_weight
-              ).toFixed(1)
+              ).toFixed(2)
               : "/"
               }}kg
             </span>
@@ -1245,7 +1245,7 @@ export default {
       vascularAccess: [],
       nursing_record: '',
       special_record: '',
-      newTableAdvice:[]
+      newTableAdvice: []
     }
   },
   methods: {
@@ -1433,7 +1433,7 @@ export default {
           var doctoradvce = response.data.data.doctorAdvice
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo
           this.newTableAdvice = response.data.data.doctorAdevieInfo
-          console.log("哈哈哈哈哈哈哈哈哈",this.newTableAdvice)
+          console.log('哈哈哈哈哈哈哈哈哈', this.newTableAdvice)
           var tableAdvice = doctorAdevieInfo
           console.log('tableAdvice', tableAdvice)
           // console.log('医生', tableAdvice.length)

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -153,6 +153,7 @@
 
           }
         },
+        range_type:'',
         total:0,
         item_name: '',
         query: {
@@ -279,7 +280,7 @@
       },
       jumpDetail(row){
         // this.$router.push("/qcd/indicatorControlAnalysis/bloodPressureDetails?id="+patient_id)
-        this.$router.push("/qcd/inspection/detail?project_id="+row.project_id+"&item_id="+row.item_id+"&range_type="+row.inspect_type+"&patient_id="+row.patient.id)
+        this.$router.push("/qcd/inspection/detail?project_id="+row.project_id+"&item_id="+row.item_id+"&range_type="+this.query.range_type+"&patient_id="+row.patient.id)
       },
       handleSizeChange(limit) {
         this.query.limit = limit

src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue

@@ -491,7 +491,6 @@
             this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
             // 本月的结束时间
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
@@ -502,7 +501,7 @@
             const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
             this.query.start_time = startDate
             const endDate = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
+
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
@@ -513,7 +512,7 @@
           case 3: //近半年
             this.query.start_time = moment().subtract('month', 6).format('YYYY-MM-DD')
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
+
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
@@ -523,7 +522,7 @@
           case 4: //近一年
             this.query.start_time = moment().subtract('month', 12).format('YYYY-MM-DD')
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
+
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
@@ -533,7 +532,6 @@
             this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
             // 本月的结束时间
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
@@ -608,6 +606,8 @@
                 }
               }
 
+              console.log(this.options.xAxis.data)
+
               console.log(this.options.series[0].data)
 
               //获取无法确定选项的颜色

src/xt_permission.js

@@ -12,19 +12,19 @@ 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()