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

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -103,7 +103,7 @@
                 >
                   <p>{{ item.item_name }}</p>
                    <span v-if="item.range_type == 1 && getvlist(item.inspection_minor)!=0"><span v-if="parseInt(item.min_range)<=getvlist(item.inspection_minor) && getvlist(item.inspection_minor)<=parseInt(item.large_range) "><i class="iconfont icon-gou gou"></i></span></span>
-                   <span v-if="item.range_type == 1 && getvlist(item.inspection_minor)!=0"><span v-if="parseInt(item.min_range)>getvlist(item.inspection_minor) || getvlist(item.inspection_minor)>parseInt(item.large_range)"><i class="iconfont icon-gantanhao gth"></i></span></span> 
+                   <span v-if="item.range_type == 1 && getvlist(item.inspection_minor)!=0"><span v-if="parseInt(item.min_range)>getvlist(item.inspection_minor) || getvlist(item.inspection_minor)>parseInt(item.large_range)"><i class="iconfont icon-gantanhao gth"></i></span></span>
                    <span v-if="item.range_type == 1 && getvlist(item.inspection_minor)==0"></span>
                    <span v-if="item.range_type == 2 && getvlistwo(item.inspection_minor)!=''"><span v-if="getvlistwo(item.inspection_minor)==item.range_value"><i class="iconfont icon-gou gou"></i></span></span>
                    <span v-if="item.range_type == 2 && getvlistwo(item.inspection_minor)!=''"><span v-if="getvlistwo(item.inspection_minor)!=item.range_value"><i class="iconfont icon-gantanhao gth"></i></span></span>
@@ -386,9 +386,9 @@ export default {
                     { offset: 1, color: colorList[index][1] }
                   ]);
                 },
-                lineStyle:{ 
+                lineStyle:{
                   color:'#409eff' //改变折线颜色
-                }, 
+                },
                 barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
               },
 
@@ -456,17 +456,17 @@ export default {
          this.listQuery.end_time =""
          this.monthActive = 1
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
-    
+
         this.startime = Date.parse(startDate)/1000
-       
+
         const endDate = moment(new Date()).format('YYYY-MM-DD')
-      
+
         this.endtime = Date.parse(endDate)/1000
-    
+
         this.getlistDetail()
          this.getIdSlist()
       }
-    
+
 
        //近半年
       if(month == 2){
@@ -474,7 +474,7 @@ export default {
         this.listQuery.end_time =""
         this.monthActive = 2
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
-        
+
         this.startime = Date.parse(startDate)/1000
         const endDate = moment(new Date()).format('YYYY-MM-DD')
         this.endtime = Date.parse(endDate)/1000
@@ -507,7 +507,7 @@ export default {
            }
            if(this.normData[i].range_type == 2){
              itemName = this.normData[i].item_name
-           } 
+           }
          }
       }
       this.itemName = itemName
@@ -620,12 +620,12 @@ export default {
             // console.log("list是什么",list)
             for(let i=0;i<list.length;i++){
               if(parseInt(list[i].inspect_value)>= parseInt(list[i].range_min) && parseInt(list[i].inspect_value)<= parseInt(list[i].range_max)){
-                    this.isTrue = 1  
+                    this.isTrue = 1
                }
                if(parseInt(list[i].inspect_value)< parseInt(list[i].range_min) || parseInt(list[i].inspect_value) > parseInt(list[i].range_max)){
                     this.isTrue =0
                }
-               
+
               if(list[i].range_type == 1){
                     this.rangetype = 1
                     this.modesData.xAxis.push(this.getTime(list[i].inspect_date));
@@ -647,7 +647,7 @@ export default {
               }else{
                 this.getArrLength(this.char2.xAxis.data,2)
               }
-       
+
           }
 
        })
@@ -672,7 +672,7 @@ export default {
           var monthEndDate = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
           this.endtime =Date.parse(monthEndDate)/1000-1;//s
         }
-     
+
           const params = {
             patientid:this.patientid,
             startime:this.startime,
@@ -685,7 +685,7 @@ export default {
               var list =  response.data.data.list
               for(let i=0;i<list.length;i++){
                 if(parseInt(list[i].inspect_value)>= parseInt(list[i].range_min) && parseInt(list[i].inspect_value)<= parseInt(list[i].range_max)){
-                      this.isTrue = 1  
+                      this.isTrue = 1
                 }
                 if(parseInt(list[i].inspect_value)< parseInt(list[i].range_min) || parseInt(list[i].inspect_value) > parseInt(list[i].range_max)){
                       this.isTrue =0
@@ -704,9 +704,9 @@ export default {
                   this.char2.xAxis.data.push(this.getTime(list[i].inspect_date))
                   this.char2.series[0].name = list[i].range_value
                 }
-                
 
-            
+
+
             }
               this.chart.series[0].data = this.modesData.series
               this.chart.xAxis.data = this.modesData.xAxis
@@ -787,7 +787,7 @@ export default {
              }else{
                itemvalue = 0
              }
-             
+
           }
         }
         return itemvalue
@@ -801,7 +801,7 @@ export default {
               }else{
                 itemvalue = ''
               }
-              
+
             }
         }
         return itemvalue
@@ -810,7 +810,7 @@ export default {
 
    created(){
      this.patientid =  this.$route.query.patientid
-    
+
      this.inspect_date = this.$route.query.date
      //获取指标项
       this.getNormData()