Merge branch 'update' of http://git.shengws.com/zhangbj/xt_pad into update

config/prod.env.js

@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
+  BASE_API: '"http://api.xt.kuyicloud.com"'
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 }

src/pages/monitoring/index.vue

@@ -76,10 +76,10 @@
             </td>
             <td width="27%">
               <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 1">低压</span>
-              <span style="background-color: dodgerblue" v-if="monitorBloodPressureStatus(item.monitoring_record) == 2">正常</span>
+              <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 2">正常</span>
               <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 3">高压</span>
               <span v-if="monitorRateStatus(item.monitoring_record) == 1">心率过缓</span>
-              <span style="background-color: dodgerblue" v-if="monitorRateStatus(item.monitoring_record) == 2">正常</span>
+              <span v-if="monitorRateStatus(item.monitoring_record) == 2">正常</span>
               <span v-if="monitorRateStatus(item.monitoring_record) == 3">心率过高</span>
             </td>
           </tr>
@@ -242,22 +242,27 @@ export default {
       }
       for (let i = 0; i < val.length; i++) {
         //舒张压（低压）(diastolic_blood_pressure)    收缩压(高压)(systolic_blood_pressure)
-        if (
-          val[i].diastolic_blood_pressure < 60 ||
-          val[i].systolic_blood_pressure < 90
-        ) {
+        if (val[i].systolic_blood_pressure >= 140 || val[i].diastolic_blood_pressure >= 90) {
+          status = 3;  //高压
+        } else if (val[i].diastolic_blood_pressure < 60 || val[i].systolic_blood_pressure < 90) {
           status = 1; //低压
-        } else if (
-          val[i].diastolic_blood_pressure >= 60 ||
-          val[i].systolic_blood_pressure < 140
-        ) {
+        } else if (val[i].diastolic_blood_pressure >= 60 || val[i].systolic_blood_pressure < 140) {
           status = 2; //正常
-        } else if (
-          val[i].diastolic_blood_pressure >= 90 ||
-          val[i].systolic_blood_pressure >= 140
-        ) {
-          status = 3; //高压
         }
+
+        // if ( val[i].diastolic_blood_pressure < 60 | val[i].systolic_blood_pressure < 90 ) {
+        //   status = 1; //低压
+        // } else if (
+        //   val[i].diastolic_blood_pressure >= 60 ||
+        //   val[i].systolic_blood_pressure < 140
+        // ) {
+        //   status = 2; //正常
+        // } else if (
+        //   val[i].diastolic_blood_pressure >= 90 ||
+        //   val[i].systolic_blood_pressure >= 140
+        // ) {
+        //   status = 3; //高压
+        // }
       }
 
       return status;