wenhongquan 5 months ago
parent
commit
9ab68ee3bd

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/data/domain/TblVideo.java

@@ -50,7 +50,7 @@ public class TblVideo extends BaseEntity {
     /**
      * 设备型号
      */
-    private Long model;
+    private String model;
     /**
      * 视频制式
      */

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblVideoBo.java

@@ -63,7 +63,7 @@ public class TblVideoBo extends BaseEntity {
      * 设备型号
      */
 //    @NotNull(message = "设备型号不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long model;
+    private String model;
 
     /**
      * 视频制式

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblVideoVo.java

@@ -61,7 +61,7 @@ public class TblVideoVo implements Serializable {
      * 设备型号
      */
     @ExcelProperty(value = "设备型号")
-    private Long model;
+    private String model;
 
     /**
      * 视频制式

+ 2 - 1
ruoyi-ui-vue3/package.json

@@ -44,5 +44,6 @@
     "vite": "3.2.3",
     "vite-plugin-compression": "0.5.1",
     "vite-plugin-svg-icons": "2.0.1"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

+ 3 - 0
ruoyi-ui-vue3/src/views/device/equipmentdash/index.vue

@@ -375,6 +375,9 @@ const getlistEquipmentSbook = () => {
   listEquipmentSbook({ ...searchform.value, pageSize: pagedata.value.size, pageNum: pagedata.value.current }).then(res => {
     const { rows, total, page, size } = res;
     devicetabledata.value = res.rows
+    pagedata.value.total = total;
+    pagedata.value.size = size;
+    pagedata.value.current = page;
   })
 }