Quellcode durchsuchen

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

张保健 vor 4 Jahren
Ursprung
Commit
c15f1e3f6f

+ 1 - 1
build/cdn.json Datei anzeigen

@@ -1,3 +1,3 @@
1 1
 {
2
-  "version": "1.1.2"
2
+  "version": "1.1.68"
3 3
 }

+ 2 - 2
config/dev.env.js Datei anzeigen

@@ -4,9 +4,9 @@ const prodEnv = require('./prod.env')
4 4
 
5 5
 module.exports = merge(prodEnv, {
6 6
   NODE_ENV: '"development"',
7
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
7
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
8 8
    //http://api.xt.test.sgjyun.com http://localhost:9529
9
-   // BASE_API: '"http://api.xt.test.sgjyun.com"'
9
+   BASE_API: '"http://api.xt.test.sgjyun.com"'
10 10
   // BASE_API: '"https://api.xt.kuyicloud.com"'
11 11
 
12 12
 })

+ 13 - 17
src/pages/home/login.vue Datei anzeigen

@@ -37,25 +37,18 @@
37 37
             :disabled="loginDisable"
38 38
           >登录</button>
39 39
 
40
-          <!-- <router-link to="/forgetPassword"> -->
41
-          <div class="newForget" style="display:none">忘记密码</div>
42
-          <!-- </router-link> -->
40
+          <!-- <router-link to="/forgetPassword">
41
+            <div class="newForget">忘记密码</div>
42
+          </router-link>-->
43 43
           <!-- </router-link> -->
44 44
           <!-- <div class="forget">
45 45
           <a href="">免密码登录</a>
46 46
           <a href="">忘记密码?</a>
47 47
           </div>-->
48
-          <!--<div class="agree">-->
49
-            <!--<el-checkbox v-model="agreement">-->
50
-              <!--我已阅读并同意-->
51
-              <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
52
-
53
-              <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
54
-            <!--</el-checkbox>-->
55
-            <!--&lt;!&ndash; <router-link to="/privacyPolicy"> &ndash;&gt;-->
56
-            <!--<span class="agreeText" @click="agree">《隐私服务协议》</span>-->
57
-            <!--&lt;!&ndash; </router-link> &ndash;&gt;-->
58
-          <!--</div>-->
48
+          <div class="agree">
49
+            <el-checkbox v-model="agreement">我已阅读并同意</el-checkbox>
50
+            <span class="agreeText" @click="agree()">《隐私服务协议》</span>
51
+          </div>
59 52
         </div>
60 53
       </div>
61 54
     </div>
@@ -131,7 +124,7 @@ export default {
131 124
       });
132 125
     },
133 126
     to: function() {
134
-      this.$router.push({ path: "/forgetPassword" });
127
+      this.$router.push({ path: "/privacy" });
135 128
     },
136 129
     submitForm() {
137 130
       const self = this;
@@ -150,8 +143,11 @@ export default {
150 143
 
151 144
       loginByPwd(this.form.mobile, hex_md5(this.form.pwd)).then(rs => {
152 145
         var resp = rs.data;
146
+        if (this.agreement != true) {
147
+          Toast("请同意隐私服务协议");
148
+        }
153 149
 
154
-        if (resp.state == 1) {
150
+        if (resp.state == 1 && this.agreement == true) {
155 151
           cacheLoginInfo(this.form.mobile, this.form.pwd);
156 152
           console.log(resp);
157 153
 
@@ -217,7 +213,7 @@ export default {
217 213
       this.setCookie("", "", -1); //修改2值都为空,天数为负1天就好了
218 214
     },
219 215
     agree() {
220
-      this.$router.push({ path: "/privacyPolicy" });
216
+      this.$router.push({ path: "/privacy" });
221 217
     }
222 218
   }
223 219
 };

+ 16 - 13
src/pages/main/DetailsPage.vue Datei anzeigen

@@ -2,7 +2,7 @@
2 2
   <div class="mainBox">
3 3
     <div class="mainContent">
4 4
       <div class="navigation">
5
-        <div class="goBack">
5
+        <div class="goBack newGoBack">
6 6
           <span class="back" @click="backAction()">
7 7
             <span class="iconfont">&#xe720;</span>返回
8 8
           </span>
@@ -10,7 +10,7 @@
10 10
             <li slot="reference" class="name">{{ patient_name }}</li>
11 11
           </el-popover>
12 12
         </div>
13
-        <div class="nav">
13
+        <div class="nav newNav1">
14 14
           <ul>
15 15
             <li
16 16
               v-for="(item, i) in ['病历', '透析', '今日']"
@@ -155,11 +155,11 @@ export default {
155 155
 .mainContent {
156 156
   position: relative;
157 157
   .navigation {
158
-    @include display-flex;
159
-    @include align-items-center;
160
-    @include text-align;
161
-    @include box-sizing;
162
-    @include justify-content-between;
158
+    // @include display-flex;
159
+    // @include align-items-center;
160
+    // @include text-align;
161
+    // @include box-sizing;
162
+    // @include justify-content-between;
163 163
     padding: 0.3rem 0.36rem;
164 164
     // border-bottom: 1px #e5e5e5 solid;
165 165
     position: fixed;
@@ -168,22 +168,25 @@ export default {
168 168
     right: 0;
169 169
     z-index: 100;
170 170
     background: #258ffc;
171
-    @media only screen and (max-width: 320px) {
172
-      display: -webkit-box;
171
+    .newGoBack {
172
+      float: left;
173
+    }
174
+    .newNav1 {
175
+      float: left;
173 176
     }
174 177
     .name {
175 178
       color: #fff;
176 179
     }
177 180
     .nav {
178
-      margin-right: 2.4rem;
181
+      margin-left: 0.4rem;
179 182
       @media only screen and (min-width: 376px) and (max-width: 415px) {
180
-        margin-right: 3.6rem;
183
+        margin-left: 1rem;
181 184
       }
182 185
       @media only screen and (min-width: 415px) and (max-width: 767px) {
183
-        margin-right: 3.6rem;
186
+        margin-left: 1.6rem;
184 187
       }
185 188
       @media only screen and (min-width: 768px) {
186
-        margin-right: 4rem;
189
+        margin-left: 2rem;
187 190
       }
188 191
       ul {
189 192
         li {

+ 1 - 0
src/pages/main/RecordPage.vue Datei anzeigen

@@ -352,6 +352,7 @@ export default {
352 352
     }
353 353
   }
354 354
   .el-input__prefix {
355
+    // left:1px;
355 356
     @media only screen and (min-width: 768px) {
356 357
       left: 10px;
357 358
     }

+ 9 - 5
src/pages/main/add_urgent_schedule.vue Datei anzeigen

@@ -239,7 +239,6 @@
239 239
 
240 240
       var today = new Date();
241 241
       this.date = parseTime(today, "{y}-{m}-{d}");
242
-
243 242
       var hour = today.getHours();
244 243
       if (hour > 3 && hour < 11) {
245 244
         this.schedule_type = 1;
@@ -248,9 +247,6 @@
248 247
       } else {
249 248
         this.schedule_type = 3;
250 249
       }
251
-
252
-
253
-
254 250
     },
255 251
     mounted() {
256 252
 
@@ -353,7 +349,15 @@
353 349
       selectSchTypeAction: function() {
354 350
         this.$refs.sch_type_field.blur();
355 351
         this.show_sch_type_picker = true;
356
-
352
+        //
353
+        // this.$nextTick(() => {
354
+        //   // this.$refs.schedule.setColumnIndex(2)
355
+        //   // .setIndexes(this.schedule_type)
356
+        //   console.log(this.$refs.schedule)
357
+        //   console.log(this.$refs.schedule.getColumnIndex)
358
+        //   console.log(this.$refs.schedule.getColumnValue)
359
+        //
360
+        // })
357 361
       },
358 362
 
359 363
       didChangePatient: function(picker, patient, index) {

+ 44 - 35
src/pages/main/dialog/ComputerDialog.vue Datei anzeigen

@@ -100,6 +100,7 @@
100 100
         zone_beds: [], // 该排班的区里的床位
101 101
         creator: 0,
102 102
         template_id: 0,
103
+        temp_device_numbers:[],
103 104
         blood_drawing:100,
104 105
         schedual_type:0,
105 106
         schedules_type: [
@@ -136,31 +137,39 @@
136 137
       },
137 138
     }, mounted () {
138 139
 
140
+
141
+    },
142
+    created () {
143
+      this.temp_device_numbers = this.device_numbers
144
+
145
+
146
+
139 147
       if (this.record.id == 0) {
140 148
         this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
149
+        let now = new Date()
150
+        let hour = now.getHours()
151
+
152
+        if (hour >= 6 && hour < 12){
153
+          this.schedual_type = 1
154
+
155
+        }else if(hour >= 12 && hour < 18){
156
+
157
+          this.schedual_type = 2
158
+
159
+
160
+        }else if(hour >= 18){
161
+          this.schedual_type = 3
162
+        }
141 163
       } else {
142 164
         if (this.record.start_time == 0) {
143 165
           this.start_time_str = parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
166
+          this.schedual_type = this.record.schedual_type
144 167
 
145 168
         } else {
146 169
           this.start_time_str = parseTime(this.record.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
147
-        }
148
-      }
149
-    },
150
-    created () {
151
-      let now = new Date()
152
-      let hour = now.getHours()
170
+          this.schedual_type = this.record.schedual_type
153 171
 
154
-      if (hour >= 6 && hour < 12){
155
-        this.schedual_type = 1
156
-
157
-      }else if(hour >= 12 && hour < 18){
158
-
159
-        this.schedual_type = 2
160
-
161
-
162
-      }else if(hour >= 18){
163
-        this.schedual_type = 3
172
+        }
164 173
       }
165 174
 
166 175
 
@@ -198,11 +207,11 @@
198 207
       // }
199 208
       // this.zone_beds = beds
200 209
 
201
-      for (let index = 0; index < this.device_numbers.length; index++) {
202
-        const device_number = this.device_numbers[index]
203
-        this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
210
+      for (let index = 0; index < this.temp_device_numbers.length; index++) {
211
+        const device_number = this.temp_device_numbers[index]
212
+        this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
204 213
       }
205
-      this.zone_beds = this.device_numbers
214
+      this.zone_beds = this.temp_device_numbers
206 215
 
207 216
       if (this.record.id > 0) {
208 217
         for (let i = 0; i < this.special_premission.length; i++) {
@@ -253,12 +262,12 @@
253 262
                   Toast.fail(response.data.msg)
254 263
                   return false
255 264
                 } else {
256
-                  t.device_numbers = response.data.data.number
257
-                  for (let index = 0; index < t.device_numbers.length; index++) {
258
-                    const device_number = t.device_numbers[index]
259
-                    t.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
265
+                  t.temp_device_numbers = response.data.data.number
266
+                  for (let index = 0; index < t.temp_device_numbers.length; index++) {
267
+                    const device_number = t.temp_device_numbers[index]
268
+                    t.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
260 269
                   }
261
-                  t.zone_beds = t.device_numbers
270
+                  t.zone_beds = t.temp_device_numbers
262 271
                   t.bed_id = t.zone_beds[0].id
263 272
                 }
264 273
               })
@@ -281,12 +290,12 @@
281 290
               return false
282 291
             } else {
283 292
               t.zone_beds = []
284
-              t.device_numbers = response.data.data.number
285
-              for (let index = 0; index < t.device_numbers.length; index++) {
286
-                const device_number = t.device_numbers[index]
287
-                t.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
293
+              t.temp_device_numbers = response.data.data.number
294
+              for (let index = 0; index < t.temp_device_numbers.length; index++) {
295
+                const device_number = t.temp_device_numbers[index]
296
+                t.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
288 297
               }
289
-              t.zone_beds = t.device_numbers
298
+              t.zone_beds = t.temp_device_numbers
290 299
               t.bed_id = t.zone_beds[0].id
291 300
 
292 301
 
@@ -305,12 +314,12 @@
305 314
             Toast.fail(response.data.msg)
306 315
             return false
307 316
           } else {
308
-            this.device_numbers = response.data.data.number
309
-            for (let index = 0; index < this.device_numbers.length; index++) {
310
-              const device_number = this.device_numbers[index]
311
-              this.device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
317
+            this.temp_device_numbers = response.data.data.number
318
+            for (let index = 0; index < this.temp_device_numbers.length; index++) {
319
+              const device_number = this.temp_device_numbers[index]
320
+              this.temp_device_numbers[index]['number'] = device_number['zone_name']+'-'+device_number['number']
312 321
             }
313
-            this.zone_beds = this.device_numbers
322
+            this.zone_beds = this.temp_device_numbers
314 323
           }
315 324
         })
316 325
       },

+ 3 - 2
src/pages/main/dialog/PrescriptionDialog.vue Datei anzeigen

@@ -830,7 +830,7 @@
830 830
       lastInputFocus: function (event) {
831 831
         var input = event.target
832 832
         event.currentTarget.select();
833
-   
833
+
834 834
         setTimeout(function () {
835 835
           input.style.marginBottom = '2rem'
836 836
           input.parentNode.scrollIntoView()
@@ -1288,7 +1288,8 @@
1288 1288
             }else{
1289 1289
               this.zhiShow = true
1290 1290
               this.totalShow = true
1291
-              this.huShow  = true 
1291
+              this.huShow  = true
1292
+             
1292 1293
             }
1293 1294
           }
1294 1295
         }

+ 28 - 25
src/pages/main/dialog/TreatmentDialog.vue Datei anzeigen

@@ -241,42 +241,45 @@ export default {
241 241
     },
242 242
 
243 243
     dialysisSummarySelectChange: function(values) {
244
-      if (this.dialysisSummary.summaryContent == null) {
245
-        this.dialysisSummary.summaryContent == "";
244
+      if(this.dialysisSummary.summaryContent == null){
245
+        this.dialysisSummary.summaryContent == ""
246 246
       }
247
+
247 248
       if (this.dialysisSummary.summaryContent == "") {
248 249
         this.dialysisSummary.summaryContent = values;
249 250
       } else {
250
-        this.dialysisSummary.summaryContent =
251
-          this.dialysisSummary.summaryContent + values;
251
+        if (this.dialysisSummary.summaryContent.indexOf(values) == -1) {
252
+          if (
253
+            this.dialysisSummary.summaryContent
254
+              .charAt(this.dialysisSummary.summaryContent.length - 1)
255
+              .indexOf("。") == -1
256
+          ) {
257
+            this.dialysisSummary.summaryContent =
258
+              this.dialysisSummary.summaryContent + "," + values;
259
+          } else {
260
+            this.dialysisSummary.summaryContent =
261
+              this.dialysisSummary.summaryContent  + values;
262
+          }
263
+        }
252 264
       }
253 265
     },
254 266
     dialysisAfterTeachSelectChange: function(values) {
255
-      if (this.dialysisSummary.propagandaAndEducationContent == null) {
256
-        this.dialysisSummary.propagandaAndEducationContent == "";
267
+      if(this.dialysisSummary.propagandaAndEducationContent == null){
268
+        this.dialysisSummary.propagandaAndEducationContent == ""
257 269
       }
258 270
       if (this.dialysisSummary.propagandaAndEducationContent == "") {
259 271
         this.dialysisSummary.propagandaAndEducationContent = values;
260 272
       } else {
261
-        this.dialysisSummary.propagandaAndEducationContent =
262
-          this.dialysisSummary.propagandaAndEducationContent + values;
263
-        // if (
264
-        //   this.dialysisSummary.propagandaAndEducationContent.indexOf(values) ==
265
-        //   -1
266
-        // ) {
267
-        //   if (
268
-        //     this.dialysisSummary.propagandaAndEducationContent
269
-        //       .charAt(
270
-        //         this.dialysisSummary.propagandaAndEducationContent.length - 1
271
-        //       )
272
-        //       .indexOf("。") == -1
273
-        //   ) {
274
-        //     this.dialysisSummary.propagandaAndEducationContent =
275
-        //       this.dialysisSummary.propagandaAndEducationContent + "," + values;
276
-        //   } else {
277
-        //
278
-        //   }
279
-        // }
273
+        if (this.dialysisSummary.propagandaAndEducationContent.indexOf(values) == -1) {
274
+          if (
275
+            this.dialysisSummary.propagandaAndEducationContent.charAt(this.dialysisSummary.propagandaAndEducationContent.length - 1).indexOf("。") == -1) {
276
+            this.dialysisSummary.propagandaAndEducationContent =
277
+              this.dialysisSummary.propagandaAndEducationContent + "," + values;
278
+          } else {
279
+            this.dialysisSummary.propagandaAndEducationContent =
280
+              this.dialysisSummary.propagandaAndEducationContent + values;
281
+          }
282
+        }
280 283
       }
281 284
     },
282 285
     commitInfo: function() {

+ 28 - 29
src/pages/privacy/index.vue Datei anzeigen

@@ -35,20 +35,19 @@
35 35
 
36 36
 
37 37
 <script>
38
-    export default {
39
-        name: "privacyPolicy"
40
-
41
-    }
38
+export default {
39
+  name: "privacy"
40
+};
42 41
 </script>
43 42
 
44 43
 <style lang="scss" scoped>
45
-  .page_privacy {
46
-    width: 100%;
47
-    margin: 0 auto;
48
-    height: 100%;
49
-    overflow-y: auto;
50
-    display: flex;
51
-    flex-direction: column;
44
+.page_privacy {
45
+  width: 100%;
46
+  margin: 0 auto;
47
+  height: 100%;
48
+  overflow-y: auto;
49
+  display: flex;
50
+  flex-direction: column;
52 51
   > div:last-child {
53 52
     flex: 1;
54 53
     overflow-y: auto;
@@ -57,24 +56,24 @@
57 56
     font-size: 0.45rem;
58 57
     padding: 0.3rem 0.37rem;
59 58
     color: $title-color;
60
-  @include align-items-center;
61
-  @include display-flex;
62
-  @include justify-content-between;
63
-  @include text-align;
59
+    @include align-items-center;
60
+    @include display-flex;
61
+    @include justify-content-between;
62
+    @include text-align;
64 63
     background: #fff;
65
-  .GoBack {
66
-    color: $main-color;
67
-    font-size: 0.45rem;
68
-  @include display-flex;
69
-  .iconfont {
70
-    color: $main-color;
71
-    font-size: 0.5rem;
72
-    margin-top: 1px;
73
-  @media only screen and (min-width: 768px) {
74
-    margin-top: 3px;
75
-  }
76
-  }
77
-  }
64
+    .GoBack {
65
+      color: $main-color;
66
+      font-size: 0.45rem;
67
+      @include display-flex;
68
+      .iconfont {
69
+        color: $main-color;
70
+        font-size: 0.5rem;
71
+        margin-top: 1px;
72
+        @media only screen and (min-width: 768px) {
73
+          margin-top: 3px;
74
+        }
75
+      }
76
+    }
78 77
   }
79 78
   .name {
80 79
     margin-right: 1.3rem;
@@ -90,5 +89,5 @@
90 89
     width: 90%;
91 90
     margin: 0 auto;
92 91
   }
93
-  }
92
+}
94 93
 </style>

+ 9 - 9
src/permission.js Datei anzeigen

@@ -1,20 +1,20 @@
1
-import router from './router'
2
-import store from './store'
1
+import router from "./router";
2
+import store from "./store";
3 3
 
4
-const loginWhiteList = ['/'] // 登录验证白名单
4
+const loginWhiteList = ["/", "/privacy", "/forgetPassword"]; // 登录验证白名单
5 5
 
6 6
 router.beforeEach((to, from, next) => {
7 7
   // 线上注释
8
-//   next()
9
-//   return
8
+  //   next()
9
+  //   return
10 10
 
11 11
   if (store.getters.user.user.id == 0) {
12 12
     if (loginWhiteList.indexOf(to.path) !== -1) {
13
-      next()
13
+      next();
14 14
     } else {
15
-      next({ path: '/'})
15
+      next({ path: "/" });
16 16
     }
17 17
   } else {
18
-    next()
18
+    next();
19 19
   }
20
-})
20
+});

+ 1 - 1
src/router/index.js Datei anzeigen

@@ -77,7 +77,7 @@ export default new Router({
77 77
     },
78 78
     {
79 79
       path: "/privacy",
80
-      name: "privacyPolicy",
80
+      name: "privacy",
81 81
       component: () => import("@/pages/privacy/index")
82 82
     }
83 83
   ]

+ 4 - 1
src/styles/style.scss Datei anzeigen

@@ -413,7 +413,10 @@ body {
413 413
   .Dialog {
414 414
     font-size: 0.36rem;
415 415
     width: 11.8rem;
416
-    @media only screen and (min-width: 415px) and (max-width: 737px) {
416
+    @media only screen and (min-width: 415px) and (max-width: 500px) {
417
+      width: 10.8rem !important;
418
+    }
419
+    @media only screen and (min-width: 501px) and (max-width: 737px) {
417 420
       width: 12.8rem !important;
418 421
     }
419 422
     @media only screen and (min-width: 376px) and (max-width: 415px) {