diff --git a/nezha-fronted/build/webpack.base.conf.js b/nezha-fronted/build/webpack.base.conf.js index 05a72f998..6d72366ea 100644 --- a/nezha-fronted/build/webpack.base.conf.js +++ b/nezha-fronted/build/webpack.base.conf.js @@ -104,7 +104,6 @@ if (arg === 'html' || devStart === 'dev:html') { baseConfig.module.rules.unshift({ include: [ resolve('src/entrance/app'), - resolve('src/components/common/alert'), resolve('src/components/common/bottomBox'), resolve('src/components/common/detailView'), resolve('src/components/common/elSelect'), diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js index 72e037b78..7f3eba4a3 100644 --- a/nezha-fronted/build/webpack.prod.conf.js +++ b/nezha-fronted/build/webpack.prod.conf.js @@ -312,7 +312,8 @@ if (process.env.NODE_ENV == 'development') { onEnd: [ { move: [ - { source: path.join(__dirname, '../dist', '/static/config.json'), destination: path.join(__dirname, '../dist/config.json') } + { source: path.join(__dirname, '../dist', '/static/config.json'), destination: path.join(__dirname, '../dist/config.json') }, + { source: path.join(__dirname, '../exportHtml', '/exportHtml.html'), destination: path.join(__dirname, '../dist/exportHtml.html') } ], mkdir: [ @@ -345,7 +346,8 @@ if (process.env.NODE_ENV == 'development') { onEnd: [ { move: [ - { source: path.join(__dirname, '../dist', '/static/config.json'), destination: path.join(__dirname, '../dist/config.json') } + { source: path.join(__dirname, '../dist', '/static/config.json'), destination: path.join(__dirname, '../dist/config.json') }, + { source: path.join(__dirname, '../exportHtml', '/exportHtml.html'), destination: path.join(__dirname, '../dist/exportHtml.html') } ], mkdir: [ @@ -371,7 +373,7 @@ if (process.env.NODE_ENV == 'development') { if (arg === 'html') { plugin.onStart[0].delete.push(path.join(__dirname, '../exportHtml/')) plugin.onEnd[0].copy.push( - { source: path.join(__dirname, '../dist', '/index.html'), destination: path.join(__dirname, '../exportHtml', '/index.html') } + { source: path.join(__dirname, '../dist', '/index.html'), destination: path.join(__dirname, '../exportHtml', '/exportHtml.html') } ) } webpackConfig.plugins.push( diff --git a/nezha-fronted/src/components/chart/chartDetail.vue b/nezha-fronted/src/components/chart/chartDetail.vue index 3f9022e2c..be110ed1a 100644 --- a/nezha-fronted/src/components/chart/chartDetail.vue +++ b/nezha-fronted/src/components/chart/chartDetail.vue @@ -210,6 +210,7 @@ export default { this.showBasicInfo = !this.showBasicInfo }, init () { + if (window.dataJson) { return } this.loading = true const weekDays = this.getWeeksTime() if (this.trendTimer) { diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index 743a31eaf..af3992c8c 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -436,9 +436,14 @@ export default { } case 'system': { this.chartData = [] + if (this.chartInfo.type === 'assetInfo' || this.chartInfo.type === 'endpointInfo') { + this.chartData = this.dataJson[this.chartInfo.id + '_' + 0].data + this.loading = false + break + } this.chartData.push(this.dataJson[this.chartInfo.id + '_' + 0].result) - } break + } case 'misc': { this.loading = false setTimeout(() => { diff --git a/nezha-fronted/src/components/common/mixin/editRigthBox.js b/nezha-fronted/src/components/common/mixin/editRigthBox.js index 4aea2c325..ecabae178 100644 --- a/nezha-fronted/src/components/common/mixin/editRigthBox.js +++ b/nezha-fronted/src/components/common/mixin/editRigthBox.js @@ -21,7 +21,7 @@ export default { this.messageParams.route = route this.messageParams.params = params this.closeMessage = this.$message({ - duration: 2000, + duration: showNext ? 5000 : 2000, dangerouslyUseHTMLString: true, type: 'success', message: `
${msg} ${this.$t('overall.continue')} ${this.$t(nextText)}
`, diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue index 42d004030..132e406fb 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue @@ -753,7 +753,7 @@ export default { this.$post(this.url, params).then(res => { this.prevent_opt.save = false if (res.code === 200) { - this.messageShow(this.$t('tip.saveSuccess'), '/endpoint', { assetId: res.data.id }, true, 'guide.addEndpoint') + this.messageShow(this.$t('tip.saveSuccess'), '/endpoint', { assetId: res.data.id }, false, 'guide.addEndpoint') this.esc(true) } else { this.$message.error(res.msg)