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

NEZ-1276 fix: 通过搜索记录查询 选项错乱的问题

Browse Source
This commit is contained in:
zhangyu
2021-11-18 17:18:16 +08:00
parent 87b49de83f
commit 99dca724f1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/charts/line-chart-block.vue
View File

@@ -211,7 +211,7 @@ import chartDataFormat from './chartDataFormat'
import { randomcolor } from '../common/js/radomcolor/randomcolor.js' import { randomcolor } from '../common/js/radomcolor/randomcolor.js'
import chartConfig from '../page/dashboard/overview/chartConfig' import chartConfig from '../page/dashboard/overview/chartConfig'
import { getChart, setChart, lineChartMove, getMousePoint } from '../common/js/common' import { getChart, setChart, lineChartMove, getMousePoint } from '../common/js/common'
import { getMetricTypeValue, chartResizeTool, formatScientificNotation, dealLegendAlias} from '../common/js/tools' import { getMetricTypeValue, chartResizeTool, formatScientificNotation, dealLegendAlias } from '../common/js/tools'
import moment from 'moment-timezone' import moment from 'moment-timezone'
import chartDataList from '@/components/common/mixin/chartDataList' import chartDataList from '@/components/common/mixin/chartDataList'
@@ -642,7 +642,7 @@ export default {
// chartId='screenShowArea'; // chartId='screenShowArea';
} }
const chartWidth = ele.clientWidth const chartWidth = ele.clientWidth
this.stepWidth = document.getElementById('listContainer').offsetWidth / 12 this.stepWidth = this.chartInfo.groupId ? (document.getElementById('listContainer').offsetWidth / 12) - 10 : document.getElementById('listContainer').offsetWidth / 12
const stackIconBorderColor = (chartInfo.type === 'stackArea' ? '#53a3cb' : '#7e7e7e') const stackIconBorderColor = (chartInfo.type === 'stackArea' ? '#53a3cb' : '#7e7e7e')
const stackIconChooseBorderColor = (chartInfo.type === 'stackArea' ? '#7e7e7e' : '#53a3cb') const stackIconChooseBorderColor = (chartInfo.type === 'stackArea' ? '#7e7e7e' : '#53a3cb')
let maxValueCopies = this.getMaxValue(dataArg, chartInfo) let maxValueCopies = this.getMaxValue(dataArg, chartInfo)

2
nezha-fronted/src/components/common/searchInput.vue
View File

@@ -954,7 +954,7 @@ export default {
this.sreach_num = this.select_list.length this.sreach_num = this.select_list.length
this.select_list.forEach(val => { this.select_list.forEach(val => {
this.searchLabelList.forEach((item, index) => { this.searchLabelList.forEach((item, index) => {
if (val.id == item.id) { if (val.label == item.label) {
this.searchLabelList.splice(index, 1) this.searchLabelList.splice(index, 1)
} }
}) })

2
nezha-fronted/src/components/common/table/nzDataList.vue
View File

@@ -11,7 +11,7 @@
</div> </div>
<div :class="{'top-tool-main-right-to-left': bottomBox.showSubList}" class="top-tool-right"> <div :class="{'top-tool-main-right-to-left': bottomBox.showSubList}" class="top-tool-right">
<div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20" :class="{'project-search alert-table asset-table endpoint-table': searchRight}"> <div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20" :class="{'project-search alert-table asset-table endpoint-table': searchRight}">
<search-input ref="searchInput" :from="from" :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-input> <search-input ref="searchInput" :from="from" :position='from' :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-input>
</div> </div>
<slot name="top-tool-right"></slot> <slot name="top-tool-right"></slot>
<button v-if="showLayout.indexOf('elementSet') > -1" class="top-tool-btn table-column-setting" <button v-if="showLayout.indexOf('elementSet') > -1" class="top-tool-btn table-column-setting"