历久设备展示

device-manager-ui/admin/src/views/device/list.vue

@@ -12,7 +12,14 @@
     <el-link style="margin-left: 10px" type="primary" :underline="false"
       >地图模式</el-link
     >
-         <el-button style="float:right;margin-right:10px" type="text" icon="el-icon-back" @click="$router.go(-1)" size="small">返回</el-button>
+    <el-button
+      style="float: right; margin-right: 10px"
+      type="text"
+      icon="el-icon-back"
+      @click="$router.go(-1)"
+      size="small"
+      >返回</el-button
+    >
     <el-divider></el-divider>
     <LayoutTable :data="tableData" :config="tableConfig">
       <el-button
@@ -67,9 +74,6 @@
         type="danger"
         >未激活：{{ tableData.unActiveCount }}台</el-tag
       >
-
-
-  
     </LayoutTable>
 
     <!-- 设备导入对话框 -->
@@ -158,7 +162,11 @@ export default {
     /** 下载模板操作 */
     downloadTemplate() {
       this.isExport = true;
-      this.$download("/device/downloadTemplate", {}, { type: "excel",fileName:"设备导入模板" })
+      this.$download(
+        "/device/downloadTemplate",
+        {},
+        { type: "excel", fileName: "设备导入模板" }
+      )
         .then(() => (this.isExport = false))
         .catch((error) => {
           this.isExport = false;
@@ -184,15 +192,15 @@ export default {
     /** 导出Excel */
     doExport() {
       this.isExport = true;
-      console.log("ids", this.selection)
+      console.log("ids", this.selection);
       this.$download(
         "/device/exportExcel",
         {
-          "idList": this.selection,
-          "deviceName": this.$route.query["deviceName"],
-          "siteId": this.$route.query["siteId"],
+          idList: this.selection,
+          deviceName: this.$route.query["deviceName"],
+          siteId: this.$route.query["siteId"],
         },
-        { type: "excel" ,fileName:"设备表"}
+        { type: "excel", fileName: "设备表" }
       )
         .then(() => (this.isExport = false))
         .catch((error) => {
@@ -333,7 +341,7 @@ export default {
             label: "设备生产商",
             prop: "deviceFirmId",
             formatter: this.formatter,
-             width: 150,
+            width: 150,
           },
           { label: "负责人", prop: "leadingOfficial" },
           { label: "联系电话", prop: "leadingOfficialTelephone" },
@@ -343,6 +351,8 @@ export default {
             formatter: this.formatter,
           },
 
+          { label: "利旧设备", prop: "source", formatter: this.formatter },
+
           {
             prop: "enabled",
             label: "启用/停用",
@@ -356,7 +366,6 @@ export default {
             formatter: this.formatterDate,
           },
 
-          // { label: "激活状态", prop: "active", formatter: this.formatterYES },
           {
             label: "操作",
             width: 240,

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

@@ -87,6 +87,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
         this.addDict(model, "isReceiveMess", paramService.getParamBySecondOrganize("Device", "isReceiveMess"));
         this.addDict(model, "deviceStatus", paramService.getParamBySecondOrganize("Device", "deviceStatus"));
         this.addDict(model, "enabled", paramService.getParamBySecondOrganize("Device", "enabled"));
+        this.addDict(model, "source", YesNoEnum.getEnumMap());
 
         super.init(model, context);
     }