see999 4 anos atrás
pai
commit
b68fa35d26

+ 2 - 2
config/dev.env.js Ver arquivo

@@ -6,9 +6,9 @@
6 6
 module.exports = {
7 7
   NODE_ENV: '"development"',
8 8
   ENV_CONFIG: '"dev"',
9
-  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
9
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10 10
   // BASE_API: '"http://api.xt.test.sgjyun.com"',
11
-  BASE_API: '"http://localhost:9531"',
11
+  // BASE_API: '"http://localhost:9531"',
12 12
   SSO_HOST: '"http://testsso.sgjyun.com"',
13 13
   SRCM_HOST: '"http://test1.sgjyun.com"',
14 14
   XT_HOST: '"http://xt.test.sgjyun.com"',

+ 5 - 1
src/xt_pages/dialysis/schedualPatient.vue Ver arquivo

@@ -281,7 +281,11 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
281 281
     created() {
282 282
       if(sessionStorage.getItem('signIn') != null){
283 283
         setTimeout(() => {    
284
-          this.$router.replace({ path: '/signIn' })
284
+          if(sessionStorage.getItem('signIn') == 1){
285
+            this.$router.replace({ path: '/signIn' })
286
+          }else if(sessionStorage.getItem('signIn') == 2){
287
+            this.$router.replace({ path: '/lineUp' })
288
+          }
285 289
         },1000)
286 290
       }
287 291
       var schedule_type_selected = this.$store.getters.schedule_type_selected

+ 8 - 5
src/xt_pages/sign/lineUp.vue Ver arquivo

@@ -251,10 +251,11 @@ export default {
251 251
         },
252 252
     },
253 253
     created(){
254
-        if(sessionStorage.getItem('lineUpKey') != null){
255
-            if(sessionStorage.getItem('lineUpKey') == 1){
254
+        if(sessionStorage.getItem('signIn') != null){
255
+            if(sessionStorage.getItem('signIn') == 2){
256 256
                 this.dialogTableVisible = true
257 257
             }
258
+            sessionStorage.removeItem('signIn')
258 259
         }
259 260
         this.initData = {
260 261
             cmd: "queue/join",
@@ -325,9 +326,11 @@ export default {
325 326
         this.timerID = setInterval(() => {
326 327
             this.updateTime()
327 328
         }, 1000);
328
-        // this.newTimes = setInterval(() => {
329
-        //     this.reload()
330
-        // }, 1000 * 60 * 30);
329
+        this.newTimes = setInterval(() => {
330
+            // this.reload()
331
+            sessionStorage.setItem('signIn',2);
332
+            window.location.reload()
333
+        }, 1000 * 60 * 30);
331 334
     },
332 335
     beforeDestroy(){
333 336
         clearInterval(this.timer);  // 清除定时器