Browse Source

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

xiaoming_global 5 years ago
parent
commit
a2a806509a

+ 6 - 3
index.html View File

@@ -1,9 +1,12 @@
1 1
 <!DOCTYPE html>
2 2
 <html>
3 3
   <head>
4
-    <meta charset="utf-8">
5
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
6
-    <title>血透平板端系统</title>
4
+    <meta charset="utf-8" />
5
+    <meta
6
+      name="viewport"
7
+      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"
8
+    />
9
+    <title>酷医云移动端</title>
7 10
   </head>
8 11
   <body>
9 12
     <div id="app"></div>

+ 65 - 37
src/pages/advice/DialysisAdviceTable.vue View File

@@ -2,10 +2,13 @@
2 2
   <div class="mainBox">
3 3
     <div class="choice">
4 4
       <ul>
5
-        <el-popover placement="bottom" trigger="click" v-model="show_patient_type_selector">
5
+        <el-popover
6
+          placement="bottom"
7
+          trigger="click"
8
+          v-model="show_patient_type_selector"
9
+        >
6 10
           <li slot="reference">
7
-            {{ patient_types[patient_selected].text
8
-            }}
11
+            {{ patient_types[patient_selected].text }}
9 12
             <span class="iconfont">&#xe74a;</span>
10 13
           </li>
11 14
           <div class="popover-demo-content">
@@ -15,15 +18,20 @@
15 18
                 :key="type.value"
16 19
                 @click="handlePaitentType(type.value)"
17 20
                 :class="advice_type_selected == type.value ? 'tick' : ''"
18
-              >{{ type.text }}</li>
21
+              >
22
+                {{ type.text }}
23
+              </li>
19 24
             </ul>
20 25
           </div>
21 26
         </el-popover>
22 27
 
23
-        <el-popover placement="bottom" trigger="click" v-model="show_zone_selector">
28
+        <el-popover
29
+          placement="bottom"
30
+          trigger="click"
31
+          v-model="show_zone_selector"
32
+        >
24 33
           <li slot="reference">
25
-            {{ zones[zone_selected].text
26
-            }}
34
+            {{ zones[zone_selected].text }}
27 35
             <span class="iconfont">&#xe74a;</span>
28 36
           </li>
29 37
           <div class="popover-demo-content">
@@ -33,17 +41,20 @@
33 41
                 :key="zone.value"
34 42
                 @click="handleZoneChange(index)"
35 43
                 :class="zone_selected == index ? 'tick' : ''"
36
-              >{{ zone.text }}</li>
44
+              >
45
+                {{ zone.text }}
46
+              </li>
37 47
             </ul>
38 48
           </div>
39 49
         </el-popover>
40
-        <el-popover placement="bottom" trigger="click" v-model="show_sch_type_selector">
50
+        <el-popover
51
+          placement="bottom"
52
+          trigger="click"
53
+          v-model="show_sch_type_selector"
54
+        >
41 55
           <li slot="reference">
42
-            {{ schedule_types[schedule_type_selected].text
43
-            }}
44
-            <span
45
-              class="iconfont"
46
-            >&#xe74a;</span>
56
+            {{ schedule_types[schedule_type_selected].text }}
57
+            <span class="iconfont">&#xe74a;</span>
47 58
           </li>
48 59
           <div class="popover-demo-content">
49 60
             <ul>
@@ -54,7 +65,9 @@
54 65
                 :class="
55 66
                   schedule_type_selected == scheduleType.value ? 'tick' : ''
56 67
                 "
57
-              >{{ scheduleType.text }}</li>
68
+              >
69
+                {{ scheduleType.text }}
70
+              </li>
58 71
             </ul>
59 72
           </div>
60 73
         </el-popover>
@@ -74,7 +87,10 @@
74 87
       </ul>
75 88
     </div>
76 89
 
77
-    <div style="width:100%;overflow:hildden;overflow-x:auto;" class="DialysisAdvice">
90
+    <div
91
+      style="width:100%;overflow:hildden;overflow-x:auto;"
92
+      class="DialysisAdvice"
93
+    >
78 94
       <div class="blueBorder"></div>
79 95
       <table class="table">
80 96
         <tr>
@@ -108,7 +124,10 @@
108 124
           </tr>
109 125
           <template v-for="schedule in schedules">
110 126
             <template v-for="(group, group_index) in schedule.new_advice">
111
-              <tr v-for="(advice, advice_index) in group.advices" @click="clickfunction(schedule)">
127
+              <tr
128
+                v-for="(advice, advice_index) in group.advices"
129
+                @click="clickfunction(schedule)"
130
+              >
112 131
                 <!--<td  v-if="advice_index == 0"-->
113 132
                 <!--:rowspan="group.advices.length">{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>-->
114 133
 
@@ -121,21 +140,22 @@
121 140
                   v-if="advice_index == 0"
122 141
                   :rowspan="group.advices.length"
123 142
                   style="color:#409eff;"
124
-                >{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
143
+                >
144
+                  {{ advice.parent_id == 0 ? schedule.patient.name : "" }}
145
+                </td>
125 146
                 <td v-if="advice_index == 0" :rowspan="group.advices.length">
126 147
                   {{
127
-                  advice.parent_id == 0 ? schedule.patient.dialysis_no : ""
148
+                    advice.parent_id == 0 ? schedule.patient.dialysis_no : ""
128 149
                   }}
129 150
                 </td>
130
-                <td
131
-                  v-if="advice_index == 0"
132
-                  :rowspan="group.advices.length"
133
-                >{{ getAdaviceType(advice.advice_type, advice.parent_id) }}</td>
151
+                <td v-if="advice_index == 0" :rowspan="group.advices.length">
152
+                  {{ getAdaviceType(advice.advice_type, advice.parent_id) }}
153
+                </td>
134 154
                 <td v-if="advice_index == 0" :rowspan="group.advices.length">
135 155
                   {{
136
-                  advice.parent_id == 0
137
-                  ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
138
-                  : ""
156
+                    advice.parent_id == 0
157
+                      ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
158
+                      : ""
139 159
                   }}
140 160
                 </td>
141 161
                 <td
@@ -146,7 +166,9 @@
146 166
                   "
147 167
                 >
148 168
                   <span>{{ advice.advice_name }}</span>
149
-                  <span>{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span>
169
+                  <span
170
+                    >{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</span
171
+                  >
150 172
                   <span v-if="advice.prescribing_number">
151 173
                     {{ advice.prescribing_number
152 174
                     }}{{ advice.prescribing_number_unit }}
@@ -157,11 +179,13 @@
157 179
                   </span>
158 180
                   <span>{{ advice.delivery_way }}</span>
159 181
                   <span>{{ advice.execution_frequency }}</span>
160
-                  <span
161
-                    v-if="advice.parent_id == 0 && advice.remark.length > 0"
162
-                  >({{ advice.remark }})</span>
182
+                  <span v-if="advice.parent_id == 0 && advice.remark.length > 0"
183
+                    >({{ advice.remark }})</span
184
+                  >
185
+                </td>
186
+                <td>
187
+                  {{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}
163 188
                 </td>
164
-                <td>{{ parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
165 189
                 <td>{{ getName(advice.execution_staff) }}</td>
166 190
                 <td>{{ getName(advice.checker) }}</td>
167 191
                 <td>{{ parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
@@ -174,7 +198,11 @@
174 198
       </table>
175 199
 
176 200
       <div class="NoData" v-show="zones.length <= 1">
177
-        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
201
+        <img
202
+          style="margin-top: 50px; margin-bottom: 50px"
203
+          src="@/assets/login/data.jpg"
204
+          alt
205
+        />
178 206
       </div>
179 207
     </div>
180 208
 
@@ -533,10 +561,10 @@ export default {
533 561
   left: 0;
534 562
   background: #fff;
535 563
   @media only screen and (max-width: 415px) {
536
-    top: 39px !important;
564
+    top: 38px !important;
537 565
   }
538
-  @media only screen and (min-width: 376px) and (max-width: 737px) {
539
-    top: 45px !important;
566
+  @media only screen and (min-width: 376px) and (max-width: 812px) {
567
+    top: 38px !important;
540 568
   }
541 569
   ul {
542 570
     @include display-flex;
@@ -572,9 +600,9 @@ export default {
572 600
   background: #fff;
573 601
   min-height: calc(100vh - 2px);
574 602
   @media only screen and (max-width: 812px) {
575
-    padding-top: 80px !important;
603
+    padding-top: 70px !important;
576 604
   }
577
-  @media only screen and (min-width: 768px) and (max-width: 1024px) {
605
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
578 606
     padding-top: 118px !important;
579 607
   }
580 608
 }

+ 69 - 42
src/pages/advice/NormalAdviceTable.vue View File

@@ -2,10 +2,13 @@
2 2
   <div class="mainBox">
3 3
     <div class="choice">
4 4
       <ul>
5
-        <el-popover placement="bottom" trigger="click" v-model="show_patient_type_selector">
5
+        <el-popover
6
+          placement="bottom"
7
+          trigger="click"
8
+          v-model="show_patient_type_selector"
9
+        >
6 10
           <li slot="reference">
7
-            {{ patient_types[patient_selected].text
8
-            }}
11
+            {{ patient_types[patient_selected].text }}
9 12
             <span class="iconfont">&#xe74a;</span>
10 13
           </li>
11 14
           <div class="popover-demo-content">
@@ -15,15 +18,20 @@
15 18
                 :key="type.value"
16 19
                 @click="handlePaitentType(type.value)"
17 20
                 :class="advice_type_selected == type.value ? 'tick' : ''"
18
-              >{{ type.text }}</li>
21
+              >
22
+                {{ type.text }}
23
+              </li>
19 24
             </ul>
20 25
           </div>
21 26
         </el-popover>
22 27
 
23
-        <el-popover placement="bottom" trigger="click" v-model="show_zone_selector">
28
+        <el-popover
29
+          placement="bottom"
30
+          trigger="click"
31
+          v-model="show_zone_selector"
32
+        >
24 33
           <li slot="reference">
25
-            {{ zones[zone_selected].text
26
-            }}
34
+            {{ zones[zone_selected].text }}
27 35
             <span class="iconfont">&#xe74a;</span>
28 36
           </li>
29 37
           <div class="popover-demo-content">
@@ -33,17 +41,20 @@
33 41
                 :key="zone.value"
34 42
                 @click="handleZoneChange(index)"
35 43
                 :class="zone_selected == index ? 'tick' : ''"
36
-              >{{ zone.text }}</li>
44
+              >
45
+                {{ zone.text }}
46
+              </li>
37 47
             </ul>
38 48
           </div>
39 49
         </el-popover>
40
-        <el-popover placement="bottom" trigger="click" v-model="show_sch_type_selector">
50
+        <el-popover
51
+          placement="bottom"
52
+          trigger="click"
53
+          v-model="show_sch_type_selector"
54
+        >
41 55
           <li slot="reference">
42
-            {{ schedule_types[schedule_type_selected].text
43
-            }}
44
-            <span
45
-              class="iconfont"
46
-            >&#xe74a;</span>
56
+            {{ schedule_types[schedule_type_selected].text }}
57
+            <span class="iconfont">&#xe74a;</span>
47 58
           </li>
48 59
           <div class="popover-demo-content">
49 60
             <ul>
@@ -54,7 +65,9 @@
54 65
                 :class="
55 66
                   schedule_type_selected == scheduleType.value ? 'tick' : ''
56 67
                 "
57
-              >{{ scheduleType.text }}</li>
68
+              >
69
+                {{ scheduleType.text }}
70
+              </li>
58 71
             </ul>
59 72
           </div>
60 73
         </el-popover>
@@ -74,7 +87,10 @@
74 87
       </ul>
75 88
     </div>
76 89
 
77
-    <div style="width:100%;overflow:hildden;overflow-x:auto;" class="NormalAdvice">
90
+    <div
91
+      style="width:100%;overflow:hildden;overflow-x:auto;"
92
+      class="NormalAdvice"
93
+    >
78 94
       <div class="blueBorder"></div>
79 95
       <table class="table">
80 96
         <tr>
@@ -115,13 +131,17 @@
115 131
               <!--<td>{{ advice.parent_id == 0 && advice.dialysis_order&&advice.dialysis_order.device_number&& advice.dialysis_order.device_number.number.length > 0 ? advice.dialysis_order.device_number.number : schedule.device_number.number }}</td>-->
116 132
               <!--<td>{{getNumber(advice)}}</td>-->
117 133
               <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
118
-              <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
119
-              <td>{{ getAdaviceType(advice.advice_type, advice.parent_id) }}</td>
134
+              <td>
135
+                {{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}
136
+              </td>
137
+              <td>
138
+                {{ getAdaviceType(advice.advice_type, advice.parent_id) }}
139
+              </td>
120 140
               <td>
121 141
                 {{
122
-                advice.parent_id == 0
123
-                ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
124
-                : ""
142
+                  advice.parent_id == 0
143
+                    ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
144
+                    : ""
125 145
                 }}
126 146
               </td>
127 147
               <td>
@@ -133,38 +153,41 @@
133 153
                   }}{{ advice.prescribing_number_unit }}
134 154
                 </span>
135 155
                 <span v-if="advice.single_dose">
136
-                  单次用量 {{ advice.single_dose
137
-                  }}{{ advice.single_dose_unit }}
156
+                  单次用量 {{ advice.single_dose }}{{ advice.single_dose_unit }}
138 157
                 </span>
139 158
                 <span>{{ advice.delivery_way }}</span>
140 159
                 <span>{{ advice.execution_frequency }}</span>
141 160
               </td>
142 161
               <td>
143 162
                 {{
144
-                advice.parent_id == 0
145
-                ? parseTime(advice.execution_time, "{m}-{d} {h}:{i}")
146
-                : ""
163
+                  advice.parent_id == 0
164
+                    ? parseTime(advice.execution_time, "{m}-{d} {h}:{i}")
165
+                    : ""
147 166
                 }}
148 167
               </td>
149 168
               <td>
150 169
                 {{
151
-                advice.parent_id == 0 ? getName(advice.execution_staff) : ""
170
+                  advice.parent_id == 0 ? getName(advice.execution_staff) : ""
152 171
                 }}
153 172
               </td>
154
-              <td>{{ advice.parent_id == 0 ? getName(advice.checker) : "" }}</td>
173
+              <td>
174
+                {{ advice.parent_id == 0 ? getName(advice.checker) : "" }}
175
+              </td>
155 176
               <td>
156 177
                 {{
157
-                advice.parent_id == 0
158
-                ? parseTime(advice.check_time, "{m}-{d} {h}:{i}")
159
-                : ""
178
+                  advice.parent_id == 0
179
+                    ? parseTime(advice.check_time, "{m}-{d} {h}:{i}")
180
+                    : ""
160 181
                 }}
161 182
               </td>
162
-              <td>{{ advice.parent_id == 0 ? getName(advice.advice_doctor) : "" }}</td>
183
+              <td>
184
+                {{ advice.parent_id == 0 ? getName(advice.advice_doctor) : "" }}
185
+              </td>
163 186
               <td>
164 187
                 {{
165
-                advice.parent_id == 0
166
-                ? parseTime(advice.created_time, "{m}-{d} {h}:{i}")
167
-                : ""
188
+                  advice.parent_id == 0
189
+                    ? parseTime(advice.created_time, "{m}-{d} {h}:{i}")
190
+                    : ""
168 191
                 }}
169 192
               </td>
170 193
             </tr>
@@ -173,7 +196,11 @@
173 196
       </table>
174 197
 
175 198
       <div class="NoData" v-show="zones.length <= 1">
176
-        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
199
+        <img
200
+          style="margin-top: 50px; margin-bottom: 50px"
201
+          src="@/assets/login/data.jpg"
202
+          alt
203
+        />
177 204
       </div>
178 205
     </div>
179 206
     <!--<div class="NoData" v-show="zones.length <= 1"><img src="@/assets/login/data.jpg" alt=""></div>-->
@@ -449,17 +476,17 @@ export default {
449 476
   left: 0;
450 477
   background: #fff;
451 478
   @media only screen and (max-width: 376px) {
452
-    top: 39px !important;
479
+    top: 38px !important;
453 480
   }
454
-  @media only screen and (min-width: 376px) and (max-width: 737px) {
455
-    top: 45px !important;
481
+  @media only screen and (min-width: 376px) and (max-width: 812px) {
482
+    top: 38px !important;
456 483
   }
457 484
   ul {
458 485
     @include display-flex;
459 486
     @include align-items-center;
460 487
     @include text-align;
461 488
     @include justify-content-between;
462
-    width: 80%;
489
+    width: 90%;
463 490
     margin: 0 auto;
464 491
     font-size: 0.32rem;
465 492
     color: $pgh-color;
@@ -490,9 +517,9 @@ export default {
490 517
   background: #fff;
491 518
   min-height: calc(100vh - 2px);
492 519
   @media only screen and (max-width: 812px) {
493
-    padding-top: 80px !important;
520
+    padding-top: 70px !important;
494 521
   }
495
-  @media only screen and (min-width: 768px) and (max-width: 1024px) {
522
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
496 523
     padding-top: 115px !important;
497 524
   }
498 525
 }

+ 19 - 6
src/pages/layout/SideBar.vue View File

@@ -8,10 +8,11 @@
8 8
             <span class="iconfont">&#xe6e6;</span>
9 9
             <p>记录</p>
10 10
           </router-link>
11
-          <span
12
-            class="redpoint"
13
-            v-if="total_read_dot"
14
-          >{{total_read_dot > 99?total_read_dot+'+':total_read_dot}}</span>
11
+          <span class="redpoint" v-if="total_read_dot">
12
+            {{
13
+            total_read_dot > 99 ? total_read_dot + "+" : total_read_dot
14
+            }}
15
+          </span>
15 16
         </li>
16 17
         <li :class="active_index == 1 ? 'active' : ''">
17 18
           <router-link to="/monitoring">
@@ -66,6 +67,13 @@ export default {
66 67
   position: absolute;
67 68
   top: -5px;
68 69
   right: -15px;
70
+  @media only screen and (max-width: 812px) {
71
+    height: 16px;
72
+    width: 16px;
73
+    line-height: 16px;
74
+    top: 1px;
75
+    right: -8px;
76
+  }
69 77
 }
70 78
 .sideColumn {
71 79
   // float: left;
@@ -114,15 +122,21 @@ export default {
114 122
           display: inline-block;
115 123
           padding: 0;
116 124
           margin: 0;
117
-          @media only screen and (min-width: 768px) {
125
+          @media only screen and (min-width: 813px) {
118 126
             display: flex;
119 127
           }
120 128
           p {
121 129
             font-size: 0.32rem;
122 130
             margin-top: 0.05rem;
131
+            @media only screen and (max-width: 812px) {
132
+              font-size: 0.4rem;
133
+            }
123 134
           }
124 135
           .iconfont {
125 136
             font-size: 0.52rem;
137
+            @media only screen and (max-width: 812px) {
138
+              font-size: 0.7rem;
139
+            }
126 140
             display: inline-block;
127 141
           }
128 142
         }
@@ -139,4 +153,3 @@ export default {
139 153
   }
140 154
 }
141 155
 </style>
142
-

+ 29 - 10
src/pages/main/DetailsPage.vue View File

@@ -13,11 +13,13 @@
13 13
         <div class="nav">
14 14
           <ul>
15 15
             <li
16
-              v-for="(item,i) in ['病历','透析','今日']"
16
+              v-for="(item, i) in ['病历', '透析', '今日']"
17 17
               :key="i"
18
-              :class="index == i? 'active':'' "
18
+              :class="index == i ? 'active' : ''"
19 19
               @click="ClickTab(i)"
20
-            >{{item}}</li>
20
+            >
21
+              {{ item }}
22
+            </li>
21 23
           </ul>
22 24
         </div>
23 25
 
@@ -28,14 +30,24 @@
28 30
                   <span class="iconfont">2018-01-01&#xe74a;</span>
29 31
         </div>-->
30 32
         <div class="print" style="float: right; visibility: hidden;">
31
-          <el-button size="mini" type="primary" @click="print" icon="el-icon-printer">打印</el-button>
33
+          <el-button
34
+            size="mini"
35
+            type="primary"
36
+            @click="print"
37
+            icon="el-icon-printer"
38
+            >打印</el-button
39
+          >
32 40
         </div>
33 41
       </div>
34 42
       <div class="Tab">
35
-        <CaseHistory v-show="index==0" title="病历"></CaseHistory>
43
+        <CaseHistory v-show="index == 0" title="病历"></CaseHistory>
36 44
         <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
37
-        <dialysis-tab v-show="index==1" title="透析" v-on:records="jump(val)"></dialysis-tab>
38
-        <today-tab ref="today" v-show="index==2" title="今日"></today-tab>
45
+        <dialysis-tab
46
+          v-show="index == 1"
47
+          title="透析"
48
+          v-on:records="jump(val)"
49
+        ></dialysis-tab>
50
+        <today-tab ref="today" v-show="index == 2" title="今日"></today-tab>
39 51
       </div>
40 52
     </div>
41 53
     <div class="add" @click="print">
@@ -167,6 +179,9 @@ export default {
167 179
     right: 0;
168 180
     z-index: 100;
169 181
     background: #258ffc;
182
+    @media only screen and (max-width: 320px) {
183
+      display: -webkit-box;
184
+    }
170 185
     .name {
171 186
       color: #fff;
172 187
     }
@@ -219,11 +234,15 @@ export default {
219 234
   text-align: center;
220 235
   z-index: 99;
221 236
   p {
222
-    width: 30px;
237
+    width: 26px;
223 238
     text-align: center;
224
-    margin: 8px auto 0;
239
+    margin: 6px auto 0;
225 240
     color: #fff;
226
-    @media only screen and (min-width: 768px) {
241
+    // @media only screen and (min-width: 768px) {
242
+    //   width: 40px !important;
243
+    //   margin: 11px auto 0;
244
+    // }
245
+    @media only screen and (min-width: 812px) {
227 246
       width: 40px !important;
228 247
       margin: 11px auto 0;
229 248
     }

+ 41 - 17
src/pages/main/DialysisArea.vue View File

@@ -3,16 +3,18 @@
3 3
     <div v-loading="loading">
4 4
       <div class="screening">
5 5
         <ul>
6
-          <el-popover v-model="zone_options_visible" placement="bottom" trigger="click">
6
+          <el-popover
7
+            v-model="zone_options_visible"
8
+            placement="bottom"
9
+            trigger="click"
10
+          >
7 11
             <li slot="reference">
8 12
               {{
9
-              zones.length <= 1 && zone_selected > 0
10
-              ? "全部分区"
11
-              : zones[zone_selected].text
13
+                zones.length <= 1 && zone_selected > 0
14
+                  ? "全部分区"
15
+                  : zones[zone_selected].text
12 16
               }}
13
-              <span
14
-                class="iconfont"
15
-              >&#xe74a;</span>
17
+              <span class="iconfont">&#xe74a;</span>
16 18
             </li>
17 19
 
18 20
             <div class="popover-demo-content">
@@ -22,12 +24,18 @@
22 24
                   :key="zone.value"
23 25
                   @click="handleZoneChange(index)"
24 26
                   :class="zone_selected == index ? 'tick' : ''"
25
-                >{{ zone.text }}</li>
27
+                >
28
+                  {{ zone.text }}
29
+                </li>
26 30
               </ul>
27 31
             </div>
28 32
           </el-popover>
29 33
 
30
-          <el-popover v-model="sch_type_options_visible" placement="bottom" trigger="click">
34
+          <el-popover
35
+            v-model="sch_type_options_visible"
36
+            placement="bottom"
37
+            trigger="click"
38
+          >
31 39
             <li slot="reference">
32 40
               {{ schedual_types[schedual_type_selected].text }}
33 41
               <span class="iconfont">&#xe74a;</span>
@@ -41,7 +49,9 @@
41 49
                   :class="
42 50
                     schedual_type_selected == schedualType.value ? 'tick' : ''
43 51
                   "
44
-                >{{ schedualType.text }}</li>
52
+                >
53
+                  {{ schedualType.text }}
54
+                </li>
45 55
               </ul>
46 56
             </div>
47 57
           </el-popover>
@@ -61,13 +71,26 @@
61 71
       <div class="stateBox">
62 72
         <div v-for="(item, index) in filtedScheduals" :key="index">
63 73
           <h2 class="title">{{ item.zone_name }}</h2>
64
-          <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
74
+          <patient-box
75
+            class="clearfix"
76
+            :patients="item.scheduals"
77
+          ></patient-box>
65 78
         </div>
66 79
         <div class="NoData" v-if="filtedScheduals.length == 0 && networkStates">
67
-          <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
80
+          <img
81
+            style="margin-top: 50px; margin-bottom: 50px"
82
+            src="@/assets/login/data.jpg"
83
+            alt
84
+          />
68 85
         </div>
69
-        <div class="NoData" v-if="!networkStates" style="display: block;text-align: center">
70
-          <p style="margin-top: 100px;font-size: 18px">网络异常,请点击重新加载</p>
86
+        <div
87
+          class="NoData"
88
+          v-if="!networkStates"
89
+          style="display: block;text-align: center"
90
+        >
91
+          <p style="margin-top: 100px;font-size: 18px">
92
+            网络异常,请点击重新加载
93
+          </p>
71 94
 
72 95
           <!--<img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/no_network.jpg" alt="">-->
73 96
           <van-button
@@ -76,7 +99,8 @@
76 99
             type="info"
77 100
             style="display:block;margin:0 auto"
78 101
             @click="reloads()"
79
-          >重新加载</van-button>
102
+            >重新加载</van-button
103
+          >
80 104
         </div>
81 105
       </div>
82 106
       <mt-datetime-picker
@@ -456,8 +480,8 @@ export default {
456 480
 .screening {
457 481
   border-bottom: 1px #e5e5e5 solid;
458 482
   position: fixed;
459
-  top: 122px;
460
-  @media only screen and (min-width: 768px) and (max-width: 1024px) {
483
+  top: 89px;
484
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
461 485
     top: 130px;
462 486
   }
463 487
   right: 0;

+ 7 - 0
src/pages/main/PatientBox.vue View File

@@ -407,6 +407,13 @@ export default {
407 407
   top: -8px;
408 408
   left: 0.7rem;
409 409
   border: 1px solid #fff;
410
+  @media only screen and (max-width: 812px) {
411
+    height: 16px;
412
+    width: 16px;
413
+    line-height: 15px;
414
+    top: -6px;
415
+    left: 0.6rem;
416
+  }
410 417
 }
411 418
 .yztx {
412 419
   margin: 0 5px;

+ 9 - 5
src/pages/main/PrintIndex.vue View File

@@ -21,30 +21,32 @@
21 21
       <DialysisPrintOrderOne
22 22
         style="margin-top:60px;"
23 23
         v-bind:childResponse="childResponse"
24
-        v-if="org_template_info.template_id ==1"
24
+        v-if="org_template_info.template_id == 1"
25 25
       ></DialysisPrintOrderOne>
26 26
       <DialysisPrintOrderTwo
27 27
         style="margin-top:60px;"
28 28
         v-bind:childResponse="childResponse"
29
-        v-if="org_template_info.template_id ==2||org_template_info.template_id ==0"
29
+        v-if="
30
+          org_template_info.template_id == 2 ||
31
+            org_template_info.template_id == 0
32
+        "
30 33
       ></DialysisPrintOrderTwo>
31 34
       <DialysisPrintOrderFive
32 35
         style="margin-top:60px;"
33 36
         v-bind:childResponse="childResponse"
34
-        v-if="org_template_info.template_id ==5"
37
+        v-if="org_template_info.template_id == 5"
35 38
       ></DialysisPrintOrderFive>
36 39
       <!--<DialysisPrintOrderSix style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==6"></DialysisPrintOrderSix>-->
37 40
       <DialysisPrintOrderSix
38 41
         style="margin-top:60px;"
39 42
         v-bind:childResponse="childResponse"
40
-        v-if="org_template_info.template_id ==6"
43
+        v-if="org_template_info.template_id == 6"
41 44
       ></DialysisPrintOrderSix>
42 45
     </div>
43 46
     <side-bar :active_index="0" v-if="isShow == true"></side-bar>
44 47
   </div>
45 48
 </template>
46 49
 
47
-
48 50
 <script>
49 51
 import { getPrintDialysisRecord } from "@/api/dialysis";
50 52
 import { getDataConfig } from "@/utils/data";
@@ -574,6 +576,8 @@ body {
574 576
 .mainBox {
575 577
   display: flex;
576 578
   flex-direction: column;
579
+  height: 100%;
580
+  overflow: hidden;
577 581
   > :first-child {
578 582
     flex: 1;
579 583
     overflow: auto;

+ 49 - 24
src/pages/main/RecordPage.vue View File

@@ -45,19 +45,33 @@
45 45
       <div class="box">
46 46
         <div class="department">
47 47
           <ul>
48
-            <li style="position: relative;" :class="index == 0? 'active':'' " @click="ClickTab(0)">
49
-              {{'候诊区'}}
50
-              <span
51
-                class="redpoint"
52
-                v-if="un_read_wait_num"
53
-              >{{un_read_wait_num > 99 ? un_read_wait_num+'+':un_read_wait_num}}</span>
48
+            <li
49
+              style="position: relative;"
50
+              :class="index == 0 ? 'active' : ''"
51
+              @click="ClickTab(0)"
52
+            >
53
+              {{ "候诊区" }}
54
+              <span class="redpoint" v-if="un_read_wait_num">
55
+                {{
56
+                un_read_wait_num > 99
57
+                ? un_read_wait_num + "+"
58
+                : un_read_wait_num
59
+                }}
60
+              </span>
54 61
             </li>
55
-            <li style="position: relative;" :class="index == 1? 'active':'' " @click="ClickTab(1)">
56
-              {{'透析区'}}
57
-              <span
58
-                class="redpoint"
59
-                v-if="un_read_dialysis_num"
60
-              >{{un_read_dialysis_num > 99 ? un_read_dialysis_num+'+':un_read_dialysis_num}}</span>
62
+            <li
63
+              style="position: relative;"
64
+              :class="index == 1 ? 'active' : ''"
65
+              @click="ClickTab(1)"
66
+            >
67
+              {{ "透析区" }}
68
+              <span class="redpoint" v-if="un_read_dialysis_num">
69
+                {{
70
+                un_read_dialysis_num > 99
71
+                ? un_read_dialysis_num + "+"
72
+                : un_read_dialysis_num
73
+                }}
74
+              </span>
61 75
             </li>
62 76
           </ul>
63 77
         </div>
@@ -81,9 +95,9 @@
81 95
         <van-button size="small" type="info">临时排班</van-button>
82 96
     </div>-->
83 97
     <div class="area">
84
-      <waiting-area v-show="index==0" title="候诊区" :search_keyword="search_keyword"></waiting-area>
98
+      <waiting-area v-show="index == 0" title="候诊区" :search_keyword="search_keyword"></waiting-area>
85 99
       <dialysis-area
86
-        v-show="index==1"
100
+        v-show="index == 1"
87 101
         title="透析区"
88 102
         :search_keyword="search_keyword"
89 103
         @clear_search_keyword="clearKeyword"
@@ -161,7 +175,10 @@ export default {
161 175
 .top_row {
162 176
   // height: 50px;
163 177
   font-size: 0.3rem;
164
-  padding: 0.3rem 0.3rem;
178
+  padding: 0.3rem 0.3rem 0;
179
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
180
+    padding: 0.3rem 0.3rem;
181
+  }
165 182
   // border-bottom: 1px #e5e5e5 solid;
166 183
   // display: flex;
167 184
   // align-items: center;
@@ -180,11 +197,14 @@ export default {
180 197
   height: 45px;
181 198
   line-height: 50px;
182 199
   margin-left: 8px;
183
-  color: $title-color;
200
+  // color: $title-color;
201
+  color: #fff;
184 202
 }
185 203
 .department {
186 204
   text-align: center;
187
-  height: 100%;
205
+  // height: 100%;
206
+  width: 60%;
207
+  margin: 0 auto;
188 208
   ul {
189 209
     height: 100%;
190 210
     display: flex;
@@ -230,9 +250,14 @@ export default {
230 250
   top: -8px;
231 251
   right: -8px;
232 252
   border: 1px solid #fff;
253
+  @media only screen and (max-width: 812px) {
254
+    height: 16px;
255
+    width: 16px;
256
+    line-height: 14px;
257
+  }
233 258
 }
234 259
 .box {
235
-  height: 50px;
260
+  height: 30px;
236 261
   margin-top: 50px;
237 262
   background: #258ffc;
238 263
 }
@@ -261,14 +286,14 @@ export default {
261 286
   font-size: 0.4rem;
262 287
   text-align: center;
263 288
   p {
264
-    width: 30px;
289
+    width: 26px;
265 290
     text-align: center;
266
-    margin: 8px auto 0;
291
+    margin: 6px auto 0;
267 292
     color: #fff;
268
-    @media only screen and (min-width: 415px) and (max-width: 668px) {
269
-      width: 40px;
270
-    }
271
-    @media only screen and (min-width: 768px) and (max-width: 1024px) {
293
+    // @media only screen and (min-width: 415px) and (max-width: 668px) {
294
+    //   width: 40px;
295
+    // }
296
+    @media only screen and (min-width: 769px) and (max-width: 1024px) {
272 297
       width: 40px;
273 298
       margin: 10px auto 0;
274 299
     }

+ 159 - 73
src/pages/main/WaitingArea.vue View File

@@ -9,12 +9,17 @@
9 9
             :class="select_index == i ? 'active' : ''"
10 10
             @click="menuTabClick(i)"
11 11
             :key="i"
12
-          >{{ item.label + (item.count > 0 ? "(" + item.count + ")" : "") }}</li>
13
-
14
-          <el-popover v-model="zone_options_visible" placement="bottom" trigger="click">
12
+          >
13
+            {{ item.label + (item.count > 0 ? "(" + item.count + ")" : "") }}
14
+          </li>
15
+
16
+          <el-popover
17
+            v-model="zone_options_visible"
18
+            placement="bottom"
19
+            trigger="click"
20
+          >
15 21
             <li slot="reference">
16
-              {{ zone_options[zone_selected].text
17
-              }}
22
+              {{ zone_options[zone_selected].text }}
18 23
               <span class="iconfont">&#xe74a;</span>
19 24
             </li>
20 25
             <div class="popover-demo-content">
@@ -22,17 +27,22 @@
22 27
                 <li
23 28
                   v-for="(option, index) in zone_options"
24 29
                   :key="index"
25
-                  @click="handleZoneChange(index,option)"
30
+                  @click="handleZoneChange(index, option)"
26 31
                   :class="zone_selected == index ? 'tick' : ''"
27
-                >{{ option.text }}</li>
32
+                >
33
+                  {{ option.text }}
34
+                </li>
28 35
               </ul>
29 36
             </div>
30 37
           </el-popover>
31 38
 
32
-          <el-popover v-model="time_options_visible" placement="bottom" trigger="click">
39
+          <el-popover
40
+            v-model="time_options_visible"
41
+            placement="bottom"
42
+            trigger="click"
43
+          >
33 44
             <li slot="reference">
34
-              {{ time_options[time_selected].text
35
-              }}
45
+              {{ time_options[time_selected].text }}
36 46
               <span class="iconfont">&#xe74a;</span>
37 47
             </li>
38 48
             <div class="popover-demo-content">
@@ -42,7 +52,9 @@
42 52
                   :key="index"
43 53
                   @click="handleTimeChange(index)"
44 54
                   :class="time_selected == index ? 'tick' : ''"
45
-                >{{ option.text }}</li>
55
+                >
56
+                  {{ option.text }}
57
+                </li>
46 58
               </ul>
47 59
             </div>
48 60
           </el-popover>
@@ -52,22 +64,36 @@
52 64
         <!-- <patient-box class="clearfix" :patients="filtedScheduals "></patient-box> -->
53 65
         <div v-for="(item, index) in filtedScheduals" :key="index">
54 66
           <h2 class="title">{{ item.zone_name }}</h2>
55
-          <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
67
+          <patient-box
68
+            class="clearfix"
69
+            :patients="item.scheduals"
70
+          ></patient-box>
56 71
         </div>
57 72
         <div class="NoData" v-if="filtedScheduals.length == 0 && networkStates">
58
-          <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
73
+          <img
74
+            style="margin-top: 50px; margin-bottom: 50px"
75
+            src="@/assets/login/data.jpg"
76
+            alt
77
+          />
59 78
         </div>
60 79
 
61
-        <div class="NoData" v-if="!networkStates" style="display: block;text-align: center;">
80
+        <div
81
+          class="NoData"
82
+          v-if="!networkStates"
83
+          style="display: block;text-align: center;"
84
+        >
62 85
           <!--<img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/no_network.jpg" alt="">-->
63
-          <p style="margin-top: 100px;font-size: 18px">网络异常,请点击重新加载</p>
86
+          <p style="margin-top: 100px;font-size: 18px">
87
+            网络异常,请点击重新加载
88
+          </p>
64 89
           <van-button
65 90
             slot="button"
66 91
             size="normal"
67 92
             type="info"
68 93
             style="display:block;margin:0 auto"
69 94
             @click="reloads()"
70
-          >重新加载</van-button>
95
+            >重新加载</van-button
96
+          >
71 97
         </div>
72 98
       </div>
73 99
     </div>
@@ -134,7 +160,6 @@ export default {
134 160
   },
135 161
   computed: {
136 162
     filtedScheduals: function() {
137
-
138 163
       var search_keyword = this.search_keyword;
139 164
       if (this.search_keyword.length > 0) {
140 165
         var scheduals = [];
@@ -151,7 +176,6 @@ export default {
151 176
       }
152 177
       //
153 178
       if (this.zone_selected != 0) {
154
-
155 179
         // var zone_name = this.zone_options[this.zone_selected].text
156 180
         // for (let index = 0; index < this.zone_scheduals.length; index++) {
157 181
         //   const zone_scheduals = this.zone_scheduals[index]
@@ -159,22 +183,31 @@ export default {
159 183
         //     return [zone_scheduals]
160 184
         //   }
161 185
         // }
162
-        var zone_name = this.zone_options[this.zone_selected].text
186
+        var zone_name = this.zone_options[this.zone_selected].text;
163 187
         var schedules = [];
164 188
         var filtedSchedules = [];
165 189
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
166 190
           const scheduleInfo = this.zone_scheduals[o_i];
167 191
           var originSchedules = scheduleInfo.scheduals;
168
-          
192
+
169 193
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
170 194
             const schedule = originSchedules[s_i];
171
-            if(this.zone_selected == 0){
172
-              if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
195
+            if (this.zone_selected == 0) {
196
+              if (
197
+                this.time_selected == 0 ||
198
+                schedule.schedule_type == this.time_selected
199
+              ) {
173 200
                 filtedSchedules.push(schedule);
174 201
               }
175
-            }else{
176
-              if ((zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
177
-                if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
202
+            } else {
203
+              if (
204
+                zone_name.length > 0 &&
205
+                zone_name == schedule.device_number.zone.name
206
+              ) {
207
+                if (
208
+                  this.time_selected == 0 ||
209
+                  schedule.schedule_type == this.time_selected
210
+                ) {
178 211
                   filtedSchedules.push(schedule);
179 212
                 }
180 213
               }
@@ -187,28 +220,36 @@ export default {
187 220
           //   });
188 221
           // }
189 222
         }
190
-        console.log(filtedSchedules)
223
+        console.log(filtedSchedules);
191 224
         return this.processScheduals(filtedSchedules);
192 225
       }
193 226
 
194 227
       if (this.time_selected != 0) {
195
-        var zone_name = this.zone_options[this.zone_selected].text
228
+        var zone_name = this.zone_options[this.zone_selected].text;
196 229
         var schedules = [];
197 230
         var filtedSchedules = [];
198 231
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
199 232
           const scheduleInfo = this.zone_scheduals[o_i];
200 233
           var originSchedules = scheduleInfo.scheduals;
201
-          
234
+
202 235
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
203 236
             const schedule = originSchedules[s_i];
204
-            if(this.zone_selected == 0){
205
-              if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
237
+            if (this.zone_selected == 0) {
238
+              if (
239
+                this.time_selected == 0 ||
240
+                schedule.schedule_type == this.time_selected
241
+              ) {
206 242
                 filtedSchedules.push(schedule);
207 243
               }
208
-
209
-            }else{
210
-              if ((zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
211
-                if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
244
+            } else {
245
+              if (
246
+                zone_name.length > 0 &&
247
+                zone_name == schedule.device_number.zone.name
248
+              ) {
249
+                if (
250
+                  this.time_selected == 0 ||
251
+                  schedule.schedule_type == this.time_selected
252
+                ) {
212 253
                   filtedSchedules.push(schedule);
213 254
                 }
214 255
               }
@@ -221,7 +262,7 @@ export default {
221 262
           //   });
222 263
           // }
223 264
         }
224
-        console.log(filtedSchedules)
265
+        console.log(filtedSchedules);
225 266
         return this.processScheduals(filtedSchedules);
226 267
       }
227 268
 
@@ -230,17 +271,25 @@ export default {
230 271
       var assessment_before_dislysis_count = 0;
231 272
       var prescription_count = 0;
232 273
       if (zone_selected != 0 || timetype_selected != 0) {
233
-        var zone_name = zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
274
+        var zone_name =
275
+          zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
234 276
         var schedules = [];
235 277
         var filtedSchedules = [];
236 278
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
237 279
           const scheduleInfo = this.zone_scheduals[o_i];
238 280
           var originSchedules = scheduleInfo.scheduals;
239
-          
281
+
240 282
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
241 283
             const schedule = originSchedules[s_i];
242
-            if ( zone_name.length == 0 || (zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
243
-              if ( timetype_selected == 0 ||  schedule.schedule_type == timetype_selected ) {
284
+            if (
285
+              zone_name.length == 0 ||
286
+              (zone_name.length > 0 &&
287
+                zone_name == schedule.device_number.zone.name)
288
+            ) {
289
+              if (
290
+                timetype_selected == 0 ||
291
+                schedule.schedule_type == timetype_selected
292
+              ) {
244 293
                 filtedSchedules.push(schedule);
245 294
               }
246 295
             }
@@ -253,19 +302,28 @@ export default {
253 302
           // }
254 303
         }
255 304
 
256
-        console.log(filtedSchedules)
305
+        console.log(filtedSchedules);
257 306
         return this.processScheduals(filtedSchedules);
258 307
 
259 308
         if (this.select_index == 2) {
260 309
           var scheduals = [];
261 310
           for (let index = 0; index < this.scheduals.length; index++) {
262 311
             const schedual = this.scheduals[index];
263
-            if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0) {
264
-              if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
265
-                continue
312
+            if (
313
+              schedual.assessment_before_dislysis == null ||
314
+              schedual.assessment_before_dislysis.weight_before == 0
315
+            ) {
316
+              if (
317
+                this.cur_zone_selected > 0 &&
318
+                schedual.device_number.zone.id != this.cur_zone_selected
319
+              ) {
320
+                continue;
266 321
               }
267
-              if(timetype_selected > 0 && schedual.schedule_type != timetype_selected) {
268
-                continue
322
+              if (
323
+                timetype_selected > 0 &&
324
+                schedual.schedule_type != timetype_selected
325
+              ) {
326
+                continue;
269 327
               }
270 328
               scheduals.push(schedual);
271 329
             }
@@ -276,12 +334,21 @@ export default {
276 334
           var scheduals = [];
277 335
           for (let index = 0; index < this.scheduals.length; index++) {
278 336
             const schedual = this.scheduals[index];
279
-            if (schedual.prescription == null || schedual.prescription.creater == 0) {
280
-              if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
281
-                continue
337
+            if (
338
+              schedual.prescription == null ||
339
+              schedual.prescription.creater == 0
340
+            ) {
341
+              if (
342
+                this.cur_zone_selected > 0 &&
343
+                schedual.device_number.zone.id != this.cur_zone_selected
344
+              ) {
345
+                continue;
282 346
               }
283
-              if(timetype_selected > 0 && schedual.schedule_type != timetype_selected) {
284
-                continue
347
+              if (
348
+                timetype_selected > 0 &&
349
+                schedual.schedule_type != timetype_selected
350
+              ) {
351
+                continue;
285 352
               }
286 353
               scheduals.push(schedual);
287 354
             }
@@ -294,11 +361,17 @@ export default {
294 361
           for (let index = 0; index < this.scheduals.length; index++) {
295 362
             const schedual = this.scheduals[index];
296 363
             if (schedual.dialysis_order == null) {
297
-              if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
298
-                continue
364
+              if (
365
+                this.cur_zone_selected > 0 &&
366
+                schedual.device_number.zone.id != this.cur_zone_selected
367
+              ) {
368
+                continue;
299 369
               }
300
-              if(timetype_selected > 0 && schedual.schedule_type != timetype_selected) {
301
-                continue
370
+              if (
371
+                timetype_selected > 0 &&
372
+                schedual.schedule_type != timetype_selected
373
+              ) {
374
+                continue;
302 375
               }
303 376
               scheduals.push(schedual);
304 377
             }
@@ -312,7 +385,10 @@ export default {
312 385
         var scheduals = [];
313 386
         for (let index = 0; index < this.scheduals.length; index++) {
314 387
           const schedual = this.scheduals[index];
315
-          if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0) {
388
+          if (
389
+            schedual.assessment_before_dislysis == null ||
390
+            schedual.assessment_before_dislysis.weight_before == 0
391
+          ) {
316 392
             scheduals.push(schedual);
317 393
           }
318 394
         }
@@ -322,7 +398,10 @@ export default {
322 398
         var scheduals = [];
323 399
         for (let index = 0; index < this.scheduals.length; index++) {
324 400
           const schedual = this.scheduals[index];
325
-          if (schedual.prescription == null || schedual.prescription.creater == 0) {
401
+          if (
402
+            schedual.prescription == null ||
403
+            schedual.prescription.creater == 0
404
+          ) {
326 405
             scheduals.push(schedual);
327 406
           }
328 407
         }
@@ -361,9 +440,9 @@ export default {
361 440
     if (type != null) {
362 441
       this.select_index = parseInt(type);
363 442
     }
364
-   
365
-    var storedata = this.$store.getters.waitscheduals
366
-    var scheduals = storedata.waitscheduals
443
+
444
+    var storedata = this.$store.getters.waitscheduals;
445
+    var scheduals = storedata.waitscheduals;
367 446
     if (Object.keys(storedata).length > 0) {
368 447
       var totalCount = scheduals.length;
369 448
       var prescription_count = 0;
@@ -395,9 +474,9 @@ export default {
395 474
   beforeDestroy() {
396 475
     clearInterval(this.timer);
397 476
     this.timer = null;
398
-    this.$once('hook:beforeDestroy', () => {
477
+    this.$once("hook:beforeDestroy", () => {
399 478
       clearInterval(this.timer);
400
-    })
479
+    });
401 480
   },
402 481
   methods: {
403 482
     processScheduals: function(scheduals) {
@@ -411,17 +490,23 @@ export default {
411 490
           schedualMap[schedual.device_number.zone.id] = [];
412 491
         }
413 492
         if (this.select_index == 1) {
414
-            if(schedual.prescription == null || schedual.prescription.creater == 0){
493
+          if (
494
+            schedual.prescription == null ||
495
+            schedual.prescription.creater == 0
496
+          ) {
415 497
             schedualMap[schedual.device_number.zone.id].push(schedual);
416
-            prescription_count++
498
+            prescription_count++;
417 499
           }
418
-        } else if (this.select_index == 2){
419
-            if(schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weight_before == 0){
500
+        } else if (this.select_index == 2) {
501
+          if (
502
+            schedual.assessment_before_dislysis == null ||
503
+            schedual.assessment_before_dislysis.weight_before == 0
504
+          ) {
420 505
             schedualMap[schedual.device_number.zone.id].push(schedual);
421
-            assessment_before_dislysis_count++
506
+            assessment_before_dislysis_count++;
422 507
           }
423 508
         } else {
424
-          if(schedual.dialysis_order == null){
509
+          if (schedual.dialysis_order == null) {
425 510
             schedualMap[schedual.device_number.zone.id].push(schedual);
426 511
           }
427 512
         }
@@ -437,7 +522,6 @@ export default {
437 522
         this.menuList[2].count = assessment_before_dislysis_count;
438 523
       }
439 524
 
440
-
441 525
       var zones = [];
442 526
       // zones.push({ value: 0, text: "全部分区" })
443 527
       for (var zoneId in zoneMap) {
@@ -479,10 +563,10 @@ export default {
479 563
       setSelectedTimesDataConfigList(this.time_selected);
480 564
       setWaitTypeSelectedConfig(tabIndex);
481 565
     },
482
-    handleZoneChange: function(index,zone) {
566
+    handleZoneChange: function(index, zone) {
483 567
       this.zone_options_visible = false;
484 568
       this.zone_selected = index;
485
-      this.cur_zone_selected = zone.value
569
+      this.cur_zone_selected = zone.value;
486 570
       // this.select_index = -1;
487 571
       setSelectedAreaDataConfigList(index.toString());
488 572
     },
@@ -503,7 +587,9 @@ export default {
503 587
             this.loading = false;
504 588
 
505 589
             var scheduals = resp.data.scheduals;
506
-            this.$store.dispatch("SetWaitScheduals",{waitscheduals:scheduals})
590
+            this.$store.dispatch("SetWaitScheduals", {
591
+              waitscheduals: scheduals
592
+            });
507 593
             var totalCount = scheduals.length;
508 594
             var prescription_count = 0;
509 595
             var assessment_before_dislysis_count = 0;
@@ -576,8 +662,8 @@ export default {
576 662
 .screening {
577 663
   border-bottom: 1px #e5e5e5 solid;
578 664
   position: fixed;
579
-  top: 122px;
580
-  @media only screen and (min-width: 768px) and (max-width: 1024px) {
665
+  top: 89px;
666
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
581 667
     top: 130px;
582 668
   }
583 669
   right: 0;

+ 11 - 4
src/pages/main/dialog/TwoMenu.vue View File

@@ -7,7 +7,9 @@
7 7
       <h1 class="name">{{ title }}</h1>
8 8
       <!-- <span class="success" @click="handle_selected()">完成</span> -->
9 9
       <span v-if="type == 1" class="success"></span>
10
-      <span v-if="type == 2" @click="handle_selected" class="success">确定</span>
10
+      <span v-if="type == 2" @click="handle_selected" class="success"
11
+        >确定</span
12
+      >
11 13
     </div>
12 14
 
13 15
     <div class="optionsBox" v-show="type == 1">
@@ -28,7 +30,9 @@
28 30
                 single.id_key.lenght == 0 ? item : item[single.id_key]
29 31
               )
30 32
             "
31
-          >{{ single.show_key.lenght == 0 ? item : item[single.show_key] }}</li>
33
+          >
34
+            {{ single.show_key.lenght == 0 ? item : item[single.show_key] }}
35
+          </li>
32 36
         </ul>
33 37
       </div>
34 38
     </div>
@@ -42,7 +46,10 @@
42 46
               v-for="(item, index) in mutable.options"
43 47
               :key="index"
44 48
               :name="mutable.id_key.lenght == 0 ? item : item[mutable.id_key]"
45
-            >{{ mutable.show_key.lenght == 0 ? item : item[mutable.show_key] }}</van-checkbox>
49
+              >{{
50
+                mutable.show_key.lenght == 0 ? item : item[mutable.show_key]
51
+              }}</van-checkbox
52
+            >
46 53
           </van-checkbox-group>
47 54
         </li>
48 55
       </ul>
@@ -98,7 +105,7 @@ export default {
98 105
       this.single.id_key = id_key;
99 106
       this.handle_select = handle_select;
100 107
       this.handle_hide = handle_hide;
101
-      console.log( this.single.cur_id )
108
+      console.log(this.single.cur_id);
102 109
     },
103 110
     // showMutableSelect(list_options, selected_values, title, show_key, id_key, handle_select) {
104 111
     //   this.show = true

+ 65 - 61
src/pages/main/dialog/new_order/select_advice_template_dialog.vue View File

@@ -20,18 +20,24 @@
20 20
                 "
21 21
                 class="select_all_btn"
22 22
                 @click="selectTemplateAllAdviceAction(template)"
23
-              >全选</div>
23
+              >
24
+                全选
25
+              </div>
24 26
               <div
25 27
                 v-show="
26 28
                   isFold(template.id) && isTemplateSelectingAllAdvices(template)
27 29
                 "
28 30
                 class="select_all_btn"
29 31
                 @click="cancelSelectTemplateAllAdviceAction(template)"
30
-              >取消全选</div>
32
+              >
33
+                取消全选
34
+              </div>
31 35
 
32 36
               <span v-if="isFold(template.id)" class="iconfont">&#xe749;</span>
33 37
               <span v-if="!isFold(template.id)" class="iconfont">&#xe74a;</span>
34
-              <div @click="foldTemplateAction(template.id)" class="name">{{ template.name }}</div>
38
+              <div @click="foldTemplateAction(template.id)" class="name">
39
+                {{ template.name }}
40
+              </div>
35 41
             </div>
36 42
             <div
37 43
               v-show="isFold(template.id)"
@@ -47,8 +53,7 @@
47 53
                   {{ advice.prescribing_number_unit }}
48 54
                 </span>
49 55
                 <span v-if="advice.single_dose">
50
-                  单次用量{{ advice.single_dose
51
-                  }}{{ advice.single_dose_unit }}
56
+                  单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }}
52 57
                 </span>
53 58
               </span>
54 59
               <van-checkbox
@@ -64,8 +69,7 @@
64 69
                   {{ advice.prescribing_number_unit }}
65 70
                 </span>
66 71
                 <span v-if="advice.single_dose">
67
-                  单次用量{{ advice.single_dose
68
-                  }}{{ advice.single_dose_unit }}
72
+                  单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }}
69 73
                 </span>
70 74
                 <span>{{ advice.delivery_way }}</span>
71 75
                 <span>{{ advice.execution_frequency }}</span>
@@ -81,7 +85,7 @@
81 85
 
82 86
 <script>
83 87
 export default {
84
-  name: 'SelectAdviceTemplate',
88
+  name: "SelectAdviceTemplate",
85 89
   props: {
86 90
     visibility: {
87 91
       type: Boolean,
@@ -90,160 +94,160 @@ export default {
90 94
     templates: {
91 95
       type: Array,
92 96
       default: () => {
93
-        return []
97
+        return [];
94 98
       }
95 99
     }
96 100
   },
97
-  data () {
101
+  data() {
98 102
     return {
99 103
       fold_template_ids: [],
100 104
       selecting_advice_ids: []
101
-    }
105
+    };
102 106
   },
103 107
   methods: {
104
-    backAction: function () {
105
-      this.$emit('back')
108
+    backAction: function() {
109
+      this.$emit("back");
106 110
     },
107
-    foldTemplateAction: function (template_id) {
111
+    foldTemplateAction: function(template_id) {
108 112
       for (let index = 0; index < this.fold_template_ids.length; index++) {
109 113
         if (this.fold_template_ids[index] == template_id) {
110
-          this.fold_template_ids.splice(index, 1)
111
-          return
114
+          this.fold_template_ids.splice(index, 1);
115
+          return;
112 116
         }
113 117
       }
114
-      this.fold_template_ids.push(template_id)
118
+      this.fold_template_ids.push(template_id);
115 119
     },
116
-    selectAdviceAction: function (template, advice) {
117
-      var isCancelSelect = false
120
+    selectAdviceAction: function(template, advice) {
121
+      var isCancelSelect = false;
118 122
       for (let index = 0; index < this.selecting_advice_ids.length; index++) {
119 123
         if (this.selecting_advice_ids[index].advice_id == advice.id) {
120
-          this.selecting_advice_ids.splice(index, 1)
121
-          isCancelSelect = true
122
-          break
124
+          this.selecting_advice_ids.splice(index, 1);
125
+          isCancelSelect = true;
126
+          break;
123 127
         }
124 128
       }
125 129
       if (!isCancelSelect) {
126 130
         this.selecting_advice_ids.push({
127 131
           template_id: template.id,
128 132
           advice_id: advice.id
129
-        })
133
+        });
130 134
       }
131 135
     },
132
-    selectTemplateAllAdviceAction: function (template) {
136
+    selectTemplateAllAdviceAction: function(template) {
133 137
       for (
134 138
         let index = 0;
135 139
         index < template.DoctorAdviceTemplate.length;
136 140
         index++
137 141
       ) {
138
-        const advice = template.DoctorAdviceTemplate[index]
142
+        const advice = template.DoctorAdviceTemplate[index];
139 143
         if (advice.parent_id > 0) {
140
-          continue
144
+          continue;
141 145
         }
142
-        var didSelect = false
146
+        var didSelect = false;
143 147
         for (
144 148
           let s_a_index = 0;
145 149
           s_a_index < this.selecting_advice_ids.length;
146 150
           s_a_index++
147 151
         ) {
148 152
           if (this.selecting_advice_ids[s_a_index].advice_id == advice.id) {
149
-            didSelect = true
150
-            break
153
+            didSelect = true;
154
+            break;
151 155
           }
152 156
         }
153 157
         if (!didSelect) {
154 158
           this.selecting_advice_ids.push({
155 159
             template_id: template.id,
156 160
             advice_id: advice.id
157
-          })
161
+          });
158 162
         }
159 163
       }
160 164
     },
161
-    cancelSelectTemplateAllAdviceAction: function (template) {
165
+    cancelSelectTemplateAllAdviceAction: function(template) {
162 166
       for (
163 167
         let index = this.selecting_advice_ids.length - 1;
164 168
         index >= 0;
165 169
         index--
166 170
       ) {
167 171
         if (this.selecting_advice_ids[index].template_id == template.id) {
168
-          this.selecting_advice_ids.splice(index, 1)
172
+          this.selecting_advice_ids.splice(index, 1);
169 173
         }
170 174
       }
171 175
     },
172
-    submitAction: function () {
173
-      var advices = []
176
+    submitAction: function() {
177
+      var advices = [];
174 178
       // WAIN: 效率低,可以通过在 selecting_advice_ids 加上 template_index 和 advice_index 字段来消除 this.templates 的循环
175 179
       for (let t_a_i = 0; t_a_i < this.selecting_advice_ids.length; t_a_i++) {
176
-        const tpl_advice = this.selecting_advice_ids[t_a_i]
180
+        const tpl_advice = this.selecting_advice_ids[t_a_i];
177 181
         for (let t_i = 0; t_i < this.templates.length; t_i++) {
178
-          const tpl = this.templates[t_i]
182
+          const tpl = this.templates[t_i];
179 183
           if (tpl.id == tpl_advice.template_id) {
180
-            var child_begin = false
184
+            var child_begin = false;
181 185
             for (let a_i = 0; a_i < tpl.DoctorAdviceTemplate.length; a_i++) {
182
-              const adv = tpl.DoctorAdviceTemplate[a_i]
186
+              const adv = tpl.DoctorAdviceTemplate[a_i];
183 187
               if (adv.id == tpl_advice.advice_id) {
184
-                advices.push(adv)
185
-                child_begin = true
188
+                advices.push(adv);
189
+                child_begin = true;
186 190
               } else if (child_begin == true) {
187 191
                 if (adv.parent_id == tpl_advice.advice_id) {
188
-                  advices.push(adv)
192
+                  advices.push(adv);
189 193
                 } else {
190
-                  break
194
+                  break;
191 195
                 }
192 196
               }
193 197
             }
194 198
           }
195 199
         }
196 200
       }
197
-      this.$emit('finish', advices)
201
+      this.$emit("finish", advices);
198 202
 
199 203
       this.$nextTick(() => {
200
-        this.fold_template_ids = []
201
-        this.selecting_advice_ids = []
202
-      })
204
+        this.fold_template_ids = [];
205
+        this.selecting_advice_ids = [];
206
+      });
203 207
     },
204 208
 
205
-    isFold: function (template_id) {
209
+    isFold: function(template_id) {
206 210
       for (let index = 0; index < this.fold_template_ids.length; index++) {
207 211
         if (this.fold_template_ids[index] == template_id) {
208
-          return true
212
+          return true;
209 213
         }
210 214
       }
211
-      return false
215
+      return false;
212 216
     },
213
-    isAdviceSelecting: function (advice_id) {
217
+    isAdviceSelecting: function(advice_id) {
214 218
       for (let index = 0; index < this.selecting_advice_ids.length; index++) {
215 219
         if (this.selecting_advice_ids[index].advice_id == advice_id) {
216
-          return true
220
+          return true;
217 221
         }
218 222
       }
219
-      return false
223
+      return false;
220 224
     },
221
-    isTemplateSelectingAllAdvices: function (template) {
222
-      var count = 0
225
+    isTemplateSelectingAllAdvices: function(template) {
226
+      var count = 0;
223 227
       for (let t_a_i = 0; t_a_i < this.selecting_advice_ids.length; t_a_i++) {
224 228
         if (this.selecting_advice_ids[t_a_i].template_id == template.id) {
225
-          count++
229
+          count++;
226 230
         }
227 231
       }
228 232
 
229
-      var p_advice_count = 0
233
+      var p_advice_count = 0;
230 234
       for (
231 235
         let index = 0;
232 236
         index < template.DoctorAdviceTemplate.length;
233 237
         index++
234 238
       ) {
235 239
         if (template.DoctorAdviceTemplate[index].parent_id == 0) {
236
-          p_advice_count++
240
+          p_advice_count++;
237 241
         }
238 242
       }
239 243
       if (count < p_advice_count) {
240
-        return false
244
+        return false;
241 245
       } else {
242
-        return true
246
+        return true;
243 247
       }
244 248
     }
245 249
   }
246
-}
250
+};
247 251
 </script>
248 252
 
249 253
 <style style="stylesheet/scss" lang="scss">
@@ -252,7 +256,7 @@ export default {
252 256
   max-height: 9.6rem;
253 257
   min-height: 5rem;
254 258
   overflow-y: scroll;
255
-  @media only screen and (max-width: 812px) {
259
+  @media only screen and (max-width: 811px) {
256 260
     min-height: 17.8rem !important;
257 261
   }
258 262
   ul {

+ 14 - 5
src/pages/main/dialog/subMenu/checkBoxSubMenu.vue View File

@@ -5,8 +5,14 @@
5 5
         <span class="iconfont">&#xe720;</span>返回
6 6
       </div>
7 7
       <h1 class="name">{{ propsForm.title }}</h1>
8
-      <span v-if="propsForm.isMultiple == 1" @click="comfirm" class="success"></span>
9
-      <span v-if="propsForm.isMultiple == 2" @click="comfirm" class="success">确定</span>
8
+      <span
9
+        v-if="propsForm.isMultiple == 1"
10
+        @click="comfirm"
11
+        class="success"
12
+      ></span>
13
+      <span v-if="propsForm.isMultiple == 2" @click="comfirm" class="success"
14
+        >确定</span
15
+      >
10 16
     </div>
11 17
 
12 18
     <div v-if="propsForm.isMultiple == 1" class="optionsBox">
@@ -19,7 +25,9 @@
19 25
             :key="item.id"
20 26
             value="item"
21 27
             :class="propsForm.selectId == item.id ? 'tick' : ''"
22
-          >{{ item.name }}</li>
28
+          >
29
+            {{ item.name }}
30
+          </li>
23 31
           <!--<li v-if="propsForm.isHasOther == 1 && this.$store.getters.user.template_info.template_id == 2" @click="itemClick(-1)"  :key="-1" value="-1" :class="propsForm.selectId == -1? 'tick':'' ">其他</li>-->
24 32
         </ul>
25 33
       </div>
@@ -34,7 +42,8 @@
34 42
               v-for="(item, index) in propsForm.list"
35 43
               :key="index"
36 44
               :name="item.name"
37
-            >{{ item.name }}</van-checkbox>
45
+              >{{ item.name }}</van-checkbox
46
+            >
38 47
           </van-checkbox-group>
39 48
         </li>
40 49
       </ul>
@@ -168,7 +177,7 @@ export default {
168 177
     max-height: 16rem !important;
169 178
     min-height: 8rem !important;
170 179
   }
171
-  @media only screen and (min-width: 769px) and (max-width: 1024px) {
180
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
172 181
     max-height: 10.8rem !important;
173 182
   }
174 183
   ul {

+ 7 - 7
src/pages/main/dialysis/AdviceTable.vue View File

@@ -1441,18 +1441,18 @@ export default {
1441 1441
   padding-top: 36px;
1442 1442
   background: #fff;
1443 1443
   min-height: calc(100vh - 200px);
1444
-  @media only screen and (min-width: 376px) and (max-width: 668px) {
1445
-    padding-top: 50px !important;
1446
-  }
1447
-  @media only screen and (min-width: 768px) and (max-width: 1024px) {
1444
+  // @media only screen and (min-width: 376px) and (max-width: 668px) {
1445
+  //   padding-top: 50px !important;
1446
+  // }
1447
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
1448 1448
     padding-top: 54px !important;
1449 1449
   }
1450 1450
   @media only screen and (min-width: 737px) and (max-width: 768px) {
1451 1451
     padding-top: 76px !important;
1452 1452
   }
1453
-  @media only screen and (min-width: 415px) and (max-width: 736px) {
1454
-    padding-top: 48px !important;
1455
-  }
1453
+  // @media only screen and (min-width: 415px) and (max-width: 736px) {
1454
+  //   padding-top: 48px !important;
1455
+  // }
1456 1456
   .choice {
1457 1457
     border-bottom: 1px #e5e5e5 solid;
1458 1458
 

+ 58 - 16
src/pages/main/dialysis/CheckTab.vue View File

@@ -10,9 +10,9 @@
10 10
         >{{item.project_name}}</li>
11 11
       </ul>-->
12 12
       <van-tabs v-model="active" @change="onClick">
13
-        <van-tab v-for="(item,i) in inspectionDate" :key="i" :title="item.project_name"></van-tab>
13
+        <van-tab v-for="(item, i) in inspectionDate" :key="i" :title="item.project_name"></van-tab>
14 14
       </van-tabs>
15
-      <!-- <van-tabs v-model="active">
15
+      <!-- <van-tabs v-model="active" ref="one">
16 16
         <van-tab title="标签 1">内容 1</van-tab>
17 17
         <van-tab title="标签 2">内容 2</van-tab>
18 18
         <van-tab title="标签 3">内容 3</van-tab>
@@ -29,15 +29,20 @@
29 29
 <script>
30 30
 import { GetInspection } from "@/api/check";
31 31
 import InspectionItemTable from "./InspectionItemTable";
32
+import $ from "jquery";
32 33
 
33 34
 export default {
34 35
   name: "CheckTab",
35 36
   created() {
36 37
     this.patient = this.$route.query.patient_id;
37 38
     this.GetList();
38
-  },
39
-  mounted() {
40
-    this.active = 0;
39
+
40
+    this.$nextTick(() => {
41
+      if (this.active === 0) {
42
+        console.log();
43
+        $(".van-tabs__line").addClass("intro");
44
+      }
45
+    });
41 46
   },
42 47
   data() {
43 48
     return {
@@ -63,7 +68,7 @@ export default {
63 68
       GetInspection(params).then(response => {
64 69
         this.inspectionDate = [];
65 70
         if (response.data.state == 1) {
66
-          console.log(this.$refs.item);
71
+          // console.log(this.$refs.item);
67 72
           this.inspectionDate = response.data.data.reference;
68 73
           this.$refs.item.GetList(1, this.inspectionDate[0]);
69 74
         }
@@ -72,7 +77,10 @@ export default {
72 77
     onClick(num, title) {
73 78
       // console.log(this.inspectionDate);
74 79
       // console.log(num);
75
-      console.log(this.$refs.item);
80
+      // console.log(this.$refs.item);
81
+      if ($(".van-tabs__line").is(".intro")) {
82
+        $(".van-tabs__line").removeClass("intro");
83
+      }
76 84
 
77 85
       this.inspectionDate.map((items, i) => {
78 86
         if (num == i) {
@@ -91,13 +99,16 @@ export default {
91 99
   background: #fff;
92 100
   position: fixed;
93 101
   top: 76px;
94
-  @media only screen and (min-width: 376px) and (max-width: 668px) {
95
-    top: 84px !important;
96
-  }
97
-  @media only screen and (min-width: 415px) and (max-width: 736px) {
98
-    top: 88px !important;
102
+  // @media only screen and (min-width: 376px) and (max-width: 668px) {
103
+  //   top: 84px !important;
104
+  // }
105
+  // @media only screen and (min-width: 415px) and (max-width: 736px) {
106
+  //   top: 88px !important;
107
+  // }
108
+  @media only screen and (max-width: 812px) {
109
+    top: 76px !important;
99 110
   }
100
-  @media only screen and (min-width: 768px) and (max-width: 1024px) {
111
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
101 112
     top: 117px !important;
102 113
   }
103 114
   @media only screen and (min-width: 1024px) {
@@ -138,6 +149,37 @@ export default {
138 149
   }
139 150
 }
140 151
 </style>
141
-
142
-
143
-
152
+<style lang="scss">
153
+.intro {
154
+  width: 41px !important;
155
+  transform: translateX(20.5px) !important;
156
+  @media only screen and (min-width: 415px) and (max-width: 668px) {
157
+    width: 73px !important;
158
+    transform: translateX(36.5px) !important;
159
+  }
160
+  @media only screen and (min-width: 376px) and (max-width: 415px) {
161
+    width: 45.5px !important;
162
+    transform: translateX(22.75px) !important;
163
+  }
164
+  @media only screen and (min-width: 668px) and (max-width: 735px) {
165
+    width: 45.5px !important;
166
+    transform: translateX(22.75px) !important;
167
+  }
168
+  @media only screen and (min-width: 668px) and (max-width: 736px) {
169
+    width: 81px !important;
170
+    transform: translateX(40.5px) !important;
171
+  }
172
+  @media only screen and (min-width: 737px) and (max-width: 812px) {
173
+    width: 89px !important;
174
+    transform: translateX(44.5px) !important;
175
+  }
176
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
177
+    width: 113px !important;
178
+    transform: translateX(56.5px) !important;
179
+  }
180
+  @media only screen and (min-width: 1025px) {
181
+    width: 150.5px !important;
182
+    transform: translateX(75.25px) !important;
183
+  }
184
+}
185
+</style>

+ 23 - 19
src/pages/main/dialysis/DialysisTab.vue View File

@@ -3,23 +3,28 @@
3 3
     <div class="nav">
4 4
       <ul>
5 5
         <li
6
-          v-for="(item,i) in ['长期透析处方','透析记录','排班信息','宣教信息']"
6
+          v-for="(item, i) in [
7
+            '长期透析处方',
8
+            '透析记录',
9
+            '排班信息',
10
+            '宣教信息'
11
+          ]"
7 12
           :key="i"
8
-          :class="index == i? 'active':'' "
13
+          :class="index == i ? 'active' : ''"
9 14
           @click="ClickTab(i)"
10
-        >{{item}}</li>
15
+        >{{ item }}</li>
11 16
       </ul>
12 17
     </div>
13 18
 
14 19
     <div class="tab-content">
15
-      <long-table v-show="index==0" title="长期透析处方"></long-table>
16
-      <record-table v-show="index==1" title="透析记录"></record-table>
20
+      <long-table v-show="index == 0" title="长期透析处方"></long-table>
21
+      <record-table v-show="index == 1" title="透析记录"></record-table>
17 22
       <!--<advice-table v-show="index==2" title="医嘱信息"></advice-table>-->
18
-      <schedul-table v-show="index==2" class="排班信息"></schedul-table>
19
-      <mission-table v-show="index==3" class="宣教信息"></mission-table>
23
+      <schedul-table v-show="index == 2" class="排班信息"></schedul-table>
24
+      <mission-table v-show="index == 3" class="宣教信息"></mission-table>
20 25
     </div>
21 26
   </div>
22
-</template> 
27
+</template>
23 28
 
24 29
 <script>
25 30
 import LongTable from "./LongTable";
@@ -51,25 +56,25 @@ export default {
51 56
 
52 57
 <style style="stylesheet/scss" lang="scss" scoped>
53 58
 .fixedBox {
54
-  padding-top: 40px;
59
+  padding-top: 38px;
55 60
   background: #fff;
56 61
   min-height: calc(100vh - 64px);
57
-  @media only screen and (min-width: 376px) and (max-width: 737px) {
58
-    padding-top: 46px;
59
-  }
60
-  @media only screen and (min-width: 768px) and (max-width: 1024px) {
62
+  // @media only screen and (min-width: 376px) and (max-width: 737px) {
63
+  //   padding-top: 46px;
64
+  // }
65
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
61 66
     padding-top: 74px;
62 67
   }
63 68
   .nav {
64 69
     border-bottom: 1px #e5e5e5 solid;
65 70
     position: fixed;
66
-    top: 51px;
67
-    @media only screen and (min-width: 768px) and (max-width: 1024px) {
71
+    top: 45px;
72
+    @media only screen and (min-width: 813px) and (max-width: 1024px) {
68 73
       top: 64px;
69 74
     }
70
-    @media only screen and (min-width: 376px) and (max-width: 668px) {
71
-      top: 50px;
72
-    }
75
+    // @media only screen and (min-width: 376px) and (max-width: 668px) {
76
+    //   top: 50px;
77
+    // }
73 78
     right: 0;
74 79
     z-index: 66;
75 80
     left: 0;
@@ -107,4 +112,3 @@ export default {
107 112
   }
108 113
 }
109 114
 </style>
110
-

+ 24 - 22
src/pages/main/dialysis/InspectionItemTable.vue View File

@@ -11,31 +11,31 @@
11 11
         </tr>
12 12
       </table>
13 13
 
14
-      <table class="table" v-for="(items,indexs) in inspections_item" :key="indexs">
14
+      <table class="table" v-for="(items, indexs) in inspections_item" :key="indexs">
15 15
         <tr>
16
-          <td width="20%">{{items.date}}</td>
16
+          <td width="20%">{{ items.date }}</td>
17 17
           <td width="10%"></td>
18 18
           <td width="10%"></td>
19 19
           <td width="10%"></td>
20 20
         </tr>
21
-        <tr class="table" v-for="(item,index) in items.inspection_show_item" :key="index">
22
-          <td width="20%">{{item.item_name}}</td>
23
-          <td width="10%">{{item.value}}</td>
24
-          <td width="10%" v-if="item.range_type ==1">{{item.range_min}} ~ {{item.range_max}}</td>
25
-          <td width="10%" v-else>{{item.range_value}}</td>
26
-          <td width="10%">{{item.unit}}</td>
21
+        <tr class="table" v-for="(item, index) in items.inspection_show_item" :key="index">
22
+          <td width="20%">{{ item.item_name }}</td>
23
+          <td width="10%">{{ item.value }}</td>
24
+          <td width="10%" v-if="item.range_type == 1">{{ item.range_min }} ~ {{ item.range_max }}</td>
25
+          <td width="10%" v-else>{{ item.range_value }}</td>
26
+          <td width="10%">{{ item.unit }}</td>
27 27
         </tr>
28 28
 
29 29
         <tr
30 30
           v-if="items.isExpand"
31 31
           class="table"
32
-          v-for="(item,index) in items.inspection_hide_item"
32
+          v-for="(item, index) in items.inspection_hide_item"
33 33
           :key="index"
34 34
         >
35
-          <td width="20%">{{item.item_name}}</td>
36
-          <td width="10%">{{item.value}}</td>
37
-          <td width="10%">{{item.range_min}} ~ {{item.range_max}}</td>
38
-          <td width="10%">{{item.unit}}</td>
35
+          <td width="20%">{{ item.item_name }}</td>
36
+          <td width="10%">{{ item.value }}</td>
37
+          <td width="10%">{{ item.range_min }} ~ {{ item.range_max }}</td>
38
+          <td width="10%">{{ item.unit }}</td>
39 39
         </tr>
40 40
         <tr>
41 41
           <td width="20%"></td>
@@ -44,7 +44,7 @@
44 44
             style="color:#409EFF;"
45 45
             @click="expandTable(indexs)"
46 46
             v-model="isExpand"
47
-          >{{items.expandName}}</td>
47
+          >{{ items.expandName }}</td>
48 48
           <td width="10%"></td>
49 49
           <td width="10%"></td>
50 50
         </tr>
@@ -301,13 +301,16 @@ export default {
301 301
   background: #fff;
302 302
   min-height: calc(100vh - 178px);
303 303
   margin-top: 76px;
304
-  @media only screen and (min-width: 376px) and (max-width: 668px) {
305
-    margin-top: 84px;
306
-  }
307
-  @media only screen and (min-width: 415px) and (max-width: 736px) {
308
-    margin-top: 84px !important;
309
-  }
310
-  @media only screen and (min-width: 768px) and (max-width: 1023px) {
304
+  // @media only screen and (min-width: 376px) and (max-width: 668px) {
305
+  //   margin-top: 84px;
306
+  // }
307
+  // @media only screen and (min-width: 415px) and (max-width: 736px) {
308
+  //   margin-top: 84px !important;
309
+  // }
310
+  // @media only screen and (max-width: 812px) {
311
+  //   margin-top: 80px !important;
312
+  // }
313
+  @media only screen and (min-width: 813px) and (max-width: 1023px) {
311 314
     margin-top: 114px !important;
312 315
   }
313 316
   @media only screen and (min-width: 1024px) {
@@ -325,4 +328,3 @@ export default {
325 328
   background: #409eff !important;
326 329
 }
327 330
 </style>
328
-

+ 451 - 327
src/pages/main/dialysis/LongTable.vue View File

@@ -1,232 +1,318 @@
1 1
 <template>
2
-    <div>
3
-        <div class="blueBorder"></div>              
4
-        <div class="tableTit " >   
5
-            <ul>
6
-                <li v-for="(item,index) in ['序号','透析模式','透析时长','医生','更新日期','操作']" :key="index" :value="item.value" >{{item}}</li>
7
-                <!-- <li v-for="(item,index) in ['序号','透析模式','透析时长','医生','更新日期']" :key="index" :value="item.value" >{{item}}</li> -->
8
-            </ul>
9
-        </div>
10
-        <div class="tableDate" >
11
-          <van-list
12
-            v-model="loading"
13
-            :finished="finished"
14
-            @load="onLoad"
15
-          >
16
-          <ul>
17
-                <li v-for="(item,index) in tableDate" :key="index" :value="item.value" >
18
-                <span>{{item.no}}</span>
19
-                <span>{{item.mode_name}}</span>
20
-                <span>{{item.dialysis_duration_hour}}h {{item.dialysis_duration_minute}}min</span>
21
-                <span>{{tranDoctor(item.registrars_id)}}</span>
22
-                <span>{{item.edate}}</span>
23
-                <span @click="openEdit(index, item)"><i class="iconfont">&#xe6f7;</i>修改</span>
24
-                </li>
25
-            </ul>
26
-          </van-list>
27
-          <div class="NoData" v-show="tableDate.length == 0"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
2
+  <div>
3
+    <div class="blueBorder"></div>
4
+    <div class="tableTit">
5
+      <ul>
6
+        <li
7
+          v-for="(item,index) in ['序号','透析模式','透析时长','医生','更新日期','操作']"
8
+          :key="index"
9
+          :value="item.value"
10
+        >{{item}}</li>
11
+        <!-- <li v-for="(item,index) in ['序号','透析模式','透析时长','医生','更新日期']" :key="index" :value="item.value" >{{item}}</li> -->
12
+      </ul>
13
+    </div>
14
+    <div class="tableDate">
15
+      <van-list v-model="loading" :finished="finished" @load="onLoad">
16
+        <ul>
17
+          <li v-for="(item,index) in tableDate" :key="index" :value="item.value">
18
+            <span>{{item.no}}</span>
19
+            <span>{{item.mode_name}}</span>
20
+            <span>{{item.dialysis_duration_hour}}h {{item.dialysis_duration_minute}}min</span>
21
+            <span>{{tranDoctor(item.registrars_id)}}</span>
22
+            <span>{{item.edate}}</span>
23
+            <span @click="openEdit(index, item)">
24
+              <i class="iconfont">&#xe6f7;</i>修改
25
+            </span>
26
+          </li>
27
+        </ul>
28
+      </van-list>
29
+      <div class="NoData" v-show="tableDate.length == 0">
30
+        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
31
+      </div>
32
+    </div>
28 33
 
34
+    <van-popup
35
+      title="透析处方"
36
+      v-model="showObj.showPopup"
37
+      :overlay="true"
38
+      @click-overlay="popupDidHide()"
39
+    >
40
+      <div v-if="showObj.showForm" class="Dialog">
41
+        <div class="DialogTit">
42
+          <span @click="popupDidHide()" class="iconfont">&#xe6e9;</span>
43
+          <h1 class="name">透析处方</h1>
44
+          <span @click="commitInfo" class="success">完成</span>
29 45
         </div>
30 46
 
31
-        <van-popup title="透析处方" v-model="showObj.showPopup" :overlay="true" @click-overlay="popupDidHide()">
32
-          <div v-if="showObj.showForm" class="Dialog">
33
-            <div class="DialogTit" >
34
-              <span @click="popupDidHide()" class="iconfont">&#xe6e9;</span>
35
-              <h1 class="name">透析处方</h1>
36
-              <span @click="commitInfo" class="success">完成</span>
47
+        <div class="DialogContent" id="dialogTop">
48
+          <div @click="showSubMenu('mode')" class="item" ref="mode">
49
+            <label class="name" for="txms">透析模式</label>
50
+            <div class="content">
51
+              <span class="text" id="txms">{{GetModeByModeId(dialysisSolution.mode_id)}}</span>
52
+              <span class="iconfont">&#xe6f9;</span>
37 53
             </div>
54
+          </div>
55
+          <div class="item" @click="openPicker">
56
+            <label class="name" for="txsc">透析时长</label>
57
+            <div class="content">
58
+              <span class="text" style="width: 100px">{{timeValue}}</span>
59
+              <span class="iconfont">&#xe6f9;</span>
60
+            </div>
61
+          </div>
38 62
 
39
-            <div class="DialogContent" id="dialogTop">
40
-              <div @click="showSubMenu('mode')" class="item" ref="mode">
41
-                <label class="name" for="txms">透析模式</label>
42
-                <div class="content">
43
-                  <span class="text" id="txms">{{GetModeByModeId(dialysisSolution.mode_id)}}</span>
44
-                  <span class="iconfont">&#xe6f9;</span>
45
-                </div>
46
-              </div>
47
-              <div class="item" @click="openPicker">
48
-                <label class="name" for="txsc">透析时长</label>
49
-                <div class="content">
50
-                  <span class="text" style="width: 100px">{{timeValue}}</span>
51
-                  <span class="iconfont">&#xe6f9;</span>
52
-                </div>
53
-              </div>
54
-
55
-              <div class="item">
56
-                <label class="name" for="xll">血流量(ml/min)</label>
57
-                <div class="content">
58
-                  <input type="tel" @focus="inputFocus" id="xll" v-model="dialysisSolution.blood_flow_volume"/>
59
-                </div>
60
-              </div>
61
-
62
-              <div class="item">
63
-                <label class="name" for="mbcll">目标超滤量(ml)</label>
64
-                <div class="content">
65
-                  <input type="tel" @focus="inputFocus" id="mbcll" v-model="dialysisSolution.target_ultrafiltration"/>
66
-                </div>
67
-              </div>
68
-              <div @click="showSubMenu('dialysate_formulation')" class="item" ref="dialysate_formulation">
69
-                <label class="name" for="txypf">透析液配方</label>
70
-                <div class="content">
71
-                  <span class="text" id="txypf">{{GetDialysateFormulationById(dialysisSolution.dialysate_formulation)}}</span>
72
-                  <span class="iconfont">&#xe6f9;</span>
73
-                </div>
74
-              </div>
63
+          <div class="item">
64
+            <label class="name" for="xll">血流量(ml/min)</label>
65
+            <div class="content">
66
+              <input
67
+                type="tel"
68
+                @focus="inputFocus"
69
+                id="xll"
70
+                v-model="dialysisSolution.blood_flow_volume"
71
+              />
72
+            </div>
73
+          </div>
75 74
 
76
-              <div @click="showSubMenu('anticoagulant')" class="item" ref="anticoagulant">
77
-                <label class="name" for="knj">抗疑剂</label>
78
-                <div class="content">
79
-                  <span class="text" id="knj">{{GetAnticoagulantById(dialysisSolution.anticoagulant)}}</span>
80
-                  <span class="iconfont">&#xe6f9;</span>
81
-                </div>
82
-              </div>
75
+          <div class="item">
76
+            <label class="name" for="mbcll">目标超滤量(ml)</label>
77
+            <div class="content">
78
+              <input
79
+                type="tel"
80
+                @focus="inputFocus"
81
+                id="mbcll"
82
+                v-model="dialysisSolution.target_ultrafiltration"
83
+              />
84
+            </div>
85
+          </div>
86
+          <div
87
+            @click="showSubMenu('dialysate_formulation')"
88
+            class="item"
89
+            ref="dialysate_formulation"
90
+          >
91
+            <label class="name" for="txypf">透析液配方</label>
92
+            <div class="content">
93
+              <span
94
+                class="text"
95
+                id="txypf"
96
+              >{{GetDialysateFormulationById(dialysisSolution.dialysate_formulation)}}</span>
97
+              <span class="iconfont">&#xe6f9;</span>
98
+            </div>
99
+          </div>
83 100
 
84
-              <div class="item" v-if="anticoagulant.shouji != -1">
85
-                <label class="name" for="sj">首剂({{anticoagulant.shouji_unit}})</label>
86
-                <div class="content">
87
-                  <input type="tel" @focus="inputFocus" id="sj" v-model="dialysisSolution.anticoagulant_shouji"
88
-                        :disabled="anticoagulant.shouji==1?false:true"/>
89
-                </div>
90
-              </div>
91
-              <div class="item" v-if="anticoagulant.weichi != -1">
92
-                <label class="name" for="wz">维持({{anticoagulant.weichi_unit}})</label>
93
-                <div class="content">
94
-                  <input type="tel" @focus="inputFocus" id="wz" class="inputBox" v-model="dialysisSolution.anticoagulant_weichi"
95
-                        :disabled="anticoagulant.weichi==1?false:true">
96
-                </div>
97
-              </div>
98
-              <div class="item" v-if="anticoagulant.zongliang != -1">
99
-                <label class="name" for="zl">总量(mg)</label>
100
-                <div class="content">
101
-                  <input type="tel" @focus="inputFocus" id="zl" class="inputBox" v-model="dialysisSolution.anticoagulant_zongliang"
102
-                        :disabled="anticoagulant.zongliang==1?false:true">
103
-                </div>
104
-              </div>
101
+          <div @click="showSubMenu('anticoagulant')" class="item" ref="anticoagulant">
102
+            <label class="name" for="knj">抗疑剂</label>
103
+            <div class="content">
104
+              <span class="text" id="knj">{{GetAnticoagulantById(dialysisSolution.anticoagulant)}}</span>
105
+              <span class="iconfont">&#xe6f9;</span>
106
+            </div>
107
+          </div>
105 108
 
106
-              <div class="item" v-if="anticoagulant.gaimingcheng != -1">
107
-                <label class="name" for="g">钙名称({{anticoagulant.gaimingcheng_unit}})</label>
108
-                <div class="content">
109
-                  <input type="text" id="g" class="inputBox" v-model="dialysisSolution.anticoagulant_gaimingcheng"
110
-                        :disabled="anticoagulant.gaimingcheng==1?false:true">
111
-                </div>
112
-              </div>
109
+          <div class="item" v-if="anticoagulant.shouji != -1">
110
+            <label class="name" for="sj">首剂({{anticoagulant.shouji_unit}})</label>
111
+            <div class="content">
112
+              <input
113
+                type="tel"
114
+                @focus="inputFocus"
115
+                id="sj"
116
+                v-model="dialysisSolution.anticoagulant_shouji"
117
+                :disabled="anticoagulant.shouji==1?false:true"
118
+              />
119
+            </div>
120
+          </div>
121
+          <div class="item" v-if="anticoagulant.weichi != -1">
122
+            <label class="name" for="wz">维持({{anticoagulant.weichi_unit}})</label>
123
+            <div class="content">
124
+              <input
125
+                type="tel"
126
+                @focus="inputFocus"
127
+                id="wz"
128
+                class="inputBox"
129
+                v-model="dialysisSolution.anticoagulant_weichi"
130
+                :disabled="anticoagulant.weichi==1?false:true"
131
+              />
132
+            </div>
133
+          </div>
134
+          <div class="item" v-if="anticoagulant.zongliang != -1">
135
+            <label class="name" for="zl">总量(mg)</label>
136
+            <div class="content">
137
+              <input
138
+                type="tel"
139
+                @focus="inputFocus"
140
+                id="zl"
141
+                class="inputBox"
142
+                v-model="dialysisSolution.anticoagulant_zongliang"
143
+                :disabled="anticoagulant.zongliang==1?false:true"
144
+              />
145
+            </div>
146
+          </div>
113 147
 
114
-              <div class="item" v-if="anticoagulant.gaijiliang != -1">
115
-                <label class="name" for="gjl">钙剂量</label>
116
-                <div class="content">
117
-                  <input type="text" id="gjl" class="inputBox" v-model="dialysisSolution.anticoagulant_gaimingcheng"
118
-                        :disabled="anticoagulant.gaimingcheng==1?false:true">
119
-                </div>
120
-              </div>
148
+          <div class="item" v-if="anticoagulant.gaimingcheng != -1">
149
+            <label class="name" for="g">钙名称({{anticoagulant.gaimingcheng_unit}})</label>
150
+            <div class="content">
151
+              <input
152
+                type="text"
153
+                id="g"
154
+                class="inputBox"
155
+                v-model="dialysisSolution.anticoagulant_gaimingcheng"
156
+                :disabled="anticoagulant.gaimingcheng==1?false:true"
157
+              />
158
+            </div>
159
+          </div>
121 160
 
122
-              <div class="line"></div>
123
-              <div class="item">
124
-                <label class="name" for="zhy">置换量(L)</label>
125
-                <div class="content">
126
-                  <input type="tel" @focus="inputFocus" id="zhy" v-model="dialysisSolution.replacement_total"/>
127
-                </div>
128
-              </div>
161
+          <div class="item" v-if="anticoagulant.gaijiliang != -1">
162
+            <label class="name" for="gjl">钙剂量</label>
163
+            <div class="content">
164
+              <input
165
+                type="text"
166
+                id="gjl"
167
+                class="inputBox"
168
+                v-model="dialysisSolution.anticoagulant_gaimingcheng"
169
+                :disabled="anticoagulant.gaimingcheng==1?false:true"
170
+              />
171
+            </div>
172
+          </div>
129 173
 
130
-              <div class="item">
131
-                <label class="name" for="j">钾(mmol/L)</label>
132
-                <div class="content">
133
-                  <input type="tel" @focus="inputFocus" id="j" v-model="dialysisSolution.kalium"/>
134
-                </div>
135
-              </div>
136
-              <div class="item">
137
-                <label class="name" for="n">钠(mmol/L):</label>
138
-                <div class="content">
139
-                  <input type="tel" @focus="inputFocus" id="n" v-model="dialysisSolution.sodium"/>
140
-                </div>
141
-              </div>
142
-              <div class="item">
143
-                <label class="name" for="gg">钙(mmol/L)</label>
144
-                <div class="content">
145
-                  <input type="tel" @focus="inputFocus" id="gg" v-model="dialysisSolution.calcium"/>
146
-                </div>
147
-              </div>
148
-              <div class="item">
149
-                <label class="name" for="tsqy">碳酸氢盐(mmol/L)</label>
150
-                <div class="content">
151
-                  <input type="tel" @focus="inputFocus" id="tsqy" v-model="dialysisSolution.bicarbonate"/>
174
+          <div class="line"></div>
175
+          <div class="item">
176
+            <label class="name" for="zhy">置换量(L)</label>
177
+            <div class="content">
178
+              <input
179
+                type="tel"
180
+                @focus="inputFocus"
181
+                id="zhy"
182
+                v-model="dialysisSolution.replacement_total"
183
+              />
184
+            </div>
185
+          </div>
152 186
 
153
-                </div>
154
-              </div>
155
-              <div class="item">
156
-                <label class="name" for="ptt">葡萄糖(mmol/L)</label>
157
-                <div class="content">
158
-                  <input type="tel" @focus="inputFocus" id="ptt" v-model="dialysisSolution.glucose"/>
159
-                </div>
160
-              </div>
187
+          <div class="item">
188
+            <label class="name" for="j">钾(mmol/L)</label>
189
+            <div class="content">
190
+              <input type="tel" @focus="inputFocus" id="j" v-model="dialysisSolution.kalium" />
191
+            </div>
192
+          </div>
193
+          <div class="item">
194
+            <label class="name" for="n">钠(mmol/L):</label>
195
+            <div class="content">
196
+              <input type="tel" @focus="inputFocus" id="n" v-model="dialysisSolution.sodium" />
197
+            </div>
198
+          </div>
199
+          <div class="item">
200
+            <label class="name" for="gg">钙(mmol/L)</label>
201
+            <div class="content">
202
+              <input type="tel" @focus="inputFocus" id="gg" v-model="dialysisSolution.calcium" />
203
+            </div>
204
+          </div>
205
+          <div class="item">
206
+            <label class="name" for="tsqy">碳酸氢盐(mmol/L)</label>
207
+            <div class="content">
208
+              <input
209
+                type="tel"
210
+                @focus="inputFocus"
211
+                id="tsqy"
212
+                v-model="dialysisSolution.bicarbonate"
213
+              />
214
+            </div>
215
+          </div>
216
+          <div class="item">
217
+            <label class="name" for="ptt">葡萄糖(mmol/L)</label>
218
+            <div class="content">
219
+              <input type="tel" @focus="inputFocus" id="ptt" v-model="dialysisSolution.glucose" />
220
+            </div>
221
+          </div>
161 222
 
162
-              <div class="line"></div>
163
-              
164
-              <div class="item">
165
-                <label class="name" for="txyll">透析液流量(ml/min)</label>
166
-                <div class="content">
167
-                  <input type="tel" @focus="inputFocus" id="txyll" v-model="dialysisSolution.dialysate_flow"/>
168
-                </div>
169
-              </div>
170
-              <div class="item">
171
-                <label class="name" for="txywd">透析液温度(℃)</label>
172
-                <div class="content">
173
-                  <!--<span class="text">HD</span>-->
174
-                  <!--<span class="iconfont">&#xe6f9;</span>-->
175
-                  <input type="tel" @focus="inputFocus" id="txywd" v-model="dialysisSolution.dialysate_temperature"/>
176
-
177
-                </div>
178
-              </div>
179
-              <div class="item">
180
-                <label class="name" for="dtl">电导率(mS/cm)</label>
181
-                <div class="content">
182
-                  <!--<span class="text">HD</span>-->
183
-                  <!--<span class="iconfont">&#xe6f9;</span>-->
184
-                  <input type="tel" @focus="inputFocus" id="dtl" v-model="dialysisSolution.conductivity"/>
185
-                </div>
186
-              </div>
223
+          <div class="line"></div>
224
+
225
+          <div class="item">
226
+            <label class="name" for="txyll">透析液流量(ml/min)</label>
227
+            <div class="content">
228
+              <input
229
+                type="tel"
230
+                @focus="inputFocus"
231
+                id="txyll"
232
+                v-model="dialysisSolution.dialysate_flow"
233
+              />
234
+            </div>
235
+          </div>
236
+          <div class="item">
237
+            <label class="name" for="txywd">透析液温度(℃)</label>
238
+            <div class="content">
239
+              <!--<span class="text">HD</span>-->
240
+              <!--<span class="iconfont">&#xe6f9;</span>-->
241
+              <input
242
+                type="tel"
243
+                @focus="inputFocus"
244
+                id="txywd"
245
+                v-model="dialysisSolution.dialysate_temperature"
246
+              />
247
+            </div>
248
+          </div>
249
+          <div class="item">
250
+            <label class="name" for="dtl">电导率(mS/cm)</label>
251
+            <div class="content">
252
+              <!--<span class="text">HD</span>-->
253
+              <!--<span class="iconfont">&#xe6f9;</span>-->
254
+              <input
255
+                type="tel"
256
+                @focus="inputFocus"
257
+                id="dtl"
258
+                v-model="dialysisSolution.conductivity"
259
+              />
260
+            </div>
261
+          </div>
187 262
 
188
-              <div class="line"></div>
189
-              <div>
190
-                <div class="item">
191
-                  <label class="name" for="bz">备注</label>
192
-                  <div class="content">
193
-                    <span class="text"></span>
194
-                  </div>
195
-                </div>
196
-                <textarea class="textarea" id="bz" placeholder="请输入内容" v-model="dialysisSolution.remark" @focus="lastInputFocus" @blur="lastInputBlur"></textarea>
263
+          <div class="line"></div>
264
+          <div>
265
+            <div class="item">
266
+              <label class="name" for="bz">备注</label>
267
+              <div class="content">
268
+                <span class="text"></span>
197 269
               </div>
198
-              
199
-              <!--<div class="footer">-->
200
-              <!--处方医生:刘小军 医生-->
201
-              <!--</div>-->
202
-              
203 270
             </div>
271
+            <textarea
272
+              class="textarea"
273
+              id="bz"
274
+              placeholder="请输入内容"
275
+              v-model="dialysisSolution.remark"
276
+              @focus="lastInputFocus"
277
+              @blur="lastInputBlur"
278
+            ></textarea>
204 279
           </div>
205 280
 
206
-
207
-          <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"
208
-                          :propsForm="propForm"></check-box-sub-menu>
209
-                          
210
-          <mt-datetime-picker
211
-            ref="picker"
212
-            type="time"
213
-            hourFormat="{value}小时"
214
-            minuteFormat="{value}分钟"
215
-            @confirm="handleTimeConfirm"
216
-            v-model="time">
217
-          </mt-datetime-picker>
218
-        </van-popup>
219
-    </div>
281
+          <!--<div class="footer">-->
282
+          <!--处方医生:刘小军 医生-->
283
+          <!--</div>-->
284
+        </div>
285
+      </div>
286
+
287
+      <check-box-sub-menu
288
+        :visibility="visibility"
289
+        v-on:menu-cancle="menuCancle"
290
+        v-on:menu-comfirm="menuComfirm"
291
+        :propsForm="propForm"
292
+      ></check-box-sub-menu>
293
+
294
+      <mt-datetime-picker
295
+        ref="picker"
296
+        type="time"
297
+        hourFormat="{value}小时"
298
+        minuteFormat="{value}分钟"
299
+        @confirm="handleTimeConfirm"
300
+        v-model="time"
301
+      ></mt-datetime-picker>
302
+    </van-popup>
303
+  </div>
220 304
 </template>
221 305
 
222 306
 <script>
223
-
224
-import {GetPatientDialysisSolutionList,EditDialysisSolution} from "@/api/patient";
225
-import {parseTime} from "@/utils";
226
-import {fetchAllAdminUsers} from "@/api/doctor";
227
-import {getDataConfig} from '@/utils/data';
307
+import {
308
+  GetPatientDialysisSolutionList,
309
+  EditDialysisSolution
310
+} from "@/api/patient";
311
+import { parseTime } from "@/utils";
312
+import { fetchAllAdminUsers } from "@/api/doctor";
313
+import { getDataConfig } from "@/utils/data";
228 314
 import CheckBoxSubMenu from "../dialog/subMenu/checkBoxSubMenu";
229
-import { Toast } from 'vant';
315
+import { Toast } from "vant";
230 316
 
231 317
 let allno = 1;
232 318
 
@@ -234,24 +320,24 @@ export default {
234 320
   name: "LongTable",
235 321
   data() {
236 322
     return {
237
-      visibility:false,
323
+      visibility: false,
238 324
       loading: false,
239 325
       finished: false,
240
-      
326
+
241 327
       queryParams: {
242 328
         page: 0,
243 329
         id: 0,
244
-        limit: 10,
330
+        limit: 10
245 331
       },
246 332
 
247 333
       tableDate: [],
248
-      adminUserOptions:{},
334
+      adminUserOptions: {},
249 335
       currentIndex: -1,
250
-      showObj:{
251
-        showPopup:false,
252
-        showForm:true,
336
+      showObj: {
337
+        showPopup: false,
338
+        showForm: true
253 339
       },
254
-      dialysisSolution:{
340
+      dialysisSolution: {
255 341
         id: 0,
256 342
         mode: "",
257 343
         mode_id: "",
@@ -274,9 +360,9 @@ export default {
274 360
         anticoagulant_zongliang: "",
275 361
         anticoagulant_gaimingcheng: "",
276 362
         anticoagulant_gaijiliang: "",
277
-        target_ultrafiltration:'',
278
-        dialysate_formulation:'',
279
-        replacement_total:'',
363
+        target_ultrafiltration: "",
364
+        dialysate_formulation: "",
365
+        replacement_total: "",
280 366
         kalium: "",
281 367
         sodium: "",
282 368
         calcium: "",
@@ -289,7 +375,7 @@ export default {
289 375
         doctor: "",
290 376
         remark: ""
291 377
       },
292
-      anticoagulant:{
378
+      anticoagulant: {
293 379
         id: 0,
294 380
         name: "",
295 381
         type: 1,
@@ -316,60 +402,72 @@ export default {
316 402
       modeOption: [],
317 403
       dialysateFormulationOptions: [],
318 404
       anticoagulantsConfit: {},
319
-      timeValue: '',
320
-      time: '03:00',
321
-      record_date:'',
405
+      timeValue: "",
406
+      time: "03:00",
407
+      record_date: ""
322 408
     };
323 409
   },
324
-  methods:{
325
-    commitInfo: function () {
326
-      Toast.loading({forbidClick: true, duration: 0})
410
+  methods: {
411
+    commitInfo: function() {
412
+      Toast.loading({ forbidClick: true, duration: 0 });
327 413
       this.dialysisSolution.mode = this.dialysisSolution.mode_id;
328
-      EditDialysisSolution(this.dialysisSolution.id, this.dialysisSolution).then(response => {
414
+      EditDialysisSolution(
415
+        this.dialysisSolution.id,
416
+        this.dialysisSolution
417
+      ).then(response => {
329 418
         if (response.data.state == 0) {
330 419
           Toast.fail(response.data.msg);
331 420
           return false;
332 421
         } else {
333 422
           Toast.success("修改成功");
334 423
           for (const key in response.data.data.solution) {
335
-            this.tableDate[this.currentIndex][key] = response.data.data.solution[key];
424
+            this.tableDate[this.currentIndex][key] =
425
+              response.data.data.solution[key];
336 426
           }
337 427
           this.popupDidHide();
338
-
339 428
         }
340 429
       });
341 430
     },
342
-    openEdit(index, item){
343
-        this.currentIndex = index;
344
-        for(var key in item) {
345
-          this.dialysisSolution[key] = item[key];
346
-        }
347
-        
348
-      this.timeValue = this.dialysisSolution.dialysis_duration_hour + "小时" + this.dialysisSolution.dialysis_duration_minute + "分钟";
431
+    openEdit(index, item) {
432
+      this.currentIndex = index;
433
+      for (var key in item) {
434
+        this.dialysisSolution[key] = item[key];
435
+      }
349 436
 
350
-      this.time = (this.dialysisSolution.dialysis_duration_hour>=10?this.dialysisSolution.dialysis_duration_hour:'0'+this.dialysisSolution.dialysis_duration_hour) + ":" + (this.dialysisSolution.dialysis_duration_minute>=10?this.dialysisSolution.dialysis_duration_minute:'0'+this.dialysisSolution.dialysis_duration_minute);
437
+      this.timeValue =
438
+        this.dialysisSolution.dialysis_duration_hour +
439
+        "小时" +
440
+        this.dialysisSolution.dialysis_duration_minute +
441
+        "分钟";
442
+
443
+      this.time =
444
+        (this.dialysisSolution.dialysis_duration_hour >= 10
445
+          ? this.dialysisSolution.dialysis_duration_hour
446
+          : "0" + this.dialysisSolution.dialysis_duration_hour) +
447
+        ":" +
448
+        (this.dialysisSolution.dialysis_duration_minute >= 10
449
+          ? this.dialysisSolution.dialysis_duration_minute
450
+          : "0" + this.dialysisSolution.dialysis_duration_minute);
351 451
 
352 452
       this.showObj.showPopup = true;
353 453
 
354 454
       // document.getElementById('dialogTop').scrollTop = 200;
355
-      var dialogTop = document.querySelector('#dialogTop');
455
+      var dialogTop = document.querySelector("#dialogTop");
356 456
       if (dialogTop != null) {
357 457
         this.$nextTick(() => {
358
-            dialogTop.scrollTop = 0;
458
+          dialogTop.scrollTop = 0;
359 459
         });
360 460
       }
361
-      
362
-        
363 461
     },
364
-    popupDidHide(){
462
+    popupDidHide() {
365 463
       this.showObj.showPopup = false;
366 464
       this.visibility = false;
367 465
       this.showObj.showForm = true;
368 466
     },
369
-    openPicker: function () {
467
+    openPicker: function() {
370 468
       this.$refs.picker.open();
371 469
     },
372
-    showSubMenu: function (val) {
470
+    showSubMenu: function(val) {
373 471
       switch (val) {
374 472
         case "mode":
375 473
           this.propForm.type = 1;
@@ -380,7 +478,7 @@ export default {
380 478
           this.propForm.optionList = this.modeOption;
381 479
           this.propForm.isMultiple = 1;
382 480
           this.propForm.selectId = this.dialysisSolution.mode_id;
383
-          this.propForm.click_ref = "mode"
481
+          this.propForm.click_ref = "mode";
384 482
 
385 483
           break;
386 484
 
@@ -393,7 +491,7 @@ export default {
393 491
           this.propForm.optionList = this.anticoagulantsConfit;
394 492
           this.propForm.isMultiple = 1;
395 493
           this.propForm.selectId = this.dialysisSolution.anticoagulant;
396
-          this.propForm.click_ref = "anticoagulant"
494
+          this.propForm.click_ref = "anticoagulant";
397 495
           break;
398 496
         case "dialysate_formulation":
399 497
           this.propForm.type = 6;
@@ -404,37 +502,48 @@ export default {
404 502
           this.propForm.optionList = this.dialysateFormulationOptions;
405 503
           this.propForm.isMultiple = 1;
406 504
           this.propForm.selectId = this.dialysisSolution.dialysate_formulation;
407
-          this.propForm.click_ref = "dialysate_formulation"
505
+          this.propForm.click_ref = "dialysate_formulation";
408 506
           break;
409 507
       }
410 508
     },
411
-    menuCancle: function () {
509
+    menuCancle: function() {
412 510
       this.visibility = false;
413 511
       this.showObj.showForm = true;
414
-      this.$nextTick( () => {
415
-        if (this.$refs[this.propForm.click_ref] != undefined && this.$refs[this.propForm.click_ref] != null) {
416
-          this.$refs[this.propForm.click_ref].scrollIntoView()
512
+      this.$nextTick(() => {
513
+        if (
514
+          this.$refs[this.propForm.click_ref] != undefined &&
515
+          this.$refs[this.propForm.click_ref] != null
516
+        ) {
517
+          this.$refs[this.propForm.click_ref].scrollIntoView();
417 518
         }
418
-      })
519
+      });
419 520
     },
420
-    menuComfirm: function (val) {
521
+    menuComfirm: function(val) {
421 522
       this.visibility = false;
422 523
       this.showObj.showForm = true;
423
-      this.$nextTick( () => {
424
-        if (this.$refs[this.propForm.click_ref] != undefined && this.$refs[this.propForm.click_ref] != null) {
425
-          this.$refs[this.propForm.click_ref].scrollIntoView()
524
+      this.$nextTick(() => {
525
+        if (
526
+          this.$refs[this.propForm.click_ref] != undefined &&
527
+          this.$refs[this.propForm.click_ref] != null
528
+        ) {
529
+          this.$refs[this.propForm.click_ref].scrollIntoView();
426 530
         }
427
-      })
531
+      });
428 532
       switch (val.type) {
429 533
         case 1:
430 534
           this.dialysisSolution.mode_id = val.selectId;
431
-          this.dialysisSolution.mode_name = this.GetModeByModeId(this.dialysisSolution.mode_id);
535
+          this.dialysisSolution.mode_name = this.GetModeByModeId(
536
+            this.dialysisSolution.mode_id
537
+          );
432 538
           break;
433
-       
539
+
434 540
         case 5:
435 541
           this.dialysisSolution.anticoagulant = val.selectId;
436 542
 
437
-          if (typeof this.anticoagulantsConfit[val.selectId] == "undefined" || this.anticoagulantsConfit[val.selectId] == null) {
543
+          if (
544
+            typeof this.anticoagulantsConfit[val.selectId] == "undefined" ||
545
+            this.anticoagulantsConfit[val.selectId] == null
546
+          ) {
438 547
             return;
439 548
           }
440 549
           this.anticoagulant = this.anticoagulantsConfit[val.selectId];
@@ -447,26 +556,36 @@ export default {
447 556
           break;
448 557
       }
449 558
     },
450
-    handleTimeConfirm: function (val) {
451
-      val = val.replace("小时")
452
-      val = val.replace("分钟")
453
-      let timeArray = val.split(":")
559
+    handleTimeConfirm: function(val) {
560
+      val = val.replace("小时");
561
+      val = val.replace("分钟");
562
+      let timeArray = val.split(":");
454 563
       if (parseInt(timeArray[0].substring(0, 1)) == 0) {
455
-        this.dialysisSolution.dialysis_duration_hour = timeArray[0].charAt(timeArray[0].length - 1)
564
+        this.dialysisSolution.dialysis_duration_hour = timeArray[0].charAt(
565
+          timeArray[0].length - 1
566
+        );
456 567
       } else {
457
-        this.dialysisSolution.dialysis_duration_hour = timeArray[0]
568
+        this.dialysisSolution.dialysis_duration_hour = timeArray[0];
458 569
       }
459 570
 
460 571
       if (parseInt(timeArray[1].substring(0, 1)) == 0) {
461
-        this.dialysisSolution.dialysis_duration_minute = timeArray[1].charAt(timeArray[1].length - 1)
572
+        this.dialysisSolution.dialysis_duration_minute = timeArray[1].charAt(
573
+          timeArray[1].length - 1
574
+        );
462 575
       } else {
463
-        this.dialysisSolution.dialysis_duration_minute = timeArray[1]
576
+        this.dialysisSolution.dialysis_duration_minute = timeArray[1];
464 577
       }
465
-      this.timeValue = this.dialysisSolution.dialysis_duration_hour + "小时" + this.dialysisSolution.dialysis_duration_minute + "分钟"
466
-      this.dialysisSolution.dialysis_duration = this.dialysisSolution.dialysis_duration_hour + "." + this.dialysisSolution.dialysis_duration_minute
467
-
578
+      this.timeValue =
579
+        this.dialysisSolution.dialysis_duration_hour +
580
+        "小时" +
581
+        this.dialysisSolution.dialysis_duration_minute +
582
+        "分钟";
583
+      this.dialysisSolution.dialysis_duration =
584
+        this.dialysisSolution.dialysis_duration_hour +
585
+        "." +
586
+        this.dialysisSolution.dialysis_duration_minute;
468 587
     },
469
-    GetModeByModeId: function (val) {
588
+    GetModeByModeId: function(val) {
470 589
       let treatment_mode_name = "";
471 590
       let treatment_mode = this.modeOption;
472 591
       for (let keys in treatment_mode) {
@@ -478,46 +597,46 @@ export default {
478 597
       return treatment_mode_name;
479 598
     },
480 599
     inputFocus: function(event) {
481
-      var input = event.target
482
-      setTimeout(function () {
483
-        input.scrollIntoView()
600
+      var input = event.target;
601
+      setTimeout(function() {
602
+        input.scrollIntoView();
484 603
       }, 0);
485 604
 
486 605
       if (input.setSelectionRange) {
487
-        setTimeout(function () {
606
+        setTimeout(function() {
488 607
           input.setSelectionRange(0, input.value.length);
489 608
         }, 0);
490 609
       } else if (input.createTextRange) {
491
-          var rng = input.createTextRange();
492
-          rng.move('character', input.value.length);
493
-          rng.select();
610
+        var rng = input.createTextRange();
611
+        rng.move("character", input.value.length);
612
+        rng.select();
494 613
       }
495 614
     },
496 615
     lastInputBlur: function(event) {
497
-      var input = event.target
498
-      setTimeout(function () {
499
-        input.style.marginBottom = ""
616
+      var input = event.target;
617
+      setTimeout(function() {
618
+        input.style.marginBottom = "";
500 619
       }, 0);
501 620
     },
502 621
     lastInputFocus: function(event) {
503
-      var input = event.target
504
-      setTimeout(function () {
505
-        input.style.marginBottom = "2rem"
506
-        input.parentNode.scrollIntoView()
622
+      var input = event.target;
623
+      setTimeout(function() {
624
+        input.style.marginBottom = "2rem";
625
+        input.parentNode.scrollIntoView();
507 626
       }, 0);
508 627
     },
509
-    GetDialysateFormulationById: function (val) {
628
+    GetDialysateFormulationById: function(val) {
510 629
       let name = "";
511 630
       let dfl = this.dialysateFormulationOptions.length;
512 631
       for (let index = 0; index < dfl; index++) {
513
-        if(this.dialysateFormulationOptions[index].id == val) {
632
+        if (this.dialysateFormulationOptions[index].id == val) {
514 633
           name = this.dialysateFormulationOptions[index].name;
515 634
           break;
516 635
         }
517 636
       }
518 637
       return name;
519 638
     },
520
-    GetAnticoagulantById: function (val) {
639
+    GetAnticoagulantById: function(val) {
521 640
       let anticoagulan_name = "";
522 641
       let anticoagulant = this.anticoagulantsConfit;
523 642
       for (let keys in anticoagulant) {
@@ -527,11 +646,11 @@ export default {
527 646
       }
528 647
       return anticoagulan_name;
529 648
     },
530
-    tranDoctor(id){
649
+    tranDoctor(id) {
531 650
       if (id in this.adminUserOptions) {
532 651
         return this.adminUserOptions[id].name;
533
-      }else {
534
-        return '未知';
652
+      } else {
653
+        return "未知";
535 654
       }
536 655
     },
537 656
     fetchAllAdminUsers() {
@@ -539,60 +658,65 @@ export default {
539 658
         if (response.data.state == 1) {
540 659
           var ul = response.data.data.users.length;
541 660
           for (let index = 0; index < ul; index++) {
542
-            this.adminUserOptions[response.data.data.users[index].id] = response.data.data.users[index];
661
+            this.adminUserOptions[response.data.data.users[index].id] =
662
+              response.data.data.users[index];
543 663
           }
544 664
         }
545 665
       });
546 666
     },
547 667
     onLoad() {
548 668
       // 异步更新数据
549
-      this.queryParams.page ++ ;
550
-        GetPatientDialysisSolutionList(this.queryParams).then(response=>{
551
-          if(response.data.state == 1) {
552
-            var sl = response.data.data.solutions.length;
553
-            if (sl == 0) {
554
-              this.finished = true;
555
-            }else {
556
-
557
-              for (let index = 0; index < sl; index++) {
558
-                var solution = response.data.data.solutions[index];
559
-                solution.no = allno;
560
-                solution.edate = parseTime(solution.updated_time, "{y}-{m}-{d} {h}:{i}")
561
-                allno ++;
562
-                this.tableDate.push(solution);
563
-              }
669
+      this.queryParams.page++;
670
+      GetPatientDialysisSolutionList(this.queryParams).then(response => {
671
+        if (response.data.state == 1) {
672
+          var sl = response.data.data.solutions.length;
673
+          if (sl == 0) {
674
+            this.finished = true;
675
+          } else {
676
+            for (let index = 0; index < sl; index++) {
677
+              var solution = response.data.data.solutions[index];
678
+              solution.no = allno;
679
+              solution.edate = parseTime(
680
+                solution.updated_time,
681
+                "{y}-{m}-{d} {h}:{i}"
682
+              );
683
+              allno++;
684
+              this.tableDate.push(solution);
564 685
             }
565
-            this.loading = false;
566 686
           }
567
-        });
568
-        
569
-    },
687
+          this.loading = false;
688
+        }
689
+      });
690
+    }
570 691
   },
571
-  created(){
692
+  created() {
572 693
     allno = 1;
573 694
     this.fetchAllAdminUsers();
574 695
     this.queryParams.id = this.$route.query.patient_id;
575 696
     this.onLoad();
576
-    
697
+
577 698
     this.modeOption = this.$store.getters.treatment_mode;
578
-    this.dialysateFormulationOptions = getDataConfig('hemodialysis','dialysate_formulation');
699
+    this.dialysateFormulationOptions = getDataConfig(
700
+      "hemodialysis",
701
+      "dialysate_formulation"
702
+    );
579 703
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
580 704
 
581 705
     var date = this.$route.query && this.$route.query.date;
582
-      date *= 1000;
583
-      var newDate = new Date(date);
584
-
585
-      var y = newDate.getFullYear();
586
-      var m = newDate.getMonth() + 1;
587
-      var d = newDate.getDate();
588
-      if (isNaN(y) || isNaN(m) || isNaN(d)) {
589
-        newDate = new Date();
590
-        y = newDate.getFullYear();
591
-        m = newDate.getMonth() + 1;
592
-        d = newDate.getDate();
593
-      }
594
-      this.record_date =
595
-        y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
706
+    date *= 1000;
707
+    var newDate = new Date(date);
708
+
709
+    var y = newDate.getFullYear();
710
+    var m = newDate.getMonth() + 1;
711
+    var d = newDate.getDate();
712
+    if (isNaN(y) || isNaN(m) || isNaN(d)) {
713
+      newDate = new Date();
714
+      y = newDate.getFullYear();
715
+      m = newDate.getMonth() + 1;
716
+      d = newDate.getDate();
717
+    }
718
+    this.record_date =
719
+      y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
596 720
   },
597 721
   components: {
598 722
     CheckBoxSubMenu

+ 1 - 1
src/pages/main/dialysis/MissionTable.vue View File

@@ -220,7 +220,7 @@ export default {
220 220
       @include text-align;
221 221
       @include justify-content-between;
222 222
       padding: 0.3rem 0;
223
-
223
+      margin: 0 auto;
224 224
       .iconfont {
225 225
         margin: 0 0.1rem;
226 226
         @media only screen and (max-width: 812px) {

+ 10 - 11
src/pages/main/records/CaseHistory.vue View File

@@ -10,7 +10,6 @@
10 10
         >{{ item }}</li>
11 11
       </ul>
12 12
     </div>
13
-
14 13
     <div class="tab-content">
15 14
       <records-tab v-show="index == 0"></records-tab>
16 15
       <check-tab v-show="index == 1" ref="item"></check-tab>
@@ -80,18 +79,18 @@ export default {
80 79
   @media only screen and (max-width: 812px) {
81 80
     top: 45px !important;
82 81
   }
83
-  @media only screen and (min-width: 376px) and (max-width: 668px) {
84
-    top: 50px !important;
85
-  }
86
-  @media only screen and (min-width: 415px) and (max-width: 736px) {
87
-    top: 50px !important;
88
-  }
89
-  @media only screen and (min-width: 768px) and (max-width: 1024px) {
82
+  // @media only screen and (min-width: 376px) and (max-width: 668px) {
83
+  //   top: 50px !important;
84
+  // }
85
+  // @media only screen and (min-width: 415px) and (max-width: 736px) {
86
+  //   top: 50px !important;
87
+  // }
88
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
90 89
     top: 67px;
91 90
   }
92
-  @media only screen and (min-width: 737px) and (max-width: 768px) {
93
-    padding-top: 20px;
94
-  }
91
+  // @media only screen and (min-width: 737px) and (max-width: 768px) {
92
+  //   padding-top: 20px;
93
+  // }
95 94
   ul {
96 95
     width: 60%;
97 96
     margin: 0 auto;

+ 3 - 0
src/pages/main/today/TodayTab.vue View File

@@ -1600,4 +1600,7 @@ export default {
1600 1600
   top: -8px;
1601 1601
   right: -8px;
1602 1602
 }
1603
+.goTop {
1604
+  z-index: 999;
1605
+}
1603 1606
 </style>

+ 25 - 12
src/pages/main/today/detailsInfo.vue View File

@@ -8,12 +8,20 @@
8 8
 
9 9
     <div class="ui-step clearfix">
10 10
       <ul class="ui-step-ul">
11
-        <li v-for="(item, index) in step_data" :key="index" class="ui-step-done">
11
+        <li
12
+          v-for="(item, index) in step_data"
13
+          :key="index"
14
+          class="ui-step-done"
15
+        >
12 16
           <div
13 17
             class="ui-step-number"
14
-            :style="item.value==1?'':'background:#fff;border: 1px $main-color solid;'"
18
+            :style="
19
+              item.value == 1
20
+                ? ''
21
+                : 'background:#fff;border: 1px $main-color solid;'
22
+            "
15 23
           >
16
-            <i :style="item.value==1?'':'border:0;'" />
24
+            <i :style="item.value == 1 ? '' : 'border:0;'" />
17 25
           </div>
18 26
           <div class="ui-step-title">{{ item.title }}</div>
19 27
         </li>
@@ -23,35 +31,35 @@
23 31
     <ul class="clearfix newWidth">
24 32
       <li>
25 33
         <label>姓名 :</label>
26
-        <span>{{patient.name}}</span>
34
+        <span>{{ patient.name }}</span>
27 35
       </li>
28 36
       <li>
29 37
         <label>性别 :</label>
30
-        <span>{{patient.gender == 1 ? "男" : "女"}}</span>
38
+        <span>{{ patient.gender == 1 ? "男" : "女" }}</span>
31 39
       </li>
32 40
       <li>
33 41
         <label>年龄 :</label>
34
-        <span>{{age}}</span>
42
+        <span>{{ age }}</span>
35 43
       </li>
36 44
       <li>
37 45
         <label>透析号 :</label>
38
-        <span>{{patient.dialysis_no}}</span>
46
+        <span>{{ patient.dialysis_no }}</span>
39 47
       </li>
40 48
       <li>
41 49
         <label>床位号 :</label>
42
-        <span>{{device_number}}</span>
50
+        <span>{{ device_number }}</span>
43 51
       </li>
44 52
       <li>
45 53
         <label>来源 :</label>
46
-        <span>{{source}}</span>
54
+        <span>{{ source }}</span>
47 55
       </li>
48 56
       <li>
49 57
         <label>住院号 :</label>
50
-        <span>{{patient.admission_number}}</span>
58
+        <span>{{ patient.admission_number }}</span>
51 59
       </li>
52 60
       <li>
53 61
         <label>透析日期 :</label>
54
-        <span>{{dialysis_date}}</span>
62
+        <span>{{ dialysis_date }}</span>
55 63
       </li>
56 64
     </ul>
57 65
   </div>
@@ -208,7 +216,9 @@ export default {
208 216
           color: #34495e;
209 217
           font-size: 0.34rem;
210 218
           font-weight: normal;
211
-          width: 1rem;
219
+          @media only screen and (max-width: 415px) {
220
+            width: 1rem;
221
+          }
212 222
         }
213 223
         .ui-step-number {
214 224
           position: relative;
@@ -252,6 +262,9 @@ export default {
252 262
     @media only screen and (min-width: 375px) {
253 263
       width: 33.3% !important;
254 264
     }
265
+    @media only screen and (max-width: 320px) {
266
+      width: 33.3% !important;
267
+    }
255 268
     @media only screen and (min-width: 667px) {
256 269
       width: 25% !important;
257 270
     }

+ 69 - 36
src/pages/monitoring/index.vue View File

@@ -24,7 +24,8 @@
24 24
               type="info"
25 25
               style="border: none;"
26 26
               @click="searchWithKeyword(1)"
27
-            >搜索</van-button>
27
+              >搜索</van-button
28
+            >
28 29
           </van-field>
29 30
         </div>
30 31
       </div>
@@ -33,8 +34,7 @@
33 34
         <ul>
34 35
           <el-popover v-model="visible" placement="bottom" trigger="click">
35 36
             <li slot="reference">
36
-              {{ partitionName(partition)
37
-              }}
37
+              {{ partitionName(partition) }}
38 38
               <span class="iconfont">&#xe74a;</span>
39 39
             </li>
40 40
             <div class="popover-demo-content">
@@ -44,20 +44,24 @@
44 44
                   :key="item.id"
45 45
                   @click="itemClick(item.id)"
46 46
                   :class="partition == item.id ? 'tick' : ''"
47
-                >{{ item.name }}</li>
47
+                >
48
+                  {{ item.name }}
49
+                </li>
48 50
               </ul>
49 51
             </div>
50 52
           </el-popover>
51 53
           <li @click="openPicker">
52
-            {{ parseTime(date.getTime() / 1000, "{y}-{m}-{d}")
53
-            }}
54
-            <span
55
-              class="iconfont"
56
-            >&#xe74a;</span>
54
+            {{ parseTime(date.getTime() / 1000, "{y}-{m}-{d}") }}
55
+            <span class="iconfont">&#xe74a;</span>
57 56
           </li>
58 57
         </ul>
59 58
       </div>
60
-      <van-list v-model="loading" :finished="finished" finished-text="  " @load="onLoad">
59
+      <van-list
60
+        v-model="loading"
61
+        :finished="finished"
62
+        finished-text="  "
63
+        @load="onLoad"
64
+      >
61 65
         <div class="blueBorder"></div>
62 66
         <table class="table">
63 67
           <tr>
@@ -72,7 +76,11 @@
72 76
           </tr>
73 77
         </table>
74 78
 
75
-        <table class="table" v-for="(items, index) in dialysis_scheduals" :key="index">
79
+        <table
80
+          class="table"
81
+          v-for="(items, index) in dialysis_scheduals"
82
+          :key="index"
83
+        >
76 84
           <tr v-if="items.zone_name.length > 0">
77 85
             <td width="8%">{{ items.zone_name }}</td>
78 86
             <td width="8%"></td>
@@ -83,50 +91,75 @@
83 91
             <td width="14%"></td>
84 92
             <td width="27%"></td>
85 93
           </tr>
86
-          <tr v-for="(item, index) in items.scheduals" :key="index" @click="clickfunction(item)">
94
+          <tr
95
+            v-for="(item, index) in items.scheduals"
96
+            :key="index"
97
+            @click="clickfunction(item)"
98
+          >
87 99
             <td width="10%" style="color:#409eff;">{{ item.patient.name }}</td>
88 100
             <td width="8%">
89 101
               {{
90
-              item.dialysis_order.device_number.number.length > 0
91
-              ? item.dialysis_order.device_number.number
92
-              : item.device_number.number
102
+                item.dialysis_order.device_number.number.length > 0
103
+                  ? item.dialysis_order.device_number.number
104
+                  : item.device_number.number
93 105
               }}
94 106
             </td>
95 107
 
96 108
             <td width="9%">{{ item.patient.dialysis_no }}</td>
97
-            <td width="13%">{{ parseTime(item.schedule_date, "{y}-{m}-{d}") }}</td>
109
+            <td width="13%">
110
+              {{ parseTime(item.schedule_date, "{y}-{m}-{d}") }}
111
+            </td>
98 112
             <td width="10%">{{ item.treatment_mode.name }}</td>
99 113
             <td width="9%">
100 114
               {{
101
-              item.prescription.dewater_amount
102
-              ? item.prescription.dewater_amount
103
-              : ""
115
+                item.prescription.dewater_amount
116
+                  ? item.prescription.dewater_amount
117
+                  : ""
104 118
               }}
105 119
             </td>
106 120
             <td width="14%">
107 121
               {{
108
-              item.assessment_before_dislysis.weight_before
109
-              ? item.assessment_before_dislysis.weight_before
110
-              : ""
122
+                item.assessment_before_dislysis.weight_before
123
+                  ? item.assessment_before_dislysis.weight_before
124
+                  : ""
111 125
               }}/{{
112
-              item.assessment_after_dislysis.weight_after
113
-              ? item.assessment_after_dislysis.weight_after
114
-              : ""
126
+                item.assessment_after_dislysis.weight_after
127
+                  ? item.assessment_after_dislysis.weight_after
128
+                  : ""
115 129
               }}
116 130
             </td>
117 131
             <td width="27%">
118
-              <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 1">低压</span>
119
-              <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 2">正常</span>
120
-              <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 3">高压</span>
121
-              <span v-if="monitorRateStatus(item.monitoring_record) == 1">心率过缓</span>
122
-              <span v-if="monitorRateStatus(item.monitoring_record) == 2">正常</span>
123
-              <span v-if="monitorRateStatus(item.monitoring_record) == 3">心率过高</span>
132
+              <span
133
+                v-if="monitorBloodPressureStatus(item.monitoring_record) == 1"
134
+                >低压</span
135
+              >
136
+              <span
137
+                v-if="monitorBloodPressureStatus(item.monitoring_record) == 2"
138
+                >正常</span
139
+              >
140
+              <span
141
+                v-if="monitorBloodPressureStatus(item.monitoring_record) == 3"
142
+                >高压</span
143
+              >
144
+              <span v-if="monitorRateStatus(item.monitoring_record) == 1"
145
+                >心率过缓</span
146
+              >
147
+              <span v-if="monitorRateStatus(item.monitoring_record) == 2"
148
+                >正常</span
149
+              >
150
+              <span v-if="monitorRateStatus(item.monitoring_record) == 3"
151
+                >心率过高</span
152
+              >
124 153
             </td>
125 154
           </tr>
126 155
         </table>
127 156
 
128 157
         <div class="NoData" v-show="dialysis_scheduals.length == 0">
129
-          <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt />
158
+          <img
159
+            style="margin-top: 50px; margin-bottom: 50px"
160
+            src="@/assets/login/data.jpg"
161
+            alt
162
+          />
130 163
         </div>
131 164
       </van-list>
132 165
     </div>
@@ -421,10 +454,10 @@ export default {
421 454
   left: 0;
422 455
   background: #fff;
423 456
   @media only screen and (max-width: 415px) {
424
-    top: 39px !important;
457
+    top: 38px !important;
425 458
   }
426
-  @media only screen and (min-width: 376px) and (max-width: 737px) {
427
-    top: 45px !important;
459
+  @media only screen and (min-width: 376px) and (max-width: 812px) {
460
+    top: 38px !important;
428 461
   }
429 462
   ul {
430 463
     @include display-flex;
@@ -465,7 +498,7 @@ export default {
465 498
   @media only screen and (min-width: 376px) and (max-width: 737px) {
466 499
     padding-top: 80px !important;
467 500
   }
468
-  @media only screen and (min-width: 768px) and (max-width: 1024px) {
501
+  @media only screen and (min-width: 813px) and (max-width: 1024px) {
469 502
     padding-top: 116px !important;
470 503
   }
471 504
 }

+ 6 - 6
src/styles/media.scss View File

@@ -1,13 +1,13 @@
1
-@media only screen and (max-width: 376px) {
1
+@media only screen and (max-width: 812px) {
2 2
   html {
3 3
     font-size: 30px;
4 4
   }
5 5
 }
6
-@media only screen and (min-width: 376px) and (max-width: 737px) {
7
-  html {
8
-    font-size: 36px;
9
-  }
10
-}
6
+// @media only screen and (min-width: 376px) and (max-width: 812px) {
7
+//   html {
8
+//     font-size: 36px;
9
+//   }
10
+// }
11 11
 
12 12
 /* Medium devices (landscape tablets, 768px and up) */
13 13
 // @media only screen and (min-width: 800px) {

+ 23 - 17
src/styles/style.scss View File

@@ -86,7 +86,7 @@ body {
86 86
         line-height: 0.62rem;
87 87
         float: left;
88 88
         width: 5.2rem;
89
-        @media only screen and (min-width: 376px) and (max-width: 415px) {
89
+        @media only screen and (min-width: 376px) and (max-width: 413px) {
90 90
           width: 4.2rem;
91 91
         }
92 92
         .content {
@@ -462,20 +462,20 @@ body {
462 462
       background: -webkit-linear-gradient(#dfe4ea, #ebf1f7);
463 463
     }
464 464
     .DialogContent {
465
-      height: 8.8rem;
465
+      height: 8.8rem !important;
466 466
       overflow-y: scroll;
467 467
       background: #fff;
468 468
       @media only screen and (max-width: 415px) {
469 469
         height: 14.8rem !important;
470 470
       }
471 471
       @media only screen and (min-width: 666px) and (max-width: 737px) {
472
-        height: 7.8rem;
472
+        height: 8.8rem !important;
473 473
       }
474 474
       @media only screen and (min-width: 737px) and (max-width: 768px) {
475
-        height: 14.8rem;
475
+        height: 14.8rem !important;
476 476
       }
477
-      @media only screen and (min-width: 769px) and (max-width: 1024px) {
478
-        height: 11.8rem;
477
+      @media only screen and (min-width: 813px) and (max-width: 1024px) {
478
+        height: 11.8rem !important;
479 479
       }
480 480
       .item {
481 481
         padding: 0 0.32rem;
@@ -743,7 +743,7 @@ body {
743 743
 // 搜索全局
744 744
 .search {
745 745
   color: #a8b3ba;
746
-  width: 4.2rem;
746
+  width: 6.2rem;
747 747
   float: right;
748 748
   font-size: 0.34rem;
749 749
   .field {
@@ -754,6 +754,9 @@ body {
754 754
   .iconfont {
755 755
     color: #a8b3ba;
756 756
     font-size: 0.42rem;
757
+    @media only screen and (max-width: 812px) {
758
+      font-size: 0.52rem;
759
+    }
757 760
   }
758 761
   .field {
759 762
     background-color: #ebf1f7;
@@ -769,16 +772,16 @@ body {
769 772
   }
770 773
 }
771 774
 
772
-.van-cell {
773
-  @media only screen and (max-width: 812px) {
774
-    font-size: 6px !important;
775
-  }
776
-}
775
+// .van-cell {
776
+//   @media only screen and (max-width: 812px) {
777
+//     font-size: 6px !important;
778
+//   }
779
+// }
777 780
 .van-field__left-icon {
778
-  @media only screen and (max-width: 812px) {
779
-    // margin-right: 0 !important;
780
-    margin-top: 1px;
781
-  }
781
+  // @media only screen and (max-width: 812px) {
782
+  //   // margin-right: 0 !important;
783
+  //   margin-top: -1px;
784
+  // }
782 785
   .van-icon-arrow-down {
783 786
     @media only screen and (max-width: 812px) {
784 787
       font-size: 12px !important;
@@ -867,8 +870,11 @@ body {
867 870
 //   background: #fff;
868 871
 // }
869 872
 .stateBox {
870
-  padding-top: 180px;
873
+  padding-top: 140px;
871 874
   background: #fff;
872 875
   min-height: calc(100vh - 2px);
873 876
   padding-left: 0.45rem;
874 877
 }
878
+#app {
879
+  -webkit-overflow-scrolling: touch;
880
+}