bug修改

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -289,12 +289,15 @@ export default {
   },
   methods: {
     handleSizeChange(limit){
+      this.tableData = []
       this.listQuery.limit = limit
+      
       this.getlist()
+
     },
     handleCurrentChange(page){
+      this.tableData = []  
       this.listQuery.page = page
-
       this.getlist()
     },
     changeTime() {
@@ -490,7 +493,7 @@ export default {
       getPatientsControl(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.listQuery.page,this.listQuery.limit).then(response=>{
          if(response.data.state == 1){
            var patients = response.data.data.patients
-     
+            console.log("patients",patients)
             this.tablePatients = patients
             var total = response.data.data.total
             this.total = total
@@ -644,101 +647,32 @@ export default {
         }
         return result;
     },
-
+    //统计柱状图
     getCartogramlist(){
        getCartogramlist(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.limit,this.page).then(response=>{
            if(response.data.state == 1){
-              var cartogramlist =  response.data.data.cartogramlist
-               console.log("cartogramlist",cartogramlist)
-              var totaltwo =  response.data.data.total
-              // console.log("totaltwo",totaltwo)
-              var infectiouscontrol =  response.data.data.infectiouscontrol
-              // console.log("infectiouscontrol",infectiouscontrol)
-              infectiouscontrol.map(item=>{
-                cartogramlist.push(item)
-              })
-               var cart = []
-              //  console.log("已配置的选项",this.normData)
-              //过滤已经配置的选项
-              for(let i=0;i<cartogramlist.length;i++){
-                for(let j=0;j<this.normData.length;j++){
-                   if(cartogramlist[i].item_id == this.normData[j].inspection_minor){
-                        cart.push(cartogramlist[i])
-                   }
-                }
-              }
-               let dataInfo = {}
-                cart.forEach((item, index) => {
-                  let { patient_id } = item
-                  if (!dataInfo[patient_id]) {
-                    dataInfo[patient_id] = {
-                      patient_id,
-                      name:item.name,
-                      child: [],
-                      inspect_date:item.inspect_date,
-                      total:0,
-                      count:0,
-                      infectotal:0,
-                    }
-                  }
-                })
-              let list = Object.values(dataInfo)
-
+             var total =  response.data.data.total
+             
+             var standtotal = response.data.data.standtotal
+         
+             var standtotalone = response.data.data.standtotalOne
 
-              var arr = []
-              list.map(item=>{
-                 for(let i=0;i<cart.length;i++){
-                    if(item.inspect_date == cart[i].inspect_date && item.patient_id == cart[i].patient_id){
-                        item.child.push(cart[i])
-                    }
-                 }
-              })
-
-
-          //  console.log("list",list)
-             list.map(item=>{
-                item.child.map(it=>{
-                  //  console.log("长度",item.child.length)
-                  //  console.log("it",it)
-                   if(it.range_type == 1 && parseInt(it.range_min)<=parseInt(it.inspect_value) && parseInt(it.inspect_value)<=parseInt(it.range_max)){
-                       item.total ++
-                   }
-                   if(it.range_type == 2 && it.inspect_value == it.range_value){
-                      item.infectotal ++
-                   }
-                })
-             })
-            //  console.log("list",list)
-             var standardTotal = 0
-
-             list.map(item=>{
-               if((item.total +item.infectotal) == item.child.length){
-                  item.count ++
-               }
-             })
-             list.map(item=>{
-               standardTotal += item.count
-             })
-             var totalCount = list.length
-            //  console.log("arr",list)
-            //  console.log("合格",standardTotal)
-            //  console.log("总人数",totalCount)
+          
              for(let i=0;i<this.dataCount.length;i++){
-                this.dataCount[0].count = standardTotal
-                this.dataCount[1].count =  totalCount - standardTotal
+                this.dataCount[0].count = standtotal + standtotalone
+                this.dataCount[1].count =  total -standtotal - standtotalone
                this.obj.push(this.dataCount[i].count)
              }
             // console.log("dataCount",this.dataCount)
-         for (let i = 0; i < this.dataName.length; i++) {
-            this.modesData.xAxis.push(this.dataName[i].name)
-
-          }
-          for (let i = 0; i < this.dataCount.length; i++) {
-              this.modesData.series.push(((this.dataCount[i].count / totalCount) * 100).toFixed(1))
+            for (let i = 0; i < this.dataName.length; i++) {
+                this.modesData.xAxis.push(this.dataName[i].name)
+              }
+            for (let i = 0; i < this.dataCount.length; i++) {
+                this.modesData.series.push(((this.dataCount[i].count / total) * 100).toFixed(1))
             }
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
-            //  console.log("this",this.modesData)
+           
            }
        })
     },

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -256,10 +256,17 @@ export default {
       getConfigurationDetail(id).then(response=>{
          if(response.data.state == 1){
            var configurationdetail = response.data.data.configurationdetail
-          //  console.log("详情",configurationdetail)
+           console.log("详情",configurationdetail)
+           var id = response.data.data.vid
+           console.log("id",id)
+           if (id == 0) {
+              this.editform.inspectionMinor = configurationdetail.inspection_minor
+           }else{
+             this.editform.inspectionMinor = id
+           }
            this.editform.id = configurationdetail.id
            this.editform.inspectionMajor = configurationdetail.inspection_major
-           this.editform.inspectionMinor = configurationdetail.inspection_minor
+         
            this.editform.check_type = configurationdetail.range_type
            this.editform.range_value = configurationdetail.range_value
          if(configurationdetail.range_type == 1){
@@ -302,7 +309,7 @@ export default {
       getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
-        //  console.log("小项",inspection)
+          // console.log("小项",inspection)
          this.InspectionMinor = inspection
         }
       })
@@ -392,7 +399,7 @@ export default {
               configurationlist[i].sort = ""
             }
           }
-          // console.log("列表",configurationlist)
+          console.log("列表",configurationlist)
           this.configuraData = configurationlist
           var total = response.data.data.total
          // console.log("total",total)
@@ -406,7 +413,7 @@ export default {
         if(response.data.state == 1){
           var minor =  response.data.data.minor
           this.InspectionMinorTwo = minor
-          console.log("minor",minor)
+          // console.log("minor",minor)
         }
       })
     },
@@ -490,7 +497,7 @@ export default {
     //获取表格里面的数据
     this.getConfigurationList()
     //获取所有小项的数据
-    this.getAllInspectionMinor()
+     this.getAllInspectionMinor()
     //获取排序值
     this.getLastSort()
    },