diff --git a/nezha-fronted/README.md b/nezha-fronted/README.md index a4f0b04aa..bd59e561b 100644 --- a/nezha-fronted/README.md +++ b/nezha-fronted/README.md @@ -12,10 +12,14 @@ npm install npm run dev # build for production with minification -npm run build +npm run build -- dev # build for production and view the bundle analyzer report npm run build --report ``` For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). + +使用 + +需要配置 config.json 为 {"baseUrl":"http://192.168.40.42:8080/", "version": "21.04"} diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss index 06594fc3c..56511bf41 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss @@ -4,6 +4,7 @@ padding-bottom: 20px; } .alert-message-info-box{ + box-sizing: border-box; padding: 20px; display: flex; width: 100%; @@ -23,6 +24,7 @@ flex: none; } .alert-message-info-tab{ + height: 63%; flex: 1; .el-tabs.el-tabs--card { height: 100%; @@ -65,6 +67,11 @@ } .info-box-right{ flex: 1; + height: 100%; + border: 1px solid #E7EAED; + border-radius: 2px; + box-sizing: border-box; + padding: 20px; } .table-no-data { width: 100%; diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfo.vue b/nezha-fronted/src/components/common/alert/alertMessageInfo.vue index 2683af6fb..6c1316f18 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageInfo.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageInfo.vue @@ -45,7 +45,7 @@ :infoData="infoData" />
- 时间 +
@@ -62,13 +62,15 @@ import chartTempData from '@/components/charts/chartTempData' import logsData from '@/components/chart/logsData' import lodash from 'lodash' import alertMessageInfoTab from '@/components/common/alert/alertMessageInfoTab' +import alertMessageInfoTimeLine from '@/components/common/alert/alertMessageInfoTimeLine' export default { name: 'panelChart', components: { alertMessageInfoTab, chart, - ChartScreenHeader + ChartScreenHeader, + alertMessageInfoTimeLine }, props: { chartInfo: Object, // 其中的param json串已转化为对象 diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoDetail.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoDetail.vue index 660e9eada..88c08cbfc 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageInfoDetail.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageInfoDetail.vue @@ -2,7 +2,7 @@
{{item.label}}
-
+
{{infoData[item.key]}}
@@ -49,7 +49,7 @@ export default { return { cardNames: [ { key: 'summary', label: this.$t('alert.summary') }, - { key: 'remark', label: this.$t('overall.remark') }, + { key: 'description', label: this.$t('overall.remark') }, { key: 'labels', label: this.$t('alert.list.labels') }, { key: 'startAt', label: this.$t('alert.startAt') } ] diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue new file mode 100644 index 000000000..59baf12e0 --- /dev/null +++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue @@ -0,0 +1,25 @@ + + + + +