From 53704149a7089a1d9d94746147ce14b957a5139e Mon Sep 17 00:00:00 2001 From: zyh Date: Thu, 2 Mar 2023 09:42:41 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-2596=20feat=EF=BC=9ANZ-TALON=20=E9=9B=86?= =?UTF-8?q?=E6=88=90=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/integration/integration.scss | 99 ++++++++- .../chart/chart/options/chartTimeSeries.js | 7 +- .../src/components/chart/chartMixin.js | 16 +- .../src/components/page/config/agent.vue | 2 +- .../integration-tabs/automatic.vue | 80 +++++++ .../integration-tabs/configuration.vue | 10 +- .../integration-tabs/integration-tabs.vue | 43 +++- .../integration/integration-tabs/manual.vue | 203 ++++++++++++++++++ .../page/integration/integration.vue | 27 ++- 9 files changed, 451 insertions(+), 36 deletions(-) create mode 100644 nezha-fronted/src/components/page/integration/integration-tabs/automatic.vue create mode 100644 nezha-fronted/src/components/page/integration/integration-tabs/manual.vue diff --git a/nezha-fronted/src/assets/css/components/page/integration/integration.scss b/nezha-fronted/src/assets/css/components/page/integration/integration.scss index 0ad7b6d1f..05eb36388 100644 --- a/nezha-fronted/src/assets/css/components/page/integration/integration.scss +++ b/nezha-fronted/src/assets/css/components/page/integration/integration.scss @@ -250,7 +250,6 @@ } .integration-configuration-pre{ width: 100%; - // max-height: 295px; overflow-y: auto; box-sizing: border-box; padding: 14px; @@ -261,7 +260,6 @@ overflow-wrap: break-word; word-break: break-word; white-space: pre-wrap; - margin-top: 6px; } } @@ -327,4 +325,101 @@ } } } +} + +.integration-dialog.integration-dialog-internal{ + .integration-tabs-nav{ + .integration-tabs-nav-item{ + width: 168px; + } + } + .integration-manual,.integration-automatic{ + padding: 30px; + padding-top: 15px; + padding-right: 10px; + margin-right: 20px; + box-sizing: border-box; + height: 100%; + overflow-y: auto; + .integration-install{ + font-size: 16px; + color: $--color-text-primary; + font-weight: 600; + } + .install-step{ + padding-top: 15px; + width: 100%; + display: flex; + .step-num{ + width: 20px; + height: 20px; + box-sizing: border-box; + border: 1px solid $--border-color-light; + border-radius: 2px; + font-size: 12px; + text-align: center; + line-height: 20px; + color: $--color-text-primary; + margin-right: 12px; + } + .step-right{ + flex: 1; + h4{ + font-size: 14px; + line-height: 20px; + margin-bottom: 12px; + color: $--color-text-regular; + font-weight: normal; + } + p{ + font-size: 14px; + line-height: 20px; + margin-bottom: 8px; + color: $--color-text-regular; + display: flex; + align-items: center; + &>.dot{ + display: inline-block; + width: 6px; + height: 6px; + border-radius: 50%; + background: $--color-text-primary; + margin-right: 6px; + } + } + .talon-select{ + color: $--color-text-regular; + display: flex; + align-items: center; + &>span{ + margin-right: 8px; + } + .el-select{ + width: 220px; + } + .nz-btn{ + margin-left: 18px; + } + } + .command-box{ + // width: 800px; + width: 100%; + line-height: 32px; + .el-input__inner{ + color: $--color-text-primary; + border-color: $--border-color-light; + cursor: text; + } + .el-input__suffix{ + .el-input__suffix-inner{ + cursor: pointer; + i{ + color: $--color-text-regular; + } + } + } + } + } + } + } } \ No newline at end of file diff --git a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js index 32b25ee29..7ef74150a 100644 --- a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js +++ b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js @@ -140,9 +140,9 @@ export const chartTimeSeriesLineOption = { type: 'line', symbol: 'emptyCircle', // 去掉点 connectNulls: true, - symbolSize: [0, 0], + symbolSize: [2, 2], smooth: 0.2, // 曲线变平滑 - // showSymbol: false, + showSymbol: false, data: [], lineStyle: { width: 1, @@ -163,6 +163,7 @@ export const chartTimeSeriesScatterOption = { series: [{ name: '', type: 'scatter', - data: [] + data: [], + z: 9 }] } diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js index b1b075cd6..e1246c0be 100644 --- a/nezha-fronted/src/components/chart/chartMixin.js +++ b/nezha-fronted/src/components/chart/chartMixin.js @@ -92,21 +92,13 @@ export default { if (s.yAxisIndex == 1) { const style = chartInfo.param.rightYAxis.style if (style == 'line') { - s = { - ...chartTimeSeriesLineOption.series[0], - yAxisIndex: s.yAxisIndex - } + s = lodash.cloneDeep(chartTimeSeriesLineOption.series[0]) } else if (style == 'area') { - s = { - ...chartTimeSeriesAreaOption.series[0], - yAxisIndex: s.yAxisIndex - } + s = lodash.cloneDeep(chartTimeSeriesAreaOption.series[0]) } else if (style == 'point') { - s = { - ...chartTimeSeriesScatterOption.series[0], - yAxisIndex: s.yAxisIndex - } + s = lodash.cloneDeep(chartTimeSeriesScatterOption.series[0]) } + s.yAxisIndex = 1 } if (s.param && s.param.nullType) { diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue index 9065d8539..7c0f66130 100644 --- a/nezha-fronted/src/components/page/config/agent.vue +++ b/nezha-fronted/src/components/page/config/agent.vue @@ -232,7 +232,7 @@ export default { }, copyUrl (txt) { this.$copyText(txt).then(() => { - this.$message.success({ message: this.$t('overall.copySuccess'), customClass: 'message-zindex' }) + this.$message.success({ message: this.$t('overall.copySuccess') }) }) }, // copyUrl (id) { diff --git a/nezha-fronted/src/components/page/integration/integration-tabs/automatic.vue b/nezha-fronted/src/components/page/integration/integration-tabs/automatic.vue new file mode 100644 index 000000000..b6bcb5418 --- /dev/null +++ b/nezha-fronted/src/components/page/integration/integration-tabs/automatic.vue @@ -0,0 +1,80 @@ + + + diff --git a/nezha-fronted/src/components/page/integration/integration-tabs/configuration.vue b/nezha-fronted/src/components/page/integration/integration-tabs/configuration.vue index 66124a921..333543390 100644 --- a/nezha-fronted/src/components/page/integration/integration-tabs/configuration.vue +++ b/nezha-fronted/src/components/page/integration/integration-tabs/configuration.vue @@ -1,10 +1,11 @@ diff --git a/nezha-fronted/src/components/page/integration/integration-tabs/integration-tabs.vue b/nezha-fronted/src/components/page/integration/integration-tabs/integration-tabs.vue index 60ef4395e..8452553f0 100644 --- a/nezha-fronted/src/components/page/integration/integration-tabs/integration-tabs.vue +++ b/nezha-fronted/src/components/page/integration/integration-tabs/integration-tabs.vue @@ -4,6 +4,10 @@
  • {{item.name}}
  • + + + + @@ -13,6 +17,8 @@ diff --git a/nezha-fronted/src/components/page/integration/integration-tabs/manual.vue b/nezha-fronted/src/components/page/integration/integration-tabs/manual.vue new file mode 100644 index 000000000..a4548b759 --- /dev/null +++ b/nezha-fronted/src/components/page/integration/integration-tabs/manual.vue @@ -0,0 +1,203 @@ + + + diff --git a/nezha-fronted/src/components/page/integration/integration.vue b/nezha-fronted/src/components/page/integration/integration.vue index 990d46082..655a9407f 100644 --- a/nezha-fronted/src/components/page/integration/integration.vue +++ b/nezha-fronted/src/components/page/integration/integration.vue @@ -1,12 +1,12 @@