See999 4 år sedan
förälder
incheckning
2811d7a92b
4 ändrade filer med 9 tillägg och 28 borttagningar
  1. 5 0
      package-lock.json
  2. 1 0
      package.json
  3. 2 0
      src/main.js
  4. 1 28
      src/xt_pages/dialysis/PatientBox.vue

+ 5 - 0
package-lock.json Visa fil

@@ -3190,6 +3190,11 @@
3190 3190
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
3191 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 3198
     "define-properties": {
3194 3199
       "version": "1.1.3",
3195 3200
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",

+ 1 - 0
package.json Visa fil

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

+ 2 - 0
src/main.js Visa fil

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

+ 1 - 28
src/xt_pages/dialysis/PatientBox.vue Visa fil

@@ -3,7 +3,7 @@
3 3
     <!-- <router-link to="/dialysis/details"> -->
4 4
     <div
5 5
       class="patient"
6
-      v-for="schedule in scheduleArr"
6
+      v-for="schedule in schedules"
7 7
       v-if="schedule.patient"
8 8
       :class="borderColor(schedule)"
9 9
       @click.stop="detailAction(schedule)"
@@ -213,7 +213,6 @@ export default {
213 213
       temp_schedual: null,
214 214
       date:'',
215 215
       modedata:0,
216
-      scheduleArr:[]
217 216
     };
218 217
   },
219 218
   props: {
@@ -628,34 +627,8 @@ export default {
628 627
       } else if (id == 3) {
629 628
         return 'modePurple'
630 629
       }
631
-    },
632
-
633
-   compare(propertyName) {
634
-    return function(obj1, obj2) {
635
-        var value1 = obj1[propertyName];
636
-        var value2 = obj2[propertyName];
637
-        if (value1 < value2) {
638
-            return -1;
639
-        } else if (value1 > value2) {
640
-            return 1;
641
-        } else {
642
-            return 0;
643
-        }
644 630
     }
645
-}
646 631
   },
647
-  created(){
648
-    console.log("排班数据33333",this.schedules)
649
-
650
-    for(let i=0;i<this.schedules.length;i++){
651
-       this.schedules[i].Sort = this.schedules[i].device_number.sort
652
-    }
653
-
654
-   console.log("9999999",this.schedules)
655
-   this.schedules.sort(this.compare("Sort"))
656
-    console.log("122212121212112",this.schedules)
657
-    this.scheduleArr = this.schedules
658
-  }
659 632
 };
660 633
 </script>
661 634