diff --git a/src/components/device/index.vue b/src/components/device/index.vue
index 5e2be8a..5bc6421 100644
--- a/src/components/device/index.vue
+++ b/src/components/device/index.vue
@@ -35,44 +35,6 @@
             </td>
           </tr>
         </table>
-        <!--<table class="deviceTb">-->
-          <!--<tr>-->
-            <!--<td>-->
-             <!--<div class="deviceBg eleVerHorCenter-box">-->
-               <!--<table class="PDAcontent">-->
-                 <!--<tr><td><span>{{PDANum}}</span> </td></tr>-->
-                 <!--<tr><td><div>PDA</div></td></tr>-->
-               <!--</table>-->
-             <!--</div>-->
-            <!--</td>-->
-            <!--<td>-->
-              <!--<div class="deviceBg eleVerHorCenter-box">-->
-                <!--<table class="diCicontent">-->
-                  <!--<tr><td><span>{{diCiNum}}</span> </td></tr>-->
-                  <!--<tr><td><div>地磁</div></td></tr>-->
-                <!--</table>-->
-              <!--</div>-->
-            <!--</td>-->
-          <!--</tr>-->
-          <!--<tr>-->
-            <!--<td>-->
-              <!--<div class="deviceBg eleVerHorCenter-box">-->
-                <!--<table class="daoZhacontent">-->
-                  <!--<tr><td><span>{{daoZha}}</span> </td></tr>-->
-                  <!--<tr><td><div>道闸</div></td></tr>-->
-                <!--</table>-->
-              <!--</div>-->
-            <!--</td>-->
-            <!--<td>-->
-              <!--<div class="deviceBg eleVerHorCenter-box">-->
-                <!--<table class="youDaocontent">-->
-                  <!--<tr><td><span>{{youDaoNum}}</span> </td></tr>-->
-                  <!--<tr><td><div>诱导屏</div></td></tr>-->
-                <!--</table>-->
-              <!--</div>-->
-            <!--</td>-->
-          <!--</tr>-->
-        <!--</table>-->
       </div>
     </div>
   </div>
@@ -102,13 +64,18 @@ import { deviceAddress } from '../../api/api'
       onLoad() {
         deviceAddress({orgIds: this.GLOBAL.paramsvariables}).then((response)=>{
           let  data = response.data.data
+          console.log(data)
           this.PDANum = data[0].num
           this.PDAName = data[0].deviceName
           this.diCiNum = data[1].num
           this.diCiName = data[1].deviceName
           this.daoZhaNum = data[2].num
+
           this.daoZhaName = data[2].deviceName
           this.youDaoNum = data[3].num
+          if(this.youDaoNum == 0){
+            this.youDaoNum = '-'
+          }
           this.youDaoName = data[3].deviceName
         }).catch((response)=>{
           console.log(response);
diff --git a/src/components/orderMessage/index.vue b/src/components/orderMessage/index.vue
index 19e4376..d1d015a 100644
--- a/src/components/orderMessage/index.vue
+++ b/src/components/orderMessage/index.vue
@@ -10,8 +10,8 @@
           <li class="orderMoney">收费金额</li>
         </ul>
         <div class="nwwest-roll  news-wrap" id="nwwest-roll">
-          <ul id="roll-ul">
-            <li v-for="(item,index) in list" ref="rollul" :class="{anim:animate==true}" :key="index">
+          <ul id="roll-ul" class="roll-ul" :style="{ top }">
+            <li v-for="(item,index) in list" ref="rollul"  :key="index">
               <div :title="item.orderId">{{item.orderId}}</div>
               <div :title="item.plName">{{item.plName}}</div>
               <div :title="item.orderActFee">{{item.orderActFee|formatMoney}}</div>
@@ -32,10 +32,16 @@
         orderList:"",//公告列表
         //marqueeHeight: '100%',
         name: '订单公告',
-        animate: true,
+        activeIndex: 0,
+        intnum: undefined,
         list: []
       }
     },
+    computed: {
+      top() {
+        return - this.activeIndex * 26 + 'px';
+      }
+    },
     created() {
       this.onLoad()
     },
@@ -46,7 +52,15 @@
         }).then((response)=>{
           let  data = response.data.data
           this.list = data;
-          setInterval(this.scroll, 2000)
+          var that = this
+          this.intnum = setInterval(_ => {
+            if (this.activeIndex < this.list.length) {
+              this.activeIndex += 1;
+              that.list.push(that.list[0]);
+            } else {
+              this.activeIndex = 0;
+            }
+          }, 1000);
         }).catch((response)=>{
           console.log(response);
         })
@@ -82,6 +96,11 @@
       height: 40px;
       line-height: 40px;
       font-size: 14px;
+      .roll-ul{
+        height: 100%;
+        position: relative;
+        transition: top 0.5s;
+      }
       li{
         height: 40px;
         float: left;