see999 4 gadus atpakaļ
vecāks
revīzija
c333c2c4db

+ 7 - 3
src/xt_pages/dialysis/schedualPatient.vue Parādīt failu

279
       }
279
       }
280
     },
280
     },
281
     created() {
281
     created() {
282
-      if(sessionStorage.getItem('signIn') != null){
282
+      if(sessionStorage.getItem('signInKey') != null){
283
         setTimeout(() => {    
283
         setTimeout(() => {    
284
-          if(sessionStorage.getItem('signIn') == 1){
284
+          if(sessionStorage.getItem('signInKey') == 1){
285
             this.$router.replace({ path: '/signIn' })
285
             this.$router.replace({ path: '/signIn' })
286
-          }else if(sessionStorage.getItem('signIn') == 2){
286
+          }
287
+        },1000)
288
+      }else if(sessionStorage.getItem('lineUpKey') != null){
289
+        setTimeout(() => { 
290
+          if(sessionStorage.getItem('lineUpKey') == 1){
287
             this.$router.replace({ path: '/lineUp' })
291
             this.$router.replace({ path: '/lineUp' })
288
           }
292
           }
289
         },1000)
293
         },1000)

+ 5 - 4
src/xt_pages/sign/lineUp.vue Parādīt failu

251
         },
251
         },
252
     },
252
     },
253
     created(){
253
     created(){
254
-        if(sessionStorage.getItem('signIn') != null){
255
-            if(sessionStorage.getItem('signIn') == 2){
254
+        if(sessionStorage.getItem('lineUpKey') != null){
255
+            if(sessionStorage.getItem('lineUpKey') == 1){
256
                 this.dialogTableVisible = true
256
                 this.dialogTableVisible = true
257
             }
257
             }
258
-            sessionStorage.removeItem('signIn')
258
+            sessionStorage.removeItem('lineUpKey')
259
+            sessionStorage.removeItem('signInKey')
259
         }
260
         }
260
         this.initData = {
261
         this.initData = {
261
             cmd: "queue/join",
262
             cmd: "queue/join",
328
         }, 1000);
329
         }, 1000);
329
         this.newTimes = setInterval(() => {
330
         this.newTimes = setInterval(() => {
330
             // this.reload()
331
             // this.reload()
331
-            sessionStorage.setItem('signIn',2);
332
+            sessionStorage.setItem('lineUpKey',1);
332
             window.location.reload()
333
             window.location.reload()
333
         }, 1000 * 60 * 30);
334
         }, 1000 * 60 * 30);
334
     },
335
     },

+ 5 - 4
src/xt_pages/sign/signIn.vue Parādīt failu

170
         },
170
         },
171
     },
171
     },
172
     created(){
172
     created(){
173
-        if(sessionStorage.getItem('signIn') != null){
174
-            if(sessionStorage.getItem('signIn') == 1){
173
+        if(sessionStorage.getItem('signInKey') != null){
174
+            if(sessionStorage.getItem('signInKey') == 1){
175
                 this.dialogTableVisible = true
175
                 this.dialogTableVisible = true
176
             }
176
             }
177
-            sessionStorage.removeItem('signIn')
177
+            sessionStorage.removeItem('signInKey')
178
+            sessionStorage.removeItem('lineUpKey')
178
         }
179
         }
179
         // if(sessionStorage.getItem('signInKey') != null){
180
         // if(sessionStorage.getItem('signInKey') != null){
180
         //     if(sessionStorage.getItem('signInKey') == 1){
181
         //     if(sessionStorage.getItem('signInKey') == 1){
217
         // this.updateTime();
218
         // this.updateTime();
218
         this.newTimes = setInterval(() => {
219
         this.newTimes = setInterval(() => {
219
             // this.reload()
220
             // this.reload()
220
-            sessionStorage.setItem('signIn',1);
221
+            sessionStorage.setItem('signInKey',1);
221
             window.location.reload()
222
             window.location.reload()
222
         }, 1000 * 60 * 30);
223
         }, 1000 * 60 * 30);
223
     },
224
     },