diff --git a/src/assets/images/abnormalAlarm/email-icon0.png b/src/assets/images/abnormalAlarm/email-icon0.png new file mode 100644 index 0000000..af519c8 Binary files /dev/null and b/src/assets/images/abnormalAlarm/email-icon0.png differ diff --git a/src/assets/images/abnormalAlarm/email-icon1.png b/src/assets/images/abnormalAlarm/email-icon1.png new file mode 100644 index 0000000..7513267 Binary files /dev/null and b/src/assets/images/abnormalAlarm/email-icon1.png differ diff --git a/src/assets/images/abnormalAlarm/email-icon2.png b/src/assets/images/abnormalAlarm/email-icon2.png new file mode 100644 index 0000000..d0615c3 Binary files /dev/null and b/src/assets/images/abnormalAlarm/email-icon2.png differ diff --git a/src/assets/images/abnormalAlarm/email-icon3.png b/src/assets/images/abnormalAlarm/email-icon3.png new file mode 100644 index 0000000..17e112c Binary files /dev/null and b/src/assets/images/abnormalAlarm/email-icon3.png differ diff --git a/src/assets/images/abnormalAlarm/email-split.png b/src/assets/images/abnormalAlarm/email-split.png new file mode 100644 index 0000000..f188c82 Binary files /dev/null and b/src/assets/images/abnormalAlarm/email-split.png differ diff --git a/src/views/abnormalAlarm/emailMonitor/instances/index.vue b/src/views/abnormalAlarm/emailMonitor/instances/index.vue index c628d7c..125d926 100644 --- a/src/views/abnormalAlarm/emailMonitor/instances/index.vue +++ b/src/views/abnormalAlarm/emailMonitor/instances/index.vue @@ -1,15 +1,756 @@ - \ No newline at end of file diff --git a/src/views/abnormalAlarm/emailMonitor/overview/index.vue b/src/views/abnormalAlarm/emailMonitor/overview/index.vue index a7d4bfb..e5ded80 100644 --- a/src/views/abnormalAlarm/emailMonitor/overview/index.vue +++ b/src/views/abnormalAlarm/emailMonitor/overview/index.vue @@ -413,8 +413,14 @@ export default { this.form.resetFields() this.visible = false }, - onRowDbclick() { - this.$router.push("/alarm/emailMonitor/instances") + onRowDbclick(record) { + let query = { + emailId:record.id + } + this.$router.push({ + path: '/alarm/emailMonitor/instances', + query + }) } }, } diff --git a/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue b/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue index 06358b0..82ef63e 100644 --- a/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue +++ b/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue @@ -217,24 +217,6 @@ export default { bottom: 0, containLabel: true }, - legend: { - icon: "roundRect", - itemHeight: 12, // 图例icon高度 - itemWidth: 12, // 图例icon宽度 - top: 0, - right: 0, - textStyle: { - color: "#ade6ee", - lineHeight: 12, - - rich: { - a: { - verticalAlign: 'middle', - }, - }, - padding:[0,-2,-4,0], - } - }, xAxis: { type: 'category', axisTick: { @@ -317,24 +299,6 @@ export default { bottom: 0, containLabel: true }, - legend: { - icon: "roundRect", - itemHeight: 12, // 图例icon高度 - itemWidth: 12, // 图例icon宽度 - top: 0, - right: 0, - textStyle: { - color: "#ade6ee", - lineHeight: 12, - - rich: { - a: { - verticalAlign: 'middle', - }, - }, - padding:[0,-2,-4,0], - } - }, xAxis: { type: 'category', axisTick: {