2 Коммиты 74ebec2b83 ... a8d365a27b

Автор SHA1 Сообщение Дата
  yq1 a8d365a27b Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch 1 месяц назад
  yq1 b058fb5cc6 9月18, 1 месяц назад

+ 3 - 0
src/xt_pages/Dialysisanalysis/new_otherIndicators/components/anticoagulant.vue Просмотреть файл

@@ -322,6 +322,7 @@ import html2canvas from "html2canvas"
322 322
           page:this.currentPage,
323 323
           limit:this.limit,
324 324
         }
325
+        console.log('抗凝剂params',params);
325 326
         Getdetail(params).then(response =>{
326 327
           if(response.data.state ==1){
327 328
             const list = response.data.data.prescriptions
@@ -352,7 +353,9 @@ import html2canvas from "html2canvas"
352 353
       },
353 354
       // 详情查询
354 355
       deil_click(){
356
+        this.currentPage =1
355 357
         this.getGetdetail(this.dialyze_value)
358
+       
356 359
       },
357 360
       //导出excel
358 361
       exportExcel(){

+ 14 - 12
src/xt_pages/Dialysisanalysis/new_otherIndicators/components/complete.vue Просмотреть файл

@@ -223,11 +223,11 @@ import html2canvas from "html2canvas"
223 223
         limit:50,
224 224
         total:0,
225 225
         tableData:[],
226
-        // status_options:[],
226
+        status_options:[],
227 227
         nurseList:[],
228 228
         operators:[],
229 229
         docList:[],
230
-        status_options:[{value:1,label:'达到透析处方时间'},{value:2,label:'超出处方时间'},{value:3,label:'未到达处方时间'}],
230
+        // status_options:[{value:1,label:'达到透析处方时间'},{value:2,label:'超出处方时间'},{value:3,label:'未到达处方时间'}],
231 231
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
232 232
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
233 233
         ],
@@ -272,14 +272,14 @@ import html2canvas from "html2canvas"
272 272
               yAxis.push(key)
273 273
             }
274 274
             const status = []
275
-            // for(let i in yAxis){
276
-            //   const obj ={
277
-            //     value:(i*1)+1,
278
-            //     label:yAxis[i]
279
-            //   }
280
-            //   status.push(obj)
281
-            // }
282
-            // this.status_options = status
275
+            for(let i in yAxis){
276
+              const obj ={
277
+                value:(i*1)+1,
278
+                label:yAxis[i]
279
+              }
280
+              status.push(obj)
281
+            }
282
+            this.status_options = status
283 283
             console.log('this.status_options',this.status_options);
284 284
             const option = {
285 285
                 title:{
@@ -340,13 +340,14 @@ import html2canvas from "html2canvas"
340 340
             myChart.setOption(option);
341 341
             myChart.on('click',params =>{
342 342
               this.complete_dialog = true
343
-              console.log('bbbb',params);
343
+              console.log('bbbb完成率',params);
344 344
               var status_id =''
345 345
               for(let i in this.status_options){
346 346
                 if(params.data.name == this.status_options[i].label){
347 347
                   status_id = this.status_options[i].value
348 348
                 }
349 349
               }
350
+              this.status_value = status_id
350 351
               this.getdetail(status_id)
351 352
             })
352 353
           }
@@ -359,6 +360,7 @@ import html2canvas from "html2canvas"
359 360
       },
360 361
       // 详情查询
361 362
       detil_click(){
363
+        this.currentPage = 1
362 364
         this.getdetail(this.status_value)
363 365
       },
364 366
        // 下载
@@ -446,7 +448,7 @@ import html2canvas from "html2canvas"
446 448
             this.tableData = table
447 449
             this.total = response.data.data.total
448 450
           }
449
-          console.log('55555',response);
451
+          console.log('55555',params);
450 452
         })
451 453
       },
452 454
       // 选择日期

+ 3 - 1
src/xt_pages/Dialysisanalysis/new_otherIndicators/components/dialyzer.vue Просмотреть файл

@@ -282,7 +282,7 @@ import html2canvas from "html2canvas"
282 282
             const options = []
283 283
             for(let i in xAxis){
284 284
               const arr ={
285
-                id:i+1,
285
+                id:(i*1)+1,
286 286
                 name:xAxis[i]
287 287
               }
288 288
               options.push(arr)
@@ -375,6 +375,7 @@ import html2canvas from "html2canvas"
375 375
       },
376 376
       // 详情查询
377 377
       deil_click(){
378
+        this.currentPage =1
378 379
         this.Getdialyzerdetail(this.getdialyze(this.dialyze_value))
379 380
       },
380 381
        // 下载 
@@ -646,6 +647,7 @@ import html2canvas from "html2canvas"
646 647
       },
647 648
       getdialyze(val){
648 649
         const option = this.dialyze_options
650
+        console.log('透析器option',option);    
649 651
         for(let i in option){
650 652
           if(val == option[i].id){
651 653
             return option[i].name