diff --git a/src/assets/custom.scss b/src/assets/custom.scss index f66d53e..f912fe4 100644 --- a/src/assets/custom.scss +++ b/src/assets/custom.scss @@ -124,7 +124,10 @@ :deep(.vben-basic-table .ant-table-wrapper .ant-table.ant-table-bordered .ant-table-title) { padding-top: 8px !important; - border-radius: 0; + border-radius: 8px 8px 0 0; + border-left: 1px solid #183171 !important; + border-top: 1px solid #183171 !important; + border-right: 1px solid #183171 !important; background-color: #13265a !important; } @@ -475,3 +478,39 @@ :deep(.ant-picker-time-panel-cell-selected .ant-picker-time-panel-cell-inner) { background-color: rgba(146,214,237,0.3) !important; } + +:deep(.ant-card) { + border: 1px solid #183171 !important; + background-color: #13265a !important; +} + +:deep(.ant-card-body) { + padding: 0 !important ; +} + +:deep(.ant-page-header-heading-title) { + font-family: "Noto Sans SC", serif; + font-size: 20px; + font-weight: normal; + color: white !important; +} + +:deep(.ant-descriptions-view) { + border: 1px solid #183171 !important; +} + +:deep(.ant-descriptions-row) { + border-bottom: 1px solid #183171 !important; +} + +:deep(.ant-descriptions-item-label) { + background-color: rgba(146,214,237,0.05) !important; +} + +:deep(.ant-descriptions-item-label), +:deep(.ant-descriptions-item-content) { + font-family: "Noto Sans SC", serif; + font-size: 14px; + color: white !important; + border-inline-end: 1px solid #183171 !important; +} diff --git a/src/router/routes/embedded/data.ts b/src/router/routes/embedded/data.ts index 726137a..a7c4e5f 100644 --- a/src/router/routes/embedded/data.ts +++ b/src/router/routes/embedded/data.ts @@ -26,7 +26,7 @@ const data: AppRouteModule = { name: 'TaskPage', component: () => import('/@/views/data/task/index.vue'), meta: { - title: '任务', + title: '任务管理', ignoreAuth: true, }, }, @@ -39,6 +39,15 @@ const data: AppRouteModule = { ignoreAuth: true, }, }, + { + path: 'task-log', + name: 'TaskLogPage', + component: () => import('/@/views/data/task-log/index.vue'), + meta: { + title: '任务日志', + ignoreAuth: true, + }, + }, ], }; diff --git a/src/views/data/device/drawer.vue b/src/views/data/device/drawer.vue index 61f00ec..aefe1fe 100644 --- a/src/views/data/device/drawer.vue +++ b/src/views/data/device/drawer.vue @@ -15,7 +15,7 @@ const entity = ref(); const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({ - labelWidth: 120, + labelWidth: 100, schemas: formSchema, showActionButtonGroup: false, }); diff --git a/src/views/data/task-log/detail.vue b/src/views/data/task-log/detail.vue deleted file mode 100644 index b97e9dc..0000000 --- a/src/views/data/task-log/detail.vue +++ /dev/null @@ -1,74 +0,0 @@ - - - - diff --git a/src/views/data/task-log/drawer.vue b/src/views/data/task-log/drawer.vue deleted file mode 100644 index 2841733..0000000 --- a/src/views/data/task-log/drawer.vue +++ /dev/null @@ -1,63 +0,0 @@ - - diff --git a/src/views/data/task-log/index.vue b/src/views/data/task-log/index.vue index d544931..db72920 100644 --- a/src/views/data/task-log/index.vue +++ b/src/views/data/task-log/index.vue @@ -1,128 +1,50 @@ - + diff --git a/src/views/data/task-log/schema.ts b/src/views/data/task-log/schema.ts index 38b6ea9..e0e5d0a 100644 --- a/src/views/data/task-log/schema.ts +++ b/src/views/data/task-log/schema.ts @@ -10,9 +10,7 @@ import { BasicColumn } from '@/components/Table'; import { FormSchema } from '@/components/Table'; - - -const colProps = { xs: { span: 24 }, sm: { span: 24 }, lg: { span: 8 } }; +const colProps = { xs: { span: 24 }, sm: { span: 24 }, lg: { span: 6 } }; const colPropsInDrawer = { span: 24 }; export const schema = { @@ -37,7 +35,7 @@ export const schema = { }, { field: 'taskId', - label: 'dat_detect_task.id', + label: '任务ID', defaultValue: undefined, form: { componentProps: { @@ -49,6 +47,7 @@ export const schema = { rules: [{ required: true, message: '请输入dat_detect_task.id!' }], }, table: { + width: 140, }, }, { @@ -64,6 +63,7 @@ export const schema = { component: 'Input', }, table: { + width: 200, }, }, { @@ -79,11 +79,12 @@ export const schema = { component: 'Input', }, table: { + ellipsis: true, }, }, { field: 'createTime', - label: 'CreateTime', + label: '创建时间', defaultValue: undefined, form: { colProps, @@ -98,6 +99,7 @@ export const schema = { rules: [{ required: true, message: '请输入CreateTime!' }], }, table: { + width: 150, }, }, { @@ -122,10 +124,10 @@ export const schema = { ], }; -const queryFields = ['id','taskId','deviceSn','content','createTime','updateTime']; +const queryFields = ['deviceSn', 'createTime']; const editFields = ['taskId','deviceSn','content']; -const tableFields = ['taskId','deviceSn','content','createTime','updateTime']; -const descriptionFields = ['taskId','deviceSn','content','createTime','updateTime']; +const tableFields = ['taskId','deviceSn','content','createTime']; +const descriptionFields = ['taskId','deviceSn','content','createTime']; const queryFieldsIndexMap = new Map(queryFields.map((field, index) => [field, index])); export const searchFormSchema: FormSchema[] = schema.properties.filter(item => queryFields.includes(item.field)) diff --git a/src/views/data/task/detail.vue b/src/views/data/task/detail.vue index b1af3e3..89f9f0f 100644 --- a/src/views/data/task/detail.vue +++ b/src/views/data/task/detail.vue @@ -1,29 +1,24 @@