Compare commits
No commits in common. "5aebb3309363ac8e6c81c4cf5d40ab3f9a2b023c" and "773ced60cdce56212cb875377d776f4c5e9ff0f7" have entirely different histories.
5aebb33093
...
773ced60cd
@ -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.11.16</span>
|
<span>2023.10.30</span>
|
||||||
<span class="line"></span>
|
<span class="line"></span>
|
||||||
<span>星期四</span>
|
<span>星期一</span>
|
||||||
<span class="line"></span>
|
<span class="line"></span>
|
||||||
<span>15:39</span>
|
<span>14:17</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="nav">
|
<div class="nav">
|
||||||
<div class="item">
|
<div class="item">
|
||||||
@ -201,7 +201,6 @@
|
|||||||
</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'
|
||||||
@ -276,8 +275,6 @@ export default {
|
|||||||
name: '风机', open: 0, status: []
|
name: '风机', open: 0, status: []
|
||||||
},
|
},
|
||||||
statusList: [],
|
statusList: [],
|
||||||
|
|
||||||
time: null,//当前时间
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
@ -300,14 +297,12 @@ 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
|
||||||
@ -441,15 +436,6 @@ 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) {
|
||||||
|
@ -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()
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user