Kaynağa Gözat

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

See999 4 yıl önce
ebeveyn
işleme
391e594cdb

+ 1 - 1
config/dev.env.js Dosyayı Görüntüle

@@ -7,7 +7,7 @@ module.exports = {
7 7
   NODE_ENV: '"development"',
8 8
   ENV_CONFIG: '"dev"',
9 9
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
10
+  BASE_API: '"http://localhost:9531"',
11 11
   SSO_HOST: '"http://testsso.sgjyun.com"',
12 12
   SRCM_HOST: '"http://test1.sgjyun.com"',
13 13
   XT_HOST: '"http://xt.test.sgjyun.com"',

+ 2 - 1
src/api/common/common.js Dosyayı Görüntüle

@@ -149,7 +149,7 @@ export function getTotalLapseCount(startime, endtime) {
149 149
     startime: startime,
150 150
     endtime: endtime
151 151
   }
152
-  console.log('params', params)
152
+  console.log('转归params', params)
153 153
   return request({
154 154
     url: '/com/api/gettotallapsecount',
155 155
     method: 'get',
@@ -199,6 +199,7 @@ export function getTotalDialysisCount(startime, endtime) {
199 199
     startime: startime,
200 200
     endtime: endtime
201 201
   }
202
+  console.log('透析年龄======', params)
202 203
   return request({
203 204
     url: '/com/api/gettotaldialysiscount',
204 205
     method: 'get',

+ 3 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue Dosyayı Görüntüle

@@ -195,7 +195,7 @@
195 195
               ? parseFloat(
196 196
               afterdialysis.weight_after -
197 197
               afterdialysis.additional_weight
198
-              ).toFixed(1)
198
+              ).toFixed(2)
199 199
               : "/"
200 200
               }}kg
201 201
             </span>
@@ -1245,7 +1245,7 @@ export default {
1245 1245
       vascularAccess: [],
1246 1246
       nursing_record: '',
1247 1247
       special_record: '',
1248
-      newTableAdvice:[]
1248
+      newTableAdvice: []
1249 1249
     }
1250 1250
   },
1251 1251
   methods: {
@@ -1433,7 +1433,7 @@ export default {
1433 1433
           var doctoradvce = response.data.data.doctorAdvice
1434 1434
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo
1435 1435
           this.newTableAdvice = response.data.data.doctorAdevieInfo
1436
-          console.log("哈哈哈哈哈哈哈哈哈",this.newTableAdvice)
1436
+          console.log('哈哈哈哈哈哈哈哈哈', this.newTableAdvice)
1437 1437
           var tableAdvice = doctorAdevieInfo
1438 1438
           console.log('tableAdvice', tableAdvice)
1439 1439
           // console.log('医生', tableAdvice.length)

+ 27 - 17
src/xt_pages/qcd/basicInformationAnalysis.vue Dosyayı Görüntüle

@@ -18,6 +18,9 @@
18 18
             >{{ item.label }}</li>
19 19
           </ul>
20 20
         </div>
21
+        <label class="title">
22
+             <span class="name">日期查询</span> :
23
+        </label>
21 24
         <el-date-picker
22 25
           v-model="listQuery.start_time"
23 26
           prefix-icon="el-icon-date"
@@ -299,8 +302,8 @@ export default {
299 302
         { value: 0, label: "本月", state: 0 },
300 303
         { value: 1, label: "近三月", state: 1 },
301 304
         { value: 2, label: "近半年", state: 2 },
302
-        { value: 3, label: "近一年", state: 3 },
303
-        { value:4,label:"自定义",state:4}
305
+        { value: 3, label: "近一年", state: 3 }
306
+        // { value:4,label:"自定义",state:4}
304 307
       ],
305 308
       modetype:[],
306 309
       total:0,
@@ -340,11 +343,11 @@ export default {
340 343
          //统计透析总量
341 344
         this.getDialysisModeType(val,this.listQuery.end_time)
342 345
         //统计转归状态
343
-        this.getTotalLapseCount(timeStar,timeEnd)
346
+        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time)
344 347
         //统计男女比例
345 348
         this.getTotalSexCount(timeStar,timeEnd)
346 349
         //统计传染病
347
-        this.getTotalInfectiousCount(timeStar,timeEnd)
350
+        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time)
348 351
         //统计年龄
349 352
         this.getTotalAgeCount(timeStar,timeEnd)
350 353
         //统计透析年龄
@@ -364,11 +367,11 @@ export default {
364 367
           //统计透析总量
365 368
         this.getDialysisModeType(this.listQuery.start_time,val)
366 369
         //统计转归状态
367
-        this.getTotalLapseCount(timeStar,timeEnd)
370
+        this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time)
368 371
         //统计男女比例
369 372
         this.getTotalSexCount(timeStar,timeEnd)
370 373
         //统计传染病
371
-        this.getTotalInfectiousCount(timeStar,timeEnd)
374
+        this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time)
372 375
         //统计年龄
373 376
         this.getTotalAgeCount(timeStar,timeEnd)
374 377
         //统计透析年龄
@@ -380,9 +383,9 @@ export default {
380 383
       this.listQuery.state = state;
381 384
       //获取本月当前机构的透析模式
382 385
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
383
-      console.log("开始时间",startDate)
386
+      // console.log("开始时间",startDate)
384 387
       const endDate = moment(new Date()).format('YYYY-MM-DD')
385
-      console.log("结束时间",endDate)
388
+      // console.log("结束时间",endDate)
386 389
       var now = new Date()
387 390
       var nowMonth = now.getMonth(); //当前月
388 391
       var nowYear = now.getFullYear(); //当前年
@@ -411,6 +414,8 @@ export default {
411 414
       }
412 415
       //近三月
413 416
       if(state == 1){
417
+        this.listQuery.start_time = ""
418
+        this.listQuery.end_time = ""
414 419
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
415 420
         // console.log("三月前",startDate)
416 421
         var startunitx = Date.parse(startDate)/1000
@@ -435,6 +440,8 @@ export default {
435 440
 
436 441
      //近半年
437 442
      if(state == 2){
443
+        this.listQuery.start_time = ""
444
+        this.listQuery.end_time = ""
438 445
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
439 446
         // console.log("6月前",startDate)
440 447
         var startunitx = Date.parse(startDate)/1000
@@ -459,6 +466,8 @@ export default {
459 466
 
460 467
      //近一年
461 468
      if(state == 3){
469
+        this.listQuery.start_time = ""
470
+        this.listQuery.end_time = ""
462 471
         const startDate = moment().subtract('month', 12).format('YYYY-MM-DD')
463 472
         // console.log("6月前",startDate)
464 473
         var startunitx = Date.parse(startDate)/1000
@@ -502,11 +511,12 @@ export default {
502 511
       getTotalLapseCount(startDate,endDate).then(response=>{
503 512
          if(response.data.state == 1){
504 513
           var patients =  response.data.data.patients
514
+          console.log('patients',patients)
505 515
           this.rollOutTotal = patients.length
506
-          // console.log("留治病人长度",patients.length)
516
+          console.log("留治病人长度",patients.length)
507 517
           var patienttwo = response.data.data.patienttwo
508 518
           this.outTotal = patienttwo.length
509
-            // console.log("转出长度", this.outTotal)
519
+          console.log("转出长度", this.outTotal)
510 520
           var count = response.data.data.count
511 521
           this.patientCount = count
512 522
          }
@@ -534,7 +544,7 @@ export default {
534 544
              this.InfectiousTotal = response.data.data.total
535 545
             //  console.log("===",this.InfectiousTotal)
536 546
              var infectious = response.data.data.count
537
-            //  console.log("infectious",infectious)
547
+          //  console.log("infectious",infectious)
538 548
              var otherTotal = response.data.data.otherTotal
539 549
             //  console.log("otherTotal",otherTotal)
540 550
              this.otherTotal = otherTotal
@@ -595,7 +605,7 @@ export default {
595 605
       getTotalDialysisCount(timeStar,timeEnd).then(response=>{
596 606
          if(response.data.state == 1){
597 607
            var dataage =  response.data.data.dataage
598
-           console.log("dataage",dataage)
608
+          //  console.log("dataage",dataage)
599 609
            this.dialysisAge = dataage
600 610
 
601 611
          }
@@ -605,24 +615,24 @@ export default {
605 615
   created() {
606 616
         //获取本月当前机构的透析模式
607 617
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
608
-      // console.log("开始时间",startDate)
618
+       console.log("开始时间",startDate)
609 619
       const endDate = moment(new Date()).format('YYYY-MM-DD')
610
-     // console.log("结束时间",endDate)
620
+     console.log("结束时间",endDate)
611 621
       var now = new Date()
612 622
       var nowMonth = now.getMonth(); //当前月
613 623
       var nowYear = now.getFullYear(); //当前年
614 624
       //本月的开始时间
615 625
       var monthStartDate = new Date(nowYear, nowMonth, 1);
616 626
       var timeStar=Date.parse(monthStartDate)/1000;//s
617
-     // console.log("本月第一天",timeStar)
627
+      console.log("本月第一天",timeStar)
618 628
       //本月的结束时间
619 629
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
620 630
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
621
-     // console.log("本月最后一天",timeEnd)
631
+      console.log("本月最后一天",timeEnd)
622 632
       //统计透析总量
623 633
       this.getDialysisModeType(startDate,endDate)
624 634
       //统计转归状态
625
-      this.getTotalLapseCount(timeStar,timeEnd)
635
+      this.getTotalLapseCount(startDate,endDate)
626 636
       //统计男女比例
627 637
       this.getTotalSexCount(timeStar,timeEnd)
628 638
       //统计传染病

+ 2 - 1
src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue Dosyayı Görüntüle

@@ -154,6 +154,7 @@
154 154
 
155 155
           }
156 156
         },
157
+        range_type:'',
157 158
         total:0,
158 159
         item_name: '',
159 160
         query: {
@@ -285,7 +286,7 @@
285 286
       },
286 287
       jumpDetail(row){
287 288
         // this.$router.push("/qcd/indicatorControlAnalysis/bloodPressureDetails?id="+patient_id)
288
-        this.$router.push("/qcd/inspection/detail?project_id="+row.project_id+"&item_id="+row.item_id+"&range_type="+row.inspect_type+"&patient_id="+row.patient.id)
289
+        this.$router.push("/qcd/inspection/detail?project_id="+row.project_id+"&item_id="+row.item_id+"&range_type="+this.query.range_type+"&patient_id="+row.patient.id)
289 290
       },
290 291
       handleSizeChange(limit) {
291 292
         this.query.limit = limit

+ 5 - 5
src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue Dosyayı Görüntüle

@@ -487,7 +487,6 @@
487 487
             this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
488 488
             // 本月的结束时间
489 489
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
490
-            this.query.patient_id = this.$route.query.patient_id
491 490
             this.query.project_id = this.$route.query.project_id
492 491
             this.query.item_id = this.$route.query.item_id
493 492
             this.query.range_type = this.$route.query.range_type
@@ -498,7 +497,7 @@
498 497
             const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
499 498
             this.query.start_time = startDate
500 499
             const endDate = moment(new Date()).format('YYYY-MM-DD')
501
-            this.query.patient_id = this.$route.query.patient_id
500
+
502 501
             this.query.project_id = this.$route.query.project_id
503 502
             this.query.item_id = this.$route.query.item_id
504 503
             this.query.range_type = this.$route.query.range_type
@@ -509,7 +508,7 @@
509 508
           case 3: //近半年
510 509
             this.query.start_time = moment().subtract('month', 6).format('YYYY-MM-DD')
511 510
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
512
-            this.query.patient_id = this.$route.query.patient_id
511
+
513 512
             this.query.project_id = this.$route.query.project_id
514 513
             this.query.item_id = this.$route.query.item_id
515 514
             this.query.range_type = this.$route.query.range_type
@@ -519,7 +518,7 @@
519 518
           case 4: //近一年
520 519
             this.query.start_time = moment().subtract('month', 12).format('YYYY-MM-DD')
521 520
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
522
-            this.query.patient_id = this.$route.query.patient_id
521
+
523 522
             this.query.project_id = this.$route.query.project_id
524 523
             this.query.item_id = this.$route.query.item_id
525 524
             this.query.range_type = this.$route.query.range_type
@@ -529,7 +528,6 @@
529 528
             this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
530 529
             // 本月的结束时间
531 530
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
532
-            this.query.patient_id = this.$route.query.patient_id
533 531
             this.query.project_id = this.$route.query.project_id
534 532
             this.query.item_id = this.$route.query.item_id
535 533
             this.query.range_type = this.$route.query.range_type
@@ -604,6 +602,8 @@
604 602
                 }
605 603
               }
606 604
 
605
+              console.log(this.options.xAxis.data)
606
+
607 607
               console.log(this.options.series[0].data)
608 608
 
609 609
               //获取无法确定选项的颜色

+ 6 - 5
src/xt_pages/qcd/officesControlAnalysis/project.vue Dosyayı Görüntüle

@@ -281,7 +281,7 @@ export default {
281 281
         //第四季度
282 282
          const four_qurter_start = moment().month(9).startOf('month').format("YYYY-MM-DD")
283 283
          const four_qurter_end = moment().month(11).endOf('month').format("YYYY-MM-DD")
284
-         console.log("this.modetype",this.mode_type)
284
+        //  console.log("this.modetype",this.mode_type)
285 285
          for(let i=0;i<this.normdata.length;i++){
286 286
             if(this.normdata[i].inspection_minor == this.mode_type){
287 287
                this.range_type = this.normdata[i].range_type
@@ -306,9 +306,9 @@ export default {
306 306
       getProjectList(params).then(response=>{
307 307
         if(response.data.state === 1){
308 308
           var list = response.data.data.list
309
-          console.log("list",list)
309
+           console.log("list",list)
310 310
           var standList =  response.data.data.standList
311
-          console.log("standlist",standList)
311
+           console.log("standlist",standList)
312 312
           var newArr = [
313 313
             {Total:"第一季度",Count:1,NoCount: 0},
314 314
             {Total:"第二季度",Count:1,NoCount: 0},
@@ -377,7 +377,7 @@ export default {
377 377
              }
378 378
           }
379 379
         
380
-      
380
+         console.log("arrfive",arrFive)
381 381
         
382 382
         for(const key in arrFive){
383 383
             this.modesData.xAxis.push(arrFive[key].Total);
@@ -387,6 +387,7 @@ export default {
387 387
 
388 388
           this.chart.series[0].data = this.modesData.series
389 389
           this.chart.xAxis.data = this.modesData.xAxis
390
+          console.log("表格",this.modesData)
390 391
        
391 392
         }
392 393
       })
@@ -573,7 +574,7 @@ export default {
573 574
        getMonthProjectList(params).then(response=>{
574 575
         if(response.data.state === 1){
575 576
             var monthlist = response.data.data.monthlist
576
-            console.log("monthlist",monthlist)
577
+           console.log("monthlist",monthlist)
577 578
             var newArr = [
578 579
               {Total:"一月",Count:1,NoCount: 0},
579 580
               {Total:"二月",Count:1,NoCount: 0},

+ 5 - 5
src/xt_pages/qcd/officesControlAnalysis/time.vue Dosyayı Görüntüle

@@ -482,7 +482,7 @@ export default {
482 482
       getNormData().then(response=>{
483 483
          if(response.data.state === 1){
484 484
            var normdata = response.data.data.normdata
485
-           console.log("指标正常范围",normdata)
485
+          //  console.log("指标正常范围",normdata)
486 486
            this.normData = normdata
487 487
            this.getlist()
488 488
          }
@@ -595,9 +595,9 @@ export default {
595 595
       getFirstQuarter(params).then(response=>{
596 596
          if(response.data.state === 1){
597 597
             var count =  response.data.data.count
598
-           console.log("count",count) 
598
+          //  console.log("count",count) 
599 599
             var countwo = response.data.data.countwo 
600
-           console.log("countwo",countwo)
600
+          //  console.log("countwo",countwo)
601 601
             countwo.map(item=>{
602 602
               count.push(item)
603 603
             })
@@ -611,7 +611,7 @@ export default {
611 611
                 }
612 612
               }
613 613
             }
614
-           console.log("arr",arr )
614
+          //  console.log("arr",arr )
615 615
            
616 616
             var arrtwo =  this.arrayDate(count,this.normData)
617 617
             for(let i=0;i<arrtwo.length;i++){
@@ -623,7 +623,7 @@ export default {
623 623
             arrtwo.map(item => {
624 624
               arr.push(item)
625 625
             })
626
-            console.log("arr",arr)
626
+            // console.log("arr",arr)
627 627
              arr.sort(this.compare('sort'))  
628 628
             // arr.sort((a,b)=>{
629 629
             //     return projectArr.indexOf(a.ProjectName)-projectArr.indexOf(b.ProjectName);

+ 40 - 4
src/xt_pages/qcd/patientComplianceDetails.vue Dosyayı Görüntüle

@@ -32,7 +32,7 @@
32 32
               </el-form-item>
33 33
             </el-form>
34 34
             <div class="tableTitle">患者列表</div>
35
-            <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'}">
35
+            <el-table ref="singleTable" :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'}">
36 36
               <el-table-column prop="name" label="透析号" width="70">
37 37
                  <template slot-scope="scope">
38 38
                     {{scope.row.dialysis_no}}
@@ -128,6 +128,7 @@ import echarts from "echarts";
128 128
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
129 129
 import LineChart from "../qcd/components/LineChart";
130 130
 import { uParseTime } from "@/utils/tools";
131
+ import { PostSearch} from '@/api/patient'
131 132
 import { getCurrentOrgPatients,GetQualityControl,getNormData,getPatientComplianceDetail } from "@/api/common/common"
132 133
 export default {
133 134
   components: {
@@ -259,7 +260,9 @@ export default {
259 260
     chooseMonth(month) {
260 261
       //一月
261 262
       if(month == 0){
262
-         this.monthActive = 0
263
+        this.listQuery.start_time = ""
264
+        this.listQuery.end_time =""
265
+        this.monthActive = 0
263 266
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
264 267
         const endDate = moment(new Date()).format('YYYY-MM-DD')
265 268
         var now = new Date()
@@ -277,6 +280,8 @@ export default {
277 280
 
278 281
       //近三月
279 282
       if(month == 1){
283
+         this.listQuery.start_time = ""
284
+         this.listQuery.end_time =""
280 285
          this.monthActive = 1
281 286
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
282 287
     
@@ -292,6 +297,8 @@ export default {
292 297
 
293 298
        //近半年
294 299
       if(month == 2){
300
+        this.listQuery.start_time = ""
301
+        this.listQuery.end_time =""
295 302
         this.monthActive = 2
296 303
         const startDate = moment().subtract('month', 6).format('YYYY-MM-DD')
297 304
         
@@ -303,6 +310,8 @@ export default {
303 310
 
304 311
       //近一年
305 312
       if(month == 3){
313
+        this.listQuery.start_time = ""
314
+        this.listQuery.end_time =""
306 315
         this.monthActive = 3
307 316
         const startDate = moment().subtract('month', 12).format('YYYY-MM-DD')
308 317
         this.startime = Date.parse(startDate)/1000
@@ -367,6 +376,11 @@ export default {
367 376
       getCurrentOrgPatients().then(response=>{
368 377
           if(response.data.state == 1){
369 378
             var patients = response.data.data.patients
379
+            for(let i=0;i<patients.length;i++){
380
+               if(this.patientid == patients[i].id){
381
+                  this.$refs.singleTable.setCurrentRow(patients[i])
382
+               }
383
+            }
370 384
             this.patientsData = patients
371 385
           }
372 386
       })
@@ -382,7 +396,6 @@ export default {
382 396
       })
383 397
     },
384 398
     getlist(){
385
-        console.log("进来没有")
386 399
         this.modesData.series = []
387 400
         this.modesData.xAxis = []
388 401
         const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
@@ -470,11 +483,34 @@ export default {
470 483
               this.chart.xAxis.data = this.modesData.xAxis
471 484
             }
472 485
        })
473
-    }
486
+    },
487
+     querySearchAsync(keyword, cb) {
488
+        let key = ''
489
+        if (keyword != undefined) {
490
+          key = keyword
491
+        }
492
+        let searchArray = []
493
+        PostSearch(key).then(response => {
494
+          if (response.data.state == 1) {
495
+             searchArray = response.data.data.patient
496
+            //  console.log("searchArray",searchArray)
497
+            cb(searchArray)
498
+          } else {
499
+            cb([])
500
+          }
501
+        })
502
+      },
503
+     handleSelect(val) {
504
+        console.log("val",val)
505
+        this.listQuery.search = val.name
506
+        this.patient_id = val.id
507
+        this.getlistDetail()
508
+      },
474 509
   },
475 510
 
476 511
    created(){
477 512
      this.patientid =  this.$route.query.patientid
513
+    
478 514
      this.inspect_date = this.$route.query.date
479 515
      //获取指标项
480 516
       this.getNormData()

+ 10 - 12
src/xt_pages/qcd/patientControlAnalysis.vue Dosyayı Görüntüle

@@ -369,7 +369,7 @@ export default {
369 369
        getPatientContorlAnalysis(params).then(response=>{
370 370
            if(response.data.state == 1){
371 371
               var control = response.data.data.patientcontorDetail
372
-             console.log("control",control)
372
+            //  console.log("control",control)
373 373
               let dataInfo = {}
374 374
               control.forEach((item, index) => {
375 375
                 let { inspect_date } = item
@@ -385,7 +385,7 @@ export default {
385 385
                 }
386 386
               })
387 387
               let list = Object.values(dataInfo)
388
-              console.log("list",list)
388
+              // console.log("list",list)
389 389
               list.map(item => {
390 390
                 for (let i = 0; i < control.length; i++) {
391 391
                   if (item.inspect_date == control[i].inspect_date && item.patient_id == control[i].patient_id) {
@@ -440,7 +440,6 @@ export default {
440 440
                   }
441 441
                   this.tableData.push({ name: key, data: dd[key]})
442 442
                 }
443
-                console.log("表哥===========",this.tableData)
444 443
               let dataInfotwo = {}
445 444
               control.forEach((item, index) => {
446 445
                 let { inspect_date } = item
@@ -491,17 +490,17 @@ export default {
491 490
       getPatientsControl(this.lapstor,this.listQuery.start_time,this.listQuery.end_time,this.listQuery.page,this.listQuery.limit).then(response=>{
492 491
          if(response.data.state == 1){
493 492
            var patients = response.data.data.patients
494
-            // console.log("patients",patients)
493
+     
495 494
             this.tablePatients = patients
496 495
             var total = response.data.data.total
497 496
             this.total = total
498 497
             var control = response.data.data.control
499 498
            var infectiousControl =  response.data.data.infectiousControl
500
-          //  console.log("infectiousContrl",infectiousControl)
499
+        
501 500
            infectiousControl.map(item=>{
502 501
              control.push(item)
503 502
            })
504
-            // console.log("control",control)
503
+       
505 504
             var newArr = []
506 505
             // 分页
507 506
             for (let i = 0; i < control.length; i++) {
@@ -511,7 +510,7 @@ export default {
511 510
                 }
512 511
               }
513 512
             }
514
-          // console.log("newArr",newArr)
513
+       
515 514
           let dataInfo = {}
516 515
           newArr.forEach((item, index) => {
517 516
             let { inspect_date } = item
@@ -535,14 +534,14 @@ export default {
535 534
               }
536 535
             }
537 536
           })
538
-        //  console.log("list",list)
537
+ 
539 538
          var newarrtwo = []
540 539
           list.map(item => {
541 540
             item.child.map(it => {
542 541
               newarrtwo.push(it)
543 542
             })
544 543
           })
545
-        //  console.log("newarrtwo",newarrtwo)
544
+ 
546 545
           // 配置的才显示
547 546
          var arrthree = []
548 547
           for (let i = 0; i < newarrtwo.length; i++) {
@@ -558,7 +557,7 @@ export default {
558 557
             item.item_name = ''
559 558
             arrthree.push(item)
560 559
           })
561
-          // console.log('arrthree', arrthree)
560
+   
562 561
           var dd = {}
563 562
            for (const index in arrthree) {
564 563
              if (!(arrthree[index].inspect_date in dd)) {
@@ -584,7 +583,7 @@ export default {
584 583
             }
585 584
           })
586 585
         let listtwo = Object.values(dataInfotwo)
587
-        // console.log("listtwo",listtwo)
586
+       
588 587
           for (const key in dd) {
589 588
             for (const mkey in this.ObjectData) {
590 589
               if (!(this.ObjectData[mkey].item_name in dd[key])) {
@@ -616,7 +615,6 @@ export default {
616 615
                }
617 616
              }
618 617
           }
619
-        //  console.log("表哥123",this.tableData)
620 618
          }
621 619
       })
622 620
     },

+ 5 - 5
src/xt_pages/qcd/statisticalConfiguration.vue Dosyayı Görüntüle

@@ -256,7 +256,7 @@ export default {
256 256
       getConfigurationDetail(id).then(response=>{
257 257
          if(response.data.state == 1){
258 258
            var configurationdetail = response.data.data.configurationdetail
259
-           console.log("详情",configurationdetail)
259
+          //  console.log("详情",configurationdetail)
260 260
            this.editform.id = configurationdetail.id
261 261
            this.editform.inspectionMajor = configurationdetail.inspection_major
262 262
            this.editform.inspectionMinor = configurationdetail.inspection_minor
@@ -290,7 +290,7 @@ export default {
290 290
       getInspectionMajor().then(response=>{
291 291
         if(response.data.state == 1){
292 292
           var inspection =  response.data.data.inspection
293
-          console.log("大项是什么",inspection)
293
+          // console.log("大项是什么",inspection)
294 294
           this.InspectionMajor = inspection
295 295
          
296 296
         }
@@ -302,7 +302,7 @@ export default {
302 302
       getInspectionMinor(id).then(response=>{
303 303
         if(response.data.state == 1){
304 304
          var inspection =  response.data.data.inspection
305
-         console.log("小项",inspection)
305
+        //  console.log("小项",inspection)
306 306
          this.InspectionMinor = inspection
307 307
         }
308 308
       })
@@ -323,7 +323,7 @@ export default {
323 323
        getInspectionRange(id).then(response=>{
324 324
          if(response.data.state == 1){
325 325
            var inspectionRange =  response.data.data.inspectionRange
326
-           console.log("inspectionRange",inspectionRange)
326
+          //  console.log("inspectionRange",inspectionRange)
327 327
            if(inspectionRange.range_type == 1){
328 328
              this.showOne = true
329 329
              this.showTwo = false
@@ -387,7 +387,7 @@ export default {
387 387
               configurationlist[i].sort = ""
388 388
             }
389 389
           }
390
-          console.log("列表",configurationlist)
390
+          // console.log("列表",configurationlist)
391 391
           this.configuraData = configurationlist
392 392
           var total = response.data.data.total
393 393
          // console.log("total",total)

+ 13 - 13
src/xt_permission.js Dosyayı Görüntüle

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28 28
   // 线上注释
29 29
 
30 30
   NProgress.start()