~ #38

Merged
xiaomeng merged 1 commits from pc-master into portal 2023-11-16 07:44:50 +00:00
2 changed files with 26 additions and 12 deletions

View File

@ -11,11 +11,11 @@
</div> </div>
<div class="calendar"> <div class="calendar">
<img src="../../assets/img/calendar.png" alt=""> <img src="../../assets/img/calendar.png" alt="">
<span>2023.10.30</span> <span>2023.11.16</span>
<span class="line"></span> <span class="line"></span>
<span>星期</span> <span>星期</span>
<span class="line"></span> <span class="line"></span>
<span>14:17</span> <span>15:39</span>
</div> </div>
<div class="nav"> <div class="nav">
<div class="item"> <div class="item">
@ -201,6 +201,7 @@
</template> </template>
<script> <script>
import { getnowtime } from '../../assets/js/nowTime'
import Swiper from '@/assets/js/swiper.min.js' import Swiper from '@/assets/js/swiper.min.js'
import '@/assets/js/swiper.min.css' import '@/assets/js/swiper.min.css'
import { weather_echart, thisWeekTemperature_echart } from '@/assets/js/echarts' import { weather_echart, thisWeekTemperature_echart } from '@/assets/js/echarts'
@ -275,6 +276,8 @@ export default {
name: '风机', open: 0, status: [] name: '风机', open: 0, status: []
}, },
statusList: [], statusList: [],
time: null,//
} }
}, },
mounted() { mounted() {
@ -297,12 +300,14 @@ export default {
this.drag_boxHandler() this.drag_boxHandler()
this.timer_ = setTimeout(() => { // this.timer_ = setTimeout(() => {
this.$router.push({ path: '/largeScreen1' }) // this.$router.push({ path: '/largeScreen1' })
}, 6000); // }, 6000);
this.login() this.login()
this.getTime()
}, },
destroyed() { destroyed() {
this.timer_ = null this.timer_ = null
@ -436,6 +441,15 @@ export default {
return str.padStart(length, '0'); return str.padStart(length, '0');
}, },
getTime() {
this.time = getnowtime()
console.log(this.time);
const that = this
setInterval(() => {
that.time = getnowtime()
}, 1000);
},
// Copy // Copy
get_readControl_getState(deviceId) { get_readControl_getState(deviceId) {

View File

@ -191,15 +191,15 @@ export default {
mounted() { mounted() {
this.drag_boxHandler() this.drag_boxHandler()
this.timer1 = setTimeout(() => { // this.timer1 = setTimeout(() => {
this.$router.push({ path: '/largeScreen' }) // this.$router.push({ path: '/largeScreen' })
}, 20000); // }, 20000);
this.timer = setInterval(() => { // this.timer = setInterval(() => {
this.dialogVisible = !this.dialogVisible // this.dialogVisible = !this.dialogVisible
}, 3000); // }, 3000);
this.login() this.login()