From 5151d7aac52e01760ba61498496b98de1f835c22 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 19 Sep 2025 14:16:18 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.2' into prod
---
src/views/device/addDevice.vue | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index 45ebc85..3c32c25 100644
--- a/src/views/device/addDevice.vue
+++ b/src/views/device/addDevice.vue
@@ -11,7 +11,7 @@
@click.stop="copyInfo(scope.row, scope.index)" v-if="userInfo.role_name.includes('admin')">复制
</el-button>
</template>
- </avue-crud>
+ </avue-crud>F
</basic-container>
</template>
@@ -276,6 +276,18 @@
},
},
{
+ label: '创建时间',
+ prop: 'create_time',
+ addDisplay: false,
+ editDisplay: false,
+ overHidden: true,
+ type: 'date',
+ labelWidth: 130,
+ width: 160,
+ format: 'YYYY-MM-DD HH:mm:ss',
+
+ },
+ {
label: '设备描述', // '工作空间描述',
prop: 'workspace_desc',
type: 'textarea',
@@ -312,18 +324,7 @@
],
},
- {
- label: '创建时间',
- prop: 'create_time',
- addDisplay: false,
- editDisplay: false,
- overHidden: true,
- type: 'date',
- labelWidth: 130,
- width: 160,
- format: 'YYYY-MM-DD HH:mm:ss',
-
- },
+
],
--
Gitblit v1.9.3