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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.1.124"
+  "version": "1.1.256"
 }

config/prod.env.js

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

src/pages/main/dialog/PlaneDialog.vue

@@ -124,7 +124,7 @@ export default {
       type: Object
     }
   },
-  mounted() {debugger
+  mounted() {
     if (this.record.id == "") {
       //没有上下机记录
       this.end_time_str =

src/pages/main/dialog/ThorougDialog.vue

@@ -431,7 +431,6 @@
           <label class="name" for="dg">透析过程提前其他原因</label>
           <div class="content">
             <input
-              type="number"
               @click="newClick($event)"
               @focus="inputFocus"
               id="txz"

src/pages/main/today/dialysisMonitoring.vue

@@ -24,8 +24,11 @@
           </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if="isShow('置换率')" width="92px">置换率(L/h)</th>
-          <th v-if="isShow('置换量')" width="92px">置换量(L)</th>
+          <th v-if="isShow('置换率')&& template_id == 6" width="92px">置换率(ml/min)</th>
+          <th v-if="isShow('置换率')&& template_id != 6" width="92px">置换率(L/h)</th>
+          <th v-if="isShow('置换量')&& template_id == 6" width="50px">置换量(ml)</th>
+          <th v-if="isShow('置换量')&& template_id != 6" width="50px">置换量(L)</th>
+
 
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>
@@ -42,15 +45,17 @@
           </td>
           <td v-if="isShow('血压')">
             {{
-              item.systolic_blood_pressure ? item.systolic_blood_pressure : ""
+            item.systolic_blood_pressure ? item.systolic_blood_pressure : ""
             }}/{{
-              item.diastolic_blood_pressure ? item.diastolic_blood_pressure : ""
+            item.diastolic_blood_pressure ? item.diastolic_blood_pressure : ""
             }}
           </td>
-
           <td v-if="isShow('脉搏')">
             {{ item.pulse_frequency ? item.pulse_frequency : "" }}
           </td>
+
+
+
           <td v-if="isShow('呼吸频率')">
             {{ item.breathing_rate ? item.breathing_rate : "" }}
           </td>

src/store/modules/globalConfig.js

@@ -408,7 +408,7 @@ const global_config = {
       },
       5: {
         id: 5,
-        name: '4%枸橼酸钠',
+        name: '枸橼酸钠',
         type: 1,
         shouji: -1,
         weichi: 1,