소스 검색

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

csx 4 년 전
부모
커밋
9f27afcfec

+ 1 - 1
src/pages/main/Print.vue 파일 보기

@@ -1102,7 +1102,7 @@
1102 1102
                     </td>
1103 1103
                     <td width="20">L</td>
1104 1104
                     <td></td>
1105
-                    <td width="60">透后重</td>
1105
+                    <td width="60">透后重</td>
1106 1106
                     <td width="50">
1107 1107
                       <div class="under-line">&nbsp;{{afterdialysis.weight_after?afterdialysis.weight_after:''}}</div>
1108 1108
                     </td>

+ 2 - 2
src/pages/main/dialog/AssessmentDialog.vue 파일 보기

@@ -8,8 +8,8 @@
8 8
       </div>
9 9
 
10 10
       <div class="DialogContent" id="dialogTop">
11
-        <div class="item" v-if="isShow('透前重')">
12
-          <h2 class="name">透前重(kg)</h2>
11
+        <div class="item" v-if="isShow('透前重')">
12
+          <h2 class="name">透前重(kg)</h2>
13 13
           <div class="content">
14 14
             <input
15 15
               type="number"

+ 3 - 3
src/pages/main/dialog/ThorougDialog.vue 파일 보기

@@ -28,8 +28,8 @@
28 28
           </div>
29 29
         </div>
30 30
 
31
-        <div class="item" v-if="isShow('透后重')">
32
-          <label class="name" for="sjcll">透后重(kg)</label>
31
+        <div class="item" v-if="isShow('透后重')">
32
+          <label class="name" for="sjcll">透后重(kg)</label>
33 33
           <div class="content">
34 34
             <input
35 35
               type="number"
@@ -1603,7 +1603,7 @@ export default {
1603 1603
         this.formValue[key] = this.record[key]
1604 1604
       }
1605 1605
     }
1606
-    
1606
+
1607 1607
     if ((this.record.id == undefined || this.record.id == '') && this.predialysis.id != undefined) {
1608 1608
       this.$set(this.formValue, 'additional_weight', this.predialysis['additional_weight'].toString())
1609 1609
     }

+ 8 - 8
src/pages/main/dialog/subMenu/MsgTip.vue 파일 보기

@@ -19,9 +19,9 @@
19 19
         </div>
20 20
       </div>
21 21
       <div class="item" style="display:block;">
22
-        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透前重(kg)<span style="text-align:right;float: right;color:#ec6618;">{{ getBeforeWeight(predialysis)}}</span></div>
22
+        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透前重(kg)<span style="text-align:right;float: right;color:#ec6618;">{{ getBeforeWeight(predialysis)}}</span></div>
23 23
         <div class="content" style="margin-top:5px;margin-left:0;">
24
-          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透前重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{ getBeforeWeight(predialysis)}}</span>kg=
24
+          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透前重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{ getBeforeWeight(predialysis)}}</span>kg=
25 25
           透前总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{predialysis.weight_before}}</span>kg-
26 26
           衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{predialysis.additional_weight}}</span>kg
27 27
            </span>
@@ -46,8 +46,8 @@
46 46
         <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">体重增加(kg)<span style="text-align:right;float: right;color:#ec6618;">{{add_weight}}</span></div>
47 47
         <div class="content" style="margin-top:5px;margin-left:0;">
48 48
           <span class="text" style="text-align:left;display:block;height:0.8rem;line-height:0.6rem;" id="txms">体重增加:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{add_weight}}</span>kg=
49
-          透前重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getBeforeWeight(predialysis)}}</span>kg -
50
-          上次透后重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg
49
+          透前重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getBeforeWeight(predialysis)}}</span>kg -
50
+          上次透后重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg
51 51
           </span>
52 52
         </div>
53 53
         <br>
@@ -59,9 +59,9 @@
59 59
         </div>
60 60
       </div> -->
61 61
       <div class="item" style="display:block;">
62
-        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透后重(kg)<span style="text-align:right;float: right;color:#ec6618;">{{getAfterWeight(record)}}</span></div>
62
+        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">透后重(kg)<span style="text-align:right;float: right;color:#ec6618;">{{getAfterWeight(record)}}</span></div>
63 63
         <div class="content" style="margin-top:5px;margin-left:0;">
64
-          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透后重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getAfterWeight(record)}}</span>kg=
64
+          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透后重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getAfterWeight(record)}}</span>kg=
65 65
           透后总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{record.weight_after}}</span>kg-
66 66
           衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{predialysis.additional_weight}}</span>kg
67 67
            </span>
@@ -81,9 +81,9 @@
81 81
         </div>
82 82
       </div>
83 83
       <div class="item" style="display:block;">
84
-        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">上次透后重(kg)<span style="text-align:right;float: right;color:#ec6618;">{{getLastAfterWeight(last_record)}}</span></div>
84
+        <div class="name" style="width:100%;text-align:left;line-height:1.5rem;font-size:0.7rem;" for="txms">上次透后重(kg)<span style="text-align:right;float: right;color:#ec6618;">{{getLastAfterWeight(last_record)}}</span></div>
85 85
         <div class="content" style="margin-top:5px;margin-left:0;">
86
-          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">上次透后重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg=
86
+          <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">上次透后重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg=
87 87
           上次透后总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_record.weight_after}}</span>kg-
88 88
           上次衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_predialysis.additional_weight}}</span>kg
89 89
            </span>

+ 2 - 2
src/pages/main/dialysis/RecordTable.vue 파일 보기

@@ -63,8 +63,8 @@
63 63
             <th width="110px">透析模式</th>
64 64
             <th width="92px">透析时长(h)</th>
65 65
             <th width="76px">干体重(kg)</th>
66
-            <th width="76px">透前重(kg)</th>
67
-            <th width="76px">透后重(kg)</th>
66
+            <th width="76px">透前重(kg)</th>
67
+            <th width="76px">透后重(kg)</th>
68 68
             <th width="92px">透前血压(mmHg)</th>
69 69
             <th width="92px">透后血压(mmHg)</th>
70 70
             <th width="92px">超滤总量(L)</th>

+ 2 - 2
src/pages/main/today/assessmentAfter.vue 파일 보기

@@ -24,8 +24,8 @@
24 24
           <span class="content" id="ssy">{{systolic_blood_pressure?systolic_blood_pressure:''}}</span>
25 25
           <span class="unit">{{systolic_blood_pressure?'mmHg':''}}</span>
26 26
         </li>
27
-        <li v-if="isShow('透后重')">
28
-          <label for="thtz">透后重 : </label>
27
+        <li v-if="isShow('透后重')">
28
+          <label for="thtz">透后重 : </label>
29 29
           <span class="content" id="thtz">{{weight_after?weight_after:''}}</span>
30 30
           <span class="unit">{{weight_after?'kg':''}}</span>
31 31
         </li>

+ 2 - 2
src/pages/main/today/assessmentBefore.vue 파일 보기

@@ -7,8 +7,8 @@
7 7
     </h2>
8 8
     <div class="plate ">
9 9
       <ul>
10
-        <li v-if="isShow('透前重')">
11
-          <label>透前重 : </label>
10
+        <li v-if="isShow('透前重')">
11
+          <label>透前重 : </label>
12 12
           <span class="content">{{ weight_before ? weight_before : "" }}</span>
13 13
           <span class="unit">{{ weight_before ? "kg" : "" }}</span>
14 14
         </li>

+ 2 - 2
src/pages/main/today/pastData.vue 파일 보기

@@ -36,8 +36,8 @@ export default {
36 36
       tableTit: [
37 37
         "日期",
38 38
         "透析模式",
39
-        "透前重(kg)",
40
-        "透后重(kg)",
39
+        "透前重(kg)",
40
+        "透后重(kg)",
41 41
         "设定脱水(L)",
42 42
         "实际脱水(L)"
43 43
       ],

+ 2 - 2
src/pages/waitingRoom/components/assessmentAfter.vue 파일 보기

@@ -8,7 +8,7 @@
8 8
     <div class="plate ">
9 9
       <ul>
10 10
         <li>
11
-          <label>透后重 : </label>
11
+          <label>透后重 : </label>
12 12
           <span class="content">{{ weight_after }}</span>
13 13
           <span class="unit">kg</span>
14 14
         </li>
@@ -98,7 +98,7 @@ export default {
98 98
       note: "无明显异常",
99 99
       doctor: "刘小军  医生",
100 100
       info1: [
101
-        { value: "1", label: "透后重 : ", content: "55", unit: "kg" },
101
+        { value: "1", label: "透后重 : ", content: "55", unit: "kg" },
102 102
         { value: "2", label: "收缩压 : ", content: "174", unit: "mmHg" },
103 103
         { value: "3", label: "实际超滤量: ", content: "20", unit: "ml" },
104 104
         { value: "4", label: "疑血 : ", content: "无震颤", unit: "" },

+ 1 - 1
src/pages/waitingRoom/components/assessmentBefore.vue 파일 보기

@@ -44,7 +44,7 @@ export default {
44 44
       note: "",
45 45
       doctor: "刘小军  医生",
46 46
       info1: [
47
-        { value: "1", label: "透前重 : ", content: "0", unit: "kg" },
47
+        { value: "1", label: "透前重 : ", content: "0", unit: "kg" },
48 48
         { value: "2", label: "收缩压 : ", content: "0", unit: "mmHg" },
49 49
         { value: "3", label: "前次透析后: ", content: "0", unit: "" },
50 50
         { value: "4", label: " ", content: " ", unit: "" }

+ 1 - 1
src/pages/waitingRoom/components/dialog/afterThoroughly.vue 파일 보기

@@ -7,7 +7,7 @@
7 7
     </h2>
8 8
     <div class="content">
9 9
       <div class="cell">
10
-        <label>透后重(kg)</label>
10
+        <label>透后重(kg)</label>
11 11
         <input
12 12
           type="text"
13 13
           class="inputBox"

+ 1 - 1
src/pages/waitingRoom/components/dialog/preDialysis.vue 파일 보기

@@ -7,7 +7,7 @@
7 7
     </h2>
8 8
     <div class="content">
9 9
       <div class="cell">
10
-        <label>透前重(kg)</label>
10
+        <label>透前重(kg)</label>
11 11
         <input
12 12
           type="text"
13 13
           class="inputBox"

+ 2 - 2
src/pages/waitingRoom/components/pastData.vue 파일 보기

@@ -36,8 +36,8 @@ export default {
36 36
       tableTit: [
37 37
         "日期",
38 38
         "透析模式",
39
-        "透前重(kg)",
40
-        "透后重(kg)",
39
+        "透前重(kg)",
40
+        "透后重(kg)",
41 41
         "设定脱水(L)",
42 42
         "实际脱水(L)"
43 43
       ],