From f8d66baea0d3d4dde652720ac9ea829b1b6407eb Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 18:22:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/components/DeviceJobDetails/JobRelatedEvents.vue | 2
src/components/DeviceJobDetails/DeviceJobDetails.vue | 14 ++++---
src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue | 3 +
src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue | 3 +
src/styles/element-ui.scss | 57 ++++++++++++++++++++++------
src/views/Home/SearchBox.vue | 1
6 files changed, 60 insertions(+), 20 deletions(-)
diff --git a/src/components/DeviceJobDetails/DeviceJobDetails.vue b/src/components/DeviceJobDetails/DeviceJobDetails.vue
index 4f432ca..3accea9 100644
--- a/src/components/DeviceJobDetails/DeviceJobDetails.vue
+++ b/src/components/DeviceJobDetails/DeviceJobDetails.vue
@@ -18,7 +18,7 @@
<div v-for="(item, index) in infoList" :key="index">
<div class="itemBox">
<div class="itemTitle">{{ item.name }}：</div>
- <div class="itemValue">{{ item.value ? item.value : '' }}</div>
+ <div class="itemValue">{{ item.value ? item.value : '--' }}</div>
</div>
</div>
</div>
@@ -74,7 +74,7 @@
{ 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: 'cycle_time_value' },
{ name: '飞行事件', value: '', field: 'event_number' },
{ name: '任务频次', value: '', field: 'rep_rule_type rep_rule_val' },
{ name: '任务描述', value: '', field: 'remark' },
@@ -123,14 +123,16 @@
const getDetails = () => {
getJobDetails({ wayLineJobInfoId: wayLineJodInfoId.value }).then(res => {
detailsData.value = res.data.data
+
infoList.value.forEach(item => {
- if (item.name === '任务时间') {
- item.value = detailsData.value.begin_time.slice(0, 10) + '-' + detailsData.value.end_time.slice(0, 10)
- } else if (item.name === '任务频次') {
+ // if (item.name === '任务时间') {
+ // item.value = detailsData.value.begin_time.slice(0, 10) + '-' + detailsData.value.end_time.slice(0, 10)
+ // } else
+ if (item.name === '任务频次') {
const { rep_rule_type = '', rep_rule_val = '' } = detailsData?.value || {}
item.value = rep_rule_type + ' -- ' + rep_rule_val
} else {
- item.value = detailsData.value?.[item.field] || ''
+ item.value = detailsData.value?.[item.field] || '--'
}
})
flystatus.value = res.data.data.ai_type_str
diff --git a/src/components/DeviceJobDetails/JobRelatedEvents.vue b/src/components/DeviceJobDetails/JobRelatedEvents.vue
index ef28ccd..97e8f6e 100644
--- a/src/components/DeviceJobDetails/JobRelatedEvents.vue
+++ b/src/components/DeviceJobDetails/JobRelatedEvents.vue
@@ -8,7 +8,7 @@
:row-style="{ height: '38px', fontSize: '14px', 'text-align': 'center' }"
:header-cell-style="{ 'text-align': 'center', height: '36px', fontSize: '14px' }"
>
- <el-table-column prop="id" label="事件编号" />
+ <el-table-column prop="event_num" label="事件编号" />
<el-table-column show-overflow-tooltip prop="event_name" label="事件名称" />
<el-table-column show-overflow-tooltip prop="dept_name" label="所属单位" />
<el-table-column show-overflow-tooltip prop="remark" label="事件内容" />
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 5f68843..88eaafd 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -296,7 +296,7 @@
}
}
//下拉
-// :teleported="false"
+// :teleported="false"（修改下拉框样式，在el-select添加）别删
.ztzf-select {
.el-select__wrapper {
background: #012A50;
@@ -407,7 +407,6 @@
}
// 弹框-dialog
.ztzf-dialog {
-
background: #0f1929;
box-shadow: inset 0px -50px 50px 0px rgba(27, 148, 255, 0.13);
border-radius: 20px 0px 0px 0px;
@@ -422,7 +421,6 @@
rgba(27, 148, 255, 1)
)
2 2;
- // 头部
.el-dialog__header {
width: 100%;
height: 47px;
@@ -460,30 +458,21 @@
}
/* 时间选择器下拉面板 */
.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;
@@ -518,3 +507,47 @@
}
}
}
+// 树形选择
+.custom-tree-select {
+ 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;
+ 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 #012350 !important;
+ }
+ .el-tree {
+ background: transparent !important;
+ color: #fff !important;
+ .el-tree-node__content:hover {
+ background: none !important;
+ }
+ .el-tree-node__content:hover {
+ background: none !important;
+ }
+
+ .el-tree-node.is-current > .el-tree-node__content {
+ background: #479dff !important;
+ color: #479dff !important;
+ }
+ }
+
+ .el-select-dropdown__item {
+ background: none !important;
+ color: #fff !important;
+ input {
+ color: #fff !important;
+ &::placeholder {
+ color: #fff !important;
+ }
+ }
+ }
+ .el-tree {
+ --el-tree-node-hover-bg-color: none !important;
+ color: #fff !important;
+ }
+ .el-select-dropdown__item.is-selected {
+ color: var(--el-color-primary) !important;
+ }
+}
diff --git a/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue b/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue
index 502ccc2..fd49c26 100644
--- a/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue
+++ b/src/views/Home/EventOverviewDetail/EventOverviewDetailRight.vue
@@ -12,6 +12,7 @@
/>
<el-date-picker
+ popper-class="custom-date-picker"
class="ztzf-date-picker"
v-model="timeArr"
type="daterange"
@@ -23,6 +24,7 @@
/>
<el-select
+ :teleported="false"
class="ztzf-select"
:style="{ width: pxToRem(174) }"
v-model="params.device_sn"
@@ -35,6 +37,7 @@
</el-select>
<el-select
+ :teleported="false"
class="ztzf-select"
:style="{ width: pxToRem(174) }"
v-model="params.word_order_type"
diff --git a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
index 860834d..591a78a 100644
--- a/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
+++ b/src/views/Home/HomeLeft/InspectionRaskDetails/InspectionRaskDetailsDialog.vue
@@ -107,7 +107,7 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="industry_type_str" label="任务类型" />
- <el-table-column prop="begin_time" label="任务时间" width="150" />
+ <el-table-column prop="cycle_time_value" label="任务时间" width="150" />
<el-table-column prop="event_number" label="关联事件">
<template #default="scope">
<span>{{ scope.row.event_number ? scope.row.event_number : '/' }}</span>
@@ -241,6 +241,7 @@
if (res.data.code !== 0) return
taskDetailData.value = res.data.data.records
total.value = res.data.data.total
+
})
}
// 机巢列表数据
diff --git a/src/views/Home/SearchBox.vue b/src/views/Home/SearchBox.vue
index fb3b28c..1ef74b7 100644
--- a/src/views/Home/SearchBox.vue
+++ b/src/views/Home/SearchBox.vue
@@ -15,6 +15,7 @@
<div class="searchBtn" @click="searchClick"></div>
<div class="region">
<el-tree-select
+ popper-class="custom-tree-select"
v-model="treeValue"
check-strictly
lazy
--
Gitblit v1.9.3