diff --git a/nezha-fronted/build/webpack.dev.conf.js b/nezha-fronted/build/webpack.dev.conf.js index d715197fa..3c6ef7a3d 100644 --- a/nezha-fronted/build/webpack.dev.conf.js +++ b/nezha-fronted/build/webpack.dev.conf.js @@ -29,6 +29,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { ], }, hot: true, + inline:true, contentBase: false, // since we use CopyWebpackPlugin. compress: true, host: HOST || config.dev.host, diff --git a/nezha-fronted/config/index.js b/nezha-fronted/config/index.js index 97c7b0130..c9782e0ea 100644 --- a/nezha-fronted/config/index.js +++ b/nezha-fronted/config/index.js @@ -22,7 +22,7 @@ module.exports = { // host: '0.0.0.0', // can be overwritten by process.env.HOST host: '127.0.0.1', // can be overwritten by process.env.HOST port: 80, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined - autoOpenBrowser: false, + autoOpenBrowser: true, errorOverlay: true, notifyOnErrors: true, poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue index 10b14c4aa..6c568271d 100644 --- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue @@ -14,7 +14,8 @@ :resizable="false" align="center" type="selection" - width="55"> + width="55" + > - {{item.label}} + {{ item.label }} - + - {{$t('config.terminallog.endTime')}} - {{utcTimeToTimezoneStr(scope.row.endAt)}} + {{ $t("config.terminallog.endTime") }} + {{ utcTimeToTimezoneStr(scope.row.endAt) }} - {{getDuration(scope.row)}} + {{ getDuration(scope.row) }} + + + {{scope.row.alerts}} + + - - - {{item1.value}} - - + + + {{ item1.value }} + + - active - pending - expired + active + pending + expired - {{utcTimeToTimezoneStr(scope.row[item.prop])}} + {{ utcTimeToTimezoneStr(scope.row[item.prop]) }} - {{utcTimeToTimezoneStr(scope.row[item.prop])}} + {{ utcTimeToTimezoneStr(scope.row[item.prop]) }} - {{scope.row[item.prop] || '-'}} + {{ + scope.row[item.prop] || "-" + }} - - - {{$t('overall.option')}} + + + {{ $t("overall.option") }} + - - - + + + + + - - {{$t('overall.edit')}} - {{$t('overall.duplicate')}} - {{$t('buttons.delete')}} + + {{ + $t("overall.edit") + }} + {{ + $t("overall.duplicate") + }} + {{ + $t("buttons.delete") + }} - + @@ -107,114 +169,130 @@ diff --git a/nezha-fronted/src/components/page/alert/alertSilence.vue b/nezha-fronted/src/components/page/alert/alertSilence.vue index 68d79afae..3d286c4df 100644 --- a/nezha-fronted/src/components/page/alert/alertSilence.vue +++ b/nezha-fronted/src/components/page/alert/alertSilence.vue @@ -10,11 +10,24 @@ @search="search" > - + - + { $refs.dataList.showBottomBox(targetTab, object) }"> + @showBottomBox=" + (targetTab, object) => { + $refs.dataList.showBottomBox(targetTab, object); + } + " + > - + - + - + - - {{$t('overall.exportCur')}} + + {{ $t("overall.exportCur") }} - - {{$t('overall.exportAll')}} + + {{ $t("overall.exportAll") }} @@ -61,232 +105,266 @@