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

config/dev.env.js

@@ -8,6 +8,7 @@ module.exports = {
   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://localhost:9531"',
+  // BASE_API:'"http://api.xt.test.sgjyun.com"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -17,8 +17,8 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    // host: 'xt.test.sgjyun.com',
-    // host: 'xt.kuyicloud.com',
+    //  host: 'xt.test.sgjyun.com',
+    //  host: 'xt.kuyicloud.com',
     // host: 'xt.test.sgjyun.com',
     host:'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined

src/api/common/common.js

@@ -149,7 +149,7 @@ export function getTotalLapseCount(startime, endtime) {
     startime: startime,
     endtime: endtime
   }
-
+  console.log('params', params)
   return request({
     url: '/com/api/gettotallapsecount',
     method: 'get',
@@ -174,6 +174,7 @@ export function getTotalInfectiousCount(startime, endtime) {
     startime: startime,
     endtime: endtime
   }
+  console.log('传染病', params)
   return request({
     url: '/com/api/gettoalinfectiouscount',
     method: 'get',
@@ -266,7 +267,7 @@ export function getPrescriptionByName(patientid, startime, endtime, limit, page)
     limit: limit,
     page: page
   }
-  console.log('params', params)
+  // console.log('params', params)
   return request({
     url: '/com/api/getprescriptionbyname',
     method: 'Get',
@@ -282,10 +283,11 @@ export function geStatistics(params) {
   })
 }
 
-export function getInspectionTotalCount(startime, endtime) {
+export function getInspectionTotalCount(startime, endtime, patientid) {
   const params = {
     startime: startime,
-    endtime: endtime
+    endtime: endtime,
+    patientid: patientid
   }
   return request({
     url: '/com/api/getinspectiontotalcount',

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -380,9 +380,9 @@ export default {
       this.listQuery.state = state;
       //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
-    //  console.log("开始时间",startDate)
+      console.log("开始时间",startDate)
       const endDate = moment(new Date()).format('YYYY-MM-DD')
-     // console.log("结束时间",endDate)
+      console.log("结束时间",endDate)
       var now = new Date()
       var nowMonth = now.getMonth(); //当前月
       var nowYear = now.getFullYear(); //当前年
@@ -399,11 +399,11 @@ export default {
        //统计透析总量
         this.getDialysisModeType(startDate,endDate)
         //统计转归状态
-        this.getTotalLapseCount(timeStar,timeEnd)
+        this.getTotalLapseCount(startDate,endDate)
         //统计男女比例
         this.getTotalSexCount(timeStar,timeEnd)
         //统计传染病
-        this.getTotalInfectiousCount(timeStar,timeEnd)
+        this.getTotalInfectiousCount(startDate,endDate)
         //统计年龄
         this.getTotalAgeCount(timeStar,timeEnd)
         //统计透析年龄
@@ -412,21 +412,21 @@ export default {
       //近三月
       if(state == 1){
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
-        console.log("三月前",startDate)
+        // console.log("三月前",startDate)
         var startunitx = Date.parse(startDate)/1000
-        console.log("开始时间搓",startunitx)
+        // console.log("开始时间搓",startunitx)
         const endDate = moment(new Date()).format('YYYY-MM-DD')
-        console.log("结束时间",endDate)
+        // console.log("结束时间",endDate)
          var endunitx = Date.parse(endDate)/1000
-        console.log("日期时间搓",endunitx)
+        // console.log("日期时间搓",endunitx)
          //统计透析总量
         this.getDialysisModeType(startDate,endDate)
          //统计转归状态
-        this.getTotalLapseCount(startunitx,endunitx)
+        this.getTotalLapseCount(startDate,endDate)
         //统计男女比例
         this.getTotalSexCount(startunitx,endunitx)
         //统计传染病
-        this.getTotalInfectiousCount(startunitx,endunitx)
+        this.getTotalInfectiousCount(startDate,endDate)
         //统计年龄
         this.getTotalAgeCount(startunitx,endunitx)
         //统计透析年龄
@@ -436,21 +436,21 @@ export default {
      //近半年
      if(state == 2){
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
-        console.log("6月前",startDate)
+        // console.log("6月前",startDate)
         var startunitx = Date.parse(startDate)/1000
-        console.log("开始时间搓",startunitx)
+        // console.log("开始时间搓",startunitx)
         const endDate = moment(new Date()).format('YYYY-MM-DD')
-        console.log("结束时间",endDate)
+        // console.log("结束时间",endDate)
          var endunitx = Date.parse(endDate)/1000
-        console.log("日期时间搓",endunitx)
+        // console.log("日期时间搓",endunitx)
          //统计透析总量
         this.getDialysisModeType(startDate,endDate)
          //统计转归状态
-        this.getTotalLapseCount(startunitx,endunitx)
+        this.getTotalLapseCount(startDate,endDate)
         //统计男女比例
         this.getTotalSexCount(startunitx,endunitx)
         //统计传染病
-        this.getTotalInfectiousCount(startunitx,endunitx)
+        this.getTotalInfectiousCount(startDate,endDate)
         //统计年龄
         this.getTotalAgeCount(startunitx,endunitx)
         //统计透析年龄
@@ -460,21 +460,21 @@ export default {
      //近一年
      if(state == 3){
         const startDate = moment().subtract('month', 12).format('YYYY-MM-DD')
-        console.log("6月前",startDate)
+        // console.log("6月前",startDate)
         var startunitx = Date.parse(startDate)/1000
-        console.log("开始时间搓",startunitx)
+        // console.log("开始时间搓",startunitx)
         const endDate = moment(new Date()).format('YYYY-MM-DD')
-        console.log("结束时间",endDate)
+        // console.log("结束时间",endDate)
          var endunitx = Date.parse(endDate)/1000
-        console.log("日期时间搓",endunitx)
+        // console.log("日期时间搓",endunitx)
          //统计透析总量
         this.getDialysisModeType(startDate,endDate)
          //统计转归状态
-        this.getTotalLapseCount(startunitx,endunitx)
+        this.getTotalLapseCount(startDate,endDate)
         //统计男女比例
         this.getTotalSexCount(startunitx,endunitx)
         //统计传染病
-        this.getTotalInfectiousCount(startunitx,endunitx)
+        this.getTotalInfectiousCount(startDate,endDate)
         //统计年龄
         this.getTotalAgeCount(startunitx,endunitx)
         //统计透析年龄
@@ -489,10 +489,10 @@ export default {
          if(response.data.state == 1){
           var modetype =  response.data.data.modetype
             var total =  response.data.data.total
-            console.log("total",total)
+            // console.log("total",total)
             this.total = total
            this.modetype = modetype
-           console.log("modetype",modetype)
+          //  console.log("modetype",modetype)
 
          }
       })
@@ -503,10 +503,10 @@ export default {
          if(response.data.state == 1){
           var patients =  response.data.data.patients
           this.rollOutTotal = patients.length
-          console.log("留治病人长度",patients.length)
+          // console.log("留治病人长度",patients.length)
           var patienttwo = response.data.data.patienttwo
           this.outTotal = patienttwo.length
-            console.log("转出长度", this.outTotal)
+            // console.log("转出长度", this.outTotal)
           var count = response.data.data.count
           this.patientCount = count
          }
@@ -532,11 +532,11 @@ export default {
        getTotalInfectiousCount(timeStar,timeEnd).then(response=>{
            if(response.data.state === 1){
              this.InfectiousTotal = response.data.data.total
-             console.log("===",this.InfectiousTotal)
+            //  console.log("===",this.InfectiousTotal)
              var infectious = response.data.data.count
-             console.log("infectious",infectious)
+            //  console.log("infectious",infectious)
              var otherTotal = response.data.data.otherTotal
-             console.log("otherTotal",otherTotal)
+            //  console.log("otherTotal",otherTotal)
              this.otherTotal = otherTotal
               var arr = [
                 {count:0,disease_id:2},
@@ -559,7 +559,7 @@ export default {
       getTotalAgeCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
           var ageCount =  response.data.data.ageCount
-          console.log("ageCount",ageCount)
+          // console.log("ageCount",ageCount)
           var arr = []
           arr =  ageCount.sort(this.compare('age'))
           this.ageCount = arr
@@ -595,7 +595,7 @@ export default {
       getTotalDialysisCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
            var dataage =  response.data.data.dataage
-           console.log("dataage",dataage)
+          //  console.log("dataage",dataage)
            this.dialysisAge = dataage
 
          }
@@ -605,7 +605,7 @@ export default {
   created() {
         //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
-      console.log("开始时间",startDate)
+      // console.log("开始时间",startDate)
       const endDate = moment(new Date()).format('YYYY-MM-DD')
      // console.log("结束时间",endDate)
       var now = new Date()
@@ -626,7 +626,7 @@ export default {
       //统计男女比例
       this.getTotalSexCount(timeStar,timeEnd)
       //统计传染病
-      this.getTotalInfectiousCount(timeStar,timeEnd)
+      this.getTotalInfectiousCount(startDate,endDate)
       //统计年龄
       this.getTotalAgeCount(timeStar,timeEnd)
       //统计透析年龄

src/xt_pages/qcd/components/LineChart.vue

@@ -247,7 +247,8 @@ export default {
         //   }
         // ],
         legend: this.chartOptions.legend,
-        series: this.chartOptions.series
+        series: this.chartOptions.series,
+        dataZoom: this.chartOptions.dataZoom,
       });
     },
     initChart() {

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue

@@ -264,6 +264,24 @@ 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 // 锁定区域禁止缩放
+          }
         ]
       },
     };
@@ -357,6 +375,7 @@ export default {
               this.chart.series[0].data.push(resp.data.data[i].systolic_blood_pressure)
               this.chart.series[1].data.push(resp.data.data[i].diastolic_blood_pressure)
             }
+            this.getArrLength(this.chart.xAxis.data)
           } else {
           }
         })
@@ -408,6 +427,15 @@ export default {
     },
     clickQuality(index) {
       this.quality = index;
+    },
+    getArrLength(result){
+      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
+      }
     }
   },created() {
     var date = new Date()

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

@@ -354,6 +354,24 @@
                 }
               }
             }
+          ],
+          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 // 锁定区域禁止缩放
+            }
           ]
         }
 
@@ -610,6 +628,7 @@
                 this.options2.xAxis.data.push(resp.data.data[i].date)
                 this.options2.series[0].data.push(resp.data.data[i].value)
               }
+              this.getArrLength(this.options2.xAxis.data)
 
             } else {
 
@@ -623,6 +642,15 @@
         // 把时间日期转成时间戳
         return new Date(time).getTime() / 1000;
       },
+      getArrLength(result){
+        if(result.length > 10){
+          var dataZoom_end = (10/result.length)*100;
+          this.options2.dataZoom[0].end = dataZoom_end
+        }else{
+          var dataZoom_end = 100;
+          this.options2.dataZoom[0].end = dataZoom_end
+        }
+      }
 
     }, created() {
       var date = new Date()

src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue

@@ -399,6 +399,24 @@
                 }
               }
             }
+          ],
+          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 // 锁定区域禁止缩放
+            }
           ]
         }
 
@@ -521,6 +539,7 @@
                   this.chart.xAxis.data.push(resp.data.data[i].date)
                   this.chart.series[0].data.push(resp.data.data[i].value)
                 }
+                this.getArrLength(this.chart.xAxis.data)
             } else {
             }
           })
@@ -577,6 +596,15 @@
             }
           }
         })
+      },
+      getArrLength(result){
+        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
+        }
       }
     }, created() {
       var date = new Date()

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -97,7 +97,7 @@
             <div class="tableTitle">统计表</div>
             <div>
               <el-table :data="tableData" v-loading="loading" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-                <el-table-column fixed label="透析日期" align="center">
+                <el-table-column fixed width="110" label="透析日期" align="center">
                   <template slot-scope="scope">
                     {{scope.row.schedule_date | parseTime('{y}-{m}-{d}') }}
                     <!--{{getTime(scope.row.schedule_date)}}-->
@@ -235,7 +235,7 @@
                 </el-table-column>
 
 
-                <el-table-column width="100" label="透析时长" align="center">
+                <el-table-column width="110" label="透析时长" align="center">
                   <template slot-scope="scope">
                     {{
                     scope.row.prescription.dialysis_duration_hour?scope.row.prescription.dialysis_duration_hour+'小时':''}}
@@ -252,7 +252,7 @@
                 </el-table-column>
 
 
-                <el-table-column width="100" label="抗凝剂" align="center">
+                <el-table-column width="110" label="抗凝剂" align="center">
                   <template slot-scope="scope">
                     {{GetAnticoagulantById( scope.row.prescription.anticoagulant)}}
                   </template>
@@ -423,6 +423,24 @@
                 }
               }
             }
+          ],
+          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 // 锁定区域禁止缩放
+            }
           ]
         },
         bar: {
@@ -591,11 +609,13 @@
       },
       getModeName(mode_id) {
         return this.$store.getters.treatment_mode[mode_id] != undefined ? this.$store.getters.treatment_mode[mode_id].name : ''
-      }, GetDialysisProcessIndexTableData(params) {
+      }, 
+      GetDialysisProcessIndexTableData(params) {
         this.loading = true
         GetDialysisProcessIndexTableData(params)
           .then(rs => {
             var resp = rs.data
+            console.log("resp=====",resp)
             if (resp.state == 1) {
               this.loading = false
               this.tableData = []
@@ -622,12 +642,14 @@
           GetDialysisProcessIndexChartData(params)
           .then(rs => {
             var resp = rs.data
+            console.log("resp",resp)
             if (resp.state == 1) {
               if (this.query.statistics_type != 9 && this.query.statistics_type != 10) {
                 for (let i = 0; i < resp.data.data.length; i++) {
                   this.chart.xAxis.data.push(resp.data.data[i].date)
                   this.chart.series[0].data.push(resp.data.data[i].value)
                 }
+                this.getArrLength(this.chart.xAxis.data,1)
               } else {
 
                 for (let i = 0; i < resp.data.data.length; i++) {
@@ -636,6 +658,7 @@
                   this.percent.push(resp.data.data[i].ratio)
 
                 }
+                this.getArrLength(this.bar.xAxis.data,2)
               }
             } else {
             }
@@ -697,6 +720,26 @@
           }
         })
 
+      },
+      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(type == 2){
+          if(result.length > 10){
+            var dataZoom_end = (10/result.length)*100;
+            this.bar.dataZoom[0].end = dataZoom_end
+          }else{
+            var dataZoom_end = 100;
+            this.bar.dataZoom[0].end = dataZoom_end
+          }
+        }
+        
       }
     }, created() {
       var date = new Date()

src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue

@@ -266,6 +266,24 @@ 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 // 锁定区域禁止缩放
+          }
         ]
       },
     };
@@ -362,6 +380,7 @@ export default {
               this.chart.xAxis.data.push(resp.data.data[i].date)
               this.chart.series[0].data.push(parseFloat(resp.data.data[i].value).toFixed(1))
             }
+            this.getArrLength(this.chart.xAxis.data)
           } else {
           }
         })
@@ -410,6 +429,15 @@ export default {
         }
       })
     },
+    getArrLength(result){
+      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
+      }
+    }
   },created() {
     var date = new Date()
     var year = date.getFullYear() //获取完整的年份(4位)

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -46,7 +46,10 @@
         <p class="pointTitle">指标正常范围值</p>
       </div>
       <div class="cell clearfix newDisplay">
-        <span class="index" v-for="(item,index) in normdata" :key="index ">{{item.item_name}}({{item.min_range}}-{{item.large_range}})</span>
+        <span class="index" v-for="(item,index) in normdata" :key="index ">
+          <span v-if="item.range_type == 1">{{item.item_name}}({{item.min_range}}-{{item.large_range}})</span> 
+          <span v-if="item.range_type == 2">{{item.item_name}}({{item.range_value}})</span> 
+        </span>
       </div>
     </div>
   </div>
@@ -106,6 +109,7 @@ export default {
       lapseto:0,
       type:1,
       mode_type:"",
+      range_type:"",
       chart: {
         title: {
           text: "ECharts 入门示例"
@@ -273,8 +277,12 @@ export default {
         //第四季度
          const four_qurter_start = moment().month(9).startOf('month').format("YYYY-MM-DD")
          const four_qurter_end = moment().month(11).endOf('month').format("YYYY-MM-DD")
- 
-     
+         console.log("this.modetype",this.mode_type)
+         for(let i=0;i<this.normdata.length;i++){
+            if(this.normdata[i].inspection_minor == this.mode_type){
+               this.range_type = this.normdata[i].range_type
+            }
+         }
          const params = {
            lapseto:this.lapseto,
            itemtype:this.type,
@@ -289,13 +297,14 @@ export default {
            three_qurter_end:three_qurter_end,
            four_qurter_start:four_qurter_start,
            four_qurter_end:four_qurter_end,
+           range_type:this.range_type
          }
       getProjectList(params).then(response=>{
         if(response.data.state === 1){
           var list = response.data.data.list
-      
+          console.log("list",list)
           var standList =  response.data.data.standList
-         
+          console.log("standlist",standList)
           var newArr = [
             {Total:"第一季度",Count:1,NoCount: 0},
             {Total:"第二季度",Count:1,NoCount: 0},

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -91,7 +91,11 @@
         <p class="pointTitle">指标正常范围值</p>
       </div>
       <div class="cell clearfix newDisplay">
-         <span v-for="(item,index) in normData" :key="index" class="index">{{item.item_name}}({{item.min_range}}-{{item.large_range}})</span> 
+         <span v-for="(item,index) in normData" :key="index" class="index">
+           {{item.item_name}}
+           <span v-if="item.range_type == 1">({{item.min_range}}-{{item.large_range}})</span>
+           <span v-if="item.range_type == 2">({{item.range_value}})</span>
+        </span> 
       </div>
     </div>
   </div>
@@ -266,6 +270,24 @@ 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 // 锁定区域禁止缩放
+          }
+        ]
       }
     };
   },
@@ -310,7 +332,7 @@ export default {
         this.getlist()
       }
     },
-     getTimestamp(time) {
+    getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
@@ -456,6 +478,7 @@ export default {
       getNormData().then(response=>{
          if(response.data.state === 1){
            var normdata = response.data.data.normdata
+          //  console.log("指标正常范围",normdata)
            this.normData = normdata
            this.getlist()
          }
@@ -568,7 +591,13 @@ export default {
       getFirstQuarter(params).then(response=>{
          if(response.data.state === 1){
             var count =  response.data.data.count
-            console.log("count",count)  
+            // console.log("count",count) 
+            var countwo = response.data.data.countwo 
+            // console.log("countwo",countwo)
+            countwo.map(item=>{
+              count.push(item)
+            })
+          //  console.log("count",count)
             //获取已经配置的数据 
             var arr=[]
             for(let i=0;i<count.length;i++){  
@@ -578,7 +607,7 @@ export default {
                 }
               }
             }
-           console.log("arr",arr )
+          //  console.log("arr",arr )
            
             var arrtwo =  this.arrayDate(count,this.normData)
             for(let i=0;i<arrtwo.length;i++){
@@ -590,7 +619,7 @@ export default {
             arrtwo.map(item => {
               arr.push(item)
             })
-            // arr.sort(this.compare('sort'))    
+            arr.sort(this.compare('sort'))    
             for(const key in this.normData ){
                this.modesData.xAxis.push(this.normData[key].item_name);
                 if(key in arr){
@@ -601,18 +630,18 @@ export default {
             }
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
-    
+            this.getArrLength(this.chart.xAxis.data)
 
           
          }
       })
     },
-   compare(property){
-        return function(a,b){
-            var value1 = a[property];
-            var value2 = b[property];
-            return value1 - value2;
-        }
+    compare(property){
+      return function(a,b){
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;
+      }
     },
     arrayDate(array1,array2){
         var array1 = array1;
@@ -636,6 +665,15 @@ export default {
         }
         return result;
     },
+    getArrLength(result){
+      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
+      }
+    }
   },
   created(){
      //获取指标正常范围值

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -78,7 +78,8 @@
             <el-table-column fixed prop="name" label="姓名" width="100"></el-table-column>
             <el-table-column label="透析号" width="80">
               <template slot-scope="scope">
-                  {{getDialysisNo(scope.row.name)}}
+                  <!-- {{getDialysisNo(scope.row.name)}} -->
+                  {{scope.row.dialysis_no}}
               </template>
             </el-table-column>
             <el-table-column

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -74,13 +74,18 @@
                 </el-option>
             </el-select>
           </el-form-item>
-
-          <!-- <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
-            <el-input style="width:200px" v-model="form.min_range"></el-input>&nbsp;
-            -
-            <el-input style="width:200px" v-model="form.large_range"></el-input>
-          </el-form-item> -->
-          <div style="display:flex;">
+       
+            <el-form-item label="检验类型" :label-width="formLabelWidth" required prop="check_type">
+                    <el-radio
+                      :disabled = "true"
+                      v-model="form.check_type"
+                      v-for="item in radioType"
+                      :key="item.label"
+                      :label="item.value"
+                      :value="item.label"
+                      >{{ item.label }}</el-radio>
+            </el-form-item>  
+          <div style="display:flex;" v-show="showOne">
             <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="min_range">
                 <el-input style="width:200px" v-model="form.min_range"></el-input>
             </el-form-item>
@@ -89,6 +94,11 @@
                 <el-input style="width:200px" v-model="form.large_range"></el-input>
             </el-form-item>
           </div>
+          <div v-show="showTwo">
+            <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="range_value">
+                <el-input style="width:200px" v-model="form.range_value"></el-input>
+            </el-form-item>
+          </div>
           <el-form-item label="排序" :label-width="formLabelWidth">
             <el-input style="width:200px" v-model="form.sort"></el-input>
           </el-form-item>
@@ -125,12 +135,18 @@
                 </el-option>
             </el-select>
           </el-form-item>
-          <!-- <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="large_range">
-            <el-input style="width:200px" v-model="editform.min_range"></el-input>&nbsp;
-            -
-            <el-input style="width:200px" v-model="editform.large_range"></el-input>
-          </el-form-item> -->
-           <div style="display:flex;">
+          <el-form-item label="检验类型" :label-width="formLabelWidth" required prop="check_type">
+                <el-radio
+                  :disabled = "true"
+                   v-model="editform.check_type"
+                   v-for="item in radioType"
+                   :key="item.label"
+                   :label="item.value"
+                   :value="item.label"
+                  >{{ item.label }}
+                </el-radio>
+            </el-form-item> 
+           <div style="display:flex;" v-show="showOne">
             <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="min_range">
                 <el-input style="width:200px" v-model="editform.min_range"></el-input>
             </el-form-item>
@@ -138,6 +154,11 @@
             <el-form-item class='newFormItem' :label-width="formLabelWidth" required prop="large_range">
                 <el-input style="width:200px" v-model="editform.large_range"></el-input>
             </el-form-item>
+          </div>
+            <div v-show="showTwo">
+            <el-form-item label="质控范围" :label-width="formLabelWidth" required prop="range_value">
+                <el-input style="width:200px" v-model="editform.range_value"></el-input>
+            </el-form-item>
           </div>
           <el-form-item label="排序" :label-width="formLabelWidth">
             <el-input style="width:200px" v-model="editform.sort"></el-input>
@@ -169,6 +190,10 @@ export default {
         { path: false, name: "统计配置" },
         { path: false, name: "质控达标统计配置" }
       ],
+     radioType: [
+        { value: 1, label: "数值范围" },
+        { value: 2, label: "选项" }
+      ],
       tabActiveName: "control",
       InspectionMajor:[],
       InspectionMinor:[],
@@ -183,6 +208,8 @@ export default {
         min_range: "",
         large_range: "",
         sort:"",
+        check_type:"",
+        range_value:"",
       },
       editform:{
          id:0,
@@ -191,16 +218,21 @@ export default {
          min_range: "",
          large_range: "",
          sort:"",
+         check_type:"",
+         range_value:"",
       },
       rules: {
         inspectionMajor: [{ required: true, message: "检查大项不能为空" }],
         inspectionMinor: [{ required: true, message: "检查小项不能为空" }],
         large_range:[{required:true,message:"质控范围不能为空"}],
-        min_range:[{required:true,message:"质控范围不能为空"}]
+        min_range:[{required:true,message:"质控范围不能为空"}],
+        check_type:[{required:true,message:"检验类型不能为空"}]
       },
       page:1,
       limit:10,
       total:0,
+      showOne:true,
+      showTwo:false,
     };
   },
   methods: {
@@ -216,13 +248,27 @@ export default {
       getConfigurationDetail(id).then(response=>{
          if(response.data.state == 1){
            var configurationdetail = response.data.data.configurationdetail
-          console.log("详情",configurationdetail)
+           console.log("详情",configurationdetail)
            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){
+              this.showOne = true
+              this.showTwo = false
+           }
+         if(configurationdetail.range_type == 2){
+             this.showOne = false
+             this.showTwo = true
+           }
+         if (configurationdetail.range_value == ""){
+             this.editform.range_value = "0"
+           }
            this.editform.large_range = configurationdetail.large_range
            this.editform.min_range = configurationdetail.min_range
-           if(configurationdetail.sort == 0){
+           
+         if(configurationdetail.sort == 0){
             this.editform.sort = ""
             return
            }
@@ -236,7 +282,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
          
         }
@@ -268,9 +314,27 @@ export default {
        getInspectionRange(id).then(response=>{
          if(response.data.state == 1){
            var inspectionRange =  response.data.data.inspectionRange
-          console.log("inspectionRange",inspectionRange)
-           this.form.min_range = inspectionRange.range_min
-           this.form.large_range = inspectionRange.range_max
+           console.log("inspectionRange",inspectionRange)
+           if(inspectionRange.range_type == 1){
+             this.showOne = true
+             this.showTwo = false
+             this.form.check_type =  1
+             this.editform.check_type = 1
+             this.form.min_range = inspectionRange.range_min
+             this.form.large_range = inspectionRange.range_max
+             this.form.range_value  = "0"
+           }
+           if(inspectionRange.range_type == 2){
+             this.showOne = false
+             this.showTwo = true
+             this.form.check_type = 2
+             this.editform.check_type = 2
+             this.form.min_range = inspectionRange.range_min
+             this.form.large_range = inspectionRange.range_max
+             this.form.range_value = inspectionRange.range_value
+             this.editform.range_value = inspectionRange.range_value
+           }
+          
          }
       })
     },

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

@@ -72,7 +72,7 @@
             <template slot-scope="scope">{{ scope.row.name}}</template>
          </el-table-column>
          <el-table-column
-          :label="modeItem.project_name"
+          :label="modeItem.project_name+'('+modeItem.inspection_frequency+'天)'"
           property="number"
           align="center"
           min-width="110"
@@ -80,7 +80,8 @@
           :key="index"
         >
           <template slot-scope="scope">
-              {{ scope.row.data[index].Count}}
+             <span v-if="Math.floor(90/modeItem.inspection_frequency) <= scope.row.data[index].Count" style="color:black">{{ scope.row.data[index].Count}}</span>
+              <span v-if="Math.floor(90/modeItem.inspection_frequency) > scope.row.data[index].Count" style="color:red">{{ scope.row.data[index].Count}}</span>
           </template>
         </el-table-column>
         </el-table>
@@ -90,7 +91,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="listQuery.page"
-          :page-sizes="[20, 40, 60, 80,100]"
+          :page-sizes="[10, 20, 30, 40,50]"
           :page-size="10"
           background
           style="margin-top:20px;"
@@ -113,7 +114,7 @@ export default {
         start_time: "",
         end_time: "",
         page: 1,
-        limit: 20
+        limit: 10
       },
       value: "请选项",
       tableData: [],
@@ -203,7 +204,7 @@ export default {
       getAllMajorInspection().then(response=>{
         if(response.data.state === 1){
            var inspection = response.data.data.inspection
-        
+           console.log("inspection",inspection)
            var a=[];
            for(let i=0;i<inspection.length;i++){
              a.push(inspection[i])
@@ -219,16 +220,17 @@ export default {
       })
     },
     getPatientList(){
+        this.tableData = []
       getPatientList(this.listQuery.start_time,this.listQuery.end_time,this.listQuery.limit,this.listQuery.page).then(response=>{
          if(response.data.state === 1){
            var patientInfo = response.data.data.patientInfo
-          
+           console.log("patientInfo",patientInfo)
 
            var total = response.data.data.total
         
            this.total = total
           var list = response.data.data.list
-       
+          console.log("counts",list)
           var dtd = []
           for(let i=0;i<list.length;i++){
               for(let j=0;j<this.tableName.length;j++){
@@ -261,7 +263,7 @@ export default {
               }
               this.tableData.push({ name: key, data: dd[key]});
             }
-       
+            console.log("表哥",this.tableData)
             let projectArr = []
           
             this.newArr.map(item => {

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

@@ -181,6 +181,24 @@ 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 // 锁定区域禁止缩放
+          }
         ]
       },
       pickerOptions: {
@@ -216,7 +234,7 @@ export default {
       } else {
       }
     },
-   getTimestamp(time) {
+    getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
@@ -227,68 +245,69 @@ export default {
       })
     },
     getInspectionTotalCount(){
-          this.modesData.series = []
-          this.modesData.xAxis = []
+      this.modesData.series = []
+      this.modesData.xAxis = []
       getInspectionTotalCount(this.listQuery.start_time,this.listQuery.end_time).then(response=>{
-          if(response.data.state === 1){
-            var Inspection = response.data.data.Inspection
-     
-            this.tableData = Inspection
-          
-            var counts = response.data.data.counts
-         
-            var arr = []
-            for(let i=0;i<Inspection.length;i++){
-               for(let j=0;j<counts.length;j++){
-                 if(Inspection[i].inspection_major == counts[j].ProjectId){
-                   arr.push(counts[j])
-                 }
-               }
+        if(response.data.state === 1){
+          var Inspection = response.data.data.Inspection
+    
+          this.tableData = Inspection
+        
+          var counts = response.data.data.counts
+        
+          var arr = []
+          for(let i=0;i<Inspection.length;i++){
+            for(let j=0;j<counts.length;j++){
+              if(Inspection[i].inspection_major == counts[j].ProjectId){
+                arr.push(counts[j])
+              }
             }
+          }
+        
+          var arrtwo =  this.arrayDate(counts,this.normData)
           
-           var arrtwo =  this.arrayDate(counts,this.normData)
-            
-            var hash = {};
-            var i = 0;
-            var res = [];
-            arr.forEach(function(item) {
-             var ProjectName = item.ProjectName;
-             hash[ProjectName] ? res[hash[ProjectName] - 1].Count.push(item.Count) : hash[ProjectName] = ++i && res.push({
-                 Count: [item.Count],
-                 ProjectName: ProjectName,
-                 ProjectId: item.ProjectId,
-                 Sort:item.Sort,
-             })
-            });
-            
-            res.map(item => {
-             item.Count = eval(item.Count.join('+'))
-            })
-           
-            let arr1 = []
-            this.tableData.map(it => {
-              arr1.push(it.project_name)
+          var hash = {};
+          var i = 0;
+          var res = [];
+          arr.forEach(function(item) {
+            var ProjectName = item.ProjectName;
+            hash[ProjectName] ? res[hash[ProjectName] - 1].Count.push(item.Count) : hash[ProjectName] = ++i && res.push({
+                Count: [item.Count],
+                ProjectName: ProjectName,
+                ProjectId: item.ProjectId,
+                Sort:item.Sort,
             })
+          });
+          
+          res.map(item => {
+            item.Count = eval(item.Count.join('+'))
+          })
+          
+          let arr1 = []
+          this.tableData.map(it => {
+            arr1.push(it.project_name)
+          })
 
-            arr1.forEach((item,index)=>{
-              if(!(res[index] && item ==res[index].ProjectName)){
-                res.splice(index,0,{Count:0, ProjectName: item, Sort: index+1})
-              }
-            })
-            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))
+          arr1.forEach((item,index)=>{
+            if(!(res[index] && item ==res[index].ProjectName)){
+              res.splice(index,0,{Count:0, ProjectName: item, Sort: index+1})
             }
-            
-            this.chart.series[0].data = this.modesData.series
-            this.chart.xAxis.data = this.modesData.xAxis
+          })
+          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
+          this.getArrLength(this.chart.xAxis.data)
+        }
       })
     },
 
@@ -326,6 +345,7 @@ export default {
             }
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
+            this.getArrLength(this.chart.xAxis.data)
           }
        })
     },
@@ -362,6 +382,7 @@ export default {
             }
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
+            this.getArrLength(this.chart.xAxis.data)
          }
       })
     },
@@ -387,28 +408,37 @@ export default {
         }
         return result;
     },
-     querySearchAsync(keyword, cb) {
-        let key = ''
-        if (keyword != undefined) {
-          key = keyword
+    querySearchAsync(keyword, cb) {
+      let key = ''
+      if (keyword != undefined) {
+        key = keyword
+      }
+      let searchArray = []
+      PostSearch(key).then(response => {
+        if (response.data.state == 1) {
+            searchArray = response.data.data.patient
+            console.log("searchArray",searchArray)
+          cb(searchArray)
+        } else {
+          cb([])
         }
-        let searchArray = []
-        PostSearch(key).then(response => {
-          if (response.data.state == 1) {
-             searchArray = response.data.data.patient
-             console.log("searchArray",searchArray)
-            cb(searchArray)
-          } else {
-            cb([])
-          }
-        })
-      },
-   handleSelect(val) {
-        console.log("val",val)
-        this.listQuery.search = val.name
-        this.patient_id = val.id
-        this.onSearch()
-      },
+      })
+    },
+    handleSelect(val) {
+      console.log("val",val)
+      this.listQuery.search = val.name
+      this.patient_id = val.id
+      this.onSearch()
+    },
+    getArrLength(result){
+      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
+      }
+    }
   },
   created(){
     var nowDate = new Date();
@@ -432,9 +462,9 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
 
-   //获取该机构下的所有患者
-     this.getCurrentOrgPatients()
-   //获取检验检查项目
+    //获取该机构下的所有患者
+    this.getCurrentOrgPatients()
+    //获取检验检查项目
     this.getInspectionTotalCount()
   }
 };

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

@@ -88,7 +88,7 @@
            </el-table-column>
           <el-table-column prop="address" label="透析总次数" width="140">
             <template slot-scope="scope">
-                <span>{{ scope.row.total_dialysis + scope.row.user_sys_before_count }}</span>
+                <span>{{ getDialysisCount(scope.row.patient_id)}}</span>
               </template>
           </el-table-column>
         </el-table>
@@ -124,6 +124,7 @@ export default {
         page: 1,
         limit: 20
       },
+      DialysisCount:[],
       total:0,
       options: [],
       value: "请选项",
@@ -195,8 +196,19 @@ export default {
            console.log("totallist",totallist)
           this.total = totallist  
           var prescriptionList = response.data.data.prescriptionList
+          console.log("prescriptionList",prescriptionList)
           this.getModeId(prescriptionList)
-          
+          var count = response.data.data.count
+          console.log("count",count)
+          this.DialysisCount = count
+          // for(let i=0;i<count.length;i++){
+          //  for(let j=0;j<prescriptionList.length;j++){
+          //    if(count[i].patient_id == prescriptionList[j].patient_id){
+          //         prescriptionList[j].count = count[i].Count
+          //    }
+          //  }
+          // }
+          // console.log("prescriptionList",prescriptionList)
           let dataInfo = {}
           list.forEach((item, index) => {
             let { patient_id } = item
@@ -213,7 +225,7 @@ export default {
             }
           })
           let list = Object.values(dataInfo)
-          //console.log("arr",list)    
+          console.log("arr",list)    
           list.map(item => {
             for (let i = 0; i < prescriptionList.length; i++) {
               if (item.patient_id === prescriptionList[i].patient_id) {
@@ -239,6 +251,15 @@ export default {
 				return age;
 			}
     },
+    getDialysisCount(id){
+       var count = 0
+       for(let i=0;i<this.DialysisCount.length;i++){
+           if(id == this.DialysisCount[i].patient_id){
+              count = this.DialysisCount[i].Count
+           }
+       }
+       return count
+    },
     onSearch(){
       if(this.listQuery.search == "" || this.listQuery.search == null){
          this.getDialysisList()

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -251,6 +251,24 @@ 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 // 锁定区域禁止缩放
+          }
         ]
       }
     };
@@ -358,6 +376,7 @@ export default {
 
               }
             }
+            this.getArrLength(this.bar.xAxis.data)
           } else {
           }
         })
@@ -381,6 +400,15 @@ export default {
       if (this.activeName == "second") {
         this.$router.push({ path: "/qcd/workAnalysis/nurse" });
       }
+    },
+    getArrLength(result){
+      if(result.length > 10){
+        var dataZoom_end = (10/result.length)*100;
+        this.bar.dataZoom[0].end = dataZoom_end
+      }else{
+        var dataZoom_end = 100;
+        this.bar.dataZoom[0].end = dataZoom_end
+      }
     }
   },created(){
     var date = new Date()

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -286,6 +286,24 @@
                 }
               }
             }
+          ],
+          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 // 锁定区域禁止缩放
+            }
           ]
         }
       };
@@ -386,6 +404,7 @@
                   this.percent.push(resp.data.data[i].mission_ratio)
                 }
               }
+              this.getArrLength(this.bar.xAxis.data)
 
             } else {
             }
@@ -410,6 +429,15 @@
         if (this.activeName == "first") {
           this.$router.push({ path: "/qcd/workAnalysis/doctor" });
         }
+      },
+      getArrLength(result){
+        if(result.length > 10){
+          var dataZoom_end = (10/result.length)*100;
+          this.bar.dataZoom[0].end = dataZoom_end
+        }else{
+          var dataZoom_end = 100;
+          this.bar.dataZoom[0].end = dataZoom_end
+        }
       }
     },created(){
       var date = new Date()