Merge branch 'master' of http://121.40.234.130:8899/xiangxy/apt-nl-new

src/pages/modules/home/home.vue

@@ -57,7 +57,7 @@ export default {
     return {
       interTime: this.$store.getters.setTime,
       timer: null,
-      // dataInfo: {}
+      dataInfo: {}
       // dataInfo: {
       //   device_info: 'NobleLiftPS10LMT_HuaHai',
       //   task_name: '无',
@@ -67,21 +67,21 @@ export default {
       //   error_name: '障碍物告警',
       //   button_name: '继续搬运'
       // }
-      dataInfo: {
-        device_info: 'NobleLiftPS10LMT_HuaHai',
-        task_name: '任务号：11322',
-        task_info: '目标点：5',
-        task_status: '执行中',
-        task_num: '待执行0/2',
-        speed: '0.0m/s',
-        error_name: '正常运行',
-        button_name: '继续搬运'
-      }
+      // dataInfo: {
+      //   device_info: 'NobleLiftPS10LMT_HuaHai',
+      //   task_name: '任务号：11322',
+      //   task_info: '目标点：5',
+      //   task_status: '执行中',
+      //   task_num: '待执行0/2',
+      //   speed: '0.0m/s',
+      //   error_name: '正常运行',
+      //   button_name: '继续搬运'
+      // }
     }
   },
   created () {
-    // this.initData()
-    // this.refresh()
+    this.initData()
+    this.refresh()
   },
   beforeDestroy () {
     clearInterval(this.timer)
@@ -121,35 +121,6 @@ export default {
 .main-container_l
   width 100%
   padding-left 53px
-.bgred
-  background #fa6400
-.bggreen
-  background #54C0B3
-.cred
-  color #fa6400
-.cgreen
-  color #54C0B3
-.con0
-  height 1rem
-  margin-top .26rem
-  margin-bottom .5rem
-  margin-left .4rem
-.site_nav
-  _wh(2rem,1rem)
-  _bis('../../../images/aio/btn_dis.png',100%,100%)
-  margin-bottom .2rem
-  margin-right .3rem
-  &:nth-of-type(3)
-    margin-right 1.8rem
-.site_nav_a
-  display block
-  _font(.32rem,1rem,,,center)
-  cursor pointer
-  color #ffffff
-.active
-  _bis('../../../images/aio/btn_checked.png',100%,100%)
-.white
-  color #464646
 .con1
   float left
   position relative
@@ -196,6 +167,8 @@ export default {
   font-size 36px
   color #B4C1D8
   background center / 100% 100% url(../../../images/new/bg-home-r2.png) no-repeat
+  position relative
+  top -10px
 .infoli01
   width 542px
   height 140px