Merge branch 'xf_dev' of http://113.44.0.55:8014/jiaxiaoqiang/JG-ADMIN-TEMP into xf_dev

src/views/plan/workOrder/index.vue

@@ -58,7 +58,7 @@
           "
           type="primary"
           link
-          size="small"
+          :size="size"
           @click="handleEdit(row, 0)"
           ><i-ep-edit />编辑
         </el-button>

src/views/report/statistics/screens/line3D/index.vue

@@ -114,7 +114,7 @@
                         </div>
                       </div>
                       <div class="info3">
-                        <div class="ip">ID:{{ item.id }}</div>
+                        <div class="ip">ID:{{ item.deviceNo }}</div>
                         <div class="ip">位置:{{ item.position }}</div>
                         <div
                           class="infoState"