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

package-lock.json

@@ -3190,6 +3190,11 @@
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
       "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
     },
+    "default-passive-events": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz",
+      "integrity": "sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ=="
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",

package.json

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

src/main.js

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

src/xt_pages/dialysis/PatientBox.vue

@@ -3,7 +3,7 @@
     <!-- <router-link to="/dialysis/details"> -->
     <div
       class="patient"
-      v-for="schedule in scheduleArr"
+      v-for="schedule in schedules"
       v-if="schedule.patient"
       :class="borderColor(schedule)"
       @click.stop="detailAction(schedule)"
@@ -213,7 +213,6 @@ export default {
       temp_schedual: null,
       date:'',
       modedata:0,
-      scheduleArr:[]
     };
   },
   props: {
@@ -378,12 +377,10 @@ export default {
       this.doctor_advices = [];
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
         var resp = rs.data;
-      
         if (resp.state == 1) {
           var patient = resp.data.patient; // 患者信息
-          // console.log("患者信息99999999",patient)
+          console.log("患者信息",patient)
           var schedual = resp.data.schedual; // 患者排班信息
-          // console.log("排班2222222222",schedual)
           var prescription = resp.data.prescription; // 透析处方
           if(prescription!=null){
               if(prescription.body_fluid == -2 ){
@@ -505,8 +502,8 @@ export default {
           this.admin_users = resp.data.doctors;
           this.devices = resp.data.devices;
           this.device_numbers = resp.data.device_numbers;
-           
-        
+
+          
 
           var device_map = {};
           for (let index = 0; index < this.devices.length; index++) {
@@ -528,8 +525,6 @@ export default {
             device_number_map[device_number.id] = device_number;
           }
           this.device_number_map = device_number_map;
-
-          
           this.getLongAdvice()
         } else {
           this.$message.error(resp.msg);
@@ -581,7 +576,6 @@ export default {
               }
 
               this.is_open = resp.data.is_open_remind;
-             
               this.longAdvices = totalAdvice;
               this.waitUploadAdvices = waitUploadAdvices;
               break;
@@ -595,8 +589,8 @@ export default {
       this.$emit("advice");
     },
     open(schedual){
+      console.log("中国2222222",this)
      
-      
       this.date = schedual.schedule_date
       this.patient_id = schedual.patient_id
       this.modedata = 1
@@ -633,31 +627,8 @@ export default {
       } else if (id == 3) {
         return 'modePurple'
       }
-    },
-
-   compare(propertyName) {
-    return function(obj1, obj2) {
-        var value1 = obj1[propertyName];
-        var value2 = obj2[propertyName];
-        if (value1 < value2) {
-            return -1;
-        } else if (value1 > value2) {
-            return 1;
-        } else {
-            return 0;
-        }
     }
-   }
-  
   },
-  created(){
-  
-    for(let i=0;i<this.schedules.length;i++){
-       this.schedules[i].Sort = this.schedules[i].device_number.sort
-    }
-   this.schedules.sort(this.compare("Sort"))
-   this.scheduleArr = this.schedules
-  }
 };
 </script>