Browse Source

添加规格单位和添加无网络空页面

csx 5 years ago
parent
commit
f58ada3f3a

+ 1 - 1
build/cdn.json View File

@@ -1,3 +1,3 @@
1 1
 {
2
-  "version": "1.0.2"
2
+  "version": "1.0.20"
3 3
 }

+ 4 - 0
config/prod.env.js View File

@@ -1,6 +1,10 @@
1 1
 'use strict'
2 2
 module.exports = {
3 3
   NODE_ENV: '"production"',
4
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
5
+
4 6
   BASE_API: '"https://api.xt.kuyicloud.com"'
7
+
8
+  // http://api.xt.test.sgjyun.com
5 9
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
6 10
 }

BIN
src/assets/login/no_network.jpg View File


BIN
src/assets/login/no_network.png View File


+ 69 - 3
src/pages/main/DialysisArea.vue View File

@@ -1,5 +1,7 @@
1 1
 <template>
2 2
   <div>
3
+    <div v-loading="loading">
4
+
3 5
     <div class="screening">
4 6
       <ul>
5 7
         <el-popover
@@ -53,9 +55,18 @@
53 55
         <h2 class="title">{{item.zone_name}}</h2>
54 56
         <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
55 57
       </div>
56
-      <div class="NoData" v-show="filtedScheduals.length == 0">
58
+      <div class="NoData" v-if="filtedScheduals.length == 0&&networkStates">
57 59
         <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt>
58 60
       </div>
61
+      <div class="NoData" v-if="!networkStates" style="display: block;text-align: center">
62
+        <p  style="margin-top: 100px;font-size: 18px">网络异常,请点击重新加载</p>
63
+
64
+
65
+        <!--<img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/no_network.jpg" alt="">-->
66
+        <van-button  slot="button" size="normal" type="info" style="display:block;margin:0 auto"  @click="reloads()">重新加载
67
+        </van-button>
68
+      </div>
69
+
59 70
     </div>
60 71
     <mt-datetime-picker
61 72
       v-model="selected_date"
@@ -67,6 +78,8 @@
67 78
       @confirm="handleScheduleDateChange"
68 79
     ></mt-datetime-picker>
69 80
   </div>
81
+  </div>
82
+
70 83
 </template>
71 84
 
72 85
 <script>
@@ -75,6 +88,7 @@ import { Popover } from "vux";
75 88
 import { Datetime } from "vux";
76 89
 import { parseTime } from "@/utils/index";
77 90
 import { getDialysisScheduals } from "@/api/dialysis";
91
+import {Toast} from 'vant'
78 92
 
79 93
 export default {
80 94
   name: "DialysisArea",
@@ -83,8 +97,12 @@ export default {
83 97
     Popover,
84 98
     Datetime
85 99
   },
100
+  inject: ['reload'],
86 101
   data() {
87 102
     return {
103
+      loading:false,
104
+
105
+      networkStates:true,
88 106
       timer:null,
89 107
       selected_date: this.$store.getters.app.dialysis_area.schedule_date, //new Date(),
90 108
       schedual_types: [
@@ -203,6 +221,9 @@ export default {
203 221
     this.timer = null;
204 222
   },
205 223
   methods: {
224
+    reloads:function(){
225
+      this.reload()
226
+    },
206 227
     handletimeType: function(index) {
207 228
       this.sch_type_options_visible = false;
208 229
       this.schedual_type_selected = index;
@@ -237,11 +258,18 @@ export default {
237 258
     },
238 259
 
239 260
     requestDialysisScheduals() {
261
+      // this.$toast.loading({forbidClick: true, duration: 0})
262
+      this.loading = true
240 263
       var type = 0;
241 264
       getDialysisScheduals({ type: type, date: this.selected_date_str })
242 265
         .then(rs => {
266
+          this.networkStates = true
243 267
           var resp = rs.data;
244 268
           if (resp.state == 1) {
269
+            this.loading = false
270
+
271
+
272
+
245 273
             // console.log(resp.data)
246 274
             var scheduals = resp.data.scheduals;
247 275
             var zoneMap = {};
@@ -286,12 +314,38 @@ export default {
286 314
             }
287 315
             this.dialysis_scheduals = dialysis_scheduals;
288 316
           } else {
317
+            this.loading = false
318
+
319
+
289 320
             this.$toast({
290 321
               message: resp.msg
291 322
             });
292 323
           }
293 324
         })
294
-        .catch(v => {});
325
+        .catch(error => {
326
+          this.loading = false
327
+
328
+
329
+
330
+          //超时之后在这里捕抓错误信息.
331
+          if (error.response) {
332
+            this.networkStates = false
333
+
334
+
335
+            console.log('error.response')
336
+            console.log(error.response);
337
+          } else if (error.request) {
338
+            this.networkStates = false
339
+
340
+            // if(error.request.readyState == 4 && error.request.status == 0){
341
+            //   //我在这里重新请求
342
+            //   this.networkStates = false
343
+            // }
344
+          } else {
345
+
346
+            this.networkStates = false
347
+          }
348
+        });
295 349
     },
296 350
     openPicker() {
297 351
       this.$refs.picker.open();
@@ -304,7 +358,7 @@ export default {
304 358
 .screening {
305 359
   border-bottom: 1px #e5e5e5 solid;
306 360
   position: fixed;
307
-  top: 1.6rem;
361
+  top: 63px;
308 362
   right: 0;
309 363
   z-index: 66;
310 364
   left: 1.58rem;
@@ -341,6 +395,18 @@ export default {
341 395
   }
342 396
 }
343 397
 
398
+  .shadow{
399
+  width:100%;
400
+  height:100%;
401
+  position:absolute;
402
+  left:0;
403
+  top:0;
404
+  z-index:998;
405
+  background-color:#000;
406
+  opacity:0.6;
407
+  display:none;
408
+  }
409
+
344 410
 </style>
345 411
 
346 412
 <style>

+ 1 - 1
src/pages/main/RecordPage.vue View File

@@ -6,7 +6,7 @@
6 6
           <span class="title"> {{ $store.getters.user.org.org_short_name }} </span>
7 7
         </div>
8 8
       </van-col>
9
-      <van-col :span="11">
9
+      <van-col :span="6">
10 10
         <div class="department">
11 11
           <ul>
12 12
             <li style="position: relative;" :class="index == 0? 'active':'' " @click="ClickTab(0)">

+ 50 - 11
src/pages/main/WaitingArea.vue View File

@@ -1,5 +1,7 @@
1 1
 <template>
2 2
   <div>
3
+    <div v-loading="loading">
4
+
3 5
     <div class="screening">
4 6
       <!--<div @click="reloads()">刷新</div>-->
5 7
       <ul>
@@ -48,11 +50,20 @@
48 50
         <h2 class="title">{{item.zone_name}}</h2>
49 51
         <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
50 52
       </div>
51
-      <div class="NoData" v-show="filtedScheduals.length == 0"><img style="margin-top: 50px; margin-bottom: 50px"
53
+      <div class="NoData" v-if="filtedScheduals.length == 0&&networkStates"><img style="margin-top: 50px; margin-bottom: 50px"
52 54
                                                                     src="@/assets/login/data.jpg" alt=""></div>
53 55
 
56
+      <div class="NoData" v-if="!networkStates" style="display: block;text-align: center;">
57
+        <!--<img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/no_network.jpg" alt="">-->
58
+        <p  style="margin-top: 100px;font-size: 18px">网络异常,请点击重新加载</p>
59
+        <van-button  slot="button" size="normal" type="info" style="display:block;margin:0 auto"  @click="reloads()">重新加载
60
+        </van-button>
61
+      </div>
62
+
54 63
     </div>
55 64
   </div>
65
+  </div>
66
+
56 67
 </template>
57 68
 
58 69
 <script>
@@ -60,6 +71,8 @@
60 71
   import {getWaitingScheduals} from '@/api/dialysis'
61 72
   import {parseTime} from '@/utils'
62 73
   import {Popover} from 'vux'
74
+  import {Toast} from 'vant'
75
+
63 76
   import {
64 77
     getSelectedAreaDataConfigList,
65 78
     getSelectedTimesDataConfigList,
@@ -78,6 +91,7 @@
78 91
     inject: ['reload'],
79 92
     data () {
80 93
       return {
94
+        loading:false,
81 95
         menuList: [
82 96
           {value: '1', label: '全部', count: 0},
83 97
           {value: '3', label: '待开处方', count: 0},
@@ -87,7 +101,7 @@
87 101
         select_index: 0,
88 102
         zone_selected: 0,
89 103
         time_selected: 0,
90
-
104
+        networkStates:true,
91 105
         scheduals: [],
92 106
 
93 107
         zone_options: [{value: 0, text: '全部分区'}],
@@ -252,16 +266,13 @@
252 266
       }
253 267
       if(type != null){
254 268
         this.select_index = parseInt(type)
255
-
256 269
       }
257
-
258 270
       this.requestScheduals()
259 271
     },
260 272
     mounted () {
261 273
       this.timer = window.setInterval(() => {
262 274
         setTimeout(this.requestScheduals(), 0)
263 275
       }, 30000)
264
-
265 276
     },
266 277
     beforeDestroy () {
267 278
       clearInterval(this.timer)
@@ -288,8 +299,6 @@
288 299
         setSelectedAreaDataConfigList(this.zone_selected)
289 300
         setSelectedTimesDataConfigList(this.time_selected)
290 301
         setWaitTypeSelectedConfig(tabIndex)
291
-
292
-
293 302
       },
294 303
       handleZoneChange: function (index) {
295 304
         this.zone_options_visible = false
@@ -304,12 +313,13 @@
304 313
       },
305 314
 
306 315
       requestScheduals () {
307
-
316
+        this.loading = true
308 317
         var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
309 318
         getWaitingScheduals({date: date}).then(rs => {
310 319
           var resp = rs.data
311
-          // console.log(resp);
312 320
           if (resp.state == 1) {
321
+            this.loading = false
322
+
313 323
             var scheduals = resp.data.scheduals
314 324
             var totalCount = scheduals.length
315 325
             var prescription_count = 0
@@ -330,11 +340,29 @@
330 340
             this.zone_options = this.makeZones(scheduals)
331 341
             this.zone_scheduals = this.processScheduals(scheduals)
332 342
           } else {
343
+            this.loading = false
344
+
333 345
             this.$toast({
334 346
               message: resp.msg
335 347
             })
336 348
           }
337
-        })
349
+        }).catch(error => {
350
+          this.loading = false
351
+
352
+          //超时之后在这里捕抓错误信息.
353
+          if (error.response) {
354
+            this.networkStates = false
355
+
356
+          } else if (error.request) {
357
+            this.networkStates = false
358
+            // if(error.request.readyState == 4 && error.request.status == 0){
359
+            //   //我在这里重新请求
360
+            //   this.networkStates = false
361
+            // }
362
+          } else {
363
+            this.networkStates = false
364
+          }
365
+        });
338 366
       },
339 367
       makeZones: function (scheduals) {
340 368
         var zoneMap = {}
@@ -404,7 +432,7 @@
404 432
   .screening {
405 433
   border-bottom: 1px #e5e5e5 solid;
406 434
   position: fixed;
407
-  top: 1.6rem;
435
+  top: 63px;
408 436
   right: 0;
409 437
   z-index: 66;
410 438
   left: 1.58rem;
@@ -451,5 +479,16 @@
451 479
   display: inline-block;
452 480
   }
453 481
   }
482
+  .shadow{
483
+  width:100%;
484
+  height:100%;
485
+  position:absolute;
486
+  left:0;
487
+  top:0;
488
+  z-index:998;
489
+  background-color:#000;
490
+  opacity:0.6;
491
+  display:none;
492
+  }
454 493
 </style>
455 494
 

+ 12 - 1
src/pages/main/dialog/AcceptsDialog.vue View File

@@ -48,6 +48,10 @@
48 48
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="2">严重</el-radio>
49 49
             <el-radio v-model="receiveTreatmentAsses.sick_condition" label="3">危</el-radio>
50 50
           </el-form-item>
51
+          <el-form-item label-width="100dp" label="其他病情 : "
52
+                        v-if="isShow('其他病情')">
53
+            <el-input v-model="receiveTreatmentAsses.sick_condition_other" style="width: 400px"></el-input>
54
+          </el-form-item>
51 55
           <el-form-item label-width="100dp" label="跌倒风险评估评分 : "
52 56
                         v-if="isShow('跌倒风险评估评分')">
53 57
             <el-input v-model="receiveTreatmentAsses.score" style="width: 100px"></el-input>
@@ -110,6 +114,7 @@
110 114
           nutrition: '1',
111 115
           psychological_assessment: '1',
112 116
           psychological_assessment_other: '',
117
+          sick_condition_other:'',
113 118
           score:'',
114 119
         },
115 120
         patient: {
@@ -149,6 +154,8 @@
149 154
               this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
150 155
               this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other
151 156
               this.receiveTreatmentAsses.score = this.accepts.score
157
+              this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
158
+
152 159
             }
153 160
           }
154 161
         })
@@ -164,7 +171,7 @@
164 171
           this.accepts.intake == 0 &&
165 172
           this.accepts.nutrition == 0 &&
166 173
           this.accepts.psychological_assessment == 0 &&
167
-          this.accepts.psychological_assessment_other == ''&&
174
+          this.accepts.psychological_assessment_other == ''&&this.accepts.sick_condition_other == ''&&
168 175
           this.accepts.score == ''
169 176
 
170 177
       ) {
@@ -190,6 +197,8 @@
190 197
                 this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
191 198
                 this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
192 199
                 this.receiveTreatmentAsses.score = this.accepts.score
200
+                this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
201
+
193 202
 
194 203
               }
195 204
             }
@@ -208,6 +217,8 @@
208 217
           this.receiveTreatmentAsses.psychological_assessment = this.accepts.psychological_assessment + ''
209 218
           this.receiveTreatmentAsses.psychological_assessment_other = this.accepts.psychological_assessment_other + ''
210 219
           this.receiveTreatmentAsses.score = this.accepts.score
220
+          this.receiveTreatmentAsses.sick_condition_other = this.accepts.sick_condition_other
221
+
211 222
 
212 223
 
213 224
         }

File diff suppressed because it is too large
+ 935 - 888
src/pages/main/dialog/MonitDialog.vue


+ 12 - 4
src/pages/main/dialog/PrescriptionDialog.vue View File

@@ -158,8 +158,8 @@
158 158
 
159 159
           </div>
160 160
         </div>
161
-        <div class="item" v-if="isShow('电导')">
162
-          <label class="name" for="dtl">电导率(mS/cm)</label>
161
+        <div class="item" v-if="isShow('电导')">
162
+          <label class="name" for="dtl">电导度(mS/m)</label>
163 163
           <div class="content">
164 164
 
165 165
             <input type="tel" @focus="inputFocus" id="dtl" v-model="dialysisPrescription.conductivity"/>
@@ -220,7 +220,12 @@
220 220
           </div>
221 221
         </div>
222 222
 
223
-
223
+        <div  class="item"  v-if="isShow('目标KT/V')">
224
+          <label class="name" for="knj">目标KT/V</label>
225
+          <div class="content">
226
+            <input  @focus="inputFocus" id="dt" v-model="dialysisPrescription.target_ktv"/>
227
+          </div>
228
+        </div>
224 229
 
225 230
 
226 231
         <div @click="showSubMenu('blood_access')" class="item" ref="blood_access" v-if="isShow('血管通路')">
@@ -300,6 +305,9 @@
300 305
 
301 306
 
302 307
 
308
+
309
+
310
+
303 311
   </div>
304 312
 </template>
305 313
 
@@ -426,6 +434,7 @@
426 434
           hemoperfusion:'',
427 435
           dialyser_sterilised:'',
428 436
           filtryzer:'',
437
+          target_ktv:'',
429 438
         },
430 439
         anticoagulant: {
431 440
           id: 0,
@@ -959,7 +968,6 @@
959 968
       }
960 969
     },
961 970
     created() {
962
-
963 971
       if (this.$store.getters.user.user.user_type == 2) {
964 972
         this.isShowSign = true;
965 973
 

+ 2 - 2
src/pages/main/dialog/modify_order/modify_order_form.vue View File

@@ -22,7 +22,7 @@
22 22
             </div>
23 23
             <div class="cell">
24 24
               <label>药品规格</label>
25
-              <input class="inputBox" style="width:100%" v-model="order.advice_desc">
25
+              <input class="inputBox" style="width:62.5%" v-model="order.advice_desc">
26 26
               <!--<input type="number" onclick="this.select()" class="inputBox" style="width:60%" v-model="order.drug_spec">-->
27 27
               <input
28 28
                 type="text"
@@ -116,7 +116,7 @@
116 116
 
117 117
     <single-option-dialog
118 118
       :visibility="sub_dialog_key == 5"
119
-      title="药规格"
119
+      title="药规格"
120 120
       @did-selected="didSelectDrugSpecUnit"
121 121
       @back="didCloseSingleOptionDialog"
122 122
       :options="drug_spec_unit_options"

+ 2 - 2
src/pages/main/dialog/new_order/order_form.vue View File

@@ -18,7 +18,7 @@
18 18
             </div>
19 19
             <div class="cell">
20 20
               <label>药品规格</label>
21
-              <input class="inputBox" style="width:100%" v-model="order.advice_desc">
21
+              <input class="inputBox" style="width:62.5%" v-model="order.advice_desc">
22 22
 
23 23
               <!--<input type="number" class="inputBox" style="width:62.5%" v-model="order.drug_spec">-->
24 24
               <input
@@ -114,7 +114,7 @@
114 114
 
115 115
     <single-option-dialog
116 116
       :visibility="sub_dialog_key == 5"
117
-      title="药规格"
117
+      title="药规格"
118 118
       @did-selected="didSelectDrugSpecUnit"
119 119
       @back="didCloseSingleOptionDialog"
120 120
       :options="drug_spec_unit_options"

+ 66 - 68
src/pages/main/dialog/new_order/single_option_dialog.vue View File

@@ -17,8 +17,7 @@
17 17
             v-for="(option, index) in options"
18 18
             :key="option_key != null && option_key.length > 0 ? option[option_key] : index"
19 19
             :class="select_index == index ? 'tick' : ''"
20
-          >{{ option_label_key != null && option_label_key.length > 0 ? option[option_label_key] : option }}
21
-          </li>
20
+          >{{ option_label_key != null && option_label_key.length > 0 ? option[option_label_key] : option }}</li>
22 21
         </ul>
23 22
       </div>
24 23
     </div>
@@ -26,90 +25,89 @@
26 25
 </template>
27 26
 
28 27
 <script>
29
-  export default {
30
-    name: 'SingleOptionDialogContent',
31
-    data () {
32
-      return {
33
-        select_index: -1
34
-      }
28
+export default {
29
+  name: "SingleOptionDialogContent",
30
+  data() {
31
+    return {
32
+      select_index: -1
33
+    };
34
+  },
35
+  props: {
36
+    visibility: {
37
+      type: Boolean,
38
+      default: false
35 39
     },
36
-    props: {
37
-      visibility: {
38
-        type: Boolean,
39
-        default: false
40
-      },
41
-      title: {
42
-        type: String,
43
-        default: ''
44
-      },
45
-      options: {
46
-        type: Array,
47
-        required: true
48
-      },
49
-      option_key: {
50
-        // 如果 options 是Object数组,选项唯一标识的 key,可不传
51
-        type: String,
52
-        default: ''
53
-      },
54
-      option_label_key: {
55
-        // 如果 options 是Object数组,选项显示文本的object 的 key,否则不传则显示 options 元素
56
-        type: String,
57
-        default: ''
58
-      }
40
+    title: {
41
+      type: String,
42
+      default: ""
59 43
     },
60
-    methods: {
61
-      backAction: function () {
62
-        this.$emit('back')
63
-      },
64
-      itemClick: function (index) {
65
-        this.select_index = index
66
-        this.$emit('did-selected', this.select_index)
67
-      }
44
+    options: {
45
+      type: Array,
46
+      required: true
47
+    },
48
+    option_key: {
49
+      // 如果 options 是Object数组,选项唯一标识的 key,可不传
50
+      type: String,
51
+      default: ""
52
+    },
53
+    option_label_key: {
54
+      // 如果 options 是Object数组,选项显示文本的object 的 key,否则不传则显示 options 元素
55
+      type: String,
56
+      default: ""
57
+    }
58
+  },
59
+  methods: {
60
+    backAction: function() {
61
+      this.$emit("back");
62
+    },
63
+    itemClick: function(index) {
64
+      this.select_index = index;
65
+      this.$emit("did-selected", this.select_index);
68 66
     }
69 67
   }
68
+};
70 69
 </script>
71 70
 
72 71
 <style style="stylesheet/scss" lang="scss" scoped>
73
-  .optionsBox {
72
+.optionsBox {
74 73
   background: #fff;
75 74
   min-height: 5rem;
76
-  max-height: 10.0rem;
77 75
   ul {
78 76
   overflow-y: scroll;
79 77
   max-height: 9.0rem;
80 78
   li {
81
-  height: 1rem;
82
-  line-height: 1rem;
83
-  border-bottom: 1px #e5e5e5 solid;
84
-  padding: 0 0.38rem;
85
-  }
86
-  .tick {
87
-  position: relative;
88
-  &::before {
89
-  content: "";
90
-  display: inline-block;
91
-  border: 2px solid $main-color;
92
-  border-top-width: 0;
93
-  border-right-width: 0;
94
-  width: 0.3rem;
95
-  height: 0.15rem;
96
-  -webkit-transform: rotate(-50deg);
97
-  position: absolute;
98
-  top: 0.38rem;
99
-  right: 0.44rem;
100
-  }
101
-  }
102
-  }
79
+      height: 1rem;
80
+      line-height: 1rem;
81
+      border-bottom: 1px #e5e5e5 solid;
82
+      padding: 0 0.38rem;
83
+    }
84
+    .tick {
85
+      position: relative;
86
+      &::before {
87
+        content: "";
88
+        display: inline-block;
89
+        border: 2px solid $main-color;
90
+        border-top-width: 0;
91
+        border-right-width: 0;
92
+        width: 0.3rem;
93
+        height: 0.15rem;
94
+        -webkit-transform: rotate(-50deg);
95
+        position: absolute;
96
+        top: 0.38rem;
97
+        right: 0.44rem;
98
+      }
99
+    }
103 100
   }
104
-  .CheckBox {
101
+}
102
+.CheckBox {
105 103
   background: #fff;
106 104
   max-height: 6.8rem;
107 105
   min-height: 5rem;
108 106
   overflow-y: scroll;
109 107
   ul {
110
-  li {
111
-  line-height: 1rem;
112
-  }
113
-  }
108
+    li {
109
+      line-height: 1rem;
110
+    }
114 111
   }
112
+}
115 113
 </style>

+ 1 - 1
src/pages/main/template/DialysisPrintOrderOne.vue View File

@@ -832,7 +832,7 @@
832 832
               <td class="advice-name">
833 833
                 <span v-if="advice[0].parent_id>0">└</span>
834 834
                 <span>{{advice[0].advice_name }}</span>
835
-                <span>{{advice[0].advice_desc}}</span>
835
+                <span>{{advice[0].advice_desc}}{{advice[0].drug_spec_unit}}</span>
836 836
                 <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
837 837
                 <span v-if="advice[0].prescribing_number">* {{advice[0].prescribing_number}}{{advice[0].prescribing_number_unit}}</span>
838 838
                 <span

+ 2 - 1
src/pages/main/today/TodayTab.vue View File

@@ -455,7 +455,8 @@ export default {
455 455
         monitor.diastolic_blood_pressure;
456 456
       this.monitor_records[monitor_index].systolic_blood_pressure =
457 457
         monitor.systolic_blood_pressure;
458
-
458
+      this.monitor_records[monitor_index].conductivity =
459
+        monitor.conductivity;
459 460
       this.monitor_records.sort((a, b) => b.operate_time - a.operate_time);
460 461
 
461 462
       // if (monitor_index >= 0) {

+ 5 - 1
src/pages/main/today/acceptsAssessment.vue View File

@@ -30,6 +30,7 @@
30 30
           <label>病情 </label>
31 31
           <span class="content">{{sickCondition}} </span>
32 32
         </li>
33
+
33 34
         <li style="height: 0.6rem;" v-if="isShow('跌倒风险评估评分')">
34 35
           <label>跌倒风险评估评分:</label>
35 36
           <span class="content">{{this.record.score}}分</span>
@@ -46,7 +47,6 @@
46 47
       <!-- </ul>
47 48
 
48 49
 
49
-
50 50
       <ul > -->
51 51
         <li style="height: 0.6rem;" v-if="isShow('营养状况')">
52 52
           <label>营养状况:</label>
@@ -60,6 +60,10 @@
60 60
           <label>心理评估异常原因:</label>
61 61
           <span class="content">{{this.record.psychological_assessment_other}}</span>
62 62
         </li>
63
+        <li style="height: 0.6rem;" v-if="isShow('其他病情')">
64
+          <label>其他病情 </label>
65
+          <span class="content">{{this.record.sick_condition_other}} </span>
66
+        </li>
63 67
       </ul>
64 68
 
65 69
 

+ 4 - 2
src/pages/main/today/dialysisMonitoring.vue View File

@@ -4,12 +4,12 @@
4 4
     <div class="dm" style="width:100%;overflow:hildden;overflow-x:auto;">
5 5
       <table  class="table" style="">
6 6
         <tr>
7
-          <th  v-if="isShow('监测时间')" width="124px">时间</th>
7
+          <th v-if="isShow('监测时间')" width="124px">时间</th>
8 8
           <th v-if="isShow('体温')" width="80px">体温(℃)</th>
9 9
           <th v-if="isShow('脉搏')" width="80px">脉率(次/分)</th>
10 10
           <th v-if="isShow('呼吸频率')" width="110px">呼吸频率(次/分)</th>
11 11
           <th v-if="isShow('血压')" width="72px">血压(mmHg)</th>
12
-          <th  width="76px">静脉压/动脉压(mmHg)</th>
12
+          <th width="76px">静脉压/动脉压(mmHg)</th>
13 13
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
14 14
           <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmHg)</th>
15 15
           <th v-if="isShow('超滤量')" width="76px">超滤量(L)</th>
@@ -17,6 +17,7 @@
17 17
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
18 18
           <th v-if="isShow('置换率')" width="92px">置换率(L/h)</th>
19 19
           <th v-if="isShow('置换量')"  width="92px">置换量(L)</th>
20
+          <th v-if="isShow('电导度')"  width="92px">电导度(mS/m)</th>
20 21
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
21 22
           <th v-if="isShow('处理')" width="92px">处理</th>
22 23
           <th v-if="isShow('结果')" width="92px">结果</th>
@@ -35,6 +36,7 @@
35 36
           <td v-if="isShow('透析液温度')">{{item.dialysate_temperature?item.dialysate_temperature:''}}</td>
36 37
           <td v-if="isShow('置换率')">{{item.replacement_rate?item.replacement_rate:''}}</td>
37 38
           <td v-if="isShow('置换量')">{{item.displacement_quantity?item.displacement_quantity:''}}</td>
39
+          <th v-if="isShow('电导度')" >{{item.conductivity?item.conductivity:''}}</th>
38 40
           <td v-if="isShow('病情变化')">{{item.symptom}}</td>
39 41
           <td v-if="isShow('处理')">{{item.dispose}}</td>
40 42
           <td v-if="isShow('结果')">{{item.result}}</td>

+ 16 - 13
src/pages/main/today/dialysisPrescription.vue View File

@@ -94,11 +94,7 @@
94 94
           <span class="content">{{dialysate_flow != '0'?dialysate_flow:""}}</span>
95 95
           <span class="unit">{{dialysate_flow != '0'?"ml/min":""}}</span>
96 96
         </li>
97
-        <li v-if="isShow('电导率')">
98
-          <label>电导率 : </label>
99
-          <span class="content">{{conductivity != '0'?conductivity:""}}</span>
100
-          <span class="unit">{{conductivity != '0'?"mS/cm":""}}</span>
101
-        </li>
97
+
102 98
       <!-- </ul>
103 99
       <ul> -->
104 100
         <li v-if="isShow('透析器/灌流器')">
@@ -137,6 +133,17 @@
137 133
           <span class="unit">{{ultrafiltration != '0'?"L":""}}</span>
138 134
 
139 135
         </li>
136
+        <li v-if="isShow('目标KT/V')">
137
+          <label>目标KT/V: </label>
138
+          <span class="content">{{target_ktv != '0'? target_ktv:''}}</span>
139
+        </li>
140
+
141
+        <li v-if="isShow('电导度')">
142
+          <label>电导度 : </label>
143
+          <span class="content">{{conductivity != '0'?conductivity:""}}</span>
144
+          <span class="unit">{{conductivity != '0'?"mS/m":""}}</span>
145
+        </li>
146
+
140 147
       </ul>
141 148
     </div>
142 149
     <div class="note">备注 : <span>{{note}}</span></div>
@@ -299,10 +306,7 @@ export default {
299 306
 
300 307
 
301 308
     },
302
-    // dry_weight: function() {
303
-    //   var v = this.getValueStr("dry_weight", "dry_weight")
304
-    //   return v.length == 0 ? "0" : v
305
-    // },
309
+
306 310
     conductivity: function() {
307 311
       var v = this.getValueStr("conductivity", "conductivity")
308 312
       return v.length == 0 ? "0" : v
@@ -358,14 +362,13 @@ export default {
358 362
         }
359 363
       }
360 364
       return displace_liqui_part + displace_liqui_value+"L"
361
-
362 365
     },ultrafiltration:function () {
363 366
       var v = this.getValueStr("ultrafiltration", "ultrafiltration")
364 367
       v = this.getFloat(v)
365 368
       return v.length == 0 ? "0" : v
366
-
367
-
368
-
369
+    },target_ktv:function () {
370
+      var v = this.getValueStr("target_ktv", "target_ktv")
371
+      return v.length == 0 ? "0" : v
369 372
     }
370 373
   },
371 374
   created() {

+ 1 - 5
src/utils/request.js View File

@@ -6,6 +6,7 @@ const service = axios.create({
6 6
   baseURL: process.env.BASE_API, // api的base_url
7 7
   timeout: 30000, // request timeout
8 8
   withCredentials: true
9
+
9 10
 })
10 11
 
11 12
 // respone interceptor
@@ -34,12 +35,7 @@ service.interceptors.response.use(
34 35
     }
35 36
   },
36 37
   error => {
37
-    console.log('err' + error) // for debug
38 38
 
39
-    Toast({
40
-      message: "网络错误",
41
-      duration: 2 * 1000
42
-    })
43 39
     return Promise.reject(error)
44 40
   })
45 41