diff --git a/src/components/device/index.vue b/src/components/device/index.vue
index 0fc42a4..ac032cb 100644
--- a/src/components/device/index.vue
+++ b/src/components/device/index.vue
@@ -9,13 +9,13 @@
               <div class="deviceBg eleVerHorCenter-box">
                 <table class="PDAcontent">
                   <tr><td><span>{{PDANum}}</span> </td></tr>
-                  <tr><td><div>PDA</div></td></tr>
+                  <tr><td><div>{{PDAName}}</div></td></tr>
                 </table>
               </div>
               <div class="deviceBg eleVerHorCenter-box marginTop">
                 <table class="daoZhacontent">
-                  <tr><td><span>{{daoZha}}</span> </td></tr>
-                  <tr><td><div>道闸</div></td></tr>
+                  <tr><td><span>{{daoZhaNum}}</span> </td></tr>
+                  <tr><td><div>{{daoZhaName}}</div></td></tr>
                 </table>
               </div>
             </td>
@@ -23,13 +23,13 @@
               <div class="deviceBg eleVerHorCenter-box">
                 <table class="diCicontent">
                   <tr><td><span>{{diCiNum}}</span> </td></tr>
-                  <tr><td><div>地磁</div></td></tr>
+                  <tr><td><div>{{diCiName}}</div></td></tr>
                 </table>
               </div>
               <div class="deviceBg eleVerHorCenter-box marginTop">
                 <table class="youDaocontent">
                   <tr><td><span>{{youDaoNum}}</span> </td></tr>
-                  <tr><td><div>诱导屏</div></td></tr>
+                  <tr><td><div>{{youDaoName}}</div></td></tr>
                 </table>
               </div>
             </td>
@@ -85,14 +85,32 @@
     data() {
       return {
         PDANum:1235,//PDA数
+        PDAName:'',
         diCiNum:1456,//地磁数
-        daoZha:1245,//道闸数
+        diCiName:'',
+        daoZhaNum:1245,//道闸数
+        daoZhaName:'',
         youDaoNum:1235,//诱导屏
+        youDaoName:'',
         name: '设备'
       }
     },
     mounted() {
-
+      this.axios.post('urban/intelligence/device/queryDeviceStatistic',{
+        orgIds: [10003,10005]
+      }).then((response)=>{
+        let  data = response.data.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
+        this.youDaoName = data[3].deviceName
+      }).catch((response)=>{
+        console.log(response);
+      })
 
     },
     methods: {
diff --git a/src/components/tollman/index.vue b/src/components/tollman/index.vue
index 9195d10..c150370 100644
--- a/src/components/tollman/index.vue
+++ b/src/components/tollman/index.vue
@@ -42,13 +42,11 @@
       mounted() {
         //this.createLine();
         //收费员总数
-        this.tollmanTotal=this.formatNumToStr();
 
         this.axios.post('urban/intelligence/employee/queryEmployeeStaByOrgIds',{
           orgIds: [10003,10005]
         }).then((response)=>{
           let  data = response.data.data
-          console.log(response)
           this.tollmanTotal = data.allTollCollector
           this.tollmanTotal = common.formatNumToStr(this.tollmanTotal);
           this.onDutyNum = data.signInTollCollector