From e19253e5cc08b3f4607679f1585cb036f4ad89b8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 21 Aug 2025 08:46:40 +0800
Subject: [PATCH] Merge branch 'feature/v5.0/5.0.3' into test
---
src/views/job/components/JobRelatedEvents.vue | 4 ++--
src/views/dataCenter/components/dataCenterMap.vue | 20 +++++++++++++++++++-
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/views/dataCenter/components/dataCenterMap.vue b/src/views/dataCenter/components/dataCenterMap.vue
index 2715f26..417a42c 100644
--- a/src/views/dataCenter/components/dataCenterMap.vue
+++ b/src/views/dataCenter/components/dataCenterMap.vue
@@ -1,5 +1,10 @@
<template>
- <el-dialog modal-class="mapDialog" v-model="isShow" width="80%">
+ <el-dialog modal-class="mapDialog" v-model="isShow" width="80%">
+ <template #header="{ titleId, titleClass }">
+ <div class="my-header">
+ <h4 :id="titleId" :class="titleClass">定位</h4>
+ </div>
+ </template>
<div class="mapBox">
<div v-if="isShow" id="dataCenterMap" class="ztzf-cesium"></div>
</div>
@@ -318,4 +323,17 @@
height: 100%;
}
}
+.my-header :deep(.el-dialog__title) {
+ margin: 0 !important;
+ height: 19px;
+}
+
+.my-header {
+ display: flex;
+ align-items: center;
+
+ .el-button {
+ margin-left: 20px;
+ }
+}
</style>
diff --git a/src/views/job/components/JobRelatedEvents.vue b/src/views/job/components/JobRelatedEvents.vue
index 632db4f..2dd0b4a 100644
--- a/src/views/job/components/JobRelatedEvents.vue
+++ b/src/views/job/components/JobRelatedEvents.vue
@@ -13,7 +13,7 @@
<div class="itemchild">模糊查询：</div>
<el-input v-model="params.event_name" placeholder="请输入事件名称" clearable></el-input>
</div>
- <div class="item">
+ <!-- <div class="item">
<div class="itemchild">任务执行日期：</div>
<el-date-picker
popper-class="custom-date-picker"
@@ -25,7 +25,7 @@
:disabled-date="disabledDate"
@change="changeselect"
/>
- </div>
+ </div> -->
<div class="item">
<div class="itemchild">关联算法：</div>
<TaskAlgorithmBusiness :setWidth="186" :showAlgorithm="true" @algorithmChange="algorithmChange" />
--
Gitblit v1.9.3