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

src/api/dialysis.js

   })
 }
 
+export function GetMonitorToday (params) {
+  return request({
+    url: '/m/api/monitor/gettodaylast',
+    method: 'get',
+    params: params
+  })
+}
+
 export function PostSearch (keyword) {
   return request({
     url: '/m/api/patients/search?keyword=' + keyword,

src/pages/main/dialog/ComputerDialog.vue

       if (this.puncture_nurse_id == 0) {
         this.puncture_nurse_id = this.$store.getters.user.user.id
       }
+      
+      // var beds = []
+      // for (let index = 0; index < this.device_numbers.length; index++) {
+      //   const device_number = this.device_numbers[index]
+      //   if (device_number.zone_id == this.schedule.partition_id) {
+      //     beds.push(device_number)
+      //   }
+      // }
+      // this.zone_beds = beds
 
-      var beds = []
       for (let index = 0; index < this.device_numbers.length; index++) {
         const device_number = this.device_numbers[index]
-        if (device_number.zone_id == this.schedule.partition_id) {
-          beds.push(device_number)
-        }
+        this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
       }
-      this.zone_beds = beds
+      this.zone_beds = this.device_numbers
 
       if (this.record.id > 0) {
         for (let i = 0; i < this.special_premission.length; i++) {

src/pages/main/dialog/MonitDialog.vue

 </template>
 
 <script>
-  import {addMonitorRecord, deleteMonitorRecord, editMonitorRecord, GetMonitor} from '@/api/dialysis'
+  import {addMonitorRecord, deleteMonitorRecord, editMonitorRecord, GetMonitor,GetMonitorToday} from '@/api/dialysis'
   import {parseTime} from '@/utils'
   import {Dialog, Toast} from 'vant'
   import CheckBoxSubMenu from './subMenu/checkBoxSubMenu'
         rowClass: 'row-class-active',
 
         visibility: false,
+        today_last_monitor_record : {},
         propForm: {
           title: '',
           list: [],
         }
         return false
       },
+      getLastRecordTody(){
+        let params = {
+          patient_id: this.patient.id
+        }
+
+        GetMonitorToday(params).then(rs => {
+          var resp =rs.data.data
+          this.today_last_monitor_record = resp.monitor
+
+          
+          this.form.operate_time = Date.parse(new Date())
+          this.form.pulse_frequency = '' //this.last_monitor_record.pulse_frequency;
+          this.form.breathing_rated = resp.monitor.breathing_rate?resp.monitor.breathing_rate:'';
+          this.form.systolic_bp = '' //this.last_monitor_record.systolic_blood_pressure;
+          this.form.diastolic_bp = '' //this.last_monitor_record.diastolic_blood_pressure;
+          this.form.blood_flow_volume = resp.monitor.blood_flow_volume?resp.monitor.blood_flow_volume:'';
+          this.form.venous_pressure = ''//this.last_monitor_record.venous_pressure;
+          this.form.arterial_pressure = '' //this.last_monitor_record.arterial_pressure;
+          this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
+          this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate?resp.monitor.ultrafiltration_rate:'';
+          this.form.ultrafiltration_volume = ''// this.last_monitor_record.ultrafiltration_volume;
+          this.form.sodium_concentration = resp.monitor.sodium_concentration?resp.monitor.sodium_concentration:'';
+          this.form.dialysate_temperature =  resp.monitor.dialysate_temperature?resp.monitor.dialysate_temperature:'';
+          this.form.temperature = resp.monitor.temperature?resp.monitor.temperature:'';
+          this.form.replacement_rate =  resp.monitor.replacement_rate?resp.monitor.replacement_rate:'';
+          this.form.displacement_quantity = '' // this.last_monitor_record.displacement_quantity;
+          this.form.conductivity = ''
+          this.form.displacement_flow_quantity = ''
+
+          this.form.ktv = '' //this.last_monitor_record.ktv;
+          this.form.symptom = ''// this.last_monitor_record.symptom;
+          this.form.dispose = '' // this.last_monitor_record.dispose;
+          this.form.result = '' //this.last_monitor_record.result;
+          this.form.id = -1
+          console.log(this.form)
+        })
+      },
+
       getLastRecord () {
         let params = {
           patient_id: this.patient.id
         this.formPanel = true
         this.listPanel = false
         // if(this.monitor_time_str == "") {
-
+          
         var date = this.$route.query && this.$route.query.date
         date *= 1000
         var newDate = new Date(date)
         // this.monitor_time_str = this.handleTime(nowTime);
         // this.monitor_time_str = record_date + " " + this.form.monitor_time;
 
-        // this.getLastRecord()
-
-        this.form.operate_time = Date.parse(new Date())
-        this.form.pulse_frequency = '' //this.last_monitor_record.pulse_frequency;
-        this.form.breathing_rated = '' //this.last_monitor_record.breathing_rate;
-        this.form.systolic_bp = '' //this.last_monitor_record.systolic_blood_pressure;
-        this.form.diastolic_bp = '' //this.last_monitor_record.diastolic_blood_pressure;
-        this.form.blood_flow_volume = '' //this.last_monitor_record.blood_flow_volume;
-        this.form.venous_pressure = ''//this.last_monitor_record.venous_pressure;
-        this.form.arterial_pressure = '' //this.last_monitor_record.arterial_pressure;
-        this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
-        this.form.ultrafiltration_rate = ''// this.last_monitor_record.ultrafiltration_rate;
-        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.conductivity = ''
-        this.form.displacement_flow_quantity = ''
-
-        this.form.ktv = '' //this.last_monitor_record.ktv;
-        this.form.symptom = ''// this.last_monitor_record.symptom;
-        this.form.dispose = '' // this.last_monitor_record.dispose;
-        this.form.result = '' //this.last_monitor_record.result;
-        this.form.id = -1
-        console.log(this.form)
+        this.getLastRecordTody()
+        
         // }
       },
       submitEditAction: function () {

src/pages/main/index.vue

         })
       },getData(){
         console.log("111111")
-        this.requestScheduals()
-        this.requestDialysisScheduals()
+        // this.requestScheduals()
+        // this.requestDialysisScheduals()
       }
 
     },

src/pages/personal/ElectronicSignature.vue

       middleAry: [],
       // 配置参数
       config: {
-        lineWidth: 15,
+        lineWidth: 3,
         lineColor: "#000",
         shadowBlur: 1,
         fillStyle: "#fff"