6月13

src/router/modules/Dialysisanalysis.js

@@ -18,7 +18,7 @@ export default {
       component: () => import('@/xt_pages/Dialysisanalysis/otherIndicators/index'),
       name: 'otherIndicators',
       meta: {
-        title: '专业质控',
+        title: '检验分析',
         noCache: true
       }
     },
@@ -27,7 +27,7 @@ export default {
       component: () => import('@/xt_pages/Dialysisanalysis/new_otherIndicators/index'),
       name: 'otherIndicators',
       meta: {
-        title: '新专业质控',
+        title: '透析分析',
         noCache: true
       }
     },

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/Total_analysis.vue

@@ -3,7 +3,7 @@
     <div class="position">
       <div>
         <span>
-          <el-button @click="return_click" type="text" icon="el-icon-arrow-left">返回</el-button> 
+          <el-button @click="return_click" type="text" icon="el-icon-arrow-left">返回</el-button>
         </span>&nbsp;&nbsp;
         <span>透析总量分析</span>
       </div>
@@ -13,7 +13,7 @@
         <div style="display: flex;">
           <div>
             日期：
-            <el-select v-model="date_value" this placeholder="请选择" style="width: 100px;">
+            <el-select v-model="date_value" @change="datachange" placeholder="请选择" style="width: 100px;">
               <el-option
                 v-for="item in date_options"
                 :key="item.value"
@@ -42,11 +42,11 @@
           </div>
           <div>
             透析模式:
-            <el-select v-model="mode" placeholder="请选择" style="width: 120px;">
+            <el-select v-model="mode" @change="modechange" placeholder="请选择" style="width: 120px;">
               <el-option :key='0' label="不限" :value="0">
               </el-option>
               <el-option
-                v-for="item in mode_options"
+                v-for="item in modearr"
                 :key="item.id"
                 :label="item.name"
                 :value="item.id">
@@ -85,7 +85,7 @@
         <div ref="mychart">
           <div class="echart" id="mychart"  style="width:100%;height:60vh"></div>
         </div>
-          
+
           <div style="position: fixed;right: 5%;top: 50vh;">
             <el-popover
               placement="left"
@@ -124,7 +124,7 @@ import { forEach } from 'jszip';
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
-        modearr:[{ id: 0, name: '不限' },{ id: 1, name: 'HD' },{ id: 2, name: 'HDF' },{ id: 3, name: 'HD + HP' },{ id: 4, name: 'HP' },
+        modearr:[{ id: 1, name: 'HD' },{ id: 2, name: 'HDF' },{ id: 3, name: 'HD + HP' },{ id: 4, name: 'HP' },
           { id: 5, name: 'HF' },{ id: 6, name: 'SCUF' },{ id: 7, name: 'IUF' },{ id: 8, name: 'HFHD' },{ id: 9, name: 'HFHD+HP' },
           { id: 10, name: 'PHF' },{ id: 11, name: 'HFR' },{ id: 12, name: 'HDF+HP' },{ id: 13, name: 'CRRT' },{ id: 14, name: '腹水回输' },
           { id:19, name:"IUF+HD"},{ id:20, name:"UF"},{ id:21, name:"HD+"},{ id:22, name:"血浆胆红素吸附+HDF"},{ id:23, name:"血浆胆红素吸附"},
@@ -135,103 +135,6 @@ import { forEach } from 'jszip';
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
         bar_xAxis:[],
-        // bar: {
-        //   title: {
-        //     text: "ECharts 入门示例"
-        //   },
-        //   tooltip: {},
-        //   legend: {
-        //     data: [],
-        //     left: 0
-        //   },
-        //   xAxis: {
-        //     data: []
-        //   },
-        //   yAxis: {
-        //     axisLabel: {
-        //       formatter: "{value} %"
-        //     },
-        //     show: false
-        //   },
-        //   series: [
-        //     {
-        //       name: "",
-        //       type: "bar",
-        //       data: [],
-        //       barWidth: 30,
-        //       label: {
-        //         normal: {
-        //           show: true,
-        //           position: "top",
-        //           formatter: (params) => {
-        //             // if(this.percent.length > 0){
-        //             //   let str = ''
-        //             //   str = params.data + '('+ this.percent[params.dataIndex] +'%)'
-        //             //   return str
-        //             // }else{
-        //             //   let str = ''
-        //             //   str = params.data
-        //             //   return str
-        //             // }
-        //           }
-        //         }
-        //       },
-        //       //配置样式
-        //       itemStyle: {
-        //         //通常情况下：
-
-        //         //每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
-        //         normal: {
-        //           color: function(params) {
-        //             //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
-        //             var colorList = [
-        //               ["#A9E0F3", "#9FBDFC"],
-
-        //               ["#FFD7C0", "#FF9994"]
-        //             ];
-
-        //             var index = params.dataIndex;
-        //             if (params.dataIndex >= colorList.length) {
-        //               index = params.dataIndex % colorList.length;
-        //             }
-
-        //             return new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-        //               { offset: 0, color: colorList[index][0] },
-        //               // { offset: 0.5, color: colorList[index][1] },
-        //               { offset: 1, color: colorList[index][1] }
-        //             ]);
-        //           },
-        //           barBorderRadius: [5, 5, 0, 0] //柱状角成椭圆形
-        //         },
-
-        //         //鼠标悬停时：
-        //         emphasis: {
-        //           shadowBlur: 10,
-        //           shadowOffsetX: 0,
-        //           shadowColor: "rgba(0, 0, 0, 0.2)"
-        //         }
-        //       }
-        //     }
-        //   ],
-        //   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 // 锁定区域禁止缩放
-        //     }
-        //   ]
-        // }
       }
     },
     methods:{
@@ -243,7 +146,7 @@ import { forEach } from 'jszip';
       getecharts(){
         var chartDom = document.getElementById('mychart')
         var myChart = echarts.init(chartDom);
-        
+
         const params={
           start_date:this.start_date,
           end_date:this.end_date,
@@ -255,7 +158,7 @@ import { forEach } from 'jszip';
           if(response.data.state ==1){
             const modeoptions = []
             const xAxis = []
-            var yAxis = [] 
+            var yAxis = []
             const list = response.data.data.list
             list.forEach(item =>{
               const obj ={
@@ -263,7 +166,12 @@ import { forEach } from 'jszip';
                 name:this.getmodearr(item.mode_id)
               }
               yAxis.push(item.count)
-              xAxis.push(this.getmodearr(item.mode_id))
+              if(this.mode == 0){
+                xAxis.push(this.getmodearr(item.mode_id))
+              }else{
+                console.log('item.data',item);
+                xAxis.push(item.date)
+              }
               modeoptions.push(obj)
             })
             this.bar_xAxis = xAxis
@@ -324,7 +232,7 @@ import { forEach } from 'jszip';
       sete_click(){
         this.getecharts()
       },
-      // 下载 
+      // 下载
       Download_click(){
         const options ={
           allowTaint: true,
@@ -343,7 +251,7 @@ import { forEach } from 'jszip';
           console.log('1111',url);
           var link= document.createElement("a");
         //   //将生成的图片url赋值给a标签的href属性
-          link.href = url; 
+          link.href = url;
         //   //设置下载的文件名
           link.download = "页面截图.jpg";
           // // 将a标签插入dom中
@@ -419,12 +327,13 @@ import { forEach } from 'jszip';
           // this.end_date = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
           this.end_date = date.getFullYear() + "-" + mm + "-" + dd ;
           console.log('this.end_date',this.end_date);
-          
+
         }else if(eve ==4){
           this.start_date = this.getFirstDayOfMonth(new Date())
           this.end_date = this.getTime(new Date())
         }else if(eve ==5){
-          this.gettopMonth()
+          this.getLastMonthFirstDay()
+          this.getLastMonthLastDay()
         }else if(eve == 6){
           this.start_date = this.getFirstDayOfYear(new Date())
           this.end_date = this.getTime(new Date())
@@ -454,7 +363,7 @@ import { forEach } from 'jszip';
       },
       // 本周
       getFirstDayOfWeek(date){
-        var weekday = date.getDay() 
+        var weekday = date.getDay()
         date.setDate(date.getDate()-weekday+1);//往前算（weekday-1）天，年份、月份会自动变化
         return this.timeFormat(date);
       },
@@ -463,27 +372,29 @@ import { forEach } from 'jszip';
         date.setDate(1);
         return this.timeFormat(date);
       },
-      // 上个月
-      gettopMonth(){
-        var currentDate = new Date();
-        var month=currentDate.getMonth()+(-1);
-        if(month<0){
-          var n = parseInt((-month)/12);
-          month += n*12;
-          currentDate.setFullYear(currentDate.getFullYear()-n);
-        }
-        currentDate = new Date(currentDate.setMonth(month));
-        //获得当前月份0-11  
-        var currentMonth = currentDate.getMonth(); 
-        //获得当前年份4位年  
-        var currentYear = currentDate.getFullYear(); 
-        //获得上一个月的第一天  
-        this.start_date = this.getTime(new Date(currentYear, currentMonth-1,1)); 
-        //获得上一月的最后一天  
-        this.end_date = this.getTime(new Date(currentYear, currentMonth, 0));
-       console.log('11111',this.start_date);
-       console.log('22222',this.end_date);
+      //上个月第一天
+      getLastMonthFirstDay() {
+         var date = new Date();
+          date.setDate(0);
+          var y = date.getFullYear(); //获取年份
+          var m = date.getMonth() + 1; //获取月份
+          m = m < 10 ? "0" + m : m;
+          this.start_date = [y, m, '01'].join("-")
+          // return [y, m, '01'].join("-");
+      },
+      // 上个月最后一天
+      getLastMonthLastDay() {
+         var date = new Date();
+          date.setDate(0);
+          var y = date.getFullYear(); //获取年份
+          var m = date.getMonth() + 1; //获取月份
+          var d = new Date(y, m, 0).getDate(); //获取当月最后一日
+          m = m < 10 ? "0" + m : m; //月份补 0
+          d = d < 10 ? "0" + d : d; //日数补 0
+          this.end_date = [y, m, d].join("-")
+          // return [y, m, d].join("-");
       },
+
       // 本年
       getFirstDayOfYear (date) {
         date.setDate(1);
@@ -491,29 +402,29 @@ import { forEach } from 'jszip';
         return this.timeFormat(date);
       },
       // 上一年第一天
-      getLastYearFirstDay() {  
-          let date = new Date();  
-         const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年  
-         const start_month= date.setMonth(0); // 设置月份为1月（注意月份是从0开始的）  
+      getLastYearFirstDay() {
+          let date = new Date();
+         const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年
+         const start_month= date.setMonth(0); // 设置月份为1月（注意月份是从0开始的）
          const start_day = date.setDate(1); // 设置日期为1日
-        //  const last_month = date.setMonth(11); // 设置月份为12月  
-        //  const last_day = date.setDate(0); // 设置日期为0，这将自动设置为该月的最后一天  
+        //  const last_month = date.setMonth(11); // 设置月份为12月
+        //  const last_day = date.setDate(0); // 设置日期为0，这将自动设置为该月的最后一天
         //  this.start_date = year+ "-" +start_month+ "-" +start_day
          this.start_date = this.getTime(start_day)
         //  return this.start_date
-      }, 
+      },
       // 上一年最后一天
-      getLastYearLastDay() {  
-          let date = new Date();  
-          const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年  
-          const last_month = date.setMonth(12); // 设置月份为12月  
-          const last_day = date.setDate(0);// 设置日期为0，这将自动设置为该月的最后一天  
+      getLastYearLastDay() {
+          let date = new Date();
+          const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年
+          const last_month = date.setMonth(12); // 设置月份为12月
+          const last_day = date.setDate(0);// 设置日期为0，这将自动设置为该月的最后一天
           // this.end_date =  year+ "-" +last_month+ "-" +last_day
           this.end_date = this.getTime(last_day)
           console.log('this.end_date',this.end_date);
-          // return this.end_date;  
-      }, 
-      
+          // return this.end_date;
+      },
+
       // 日期格式化
       timeFormat(date) {
           if (!date || typeof(date) === "string") {
@@ -534,7 +445,7 @@ import { forEach } from 'jszip';
 
           return y + "-" + m + "-" + d;
       },
-      // 
+      // bolb类型转换
       dataURLtoBlob(dataURL) {
         const arr = dataURL.split(',');
         const mime = arr[0].match(/:(.*?);/)[1];
@@ -546,14 +457,41 @@ import { forEach } from 'jszip';
         }
         return new Blob([u8arr], { type: mime });
       },
+      // 透析模式
+      modechange(eve){
+        console.log(eve);
+
+      },
+      // 透析模式数据
+      // getmodelist(){
+      //   const params={
+      //     start_date:this.start_date,
+      //     end_date:this.end_date,
+      //     mode:0,
+      //     origin:1,
+      //     time_way:1,
+      //   }
+      //   Getdialysistotal(params).then(response =>{
+      //     const list = response.data.data.list
+      //     const modeoptions = []
+      //     list.forEach(item =>{
+      //       const obj ={
+      //         id:item.mode_id,
+      //         name:this.getmodearr(item.mode_id)
+      //       }
+      //       modeoptions.push(obj)
+      //     })
+      //     this.mode_options = modeoptions
+      //   })
+      // }
     },
     mounted(){
       this.getecharts()
     },
     created(){
       this.start_date = this.getFirstDayOfMonth(new Date())
-      // this.gettotal()
+      // this.getmodelist()
     },
 
   }
-</script>
+</script>

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/Total_table.vue

@@ -3,7 +3,7 @@
     <div class="position">
       <div>
         <span>
-          <el-button @click="return_click" type="text" icon="el-icon-arrow-left">返回</el-button> 
+          <el-button @click="return_click" type="text" icon="el-icon-arrow-left">返回</el-button>
         </span>&nbsp;&nbsp;
         <span>透析总量详情</span>
       </div>
@@ -39,7 +39,7 @@
               style="width: 150px;">
             </el-date-picker>
           </div>
-          
+
           <div>
             透析模式:
             <el-select v-model="mode"  placeholder="请选择" style="width: 120px;">
@@ -80,15 +80,19 @@
             <el-button type="primary" @click="Download_click">下载</el-button>
           </div>
         </div>
-        <!-- 表格 -->
-        <div>
-          <el-table :data="patientTableData"
-            style="width: 100%;border-collapse: collapse;" height="400" border
-            @cell-click="cellclick">
-            <el-table-column v-for="column in columns" :key="column.prop" 
-              :prop="column.prop?column.prop:''" :label="column.label?column.label:''">
+        <!-- 表格  :fixed="column.label=='日期'?left:''" :fixed="column.label=='日期'?true:false"-->
+        <div style="margin-top: 10px;">
+          <el-table :data="patientTableData" ref="table"
+            style="width: 100%;border-collapse: collapse;" height="calc(80vh - 50px)" border
+            show-summary
+            :header-cell-style="{'text-align':'center'}"
+            :cell-style="{'text-align':'center'}"
+            @cell-click="cellclick"
+            :cell-class-name="cell_classname">
+            <el-table-column v-for="column in columns" :key="column.prop"
+              :prop="column.prop?column.prop:''" :label="column.label?column.label:''" :fixed="column.label=='日期'?true:false">
             </el-table-column>
-            
+
           </el-table>
         </div>
       </div>
@@ -186,7 +190,7 @@
         </span>
       </el-dialog>
     </div>
-    
+
   </div>
 </template>
 <script>
@@ -202,7 +206,7 @@ export default {
       start_date:'',
       end_date:this.getTime(new Date()),
       mode:0,
-      date_mode:1,
+      date_mode:2,
       source:1,
       dialogVisible:false,
       tableData:[],
@@ -225,9 +229,9 @@ export default {
         { id:19, name:"IUF+HD"},{ id:20, name:"UF"},{ id:21, name:"HD+"},{ id:22, name:"血浆胆红素吸附+HDF"},{ id:23, name:"血浆胆红素吸附"},
         { id:24, name:"I-HDF"},{ id:25, name:"HD高通"},{ id:26, name:"CVVH"},{ id:27, name:"CVVHD"},{ id:28, name:"CVVHDF"},{ id:29, name:"PE"},
       ],
-      date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
+      date_mode_options:[{value:2,label:'按周'},{value:1,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
       source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
-      
+
     }
   },
   methods:{
@@ -279,7 +283,7 @@ export default {
             column.unshift(arr)
             column.push(arr1)
             this.columns = column
-            
+
             const detil = []
             for(let i in this.columns){
               detil.push(this.columns[i].label)
@@ -300,23 +304,31 @@ export default {
     },
     // 打开弹窗
     cellclick(row, column, cell, event){
-      this.dialogVisible = true
-      const date =row['日期']
-      // const mode_name = column.label
-      var mode_id = ''
-      for(let i in this.mode_options){
-        if(column.label == this.mode_options[i].name){
-          mode_id = this.mode_options[i].id
+      console.log('row',row[column.property]);
+      console.log('column',column.property);
+      console.log('cell',cell);
+      console.log('event',event);
+      if(row[column.property] == '' || column.property == '日期' || column.property == '合计'){
+        this.dialogVisible = false
+      }else{
+        this.dialogVisible = true
+        const date =row['日期']
+        // const mode_name = column.label
+        var mode_id = ''
+        for(let i in this.mode_options){
+          if(column.label == this.mode_options[i].name){
+            mode_id = this.mode_options[i].id
+          }
         }
+        const params={
+          date:date,
+          mode:mode_id,
+          origin:this.source,
+          page:this.currentPage,
+          limit:this.limit
+        }
+        this.Getdialysisdetailsinfo(params)
       }
-      const params={
-        date:date,
-        mode:mode_id,
-        origin:this.source,
-        page:this.currentPage,
-        limit:this.limit
-      }
-      this.Getdialysisdetailsinfo(params)
       // console.log('row',row,this.date);
       // console.log('column',column);
       // console.log('cell',cell);
@@ -357,7 +369,7 @@ export default {
     },
     //导出excel
     exportExcel(){
-        let tableData = [ 
+        let tableData = [
           ['序号','日期', '透析号', '患者姓名', '性别','年龄','透析方式', '机号', '治疗医生','治疗护士', '开始透析时间','结束透析时间','实际治疗时长']//导出表头
         ]
         this.tableData.forEach((item,index) =>{
@@ -438,63 +450,64 @@ export default {
     },
     // 首先定义一个getPreviousDate函数，方便调用
      // 选择日期
-     datachange(eve){
-        if(eve ==1){
-          this.start_date = this.getPreviousDate(7)
-          this.end_date = this.getTime(new Date())
-        }else if(eve==2){
-          this.start_date = this.getFirstDayOfWeek(new Date())
-          this.end_date = this.getTime(new Date())
-          console.log('this.start_date', this.start_date);
-        }else if(eve ==3){
-          var date=new Date()
-          date.setDate(date.getDate()-7 - date.getDay() + 1);
-          var m =''
-          var d = ''
-          if(date.getMonth() + 1<10){
-            m = '0'+(date.getMonth() + 1)
-          }else{
-             m = date.getMonth() + 1
-          }
-          if(date.getDate()<10){
-             d = '0'+date.getDate()
-          }else{
-            d = date.getDate()
-          }
-          // this.start_date = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() ;
-          this.start_date = date.getFullYear() + "-" + m + "-" + d ;
-          date.setDate(date.getDate() +6);
-          var mm = ''
-          var dd = ''
-          if(date.getMonth() + 1<10){
-            mm = '0'+(date.getMonth() + 1)
-          }else{
-            mm = date.getMonth() + 1
-          }
-          if(date.getDate()<10){
-            dd = '0'+date.getDate()
-          }else{
-            dd = date.getDate()
-          }
-          // if(date.getMonth() + 1<10)
-          // this.end_date = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
-          this.end_date = date.getFullYear() + "-" + mm + "-" + dd ;
-          console.log('this.end_date',this.end_date);
-          
-        }else if(eve ==4){
-          this.start_date = this.getFirstDayOfMonth(new Date())
-          this.end_date = this.getTime(new Date())
-        }else if(eve ==5){
-          this.gettopMonth()
-        }else if(eve == 6){
-          this.start_date = this.getFirstDayOfYear(new Date())
-          this.end_date = this.getTime(new Date())
-        }else if(eve == 7){
-          this.getLastYearFirstDay()
-          this.getLastYearLastDay()
+    datachange(eve){
+      if(eve ==1){
+        this.start_date = this.getPreviousDate(7)
+        this.end_date = this.getTime(new Date())
+      }else if(eve==2){
+        this.start_date = this.getFirstDayOfWeek(new Date())
+        this.end_date = this.getTime(new Date())
+        console.log('this.start_date', this.start_date);
+      }else if(eve ==3){
+        var date=new Date()
+        date.setDate(date.getDate()-7 - date.getDay() + 1);
+        var m =''
+        var d = ''
+        if(date.getMonth() + 1<10){
+          m = '0'+(date.getMonth() + 1)
+        }else{
+            m = date.getMonth() + 1
         }
-        console.log('eve',eve);
-      },
+        if(date.getDate()<10){
+            d = '0'+date.getDate()
+        }else{
+          d = date.getDate()
+        }
+        // this.start_date = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() ;
+        this.start_date = date.getFullYear() + "-" + m + "-" + d ;
+        date.setDate(date.getDate() +6);
+        var mm = ''
+        var dd = ''
+        if(date.getMonth() + 1<10){
+          mm = '0'+(date.getMonth() + 1)
+        }else{
+          mm = date.getMonth() + 1
+        }
+        if(date.getDate()<10){
+          dd = '0'+date.getDate()
+        }else{
+          dd = date.getDate()
+        }
+        // if(date.getMonth() + 1<10)
+        // this.end_date = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
+        this.end_date = date.getFullYear() + "-" + mm + "-" + dd ;
+        console.log('this.end_date',this.end_date);
+
+      }else if(eve ==4){
+        this.start_date = this.getFirstDayOfMonth(new Date())
+        this.end_date = this.getTime(new Date())
+      }else if(eve ==5){
+        this.getLastMonthFirstDay()
+        this.getLastMonthLastDay()
+      }else if(eve == 6){
+        this.start_date = this.getFirstDayOfYear(new Date())
+        this.end_date = this.getTime(new Date())
+      }else if(eve == 7){
+        this.getLastYearFirstDay()
+        this.getLastYearLastDay()
+      }
+      console.log('eve',eve);
+    },
     getPreviousDate(numOfDays) {
       var date = new Date();
       date.setDate(date.getDate() - numOfDays);
@@ -514,7 +527,7 @@ export default {
     },
     // 本周
     getFirstDayOfWeek(date){
-      var weekday = date.getDay() 
+      var weekday = date.getDay()
       date.setDate(date.getDate()-weekday+1);//往前算（weekday-1）天，年份、月份会自动变化
       return this.timeFormat(date);
     },
@@ -523,27 +536,29 @@ export default {
       date.setDate(1);
       return this.timeFormat(date);
     },
-    // 上个月
-    gettopMonth(){
-      var currentDate = new Date();
-      var month=currentDate.getMonth()+(-1);
-      if(month<0){
-        var n = parseInt((-month)/12);
-        month += n*12;
-        currentDate.setFullYear(currentDate.getFullYear()-n);
-      }
-      currentDate = new Date(currentDate.setMonth(month));
-      //获得当前月份0-11  
-      var currentMonth = currentDate.getMonth(); 
-      //获得当前年份4位年  
-      var currentYear = currentDate.getFullYear(); 
-      //获得上一个月的第一天  
-      this.start_date = this.getTime(new Date(currentYear, currentMonth-1,1)); 
-      //获得上一月的最后一天  
-      this.end_date = this.getTime(new Date(currentYear, currentMonth, 0));
-      console.log('11111',this.start_date);
-      console.log('22222',this.end_date);
+     //上个月第一天
+    getLastMonthFirstDay() {
+        var date = new Date();
+        date.setDate(0);
+        var y = date.getFullYear(); //获取年份
+        var m = date.getMonth() + 1; //获取月份
+        m = m < 10 ? "0" + m : m;
+        this.start_date = [y, m, '01'].join("-")
+        // return [y, m, '01'].join("-");
+    },
+    // 上个月最后一天
+    getLastMonthLastDay() {
+        var date = new Date();
+        date.setDate(0);
+        var y = date.getFullYear(); //获取年份
+        var m = date.getMonth() + 1; //获取月份
+        var d = new Date(y, m, 0).getDate(); //获取当月最后一日
+        m = m < 10 ? "0" + m : m; //月份补 0
+        d = d < 10 ? "0" + d : d; //日数补 0
+        this.end_date = [y, m, d].join("-")
+        // return [y, m, d].join("-");
     },
+
     // 本年
     getFirstDayOfYear (date) {
       date.setDate(1);
@@ -551,29 +566,29 @@ export default {
       return this.timeFormat(date);
     },
     // 上一年第一天
-    getLastYearFirstDay() {  
-        let date = new Date();  
-        const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年  
-        const start_month= date.setMonth(0); // 设置月份为1月（注意月份是从0开始的）  
+    getLastYearFirstDay() {
+        let date = new Date();
+        const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年
+        const start_month= date.setMonth(0); // 设置月份为1月（注意月份是从0开始的）
         const start_day = date.setDate(1); // 设置日期为1日
-      //  const last_month = date.setMonth(11); // 设置月份为12月  
-      //  const last_day = date.setDate(0); // 设置日期为0，这将自动设置为该月的最后一天  
+      //  const last_month = date.setMonth(11); // 设置月份为12月
+      //  const last_day = date.setDate(0); // 设置日期为0，这将自动设置为该月的最后一天
       //  this.start_date = year+ "-" +start_month+ "-" +start_day
         this.start_date = this.getTime(start_day)
       //  return this.start_date
-    }, 
+    },
     // 上一年最后一天
-    getLastYearLastDay() {  
-        let date = new Date();  
-        const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年  
-        const last_month = date.setMonth(12); // 设置月份为12月  
-        const last_day = date.setDate(0);// 设置日期为0，这将自动设置为该月的最后一天  
+    getLastYearLastDay() {
+        let date = new Date();
+        const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年
+        const last_month = date.setMonth(12); // 设置月份为12月
+        const last_day = date.setDate(0);// 设置日期为0，这将自动设置为该月的最后一天
         // this.end_date =  year+ "-" +last_month+ "-" +last_day
         this.end_date = this.getTime(last_day)
         console.log('this.end_date',this.end_date);
-        // return this.end_date;  
-    }, 
-    
+        // return this.end_date;
+    },
+
     // 日期格式化
     timeFormat(date) {
         if (!date || typeof(date) === "string") {
@@ -594,7 +609,7 @@ export default {
 
         return y + "-" + m + "-" + d;
     },
-    // 
+    //
     dataURLtoBlob(dataURL) {
       const arr = dataURL.split(',');
       const mime = arr[0].match(/:(.*?);/)[1];
@@ -639,7 +654,7 @@ export default {
             yearBirth = userCard.substring(6,10);
             monthBirth = userCard.substring(10,12);
             dayBirth = userCard.substring(12,14);
-            
+
           }
           //获取当前年月日并计算年龄
           var myDate = new Date();
@@ -654,7 +669,7 @@ export default {
       } else {
         return ''
       }
-      
+
     },
     getmode(ids){
       const option = this.mode_options
@@ -695,8 +710,9 @@ export default {
             this.docList = list
             this.operators = response.data.data.operators
         }
-      })  
+      })
     },
+    // 转换护士名字
     getnurse(ids){
       const nurse = this.nurseList
       for(let i in nurse){
@@ -705,6 +721,7 @@ export default {
         }
       }
     },
+    // 转换医生名字
     getdoctor(ids){
       const doctor = this.docList
       for(let i in doctor){
@@ -712,6 +729,22 @@ export default {
           return doctor[i].user_name
         }
       }
+    },
+    // 单元格样式
+    cell_classname({row, column, rowIndex, columnIndex}){
+      if(columnIndex!=0 && column.property != '合计'){
+        return 'cell_class'
+      }
+      // if(row[column.property] !=''&&column.property !='日期'){
+      //   return 'cell_class'
+      // }
+    },
+    // 固定列表格错位
+    doLayout(){
+      let that = this
+        this.$nextTick(() => {
+          that.$refs.table.doLayout()
+        })
     }
   },
   created(){
@@ -719,6 +752,16 @@ export default {
     this.getdetil()
     this.getAllNurseList()
     this.getAllDoctorList()
+  },
+  watch:{
+    patientTableData(val){
+      this.doLayout()
+    }
   }
 }
-</script>
+</script>
+<style>
+.cell_class{
+  color: #409eff;
+}
+</style>

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/anticoagulant.vue

@@ -208,7 +208,7 @@ import html2canvas from "html2canvas"
         dialyze_options:[],//抗凝剂选项数组
         anticoagulant:[],//全部抗凝剂数组
         tableData:[],
-        total:'',
+        total:0,
        
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
@@ -300,9 +300,10 @@ import html2canvas from "html2canvas"
             myChart.setOption(option);
             myChart.on('click',params =>{
               this.anticoagulant_dialog = true
-              this.getGetdetail()
               this.getbarxAxis()
-              console.log('params',params);
+              const id = this.getanticoagulant_name(params.name)
+              this.getGetdetail(id)
+              
             })
           }
           console.log('response',response);
@@ -310,9 +311,9 @@ import html2canvas from "html2canvas"
         
       },
       // 详情数据源
-      getGetdetail(){
+      getGetdetail(name){
         const params ={
-          anticoagulant:this.dialyze_value,
+          anticoagulant:name,
           start_date:this.start_date,
           end_date:this.end_date,
           page:this.currentPage,
@@ -348,7 +349,7 @@ import html2canvas from "html2canvas"
       },
       // 详情查询
       deil_click(){
-        this.getGetdetail()
+        this.getGetdetail(this.dialyze_value)
       },
       //导出excel
       exportExcel(){
@@ -456,7 +457,8 @@ import html2canvas from "html2canvas"
           this.start_date = this.getFirstDayOfMonth(new Date())
           this.end_date = this.getTime(new Date())
         }else if(eve ==5){
-          this.gettopMonth()
+          this.getLastMonthFirstDay()
+          this.getLastMonthLastDay()
         }else if(eve == 6){
           this.start_date = this.getFirstDayOfYear(new Date())
           this.end_date = this.getTime(new Date())
@@ -495,26 +497,27 @@ import html2canvas from "html2canvas"
         date.setDate(1);
         return this.timeFormat(date);
       },
-      // 上个月
-      gettopMonth(){
-        var currentDate = new Date();
-        var month=currentDate.getMonth()+(-1);
-        if(month<0){
-          var n = parseInt((-month)/12);
-          month += n*12;
-          currentDate.setFullYear(currentDate.getFullYear()-n);
-        }
-        currentDate = new Date(currentDate.setMonth(month));
-        //获得当前月份0-11  
-        var currentMonth = currentDate.getMonth(); 
-        //获得当前年份4位年  
-        var currentYear = currentDate.getFullYear(); 
-        //获得上一个月的第一天  
-        this.start_date = this.getTime(new Date(currentYear, currentMonth-1,1)); 
-        //获得上一月的最后一天  
-        this.end_date = this.getTime(new Date(currentYear, currentMonth, 0));
-       console.log('11111',this.start_date);
-       console.log('22222',this.end_date);
+      //上个月第一天
+      getLastMonthFirstDay() {
+          var date = new Date();
+          date.setDate(0);
+          var y = date.getFullYear(); //获取年份
+          var m = date.getMonth() + 1; //获取月份
+          m = m < 10 ? "0" + m : m;
+          this.start_date = [y, m, '01'].join("-")
+          // return [y, m, '01'].join("-");
+      },
+      // 上个月最后一天
+      getLastMonthLastDay() {
+          var date = new Date();
+          date.setDate(0);
+          var y = date.getFullYear(); //获取年份
+          var m = date.getMonth() + 1; //获取月份
+          var d = new Date(y, m, 0).getDate(); //获取当月最后一日
+          m = m < 10 ? "0" + m : m; //月份补 0
+          d = d < 10 ? "0" + d : d; //日数补 0
+          this.end_date = [y, m, d].join("-")
+          // return [y, m, d].join("-");
       },
       // 本年
       getFirstDayOfYear (date) {
@@ -569,13 +572,13 @@ import html2canvas from "html2canvas"
       handleSizeChange(val){
         console.log('333',val);
         this.limit = val
-        this.getGetdetail()
+        this.getGetdetail(this.dialyze_value)
       },
       // 当前页
       handleCurrentChange(val){
         console.log('4444',val);
         this.currentPage = val
-        this.getGetdetail()
+        this.getGetdetail(this.dialyze_value)
       },
       // 转换时间
       getTime(val) {
@@ -593,7 +596,6 @@ import html2canvas from "html2canvas"
         for(let j in this.bar_xAxis){
           for(let i in this.anticoagulant){
             if(this.bar_xAxis[j]==this.anticoagulant[i].name){
-              console.log('tttt',this.anticoagulant[i]);
                this.dialyze_options.push(this.anticoagulant[i])
             }
           }
@@ -626,6 +628,15 @@ import html2canvas from "html2canvas"
         }
         return new Blob([u8arr], { type: mime });
       },
+      // 
+      getanticoagulant_name(name){
+        const antico_name = this.dialyze_options
+        for(let i in antico_name){
+          if(antico_name[i].name == name){
+            return antico_name[i].id
+          }
+        }
+      }
     },
     mounted(){
       this.getecharts()

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/complete.vue

@@ -3,7 +3,7 @@
     <div class="position">
       <div>
         <span>
-          <el-button @click="return_click" type="text" icon="el-icon-arrow-left">返回</el-button> 
+          <el-button @click="return_click" type="text" icon="el-icon-arrow-left">返回</el-button>
         </span>&nbsp;&nbsp;
         <span>透析治疗完成率</span>
       </div>
@@ -76,7 +76,7 @@
             <div style="flex: 2;display: flex;">
               <div>
                 日期：
-                <el-select v-model="date_value" placeholder="请选择" style="width: 100px;">
+                <el-select v-model="date_value" @change="datachange" placeholder="请选择" style="width: 100px;">
                   <el-option
                     v-for="item in date_options"
                     :key="item.value"
@@ -119,7 +119,7 @@
             <div style="flex: 1;">
               <div>
                 <el-button type="primary" @click="detil_click">查询</el-button>
-                
+
                 <el-button type="primary" @click="derive_click">导出</el-button>
               </div>
             </div>
@@ -223,10 +223,11 @@ import html2canvas from "html2canvas"
         limit:50,
         total:0,
         tableData:[],
-        status_options:[],
+        // status_options:[],
         nurseList:[],
         operators:[],
         docList:[],
+        status_options:[{value:1,label:'达到透析处方时间'},{value:2,label:'超出处方时间'},{value:3,label:'未到达处方时间'}],
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
@@ -239,7 +240,7 @@ import html2canvas from "html2canvas"
         ],
         date_mode_options:[{value:1,label:'按周'},{value:2,label:'按天'},{value:3,label:'按月'},{value:4,label:'按年'}],
         source_options:[{value:1,label:'以开始透析为准'},{value:2,label:'以排班为准'}],
-        bar_xAxis:['HD','HDF','HD + HP','HP','HF','SCUF','IUF'],
+        status_id:"",
       }
     },
     methods:{
@@ -271,14 +272,15 @@ import html2canvas from "html2canvas"
               yAxis.push(key)
             }
             const status = []
-            for(let i in yAxis){
-              const obj ={
-                value:(i*1)+1,
-                label:yAxis[i]
-              }
-              status.push(obj)
-            }
-            this.status_options = status
+            // for(let i in yAxis){
+            //   const obj ={
+            //     value:(i*1)+1,
+            //     label:yAxis[i]
+            //   }
+            //   status.push(obj)
+            // }
+            // this.status_options = status
+            console.log('this.status_options',this.status_options);
             const option = {
                 title:{
                   text:'总数'+total,
@@ -300,10 +302,10 @@ import html2canvas from "html2canvas"
                 },
                 series: [
                   {
-                    name: 'Access From',
+                    name: '',
                     type: 'pie',
                     radius: ['40%', '70%'],
-                    avoidLabelOverlap: false,
+                    avoidLabelOverlap: true,
                     itemStyle: {
                       borderRadius: 10,
                       borderColor: '#fff',
@@ -349,7 +351,7 @@ import html2canvas from "html2canvas"
             })
           }
         })
-        
+
       },
       // 查询
       sete_click(){
@@ -357,9 +359,9 @@ import html2canvas from "html2canvas"
       },
       // 详情查询
       detil_click(){
-        this.getdetail()
+        this.getdetail(this.status_value)
       },
-       // 下载 
+       // 下载
       Download_click(){
         const options ={
           allowTaint: true,
@@ -372,7 +374,7 @@ import html2canvas from "html2canvas"
           const url = URL.createObjectURL(blob);
           var link= document.createElement("a");
         //   //将生成的图片url赋值给a标签的href属性
-          link.href = url; 
+          link.href = url;
         //   //设置下载的文件名
           link.download = "透析完成率统计.jpg";
           // // 将a标签插入dom中
@@ -387,7 +389,7 @@ import html2canvas from "html2canvas"
       },
       // 导出excel
       derive_click(){
-        let tableData = [ 
+        let tableData = [
           ['序号', '透析号', '患者姓名', '年龄','透析日期', '处方透析时长', '实际透析时长', '实际差(min)', '主治医生', '主治护士']//导出表头
         ]
         this.tableData.forEach((item,index) =>{
@@ -417,7 +419,7 @@ import html2canvas from "html2canvas"
         const params ={
           start_date:this.start_date,
           end_date:this.end_date,
-          mode:mode||this.status_value,
+          mode:mode,
           page:this.currentPage,
           limit:this.limit,
         }
@@ -426,17 +428,17 @@ import html2canvas from "html2canvas"
             const list = response.data.data.list
             const xAxis = []
             const table = []
-            list.forEach((item,index) =>{ 
+            list.forEach((item,index) =>{
               const obj={
                 index:index+1,
-                dialysis_no:item.dialysis_no,     
+                dialysis_no:item.dialysis_no,
                 patient_name:item.patient_name,
                 age:this.analyzeIDCard(item.id_card_no),
                 dialysis_date:item.dialysis_date.split('T')[0],
                 dialysis_duration:item.dialysis_duration,
                 actual_duration:item.actual_duration,
                 diff:item.diff,
-                doctor:this.getdoctor(item.doctor), 
+                doctor:this.getdoctor(item.doctor),
                 nurse:this.getnurse(item.nurse)
               }
               table.push(obj)
@@ -490,12 +492,13 @@ import html2canvas from "html2canvas"
           // this.end_date = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
           this.end_date = date.getFullYear() + "-" + mm + "-" + dd ;
           console.log('this.end_date',this.end_date);
-          
+
         }else if(eve ==4){
           this.start_date = this.getFirstDayOfMonth(new Date())
           this.end_date = this.getTime(new Date())
         }else if(eve ==5){
-          this.gettopMonth()
+          this.getLastMonthFirstDay()
+          this.getLastMonthLastDay()
         }else if(eve == 6){
           this.start_date = this.getFirstDayOfYear(new Date())
           this.end_date = this.getTime(new Date())
@@ -525,7 +528,7 @@ import html2canvas from "html2canvas"
       },
       // 本周
       getFirstDayOfWeek(date){
-        var weekday = date.getDay() 
+        var weekday = date.getDay()
         date.setDate(date.getDate()-weekday+1);//往前算（weekday-1）天，年份、月份会自动变化
         return this.timeFormat(date);
       },
@@ -534,27 +537,29 @@ import html2canvas from "html2canvas"
         date.setDate(1);
         return this.timeFormat(date);
       },
-      // 上个月
-      gettopMonth(){
-        var currentDate = new Date();
-        var month=currentDate.getMonth()+(-1);
-        if(month<0){
-          var n = parseInt((-month)/12);
-          month += n*12;
-          currentDate.setFullYear(currentDate.getFullYear()-n);
-        }
-        currentDate = new Date(currentDate.setMonth(month));
-        //获得当前月份0-11  
-        var currentMonth = currentDate.getMonth(); 
-        //获得当前年份4位年  
-        var currentYear = currentDate.getFullYear(); 
-        //获得上一个月的第一天  
-        this.start_date = this.getTime(new Date(currentYear, currentMonth-1,1)); 
-        //获得上一月的最后一天  
-        this.end_date = this.getTime(new Date(currentYear, currentMonth, 0));
-       console.log('11111',this.getTime(new Date(currentYear, currentMonth-1,1)));
-       console.log('22222',this.getTime(new Date(currentYear, currentMonth, 0)));
+       //上个月第一天
+       getLastMonthFirstDay() {
+          var date = new Date();
+          date.setDate(0);
+          var y = date.getFullYear(); //获取年份
+          var m = date.getMonth() + 1; //获取月份
+          m = m < 10 ? "0" + m : m;
+          this.start_date = [y, m, '01'].join("-")
+          // return [y, m, '01'].join("-");
+      },
+      // 上个月最后一天
+      getLastMonthLastDay() {
+          var date = new Date();
+          date.setDate(0);
+          var y = date.getFullYear(); //获取年份
+          var m = date.getMonth() + 1; //获取月份
+          var d = new Date(y, m, 0).getDate(); //获取当月最后一日
+          m = m < 10 ? "0" + m : m; //月份补 0
+          d = d < 10 ? "0" + d : d; //日数补 0
+          this.end_date = [y, m, d].join("-")
+          // return [y, m, d].join("-");
       },
+
       // 本年
       getFirstDayOfYear (date) {
         date.setDate(1);
@@ -562,28 +567,28 @@ import html2canvas from "html2canvas"
         return this.timeFormat(date);
       },
       // 上一年第一天
-      getLastYearFirstDay() {  
-          let date = new Date();  
-         const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年  
-         const start_month= date.setMonth(0); // 设置月份为1月（注意月份是从0开始的）  
+      getLastYearFirstDay() {
+          let date = new Date();
+         const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年
+         const start_month= date.setMonth(0); // 设置月份为1月（注意月份是从0开始的）
          const start_day = date.setDate(1); // 设置日期为1日
-        //  const last_month = date.setMonth(11); // 设置月份为12月  
-        //  const last_day = date.setDate(0); // 设置日期为0，这将自动设置为该月的最后一天  
+        //  const last_month = date.setMonth(11); // 设置月份为12月
+        //  const last_day = date.setDate(0); // 设置日期为0，这将自动设置为该月的最后一天
         //  this.start_date = year+ "-" +start_month+ "-" +start_day
          this.start_date = this.getTime(start_day)
         //  return this.start_date
-      }, 
+      },
       // 上一年最后一天
-      getLastYearLastDay() {  
-          let date = new Date();  
-          const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年  
-          const last_month = date.setMonth(12); // 设置月份为12月  
-          const last_day = date.setDate(0);// 设置日期为0，这将自动设置为该月的最后一天  
+      getLastYearLastDay() {
+          let date = new Date();
+          const year= date.setFullYear(date.getFullYear() - 1); // 设置年份为前一年
+          const last_month = date.setMonth(12); // 设置月份为12月
+          const last_day = date.setDate(0);// 设置日期为0，这将自动设置为该月的最后一天
           // this.end_date =  year+ "-" +last_month+ "-" +last_day
           this.end_date = this.getTime(last_day)
           console.log('this.end_date',this.end_date);
-          // return this.end_date;  
-      }, 
+          // return this.end_date;
+      },
       // 日期格式化
       timeFormat(date) {
           if (!date || typeof(date) === "string") {
@@ -606,11 +611,11 @@ import html2canvas from "html2canvas"
       },
       handleCurrentChange(val){
         this.currentPage = val
-        this.getdetail()
+        this.getdetail(this.status_value)
       },
       handleSizeChange(val){
         this.limit = val
-        this.getdetail()
+        this.getdetail(this.status_value)
       },
        // 转换时间
       getTime(val) {
@@ -656,7 +661,7 @@ import html2canvas from "html2canvas"
               yearBirth = userCard.substring(6,10);
               monthBirth = userCard.substring(10,12);
               dayBirth = userCard.substring(12,14);
-              
+
             }
             //获取当前年月日并计算年龄
             var myDate = new Date();
@@ -671,7 +676,7 @@ import html2canvas from "html2canvas"
         } else {
           return ''
         }
-        
+
       },
       // 护士
       getAllNurseList(){
@@ -692,7 +697,7 @@ import html2canvas from "html2canvas"
               this.docList = list
               this.operators = response.data.data.operators
           }
-        })  
+        })
       },
       getnurse(ids){
         const nurse = this.nurseList
@@ -721,4 +726,4 @@ import html2canvas from "html2canvas"
     },
 
   }
-</script>
+</script>

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/dialyzer.vue

@@ -267,11 +267,14 @@ import html2canvas from "html2canvas"
           end_date:this.end_date,
         }
         Getdialyzer(params).then(response =>{
+          console.log('ressponse',response.data.data);
           if(response.data.state ==1){
+            console.log('bbbbbbbbb',response.data.data);
             const list = response.data.data.data
             const xAxis =[]
             const yAxis = []
             list.forEach(item =>{
+              
               xAxis.push(item.name)
               yAxis.push(item.count)
             })
@@ -336,7 +339,7 @@ import html2canvas from "html2canvas"
               this.Getdialyzerdetail(params.name)
             })
           }
-          console.log('ressponse',response.data.data);
+          
         })
        
       },
@@ -369,7 +372,7 @@ import html2canvas from "html2canvas"
       },
       // 详情查询
       deil_click(){
-        this.Getdialyzerdetail()
+        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
       },
        // 下载 
       Download_click(){
@@ -451,7 +454,8 @@ import html2canvas from "html2canvas"
           this.start_date = this.getFirstDayOfMonth(new Date())
           this.end_date = this.getTime(new Date())
         }else if(eve ==5){
-          this.gettopMonth()
+          this.getLastMonthFirstDay()
+          this.getLastMonthLastDay()
         }else if(eve == 6){
           this.start_date = this.getFirstDayOfYear(new Date())
           this.end_date = this.getTime(new Date())
@@ -464,7 +468,7 @@ import html2canvas from "html2canvas"
       // 详情数据源
       Getdialyzerdetail(name){
         const params={
-          dialyzer:name||this.getdialyze(this.dialyze_value),
+          dialyzer:name,
           start_date:this.start_date,
           end_date:this.end_date,
           page:this.currentPage,
@@ -520,26 +524,27 @@ import html2canvas from "html2canvas"
         date.setDate(1);
         return this.timeFormat(date);
       },
-      // 上个月
-      gettopMonth(){
-        var currentDate = new Date();
-        var month=currentDate.getMonth()+(-1);
-        if(month<0){
-          var n = parseInt((-month)/12);
-          month += n*12;
-          currentDate.setFullYear(currentDate.getFullYear()-n);
-        }
-        currentDate = new Date(currentDate.setMonth(month));
-        //获得当前月份0-11  
-        var currentMonth = currentDate.getMonth(); 
-        //获得当前年份4位年  
-        var currentYear = currentDate.getFullYear(); 
-        //获得上一个月的第一天  
-        this.start_date = this.getTime(new Date(currentYear, currentMonth-1,1)); 
-        //获得上一月的最后一天  
-        this.end_date = this.getTime(new Date(currentYear, currentMonth, 0));
-       console.log('11111',this.start_date);
-       console.log('22222',this.end_date);
+       //上个月第一天
+      getLastMonthFirstDay() {
+          var date = new Date();
+          date.setDate(0);
+          var y = date.getFullYear(); //获取年份
+          var m = date.getMonth() + 1; //获取月份
+          m = m < 10 ? "0" + m : m;
+          this.start_date = [y, m, '01'].join("-")
+          // return [y, m, '01'].join("-");
+      },
+      // 上个月最后一天
+      getLastMonthLastDay() {
+          var date = new Date();
+          date.setDate(0);
+          var y = date.getFullYear(); //获取年份
+          var m = date.getMonth() + 1; //获取月份
+          var d = new Date(y, m, 0).getDate(); //获取当月最后一日
+          m = m < 10 ? "0" + m : m; //月份补 0
+          d = d < 10 ? "0" + d : d; //日数补 0
+          this.end_date = [y, m, d].join("-")
+          // return [y, m, d].join("-");
       },
       // 本年
       getFirstDayOfYear (date) {
@@ -592,11 +597,11 @@ import html2canvas from "html2canvas"
       },
       handleCurrentChange(val){
         this.currentPage = val
-        this.Getdialyzerdetail()
+        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
       },
       handleSizeChange(val){
         this.limit = val
-        this.Getdialyzerdetail()
+        this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
       },
       // 透析模式
       getmode(ids){

src/xt_pages/Dialysisanalysis/new_otherIndicators/index.vue

@@ -8,7 +8,7 @@
       <div class="page_patientControlAnalysis">
         <div class="photos">
           <div v-for="(item,index) in indicators" :key="index"  @click="echart_click(item)"
-            style="width: 280px;height: 300px;border:1px solid gainsboro;border-radius: 8px;margin: 0 0 30px 28px"
+            style="width: 280px;height: 235px;border:1px solid gainsboro;border-radius: 8px;margin: 0 0 30px 28px"
           >
             <!-- <div v-if="" class="background date_type1" style="background-repeat: no-repeat;"></div>
             <div v-if="item.check_type == 1" class="background date_type2" style="background-repeat: no-repeat;"></div>
@@ -18,9 +18,9 @@
             <!-- <div v-if="item.check_type == 1" class="background date_type2" style="background-repeat: no-repeat;"></div>
             <div v-if="item.check_type == 2" class="background date_type3" style="background-repeat: no-repeat;"></div> -->
             <!-- <div v-if="item.check_type == 1" class="background date_type1" style="background-repeat: no-repeat;"></div> -->
-            
-            <p class="title">{{item.item_name}}</p>
-           
+
+            <p class="title" style="text-align: center;">{{item.item_name}}</p>
+
           </div>
         </div>
       </div>

src/xt_pages/workforce/components/tableData.vue

@@ -1405,6 +1405,9 @@ export default {
       if(columnIndex==1&&row.zone_type!=1){
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
+      if(columnIndex!=1&&row.zone_type!=1&&columnIndex!=23&&columnIndex!=0){
+        return 'backPurple'
+      }
       // 机号蓝线
       // if(columnIndex==1 ){
       //   return 'border_bott '
@@ -1460,12 +1463,12 @@ export default {
       // return 'border-bottom: 1px solid #707174;'
 
       // console.log('555555',this.subzone);
-      if(this.org_id!=10503 && this.org_id!=10447 && this.org_id!=0 && this.org_id !=10471){
+      if(this.org_id!=10503 && this.org_id!=10447 && this.org_id!=0 && this.org_id !=10471 ){
         return 'border: 1px solid #707174;border-collapse: collapse;'
       }
-      if(columnIndex!=1&&row.zone_type!=1&&columnIndex!=23&&columnIndex!=0){
-        return 'color:red'
-      }
+      // if(columnIndex!=1&&row.zone_type!=1&&columnIndex!=23&&columnIndex!=0){
+      //   return 'color:red'
+      // }
       
       // 分区蓝线
       // for(let i=0;i<this.subzone.length;i++){