diff --git a/src/assets/iot/db_xlh.png b/src/assets/iot/db_xlh.png new file mode 100644 index 0000000..f8e0ed8 Binary files /dev/null and b/src/assets/iot/db_xlh.png differ diff --git a/src/assets/iot/recorder_sn.png b/src/assets/iot/recorder_sn.png new file mode 100644 index 0000000..34229c2 Binary files /dev/null and b/src/assets/iot/recorder_sn.png differ diff --git a/src/assets/iot/router_sn.png b/src/assets/iot/router_sn.png new file mode 100644 index 0000000..29ba693 Binary files /dev/null and b/src/assets/iot/router_sn.png differ diff --git a/src/assets/iot/sb_sn.png b/src/assets/iot/sb_sn.png new file mode 100644 index 0000000..c494361 Binary files /dev/null and b/src/assets/iot/sb_sn.png differ diff --git a/src/assets/iot/switch_sn.png b/src/assets/iot/switch_sn.png new file mode 100644 index 0000000..7e4c086 Binary files /dev/null and b/src/assets/iot/switch_sn.png differ diff --git a/src/assets/iot/wsdj_sn.png b/src/assets/iot/wsdj_sn.png new file mode 100644 index 0000000..44ca6f5 Binary files /dev/null and b/src/assets/iot/wsdj_sn.png differ diff --git a/src/views/iot/manager/components/preview/DevicePreviewForm.vue b/src/views/iot/manager/components/preview/DevicePreviewForm.vue index ee8a6bf..d69170b 100644 --- a/src/views/iot/manager/components/preview/DevicePreviewForm.vue +++ b/src/views/iot/manager/components/preview/DevicePreviewForm.vue @@ -13,16 +13,60 @@ - + + + + + + + +
+ 提示:请正确填写设备标识,如标识填写错误,将无法正常集成设备! +
+
+
+ + + +
+ 提示:请正确填写设备标识,如标识填写错误,将无法正常集成设备! +
+
+
+ + + +
+ 提示:请正确填写设备标识,如标识填写错误,将无法正常集成设备! +
+
+
+ + + +
+ 提示:请正确填写设备标识,如标识填写错误,将无法正常集成设备! +
+
+
+ + + +
+ 提示:请正确填写设备标识,如标识填写错误,将无法正常集成设备! +
+
+
+ + + +
+ 提示:请正确填写设备标识,如标识填写错误,将无法正常集成设备!
- -
- 提示:请正确填写设备标识,如标识填写错误,将无法正常集成设备! -
-
+
@@ -56,6 +100,7 @@ const formData = reactive>({ sn: undefined, ywId: undefined, remarks: undefined, + deviceType: undefined, }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); @@ -90,6 +135,7 @@ function add() { * 编辑 */ async function edit(record) { + console.log(record); isUpdate.value = true; nextTick(() => { resetFields(); @@ -155,4 +201,12 @@ defineExpose({ diff --git a/src/views/iot/manager/manager.data.ts b/src/views/iot/manager/manager.data.ts index 9d8831d..1612461 100644 --- a/src/views/iot/manager/manager.data.ts +++ b/src/views/iot/manager/manager.data.ts @@ -37,6 +37,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'dimension', }, + { + title: '设备类型', + align: "center", + dataIndex: 'deviceType_dictText', + }, { title: '设备标识', align: "center", @@ -47,11 +52,6 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'deviceName', }, - { - title: '设备类型', - align: "center", - dataIndex: 'deviceType_dictText', - }, { title: '设备型号', align: "center", @@ -84,30 +84,15 @@ export const previewColumns: BasicColumn[] = [ dataIndex: 'batchNo', }, { - title: '设备名称', + title: '设备维度', align: "center", - dataIndex: 'deviceName', + dataIndex: 'dimension', }, { title: '设备类型', align: "center", dataIndex: 'deviceType_dictText', }, - { - title: '设备型号', - align: "center", - dataIndex: 'deviceModel', - }, - { - title: '生产厂家', - align: "center", - dataIndex: 'factory', - }, - { - title: '设备维度', - align: "center", - dataIndex: 'dimension', - }, { title: '设备标识', align: "center", @@ -122,6 +107,21 @@ export const previewColumns: BasicColumn[] = [ } }, }, + { + title: '设备名称', + align: "center", + dataIndex: 'deviceName', + }, + { + title: '设备型号', + align: "center", + dataIndex: 'deviceModel', + }, + { + title: '生产厂家', + align: "center", + dataIndex: 'factory', + }, { title: '时间', align: "center",