feat:修改remark显示隐藏的问题
This commit is contained in:
@@ -25,7 +25,7 @@
|
|||||||
<span class="el-dropdown-link chart-title">
|
<span class="el-dropdown-link chart-title">
|
||||||
<span class="chart-title-text">{{chartData.name}}</span>
|
<span class="chart-title-text">{{chartData.name}}</span>
|
||||||
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
||||||
<span>
|
<span v-if="chartData.remark">
|
||||||
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
||||||
<i class="nz-icon nz-icon-info-normal"></i>
|
<i class="nz-icon nz-icon-info-normal"></i>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
<span class="el-dropdown-link chart-title">
|
<span class="el-dropdown-link chart-title">
|
||||||
<span class="chart-title-text">{{chartData.name}}</span>
|
<span class="chart-title-text">{{chartData.name}}</span>
|
||||||
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
||||||
<span>
|
<span v-if="chartData.remark">
|
||||||
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
||||||
<i class="nz-icon nz-icon-info-normal"></i>
|
<i class="nz-icon nz-icon-info-normal"></i>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
@@ -365,23 +365,25 @@ export default {
|
|||||||
obj.name = legend[index].name
|
obj.name = legend[index].name
|
||||||
obj.data = [[legendShow, item.value]]
|
obj.data = [[legendShow, item.value]]
|
||||||
obj.stack = true
|
obj.stack = true
|
||||||
obj.markLine = {
|
if (chartItem.param.threshold) {
|
||||||
silent: true,
|
obj.markLine = {
|
||||||
symbol: ['circle', 'circle'],
|
silent: true,
|
||||||
label: {
|
symbol: ['circle', 'circle'],
|
||||||
distance: this.computeDistance(chartDataFormat.getUnit(chartItem.unit ? chartItem.unit : 2).compute(chartItem.param.threshold)),
|
label: {
|
||||||
formatter: function (params) {
|
distance: this.computeDistance(chartDataFormat.getUnit(chartItem.unit ? chartItem.unit : 2).compute(chartItem.param.threshold)),
|
||||||
return chartDataFormat.getUnit(chartItem.unit ? chartItem.unit : 2).compute(params.value)
|
formatter: function (params) {
|
||||||
}
|
return chartDataFormat.getUnit(chartItem.unit ? chartItem.unit : 2).compute(params.value)
|
||||||
},
|
}
|
||||||
lineStyle: {
|
},
|
||||||
color: '#d64f40',
|
lineStyle: {
|
||||||
width: 2,
|
color: '#d64f40',
|
||||||
type: 'dotted',
|
width: 2,
|
||||||
},
|
type: 'dotted'
|
||||||
data: [{
|
},
|
||||||
yAxis: Number(chartItem.param.threshold)
|
data: [{
|
||||||
}]
|
yAxis: Number(chartItem.param.threshold)
|
||||||
|
}]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
nweSeriesItem.push(obj)
|
nweSeriesItem.push(obj)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
<span v-show="!showList" class="collapse-content">({{chartData.children.length}} charts)</span>
|
<span v-show="!showList" class="collapse-content">({{chartData.children.length}} charts)</span>
|
||||||
</span>
|
</span>
|
||||||
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
||||||
<span>
|
<span v-if="chartData.remark">
|
||||||
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
||||||
<i class="nz-icon nz-icon-info-normal"></i>
|
<i class="nz-icon nz-icon-info-normal"></i>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<el-collapse-transition>
|
<el-collapse-transition>
|
||||||
<div :id="'chartUrl'+chartIndex" class="mt-10 url-container" v-show="showList">
|
<div :id="'chartUrl'+chartIndex" class="mt-10 url-container" v-show="showList">
|
||||||
<chart-list-group :groupList.sync="chartData.children" :panel-lock="panelLock" :filterParent="filter" :hasGroup="false" :from="from" ref="listGroup" :panelId="panelId" @on-edit-group-chart="editGroupItem" @on-duplicate-group-chart="duplicateGroupItem" @on-remove-chart="removeChartGroup" @moveGroupItem="moveGroupItem"></chart-list-group>
|
<chart-list-group :groupList.sync="chartData.children" :panel-lock="panelLock" :filterParent="filter" :hasGroup="false" :from="from" ref="listGroup" :panelId="panelId" @on-edit-group-chart="editGroupItem" @on-duplicate-group-chart="duplicateGroupItem" @on-remove-chart="removeChartGroup" @moveGroupItem="moveGroupItem" @on-remove-group-chart="removeGroupItem"></chart-list-group>
|
||||||
</div>
|
</div>
|
||||||
</el-collapse-transition>
|
</el-collapse-transition>
|
||||||
<div style="position: absolute;width: 100%; top:calc(50% - 50px);text-align: center;" v-if="showStatic">
|
<div style="position: absolute;width: 100%; top:calc(50% - 50px);text-align: center;" v-if="showStatic">
|
||||||
@@ -222,8 +222,8 @@ export default {
|
|||||||
this.dropdownMenuShow = false
|
this.dropdownMenuShow = false
|
||||||
this.$emit('on-remove-chart-block', this.data.id)
|
this.$emit('on-remove-chart-block', this.data.id)
|
||||||
},
|
},
|
||||||
// 删除group 下的该图表
|
removeGroupItem (chart) {
|
||||||
removeChartGroup (chart) {
|
this.dropdownMenuShow = false
|
||||||
this.$emit('on-remove-group-chart', chart)
|
this.$emit('on-remove-group-chart', chart)
|
||||||
},
|
},
|
||||||
addGroupItemChart () {
|
addGroupItemChart () {
|
||||||
|
|||||||
@@ -1404,7 +1404,7 @@ export default {
|
|||||||
removeChart (chartId) { // from 区分从哪里点击的删除 1.从图表面板 2.从编辑框
|
removeChart (chartId) { // from 区分从哪里点击的删除 1.从图表面板 2.从编辑框
|
||||||
const chart = this.dataList.find(item => item.id === chartId)
|
const chart = this.dataList.find(item => item.id === chartId)
|
||||||
if (chart) {
|
if (chart) {
|
||||||
this.$emit('on-remove-chart', chart)
|
this.$emit('on-remove-group-chart', chart)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 复制图表
|
// 复制图表
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
<span class="el-dropdown-link chart-title">
|
<span class="el-dropdown-link chart-title">
|
||||||
<span class="chart-title-text">{{chartData.name}}</span>
|
<span class="chart-title-text">{{chartData.name}}</span>
|
||||||
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
||||||
<span>
|
<span v-if="chartData.remark">
|
||||||
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
||||||
<i class="nz-icon nz-icon-info-normal"></i>
|
<i class="nz-icon nz-icon-info-normal"></i>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
<span class="el-dropdown-link chart-title">
|
<span class="el-dropdown-link chart-title">
|
||||||
<span class="chart-title-text">{{chartData.name}}</span>
|
<span class="chart-title-text">{{chartData.name}}</span>
|
||||||
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
||||||
<span>
|
<span v-if="chartData.remark">
|
||||||
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
||||||
<i class="nz-icon nz-icon-info-normal"></i>
|
<i class="nz-icon nz-icon-info-normal"></i>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
<span class="el-dropdown-link chart-title">
|
<span class="el-dropdown-link chart-title">
|
||||||
<span class="chart-title-text">{{chartData.name}}</span>
|
<span class="chart-title-text">{{chartData.name}}</span>
|
||||||
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
||||||
<span>
|
<span v-if="chartData.remark">
|
||||||
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
||||||
<i class="nz-icon nz-icon-info-normal"></i>
|
<i class="nz-icon nz-icon-info-normal"></i>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
<span class="el-dropdown-link chart-title">
|
<span class="el-dropdown-link chart-title">
|
||||||
<span class="chart-title-text">{{chartData.name}}</span>
|
<span class="chart-title-text">{{chartData.name}}</span>
|
||||||
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
||||||
<span>
|
<span v-if="chartData.remark">
|
||||||
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
||||||
<i class="nz-icon nz-icon-info-normal"></i>
|
<i class="nz-icon nz-icon-info-normal"></i>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
<span class="el-dropdown-link chart-title">
|
<span class="el-dropdown-link chart-title">
|
||||||
<span class="chart-title-text">{{chartData.name}}</span>
|
<span class="chart-title-text">{{chartData.name}}</span>
|
||||||
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
||||||
<span>
|
<span v-if="chartData.remark">
|
||||||
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
||||||
<i class="nz-icon nz-icon-info-normal"></i>
|
<i class="nz-icon nz-icon-info-normal"></i>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
<span class="el-dropdown-link chart-title">
|
<span class="el-dropdown-link chart-title">
|
||||||
<span class="chart-title-text">{{chartData.name}}</span>
|
<span class="chart-title-text">{{chartData.name}}</span>
|
||||||
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
<span class="chart-title-icon" :class="{'visible':caretShow,'hidden':!caretShow}">
|
||||||
<span>
|
<span v-if="chartData.remark">
|
||||||
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
<el-tooltip :content="chartData.remark" placement="top" effect="light">
|
||||||
<i class="nz-icon nz-icon-info-normal"></i>
|
<i class="nz-icon nz-icon-info-normal"></i>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
|||||||
Reference in New Issue
Block a user