Skip to content

Commit 0e6387b

Browse files
committed
Enable transition at view changing
SysInfo: Add data updating
1 parent 08d1fab commit 0e6387b

File tree

2 files changed

+37
-16
lines changed

2 files changed

+37
-16
lines changed

src/App.vue

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@
4646
</v-navigation-drawer>
4747

4848
<v-main>
49-
<v-container fluid>
50-
<keep-alive>
51-
<router-view></router-view>
52-
</keep-alive>
53-
</v-container>
49+
<v-scroll-x-reverse-transition>
50+
<v-container fluid v-show="mainViewShown">
51+
<keep-alive>
52+
<router-view></router-view>
53+
</keep-alive>
54+
</v-container>
55+
</v-scroll-x-reverse-transition>
5456
</v-main>
5557
</v-app>
5658
</template>
@@ -85,22 +87,24 @@ export default {
8587
null,
8688
'System logs'
8789
],
88-
titleShown: false
90+
titleShown: false,
91+
mainViewShown: false
8992
}),
9093
methods: {
9194
changeMainView(view) {
9295
this.titleShown = false
93-
console.log(this.titleShown)
94-
this.$router.push(view)
95-
let context = this
96-
//setTimeout(function() {
97-
//
98-
//}, 1000)
96+
this.mainViewShown = false
97+
98+
setTimeout(function() {
99+
this.mainViewShown = true
100+
this.$router.push(view)
101+
console.log(view)
102+
}.bind(this), 400)
103+
99104
setTimeout(function() {
100-
context.drawer.selectedItem = context.drawer.tempSelectedItem
101-
context.titleShown = true
102-
}, 400)
103-
console.log(this.titleShown)
105+
this.drawer.selectedItem = this.drawer.tempSelectedItem
106+
this.titleShown = true
107+
}.bind(this), 400)
104108
},
105109
getSelectedItem() {
106110
this.drawer.selectedItem = this.drawer.items.findIndex(e => e.view == this.$route.name)
@@ -123,6 +127,7 @@ export default {
123127
console.log(this.$vuetify.breakpoint)
124128
console.log(this.$vuetify)
125129
this.titleShown = true
130+
this.mainViewShown = true
126131
}
127132
};
128133
</script>

src/components/SysInfo.vue

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<v-card
66
:hover="!$vuetify.breakpoint.mobile"
77
:outlined="$vuetify.breakpoint.mobile"
8+
class="d-flex flex-wrap"
9+
style="height: 100%;"
810
>
911
<v-card-title class="title-img">
1012
{{card.label}}
@@ -41,6 +43,8 @@ import { getInterfaceAddressesData, getActiveInterface, getHostname } from '../A
4143
import getTimeData from '../API/time.js'
4244
import getPythonData from '../API/python.js'
4345
46+
let updateTimer
47+
4448
export default {
4549
name: 'SysInfo',
4650
@@ -144,12 +148,24 @@ export default {
144148
await this.updateTimeData()
145149
await this.updatePythonData()
146150
},
151+
async activated() {
152+
updateTimer = setInterval(async function() {
153+
await this.updateHardwareData()
154+
await this.updateNetworkData()
155+
await this.updateTimeData()
156+
}.bind(this), 3000)
157+
},
158+
deactivated() {
159+
clearInterval(updateTimer)
160+
},
147161
};
148162
</script>
149163

150164
<style>
151165
.title-img {
152166
justify-content: space-between;
167+
width: 100%;
168+
height: fit-content;
153169
}
154170
.data-table {
155171
border-spacing: 0px;

0 commit comments

Comments
 (0)