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

src/pages/main/dialog/AcceptsDialog.vue

             <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-form-item label-width="100dp" label="跌倒风险评估评分 : "
+                        v-if="isShow('跌倒风险评估评分')">
             <el-input v-model="receiveTreatmentAsses.score" style="width: 100px"></el-input>
           </el-form-item>
 

src/pages/main/dialog/MonitDialog.vue

                 <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>
                 <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.temperature?item.temperature:""}}</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>
               <label>脉率(次/分)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.pulse_frequency">
             </div>
+            <div class="cell"  v-if="isShow('体温')">
+              <label>体温(℃)</label>
+              <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.temperature">
+            </div>
             <div class="cell"  v-if="isShow('呼吸频率')">
               <label>呼吸频率(次/分)</label>
               <input type="number" @focus="inputFocus" onclick="this.select();" class="inputBox" v-model="form.breathing_rated">
         ultrafiltration_volume: "", // 超滤量
         sodium_concentration: "", // 钠浓度
         dialysate_temperature: "", // 透析液温度
+        temperature: "", // 体温
         replacement_rate: "", // 置换率
         displacement_quantity: "", // 置换量
         ktv: "", // KT/V(在线)
             this.form.dialysate_temperature = monitor.dialysate_temperature;
           }
 
+          if(monitor.temperature == 0){
+            this.form.temperature = ""
+          }else {
+            this.form.temperature = monitor.temperature;
+          }
+
           if(monitor.replacement_rate == 0){
             this.form.replacement_rate = ""
           }else {
         this.form.dialysate_temperature = this.currentRow.dialysate_temperature;
       }
 
+      if(this.currentRow.temperature == 0){
+        this.form.temperature = ""
+      }else {
+        this.form.temperature = this.currentRow.temperature;
+      }
+
       if(this.currentRow.replacement_rate == 0){
         this.form.replacement_rate = ""
       }else {
       this.form.ultrafiltration_volume ="";// this.last_monitor_record.ultrafiltration_volume;
       this.form.sodium_concentration = "";//this.last_monitor_record.sodium_concentration;
       this.form.dialysate_temperature = ""; //this.last_monitor_record.dialysate_temperature;
+      this.form.temperature = ""; //this.last_monitor_record.temperature;
       this.form.replacement_rate = ""; // this.last_monitor_record.replacement_rate;
       this.form.displacement_quantity =""; // this.last_monitor_record.displacement_quantity;
       this.form.ktv = ""; //this.last_monitor_record.ktv;
       params.ultrafiltration_volume = this.form.ultrafiltration_volume;
       params.sodium_concentration = this.form.sodium_concentration;
       params.dialysate_temperature = this.form.dialysate_temperature;
+      params.temperature = this.form.temperature;
       params.replacement_rate = this.form.replacement_rate;
       params.displacement_quantity = this.form.displacement_quantity;
       params.ktv = this.form.ktv;
           this.form.ultrafiltration_volume = "";
           this.form.sodium_concentration = "";
           this.form.dialysate_temperature = "";
+          this.form.temperature = "";
           this.form.replacement_rate = "";
           this.form.displacement_quantity = "";
           this.form.ktv = "";
       params.ultrafiltration_volume = this.form.ultrafiltration_volume;
       params.sodium_concentration = this.form.sodium_concentration;
       params.dialysate_temperature = this.form.dialysate_temperature;
+      params.temperature = this.form.temperature;
       params.replacement_rate = this.form.replacement_rate;
       params.displacement_quantity = this.form.displacement_quantity;
       params.ktv = this.form.ktv;
             this.form.ultrafiltration_volume = "";
             this.form.sodium_concentration = "";
             this.form.dialysate_temperature = "";
+            this.form.temperature = "";
             this.form.replacement_rate = "";
             this.form.displacement_quantity = "";
             this.form.ktv = "";

src/pages/main/today/TodayTab.vue

         monitor.breathing_rate;
       this.monitor_records[monitor_index].dialysate_temperature =
         monitor.dialysate_temperature;
+        this.monitor_records[monitor_index].temperature =
+        monitor.temperature;
       this.monitor_records[monitor_index].diastolic_bp = monitor.diastolic_bp;
       this.monitor_records[monitor_index].displacement_quantity =
         monitor.displacement_quantity;

src/pages/main/today/acceptsAssessment.vue

           <label>病情 </label>
           <span class="content">{{sickCondition}} </span>
         </li>
-        <li style="height: 0.6rem;" v-if="isShow('跌倒分险评估评分')">
-          <label>跌倒分险评估评分:</label>
+        <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('风险程度')">

src/pages/main/today/dialysisMonitoring.vue

           <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="80px">心率(次/分)</th>
           <th v-if="isShow('呼吸')" width="110px">呼吸(次/分)</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th  width="76px">静脉压/动脉压(mmHg)</th>
           <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.temperature?item.temperature:''}}</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/styles/style.scss

         font-size: 0.34rem;
         line-height: 0.62rem;
         float: left;
-        width: 5.4rem;
+        width: 5.2rem;
         .content {
           color: $main-color;
         }