设备管理 页面字段宽度调整 重新下发代码提交

src/api/iot/deviceInfo.js

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

src/views/iot/deviceInfo/index.vue

@@ -92,13 +92,13 @@
       >
         <!-- :header-cell-style="{backgroundColor:'#CCE8F7'}" -->
         <!--<el-table-column type="selection" width="55" align="center" />-->
-        <el-table-column label="序号" align="center" min-width="50">
+        <el-table-column label="序号" align="center" width="90">
           <template v-slot:default="scope">
             <span v-text="getPageIndex(scope.$index)"> </span>
           </template>
         </el-table-column>
-        <el-table-column label="地区" align="center" prop="firstOrgName"/>
-        <el-table-column label="行社" align="center" prop="secondOrgName"/>
+        <el-table-column label="地区" align="center" width="110" prop="firstOrgName"/>
+        <el-table-column label="行社" align="center" width="150" prop="secondOrgName"/>
         <el-table-column label="所属机构" align="center" prop="orgName"/>
         <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
         <el-table-column label="设备名称" align="center" prop="deviceName"/>
@@ -106,6 +106,7 @@
           label="网络状态"
           align="center"
           prop="netStatus"
+          width="110"
           v-if="activeName !== 'fsu'"
         >
           <template slot-scope="scope">
@@ -113,6 +114,20 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="activeName !== 'fsu'"
+          label="同步状态"
+          align="center"
+          width="110"
+          prop="syncStatus"
+        >
+          <template slot-scope="scope">
+            <dict-tag
+              :options="dict.type.sync_status"
+              :value="scope.row.syncStatus"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
           label="操作"
           align="center"
           class-name="small-padding fixed-width"
@@ -133,6 +148,14 @@
               @click="editDevice(scope.row)"
             >编辑
             </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit-outline"
+              v-if="activeName !== 'fsu' && scope.row.syncStatus != 2"
+              @click="reSyncDevice(scope.row.id)"
+            >重新同步
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -159,10 +182,13 @@ 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,} from "@/api/iot/deviceInfo";
+import {baseDeviceGet, list, reSyncDevice,} from "@/api/iot/deviceInfo";
 
 export default {
   name: "IotDeviceInfo",
+  dicts: [
+    "sync_status",
+  ],
   components: {OrgTree, detailInfoPage, addDvrHost, addAlarmHost, addTalkHost, addDoorHost},
   data() {
     return {
@@ -433,7 +459,6 @@ export default {
       this.$modal
         .confirm("此操作将重新获取基础设备信息,是否继续?")
         .then(function () {
-          console.log("123sss")
           return baseDeviceGet();
         })
         .then(() => {
@@ -444,6 +469,20 @@ export default {
         });
     },
 
+    reSyncDevice() {
+      this.$modal
+        .confirm("是否确认重新同步设备?")
+        .then(function () {
+          return reSyncDevice();
+        })
+        .then(() => {
+          this.$modal.msgSuccess("设备推送成功!");
+          this.getList();
+        })
+        .catch(() => {
+        });
+    },
+
   },
 };
 </script>