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

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -263,14 +263,14 @@ export default {
                   color: (params) => {
                     //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
                     var colorList = [
-                      ['#409EFF','#409EFF'],
-                      ['#f56c6c','#f56c6c']
-                      ];
-                    if(params.seriesName == this.otherData[params.dataIndex]){
-                      var index = 0 
-                    }else {
-                      var index = 1
-                    }
+                ['#409EFF','#409EFF'],
+                ['#f56c6c','#f56c6c']
+                ];
+              if(params.seriesName == this.otherData[params.dataIndex]){
+                var index = 0 
+                  }else {
+                  var index = 1
+                 }
                    
 
                     // var index = params.dataIndex;
@@ -299,7 +299,25 @@ export default {
                 }
               }
             }
-          ]
+          ],
+           dataZoom: [
+            {
+              //Y轴固定,让内容滚动
+              type: "slider",
+              show: false,
+              xAxisIndex: [0],
+              start: 1,
+              end: 20, //设置X轴刻度之间的间隔(根据数据量来调整)
+              zoomLock: true //锁定区域禁止缩放(鼠标滚动会缩放,所以禁止)
+            },
+            {
+              type: "inside",
+              xAxisIndex: [0],
+              start: 1,
+              end: 20,
+              zoomLock: true //锁定区域禁止缩放
+            }
+          ],
         },
       chart: {
         title: {
@@ -378,7 +396,25 @@ export default {
               }
             }
           }
-        ]
+        ],
+         dataZoom: [
+            {
+              //Y轴固定,让内容滚动
+              type: "slider",
+              show: false,
+              xAxisIndex: [0],
+              start: 1,
+              end: 20, //设置X轴刻度之间的间隔(根据数据量来调整)
+              zoomLock: true //锁定区域禁止缩放(鼠标滚动会缩放,所以禁止)
+            },
+            {
+              type: "inside",
+              xAxisIndex: [0],
+              start: 1,
+              end: 20,
+              zoomLock: true //锁定区域禁止缩放
+            }
+          ],
       },
       inspect_date:0,
       monthActive:0,
@@ -592,6 +628,11 @@ export default {
             }
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
+            if(this.rangetype == 1){
+                this.getArrLength(this.chart.xAxis.data,1)
+              }else{
+                this.getArrLength(this.char2.xAxis.data,2)
+              }
        
           }
 
@@ -649,11 +690,18 @@ 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
+
+              if(this.rangetype == 1){
+                this.getArrLength(this.chart.xAxis.data,1)
+              }else{
+                this.getArrLength(this.char2.xAxis.data,2)
+              }
             }
        })
     },
@@ -684,6 +732,26 @@ export default {
          }
         this.getlistDetail()
       },
+      getArrLength(result,type){
+        if(type == 1){
+          if(result.length > 10){
+            var dataZoom_end = (10/result.length)*100;
+            this.chart.dataZoom[0].end = dataZoom_end
+          }else{
+            var dataZoom_end = 100;
+            this.chart.dataZoom[0].end = dataZoom_end
+          }
+        }else{
+          if(result.length > 10){
+            var dataZoom_end = (10/result.length)*100;
+            this.char2.dataZoom[0].end = dataZoom_end
+          }else{
+            var dataZoom_end = 100;
+            this.char2.dataZoom[0].end = dataZoom_end
+          }
+        }
+
+      }
   },
 
    created(){

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -346,7 +346,7 @@ export default {
       getNormData().then(response=>{
          if(response.data.state == 1){
            var normdata = response.data.data.normdata
-        //  console.log("normdata",normdata)
+         console.log("normdata",normdata)
           this.normData = normdata
            var a=[];
            for(let i=0;i<normdata.length;i++){
@@ -495,15 +495,44 @@ export default {
            var patients = response.data.data.patients
             console.log("patients",patients)
             this.tablePatients = patients
+            
+            //  let dataInfothree = {}
+            //   patients.forEach((item, index) => {
+            //     let { inspect_date } = item
+            //     if (!dataInfothree[inspect_date]) {
+            //       dataInfothree[inspect_date] = {
+            //         inspect_date,
+            //         name: item.name,
+            //         child: [],
+            //         patient_id: item.patient_id,
+            //       }
+            //     }
+            //   })
+            // let patientlist = Object.values(dataInfothree)
+            // console.log("patientlist",patientlist)
+
+ 
             var total = response.data.data.total
             this.total = total
             var control = response.data.data.control
+            console.log("control",control)
            var infectiousControl =  response.data.data.infectiousControl
-        
+          // console.log("infectiouscontrol",infectiousControl)
            infectiousControl.map(item=>{
              control.push(item)
            })
-       
+          console.log("infectiouscontrol",infectiousControl)
+          
+        //  var newPatinteArr = [] 
+        //  patientlist.map(item=>{
+        //    for(let i=0;i<control.length;i++){
+        //       if(item.inspect_date == control[i].inspect_date && item.patient_id == control[i].patient_id){
+        //            item.child.push(control[i])
+        //       }
+        //    }
+        //  })
+        //  console.log("patientlist",patientlist)
+         
             var newArr = []
             // 分页
             for (let i = 0; i < control.length; i++) {
@@ -513,7 +542,7 @@ export default {
                 }
               }
             }
-       
+        
           let dataInfo = {}
           newArr.forEach((item, index) => {
             let { inspect_date } = item
@@ -554,7 +583,7 @@ export default {
               }
             }
           }
-
+           console.log("arrthree",arrthree)
           var arrfour = this.arrayDate(arrthree, newarrtwo)
           arrfour.map(item => {
             item.item_name = ''
@@ -600,7 +629,7 @@ export default {
             }
             this.tableData.push({ name: key, data: dd[key]})
           }
-
+           
           listtwo.map(item=>{
             this.tableData.map(it=>{
               if(item.inspect_date == parseInt(it.name)){

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -297,7 +297,7 @@ export default {
       getInspectionMajor().then(response=>{
         if(response.data.state == 1){
           var inspection =  response.data.data.inspection
-          // console.log("大项是什么",inspection)
+           console.log("大项是什么",inspection)
           this.InspectionMajor = inspection
          
         }