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

src/api/qcd.js

@@ -293,3 +293,12 @@ export function Getbpdetail(params) {
     params: params
   })
 }
+
+//干体重详情
+export function Getdryweightdetail(params) {
+  return request({
+    url: '/api/commonqc/dryweight/detail',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/Dialysisanalysis/weightblood/components/dry_denominator.vue

@@ -360,7 +360,7 @@ import html2canvas from "html2canvas"
                   this.weight_value = this.weight_gain[i].value
                 }
               }
-              this.Getdialyzerdetail(this.weight_value)
+              this.Getdialyzerdetail(this.weight_value,2)
             })
           }
 
@@ -404,7 +404,7 @@ import html2canvas from "html2canvas"
       // 详情查询
       deil_click(){
         this.currentPage = 1
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,2)
       },
        // 下载
       Download_click(){
@@ -498,7 +498,7 @@ import html2canvas from "html2canvas"
         console.log('eve',eve);
       },
       // 详情数据源
-      Getdialyzerdetail(add){
+      Getdialyzerdetail(add,type){
         const params ={
           start_time:this.start_date,
           end_time:this.end_date,
@@ -508,6 +508,7 @@ import html2canvas from "html2canvas"
           keyword:this.Patient_name,
           page:this.currentPage,
           limit:this.limit,
+          item_type:type,
         }
         this.loading = true
         Getweightdetail(params).then(response =>{
@@ -526,7 +527,7 @@ import html2canvas from "html2canvas"
                   dry_weight:item.dry_weight,
                   last_weight_after:item.last_weight_after,
                   weight_before:item.weight_before,
-                  weight_add:(item.weight_add*1).toFixed(2),
+                  weight_add:((item.weight_before - item.dry_weight) / item.dry_weight).toFixed(3)  ,
                   weight_after:item.weight_after
                 }
                 table.push(obj)
@@ -641,11 +642,11 @@ import html2canvas from "html2canvas"
       },
       handleCurrentChange(val){
         this.currentPage = val
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,2)
       },
       handleSizeChange(val){
         this.limit = val
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,2)
       },
       // 性别
       getgender(ids){

src/xt_pages/Dialysisanalysis/weightblood/components/dry_weight.vue

@@ -181,7 +181,7 @@
 import * as echarts from 'echarts';
 import XLSX from 'xlsx';
 import { uParseTime } from "@/utils/tools";
-import {Getpatinetweight,Getweightdetail} from '../../../../api/qcd'
+import {Getpatinetweight,Getdryweightdetail} from '../../../../api/qcd'
 import {getAllNurseList} from '@/api/fallassement'
 import { getAllDoctorList} from "@/api/device"
 import html2canvas from "html2canvas"
@@ -340,15 +340,15 @@ import html2canvas from "html2canvas"
       },
       // 查询
       sete_click(){
-        
+
         this.getecharts()
       },
       // 详情查询
       detil_click(){
-        
+
         this.currentPage =1
         this.getdetail(this.status_value)
-        
+
       },
        // 下载
       Download_click(){
@@ -411,7 +411,7 @@ import html2canvas from "html2canvas"
           limit:this.limit,
         }
         this.loading = true
-        Getweightdetail(params).then(response =>{
+        Getdryweightdetail(params).then(response =>{
           if(response.data.state ==1){
             const list = response.data.data.list
             // const xAxis = []

src/xt_pages/Dialysisanalysis/weightblood/components/list_denominator.vue

@@ -357,12 +357,12 @@ import html2canvas from "html2canvas"
               for(let i in this.weight_gain){
                 if(params.name == this.weight_gain[i].label){
                   this.weight_value = this.weight_gain[i].value
-                  
+
                 }
               }
-              // this.Getdialyzerdetail(params.name)              
+              // this.Getdialyzerdetail(params.name)
               // console.log('this.weight_value',this.weight_value);
-              this.Getdialyzerdetail(this.weight_value)
+              this.Getdialyzerdetail(this.weight_value,1)
             })
           }
 
@@ -406,7 +406,7 @@ import html2canvas from "html2canvas"
       // 详情查询
       deil_click(){
         this.currentPage = 1
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,1)
       },
        // 下载
       Download_click(){
@@ -500,7 +500,7 @@ import html2canvas from "html2canvas"
         console.log('eve',eve);
       },
       // 详情数据源
-      Getdialyzerdetail(add){
+      Getdialyzerdetail(add,type){
         const params ={
           start_time:this.start_date,
           end_time:this.end_date,
@@ -510,6 +510,7 @@ import html2canvas from "html2canvas"
           keyword:this.Patient_name,
           page:this.currentPage,
           limit:this.limit,
+          item_type:type
         }
         this.loading = true
         Getweightdetail(params).then(response =>{
@@ -644,11 +645,11 @@ import html2canvas from "html2canvas"
       },
       handleCurrentChange(val){
         this.currentPage = val
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,1)
       },
       handleSizeChange(val){
         this.limit = val
-        this.Getdialyzerdetail(this.weight_value)
+        this.Getdialyzerdetail(this.weight_value,1)
       },
       // 性别
       getgender(ids){