Merge branch 'dev-3.8' of git.mesalab.cn:nezha/nezha-fronted into dev-3.9

This commit is contained in:
zyh
2023-08-18 14:24:00 +08:00
6 changed files with 12 additions and 1 deletions

View File

@@ -48,6 +48,12 @@ export const chartTimeSeriesLineOption = {
}
}
},
dataZoom: [
{
type: 'inside',
zoomOnMouseWheel: 'ctrl'
}
],
color: initColor(),
grid: {
left: 20,

View File

@@ -15,6 +15,7 @@
:label="item.label"
:type="tagType(item.label)"
style="margin: 5px 0 5px 5px;"
:title="item.value"
>
{{item.value}}
</nz-alert-tag>

View File

@@ -75,6 +75,7 @@
:cursor-point="tagType(label.label) !== 'info'"
:label="label.label"
:type="tagType(label.label)"
:title="label.value"
style="margin: 5px 0 5px 5px"
>
{{ label.value }}
@@ -328,4 +329,4 @@ export default {
}
}
}
</script>
</script>

View File

@@ -72,6 +72,7 @@
:label="item1.name"
:type="tagType(item1.name)"
:regex="item1.regex"
:title="item1.value"
style="margin: 5px 0 5px 5px"
>
{{ item1.value }}

View File

@@ -79,6 +79,7 @@
:type="'info'"
:label="item1.label"
:regex="item1.regex"
:title="item1.value"
style="margin: 5px 0 5px 5px">
{{ item1.value }}
</nz-alert-tag>

View File

@@ -46,6 +46,7 @@
:label="item.label"
:type="'info'"
style="margin: 5px 0 5px 5px;"
:title="item.value"
>
{{item.value}}
</nz-alert-tag>