gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.10' of git.mesalab.cn:nezha/nezha-fronted into dev-3.11

Browse Source
This commit is contained in:
zyh
2024-06-19 15:23:21 +08:00
parent 16587e3311 12f3a5c1ad
commit 05ed2a7d94
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nezha-fronted/src/assets/css/components/chart/chart.scss
View File

@@ -34,7 +34,6 @@
transition: height linear 0.3s, opacity linear 0.3s; transition: height linear 0.3s, opacity linear 0.3s;
.chart-header__tools { .chart-header__tools {
.chart-header__tool .tool__icon { .chart-header__tool .tool__icon {
// visibility: visible;
} }
} }
} }
@@ -158,10 +157,8 @@
.chart-header__tool { .chart-header__tool {
margin-left: 20px; margin-left: 20px;
cursor: pointer;
.tool__icon { .tool__icon {
visibility: hidden;
font-size: 14px; font-size: 14px;
color: $--color-text-primary; color: $--color-text-primary;
} }

1
nezha-fronted/src/assets/css/components/common/multipleTime.scss
View File

@@ -1,4 +1,5 @@
.multiple-time-box { .multiple-time-box {
cursor: pointer;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;

12
nezha-fronted/src/components/chart/ChartScreenHeader.vue
View File

@@ -37,12 +37,14 @@
<i class="nz-icon nz-icon-info-normal tool__icon"></i> <i class="nz-icon nz-icon-info-normal tool__icon"></i>
</el-tooltip> </el-tooltip>
</span> </span>
<span class="chart-header__tool" v-if="showTime(chartInfo.type)&&!isExportHtml"> <span class="chart-header__tool" v-if="showTime(chartInfo.type)">
<pick-time <pick-time
:refresh-data-func="dateChange" :refresh-data-func="dateChange"
v-model="searchTime" v-model="searchTime"
:use-chart-unit="showUnit(from)" :useChartUnit="showUnit(from)&&!isExportHtml"
:showMultiple="showMultiple(chartInfo.type)" :showMultiple="showMultiple(chartInfo.type)&&!isExportHtml"
:showTimePicker="!isExportHtml"
:useRefresh="!isExportHtml"
ref="pickTime" ref="pickTime"
style="height: 28px;" style="height: 28px;"
id="line-chart" id="line-chart"
@@ -79,7 +81,7 @@ export default {
}, },
fatherNowTimeType () { fatherNowTimeType () {
return this.$store.getters.getNowTimeType return this.$store.getters.getNowTimeType
}, }
}, },
data () { data () {
return { return {
@@ -93,7 +95,7 @@ export default {
methods: { methods: {
dateChange () { dateChange () {
const nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType const nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType
this.setSearchTime('searchTime', nowTimeType,'', false) this.setSearchTime('searchTime', nowTimeType, '', false)
this.filter.start_time = bus.timeFormate(this.searchTime[0]) this.filter.start_time = bus.timeFormate(this.searchTime[0])
this.filter.end_time = bus.timeFormate(this.searchTime[1]) this.filter.end_time = bus.timeFormate(this.searchTime[1])
this.filter.value = this.searchTime[2] this.filter.value = this.searchTime[2]