Merge pull request '~' (#38) from pc-master into portal

Reviewed-on: #38

src/views/page/largeScreen.vue

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

src/views/page/largeScreen1.vue

@@ -191,15 +191,15 @@ export default {
   mounted() {
     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()