From 4cc30b2ee7bf3ca7451c519091af6df8e4abddf7 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 04 Sep 2025 11:26:12 +0800
Subject: [PATCH] feat:更新设备和注册
---
src/views/device/addDevice.vue | 72 ++++++++++-------
src/views/device/airport.vue | 110 +++++++++++++++------------
2 files changed, 103 insertions(+), 79 deletions(-)
diff --git a/src/views/device/addDevice.vue b/src/views/device/addDevice.vue
index 622bef8..4bf099e 100644
--- a/src/views/device/addDevice.vue
+++ b/src/views/device/addDevice.vue
@@ -92,7 +92,8 @@
{
label: '设备名称',// '工作空间名称',
prop: 'workspace_name',
- editDisabled: true,
+ // editDisabled: true,
+ editDisplay: false,
searchLabelWidth: 130,
search: true,
// searchSpan: 4,
@@ -110,7 +111,8 @@
prop: 'platform_name',
labelWidth: 130,
width: 180,
- editDisabled: true,
+ // editDisabled: true,
+ editDisplay: false,
type: 'select',
dicData: this.systemNamesDicData,
rules: [
@@ -163,7 +165,8 @@
label: '绑定编号',
prop: 'bind_code',
labelWidth: 130,
- editDisabled: true,
+ // editDisabled: true,
+ editDisplay: false,
rules: [
{
required: false,
@@ -174,6 +177,7 @@
},
{
label: '设备类型',
+ editDisplay: false,
prop: 'type',
type: 'radio',
labelWidth: 130,
@@ -196,34 +200,6 @@
trigger: 'change',
},
],
- },
- {
- label: '设备描述',// '工作空间描述',
- prop: 'workspace_desc',
- labelWidth: 130,
- // search: true,
- searchSpan: 4,
- // editDisabled: true,
- rules: [
- {
- required: true,
- message: '请输入设备描述',
- trigger: 'blur',
- },
- ],
- },
-
- {
- label: '创建时间',
- prop: 'create_time',
- addDisplay: false,
- editDisplay: false,
- overHidden: true,
- type: 'date',
- labelWidth: 130,
- width: 160,
- format: 'YYYY-MM-DD HH:mm:ss',
-
},
{
label: '设备位置',// '行政区划',
@@ -296,6 +272,35 @@
}
},
},
+ {
+ label: '设备描述',// '工作空间描述',
+ prop: 'workspace_desc',
+ labelWidth: 130,
+ // search: true,
+ searchSpan: 4,
+ // editDisabled: true,
+ rules: [
+ {
+ required: true,
+ message: '请输入设备描述',
+ trigger: 'blur',
+ },
+ ],
+ },
+
+ {
+ label: '创建时间',
+ prop: 'create_time',
+ addDisplay: false,
+ editDisplay: false,
+ overHidden: true,
+ type: 'date',
+ labelWidth: 130,
+ width: 160,
+ format: 'YYYY-MM-DD HH:mm:ss',
+
+ },
+
],
},
@@ -611,7 +616,12 @@
}
values.releaseTimeRange = null
}
+ console.log(values.area_code,this.query)
values['type'] = 1
+ if (values.area_code) {
+ values['area_code'] = values.area_code.split(',').pop()
+ }
+
this.loading = true
getList(page.currentPage, page.pageSize, values).then(async res => {
const data = res.data.data
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index ad58710..bd3b139 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -323,7 +323,7 @@
{
label: '设备类型',
prop: 'domainTxt',
- editDisabled: true,
+ // editDisabled: true,
editDisplay: false, //编辑显示
viewDisplay: true, //查看显示
labelWidth: 130,
@@ -333,7 +333,8 @@
{
label: '设备型号',
prop: 'device_name',
- editDisabled: true,
+ // editDisabled: true,
+ editDisplay: false, //编辑显示
viewDisplay: true, //查看显示
search: false,
searchSpan: 4,
@@ -354,7 +355,8 @@
width: 120,
overHidden: true,
searchSpan: 4,
- editDisabled: true,
+ // editDisabled: true,
+ editDisplay: false, //编辑显示
// rules: [
// {
// required: true,
@@ -376,23 +378,6 @@
// },
// ],
// },
- {
- label: '设备名称',
- prop: 'nickname',
- labelWidth: 130,
- width: 160,
- searchSpan: 4,
- search: true,
- overHidden: true,
- editDisplay: true, //编辑显示
- rules: [
- {
- required: true,
- message: '请输入设备名称',
- trigger: 'blur',
- },
- ],
- },
{
label: '设备位置',// '行政区划',
prop: 'area_name',
@@ -464,6 +449,24 @@
}
},
},
+ {
+ label: '设备名称',
+ prop: 'nickname',
+ labelWidth: 130,
+ width: 160,
+ searchSpan: 4,
+ search: true,
+ overHidden: true,
+ editDisplay: true, //编辑显示
+ rules: [
+ {
+ required: true,
+ message: '请输入设备名称',
+ trigger: 'blur',
+ },
+ ],
+ },
+
// {
// label: '设备位置',
// prop: 'address',
@@ -485,7 +488,8 @@
labelWidth: 130,
width: 160,
overHidden: true,
- editDisabled: true,
+ editDisplay: false, //编辑显示
+ // editDisabled: true,
// rules: [
// {
// required: true,
@@ -493,6 +497,25 @@
// trigger: 'blur',
// },
// ],
+ },
+ {
+ // hide: true,
+ label: '保险有效期',
+ prop: 'duration_of_insurance',
+ labelWidth: 130,
+ width: 200,
+ type: 'daterange',
+ format: 'YYYY-MM-DD',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ startPlaceholder: '保险开始日期',
+ endPlaceholder: '保险结束日期',
+ rules: [
+ {
+ required: true,
+ message: '请选择保险有效期',
+ trigger: 'blur',
+ },
+ ],
},
// {
// label: '保险有效期',
@@ -512,7 +535,8 @@
prop: 'traffic_remaining',
labelWidth: 130,
width: 100,
- editDisabled: true,
+ // editDisabled: true,
+ editDisplay: false, //编辑显示
// rules: [
// {
// required: true,
@@ -528,7 +552,8 @@
width: 120,
type: 'date',
format: 'YYYY-MM-DD',
- editDisabled: true,
+ editDisplay: false, //编辑显示
+ // editDisabled: true,
// rules: [
// {
// required: true,
@@ -542,7 +567,8 @@
prop: 'firmware_version',
labelWidth: 130,
width: 110,
- editDisabled: true,
+ editDisplay: false, //编辑显示
+ // editDisabled: true,
// rules: [
// {
// required: true,
@@ -559,7 +585,8 @@
hide: true,
viewDisabled: true,
addDisabled: true,
- editDisabled: true,
+ editDisplay: false, //编辑显示
+ // editDisabled: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
@@ -629,32 +656,15 @@
// },
- {
- // hide: true,
- label: '保险有效期',
- prop: 'duration_of_insurance',
- labelWidth: 130,
- width: 200,
- type: 'daterange',
- format: 'YYYY-MM-DD',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
- startPlaceholder: '保险开始日期',
- endPlaceholder: '保险结束日期',
- rules: [
- {
- required: true,
- message: '请选择保险有效期',
- trigger: 'blur',
- },
- ],
- },
+
{
label: '在线时间',
+ hide: true,
prop: 'login_time',
type: 'date',
- editDisplay: true, //编辑显示
- editDisabled: true,
+ editDisplay: false, //编辑显示
+ // editDisabled: true,
viewDisplay: true, //查看显示
addDisplay: true,
labelWidth: 130,
@@ -675,8 +685,9 @@
label: '注册时间',
prop: 'create_time',
type: 'date',
- editDisplay: true, //编辑显示
- editDisabled: true,
+ hide: true,
+ editDisplay: false, //编辑显示
+ // editDisabled: true,
viewDisplay: true, //查看显示
addDisplay: true,
overHidden: true,
@@ -1384,6 +1395,9 @@
values.releaseTimeRange = null
}
values['type'] = 1
+ if (values.area_code) {
+ values['area_code'] = values.area_code.split(',').pop()
+ }
this.loading = true
getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data
--
Gitblit v1.9.3