see999 4 years ago
parent
commit
b68fa35d26
3 changed files with 15 additions and 8 deletions
  1. 2 2
      config/dev.env.js
  2. 5 1
      src/xt_pages/dialysis/schedualPatient.vue
  3. 8 5
      src/xt_pages/sign/lineUp.vue

+ 2 - 2
config/dev.env.js View File

6
 module.exports = {
6
 module.exports = {
7
   NODE_ENV: '"development"',
7
   NODE_ENV: '"development"',
8
   ENV_CONFIG: '"dev"',
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
   // BASE_API: '"http://api.xt.test.sgjyun.com"',
10
   // BASE_API: '"http://api.xt.test.sgjyun.com"',
11
-  BASE_API: '"http://localhost:9531"',
11
+  // BASE_API: '"http://localhost:9531"',
12
   SSO_HOST: '"http://testsso.sgjyun.com"',
12
   SSO_HOST: '"http://testsso.sgjyun.com"',
13
   SRCM_HOST: '"http://test1.sgjyun.com"',
13
   SRCM_HOST: '"http://test1.sgjyun.com"',
14
   XT_HOST: '"http://xt.test.sgjyun.com"',
14
   XT_HOST: '"http://xt.test.sgjyun.com"',

+ 5 - 1
src/xt_pages/dialysis/schedualPatient.vue View File

281
     created() {
281
     created() {
282
       if(sessionStorage.getItem('signIn') != null){
282
       if(sessionStorage.getItem('signIn') != null){
283
         setTimeout(() => {    
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
         },1000)
289
         },1000)
286
       }
290
       }
287
       var schedule_type_selected = this.$store.getters.schedule_type_selected
291
       var schedule_type_selected = this.$store.getters.schedule_type_selected

+ 8 - 5
src/xt_pages/sign/lineUp.vue View File

251
         },
251
         },
252
     },
252
     },
253
     created(){
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
                 this.dialogTableVisible = true
256
                 this.dialogTableVisible = true
257
             }
257
             }
258
+            sessionStorage.removeItem('signIn')
258
         }
259
         }
259
         this.initData = {
260
         this.initData = {
260
             cmd: "queue/join",
261
             cmd: "queue/join",
325
         this.timerID = setInterval(() => {
326
         this.timerID = setInterval(() => {
326
             this.updateTime()
327
             this.updateTime()
327
         }, 1000);
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
     beforeDestroy(){
335
     beforeDestroy(){
333
         clearInterval(this.timer);  // 清除定时器
336
         clearInterval(this.timer);  // 清除定时器