From 974394f7a0496fa8e37dd326b6f9313e14caa708 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 26 Jun 2025 17:35:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/all_setting_styles' into all_setting_styles
---
src/views/device/components/devicePerShare.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/device/components/devicePerShare.vue b/src/views/device/components/devicePerShare.vue
index 780466a..0abf44a 100644
--- a/src/views/device/components/devicePerShare.vue
+++ b/src/views/device/components/devicePerShare.vue
@@ -46,8 +46,6 @@
option: {
lazy: true,
tree: true,
- height: 'auto',
- calcHeight: 32,
dialogWidth: 750,
tip: false,
searchShow: true,
@@ -173,7 +171,10 @@
});
},
rowSave(row, done, loading) {
- row['device_sn'] = this.deviceSn;
+ // 添加毫秒级时间戳
+ row['createTime'] = Date.now();
+ row['deviceSn'] = this.deviceSn;
+
add(row).then(
() => {
this.initFlag = false;
@@ -281,7 +282,7 @@
this.getLoadPage(this.page, this.query);
},
getLoadPage(page, params = {}) {
- params['device_sn'] = this.deviceSn;
+ params['deviceSn'] = this.deviceSn;
this.loading = true;
getList(page.currentPage, page.pageSize, params).then(res => {
const data = res.data.data;
@@ -306,4 +307,4 @@
.firmware_status:hover {
cursor: pointer;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3