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

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/bloodPressure.vue

@@ -89,7 +89,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData" style="width: 100%" :height="tableHeight" >
+              <el-table :data="tableData" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column fixed label="日期" align="center">
                   <template slot-scope="scope">
                     {{scope.row.schedule_date | parseTime("{y}-{m}-{d}") }}
@@ -114,15 +114,15 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="透析中最低血压" align="center">
+                <el-table-column width="130" label="透析中最低血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>
+                    <div v-if="scope.row.min_monitor.diastolic_blood_pressure">{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="透析中最高血压" align="center">
+                <el-table-column width="130" label="透析中最高血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}} /{{ scope.row.max_monitor.diastolic_blood_pressure}}</div>
+                    <div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}}</div>
 
 
                   </template>
@@ -592,13 +592,16 @@
 <style lang="scss">
   .page_process {
 
-  .el-button--medium {
-    padding: 10px 8px;
-  }
+    .el-button--medium {
+      padding: 10px 8px;
+    }
 
-  .el-form-item {
-    margin-bottom: 0;
-  }
+    .el-form-item {
+      margin-bottom: 0;
+    }
+    ::-webkit-scrollbar{
+      height: 15px !important;
+    }
 
   }
 </style>

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressureDetails.vue

@@ -2,6 +2,7 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button type="primary" @click="$router.back(-1)">返回</el-button>
     </div>
     <div class="app-container">
       <div class="page_bloodPressureDetails">
@@ -92,7 +93,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData" style="width: 100%" :height="tableHeight" >
+              <el-table :data="tableData" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column fixed label="日期" align="center">
                   <template slot-scope="scope">
                     {{scope.row.schedule_date | parseTime("{y}-{m}-{d}") }}
@@ -107,13 +108,13 @@
 
                 <el-table-column label="透析中最低血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.min_monitor.systolic_blood_pressure">{{ scope.row.min_monitor.systolic_blood_pressure}} /{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>
+                    <div v-if="scope.row.min_monitor.diastolic_blood_pressure">{{ scope.row.min_monitor.diastolic_blood_pressure}}</div>
                   </template>
                 </el-table-column>
 
                 <el-table-column label="透析中最高血压" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}} /{{ scope.row.max_monitor.diastolic_blood_pressure}}</div>
+                    <div v-if="scope.row.max_monitor.systolic_blood_pressure">{{ scope.row.max_monitor.systolic_blood_pressure}}</div>
 
 
                   </template>
@@ -260,6 +261,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 // 锁定区域禁止缩放
+          }
         ]
       },
     };
@@ -352,6 +371,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 {
           }
         })
@@ -403,6 +423,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()
@@ -444,5 +473,8 @@ export default {
   .el-form-item {
     margin-bottom: 0;
   }
+  ::-webkit-scrollbar{
+    height: 15px !important;
+  }
 }
 </style>

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

@@ -72,10 +72,8 @@
     </div>
     <div class="tableTitle">统计表</div>
     <div>
-      <el-table :data="tableData" style="width: 100%" :height="tableHeight">
-
-
-        <el-table-column fixed label="姓名" align="center">
+      <el-table :data="tableData" style="width: 100%" border>
+        <el-table-column label="姓名" align="center">
           <template slot-scope="scope">
             {{scope.row.patient.name}}
           </template>
@@ -92,12 +90,12 @@
 
         <el-table-column :label="item_name" align="center">
           <template slot-scope="scope">
-            {{getValue(scope.row)}}
+            <span v-html="getValue(scope.row)"></span>
 
           </template>
         </el-table-column>
 
-        <el-table-column fixed="right" label="趋势" align="center">
+        <el-table-column label="趋势" align="center">
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="jumpDetail(scope.row)"
@@ -261,9 +259,9 @@
             let min_range_value = this.range_value_columns[2]
             let arr = min_range_value.split("~")
             if (parseFloat(row.inspect_value) > arr[1]) {
-              return row.inspect_value + "↑"
+              return row.inspect_value + "<span style='color:#F56C6C;margin-left:5px;'>↑</span>"
             } else if (parseFloat(row.inspect_value) < arr[0]) {
-              return row.inspect_value + "↓"
+              return row.inspect_value + "<span style='color:#5B98FF;margin-left:5px;'>↓</span>"
             } else {
               return row.inspect_value
             }
@@ -491,7 +489,6 @@
       }
     },
     created() {
-      this.tableHeight = (document.documentElement.clientHeight - 44) + 'px'
       var date = new Date()
       var year = date.getFullYear() //获取完整的年份(4位)
       var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1).toString() : date.getMonth() + 1 //获取当前月份(0-11,0代表1月)

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

@@ -352,6 +352,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 // 锁定区域禁止缩放
+            }
           ]
         }
 
@@ -606,6 +624,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 {
 
@@ -619,6 +638,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

@@ -81,15 +81,15 @@
               </el-table-column>
             </el-table>
           </div>
-          <div style="padding-left:10px;flex:1">
+          <div style="padding-left:10px;flex:1;width:0;">
             <div class="tableTitle">指标趋势</div>
             <div>
               <line-chart :options="chart"></line-chart>
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData" style="width: 100%"  v-loading="loading">
-                <el-table-column fixed label="监测时间" align="center">
+              <el-table :data="tableData" style="width: 100%"  v-loading="loading" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
+                <el-table-column fixed width="100" label="监测时间" align="center">
                   <template slot-scope="scope">
                     <!--{{getTime(scope.row.operate_time)}}-->
                     {{scope.row.operate_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
@@ -154,7 +154,7 @@
                 </el-table-column>
 
 
-                <el-table-column label="透析液温度" align="center">
+                <el-table-column width="110" label="透析液温度" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.dialysate_temperature?scope.row.dialysate_temperature:''}}
                   </template>
@@ -396,6 +396,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 // 锁定区域禁止缩放
+            }
           ]
         }
 
@@ -517,6 +535,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 {
             }
           })
@@ -571,6 +590,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/patientInspectionDetail.vue

@@ -243,7 +243,7 @@
         },
         stateType: 1,
         month: [
-          { value: 1, label: '本月', state: 1 },
+          { value: 1, label: '近一个月', state: 1 },
           { value: 2, label: '近三个月', state: 2 },
           { value: 3, label: '近半年', state: 3 },
           { value: 4, label: '近一年', state: 4 },

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -83,7 +83,7 @@
               </el-table-column>
             </el-table>
           </div>
-          <div style="padding-left:10px;flex:1">
+          <div style="padding-left:10px;flex:1;width:0;">
             <div class="tableTitle">指标趋势</div>
             <div>
               <line-chart :options="chart"
@@ -93,8 +93,8 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData" v-loading="loading">
-                <el-table-column fixed label="透析日期" align="center">
+              <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 width="110" label="透析日期" align="center">
                   <template slot-scope="scope">
                     {{scope.row.schedule_date | parseTime('{y}-{m}-{d}') }}
                     <!--{{getTime(scope.row.schedule_date)}}-->
@@ -107,19 +107,19 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="透析机号" align="center">
+                <el-table-column width="100" label="透析机号" align="center">
                   <template slot-scope="scope">
                     {{scope.row.device_number.number}}
                   </template>
                 </el-table-column>
 
-                <el-table-column label="干体重" align="center">
+                <el-table-column width="100" label="干体重" align="center">
                   <template slot-scope="scope">
                     {{scope.row.predialysis_evaluation.dry_weight?scope.row.predialysis_evaluation.dry_weight:''}}
                   </template>
                 </el-table-column>
 
-                <el-table-column label="透前体重" align="center">
+                <el-table-column width="100" label="透前体重" align="center">
                   <template slot-scope="scope">
                     {{
                     scope.row.predialysis_evaluation.weight_before?scope.row.predialysis_evaluation.weight_before:''}}
@@ -127,7 +127,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="透后体重" align="center">
+                <el-table-column width="100" label="透后体重" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.assessment_after_dislysis.weight_after ?
                     scope.row.assessment_after_dislysis.weight_after :''}}
@@ -135,7 +135,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="目标超滤量" align="center">
+                <el-table-column width="110" label="目标超滤量" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.prescription.target_ultrafiltration ? scope.row.prescription.target_ultrafiltration :
                     ''}}
@@ -143,7 +143,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="实际超滤量" align="center">
+                <el-table-column width="110" label="实际超滤量" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.assessment_after_dislysis.actual_ultrafiltration ?
                     scope.row.assessment_after_dislysis.actual_ultrafiltration :''}}
@@ -152,7 +152,7 @@
                 </el-table-column>
 
 
-                <el-table-column label="透前血压" align="center">
+                <el-table-column width="100" label="透前血压" align="center">
                   <template slot-scope="scope">
                     <div
                       v-if="scope.row.predialysis_evaluation.systolic_blood_pressure && scope.row.predialysis_evaluation.diastolic_blood_pressure">
@@ -164,7 +164,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="透后血压" align="center">
+                <el-table-column width="100" label="透后血压" align="center">
                   <template slot-scope="scope">
                     <div
                       v-if="scope.row.assessment_after_dislysis.systolic_blood_pressure&&scope.row.assessment_after_dislysis.diastolic_blood_pressure">
@@ -177,7 +177,7 @@
                 </el-table-column>
 
 
-                <el-table-column label="透前脉率" align="center">
+                <el-table-column width="100" label="透前脉率" align="center">
                   <template slot-scope="scope">
                     {{
                     scope.row.predialysis_evaluation.pulse_frequency?scope.row.predialysis_evaluation.pulse_frequency:''}}
@@ -185,7 +185,7 @@
                   </template>
                 </el-table-column>
 
-                <el-table-column label="透后脉率" align="center">
+                <el-table-column width="100" label="透后脉率" align="center">
                   <template slot-scope="scope">
                     {{
                     scope.row.assessment_after_dislysis.pulse_frequency?scope.row.assessment_after_dislysis.pulse_frequency:''}}
@@ -194,21 +194,21 @@
                 </el-table-column>
 
 
-                <el-table-column label="透析模式" align="center">
+                <el-table-column width="100" label="透析模式" align="center">
                   <template slot-scope="scope">
                     {{ getModeName(scope.row.prescription.mode_id)}}
                   </template>
                 </el-table-column>
 
 
-                <el-table-column label="透析器" align="center">
+                <el-table-column width="100" label="透析器" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.prescription.dialyzer_perfusion_apparatus}}
                   </template>
                 </el-table-column>
 
 
-                <el-table-column label="钾" align="center">
+                <el-table-column width="100" label="钾" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.prescription.kalium?scope.row.prescription.kalium:''}}
 
@@ -216,7 +216,7 @@
                 </el-table-column>
 
 
-                <el-table-column label="钠" align="center">
+                <el-table-column width="100" label="钠" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.prescription.sodium?scope.row.prescription.sodium:''}}
 
@@ -224,7 +224,7 @@
                 </el-table-column>
 
 
-                <el-table-column label="钙" align="center">
+                <el-table-column width="100" label="钙" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.prescription.calcium?scope.row.prescription.calcium:''}}
 
@@ -232,7 +232,7 @@
                 </el-table-column>
 
 
-                <el-table-column 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+'小时':''}}
@@ -242,14 +242,14 @@
 
                 </el-table-column>
 
-                <el-table-column label="血管通路" align="center">
+                <el-table-column width="100" label="血管通路" align="center">
                   <template slot-scope="scope">
                     {{ QueryOperaById(scope.row.predialysis_evaluation.blood_access_part_opera_id)}}
                   </template>
                 </el-table-column>
 
 
-                <el-table-column label="抗凝剂" align="center">
+                <el-table-column width="110" label="抗凝剂" align="center">
                   <template slot-scope="scope">
                     {{GetAnticoagulantById( scope.row.prescription.anticoagulant)}}
                   </template>
@@ -419,6 +419,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: {
@@ -626,6 +644,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,1)
               } else {
 
                 for (let i = 0; i < resp.data.data.length; i++) {
@@ -634,6 +653,7 @@
                   this.percent.push(resp.data.data[i].ratio)
 
                 }
+                this.getArrLength(this.bar.xAxis.data,2)
               }
             } else {
             }
@@ -692,6 +712,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()
@@ -723,13 +763,16 @@
 <style lang="scss">
   .page_process {
 
-  .el-button--medium {
-    padding: 10px 8px;
-  }
+    .el-button--medium {
+      padding: 10px 8px;
+    }
 
-  .el-form-item {
-    margin-bottom: 0;
-  }
+    .el-form-item {
+      margin-bottom: 0;
+    }
+    ::-webkit-scrollbar{
+      height: 15px !important;
+    }
 
   }
 </style>

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

@@ -90,7 +90,7 @@
             <div class="tableTitle">统计表</div>
             <div>
 
-              <el-table :data="tableData" style="width: 100%" :height="tableHeight" >
+              <el-table :data="tableData" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column fixed label="日期" align="center">
                   <template slot-scope="scope">
                     {{scope.row.assessment_date | parseTime("{y}-{m}-{d}") }}
@@ -605,6 +605,9 @@
   .el-form-item {
     margin-bottom: 0;
   }
+  ::-webkit-scrollbar{
+    height: 15px !important;
+  }
 
   }
 </style>

src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue

@@ -2,6 +2,7 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button type="primary" @click="$router.back(-1)">返回</el-button>
     </div>
     <div class="app-container">
       <div class="page_weightDetails">
@@ -94,7 +95,7 @@
             </div>
             <div class="tableTitle">统计表</div>
             <div>
-              <el-table :data="tableData" style="width: 100%" :height="tableHeight" >
+              <el-table :data="tableData" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column fixed label="日期" align="center">
                   <template slot-scope="scope">
                     {{scope.row.assessment_date | parseTime("{y}-{m}-{d}") }}
@@ -263,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 // 锁定区域禁止缩放
+          }
         ]
       },
     };
@@ -358,6 +377,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 {
           }
         })
@@ -404,6 +424,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位)
@@ -444,5 +473,8 @@ export default {
   .el-form-item {
     margin-bottom: 0;
   }
+  ::-webkit-scrollbar{
+    height: 15px !important;
+  }
 }
 </style>

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -270,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 // 锁定区域禁止缩放
+          }
+        ]
       }
     };
   },
@@ -314,7 +332,7 @@ export default {
         this.getlist()
       }
     },
-     getTimestamp(time) {
+    getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
@@ -612,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;
@@ -647,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/patientComplianceDetails.vue

@@ -2,6 +2,7 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button type="primary" @click="$router.back(-1)">返回</el-button>
     </div>
     <div class="app-container">
       <div class="page_patientComplianceDetails">
@@ -530,5 +531,8 @@ export default {
   .el-form-item {
     margin-bottom: 0;
   }
+  ::-webkit-scrollbar{
+    height: 15px !important;
+  }
 }
 </style>

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -75,8 +75,8 @@
         </div>
         <div>
           <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
-            <el-table-column fixed prop="name" label="姓名" width="120"></el-table-column>
-            <el-table-column   label="透析号" width="150">
+            <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)}} -->
                   {{scope.row.dialysis_no}}
@@ -86,15 +86,19 @@
               :label="modeItem.item_name"
               property="number"
               align="center"
-              min-width="100"
+              min-width="120"
               v-for="(modeItem, index) in normData"
               :key="index"
             >
             <template slot-scope="scope">
-                 <span v-if="scope.row.data[modeItem.item_name].inspect_value == ''">0</span>
-                 <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) < parseInt(scope.row.data[modeItem.item_name].range_min))">{{scope.row.data[modeItem.item_name].inspect_value}}↓</span>
-                <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) > parseInt(scope.row.data[modeItem.item_name].range_max))">{{scope.row.data[modeItem.item_name].inspect_value}}↑</span>
-                <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) >= parseInt(scope.row.data[modeItem.item_name].range_min))&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) <= parseInt(scope.row.data[modeItem.item_name].range_max)) ">{{scope.row.data[modeItem.item_name].inspect_value}}</span>
+              <span v-if="scope.row.data[modeItem.item_name].inspect_value == ''">0</span>
+              <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) < parseInt(scope.row.data[modeItem.item_name].range_min))">
+                <span >{{scope.row.data[modeItem.item_name].inspect_value}}</span><span style="color:#5B98FF;margin-left:5px;">↓</span>
+              </span>
+              <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) > parseInt(scope.row.data[modeItem.item_name].range_max))">
+                <span>{{scope.row.data[modeItem.item_name].inspect_value}}</span><span style="color:#F56C6C;margin-left:5px;">↑</span>
+              </span>
+              <span v-if="scope.row.data[modeItem.item_name].inspect_value !=''&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) >= parseInt(scope.row.data[modeItem.item_name].range_min))&& (parseInt(scope.row.data[modeItem.item_name].inspect_value) <= parseInt(scope.row.data[modeItem.item_name].range_max)) ">{{scope.row.data[modeItem.item_name].inspect_value}}</span>
             </template>
         </el-table-column>
             <el-table-column fixed="right" label="操作" width="100">
@@ -774,6 +778,7 @@ export default {
     font-size: 13px;
   }
 }
+
 </style>
 
 <style lang="scss">
@@ -784,5 +789,8 @@ export default {
   .cell {
     text-align: center;
   }
+  ::-webkit-scrollbar{
+    height: 15px !important;
+  }
 }
 </style>

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

@@ -65,7 +65,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <div style="padding-left:10px;flex:1">
+      <div style="padding-left:10px;flex:1;width:0">
         <div class="tableTitle">统计表</div>
         <el-table :data="tableData" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
           <el-table-column prop="name" label="姓名" fixed>
@@ -75,7 +75,7 @@
           :label="modeItem.project_name+'('+modeItem.inspection_frequency+'天)'"
           property="number"
           align="center"
-          min-width="100"
+          min-width="110"
           v-for="(modeItem, index) in tableName"
           :key="index"
         >
@@ -383,5 +383,8 @@ export default {
   .cell {
     text-align: center;
   }
+  ::-webkit-scrollbar{
+    height: 15px !important;
+  }
 }
 </style>

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

@@ -60,7 +60,6 @@
           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
           highlight-current-row
           @current-change="handleChange"
-          ref="tableinfo"
           >
            <el-table-column prop="dialysis_no" label="透析号" width="80">
             <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
@@ -182,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: {
@@ -196,7 +213,6 @@ export default {
       },
       obj:[],
       patient_id:0,
-      patientid:0,
     };
   },
   methods: {
@@ -218,92 +234,91 @@ export default {
       } else {
       }
     },
-   getTimestamp(time) {
+    getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
     getCurrentOrgPatients(){
       getCurrentOrgPatients().then(response=>{
-        var patients = response.data.data.patients
-        this.patientsData = patients
-        this.$refs.tableinfo.setCurrentRow(this.patientsData[0])
-        this.getInspectionTotalCount(this.patientsData[0].id)
+         var patients = response.data.data.patients
+         this.patientsData = patients
       })
     },
-    getInspectionTotalCount(id){
-          this.modesData.series = []
-          this.modesData.xAxis = []
-      getInspectionTotalCount(this.listQuery.start_time,this.listQuery.end_time,id).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])
-                 }
-               }
+    getInspectionTotalCount(){
+      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])
+              }
             }
+          }
+        
+          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));
-            })
-            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)
+        }
       })
     },
 
     //获取单个病人数据
     handleChange(val){
-      this.patientid = val.id
       this.modesData.series = []
       this.modesData.xAxis = []
-     getInspectionDetailById(val.id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
+       getInspectionDetailById(val.id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
             var patientdetail = response.data.data.patientdetail
-            // console.log("patientdetail",patientdetail)
+            console.log("patientdetail",patientdetail)
             var arr=[]
             for(let i=0;i<this.tableData.length;i++){
               for(let j=0;j<patientdetail.length;j++){
@@ -315,8 +330,8 @@ export default {
             
            let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
            let day = parseInt(time / (1000 * 60 * 60 * 24))
-          //  console.log("arr",arr)
-          //  console.log("tabledata",this.tableData)
+           console.log("arr",arr)
+           console.log("tabledata",this.tableData)
             for (const key in this.tableData) {
               this.modesData.xAxis.push(this.tableData[key].project_name);
               if (key in arr) {
@@ -330,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)
           }
        })
     },
@@ -341,7 +357,7 @@ export default {
       getSearchPatientInfo(this.patient_id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
          if(response.data.state  === 1){
            var PatientsInfo = response.data.data.PatientsInfo
-          //  console.log("patientsInfo",PatientsInfo)
+           console.log("patientsInfo",PatientsInfo)
            var arr = []
            for(let i=0;i<this.tableData.length;i++){
              for(let j=0;j<PatientsInfo.length;j++){
@@ -366,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)
          }
       })
     },
@@ -391,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();
@@ -436,10 +462,10 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
 
-   //获取该机构下的所有患者
-     this.getCurrentOrgPatients()
-  //  //获取检验检查项目
-  //   this.getInspectionTotalCount()
+    //获取该机构下的所有患者
+    this.getCurrentOrgPatients()
+    //获取检验检查项目
+    this.getInspectionTotalCount()
   }
 };
 </script>

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -69,7 +69,7 @@
         </div>
         <div class="tableTitle">统计表</div>
         <div>
-          <el-table :data="tableData" style="width: 100%" :height="tableHeight">
+          <el-table :data="tableData" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
             <el-table-column fixed label="姓名" align="center">
               <template slot-scope="scope">
                 {{scope.row.user_name}}
@@ -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

@@ -112,7 +112,7 @@
 
 
           <!--</el-table>-->
-          <el-table :data="tableData" style="width: 100%" :height="tableHeight" >
+          <el-table :data="tableData" style="width: 100%" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
             <el-table-column fixed label="姓名" align="center">
               <template slot-scope="scope">
                 {{scope.row.user_name}}
@@ -127,13 +127,6 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="换药" align="center">
-              <template slot-scope="scope">
-                {{scope.row.change_medicine_count?scope.row.change_medicine_count:''}}
-
-                <!--{{// scope.row.patient.lapseto == 1 ? '留治':'转出'}}-->
-              </template>
-            </el-table-column>
 
             <el-table-column label="治疗" align="center">
               <template slot-scope="scope">
@@ -151,7 +144,7 @@
 
             <el-table-column label="合计" align="center">
               <template slot-scope="scope">
-                {{scope.row.puncture_count + scope.row.change_medicine_count + scope.row.cure_count + scope.row.mission_count ?scope.row.puncture_count + scope.row.change_medicine_count + scope.row.cure_count + scope.row.mission_count:''}}
+                {{scope.row.puncture_count + scope.row.cure_count + scope.row.mission_count ?scope.row.puncture_count  + scope.row.cure_count + scope.row.mission_count:''}}
               </template>
             </el-table-column>
           </el-table>
@@ -200,8 +193,7 @@
         project_options:[
           {value:1, name:"治疗"},
           {value:2, name:"穿刺"},
-          {value:3, name:"换药"},
-          {value:4, name:"宣教/小结"},
+          {value:3, name:"宣教/小结"},
         ],
         crumbs: [
           { path: false, name: "质控管理" },
@@ -294,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 // 锁定区域禁止缩放
+            }
           ]
         }
       };
@@ -383,27 +393,18 @@
 
               for (let i = 0;  i < resp.data.data.length;i++){
                 this.bar.xAxis.data.push(resp.data.data[i].user_name)
-                if(this.query.statistics_type == 1){
-
+                if(this.query.statistics_type == 2){
                   this.bar.series[0].data.push(resp.data.data[i].puncture_count)
                   this.percent.push(resp.data.data[i].puncture_ratio)
-
-                }else if(this.query.statistics_type == 2){
-
-                  this.bar.series[0].data.push(resp.data.data[i].change_medicine_count)
-                  this.percent.push(resp.data.data[i].change_medicine_ratio)
-
-
-                }else if(this.query.statistics_type == 3){
+                }else if(this.query.statistics_type == 1){
                   this.bar.series[0].data.push(resp.data.data[i].cure_count)
                   this.percent.push(resp.data.data[i].cure_ratio)
-
-                }else if(this.query.statistics_type == 4){
+                }else if(this.query.statistics_type == 3){
                   this.bar.series[0].data.push(resp.data.data[i].mission_count)
                   this.percent.push(resp.data.data[i].mission_ratio)
-
                 }
               }
+              this.getArrLength(this.bar.xAxis.data)
 
             } else {
             }
@@ -428,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()