see999 пре 4 година
родитељ
комит
d13c57d44d
3 измењених фајлова са 33 додато и 2 уклоњено
  1. 6 1
      src/App.vue
  2. 13 0
      src/xt_pages/sign/lineUp.vue
  3. 14 1
      src/xt_pages/sign/signIn.vue

+ 6 - 1
src/App.vue Прегледај датотеку

@@ -9,6 +9,11 @@ import axios from 'axios'
9 9
 import { getOrgs, changeOrg } from "@/api/config";
10 10
 export default {
11 11
   name: "App",
12
+  provide() {
13
+    return {
14
+      reload: this.reload
15
+    };
16
+  },
12 17
   data () {
13 18
     return {
14 19
       isRouterAlive: true,
@@ -19,7 +24,7 @@ export default {
19 24
   },
20 25
 
21 26
   created(){
22
-    
27
+
23 28
     // getOrgs().then(response => {
24 29
     //   if (response.data.state === 1) {
25 30
     //     var creator = response.data.data.creator;

+ 13 - 0
src/xt_pages/sign/lineUp.vue Прегледај датотеку

@@ -213,6 +213,7 @@ export default {
213 213
     components:{
214 214
         BreadCrumb
215 215
     },
216
+    inject: ['reload'],
216 217
     data(){
217 218
         return{
218 219
             crumbs: [
@@ -240,6 +241,7 @@ export default {
240 241
 
241 242
             voice:true,
242 243
             a:1,
244
+            newTimes:null
243 245
             
244 246
         }
245 247
     },
@@ -249,6 +251,11 @@ export default {
249 251
         },
250 252
     },
251 253
     created(){
254
+        if(sessionStorage.getItem('lineUpKey') != null){
255
+            if(sessionStorage.getItem('lineUpKey') == 1){
256
+                this.dialogTableVisible = true
257
+            }
258
+        }
252 259
         this.initData = {
253 260
             cmd: "queue/join",
254 261
             data: {type:2,page:1,size:6},
@@ -318,12 +325,17 @@ export default {
318 325
         this.timerID = setInterval(() => {
319 326
             this.updateTime()
320 327
         }, 1000);
328
+        this.newTimes = setInterval(() => {
329
+            this.reload()
330
+        }, 1000 * 60 * 30);
321 331
     },
322 332
     beforeDestroy(){
323 333
         clearInterval(this.timer);  // 清除定时器
324 334
         this.timer = null
325 335
         clearInterval(this.timerID);
326 336
         this.timerID = null;  // 清除定时器
337
+        clearInterval(this.newTimes);  // 清除定时器
338
+        this.newTimes = null
327 339
         let unObj = {
328 340
             cmd:'queue/unjoin',
329 341
             data:{type:2}
@@ -453,6 +465,7 @@ export default {
453 465
             return (zero + num).slice(-digit);
454 466
         },
455 467
         fullscreenboard: function() {
468
+            sessionStorage.setItem('lineUpKey',1);
456 469
             this.dialogTableVisible = true;
457 470
             // let routeData = this.$router.resolve({ path: '/fullscreenboard' })
458 471
             // window.open(routeData.href, '_blank')

+ 14 - 1
src/xt_pages/sign/signIn.vue Прегледај датотеку

@@ -131,6 +131,7 @@ export default {
131 131
     components:{
132 132
         BreadCrumb
133 133
     },
134
+    inject: ['reload'],
134 135
     data(){
135 136
         return{
136 137
             crumbs: [
@@ -147,7 +148,8 @@ export default {
147 148
             timerID:null,
148 149
             time:'',
149 150
             newdate:'',
150
-            ds:null
151
+            ds:null,
152
+            newTimes:null
151 153
         }
152 154
     },
153 155
     computed: {
@@ -156,6 +158,11 @@ export default {
156 158
         },
157 159
     },
158 160
     created(){
161
+        if(sessionStorage.getItem('signInKey') != null){
162
+            if(sessionStorage.getItem('signInKey') == 1){
163
+                this.dialogTableVisible = true
164
+            }
165
+        }
159 166
         this.initData = {
160 167
             cmd: "queue/join",
161 168
             data: {type:1,page:1,size:10},
@@ -190,10 +197,15 @@ export default {
190 197
             this.updateTime()
191 198
         }, 1000);
192 199
         // this.updateTime();
200
+        this.newTimes = setInterval(() => {
201
+            this.reload()
202
+        }, 1000 * 60 * 30);
193 203
     },
194 204
     beforeDestroy(){
195 205
         clearInterval(this.timer);  // 清除定时器
196 206
         clearInterval(this.timerID);  // 清除定时器
207
+        clearInterval(this.newTimes);  // 清除定时器
208
+        this.newTimes = null
197 209
         let obj = {
198 210
             cmd: "queue/unjoin",
199 211
             data: {type:1},
@@ -268,6 +280,7 @@ export default {
268 280
             return (zero + num).slice(-digit);
269 281
         },
270 282
         fullscreenboard: function() {
283
+            sessionStorage.setItem('signInKey',1);
271 284
             this.dialogTableVisible = true;
272 285
             // let routeData = this.$router.resolve({ path: '/fullscreenboard' })
273 286
             // window.open(routeData.href, '_blank')