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

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -6,7 +6,7 @@
     <div class="app-container">
       <div class="cell clearfix">
         <label class="title">
-          <span class="name">转归状态</span> :
+          <span class="name">日期查询</span> :
         </label>
         <div class="time">
           <ul class>
@@ -18,6 +18,9 @@
             >{{ item.label }}</li>
           </ul>
         </div>
+        <label class="title">
+             <span class="name">日期查询</span> :
+        </label>
         <el-date-picker
           v-model="listQuery.start_time"
           prefix-icon="el-icon-date"
@@ -297,10 +300,10 @@ export default {
       stateType: 0,
       month: [
         { value: 0, label: "本月", state: 0 },
-        { 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}
+        { value: 3, label: "近一年", state: 3 }
+        // { value:4,label:"自定义",state:4}
       ],
       modetype:[],
       total:0,
@@ -340,11 +343,11 @@ export default {
          //统计透析总量
         this.getDialysisModeType(val,this.listQuery.end_time)
         //统计转归状态
-        this.getTotalLapseCount(timeStar,timeEnd)
+        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time)
         //统计男女比例
         this.getTotalSexCount(timeStar,timeEnd)
         //统计传染病
-        this.getTotalInfectiousCount(timeStar,timeEnd)
+        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time)
         //统计年龄
         this.getTotalAgeCount(timeStar,timeEnd)
         //统计透析年龄
@@ -364,11 +367,11 @@ export default {
           //统计透析总量
         this.getDialysisModeType(this.listQuery.start_time,val)
         //统计转归状态
-        this.getTotalLapseCount(timeStar,timeEnd)
+        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time)
         //统计男女比例
         this.getTotalSexCount(timeStar,timeEnd)
         //统计传染病
-        this.getTotalInfectiousCount(timeStar,timeEnd)
+        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time)
         //统计年龄
         this.getTotalAgeCount(timeStar,timeEnd)
         //统计透析年龄
@@ -380,9 +383,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(); //当前年
@@ -411,6 +414,8 @@ export default {
       }
       //近三月
       if(state == 1){
+        this.listQuery.start_time = ""
+        this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
         // console.log("三月前",startDate)
         var startunitx = Date.parse(startDate)/1000
@@ -435,6 +440,8 @@ export default {
 
      //近半年
      if(state == 2){
+        this.listQuery.start_time = ""
+        this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
         // console.log("6月前",startDate)
         var startunitx = Date.parse(startDate)/1000
@@ -459,6 +466,8 @@ export default {
 
      //近一年
      if(state == 3){
+        this.listQuery.start_time = ""
+        this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 12).format('YYYY-MM-DD')
         // console.log("6月前",startDate)
         var startunitx = Date.parse(startDate)/1000
@@ -502,11 +511,12 @@ export default {
       getTotalLapseCount(startDate,endDate).then(response=>{
          if(response.data.state == 1){
           var patients =  response.data.data.patients
+          console.log('patients',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
          }
@@ -534,7 +544,7 @@ export default {
              this.InfectiousTotal = response.data.data.total
             //  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)
              this.otherTotal = otherTotal
@@ -595,7 +605,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,24 +615,24 @@ 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)
+     console.log("结束时间",endDate)
       var now = new Date()
       var nowMonth = now.getMonth(); //当前月
       var nowYear = now.getFullYear(); //当前年
       //本月的开始时间
       var monthStartDate = new Date(nowYear, nowMonth, 1);
       var timeStar=Date.parse(monthStartDate)/1000;//s
-     // console.log("本月第一天",timeStar)
+      console.log("本月第一天",timeStar)
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-     // console.log("本月最后一天",timeEnd)
+      console.log("本月最后一天",timeEnd)
       //统计透析总量
       this.getDialysisModeType(startDate,endDate)
       //统计转归状态
-      this.getTotalLapseCount(timeStar,timeEnd)
+      this.getTotalLapseCount(startDate,endDate)
       //统计男女比例
       this.getTotalSexCount(timeStar,timeEnd)
       //统计传染病
@@ -641,7 +651,7 @@ export default {
   flex-wrap: wrap;
   .infoOne {
     margin-right: 30px;
-    margin-top: 30px;
+    margin-top: 20px;
     .titleBox {
       display: flex;
       align-items: center;

src/xt_pages/qcd/checkStatistical.vue

@@ -3,7 +3,7 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
-    <div class="app-container">
+    <div class="app-container checkStatistical">
       <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
         <el-tab-pane label="质控达标统计配置" name="control"></el-tab-pane>
         <el-tab-pane label="检验检查统计配置" name="query"></el-tab-pane>
@@ -14,7 +14,7 @@
         </el-col>
       </el-row>
       <div class="configTable">
-        <el-table :data="checkList" border style="width: 100%">
+        <el-table :data="checkList" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
           <el-table-column prop="date" label="检验检查项">
               <template slot-scope="scope">{{ scope.row.project_name }}</template>
           </el-table-column>
@@ -300,6 +300,11 @@ export default {
     text-align: center;
   }
 }
+.checkStatistical{
+  .el-tabs{
+    margin-bottom: 0 !important;
+  }
+}
 </style>
 
  <style rel="stylesheet/scss" lang="scss" scoped>

src/xt_pages/qcd/indicatorControlAnalysis/analysis.vue

@@ -55,7 +55,7 @@ export default {
       ],
       way: [
         { value: 0, label: "科室", state: 0 },
-        { value: 1, label: "个人", state: 1 }
+        { value: 1, label: "患者", state: 1 }
       ],
       wayType: 0
     };
@@ -67,3 +67,12 @@ export default {
   }
 };
 </script>
+
+<style lang="scss">
+.page_analysis{
+  .el-tabs{
+    margin-bottom:0 !important;
+  }
+}
+
+</style>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="page_office">
     <div class="cell clearfix">
-      <el-select v-model="query.project_id" placeholder="请选择" style="width:120px;margin-right:20px"
+      <el-select v-model="query.project_id" placeholder="请选择" style="width:120px;margin-right:10px"
                  @change="changeProject">
         <el-option
           v-for="item in project_columns"
@@ -14,7 +14,7 @@
       <el-select
         v-model="query.item_id"
         placeholder="请选择"
-        style="width:120px;margin-right:20px"
+        style="width:120px;margin-right:10px"
         @change="changeItem"
       >
         <el-option
@@ -25,7 +25,7 @@
         ></el-option>
       </el-select>
 
-      <el-select v-model="query.range_value" placeholder="请选择" style="width:120px;margin-right:20px"
+      <el-select v-model="query.range_value" placeholder="请选择" style="width:120px;margin-right:10px"
                  @change="changeRangeValue">
         <el-option
           v-for="item in range_value_columns"

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -9,7 +9,7 @@
         <el-tab-pane label="按项目分组" name="second"></el-tab-pane>
       </el-tabs>
       <div class="cell clearfix">
-        <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:20px" @change="changeOptions">
+        <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:10px" @change="changeOptions">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -17,7 +17,7 @@
             :value="item.value"
           ></el-option>
         </el-select>
-        <el-select v-model="type" placeholder="请选择" @change="chooseType" style="margin-right:20px">
+        <el-select v-model="type" placeholder="请选择" @change="chooseType" style="margin-right:10px">
           <el-option
             v-for="item in options1"
             :key="item.value"
@@ -25,7 +25,7 @@
             :value="item.value"
           ></el-option>
         </el-select>
-        <el-select v-model="mode_type" placeholder="请选择" style="width:120px;margin-right:20px" @change="handleModeType">
+        <el-select v-model="mode_type" placeholder="请选择" style="width:120px;margin-right:0px" @change="handleModeType">
           <el-option
             v-for="item in normdata"
             :key="item.inspection_minor"
@@ -38,6 +38,10 @@
       <div class="cell clearfix">
         <p class="chartTitle">统计图</p>
       </div>
+      <div class="cell clearfix">
+        <p class="point"></p>
+        <p class="pointTitle">达标率</p>
+      </div>
       <div>
         <line-chart :options="chart"></line-chart>
       </div>
@@ -111,14 +115,14 @@ export default {
       mode_type:"",
       range_type:"",
       chart: {
-        title: {
-          text: "ECharts 入门示例"
-        },
+        // title: {
+        //   text: "ECharts 入门示例"
+        // },
         tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
-        },
+        // legend: {
+        //   data: ["次数"],
+        //   left: 0
+        // },
         xAxis: {
           data: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
         },
@@ -190,7 +194,7 @@ export default {
               emphasis: {
                 shadowBlur: 10,
                 shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+                shadowColor: "rgba(0, 0, 0, 0.2)"
               }
             }
           }
@@ -277,7 +281,7 @@ 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)
+        //  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
@@ -302,9 +306,9 @@ export default {
       getProjectList(params).then(response=>{
         if(response.data.state === 1){
           var list = response.data.data.list
-          console.log("list",list)
+           console.log("list",list)
           var standList =  response.data.data.standList
-          console.log("standlist",standList)
+           console.log("standlist",standList)
           var newArr = [
             {Total:"第一季度",Count:1,NoCount: 0},
             {Total:"第二季度",Count:1,NoCount: 0},
@@ -373,7 +377,7 @@ export default {
              }
           }
         
-      
+         console.log("arrfive",arrFive)
         
         for(const key in arrFive){
             this.modesData.xAxis.push(arrFive[key].Total);
@@ -383,6 +387,7 @@ export default {
 
           this.chart.series[0].data = this.modesData.series
           this.chart.xAxis.data = this.modesData.xAxis
+          console.log("表格",this.modesData)
        
         }
       })
@@ -569,7 +574,7 @@ export default {
        getMonthProjectList(params).then(response=>{
         if(response.data.state === 1){
             var monthlist = response.data.data.monthlist
-            console.log("monthlist",monthlist)
+            // console.log("monthlist",monthlist)
             var newArr = [
               {Total:"一月",Count:1,NoCount: 0},
               {Total:"二月",Count:1,NoCount: 0},
@@ -763,5 +768,6 @@ export default {
 }
 .newDisplay {
   flex-wrap: wrap;
+  padding-left: 20px;
 }
 </style>

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -9,7 +9,7 @@
         <el-tab-pane label="按项目分组" name="second"></el-tab-pane>
       </el-tabs>
       <div class="cell clearfix">
-        <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:20px" @change="changeLapseto">
+        <el-select v-model="lapseto" placeholder="请选择" style="width:120px;margin-right:10px" @change="changeLapseto">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -17,7 +17,7 @@
             :value="item.value"
           ></el-option>
         </el-select>
-        <el-select v-model="type" placeholder="请选择" @change="chooseType" style="margin-right:20px">
+        <el-select v-model="type" placeholder="请选择" @change="chooseType" style="margin-right:10px">
           <el-option
             v-for="item in options1"
             :key="item.value"
@@ -83,6 +83,10 @@
       <div class="cell clearfix">
         <p class="chartTitle">统计图</p>
       </div>
+      <div class="cell clearfix">
+        <p class="point"></p>
+        <p class="pointTitle">达标率</p>
+      </div>
       <div>
         <line-chart :options="chart"></line-chart>
       </div>
@@ -196,14 +200,14 @@ export default {
       ],
       monthType: 0,
       chart: {
-        title: {
-          text: "ECharts 入门示例"
-        },
+        // title: {
+        //   text: "ECharts 入门示例"
+        // },
         tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
-        },
+        // legend: {
+        //   data: ["达标率"],
+        //   left: 0
+        // },
         xAxis: {
           data: []
         },
@@ -215,7 +219,7 @@ export default {
         },
         series: [
           {
-            name: "次数",
+            name: "达标率",
             type: "bar",
             data: [],
             barWidth: 30,
@@ -265,7 +269,7 @@ export default {
               emphasis: {
                 shadowBlur: 10,
                 shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+                shadowColor: "rgba(0, 0, 0, 0.2)"
               }
             }
           }
@@ -478,7 +482,7 @@ export default {
       getNormData().then(response=>{
          if(response.data.state === 1){
            var normdata = response.data.data.normdata
-           console.log("指标正常范围",normdata)
+          //  console.log("指标正常范围",normdata)
            this.normData = normdata
            this.getlist()
          }
@@ -591,9 +595,9 @@ 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)
+          //  console.log("countwo",countwo)
             countwo.map(item=>{
               count.push(item)
             })
@@ -607,7 +611,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++){
@@ -619,7 +623,7 @@ export default {
             arrtwo.map(item => {
               arr.push(item)
             })
-            console.log("arr",arr)
+            // console.log("arr",arr)
              arr.sort(this.compare('sort'))  
             // arr.sort((a,b)=>{
             //     return projectArr.indexOf(a.ProjectName)-projectArr.indexOf(b.ProjectName);
@@ -721,5 +725,6 @@ export default {
 }
 .newDisplay {
   flex-wrap: wrap;
+  padding-left: 20px;
 }
 </style>

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -11,15 +11,34 @@
           </el-form>
         </div>
         <el-container>
-          <div style="width:150px">
+          <div style="width:160px">
+            <el-form :inline="true" :model="listQuery">
+              <el-form-item label>
+                <el-autocomplete
+                  class="checkSearch"
+                  popper-class="my-autocomplete"
+                  v-model.trim="listQuery.search"
+                  :fetch-suggestions="querySearchAsync"
+                  :trigger-on-focus="false"
+                  placeholder="病人透析号/姓名"
+                  @select="handleSelect"
+                >
+                  <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.name }}</div>
+                  </template>
+                </el-autocomplete>
+
+              </el-form-item>
+            </el-form>
             <div class="tableTitle">患者列表</div>
-            <el-table :data="patientsData" border style="width: 100%;" height="500"  highlight-current-row @current-change="handleChange">
-              <el-table-column prop="name" label="透析号" width="80">
+            <el-table :data="patientsData" border style="width: 100%;" height="500"  highlight-current-row @current-change="handleChange" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
+              <el-table-column prop="name" label="透析号" width="70">
                  <template slot-scope="scope">
                     {{scope.row.dialysis_no}}
                  </template>
               </el-table-column>
-              <el-table-column prop="date" label="透析号" width="70">
+              <el-table-column prop="date" label="姓名" width="90">
                  <template slot-scope="scope">
                     {{scope.row.name }}
                  </template>
@@ -89,6 +108,10 @@
               </div>
             </div>
             <div class="tableTitle">指标趋势</div>
+            <div class="cell clearfix">
+              <p class="point"></p>
+              <p class="pointTitle">达标率</p>
+            </div>
             <div>
               <line-chart :options="chart"></line-chart>
             </div>
@@ -131,7 +154,7 @@ export default {
       item_id:0,
       month: [
         { value: 0, label: "本月", state: 0 },
-        { value: 1, label: "近三个月", state: 1 },
+        { value: 1, label: "近三月", state: 1 },
         { value: 2, label: "近半年", state: 2 },
         { value: 3, label: "近一年", state: 3 }
       ],
@@ -147,17 +170,17 @@ export default {
       },
       patientid:0,
       monthType: 0,
-      arr: ["钙", "磷", "钙萨达撒所多", "磷", "钙", "磷", "钙", "磷"],
+      arr: [],
       quality: 0,
       chart: {
         title: {
           text: "ECharts 入门示例"
         },
         tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
-        },
+        // legend: {
+        //   data: ["次数"],
+        //   left: 0
+        // },
         xAxis: {
           data: []
         },
@@ -212,6 +235,9 @@ export default {
                     { offset: 1, color: colorList[index][1] }
                   ]);
                 },
+                lineStyle:{ 
+                  color:'#409eff' //改变折线颜色
+                }, 
                 barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
               },
 
@@ -233,7 +259,9 @@ export default {
     chooseMonth(month) {
       //一月
       if(month == 0){
-         this.monthActive = 0
+        this.listQuery.start_time = ""
+        this.listQuery.end_time =""
+        this.monthActive = 0
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
         const endDate = moment(new Date()).format('YYYY-MM-DD')
         var now = new Date()
@@ -251,6 +279,8 @@ export default {
 
       //近三月
       if(month == 1){
+         this.listQuery.start_time = ""
+         this.listQuery.end_time =""
          this.monthActive = 1
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
     
@@ -266,6 +296,8 @@ export default {
 
        //近半年
       if(month == 2){
+        this.listQuery.start_time = ""
+        this.listQuery.end_time =""
         this.monthActive = 2
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
         
@@ -277,6 +309,8 @@ export default {
 
       //近一年
       if(month == 3){
+        this.listQuery.start_time = ""
+        this.listQuery.end_time =""
         this.monthActive = 3
         const startDate = moment().subtract('month', 12).format('YYYY-MM-DD')
         this.startime = Date.parse(startDate)/1000
@@ -356,7 +390,6 @@ export default {
       })
     },
     getlist(){
-        console.log("进来没有")
         this.modesData.series = []
         this.modesData.xAxis = []
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
@@ -461,6 +494,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.point {
+  width: 13px;
+  height: 13px;
+  background: linear-gradient(
+    0deg,
+    rgba(169, 224, 243, 1),
+    rgba(159, 189, 252, 1)
+  );
+  border-radius: 7px;
+  margin-right: 8px;
+}
+.pointTitle {
+  font-size: 13px;
+}
 .containerRight {
   padding-left: 10px;
 }
@@ -475,6 +522,7 @@ export default {
   display: flex;
   flex-wrap: nowrap;
   min-width: 1800px;
+  padding-bottom: 10px;
   .qualityOne {
     width: 4.5rem;
     height: 4.5rem;
@@ -536,5 +584,8 @@ export default {
   ::-webkit-scrollbar{
     height: 15px !important;
   }
+  .el-form--inline .el-form-item{
+    margin-right:0;
+  }
 }
 </style>

src/xt_pages/qcd/patientControlAnalysis.vue

@@ -14,7 +14,7 @@
                 v-model.trim="listQuery.search"
                 :fetch-suggestions="querySearchAsync"
                 :trigger-on-focus="false"
-                placeholder="输入病人透析号/姓名"
+                placeholder="病人透析号/姓名"
                 @select="handleSelect"
               >
                 <i class="el-icon-search el-input__icon" slot="suffix"></i>
@@ -67,6 +67,10 @@
         <div class="cell clearfix">
           <p class="chartTitle">统计图</p>
         </div>
+        <div class="cell clearfix">
+          <p class="point"></p>
+          <p class="pointTitle">指标正常范围值</p>
+        </div>
         <div>
           <line-chart :options="chart"></line-chart>
         </div>
@@ -110,7 +114,7 @@
         </el-table-column>
             <el-table-column fixed="right" label="操作" width="100">
               <template slot-scope="scope">
-                <el-button @click="handleClick(scope.row.patient_id,scope.row.inspect_date)" type="text" size="small">查看</el-button>
+                <el-button @click="handleClick(scope.row.patient_id,scope.row.inspect_date)" style="font-size:14px;" type="text" size="small">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -184,16 +188,16 @@ export default {
         series: []
       },
       chart: {
-        title: {
-          text: "ECharts 入门示例"
-        },
+        // title: {
+        //   text: "ECharts 入门示例"
+        // },
         tooltip: {},
-        legend: {
-          data: ["次数"],
-          left: 0
-        },
+        // legend: {
+        //   data: ["次数"],
+        //   left: 0
+        // },
         xAxis: {
-          data: ["达标", "未达标"]
+          data: []
         },
         yAxis: {
           axisLabel: {
@@ -205,7 +209,7 @@ export default {
           {
             name: "次数",
             type: "bar",
-            data: ["78.57", "50"],
+            data: [],
             barWidth: 30,
             label: {
               normal: {
@@ -256,7 +260,7 @@ export default {
               emphasis: {
                 shadowBlur: 10,
                 shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 0.5)"
+                shadowColor: "rgba(0, 0, 0, 0.2)"
               }
             }
           }
@@ -365,7 +369,7 @@ export default {
        getPatientContorlAnalysis(params).then(response=>{
            if(response.data.state == 1){
               var control = response.data.data.patientcontorDetail
-             console.log("control",control)
+            //  console.log("control",control)
               let dataInfo = {}
               control.forEach((item, index) => {
                 let { inspect_date } = item
@@ -381,7 +385,7 @@ export default {
                 }
               })
               let list = Object.values(dataInfo)
-              console.log("list",list)
+              // console.log("list",list)
               list.map(item => {
                 for (let i = 0; i < control.length; i++) {
                   if (item.inspect_date == control[i].inspect_date && item.patient_id == control[i].patient_id) {
@@ -436,7 +440,6 @@ export default {
                   }
                   this.tableData.push({ name: key, data: dd[key]})
                 }
-                console.log("表哥===========",this.tableData)
               let dataInfotwo = {}
               control.forEach((item, index) => {
                 let { inspect_date } = item
@@ -487,17 +490,17 @@ export default {
       getPatientsControl(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.listQuery.page,this.listQuery.limit).then(response=>{
          if(response.data.state == 1){
            var patients = response.data.data.patients
-            // console.log("patients",patients)
+     
             this.tablePatients = patients
             var total = response.data.data.total
             this.total = total
             var control = response.data.data.control
            var infectiousControl =  response.data.data.infectiousControl
-          //  console.log("infectiousContrl",infectiousControl)
+        
            infectiousControl.map(item=>{
              control.push(item)
            })
-            // console.log("control",control)
+       
             var newArr = []
             // 分页
             for (let i = 0; i < control.length; i++) {
@@ -507,7 +510,7 @@ export default {
                 }
               }
             }
-          // console.log("newArr",newArr)
+       
           let dataInfo = {}
           newArr.forEach((item, index) => {
             let { inspect_date } = item
@@ -531,14 +534,14 @@ export default {
               }
             }
           })
-        //  console.log("list",list)
+ 
          var newarrtwo = []
           list.map(item => {
             item.child.map(it => {
               newarrtwo.push(it)
             })
           })
-        //  console.log("newarrtwo",newarrtwo)
+ 
           // 配置的才显示
          var arrthree = []
           for (let i = 0; i < newarrtwo.length; i++) {
@@ -554,7 +557,7 @@ export default {
             item.item_name = ''
             arrthree.push(item)
           })
-          // console.log('arrthree', arrthree)
+   
           var dd = {}
            for (const index in arrthree) {
              if (!(arrthree[index].inspect_date in dd)) {
@@ -580,7 +583,7 @@ export default {
             }
           })
         let listtwo = Object.values(dataInfotwo)
-        // console.log("listtwo",listtwo)
+       
           for (const key in dd) {
             for (const mkey in this.ObjectData) {
               if (!(this.ObjectData[mkey].item_name in dd[key])) {
@@ -612,7 +615,6 @@ export default {
                }
              }
           }
-        //  console.log("表哥123",this.tableData)
          }
       })
     },
@@ -819,6 +821,25 @@ export default {
   .pointTitle {
     font-size: 13px;
   }
+  .chartTitle {
+    font-size: 16px;
+    font-weight: bold;
+    color: #000000;
+  }
+  .point {
+    width: 13px;
+    height: 13px;
+    background: linear-gradient(
+      0deg,
+      rgba(169, 224, 243, 1),
+      rgba(159, 189, 252, 1)
+    );
+    border-radius: 7px;
+    margin-right: 8px;
+  }
+  .pointTitle {
+    font-size: 13px;
+  }
 }
 
 </style>

src/xt_pages/qcd/statisticalConfiguration.vue

@@ -3,7 +3,7 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
-    <div class="app-container">
+    <div class="app-container statisticalConfig">
       <el-tabs v-model="tabActiveName" @tab-click="handleTabClick" style="margin-bottom:10px">
         <el-tab-pane label="质控达标统计配置" name="control"></el-tab-pane>
         <el-tab-pane label="检验检查统计配置" name="query"></el-tab-pane>
@@ -14,7 +14,7 @@
         </el-col>
       </el-row>
       <div class="configTable">
-        <el-table :data="configuraData" border style="width: 100%">
+        <el-table :data="configuraData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
           <el-table-column prop="date" label="检验检查大项" width="180">
               <template slot-scope="scope">{{ scope.row.project_name }}</template>
           </el-table-column>
@@ -256,7 +256,7 @@ 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
@@ -290,7 +290,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
          
         }
@@ -302,7 +302,7 @@ export default {
       getInspectionMinor(id).then(response=>{
         if(response.data.state == 1){
          var inspection =  response.data.data.inspection
-         console.log("小项",inspection)
+        //  console.log("小项",inspection)
          this.InspectionMinor = inspection
         }
       })
@@ -323,7 +323,7 @@ export default {
        getInspectionRange(id).then(response=>{
          if(response.data.state == 1){
            var inspectionRange =  response.data.data.inspectionRange
-           console.log("inspectionRange",inspectionRange)
+          //  console.log("inspectionRange",inspectionRange)
            if(inspectionRange.range_type == 1){
              this.showOne = true
              this.showTwo = false
@@ -387,7 +387,7 @@ export default {
               configurationlist[i].sort = ""
             }
           }
-          console.log("列表",configurationlist)
+          // console.log("列表",configurationlist)
           this.configuraData = configurationlist
           var total = response.data.data.total
          // console.log("total",total)
@@ -507,6 +507,11 @@ export default {
     margin-left:0 !important;
   }
 }
+.statisticalConfig{
+  .el-tabs{
+    margin-bottom: 0 !important;
+  }
+}
 </style>
 
  <style rel="stylesheet/scss" lang="scss" scoped>

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

@@ -13,6 +13,7 @@
              :trigger-on-focus="false"
              placeholder="输入病人透析号/姓名"
              @select="handleSelect"
+             style="width:160px;"
               >
              <i class="el-icon-search el-input__icon" slot="suffix"></i>
                <template slot-scope="{ item }">
@@ -21,7 +22,7 @@
           </el-autocomplete>
         </el-form-item>
       </el-form>
-      <label class="title">
+      <label class="title" style="text-align:left;">
         <span class="name">日期查询</span> :
       </label>
       <el-date-picker
@@ -51,16 +52,16 @@
       ></el-date-picker>
     </div>
     <el-container>
-      <div style="width:150px">
+      <div style="width:160px">
         <div class="tableTitle">患者列表</div>
         <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
          highlight-current-row
          @current-change="handleChange">
-           <el-table-column prop="dialysis_no" label="透析号" width="80">
+           <el-table-column prop="dialysis_no" label="透析号" width="70">
             <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
           </el-table-column>
-          <el-table-column prop="name" label="姓名" width="80">
+          <el-table-column prop="name" label="姓名" width="90">
             <template slot-scope="scope">{{ scope.row.name }}</template>
           </el-table-column>
         </el-table>

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

@@ -13,6 +13,7 @@
              :trigger-on-focus="false"
              placeholder="输入病人透析号/姓名"
              @select="handleSelect"
+              style="width:160px"
               >
              <i class="el-icon-search el-input__icon" slot="suffix"></i>
                <template slot-scope="{ item }">
@@ -21,7 +22,7 @@
           </el-autocomplete>
         </el-form-item>
       </el-form>
-      <label class="title">
+      <label class="title" style="text-align:left;">
         <span class="name">日期查询</span> :
       </label>
       <el-date-picker
@@ -53,7 +54,7 @@
       ></el-date-picker>
     </div>
     <el-container>
-      <div style="width:150px">
+      <div style="width:160px">
         <div class="tableTitle">患者列表</div>
         <el-table :data="patientsData" border style="width: 100%;" 
           height="500" :row-style="{ color: '#303133' }" 
@@ -62,10 +63,10 @@
            ref="singleTable"
           @current-change="handleChange"
           >
-           <el-table-column prop="dialysis_no" label="透析号" width="80">
+           <el-table-column prop="dialysis_no" label="透析号" width="70">
             <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
           </el-table-column>
-          <el-table-column prop="name" label="姓名" width="80">
+          <el-table-column prop="name" label="姓名" width="90">
             <template slot-scope="scope">{{ scope.row.name }}</template>
           </el-table-column>
         </el-table>

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

@@ -46,6 +46,10 @@
       ></el-date-picker>
     </div>
     <div class="tableTitle">统计图</div>
+    <div class="cell clearfix" style="margin:0;">
+        <p class="point"></p>
+        <p class="pointTitle">次</p>
+      </div>
     <div>
       <line-chart :options="chart"></line-chart>
     </div>
@@ -124,10 +128,10 @@ export default {
       ],
       chart: {
         tooltip: {},
-        legend: {
-          data: ["次"],
-          left: 0
-        },
+        // legend: {
+        //   data: ["次"],
+        //   left: 0
+        // },
         xAxis: {
           data: []
         },
@@ -185,11 +189,11 @@ export default {
               },
 
               //鼠标悬停时：
-              // emphasis: {
-              //   shadowBlur: 10,
-              //   shadowOffsetX: 0,
-              //   shadowColor: "rgba(0, 0, 0, 0.5)"
-              // }
+              emphasis: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: "rgba(0, 0, 0, 0.2)"
+              }
             }
           }
         ]
@@ -405,6 +409,20 @@ export default {
   font-weight: bold;
   margin-bottom: 10px;
 }
+.point {
+  width: 13px;
+  height: 13px;
+  background: linear-gradient(
+    0deg,
+    rgba(169, 224, 243, 1),
+    rgba(159, 189, 252, 1)
+  );
+  border-radius: 7px;
+  margin-right: 8px;
+}
+.pointTitle {
+  font-size: 13px;
+}
 </style>
 
 <style lang="scss">

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

@@ -11,8 +11,9 @@
              v-model.trim="listQuery.search"
              :fetch-suggestions="querySearchAsync"
              :trigger-on-focus="false"
-             placeholder="输入病人透析号/姓名"
+             placeholder="病人透析号/姓名"
              @select="handleSelect"
+              style="width:160px;"
               >
              <i class="el-icon-search el-input__icon" slot="suffix"></i>
                <template slot-scope="{ item }">
@@ -21,7 +22,7 @@
           </el-autocomplete>
         </el-form-item>
       </el-form>
-      <label class="title">
+      <label class="title" style="text-align:left;">
         <span class="name">日期查询</span> :
       </label>
       <el-date-picker
@@ -53,16 +54,16 @@
       ></el-date-picker>
     </div>
     <el-container>
-      <div style="width:150px">
+      <div style="width:160px">
         <div class="tableTitle">患者列表</div>
         <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
           highlight-current-row
           @current-change="handleChange">
-          <el-table-column prop="dialysis_no" label="透析号" width="80">
+          <el-table-column prop="dialysis_no" label="透析号" width="70">
             <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
           </el-table-column>
-          <el-table-column prop="name" label="姓名" width="80">
+          <el-table-column prop="name" label="姓名" width="90">
             <template slot-scope="scope">{{ scope.row.name }}</template>
           </el-table-column>
         </el-table>