From 8575e6b8b9bd15bf15fc131eef38b8f8d4761bf4 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 19 Apr 2025 17:44:48 +0800
Subject: [PATCH] feat: 历史任务详细页调整
---
src/components/DeviceJobDetails/JobRelatedEvents.vue | 6 ++-
src/components/DeviceJobDetails/DeviceJobDetails.vue | 7 ++-
src/styles/element-ui.scss | 90 +++++++++++++++++++++++++++++++++++++--------
3 files changed, 82 insertions(+), 21 deletions(-)
diff --git a/src/components/DeviceJobDetails/DeviceJobDetails.vue b/src/components/DeviceJobDetails/DeviceJobDetails.vue
index 007edb7..0b219d6 100644
--- a/src/components/DeviceJobDetails/DeviceJobDetails.vue
+++ b/src/components/DeviceJobDetails/DeviceJobDetails.vue
@@ -69,14 +69,14 @@
import DeviceJobDetailsMap from './DeviceJobDetailsMap.vue'
const isShow = defineModel('show')
const infoList = ref([
- { name: '任务编号', value: '', field: 'job info num' },
+ { name: '任务编号', value: '', field: 'job_info_num' },
{ name: '任务所属机巢', value: '', field: 'device_names' },
{ name: '任务名称', value: '', field: 'name' },
{ name: '所属单位', value: '', field: 'dept_name' },
{ name: '任务类型', value: '', field: 'industry_type_str' },
{ name: '任务时间', value: '', field: 'begin_time' + ' - ' + 'end_time' },
{ name: '飞行事件', value: '', field: 'event_number' },
- { name: '任务频次', value: '', field: 'rep_rule_type' + ' - ' + 'rep_rule_val' },
+ { name: '任务频次', value: '', field: 'rep_rule_type rep_rule_val' },
{ name: '任务描述', value: '', field: 'remark' },
])
// 机巢状态
@@ -128,7 +128,8 @@
if (item.name === '任务时间') {
item.value = detailsData.value.begin_time.slice(0, 10) + '-' + detailsData.value.end_time.slice(0, 10)
} else if (item.name === '任务频次') {
- item.value ===undefined ? '' : detailsData.value.rep_rule_type + ' -- ' + detailsData.value.rep_rule_val
+ const { rep_rule_type = '', rep_rule_val = '' } = detailsData?.value || {}
+ item.value = rep_rule_type + ' -- ' + rep_rule_val
} else {
item.value = detailsData.value?.[item.field] || ''
}
diff --git a/src/components/DeviceJobDetails/JobRelatedEvents.vue b/src/components/DeviceJobDetails/JobRelatedEvents.vue
index 5384cec..93e6713 100644
--- a/src/components/DeviceJobDetails/JobRelatedEvents.vue
+++ b/src/components/DeviceJobDetails/JobRelatedEvents.vue
@@ -48,7 +48,7 @@
const list = ref()
const params = ref({
- wayLineJodInfoId: null,
+ way_line_jod_info_id: null,
})
const sizeParams = ref({
current: 1,
@@ -69,11 +69,13 @@
const wayLineJodInfoId = inject('wayLineJodInfoId')
const getList = () => {
- params.value.wayLineJodInfoId = wayLineJodInfoId.value
+ params.value.way_line_jod_info_id = wayLineJodInfoId.value
+
getDeviceEventList(params.value, sizeParams.value).then(res => {
const resData = res?.data?.data || {}
list.value = resData.records
total.value = resData.total
+
})
}
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 5668e7c..5f68843 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -245,7 +245,6 @@
border: 1px solid !important;
border-radius: 0px 0px 8px 8px;
border-image: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(115, 192, 255, 1)) 1 1 !important;
- /* 修改箭头样式 */
.el-popper__arrow {
&::before {
background: #0d3556 !important;
@@ -253,23 +252,23 @@
box-sizing: border-box;
}
}
- /* 修改头部背景色 */
+
.custom-date-picker .el-picker-panel__header {
background: linear-gradient(180deg, rgba(13, 53, 86, 0.85) 0%, rgba(1, 35, 80, 0.85) 100%) !important;
color: #fff !important;
}
.el-date-table {
th {
- color: #fff !important; /* 星期标题颜色 */
+ color: #fff !important;
}
}
- /* 修改日期单元格悬停/选中状态 */
+
.custom-date-picker .el-date-table td:hover,
.custom-date-picker .el-date-table td.current:not(.disabled) {
background: rgba(60, 121, 202) !important;
color: white !important;
}
- // 头部按钮
+
.el-date-table td.start-date span,
.el-date-table td.start-date span,
.el-date-table td.end-date span {
@@ -337,33 +336,33 @@
overflow-x: hidden !important;
margin-right: 0 !important;
}
- /* 箭头样式 */
+
.el-popper__arrow::before {
background: #0d3556 !important;
border: 1px solid #0d3556 !important;
}
.el-select {
--el-select-border-color-hover: rgb(0, 162, 255) !important;
- /* // 修改下拉框hover的默认样式 */
+
}
.el-input {
--el-border-color: rgb(0, 162, 255);
- /* // 修改下拉框的边框 */
+
}
.el-select .el-input__wrapper {
background-color: #012350 !important;
- /* // 外层下拉框背景 */
+
}
.el-input__wrapper {
- --el-input-text-color: #012350 !important; /* // 修改外层下拉框的颜色 */
+ --el-input-text-color: #012350 !important;
}
.el-select__popper.el-popper {
border: rgba(0, 27, 63) !important;
- /* // 修改内部下拉框的边框颜色 */
+
}
.el-select-dropdown__wrap {
@@ -371,11 +370,11 @@
border-radius: 0px 0px 8px 8px;
border: 1px solid;
border-image: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(115, 192, 255, 1)) 1 1;
- /* // 下拉框背景色 */
+
}
.el-select-dropdown__item {
- background: rgba(0, 27, 63) !important; /* // 下拉框选项的颜色 */
+ background: #012350 !important;
}
.el-select-dropdown__item {
@@ -447,11 +446,11 @@
text-transform: none;
background: linear-gradient(90deg, #fbfdff 0%, #86d4ff 100%);
margin-left: 16px;
- -webkit-background-clip: text; /* 背景被裁剪成文字的前景色 */
- -webkit-text-fill-color: transparent; /* 文字填充颜色变透明 */
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
}
.el-dialog .el-dialog__header {
- /* margin: 0px !important; */
+
padding: 0px !important;
padding-left: 0px !important;
}
@@ -459,4 +458,63 @@
background: #13c6ff !important;
}
}
+/* 时间选择器下拉面板 */
+.custom-time-picker {
+ /* 整体背景和边框 */
+background: linear-gradient( 180deg, rgba(13,53,86,0.85) 0%, rgba(1,35,80,0.85) 100%) !important;
+border-radius: 0px 0px 8px 8px;
+border: 1px solid !important;
+border-image: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(115, 192, 255, 1)) 1 1 !important;
+ /* 修改箭头样式 */
+ .el-popper__arrow::before {
+ background: #0D3556 !important;
+ border: 1px solid #479DFF !important;
+ }
+
+ /* 时间面板头部 */
+ .el-time-panel__header {
+ background: #012350 !important;
+ color: #FFFFFF !important;
+ border-bottom: 1px solid rgba(71, 157, 255, 0.3) !important;
+ }
+
+ /* 时间选择区域 */
+ .el-time-panel__content {
+ background: #012350 !important;
+
+ /* 时间数字项 */
+ .el-time-spinner__item {
+ color: #E6E6E6 !important;
+
+ &:hover {
+ background: rgba(71, 157, 255, 0.3) !important;
+ }
+
+ &.active {
+ color: #479DFF !important;
+ font-weight: bold;
+ }
+ }
+ }
+
+
+ .el-time-panel__footer {
+ background: #012350 !important;
+ border-top: 1px solid rgba(71, 157, 255, 0.3) !important;
+
+ .el-button {
+ color: #fff !important;
+ &:hover {
+ color: #479DFF !important;
+ }
+ }
+
+ .el-time-panel__btn.cancel {
+ color: #fff !important;
+ &:hover {
+ color: #fff !important;
+ }
+ }
+ }
+}
--
Gitblit v1.9.3