From c0b71536886460d66a2054f7c1f33fbd10e9140d Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Wed, 16 Jul 2025 08:55:24 +0800 Subject: [PATCH] =?UTF-8?q?#6=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=9C=BA=E5=9C=BA=E5=8F=8A=E9=A3=9E=E8=A1=8C=E5=99=A8=E7=9A=84?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E9=83=BD=E6=9C=AA=E7=94=9F?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workmanagement/device/Aerocraft/index.vue | 4 +- .../workmanagement/device/Aerocraft/utils.ts | 41 ++--------- .../workmanagement/device/Airport/index.vue | 2 +- .../workmanagement/device/Airport/utils.ts | 72 +++++++++---------- 4 files changed, 41 insertions(+), 78 deletions(-) diff --git a/src/views/demo/workmanagement/device/Aerocraft/index.vue b/src/views/demo/workmanagement/device/Aerocraft/index.vue index c84a363..bd557bc 100644 --- a/src/views/demo/workmanagement/device/Aerocraft/index.vue +++ b/src/views/demo/workmanagement/device/Aerocraft/index.vue @@ -37,7 +37,7 @@ import { h, watch, onMounted, ref, nextTick } from "vue" import { EditOutlined } from '@ant-design/icons-vue' import { BasicTable, useTable, TableAction } from '@/components/Table'; -import { columns, dataSource, searchFormSchema } from './utils' +import { columns, searchFormSchema } from './utils' import { GetUavPageList, DeleteUav } from '@/api/demo/device' import { getClient, clientSubscribe } from '@/utils/mqtt' import dayjs from "dayjs"; @@ -48,7 +48,7 @@ const props = defineProps(['projectList','connected']) const editDeviceDate = ref({}) const editDeviceModal = ref(false) onMounted(() => { - const targetField = searchFormSchema.find(item => item.field === 'project'); + const targetField = searchFormSchema.find(item => item.field === 'workspaceid'); if (targetField) { targetField.componentProps = { ...(targetField.componentProps || {}), diff --git a/src/views/demo/workmanagement/device/Aerocraft/utils.ts b/src/views/demo/workmanagement/device/Aerocraft/utils.ts index d8b721a..4fd6cd8 100644 --- a/src/views/demo/workmanagement/device/Aerocraft/utils.ts +++ b/src/views/demo/workmanagement/device/Aerocraft/utils.ts @@ -33,27 +33,10 @@ export const columns = [ dataIndex: 'online_time', }, ]; -export const dataSource = [ - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, - { model: 111, sn:222, name: 333, version: 444, status: 555, project: 666, join_time: 777, online_time: 888 }, -] + export const searchFormSchema: FormSchema[] = [ { - field: 'project', + field: 'workspaceid', label: '项目', component: 'Select', componentProps: { @@ -63,25 +46,9 @@ export const searchFormSchema: FormSchema[] = [ colProps: { span: 4 }, }, { - field: 'status', - label: '当前状态', - component: 'Select', - componentProps: { - options: [ - { label: '在线', value: '在线' }, - { label: '离线', value: '离线' }, - ], - }, - colProps: { span: 4 }, - }, - { - field: 'model', + field: 'type', label: '设备型号', - component: 'Select', - componentProps: { - options: [ - ], - }, + component: 'Input', colProps: { span: 4 }, }, { diff --git a/src/views/demo/workmanagement/device/Airport/index.vue b/src/views/demo/workmanagement/device/Airport/index.vue index aba2871..74e9708 100644 --- a/src/views/demo/workmanagement/device/Airport/index.vue +++ b/src/views/demo/workmanagement/device/Airport/index.vue @@ -88,7 +88,7 @@ import { cloneDeep } from 'lodash-es'; const props = defineProps(['projectList','connected']) watch(() => props.projectList, () => { - const targetField = searchFormSchema.find(item => item.field === 'project'); + const targetField = searchFormSchema.find(item => item.field === 'workspaceid'); if (targetField) { targetField.componentProps = { ...(targetField.componentProps || {}), diff --git a/src/views/demo/workmanagement/device/Airport/utils.ts b/src/views/demo/workmanagement/device/Airport/utils.ts index 43273c4..fed0045 100644 --- a/src/views/demo/workmanagement/device/Airport/utils.ts +++ b/src/views/demo/workmanagement/device/Airport/utils.ts @@ -43,39 +43,39 @@ export const columns = [ ]; export const searchFormSchema: FormSchema[] = [ + // { + // field: 'upgrade_status', + // label: '升级状态', + // component: 'Select', + // componentProps: { + // options: [ + // { label: '固件待升级', value: '固件待升级' }, + // { label: '固件一致性升级', value: '固件一致性升级' }, + // { label: '飞行安全数据库待升级', value: '飞行安全数据库待升级' }, + // ], + // }, + // colProps: { span: 4 }, + // }, + // { + // field: 'work_status', + // label: '工作状态', + // component: 'Select', + // componentProps: { + // options: [ + // { label: '全部工作状态', value: '全部工作状态' }, + // { label: '设备空闲中', value: '设备空闲中' }, + // { label: '现场调试中', value: '现场调试中' }, + // { label: '远程调试中', value: '远程调试中' }, + // { label: '设备作业中', value: '设备作业中' }, + // { label: '设备升级中', value: '设备升级中' }, + // { label: '设备已离线', value: '设备已离线' }, + // { label: '未标定', value: '未标定' }, + // ], + // }, + // colProps: { span: 4 }, + // }, { - field: 'upgrade_status', - label: '升级状态', - component: 'Select', - componentProps: { - options: [ - { label: '固件待升级', value: '固件待升级' }, - { label: '固件一致性升级', value: '固件一致性升级' }, - { label: '飞行安全数据库待升级', value: '飞行安全数据库待升级' }, - ], - }, - colProps: { span: 4 }, - }, - { - field: 'work_status', - label: '工作状态', - component: 'Select', - componentProps: { - options: [ - { label: '全部工作状态', value: '全部工作状态' }, - { label: '设备空闲中', value: '设备空闲中' }, - { label: '现场调试中', value: '现场调试中' }, - { label: '远程调试中', value: '远程调试中' }, - { label: '设备作业中', value: '设备作业中' }, - { label: '设备升级中', value: '设备升级中' }, - { label: '设备已离线', value: '设备已离线' }, - { label: '未标定', value: '未标定' }, - ], - }, - colProps: { span: 4 }, - }, - { - field: 'project', + field: 'workspaceid', label: '项目', component: 'Select', componentProps: { @@ -87,15 +87,11 @@ export const searchFormSchema: FormSchema[] = [ { field: 'model', label: '设备型号', - component: 'Select', - componentProps: { - options: [ - ], - }, + component: 'Input', colProps: { span: 4 }, }, { - field: 'key', + field: 'sn', label: '设备SN', component: 'Input', colProps: { span: 6 },