修改华侨问题

config/index.js

@@ -9,7 +9,7 @@ module.exports = {
 
     // Paths
     assetsSubDirectory: 'static',
-    assetsPublicPath: './',
+    assetsPublicPath: '/',
     proxyTable: {},
 
     // Various Dev Server settings

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"'
 }

package-lock.json

@@ -54,7 +54,7 @@
     },
     "@antv/gl-matrix": {
       "version": "2.7.1",
-      "resolved": "https://registry.npm.taobao.org/@antv/gl-matrix/download/@antv/gl-matrix-2.7.1.tgz",
+      "resolved": "http://registry.npm.taobao.org/@antv/gl-matrix/download/@antv/gl-matrix-2.7.1.tgz",
       "integrity": "sha1-rLjjf3qz3wE0WrpDcteUK+QuuhQ="
     },
     "@antv/scale": {
@@ -78,7 +78,7 @@
     },
     "@antv/util": {
       "version": "1.2.5",
-      "resolved": "https://registry.npm.taobao.org/@antv/util/download/@antv/util-1.2.5.tgz",
+      "resolved": "http://registry.npm.taobao.org/@antv/util/download/@antv/util-1.2.5.tgz",
       "integrity": "sha1-iJbFBV7Cnko0S12ql7+CkF99QM0=",
       "requires": {
         "@antv/gl-matrix": "^2.7.1"
@@ -840,12 +840,12 @@
     },
     "array-filter": {
       "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/array-filter/download/array-filter-1.0.0.tgz",
+      "resolved": "http://registry.npm.taobao.org/array-filter/download/array-filter-1.0.0.tgz",
       "integrity": "sha1-uveeYubvTCpMC4MSMtr/7CUfnYM="
     },
     "array-find": {
       "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/array-find/download/array-find-1.0.0.tgz",
+      "resolved": "http://registry.npm.taobao.org/array-find/download/array-find-1.0.0.tgz",
       "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg="
     },
     "array-find-index": {
@@ -871,12 +871,12 @@
     },
     "array-map": {
       "version": "0.0.0",
-      "resolved": "https://registry.npm.taobao.org/array-map/download/array-map-0.0.0.tgz",
+      "resolved": "http://registry.npm.taobao.org/array-map/download/array-map-0.0.0.tgz",
       "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
     },
     "array-shuffle": {
       "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/array-shuffle/download/array-shuffle-1.0.1.tgz",
+      "resolved": "http://registry.npm.taobao.org/array-shuffle/download/array-shuffle-1.0.1.tgz",
       "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo="
     },
     "array-union": {
@@ -1052,7 +1052,7 @@
     },
     "autosize": {
       "version": "3.0.21",
-      "resolved": "https://registry.npm.taobao.org/autosize/download/autosize-3.0.21.tgz",
+      "resolved": "http://registry.npm.taobao.org/autosize/download/autosize-3.0.21.tgz",
       "integrity": "sha1-8YL0DRd1fZeKE5pMnKQMTA5EhgM="
     },
     "aws-sign2": {
@@ -2194,7 +2194,7 @@
     },
     "blueimp-md5": {
       "version": "2.10.0",
-      "resolved": "https://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.10.0.tgz",
+      "resolved": "http://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.10.0.tgz",
       "integrity": "sha1-AvCEOSH5DcoU9biSCjhZMgHWlk0="
     },
     "bn.js": {
@@ -3407,7 +3407,7 @@
     },
     "countup.js": {
       "version": "1.9.3",
-      "resolved": "https://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz",
+      "resolved": "http://registry.npm.taobao.org/countup.js/download/countup.js-1.9.3.tgz",
       "integrity": "sha1-zj5QzXFgRB5HjwfaMYle3MDxyd0="
     },
     "create-ecdh": {
@@ -5280,7 +5280,7 @@
     },
     "fastclick": {
       "version": "1.0.6",
-      "resolved": "https://registry.npm.taobao.org/fastclick/download/fastclick-1.0.6.tgz",
+      "resolved": "http://registry.npm.taobao.org/fastclick/download/fastclick-1.0.6.tgz",
       "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo="
     },
     "fastparse": {
@@ -5318,7 +5318,7 @@
     },
     "fecha": {
       "version": "2.3.3",
-      "resolved": "https://registry.npm.taobao.org/fecha/download/fecha-2.3.3.tgz",
+      "resolved": "http://registry.npm.taobao.org/fecha/download/fecha-2.3.3.tgz",
       "integrity": "sha1-lI50FX3xoy/RsSw6PDzctuydls0="
     },
     "figures": {
@@ -6474,7 +6474,7 @@
     },
     "hammerjs": {
       "version": "2.0.8",
-      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
+      "resolved": "http://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
     "handle-thing": {
@@ -8635,7 +8635,7 @@
     },
     "lodash.throttle": {
       "version": "4.1.1",
-      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
+      "resolved": "http://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
     },
     "lodash.unionwith": {
@@ -9416,7 +9416,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -9502,7 +9502,7 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
     },
     "npm-run-path": {
@@ -12305,13 +12305,13 @@
       "dependencies": {
         "ansi-styles": {
           "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "dev": true
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -12324,13 +12324,13 @@
         },
         "progress": {
           "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+          "resolved": "http://registry.npm.taobao.org/progress/download/progress-1.1.8.tgz",
           "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
           "dev": true
         },
         "supports-color": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
           "dev": true
         }
@@ -12458,7 +12458,7 @@
     },
     "qr.js": {
       "version": "0.0.0",
-      "resolved": "https://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
+      "resolved": "http://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
       "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
     },
     "qs": {
@@ -13731,7 +13731,7 @@
     },
     "shake.js": {
       "version": "1.2.2",
-      "resolved": "https://registry.npm.taobao.org/shake.js/download/shake.js-1.2.2.tgz",
+      "resolved": "http://registry.npm.taobao.org/shake.js/download/shake.js-1.2.2.tgz",
       "integrity": "sha1-sqxWCoKr5o14oCliOnCI4bMLrP8="
     },
     "shallow-clone": {
@@ -15213,12 +15213,12 @@
     },
     "validator": {
       "version": "9.4.1",
-      "resolved": "https://registry.npm.taobao.org/validator/download/validator-9.4.1.tgz",
+      "resolved": "http://registry.npm.taobao.org/validator/download/validator-9.4.1.tgz",
       "integrity": "sha1-q/Rm05i1Yc0kMFARLG/x3mzBJmM="
     },
     "vanilla-masker": {
       "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/vanilla-masker/download/vanilla-masker-1.2.0.tgz",
+      "resolved": "http://registry.npm.taobao.org/vanilla-masker/download/vanilla-masker-1.2.0.tgz",
       "integrity": "sha1-woMOnZlKX+zSJhUGR3wnB/5Yl1Y="
     },
     "vant": {
@@ -15497,7 +15497,7 @@
       "dependencies": {
         "axios": {
           "version": "0.15.3",
-          "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.15.3.tgz",
+          "resolved": "http://registry.npm.taobao.org/axios/download/axios-0.15.3.tgz",
           "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
           "requires": {
             "follow-redirects": "1.0.0"
@@ -15505,7 +15505,7 @@
         },
         "follow-redirects": {
           "version": "1.0.0",
-          "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.0.0.tgz",
+          "resolved": "http://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.0.0.tgz",
           "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
           "requires": {
             "debug": "^2.2.0"
@@ -15515,7 +15515,7 @@
     },
     "vux-blazy": {
       "version": "1.6.4",
-      "resolved": "https://registry.npm.taobao.org/vux-blazy/download/vux-blazy-1.6.4.tgz",
+      "resolved": "http://registry.npm.taobao.org/vux-blazy/download/vux-blazy-1.6.4.tgz",
       "integrity": "sha1-4zBz2QLgo4RO8aRjzOPKLgqrR78="
     },
     "vux-loader": {
@@ -15752,7 +15752,7 @@
     },
     "vux-xscroll": {
       "version": "3.1.12",
-      "resolved": "https://registry.npm.taobao.org/vux-xscroll/download/vux-xscroll-3.1.12.tgz",
+      "resolved": "http://registry.npm.taobao.org/vux-xscroll/download/vux-xscroll-3.1.12.tgz",
       "integrity": "sha1-41Ln+dxfn+6SU9szHJZ91Ws7yVA="
     },
     "w3c-hr-time": {
@@ -16469,7 +16469,7 @@
     },
     "x-photoswipe": {
       "version": "4.1.3-rc.1",
-      "resolved": "https://registry.npm.taobao.org/x-photoswipe/download/x-photoswipe-4.1.3-rc.1.tgz",
+      "resolved": "http://registry.npm.taobao.org/x-photoswipe/download/x-photoswipe-4.1.3-rc.1.tgz",
       "integrity": "sha1-52GQF1LdPdH3GOU4UUtgm13199s="
     },
     "xml-name-validator": {

src/pages/layout/SideBar.vue

@@ -44,10 +44,10 @@ export default {
   width:20px;
   line-height:20px;
   text-align:center;
-  font-size:0.2em;
+  font-size:0.74em;
   border-radius:20px;
   color:#fff;
-  background:red;
+  background:#F56C6C;
   position: absolute;
   top: -5px;
   right: -15px;

src/pages/main/PatientBox.vue

@@ -343,7 +343,7 @@
   font-size:0.8em;
   border-radius:20px;
   color:#fff;
-  background:red;
+  background:#F56C6C;
   position: absolute;
   top: -8px;
   left: 0.7rem;

src/pages/main/RecordPage.vue

@@ -163,7 +163,7 @@
   font-size:0.8em;
   border-radius:20px;
   color:#fff;
-  background:red;
+  background:#F56C6C;
   position: absolute;
   top: -8px;
   right: -8px;

src/pages/main/dialog/AcceptsDialog.vue

@@ -7,6 +7,8 @@
         <span class="success" @click="commitInfo">完成</span>
       </div>
       <div class="DialogContent choose">
+
+
         <el-form :model="receiveTreatmentAsses" label-width="90px">
           <el-form-item label="入室方式: " v-if="isShow('入室方式')">
             <el-radio v-model="receiveTreatmentAsses.way" label="1">步行</el-radio>
@@ -46,6 +48,10 @@
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="2">严重</el-radio>
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="3">危</el-radio>
           </el-form-item>
+          <el-form-item label-width="100dp" label="跌倒分险评估评分 : "
+                        v-if="isShow('跌倒分险评估评分')">
+            <el-input v-model="receiveTreatmentAsses.score" style="width: 100px"></el-input>
+          </el-form-item>
 
           <el-form-item label="风险程度: " v-if="isShow('风险程度')">
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="1">无</el-radio>
@@ -54,6 +60,8 @@
             <el-radio v-model="receiveTreatmentAsses.danger_level" label="4">高风险</el-radio>
 
           </el-form-item>
+
+
           <el-form-item label="摄入量: "  v-if="isShow('摄入量')">
             <el-radio v-model="receiveTreatmentAsses.intake" label="1">正常</el-radio>
             <el-radio v-model="receiveTreatmentAsses.intake" label="2">减少</el-radio>
@@ -102,6 +110,7 @@
           nutrition: '1',
           psychological_assessment: '1',
           psychological_assessment_other: '',
+          score:'',
         },
         patient: {
           id: 0
@@ -139,7 +148,7 @@
               this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
               this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
               this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other
-
+              this.receiveTreatmentAsses.score = this.accepts.score
             }
           }
         })
@@ -155,8 +164,10 @@
           this.accepts.intake == 0 &&
           this.accepts.nutrition == 0 &&
           this.accepts.psychological_assessment == 0 &&
-          this.accepts.psychological_assessment_other == ''
-        ) {
+          this.accepts.psychological_assessment_other == ''&&
+          this.accepts.score == ''
+
+      ) {
           let ParamsQuery = {}
           ParamsQuery['patient'] = this.$route.query.patient_id
           getLastAccepts(ParamsQuery).then(response => {
@@ -178,6 +189,7 @@
                 this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
                 this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
                 this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
+                this.receiveTreatmentAsses.score = this.accepts.score
 
               }
             }
@@ -195,6 +207,7 @@
           this.receiveTreatmentAsses.nutrition = this.accepts.nutrition + ''
           this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
           this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
+          this.receiveTreatmentAsses.score = this.accepts.score
 
 
         }

src/pages/main/dialog/AssessmentDialog.vue

@@ -26,6 +26,14 @@
             <input type="tel" @focus="inputFocus" v-model="formValue.temperature"/>
           </div>
         </div>
+
+        <div class="item" v-if="isShow('呼吸频率')">
+          <h2 class="name">呼吸频率(次/分)</h2>
+          <div class="content">
+            <input type="tel" @focus="inputFocus" v-model="formValue.breathing_rate"/>
+          </div>
+        </div>
+
         <div class="item" v-if="isShow('出血')">
           <h2 class="name">出血</h2>
           <div class="content">
@@ -327,6 +335,7 @@
           internal_fistula_other: '',
           blood_access_internal_fistula: '',
           machine_type:'',
+          breathing_rate:'',
         },
 
         record_date: ''

src/pages/main/dialog/MonitDialog.vue

@@ -20,7 +20,7 @@
             <tr @click="selectRow(-1, null)">
                 <th  v-if="isShow('监测时间')"  width="124px">时间</th>
                 <th  v-if="isShow('血压')" width="72px">血压(mmHg)</th>
-                <th  v-if="isShow('心率')" width="80px">心率(次/分)</th>
+                <th  v-if="isShow('脉率')" width="80px">脉率(次/分)</th>
                 <th  v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
                 <th  v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
                 <th width="76px">静脉压/动脉压(mmHg)</th>
@@ -37,7 +37,7 @@
             <tr v-for="(item,index) in monitorRecords" :key="index" :value="item.value" @click="selectRow(index, item)" :class="index==currentIndex?rowClass:''">
                 <td   v-if="isShow('监测时间')">{{parseTime(item.operate_time, "{y}-{m}-{d} {h}:{i}")}}</td>
                 <td v-if="isShow('血压')">{{item.systolic_blood_pressure?item.systolic_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.pulse_frequency?item.pulse_frequency:""}}</td>
                 <td v-if="isShow('呼吸')">{{item.breathing_rate?item.breathing_rate:""}}</td>
                 <td v-if="isShow('血流量')">{{item.blood_flow_volume?item.blood_flow_volume:""}}</td>
                 <td >{{item.venous_pressure?item.venous_pressure:""}}/{{item.arterial_pressure?item.arterial_pressure:""}}</td>
@@ -77,8 +77,8 @@
               <label>舒张压(mmHg)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.diastolic_bp">
             </div>
-            <div class="cell"  v-if="isShow('心率')">
-              <label>心率(次/分)</label>
+            <div class="cell"  v-if="isShow('脉率')">
+              <label>脉率(次/分)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.pulse_frequency">
             </div>
             <div class="cell"  v-if="isShow('呼吸频率')">

src/pages/main/today/TodayTab.vue

@@ -1074,7 +1074,7 @@ export default {
   font-size:0.8em;
   border-radius:20px;
   color:#fff;
-  background:red;
+  background:#F56C6C;
   position: absolute;
   border: 1px solid #fff;
   top: -8px;

src/pages/main/today/acceptsAssessment.vue

@@ -30,6 +30,10 @@
           <label>病情 </label>
           <span class="content">{{sickCondition}} </span>
         </li>
+        <li style="height: 0.6rem;" v-if="isShow('跌倒分险评估评分')">
+          <label>跌倒分险评估评分:</label>
+          <span class="content">{{this.record.score}}分</span>
+        </li>
         <li style="height: 0.6rem;" v-if="isShow('风险程度')">
           <label>风险程度:</label>
           <span class="content">{{dangerLevel}}</span>
@@ -127,6 +131,7 @@ export default {
     }
   },
   computed: {
+
     way: function() {
       if (this.record == null || this.record.id == "") {
         return ""

src/pages/main/today/assessmentBefore.vue

@@ -55,6 +55,12 @@
           <span class="content">{{ pulse_frequency?pulse_frequency:''}}</span>
           <span class="unit">{{ pulse_frequency?'次/分':''}}</span>
         </li>
+
+        <li v-if="isShow('呼吸频率')">
+          <label>呼吸频率 : </label>
+          <span class="content">{{ breathing_rate?breathing_rate:''}}</span>
+          <span class="unit">{{ breathing_rate?'次/分':''}}</span>
+        </li>
         <li v-if="isShow('透析前症状')">
           <label>透析前症状 : </label>
           <span class="content">{{ symptom_before_dialysis }}</span>
@@ -108,7 +114,7 @@
           <span class="content">{{getVenousCatheterization(this.record.venous_catheterization)}}</span>
           <span class="unit"> </span>
         </li>
-<!-- 
+<!--
       </ul>
 
 
@@ -214,6 +220,12 @@
         }
         return this.record.pulse_frequency
       },
+      breathing_rate: function () {
+        if (this.record == null || this.record.id == '') {
+          return '-'
+        }
+        return this.record.breathing_rate
+      },
       symptom_before_dialysis: function () {
         if (this.record == null || this.record.id == '') {
           return '-'

src/pages/main/today/dialysisComputer.vue

@@ -1,82 +1,85 @@
 <template>
-   <div class="plate-box">
-    <h2 class="title"><span class="line"></span><p>{{title}}</p><span class="line"></span> </h2>
-    <div class="plate " >
-        <ul>
-             <li>
-                <label>上机床位 : </label>
-                <span class="content">{{device_number}}</span>
-            </li>
-             <li>
-                <label>上机护士 : </label>
-                <span class="content">{{nurse}}</span>
-            </li>
-             <li>
-                <label>状态 : </label>
-                <span class="content">{{stage}}</span>
-            </li>
-          <li>
+  <div class="plate-box">
+    <h2 class="title"><span class="line"></span>
+      <p>{{title}}</p><span class="line"></span></h2>
+    <div class="plate ">
+      <ul>
+        <li>
+          <label>上机床位 : </label>
+          <span class="content">{{device_number}}</span>
+        </li>
+        <li>
+          <label>上机护士 : </label>
+          <span class="content">{{nurse}}</span>
+        </li>
+
+        <li>
           <label>上机时间 : </label>
-          <span class="content">{{start_time}}</span>
+          <span class="content" style="font-size: 15px">{{start_time}}</span>
         </li>
-        </ul>
+
+        <li>
+          <label>状态 : </label>
+          <span class="content">{{stage}}</span>
+        </li>
+
+      </ul>
+
+
     </div>
     <!-- <div class="note">处方医生 : {{doctor}}</div> -->
   </div>
 </template>
 
 <script>
-  import { parseTime } from "@/utils";
+  import {parseTime} from '@/utils'
 
   export default {
-  name: "DialysisComputer",
-  data() {
-    return {
-      title: "透析上机 ",
-    };
-  },
-  props: {
-    record: {
-      type: Object,
-    },
-    admin_map: {
-      type: Object,
-    },
-    device_number_map: {
-      type: Object,
-    }
-  },
-  computed: {
-    device_number: function() {
-      if (this.record == null || this.record.id == "") {
-        return "-"
+    name: 'DialysisComputer',
+    data () {
+      return {
+        title: '透析上机 ',
       }
-      return this.device_number_map[this.record.bed_id] == null ? "" : this.device_number_map[this.record.bed_id].number
     },
-    nurse: function() {
-      if (this.record == null || this.record.id == "") {
-        return "-"
+    props: {
+      record: {
+        type: Object,
+      },
+      admin_map: {
+        type: Object,
+      },
+      device_number_map: {
+        type: Object,
       }
-      return this.admin_map[this.record.start_nurse] == null ? "" : this.admin_map[this.record.start_nurse].name
     },
-    stage: function() {
-      if (this.record == null || this.record.id == "") {
-        return "未上机"
-      }
-      return this.record.stage == 1 ? "已上机" : "已下机"
-    },start_time:function () {
-      if (this.record == null || this.record.id == '') {
-        return "-"
-      }
-      return parseTime(this.record.start_time, "{y}年{m}月{d}日 {h}时");
-
+    computed: {
+      device_number: function () {
+        if (this.record == null || this.record.id == '') {
+          return '-'
+        }
+        return this.device_number_map[this.record.bed_id] == null ? '' : this.device_number_map[this.record.bed_id].number
+      },
+      nurse: function () {
+        if (this.record == null || this.record.id == '') {
+          return '-'
+        }
+        return this.admin_map[this.record.start_nurse] == null ? '' : this.admin_map[this.record.start_nurse].name
+      },
+      stage: function () {
+        if (this.record == null || this.record.id == '') {
+          return '未上机'
+        }
+        return this.record.stage == 1 ? '已上机' : '已下机'
+      }, start_time: function () {
+        if (this.record == null || this.record.id == '') {
+          return '-'
+        }
+        return parseTime(this.record.start_time, '{y}年{m}月{d}日 {h}时{i}分')
 
+      },
     },
-  },
-  methods: {
-
+    methods: {}
   }
-};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

src/pages/main/today/dialysisMonitoring.vue

@@ -6,7 +6,7 @@
         <tr>
           <th  v-if="isShow('监测时间')" width="124px">时间</th>
           <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
-          <th v-if="isShow('心率')" width="80px">心率(次/分)</th>
+          <th v-if="isShow('脉率')" width="80px">脉率(次/分)</th>
           <th v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th  width="76px">静脉压/动脉压(mmHg)</th>
@@ -23,7 +23,7 @@
         <tr v-for="(item,index) in tableDate" :key="index" :value="item.value">
           <td v-if="isShow('监测时间')">{{parseTime(item.operate_time, "{y}-{m}-{d} {h}:{i}")}}</td>
           <td v-if="isShow('血压')">{{item.systolic_blood_pressure?item.systolic_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.pulse_frequency?item.pulse_frequency:''}}</td>
           <td v-if="isShow('呼吸')">{{item.breathing_rate?item.breathing_rate:''}}</td>
           <td v-if="isShow('血流量')">{{item.blood_flow_volume?item.blood_flow_volume:''}}</td>
           <td>{{item.venous_pressure?item.venous_pressure:''}}/{{item.arterial_pressure?item.arterial_pressure:''}}</td>

src/pages/main/today/dialysisOff.vue

@@ -13,7 +13,7 @@
         </li>
         <li>
           <label>下机时间 : </label>
-          <span class="content">{{end_time}}</span>
+          <span class="content" style="font-size: 15px">{{end_time}}</span>
         </li>
       </ul>
     </div>
@@ -59,7 +59,7 @@
       } else if (this.record.stage == 1) {
         return "-"
       } else {
-        return parseTime(this.record.end_time, "{y}年{m}月{d}日 {h}时");
+        return parseTime(this.record.end_time, "{y}年{m}月{d}日 {h}时{i}分");
 
       }
     },

src/styles/style.scss

@@ -82,7 +82,7 @@
         font-size: 0.34rem;
         line-height: 0.62rem;
         float: left;
-        width: 5.6rem;
+        width: 5.4rem;
         .content {
           color: $main-color;
         }
@@ -366,7 +366,7 @@
 
 // 弹窗样式
 .van-popup {
-  //  max-height:8.6rem !important; 
+  //  max-height:8.6rem !important;
 }
 
 .van-popup {
@@ -523,7 +523,7 @@
       background: #ecf5ff;
       border: none;
       padding: 0.18rem 0;
-      
+
       .xg {
         color: $main-color;
         font-size: 0.28rem;
@@ -570,7 +570,7 @@
   width: 100%;
   text-align: center;
   background: #fff;
-  padding:0.3rem 0; 
+  padding:0.3rem 0;
   display:flex;
   align-items: center;
   justify-content: center;
@@ -676,7 +676,7 @@
     align-items: center;
     height: 0.64rem!important;
     line-height: 0.64rem!important;
-   
+
   }
 }
 
@@ -736,7 +736,7 @@
 //   background: #fff;
 // }
 .stateBox{
-  padding-top:115px; 
+  padding-top:115px;
   background: #fff;
   min-height: calc(100vh - 2px);
   padding-left: 0.45rem;