fix:修复从explore save chart无保存按钮,以及预览无法选择时间的问题
This commit is contained in:
@@ -59,7 +59,8 @@
|
|||||||
<span class="nz-dialog-title chart-title-text">{{chart.title}}</span>
|
<span class="nz-dialog-title chart-title-text">{{chart.title}}</span>
|
||||||
<div class="float-right panel-calendar dialog-tool" v-if="chart.type!=='url' && chart.type !=='alertList'">
|
<div class="float-right panel-calendar dialog-tool" v-if="chart.type!=='url' && chart.type !=='alertList'">
|
||||||
|
|
||||||
<time-picker ref="calendarPanel" class="nz-dashboard-picker" style="margin-top: -12px;" @change="dateChange" v-if="chart.type !='text'"></time-picker>
|
<!-- <time-picker ref="calendarPanel" class="nz-dashboard-picker" style="margin-top: -12px;" @change="dateChange" v-if="chart.type !='text'"></time-picker>-->
|
||||||
|
<pick-time :refresh-data-func="dateChange" v-model="searchTime" :use-chart-unit="false" ref="pickTime" style="height: 28px;"></pick-time>
|
||||||
<!--
|
<!--
|
||||||
<el-date-picker ref="calendar" prefix-icon=" " size="mini" class="nz-preview-picker"
|
<el-date-picker ref="calendar" prefix-icon=" " size="mini" class="nz-preview-picker"
|
||||||
format="yyyy/MM/dd HH:mm"
|
format="yyyy/MM/dd HH:mm"
|
||||||
@@ -1088,7 +1089,6 @@
|
|||||||
},
|
},
|
||||||
*/
|
*/
|
||||||
dateChange(time) {
|
dateChange(time) {
|
||||||
this.searchTime = [...time];
|
|
||||||
let chartType = this.chart.type;
|
let chartType = this.chart.type;
|
||||||
if (chartType === 'table') {
|
if (chartType === 'table') {
|
||||||
this.seriesItemScreen = [];
|
this.seriesItemScreen = [];
|
||||||
@@ -1121,7 +1121,6 @@
|
|||||||
getQueryChart(type) {
|
getQueryChart(type) {
|
||||||
let axiosArr = [];
|
let axiosArr = [];
|
||||||
const chartItem = this.chart;
|
const chartItem = this.chart;
|
||||||
console.log(chartItem);
|
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
let startTime = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss');
|
let startTime = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss');
|
||||||
let endTime = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss');
|
let endTime = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss');
|
||||||
|
|||||||
@@ -156,6 +156,7 @@
|
|||||||
<style>
|
<style>
|
||||||
.interval-refresh-popover{
|
.interval-refresh-popover{
|
||||||
min-width: unset !important;
|
min-width: unset !important;
|
||||||
|
z-index:3000 !important;
|
||||||
}
|
}
|
||||||
.sub-top-tools .interval-refresh {
|
.sub-top-tools .interval-refresh {
|
||||||
margin-top: -1px;
|
margin-top: -1px;
|
||||||
|
|||||||
@@ -2,6 +2,9 @@
|
|||||||
.loading-font{
|
.loading-font{
|
||||||
color:#232f3e !important;
|
color:#232f3e !important;
|
||||||
}
|
}
|
||||||
|
popper-z-index{
|
||||||
|
z-index: 3000 !important;
|
||||||
|
}
|
||||||
.calendar{
|
.calendar{
|
||||||
}
|
}
|
||||||
.nz-dashboard-dropdown-bg {
|
.nz-dashboard-dropdown-bg {
|
||||||
@@ -86,6 +89,7 @@
|
|||||||
:visible-arrow="false"
|
:visible-arrow="false"
|
||||||
:disabled="isPopoverDisabled"
|
:disabled="isPopoverDisabled"
|
||||||
trigger="hover"
|
trigger="hover"
|
||||||
|
popper-class="popper-z-index"
|
||||||
id="panel-calender-popover">
|
id="panel-calender-popover">
|
||||||
<template v-if="this.searchTime&&this.searchTime.length>1">
|
<template v-if="this.searchTime&&this.searchTime.length>1">
|
||||||
<el-row :gutter="10" class="calendar-popover">
|
<el-row :gutter="10" class="calendar-popover">
|
||||||
@@ -107,7 +111,7 @@
|
|||||||
<i class="nz-icon nz-icon-arrow-down" style="padding-left:0px !important;width:20px;"></i>
|
<i class="nz-icon nz-icon-arrow-down" style="padding-left:0px !important;width:20px;"></i>
|
||||||
</div>
|
</div>
|
||||||
</el-popover>
|
</el-popover>
|
||||||
<el-dropdown-menu class="nz-dashboard-dropdown" slot="dropdown">
|
<el-dropdown-menu class="nz-dashboard-dropdown popper-z-index" slot="dropdown">
|
||||||
<!-- <el-dropdown-item >{{$t('dashboard.panel.customTimeRange')}}</el-dropdown-item> -->
|
<!-- <el-dropdown-item >{{$t('dashboard.panel.customTimeRange')}}</el-dropdown-item> -->
|
||||||
<template v-for="item in timeData" >
|
<template v-for="item in timeData" >
|
||||||
<el-dropdown-item :class="showTime.id==item.id?'nz-dashboard-dropdown-bg':''" :command="item" v-if="item.id != 12 || showEmpty">
|
<el-dropdown-item :class="showTime.id==item.id?'nz-dashboard-dropdown-bg':''" :command="item" v-if="item.id != 12 || showEmpty">
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<transition name="right-box">
|
<transition name="right-box">
|
||||||
<chart-box :chart="chart" :from="$CONSTANTS.explore" :panel-data="panelData" :show-panel="{id: -1, name: '', type: 'explore'}" @close="handleBox(false)" @on-create-success="createSuccess" ref="addChartModal" v-if="rightBox.show"></chart-box>
|
<chart-box :chart="chart" :from="$CONSTANTS.fromRoute.explore" :panel-data="panelData" :show-panel="{id: -1, name: '', type: 'explore'}" @close="handleBox(false)" @on-create-success="createSuccess" ref="addChartModal" v-if="rightBox.show"></chart-box>
|
||||||
</transition>
|
</transition>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
Reference in New Issue
Block a user