设备管理设备代码提交

src/api/iot/deviceInfo.js

@@ -96,10 +96,10 @@ export function baseDeviceGet() {
 }
 
 
-// 重新同步设备
-export function reSyncDevice(id) {
+// 同步设备
+export function syncDevice(id) {
   return request({
-    url: '/system/reSyncDevice/'+id,
+    url: '/system/syncDevice/'+id,
     method: 'get',
   })
 }

src/views/iot/deviceInfo/index.vue

@@ -127,6 +127,7 @@
             />
           </template>
         </el-table-column>
+        <el-table-column label="更新时间" align="center" prop="updateTime"/>
         <el-table-column
           label="操作"
           align="center"
@@ -152,8 +153,16 @@
               size="mini"
               type="text"
               icon="el-icon-edit-outline"
-              v-if="activeName !== 'fsu' && scope.row.syncStatus != 2"
-              @click="reSyncDevice(scope.row.id)"
+              v-if="activeName !== 'fsu' && scope.row.syncStatus == 0"
+              @click="syncDevice(scope.row.id)"
+            >同步
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit-outline"
+              v-if="activeName !== 'fsu' && scope.row.syncStatus == 3"
+              @click="syncDevice(scope.row.id)"
             >重新同步
             </el-button>
           </template>
@@ -182,7 +191,7 @@ import addAlarmHost from "./dialog.addAlarmHost.vue"
 import addTalkHost from "./dialog.addTalkHost.vue"
 import addDoorHost from "./dialog.addDoorHost.vue"
 import {deptTreeSelect} from "@/api/system/public";
-import {baseDeviceGet, list, reSyncDevice,} from "@/api/iot/deviceInfo";
+import {baseDeviceGet, list, reSyncDevice, syncDevice,} from "@/api/iot/deviceInfo";
 
 export default {
   name: "IotDeviceInfo",
@@ -469,11 +478,11 @@ export default {
         });
     },
 
-    reSyncDevice() {
+    syncDevice() {
       this.$modal
         .confirm("是否确认重新同步设备?")
         .then(function () {
-          return reSyncDevice();
+          return syncDevice();
         })
         .then(() => {
           this.$modal.msgSuccess("设备推送成功!");