Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13759"
+  "version": "2999.999.13753"
 }

src/pages/main/DetailsPage.vue

@@ -456,6 +456,13 @@ export default {
     this.websocketSend(unObj)
   },
   methods: {
+    compare (property) {
+        return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+        }
+     },
     down (event) {
       this.flags = true
       var touch
@@ -808,9 +815,7 @@ export default {
         }
        
         this.newPatient = []
-        this.newPatient = cityNameList.sort(function (a, b) {
-            return a.sort > b.sort
-         })
+        this.newPatient = cityNameList.sort(this.compare('sort'))
 
 
 
@@ -951,9 +956,7 @@ export default {
         }
        
         this.myPatientsOne = []
-        this.myPatientsOne = zoneArr.sort(function (a, b) {
-            return a.sort > b.sort
-         })
+        this.myPatientsOne = zoneArr.sort(this.compare('sort'))
 
        
 
@@ -1043,10 +1046,8 @@ export default {
         }
        
         this.myPatientsOne = []
-        this.myPatientsOne = zoneArr.sort(function (a, b) {
-            return a.sort > b.sort
-         })
-
+        this.myPatientsOne = zoneArr.sort(this.compare('sort'))
+        console.log("我的病人hhhhhhhhhhhhhhhhhhhh",this.myPatientsOne)
       
 
         let cityNameList = []
@@ -1115,9 +1116,7 @@ export default {
               }
             
               this.myPatientsOne = []
-              this.myPatientsOne = zoneArr.sort(function (a, b) {
-                  return a.sort > b.sort
-              })
+              this.myPatientsOne = zoneArr.sort(this.compare('sort'))
 
             this.searchArr = zoneArr
 
@@ -1178,11 +1177,9 @@ export default {
               }
             
               this.myPatientsOne = []
-              this.myPatientsOne = zoneArr.sort(function (a, b) {
-                  return a.sort > b.sort
-              })
-
+              this.myPatientsOne = zoneArr.sort(this.compare('sort'))
 
+             this.searchArr = zoneArr
 
             // console.log('arr', arr)
             let cityNameList = []
@@ -1235,6 +1232,8 @@ export default {
     },
     onSearch (val) {
       console.log(val)
+      console.log("active=-----------------",this.active)
+      console.log("searchArr",this.searchArr)
       if (this.active == 0) {
         let arr = []
         this.searchArr.map(item => {
@@ -1247,18 +1246,19 @@ export default {
           cityNameList.push(arr[p])
         }
 
+        console.log("cityNameList",cityNameList)
+
           // //解决溪康排序问题  我的病人列表
           if(cityNameList!=null && cityNameList.length>0){
-                for(let i=0;i<cityNameList.length;i++){
-                  cityNameList[i].sort = 0
-                  cityNameList[i].sort = cityNameList[i].device_number.sort 
-                }
+              for(let i=0;i<cityNameList.length;i++){
+                cityNameList[i].sort = 0
+                cityNameList[i].sort = cityNameList[i].device_number.sort 
               }
+          }
             
-              this.myPatientsOne = []
-              this.myPatientsOne = cityNameList.sort(function (a, b) {
-                  return a.sort > b.sort
-         })
+          this.myPatientsOne = []
+          this.myPatientsOne = cityNameList.sort(this.compare('sort'))
+          console.log("myPatientsOne----------------",this.myPatientsOne)
 
 
         let firstName = {}
@@ -1281,6 +1281,8 @@ export default {
           this.mypatients = newObj
         })
       } else if (this.active == 1) {
+
+        console.log("allSearchArr------------------",this.allSearchArr)
         let arr = []
         this.allSearchArr.map(item => {
           if (item.patient.name.indexOf(val) != -1) {
@@ -1295,16 +1297,14 @@ export default {
 
        // //解决溪康排序问题  我的病人列表
        if(cityNameList!=null && cityNameList.length>0){
-                for(let i=0;i<cityNameList.length;i++){
-                  cityNameList[i].sort = 0
-                  cityNameList[i].sort = cityNameList[i].device_number.sort 
-                }
-              }
+          for(let i=0;i<cityNameList.length;i++){
+             cityNameList[i].sort = 0
+             cityNameList[i].sort = cityNameList[i].device_number.sort 
+           }
+         }
             
-              this.myPatientsOne = []
-              this.myPatientsOne = cityNameList.sort(function (a, b) {
-                  return a.sort > b.sort
-         })
+        this.newPatient = []
+        this.newPatient = cityNameList.sort(this.compare('sort'))
 
 
         let firstName = {}