浏览代码

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

XMLWAN 4 年前
父节点
当前提交
a8e06186e7
共有 4 个文件被更改,包括 13 次插入34 次删除
  1. 5 0
      package-lock.json
  2. 1 0
      package.json
  3. 2 0
      src/main.js
  4. 5 34
      src/xt_pages/dialysis/PatientBox.vue

+ 5 - 0
package-lock.json 查看文件

3190
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
3190
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
3191
       "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
3191
       "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
3192
     },
3192
     },
3193
+    "default-passive-events": {
3194
+      "version": "2.0.0",
3195
+      "resolved": "https://registry.npmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz",
3196
+      "integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
3197
+    },
3193
     "define-properties": {
3198
     "define-properties": {
3194
       "version": "1.1.3",
3199
       "version": "1.1.3",
3195
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
3200
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",

+ 1 - 0
package.json 查看文件

43
     "clipboard": "^1.7.1",
43
     "clipboard": "^1.7.1",
44
     "codemirror": "5.32.0",
44
     "codemirror": "5.32.0",
45
     "connect": "3.6.6",
45
     "connect": "3.6.6",
46
+    "default-passive-events": "^2.0.0",
46
     "driver.js": "0.5.2",
47
     "driver.js": "0.5.2",
47
     "dropzone": "5.2.0",
48
     "dropzone": "5.2.0",
48
     "echarts": "3.8.5",
49
     "echarts": "3.8.5",

+ 2 - 0
src/main.js 查看文件

29
 import * as filters from './filters' // global filters
29
 import * as filters from './filters' // global filters
30
 
30
 
31
 import * as voicePromptFun from './utils/voicePrompt' 
31
 import * as voicePromptFun from './utils/voicePrompt' 
32
+
33
+import 'default-passive-events'
32
 Vue.prototype.voicePrompt = voicePromptFun.voicePrompt  //语音提醒
34
 Vue.prototype.voicePrompt = voicePromptFun.voicePrompt  //语音提醒
33
 
35
 
34
 Vue.use(Element, {
36
 Vue.use(Element, {

+ 5 - 34
src/xt_pages/dialysis/PatientBox.vue 查看文件

3
     <!-- <router-link to="/dialysis/details"> -->
3
     <!-- <router-link to="/dialysis/details"> -->
4
     <div
4
     <div
5
       class="patient"
5
       class="patient"
6
-      v-for="schedule in scheduleArr"
6
+      v-for="schedule in schedules"
7
       v-if="schedule.patient"
7
       v-if="schedule.patient"
8
       :class="borderColor(schedule)"
8
       :class="borderColor(schedule)"
9
       @click.stop="detailAction(schedule)"
9
       @click.stop="detailAction(schedule)"
213
       temp_schedual: null,
213
       temp_schedual: null,
214
       date:'',
214
       date:'',
215
       modedata:0,
215
       modedata:0,
216
-      scheduleArr:[]
217
     };
216
     };
218
   },
217
   },
219
   props: {
218
   props: {
378
       this.doctor_advices = [];
377
       this.doctor_advices = [];
379
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
378
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
380
         var resp = rs.data;
379
         var resp = rs.data;
381
-      
382
         if (resp.state == 1) {
380
         if (resp.state == 1) {
383
           var patient = resp.data.patient; // 患者信息
381
           var patient = resp.data.patient; // 患者信息
384
-          // console.log("患者信息99999999",patient)
382
+          console.log("患者信息",patient)
385
           var schedual = resp.data.schedual; // 患者排班信息
383
           var schedual = resp.data.schedual; // 患者排班信息
386
-          // console.log("排班2222222222",schedual)
387
           var prescription = resp.data.prescription; // 透析处方
384
           var prescription = resp.data.prescription; // 透析处方
388
           if(prescription!=null){
385
           if(prescription!=null){
389
               if(prescription.body_fluid == -2 ){
386
               if(prescription.body_fluid == -2 ){
505
           this.admin_users = resp.data.doctors;
502
           this.admin_users = resp.data.doctors;
506
           this.devices = resp.data.devices;
503
           this.devices = resp.data.devices;
507
           this.device_numbers = resp.data.device_numbers;
504
           this.device_numbers = resp.data.device_numbers;
508
-           
509
-        
505
+
506
+          
510
 
507
 
511
           var device_map = {};
508
           var device_map = {};
512
           for (let index = 0; index < this.devices.length; index++) {
509
           for (let index = 0; index < this.devices.length; index++) {
528
             device_number_map[device_number.id] = device_number;
525
             device_number_map[device_number.id] = device_number;
529
           }
526
           }
530
           this.device_number_map = device_number_map;
527
           this.device_number_map = device_number_map;
531
-
532
-          
533
           this.getLongAdvice()
528
           this.getLongAdvice()
534
         } else {
529
         } else {
535
           this.$message.error(resp.msg);
530
           this.$message.error(resp.msg);
581
               }
576
               }
582
 
577
 
583
               this.is_open = resp.data.is_open_remind;
578
               this.is_open = resp.data.is_open_remind;
584
-             
585
               this.longAdvices = totalAdvice;
579
               this.longAdvices = totalAdvice;
586
               this.waitUploadAdvices = waitUploadAdvices;
580
               this.waitUploadAdvices = waitUploadAdvices;
587
               break;
581
               break;
595
       this.$emit("advice");
589
       this.$emit("advice");
596
     },
590
     },
597
     open(schedual){
591
     open(schedual){
592
+      console.log("中国2222222",this)
598
      
593
      
599
-      
600
       this.date = schedual.schedule_date
594
       this.date = schedual.schedule_date
601
       this.patient_id = schedual.patient_id
595
       this.patient_id = schedual.patient_id
602
       this.modedata = 1
596
       this.modedata = 1
633
       } else if (id == 3) {
627
       } else if (id == 3) {
634
         return 'modePurple'
628
         return 'modePurple'
635
       }
629
       }
636
-    },
637
-
638
-   compare(propertyName) {
639
-    return function(obj1, obj2) {
640
-        var value1 = obj1[propertyName];
641
-        var value2 = obj2[propertyName];
642
-        if (value1 < value2) {
643
-            return -1;
644
-        } else if (value1 > value2) {
645
-            return 1;
646
-        } else {
647
-            return 0;
648
-        }
649
     }
630
     }
650
-   }
651
-  
652
   },
631
   },
653
-  created(){
654
-  
655
-    for(let i=0;i<this.schedules.length;i++){
656
-       this.schedules[i].Sort = this.schedules[i].device_number.sort
657
-    }
658
-   this.schedules.sort(this.compare("Sort"))
659
-   this.scheduleArr = this.schedules
660
-  }
661
 };
632
 };
662
 </script>
633
 </script>
663
 
634