Explorar el Código

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

csx hace 5 años
padre
commit
30591e9e58

+ 105 - 22
src/pages/home/login.vue Ver fichero

@@ -10,21 +10,11 @@
10 10
             <ul>
11 11
               <li>
12 12
                 <span class="iconfont">&#xe78b;</span>
13
-                <input
14
-                  placeholder="请输入手机号"
15
-                  type="tel"
16
-                  class="tel"
17
-                  v-model="form.mobile"
18
-                />
13
+                <input placeholder="请输入手机号" type="tel" class="tel" v-model="form.mobile" />
19 14
               </li>
20 15
               <li>
21 16
                 <span class="iconfont">&#xe6c0;</span>
22
-                <input
23
-                  placeholder="请输入密码"
24
-                  type="password"
25
-                  class="tel"
26
-                  v-model="form.pwd"
27
-                />
17
+                <input placeholder="请输入密码" type="password" class="tel" v-model="form.pwd" />
28 18
               </li>
29 19
             </ul>
30 20
           </div>
@@ -39,15 +29,13 @@
39 29
             :disabled="loginDisable"
40 30
           >
41 31
             登录
42
-          </button> -->
32
+          </button>-->
43 33
           <button
44 34
             class="loginBtn"
45 35
             @click="submitForm"
46 36
             :class="loginDisable ? 'disableLoginBtn' : ''"
47 37
             :disabled="loginDisable"
48
-          >
49
-            登录
50
-          </button>
38
+          >登录</button>
51 39
 
52 40
           <!-- <router-link to="/forgetPassword"> -->
53 41
           <div class="newForget" style="display:none">忘记密码</div>
@@ -57,6 +45,17 @@
57 45
           <a href="">免密码登录</a>
58 46
           <a href="">忘记密码?</a>
59 47
           </div>-->
48
+          <div class="agree">
49
+            <el-checkbox v-model="agreement">
50
+              我已阅读并同意
51
+              <!-- <router-link to="/privacyPolicy"> -->
52
+
53
+              <!-- </router-link> -->
54
+            </el-checkbox>
55
+            <!-- <router-link to="/privacyPolicy"> -->
56
+            <span class="agreeText" @click="agree">《隐私服务协议》</span>
57
+            <!-- </router-link> -->
58
+          </div>
60 59
         </div>
61 60
       </div>
62 61
     </div>
@@ -77,7 +76,8 @@ export default {
77 76
         mobile: "",
78 77
         pwd: ""
79 78
       },
80
-      checked: false
79
+      checked: false,
80
+      agreement: true
81 81
     };
82 82
   },
83 83
   computed: {
@@ -215,6 +215,9 @@ export default {
215 215
     //清除cookie
216 216
     clearCookie: function() {
217 217
       this.setCookie("", "", -1); //修改2值都为空,天数为负1天就好了
218
+    },
219
+    agree() {
220
+      this.$router.push({ path: "/privacyPolicy" });
218 221
     }
219 222
   }
220 223
 };
@@ -223,7 +226,7 @@ export default {
223 226
 <style rel="stylesheet/scss" lang="scss" scoped>
224 227
 .container {
225 228
   // background: $white-bg;
226
-  background: #f5f5f5;
229
+  background: #fff;
227 230
   @include box-sizing;
228 231
   position: fixed;
229 232
   width: 100%;
@@ -232,11 +235,10 @@ export default {
232 235
   justify-content: space-between;
233 236
 
234 237
   .newLogin {
235
-    width: 90%;
236
-    height: 90%;
238
+    width: 100%;
239
+    height: 100%;
237 240
     margin: auto;
238
-    box-shadow: 0px 2px 25px 0px rgba(37, 143, 252, 0.1);
239
-    border-radius: 14px;
241
+    // box-shadow: 0px 2px 25px 0px rgba(37, 143, 252, 0.1);
240 242
     background: #fff;
241 243
   }
242 244
   .login {
@@ -336,5 +338,86 @@ export default {
336 338
   .remember {
337 339
     float: left;
338 340
   }
341
+  .agreeText {
342
+    color: #409eff;
343
+    font-size: 14px;
344
+  }
345
+}
346
+</style>
347
+
348
+<style lang="scss">
349
+.remember {
350
+  .el-checkbox__inner {
351
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
352
+      width: 20px;
353
+      height: 20px;
354
+    }
355
+    @media only screen and (min-width: 768px) {
356
+      width: 20px;
357
+      height: 20px;
358
+    }
359
+  }
360
+  .el-checkbox__inner::after {
361
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
362
+      left: 7px;
363
+      height: 12px;
364
+      width: 4px;
365
+    }
366
+
367
+    @media only screen and (min-width: 768px) {
368
+      left: 7px;
369
+      height: 12px;
370
+      width: 4px;
371
+    }
372
+  }
373
+  .el-checkbox__label {
374
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
375
+      font-size: 0.45rem;
376
+    }
377
+    @media only screen and (min-width: 768px) {
378
+      font-size: 0.45rem;
379
+    }
380
+  }
381
+}
382
+.agree {
383
+  .el-checkbox__inner {
384
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
385
+      width: 20px;
386
+      height: 20px;
387
+    }
388
+    @media only screen and (min-width: 768px) {
389
+      width: 20px;
390
+      height: 20px;
391
+    }
392
+  }
393
+  .el-checkbox__inner::after {
394
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
395
+      left: 7px;
396
+      height: 12px;
397
+      width: 4px;
398
+    }
399
+
400
+    @media only screen and (min-width: 768px) {
401
+      left: 7px;
402
+      height: 12px;
403
+      width: 4px;
404
+    }
405
+  }
406
+  .el-checkbox__label {
407
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
408
+      font-size: 0.45rem;
409
+    }
410
+    @media only screen and (min-width: 768px) {
411
+      font-size: 0.45rem;
412
+    }
413
+  }
414
+  .agreeText {
415
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
416
+      font-size: 0.45rem;
417
+    }
418
+    @media only screen and (min-width: 768px) {
419
+      font-size: 0.45rem;
420
+    }
421
+  }
339 422
 }
340 423
 </style>

+ 87 - 0
src/pages/home/privacyPolicy.vue Ver fichero

@@ -0,0 +1,87 @@
1
+<template>
2
+  <div class="page_privacy">
3
+    <h1 class="title">
4
+      <div class="GoBack" @click="$router.go(-1)">
5
+        <span class="iconfont">&#xe720;</span>返回
6
+      </div>
7
+      <span class="name">隐私声明</span>
8
+      <div class="GoBack"></div>
9
+    </h1>
10
+    <div class="boxList">
11
+      <div class="privacyTitle">声明</div>
12
+      <div class="privacyBox">
13
+        <p>本软件尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务,本软件会按照本隐私权政策的规定使用和披露您的个人信息。但本软件将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外,在未征得您事先许可的情况下,本软件不会将这些信息对外披露或向第三方提供。本软件会不时更新本隐私权政策。您在同意本软件服务使用协议之时,即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本软件服务使用协议不可分割的一部分。</p>
14
+        <br />
15
+        <p>1.适用范围</p>
16
+        <p>a)在您使用本软件网络服务,本软件自动接收并记录的您的手机上的信息,包括但不限于您的健康数据、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据;</p>
17
+        <br />
18
+        <p>2.信息的使用</p>
19
+        <p>a)在获得您的数据之后,本软件会将其上传至服务器,以生成您的排行榜数据,以便您能够更好地使用服务。</p>
20
+        <br />
21
+        <p>3.信息披露</p>
22
+        <p>a)本软件不会将您的信息披露给不受信任的第三方。</p>
23
+        <p>b)根据法律的有关规定,或者行政或司法机构的要求,向第三方或者行政、司法机构披露;</p>
24
+        <p>c)如您出现违反中国有关法律、法规或者相关规则的情况,需要向第三方披露;</p>
25
+        <br />
26
+        <p>4.信息存储和交换</p>
27
+        <p>本软件收集的有关您的信息和资料将保存在本软件及(或)其关联公司的服务器上,这些信息和资料可能传送至您所在国家、地区或本软件收集信息和资料所在地的境外并在境外被访问、存储和展示。</p>
28
+        <br />
29
+        <p>5.信息安全</p>
30
+        <p>a)在使用本软件网络服务进行网上交易时,您不可避免的要向交易对方或潜在的交易对方披露自己的个人信息,如联络方式或者邮政地址。请您妥善保护自己的个人信息,仅在必要的情形下向他人提供。如您发现自己的个人信息泄密,请您立即联络本软件客服,以便本软件采取相应措施。</p>
31
+      </div>
32
+    </div>
33
+  </div>
34
+</template>
35
+
36
+
37
+<style lang="scss" scoped>
38
+.page_privacy {
39
+  width: 100%;
40
+  margin: 0 auto;
41
+  height: 100%;
42
+  overflow-y: auto;
43
+  display: flex;
44
+  flex-direction: column;
45
+  > div:last-child {
46
+    flex: 1;
47
+    overflow-y: auto;
48
+  }
49
+  .title {
50
+    font-size: 0.45rem;
51
+    padding: 0.3rem 0.37rem;
52
+    color: $title-color;
53
+    @include align-items-center;
54
+    @include display-flex;
55
+    @include justify-content-between;
56
+    @include text-align;
57
+    background: #fff;
58
+    .GoBack {
59
+      color: $main-color;
60
+      font-size: 0.45rem;
61
+      @include display-flex;
62
+      .iconfont {
63
+        color: $main-color;
64
+        font-size: 0.5rem;
65
+        margin-top: 1px;
66
+        @media only screen and (min-width: 768px) {
67
+          margin-top: 3px;
68
+        }
69
+      }
70
+    }
71
+  }
72
+  .name {
73
+    margin-right: 1.3rem;
74
+    font-size: 0.5rem;
75
+  }
76
+  .privacyTitle {
77
+    font-size: 0.6rem;
78
+    text-align: center;
79
+    margin-top: 0.4rem;
80
+  }
81
+  .privacyBox {
82
+    font-size: 0.45rem;
83
+    width: 90%;
84
+    margin: 0 auto;
85
+  }
86
+}
87
+</style>

+ 4 - 16
src/pages/main/DetailsPage.vue Ver fichero

@@ -17,9 +17,7 @@
17 17
               :key="i"
18 18
               :class="index == i ? 'active' : ''"
19 19
               @click="ClickTab(i)"
20
-            >
21
-              {{ item }}
22
-            </li>
20
+            >{{ item }}</li>
23 21
           </ul>
24 22
         </div>
25 23
 
@@ -30,24 +28,14 @@
30 28
                   <span class="iconfont">2018-01-01&#xe74a;</span>
31 29
         </div>-->
32 30
         <div class="print" style="float: right; display:none">
33
-          <el-button
34
-            size="mini"
35
-            type="primary"
36
-            @click="print"
37
-            icon="el-icon-printer"
38
-            >打印</el-button
39
-          >
31
+          <el-button size="mini" type="primary" @click="print" icon="el-icon-printer">打印</el-button>
40 32
         </div>
41 33
       </div>
42 34
 
43 35
       <div class="Tab">
44 36
         <CaseHistory v-show="index == 0" title="病历"></CaseHistory>
45 37
         <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
46
-        <dialysis-tab
47
-          v-show="index == 1"
48
-          title="透析"
49
-          v-on:records="jump(val)"
50
-        ></dialysis-tab>
38
+        <dialysis-tab v-show="index == 1" title="透析" v-on:records="jump(val)"></dialysis-tab>
51 39
         <today-tab ref="today" v-show="index == 2" title="今日"></today-tab>
52 40
       </div>
53 41
     </div>
@@ -192,7 +180,7 @@ export default {
192 180
         margin-right: 3.6rem;
193 181
       }
194 182
       @media only screen and (min-width: 415px) and (max-width: 767px) {
195
-        margin-right: 4rem;
183
+        margin-right: 3.6rem;
196 184
       }
197 185
       @media only screen and (min-width: 768px) {
198 186
         margin-right: 4rem;

+ 1 - 1
src/pages/main/DialysisArea.vue Ver fichero

@@ -346,7 +346,7 @@ export default {
346 346
   mounted() {
347 347
     this.timer = window.setInterval(() => {
348 348
       setTimeout(this.requestDialysisScheduals(), 0);
349
-    }, 30000);
349
+    }, 12000);
350 350
   },
351 351
   beforeDestroy() {
352 352
     clearInterval(this.timer);

+ 7 - 6
src/pages/main/PatientBox.vue Ver fichero

@@ -26,9 +26,7 @@
26 26
           <div class="right">
27 27
             <h3 class="name">
28 28
               {{ patient.patient.name }}
29
-              <span class="el-icon-bell yztx" v-if="getStatus(patient)"
30
-                >医嘱</span
31
-              >
29
+              <span class="yztx" v-if="getStatus(patient)">医嘱</span>
32 30
               <span class="yc" v-show="isAbnormal(patient)">异常</span>
33 31
             </h3>
34 32
             <span class="num"
@@ -39,7 +37,7 @@
39 37
         </div>
40 38
         <div
41 39
           class="online"
42
-          style="flex:1.3;"
40
+          style="flex:1.1;"
43 41
           v-show="computeState(patient) != 4"
44 42
         >
45 43
           <p :class="stateColor(patient)">{{ stateText(patient) }}</p>
@@ -344,7 +342,7 @@ export default {
344 342
         height: 1rem;
345 343
         border-radius: 50%;
346 344
         float: left;
347
-        margin: 0 0.3rem 0 0;
345
+        margin: 0 0.2rem 0 0;
348 346
       }
349 347
       .right {
350 348
         float: left;
@@ -357,6 +355,9 @@ export default {
357 355
           @media only screen and (max-width: 415px) {
358 356
             font-size: 0.45rem;
359 357
           }
358
+          @media only screen and (min-width: 416px) and (max-width: 767px) {
359
+            font-size: 0.4rem;
360
+          }
360 361
           .yc {
361 362
             background: #ff7979;
362 363
             color: #fff;
@@ -455,7 +456,7 @@ export default {
455 456
   padding: 3px 10px;
456 457
   background-color: #f56c6c;
457 458
   color: #fff;
458
-  border-radius: 15px;
459
+  border-radius: 3px;
459 460
   font-size: 0.32rem;
460 461
   @media only screen and (max-width: 415px) {
461 462
     font-size: 0.34rem !important;

+ 204 - 204
src/pages/main/WaitingArea.vue Ver fichero

@@ -101,11 +101,11 @@
101 101
 </template>
102 102
 
103 103
 <script>
104
-import PatientBox from "./PatientBox";
105
-import { getWaitingScheduals } from "@/api/dialysis";
106
-import { parseTime } from "@/utils";
107
-import { Popover } from "vux";
108
-import { Toast } from "vant";
104
+import PatientBox from './PatientBox'
105
+import { getWaitingScheduals } from '@/api/dialysis'
106
+import { parseTime } from '@/utils'
107
+import { Popover } from 'vux'
108
+import { Toast } from 'vant'
109 109
 
110 110
 import {
111 111
   getSelectedAreaDataConfigList,
@@ -114,22 +114,22 @@ import {
114 114
   setSelectedTimesDataConfigList,
115 115
   setWaitTypeSelectedConfig,
116 116
   getWaitTypeSelectedConfig
117
-} from "@/utils/data_config";
117
+} from '@/utils/data_config'
118 118
 
119 119
 export default {
120
-  name: "WaitingArea",
120
+  name: 'WaitingArea',
121 121
   components: {
122 122
     PatientBox,
123 123
     Popover
124 124
   },
125
-  inject: ["reload"],
126
-  data() {
125
+  inject: ['reload'],
126
+  data () {
127 127
     return {
128 128
       loading: false,
129 129
       menuList: [
130
-        { value: "1", label: "全部", count: 0 },
131
-        { value: "3", label: "待开处方", count: 0 },
132
-        { value: "2", label: "待称重", count: 0 }
130
+        { value: '1', label: '全部', count: 0 },
131
+        { value: '3', label: '待开处方', count: 0 },
132
+        { value: '2', label: '待称重', count: 0 }
133 133
       ],
134 134
 
135 135
       select_index: 0,
@@ -139,19 +139,19 @@ export default {
139 139
       networkStates: true,
140 140
       scheduals: [],
141 141
 
142
-      zone_options: [{ value: 0, text: "全部分区" }],
142
+      zone_options: [{ value: 0, text: '全部分区' }],
143 143
       zone_scheduals: [],
144 144
 
145 145
       time_options: [
146
-        { value: 0, text: "全部班" },
147
-        { value: 1, text: "上午" },
148
-        { value: 2, text: "下午" },
149
-        { value: 3, text: "晚上" }
146
+        { value: 0, text: '全部班' },
147
+        { value: 1, text: '上午' },
148
+        { value: 2, text: '下午' },
149
+        { value: 3, text: '晚上' }
150 150
       ],
151 151
 
152 152
       zone_options_visible: false,
153 153
       time_options_visible: false
154
-    };
154
+    }
155 155
   },
156 156
   props: {
157 157
     search_keyword: {
@@ -159,20 +159,20 @@ export default {
159 159
     }
160 160
   },
161 161
   computed: {
162
-    filtedScheduals: function() {
163
-      var search_keyword = this.search_keyword;
162
+    filtedScheduals: function () {
163
+      var search_keyword = this.search_keyword
164 164
       if (this.search_keyword.length > 0) {
165
-        var scheduals = [];
165
+        var scheduals = []
166 166
         for (let index = 0; index < this.scheduals.length; index++) {
167
-          const schedual = this.scheduals[index];
167
+          const schedual = this.scheduals[index]
168 168
           if (
169 169
             schedual.patient.name.indexOf(search_keyword) != -1 ||
170 170
             schedual.patient.dialysis_no.indexOf(search_keyword) != -1
171 171
           ) {
172
-            scheduals.push(schedual);
172
+            scheduals.push(schedual)
173 173
           }
174 174
         }
175
-        return this.processScheduals(scheduals);
175
+        return this.processScheduals(scheduals)
176 176
       }
177 177
       //
178 178
       if (this.zone_selected != 0) {
@@ -183,21 +183,21 @@ export default {
183 183
         //     return [zone_scheduals]
184 184
         //   }
185 185
         // }
186
-        var zone_name = this.zone_options[this.zone_selected].text;
187
-        var schedules = [];
188
-        var filtedSchedules = [];
186
+        var zone_name = this.zone_options[this.zone_selected].text
187
+        var schedules = []
188
+        var filtedSchedules = []
189 189
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
190
-          const scheduleInfo = this.zone_scheduals[o_i];
191
-          var originSchedules = scheduleInfo.scheduals;
190
+          const scheduleInfo = this.zone_scheduals[o_i]
191
+          var originSchedules = scheduleInfo.scheduals
192 192
 
193 193
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
194
-            const schedule = originSchedules[s_i];
194
+            const schedule = originSchedules[s_i]
195 195
             if (this.zone_selected == 0) {
196 196
               if (
197 197
                 this.time_selected == 0 ||
198 198
                 schedule.schedule_type == this.time_selected
199 199
               ) {
200
-                filtedSchedules.push(schedule);
200
+                filtedSchedules.push(schedule)
201 201
               }
202 202
             } else {
203 203
               if (
@@ -208,7 +208,7 @@ export default {
208 208
                   this.time_selected == 0 ||
209 209
                   schedule.schedule_type == this.time_selected
210 210
                 ) {
211
-                  filtedSchedules.push(schedule);
211
+                  filtedSchedules.push(schedule)
212 212
                 }
213 213
               }
214 214
             }
@@ -220,26 +220,26 @@ export default {
220 220
           //   });
221 221
           // }
222 222
         }
223
-        console.log(filtedSchedules);
224
-        return this.processScheduals(filtedSchedules);
223
+        console.log(filtedSchedules)
224
+        return this.processScheduals(filtedSchedules)
225 225
       }
226 226
 
227 227
       if (this.time_selected != 0) {
228
-        var zone_name = this.zone_options[this.zone_selected].text;
229
-        var schedules = [];
230
-        var filtedSchedules = [];
228
+        var zone_name = this.zone_options[this.zone_selected].text
229
+        var schedules = []
230
+        var filtedSchedules = []
231 231
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
232
-          const scheduleInfo = this.zone_scheduals[o_i];
233
-          var originSchedules = scheduleInfo.scheduals;
232
+          const scheduleInfo = this.zone_scheduals[o_i]
233
+          var originSchedules = scheduleInfo.scheduals
234 234
 
235 235
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
236
-            const schedule = originSchedules[s_i];
236
+            const schedule = originSchedules[s_i]
237 237
             if (this.zone_selected == 0) {
238 238
               if (
239 239
                 this.time_selected == 0 ||
240 240
                 schedule.schedule_type == this.time_selected
241 241
               ) {
242
-                filtedSchedules.push(schedule);
242
+                filtedSchedules.push(schedule)
243 243
               }
244 244
             } else {
245 245
               if (
@@ -250,7 +250,7 @@ export default {
250 250
                   this.time_selected == 0 ||
251 251
                   schedule.schedule_type == this.time_selected
252 252
                 ) {
253
-                  filtedSchedules.push(schedule);
253
+                  filtedSchedules.push(schedule)
254 254
                 }
255 255
               }
256 256
             }
@@ -262,25 +262,25 @@ export default {
262 262
           //   });
263 263
           // }
264 264
         }
265
-        console.log(filtedSchedules);
266
-        return this.processScheduals(filtedSchedules);
265
+        console.log(filtedSchedules)
266
+        return this.processScheduals(filtedSchedules)
267 267
       }
268 268
 
269
-      var zone_selected = this.zone_selected;
270
-      var timetype_selected = this.time_selected;
271
-      var assessment_before_dislysis_count = 0;
272
-      var prescription_count = 0;
269
+      var zone_selected = this.zone_selected
270
+      var timetype_selected = this.time_selected
271
+      var assessment_before_dislysis_count = 0
272
+      var prescription_count = 0
273 273
       if (zone_selected != 0 || timetype_selected != 0) {
274 274
         var zone_name =
275
-          zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
276
-        var schedules = [];
277
-        var filtedSchedules = [];
275
+          zone_selected == 0 ? '' : this.zone_options[zone_selected].text
276
+        var schedules = []
277
+        var filtedSchedules = []
278 278
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
279
-          const scheduleInfo = this.zone_scheduals[o_i];
280
-          var originSchedules = scheduleInfo.scheduals;
279
+          const scheduleInfo = this.zone_scheduals[o_i]
280
+          var originSchedules = scheduleInfo.scheduals
281 281
 
282 282
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
283
-            const schedule = originSchedules[s_i];
283
+            const schedule = originSchedules[s_i]
284 284
             if (
285 285
               zone_name.length == 0 ||
286 286
               (zone_name.length > 0 &&
@@ -290,7 +290,7 @@ export default {
290 290
                 timetype_selected == 0 ||
291 291
                 schedule.schedule_type == timetype_selected
292 292
               ) {
293
-                filtedSchedules.push(schedule);
293
+                filtedSchedules.push(schedule)
294 294
               }
295 295
             }
296 296
           }
@@ -302,13 +302,13 @@ export default {
302 302
           // }
303 303
         }
304 304
 
305
-        console.log(filtedSchedules);
306
-        return this.processScheduals(filtedSchedules);
305
+        console.log(filtedSchedules)
306
+        return this.processScheduals(filtedSchedules)
307 307
 
308 308
         if (this.select_index == 2) {
309
-          var scheduals = [];
309
+          var scheduals = []
310 310
           for (let index = 0; index < this.scheduals.length; index++) {
311
-            const schedual = this.scheduals[index];
311
+            const schedual = this.scheduals[index]
312 312
             if (
313 313
               schedual.assessment_before_dislysis == null ||
314 314
               schedual.assessment_before_dislysis.weight_before == 0
@@ -317,23 +317,23 @@ export default {
317 317
                 this.cur_zone_selected > 0 &&
318 318
                 schedual.device_number.zone.id != this.cur_zone_selected
319 319
               ) {
320
-                continue;
320
+                continue
321 321
               }
322 322
               if (
323 323
                 timetype_selected > 0 &&
324 324
                 schedual.schedule_type != timetype_selected
325 325
               ) {
326
-                continue;
326
+                continue
327 327
               }
328
-              scheduals.push(schedual);
328
+              scheduals.push(schedual)
329 329
             }
330 330
           }
331
-          return this.processScheduals(scheduals);
331
+          return this.processScheduals(scheduals)
332 332
           // return scheduals;
333 333
         } else if (this.select_index == 1) {
334
-          var scheduals = [];
334
+          var scheduals = []
335 335
           for (let index = 0; index < this.scheduals.length; index++) {
336
-            const schedual = this.scheduals[index];
336
+            const schedual = this.scheduals[index]
337 337
             if (
338 338
               schedual.prescription == null ||
339 339
               schedual.prescription.creater == 0
@@ -342,320 +342,320 @@ export default {
342 342
                 this.cur_zone_selected > 0 &&
343 343
                 schedual.device_number.zone.id != this.cur_zone_selected
344 344
               ) {
345
-                continue;
345
+                continue
346 346
               }
347 347
               if (
348 348
                 timetype_selected > 0 &&
349 349
                 schedual.schedule_type != timetype_selected
350 350
               ) {
351
-                continue;
351
+                continue
352 352
               }
353
-              scheduals.push(schedual);
353
+              scheduals.push(schedual)
354 354
             }
355 355
           }
356 356
           // return scheduals;
357
-          return this.processScheduals(scheduals);
357
+          return this.processScheduals(scheduals)
358 358
         } else {
359 359
           // return this.zone_scheduals;
360
-          var scheduals = [];
360
+          var scheduals = []
361 361
           for (let index = 0; index < this.scheduals.length; index++) {
362
-            const schedual = this.scheduals[index];
362
+            const schedual = this.scheduals[index]
363 363
             if (schedual.dialysis_order == null) {
364 364
               if (
365 365
                 this.cur_zone_selected > 0 &&
366 366
                 schedual.device_number.zone.id != this.cur_zone_selected
367 367
               ) {
368
-                continue;
368
+                continue
369 369
               }
370 370
               if (
371 371
                 timetype_selected > 0 &&
372 372
                 schedual.schedule_type != timetype_selected
373 373
               ) {
374
-                continue;
374
+                continue
375 375
               }
376
-              scheduals.push(schedual);
376
+              scheduals.push(schedual)
377 377
             }
378 378
           }
379 379
           // return scheduals;
380
-          return this.processScheduals(scheduals);
380
+          return this.processScheduals(scheduals)
381 381
         }
382 382
       }
383 383
 
384 384
       if (this.select_index == 2) {
385
-        var scheduals = [];
385
+        var scheduals = []
386 386
         for (let index = 0; index < this.scheduals.length; index++) {
387
-          const schedual = this.scheduals[index];
387
+          const schedual = this.scheduals[index]
388 388
           if (
389 389
             schedual.assessment_before_dislysis == null ||
390 390
             schedual.assessment_before_dislysis.weight_before == 0
391 391
           ) {
392
-            scheduals.push(schedual);
392
+            scheduals.push(schedual)
393 393
           }
394 394
         }
395
-        return this.processScheduals(scheduals);
395
+        return this.processScheduals(scheduals)
396 396
         // return scheduals;
397 397
       } else if (this.select_index == 1) {
398
-        var scheduals = [];
398
+        var scheduals = []
399 399
         for (let index = 0; index < this.scheduals.length; index++) {
400
-          const schedual = this.scheduals[index];
400
+          const schedual = this.scheduals[index]
401 401
           if (
402 402
             schedual.prescription == null ||
403 403
             schedual.prescription.creater == 0
404 404
           ) {
405
-            scheduals.push(schedual);
405
+            scheduals.push(schedual)
406 406
           }
407 407
         }
408 408
         // return scheduals;
409
-        return this.processScheduals(scheduals);
409
+        return this.processScheduals(scheduals)
410 410
       } else {
411 411
         // return this.zone_scheduals;
412
-        var scheduals = [];
412
+        var scheduals = []
413 413
         for (let index = 0; index < this.scheduals.length; index++) {
414
-          const schedual = this.scheduals[index];
414
+          const schedual = this.scheduals[index]
415 415
           if (schedual.dialysis_order == null) {
416
-            scheduals.push(schedual);
416
+            scheduals.push(schedual)
417 417
           }
418 418
         }
419 419
         // return scheduals;
420
-        return this.processScheduals(scheduals);
420
+        return this.processScheduals(scheduals)
421 421
       }
422 422
     }
423 423
   },
424
-  created() {
425
-    var area = getSelectedAreaDataConfigList();
426
-    var time = getSelectedTimesDataConfigList();
427
-    var type = getWaitTypeSelectedConfig();
424
+  created () {
425
+    var area = getSelectedAreaDataConfigList()
426
+    var time = getSelectedTimesDataConfigList()
427
+    var type = getWaitTypeSelectedConfig()
428 428
 
429 429
     if (area != null) {
430
-      this.zone_options_visible = false;
431
-      this.zone_selected = parseInt(area);
432
-      this.select_index = -1;
430
+      this.zone_options_visible = false
431
+      this.zone_selected = parseInt(area)
432
+      this.select_index = -1
433 433
     }
434 434
 
435 435
     if (time != null) {
436
-      this.time_selected = parseInt(time);
437
-      this.select_index = -1;
438
-      this.time_options_visible = false;
436
+      this.time_selected = parseInt(time)
437
+      this.select_index = -1
438
+      this.time_options_visible = false
439 439
     }
440 440
     if (type != null) {
441
-      this.select_index = parseInt(type);
441
+      this.select_index = parseInt(type)
442 442
     }
443
-
444
-    var storedata = this.$store.getters.waitscheduals;
445
-    var scheduals = storedata.waitscheduals;
443
+    
444
+    var storedata = this.$store.getters.waitscheduals
445
+    var scheduals = storedata.waitscheduals
446 446
     if (Object.keys(storedata).length > 0) {
447
-      var totalCount = scheduals.length;
448
-      var prescription_count = 0;
449
-      var assessment_before_dislysis_count = 0;
447
+      var totalCount = scheduals.length
448
+      var prescription_count = 0
449
+      var assessment_before_dislysis_count = 0
450 450
       for (let index = 0; index < scheduals.length; index++) {
451
-        const schedual = scheduals[index];
451
+        const schedual = scheduals[index]
452 452
         if (schedual.assessment_before_dislysis == null) {
453
-          assessment_before_dislysis_count += 1;
453
+          assessment_before_dislysis_count += 1
454 454
         }
455 455
         if (schedual.prescription == null) {
456
-          prescription_count += 1;
456
+          prescription_count += 1
457 457
         }
458 458
       }
459
-      this.menuList[2].count = assessment_before_dislysis_count;
460
-      this.menuList[1].count = prescription_count;
461
-      this.scheduals = scheduals;
459
+      this.menuList[2].count = assessment_before_dislysis_count
460
+      this.menuList[1].count = prescription_count
461
+      this.scheduals = scheduals
462 462
 
463
-      this.zone_options = this.makeZones(scheduals);
464
-      this.zone_scheduals = this.processScheduals(scheduals);
463
+      this.zone_options = this.makeZones(scheduals)
464
+      this.zone_scheduals = this.processScheduals(scheduals)
465 465
     } else {
466
-      this.requestScheduals();
466
+      this.requestScheduals()
467 467
     }
468 468
   },
469
-  mounted() {
469
+  mounted () {
470 470
     this.timer = window.setInterval(() => {
471
-      setTimeout(this.requestScheduals(), 0);
472
-    }, 30000);
471
+      setTimeout(this.requestScheduals(), 0)
472
+    }, 12000)
473 473
   },
474
-  beforeDestroy() {
475
-    clearInterval(this.timer);
476
-    this.timer = null;
477
-    this.$once("hook:beforeDestroy", () => {
478
-      clearInterval(this.timer);
479
-    });
474
+  beforeDestroy () {
475
+    clearInterval(this.timer)
476
+    this.timer = null
477
+    this.$once('hook:beforeDestroy', () => {
478
+      clearInterval(this.timer)
479
+    })
480 480
   },
481 481
   methods: {
482
-    processScheduals: function(scheduals) {
483
-      var zoneMap = {};
484
-      var schedualMap = {};
485
-      var assessment_before_dislysis_count = 0;
486
-      var prescription_count = 0;
482
+    processScheduals: function (scheduals) {
483
+      var zoneMap = {}
484
+      var schedualMap = {}
485
+      var assessment_before_dislysis_count = 0
486
+      var prescription_count = 0
487 487
       for (let index = 0; index < scheduals.length; index++) {
488
-        const schedual = scheduals[index];
488
+        const schedual = scheduals[index]
489 489
         if (schedualMap[schedual.device_number.zone.id] == null) {
490
-          schedualMap[schedual.device_number.zone.id] = [];
490
+          schedualMap[schedual.device_number.zone.id] = []
491 491
         }
492 492
         if (this.select_index == 1) {
493 493
           if (
494 494
             schedual.prescription == null ||
495 495
             schedual.prescription.creater == 0
496 496
           ) {
497
-            schedualMap[schedual.device_number.zone.id].push(schedual);
498
-            prescription_count++;
497
+            schedualMap[schedual.device_number.zone.id].push(schedual)
498
+            prescription_count++
499 499
           }
500 500
         } else if (this.select_index == 2) {
501 501
           if (
502 502
             schedual.assessment_before_dislysis == null ||
503 503
             schedual.assessment_before_dislysis.weight_before == 0
504 504
           ) {
505
-            schedualMap[schedual.device_number.zone.id].push(schedual);
506
-            assessment_before_dislysis_count++;
505
+            schedualMap[schedual.device_number.zone.id].push(schedual)
506
+            assessment_before_dislysis_count++
507 507
           }
508 508
         } else {
509 509
           if (schedual.dialysis_order == null) {
510
-            schedualMap[schedual.device_number.zone.id].push(schedual);
510
+            schedualMap[schedual.device_number.zone.id].push(schedual)
511 511
           }
512 512
         }
513 513
         if (zoneMap[schedual.device_number.zone.id] == null) {
514
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
514
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone
515 515
         }
516 516
       }
517 517
 
518 518
       if (this.select_index == 1) {
519
-        this.menuList[1].count = prescription_count;
519
+        this.menuList[1].count = prescription_count
520 520
       }
521 521
       if (this.select_index == 2) {
522
-        this.menuList[2].count = assessment_before_dislysis_count;
522
+        this.menuList[2].count = assessment_before_dislysis_count
523 523
       }
524 524
 
525
-      var zones = [];
525
+      var zones = []
526 526
       // zones.push({ value: 0, text: "全部分区" })
527 527
       for (var zoneId in zoneMap) {
528
-        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name });
528
+        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name })
529 529
       }
530 530
 
531
-      zones = zones.sort(function(a, b) {
532
-        return a.id > b.id;
533
-      });
531
+      zones = zones.sort(function (a, b) {
532
+        return a.id > b.id
533
+      })
534 534
       // this.zones = zones
535 535
 
536
-      var zone_scheduals = [];
536
+      var zone_scheduals = []
537 537
       for (let index = 0; index < zones.length; index++) {
538
-        const zone = zones[index];
539
-        var scheduals = schedualMap[zone.id];
538
+        const zone = zones[index]
539
+        var scheduals = schedualMap[zone.id]
540 540
         zone_scheduals.push({
541 541
           zone_id: zone.id,
542 542
           zone_name: zone.name,
543 543
 
544 544
           scheduals: scheduals
545
-        });
545
+        })
546 546
       }
547 547
       // this.zone_scheduals = zone_scheduals;
548
-      return zone_scheduals;
548
+      return zone_scheduals
549 549
     },
550
-    reloads: function() {
551
-      this.reload();
550
+    reloads: function () {
551
+      this.reload()
552 552
     },
553
-    handleAllChange: function(tabIndex) {
554
-      this.select_index = tabIndex;
555
-      this.zone_selected = 0;
556
-      this.time_selected = 0;
553
+    handleAllChange: function (tabIndex) {
554
+      this.select_index = tabIndex
555
+      this.zone_selected = 0
556
+      this.time_selected = 0
557 557
     },
558
-    menuTabClick: function(tabIndex) {
559
-      this.select_index = tabIndex;
560
-      this.zone_selected = 0;
561
-      this.time_selected = 0;
562
-      setSelectedAreaDataConfigList(this.zone_selected);
563
-      setSelectedTimesDataConfigList(this.time_selected);
564
-      setWaitTypeSelectedConfig(tabIndex);
558
+    menuTabClick: function (tabIndex) {
559
+      this.select_index = tabIndex
560
+      this.zone_selected = 0
561
+      this.time_selected = 0
562
+      setSelectedAreaDataConfigList(this.zone_selected)
563
+      setSelectedTimesDataConfigList(this.time_selected)
564
+      setWaitTypeSelectedConfig(tabIndex)
565 565
     },
566
-    handleZoneChange: function(index, zone) {
567
-      this.zone_options_visible = false;
568
-      this.zone_selected = index;
569
-      this.cur_zone_selected = zone.value;
566
+    handleZoneChange: function (index, zone) {
567
+      this.zone_options_visible = false
568
+      this.zone_selected = index
569
+      this.cur_zone_selected = zone.value
570 570
       // this.select_index = -1;
571
-      setSelectedAreaDataConfigList(index.toString());
571
+      setSelectedAreaDataConfigList(index.toString())
572 572
     },
573
-    handleTimeChange: function(index) {
574
-      this.time_selected = index;
573
+    handleTimeChange: function (index) {
574
+      this.time_selected = index
575 575
       // this.select_index = -1;
576
-      this.time_options_visible = false;
577
-      setSelectedTimesDataConfigList(index.toString());
576
+      this.time_options_visible = false
577
+      setSelectedTimesDataConfigList(index.toString())
578 578
     },
579 579
 
580
-    requestScheduals() {
580
+    requestScheduals () {
581 581
       // this.loading = true;
582
-      var date = parseTime(Date.parse(new Date()), "{y}-{m}-{d}");
582
+      var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
583 583
       getWaitingScheduals({ date: date })
584 584
         .then(rs => {
585
-          var resp = rs.data;
585
+          var resp = rs.data
586 586
           if (resp.state == 1) {
587
-            this.loading = false;
587
+            this.loading = false
588 588
 
589
-            var scheduals = resp.data.scheduals;
590
-            this.$store.dispatch("SetWaitScheduals", {
589
+            var scheduals = resp.data.scheduals
590
+            this.$store.dispatch('SetWaitScheduals', {
591 591
               waitscheduals: scheduals
592
-            });
593
-            var totalCount = scheduals.length;
594
-            var prescription_count = 0;
595
-            var assessment_before_dislysis_count = 0;
592
+            })
593
+            var totalCount = scheduals.length
594
+            var prescription_count = 0
595
+            var assessment_before_dislysis_count = 0
596 596
             for (let index = 0; index < scheduals.length; index++) {
597
-              const schedual = scheduals[index];
597
+              const schedual = scheduals[index]
598 598
               if (schedual.assessment_before_dislysis == null) {
599
-                assessment_before_dislysis_count += 1;
599
+                assessment_before_dislysis_count += 1
600 600
               }
601 601
               if (schedual.prescription == null) {
602
-                prescription_count += 1;
602
+                prescription_count += 1
603 603
               }
604 604
             }
605
-            this.menuList[2].count = assessment_before_dislysis_count;
606
-            this.menuList[1].count = prescription_count;
607
-            this.scheduals = scheduals;
605
+            this.menuList[2].count = assessment_before_dislysis_count
606
+            this.menuList[1].count = prescription_count
607
+            this.scheduals = scheduals
608 608
 
609
-            this.zone_options = this.makeZones(scheduals);
610
-            this.zone_scheduals = this.processScheduals(scheduals);
609
+            this.zone_options = this.makeZones(scheduals)
610
+            this.zone_scheduals = this.processScheduals(scheduals)
611 611
           } else {
612
-            this.loading = false;
612
+            this.loading = false
613 613
 
614 614
             this.$toast({
615 615
               message: resp.msg
616
-            });
616
+            })
617 617
           }
618 618
         })
619 619
         .catch(error => {
620
-          this.loading = false;
620
+          this.loading = false
621 621
 
622
-          //超时之后在这里捕抓错误信息.
622
+          // 超时之后在这里捕抓错误信息.
623 623
           if (error.response) {
624
-            this.networkStates = false;
624
+            this.networkStates = false
625 625
           } else if (error.request) {
626
-            this.networkStates = false;
626
+            this.networkStates = false
627 627
             // if(error.request.readyState == 4 && error.request.status == 0){
628 628
             //   //我在这里重新请求
629 629
             //   this.networkStates = false
630 630
             // }
631 631
           } else {
632
-            this.networkStates = false;
632
+            this.networkStates = false
633 633
           }
634
-        });
634
+        })
635 635
     },
636
-    makeZones: function(scheduals) {
637
-      var zoneMap = {};
636
+    makeZones: function (scheduals) {
637
+      var zoneMap = {}
638 638
       for (let index = 0; index < scheduals.length; index++) {
639
-        const schedual = scheduals[index];
639
+        const schedual = scheduals[index]
640 640
         if (zoneMap[schedual.device_number.zone.id] == null) {
641
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
641
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone
642 642
         }
643 643
       }
644 644
 
645
-      var zones = [];
646
-      zones.push({ value: 0, text: "全部分区" });
645
+      var zones = []
646
+      zones.push({ value: 0, text: '全部分区' })
647 647
 
648 648
       for (var zoneId in zoneMap) {
649
-        zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name });
649
+        zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name })
650 650
       }
651 651
 
652 652
       // zones = zones.sort(function (a, b) {
653 653
       //   return a.value > b.value
654 654
       // })
655
-      return zones;
655
+      return zones
656 656
     }
657 657
   }
658
-};
658
+}
659 659
 </script>
660 660
 
661 661
 <style style="stylesheet/scss" lang="scss" scoped>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 723 - 526
src/pages/main/dialog/MonitDialog.vue


+ 4 - 1
src/pages/main/dialog/OrdersDialog.vue Ver fichero

@@ -1402,9 +1402,12 @@
1402 1402
 }
1403 1403
 .table {
1404 1404
   width: 1200px;
1405
-  @media only screen and (max-width: 767px) {
1405
+  @media only screen and (max-width: 415px) {
1406 1406
       width: 850px;
1407 1407
     }
1408
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
1409
+      width: 1000px;
1410
+    }
1408 1411
   tr {
1409 1412
     th {
1410 1413
       background: $main-color;

+ 1 - 1
src/pages/main/dialog/PlaneDialog.vue Ver fichero

@@ -126,7 +126,7 @@ export default {
126 126
       type: Object
127 127
     }
128 128
   },
129
-  mounted() {
129
+  mounted() {debugger
130 130
     if (this.record.id == "") {
131 131
       //没有上下机记录
132 132
       this.end_time_str =

+ 0 - 1
src/pages/main/dialog/PrescriptionDialog.vue Ver fichero

@@ -1088,7 +1088,6 @@
1088 1088
               this.zhiShow = true
1089 1089
               this.totalShow = true
1090 1090
               this.huShow  = true 
1091
-              console.log("a")
1092 1091
             }
1093 1092
           }
1094 1093
         }

+ 1 - 1
src/pages/main/dialog/TwoMenu.vue Ver fichero

@@ -156,7 +156,7 @@ export default {
156 156
   @media only screen and (max-width: 812px) {
157 157
     min-height: 8rem !important;
158 158
   }
159
-  @media only screen and (min-width: 415px) and (max-width: 737px) {
159
+  @media only screen and (min-width: 415px) and (max-width: 767px) {
160 160
     max-height: 12.6rem !important;
161 161
   }
162 162
   ul {

+ 15 - 26
src/pages/main/dialog/new_order/AddNewOrders.vue Ver fichero

@@ -18,12 +18,7 @@
18 18
         <div style="overflow: hidden;">
19 19
           <div class="cell" style="margin-top: 0;">
20 20
             <label>医嘱类型</label>
21
-            <el-input
22
-              class="typeInput"
23
-              ref="advice_type"
24
-              value="临时"
25
-              disabled
26
-            ></el-input>
21
+            <el-input class="typeInput" ref="advice_type" value="临时" disabled></el-input>
27 22
           </div>
28 23
           <div class="cell" style="margin-top: 0;">
29 24
             <label>开始时间</label>
@@ -43,11 +38,7 @@
43 38
             <label>开嘱时间 {{ record_date_str }}</label>
44 39
           </div>
45 40
         </div>
46
-        <div
47
-          id="newDialogContent"
48
-          class="DialogContent choose"
49
-          style="height: 6.2rem;"
50
-        >
41
+        <div id="newDialogContent" class="DialogContent choose" style="height: 6.2rem;">
51 42
           <div class="newAddTable">
52 43
             <table class="table">
53 44
               <tr>
@@ -70,20 +61,16 @@
70 61
                 >
71 62
                   <td
72 63
                     style="text-align: left; padding-left: 5px; padding-right: 5px;"
73
-                  >
74
-                    {{ advice.title }}
75
-                  </td>
76
-                  <td v-if="advice.advice_desc">
77
-                    {{ advice.advice_desc }}{{ advice.drug_spec_unit }}
78
-                  </td>
64
+                  >{{ advice.title }}</td>
65
+                  <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</td>
79 66
                   <td v-if="advice.prescribing_number">
80 67
                     {{ advice.prescribing_number
81 68
                     }}{{ advice.prescribing_number_unit }}
82 69
                   </td>
83 70
                   <td v-else></td>
84
-                  <td v-if="advice.single_dose">
85
-                    {{ advice.single_dose }} {{ advice.single_dose_unit }}
86
-                  </td>
71
+                  <td
72
+                    v-if="advice.single_dose"
73
+                  >{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
87 74
                   <td v-else></td>
88 75
                   <td>{{ advice.delivery_way }}</td>
89 76
                   <td>{{ advice.execution_frequency }}</td>
@@ -100,12 +87,8 @@
100 87
                 >
101 88
                   <td
102 89
                     style="text-align: left; padding-right: 5px; padding-left: 25px;"
103
-                  >
104
-                    {{ subdrug.title }}
105
-                  </td>
106
-                  <td>
107
-                    {{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}
108
-                  </td>
90
+                  >{{ subdrug.title }}</td>
91
+                  <td>{{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}</td>
109 92
                   <td>
110 93
                     <span v-if="subdrug.prescribing_number">
111 94
                       {{ subdrug.prescribing_number
@@ -250,6 +233,11 @@ export default {
250 233
       parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
251 234
   },
252 235
   methods: {
236
+    ok() {
237
+      // alert(1);
238
+      // this.$refs.start_time_picker.close();
239
+      console.log(this.$refs.start_time_picker);
240
+    },
253 241
     backAction: function() {
254 242
       this.$emit("back-action");
255 243
     },
@@ -386,6 +374,7 @@ export default {
386 374
     didSelectStartTime: function(time) {
387 375
       this.start_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
388 376
       console.log(".");
377
+      console.log(this.$refs.start_time_picker);
389 378
     },
390 379
     didSelectTemplateAdvice: function(resp_advices) {
391 380
       this.show_dialog_key = 0;

+ 1 - 1
src/pages/main/today/TodayTab.vue Ver fichero

@@ -1324,7 +1324,7 @@ import {parseTime} from '@/utils'
1324 1324
       // this.scrollToView('monitoring')
1325 1325
     },
1326 1326
 
1327
-    closeDialysisOff: function (assessment_after_dislysis) {
1327
+    closeDialysisOff: function (assessment_after_dislysis) {debugger
1328 1328
       this.closeDialog(7)
1329 1329
       if (assessment_after_dislysis != undefined) {
1330 1330
         this.assessment_after_dislysis = assessment_after_dislysis

+ 5 - 1
src/router/index.js Ver fichero

@@ -1,7 +1,6 @@
1 1
 import Vue from "vue";
2 2
 import Router from "vue-router";
3 3
 
4
-
5 4
 Vue.use(Router);
6 5
 
7 6
 export default new Router({
@@ -75,6 +74,11 @@ export default new Router({
75 74
       path: "/changePassword",
76 75
       name: "changePassword",
77 76
       component: () => import("@/pages/personal/ChangePassword")
77
+    },
78
+    {
79
+      path: "/privacyPolicy",
80
+      name: "privacyPolicy",
81
+      component: () => import("@/pages/home/privacyPolicy")
78 82
     }
79 83
   ]
80 84
 });

+ 1 - 1
src/styles/style.scss Ver fichero

@@ -99,7 +99,7 @@ body {
99 99
           width: 4.2rem;
100 100
         }
101 101
         @media only screen and (min-width: 415px) and (max-width: 767px) {
102
-          width: 6rem;
102
+          width: 5.6rem;
103 103
           font-size: 0.4rem;
104 104
         }
105 105
         @media only screen and (min-width: 768px) {