From f02d7400dfdf6bcd6022a45c06fd40c5ca23ecda Mon Sep 17 00:00:00 2001 From: YYD-YY <2962062657@qq.com> Date: Mon, 13 Oct 2025 21:25:38 +0800 Subject: [PATCH 1/8] 10.13 --- .../main/java/com/alops/system/domain/dto/EquBaseQueryDto.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquBaseQueryDto.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquBaseQueryDto.java index 33f696dd..76c7ce07 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquBaseQueryDto.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquBaseQueryDto.java @@ -18,8 +18,7 @@ public class EquBaseQueryDto implements Serializable { private String id; /** 设备类型 (equ_type, varchar) */ private String equTypeId; - /** 设备类型 (equ_type, varchar) */ - private String equTypeId; + /** 设备类型 (equ_type, varchar) */ private String equType; /** 设备名称 (name, varchar) */ From 821c2ccb4668227941fcf1a51b0ba6e98fa9139d Mon Sep 17 00:00:00 2001 From: Wangxin Date: Tue, 14 Oct 2025 22:10:52 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E9=A2=84=E6=B5=8B=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alops-ui/src/api/QandA/knowledge.js | 4 +- .../src/api/inMonitoring/assessment.js | 8 +- .../views/inMonitoring/assessment/index.vue | 485 ++---------------- 3 files changed, 36 insertions(+), 461 deletions(-) diff --git a/ALOps_sys_fe/alops-ui/src/api/QandA/knowledge.js b/ALOps_sys_fe/alops-ui/src/api/QandA/knowledge.js index e68555c1..91a87d42 100644 --- a/ALOps_sys_fe/alops-ui/src/api/QandA/knowledge.js +++ b/ALOps_sys_fe/alops-ui/src/api/QandA/knowledge.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -const api = '/QandA/knowledge/' +const api = '/QandA/knowledge' // 查询详细 export function getDict() { @@ -21,7 +21,7 @@ export function permanentKnowledgeList(query) { // 获取所有上传文件信息 export function uploadedFilesList(query) { return request({ - url: api + '/knowBase/uploaded-files', + url: '/QandA/knowledge/uploaded-files', method: 'get', params: query }) diff --git a/ALOps_sys_fe/alops-ui/src/api/inMonitoring/assessment.js b/ALOps_sys_fe/alops-ui/src/api/inMonitoring/assessment.js index 97ea2fe5..d632514c 100644 --- a/ALOps_sys_fe/alops-ui/src/api/inMonitoring/assessment.js +++ b/ALOps_sys_fe/alops-ui/src/api/inMonitoring/assessment.js @@ -1,11 +1,11 @@ import request from '@/utils/request' // 新增用户 -export function knowledgeAsk(data) { +export function list(query) { return request({ - url: '/QandA/knowledge/ask', - method: 'post', - data: data + url: '/inMonitoring/equAssessment/list', + method: 'get', + params: query }) } diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/assessment/index.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/assessment/index.vue index 4e0467b1..5d3c8d53 100644 --- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/assessment/index.vue +++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/assessment/index.vue @@ -7,76 +7,44 @@ - - - - - - - - - - - - - - - - - 搜索 - 重置 - - - - - - 新增 - - - 修改 - - - 删除 - - - 导入 - - - 导出 - - - - - - - - - - + + + + + + + + + + - + - - @@ -585,11 +546,23 @@ mounted() { color: #4299e1; opacity: 0.8; } + .device-icon{ + width: 100%; + } .device-info { display: flex; flex-direction:column; - gap: 15px; + background: linear-gradient(135deg, #edf2f7, #e2e8f0); + border-radius: 12px; + border: 1px solid rgba(226, 232, 240, 0.8); + transition: all 0.3s ease; + } + .device-info:hover { + background: rgba(255, 255, 255, 0.9); + border-color: rgba(66, 153, 225, 0.3); + transform: translateY(-2px); + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05); } .info-title { @@ -597,24 +570,16 @@ mounted() { font-size: 16px; font-weight: 600; text-align: center; + padding-top: 10px; } .info-item { display: flex; flex-direction: column; padding: 8px 12px; - background: rgba(255, 255, 255, 0.7); - border-radius: 12px; - border: 1px solid rgba(226, 232, 240, 0.8); - transition: all 0.3s ease; } - .info-item:hover { - background: rgba(255, 255, 255, 0.9); - border-color: rgba(66, 153, 225, 0.3); - transform: translateY(-2px); - box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05); - } + .info-label { font-size: 13px; diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/history.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/history.vue index f9828db3..89c35673 100644 --- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/history.vue +++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/history.vue @@ -1,39 +1,37 @@ \ No newline at end of file diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/routing.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/routing.vue new file mode 100644 index 00000000..4abfaed6 --- /dev/null +++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/routing.vue @@ -0,0 +1,71 @@ + + + \ No newline at end of file diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/vlan.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/vlan.vue new file mode 100644 index 00000000..f91b3c27 --- /dev/null +++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/vlan.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file From 506f6632a6638c60ca6fac2e42f153591599cea3 Mon Sep 17 00:00:00 2001 From: Wangxin Date: Tue, 21 Oct 2025 20:42:34 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E8=A7=84=E5=88=99-=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/inMonitoring/inMonitor/rules/index.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/rules/index.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/rules/index.vue index f3decfa0..f97ae395 100644 --- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/rules/index.vue +++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/rules/index.vue @@ -35,7 +35,12 @@ > - + + + @@ -288,6 +293,9 @@ export default { }, methods: { + findParamName(tableName) { + return this.byTableData.find(item => item.tableName == tableName).paramName + }, /** 查询设备列表 */ getList() { this.loading = true From 4030b204a736f468d68c5e68774f63807b86a642 Mon Sep 17 00:00:00 2001 From: Wangxin Date: Tue, 21 Oct 2025 23:05:17 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=95=B0=E6=8D=AEUI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inMonitoring/devicesState/BarChart2.vue | 129 ---- .../inMonitoring/devicesState/cardItem.vue | 25 +- .../inMonitoring/devicesState/detail.vue | 597 +++++++++++++++++- .../inMonitoring/devicesState/history.vue | 22 +- 4 files changed, 607 insertions(+), 166 deletions(-) delete mode 100644 ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/BarChart2.vue diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/BarChart2.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/BarChart2.vue deleted file mode 100644 index 395a1541..00000000 --- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/BarChart2.vue +++ /dev/null @@ -1,129 +0,0 @@ - - - diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue index 121adda1..8cb87934 100644 --- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue +++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/cardItem.vue @@ -43,6 +43,7 @@
带外IP + 带内IP {{cardData.ip || '暂无'}}
@@ -55,23 +56,21 @@
{{cardData.cpuUtilization||0}}%
CPU占用
-
+
-
{{cardData.health||0}}%
+
{{getPercentage(cardData.health)||0}}%
健康度
-
+
-
{{cardData.unhandledAlertCount||0}}
待处理预警数
-
{{cardData.handledAlertCount||0}}
预警总数
@@ -87,11 +86,8 @@ import * as echarts from 'echarts' require('echarts/theme/macarons') // echarts theme -import BarChart from './BarChart1.vue' -import BarChart2 from './BarChart2.vue' export default { name: "cardItem", - components: { BarChart, BarChart2 }, props: { cardData: { type: Object, @@ -224,6 +220,19 @@ export default { const userId = row.id this.$router.push("/inMonitoring/devicesState-detail/detail/" + userId) }, + getPercentage(value) { + const percentageMap = { + 1: 100, + 2: 75, + 3: 50, + 4: 25, + 0: 0, + }; + return percentageMap[value] || 0; // 如果 value 不存在，返回 0 + }, + + + } diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/detail.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/detail.vue index 302d5816..a8f3cede 100644 --- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/detail.vue +++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/detail.vue @@ -168,9 +168,40 @@ @change="handleDateChange">
- - -
+ + + +
+ + +
+ + +
+ + +
+ + + + +
+ + +
+ + + +
+ + +
+ + +
+ + +
@@ -213,9 +244,11 @@ import History from './history.vue' import Interface from './interface.vue' import Vlan from './vlan.vue' import Routing from './routing.vue' +import LineChart from './LineChart.vue' + export default { name: "cardItem", - components: { History, Interface, Vlan, Routing }, + components: { History, Interface, Vlan, Routing, LineChart }, data() { return { DateValue: [dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss'),dayjs().format('YYYY-MM-DD HH:mm:ss')], @@ -245,19 +278,324 @@ mounted() { let routeList = this.$route.params; this.dsId = routeList.id; this.getInfoFun(this.dsId) - this.gethistoryQuery(this.dsId) + setTimeout(() => { + this.gethistoryQuery(this.dsId) + }, 1000) }, methods: { initCharts() { // 性能图表 let details = this.historyQueryData; const performanceChart = echarts.init(document.getElementById('performanceChart')); + const performanceChart2 = echarts.init(document.getElementById('performanceChart2')); + const performanceChart3 = echarts.init(document.getElementById('performanceChart3')); + const performanceChart4 = echarts.init(document.getElementById('performanceChart4')); + const usedmemory = echarts.init(this.$refs.usedmemory, "macarons") + const usedmemory2 = echarts.init(this.$refs.usedmemory2, "macarons") + const usedmemory3 = echarts.init(this.$refs.usedmemory3, "macarons") + const usedmemory4 = echarts.init(this.$refs.usedmemory4, "macarons") + const usedmemory5 = echarts.init(this.$refs.usedmemory5, "macarons") + const chartData = { min: 0, max: 100, value: 70 }; + usedmemory.setOption({ + series: [ + { + type: 'gauge', + center: ['50%', '60%'], + radius: '90%', + min: chartData.min, + max: chartData.max, + startAngle: 220, + endAngle: -40, + splitNumber: 8, + axisLine: { + lineStyle: { + color: [ + [0.25, '#7afeaf'], + [0.5, '#58d9f9'], + [0.75, '#fbdd5e'], + [1, '#f03b44'], + ], + width: 10, + }, + }, + splitLine: { + // 分隔线 + show: true, + length: 15, + distance: 10, + lineStyle: { + width: 2, + color: 'auto', + }, + }, + axisTick: { + // 刻度线样式（及短线样式） + show: true, + lineStyle: { + width: 2, + color: 'auto', + }, + length: 10, + distance: 10, + }, + axisLabel: false, + detail: { + fontSize: '16', + formatter: '{value}℃', + color: 'auto', + offsetCenter: ['0', '0%'], + }, + pointer: { + icon: 'triangle', + show: true, + + offsetCenter: [0, '-70%'], + itemStyle: { + color: 'auto', + }, + length: '10%', + width: '3%', + }, + data: [ + { + value: this.details.temperature, + + name: '温度', + title: { + show: true, + color: '#606266', + offsetCenter: [0, '70%'], + fontSize: 18, + } + }, + ], + } + ] + }) + usedmemory2.setOption({ + series: [ + { + type: 'gauge', + center: ['50%', '60%'], + radius: '90%', + min: chartData.min, + max: chartData.max, + startAngle: 220, + endAngle: -40, + splitNumber: 8, + axisLine: { + lineStyle: { + color: [ + [0.25, '#f03b44'], + [0.5, '#fbdd5e'], + [0.75, '#58d9f9'], + [1, '#7afeaf'], + ], + width: 10, + }, + }, + splitLine: { + // 分隔线 + show: true, + length: 15, + distance: 10, + lineStyle: { + width: 2, + color: 'auto', + }, + }, + axisTick: { + // 刻度线样式（及短线样式） + show: true, + lineStyle: { + width: 2, + color: 'auto', + }, + length: 10, + distance: 10, + }, + axisLabel: false, + detail: { + fontSize: '16', + formatter: '{value}', + color: 'auto', + offsetCenter: ['0', '0%'], + }, + pointer: { + icon: 'triangle', + show: true, + + offsetCenter: [0, '-70%'], + itemStyle: { + color: 'auto', + }, + length: '10%', + width: '3%', + }, + data: [ + { + value: this.details.health == 1 ? '100' : this.details.health == 2 ? '75': this.details.health == 3 ? '50': this.details.health == 4 ? '25' : '0', + + name: '健康度', + title: { + show: true, + color: '#606266', + offsetCenter: [0, '70%'], + fontSize: 18, + } + }, + ], + } + ] + }) + usedmemory3.setOption({ + title: [ + { + text: 'CPU占用', + left: '45%', + top: '55%', + textAlign: 'center', + textStyle: { + fontSize: '14', + fontWeight: '400', + color: '#6AA0E4', + textAlign: 'center', + textShadowColor: '#000', + }, + }, + ], + series: { + type: 'pie', + radius: ['90%', "100%"], + hoverAnimation: false, + data: [ + { + value: this.details.cpuUtilization, + label: { + normal: { + color: '#6AA0E4', + fontSize: 22, + fontWeight: 'bold', + formatter: function(params) { + return params.value + '%'; + }, + position: 'center', + show: true, + } + }, + itemStyle: { + normal: { + color: '#6AA0E4' + } + } + },{ + value: 100-this.details.cpuUtilization, + name: '', + labelLine: { + show: false + }, + itemStyle: { + normal: { + color: '#D8D8D8' + }, + emphasis:{ + color:'#D8D8D8' + } + } + }] + } + }) + usedmemory4.setOption({ + title: [ + { + text: '内存使用率', + left: '45%', + top: '55%', + textAlign: 'center', + textStyle: { + fontSize: '14', + fontWeight: '400', + color: '#6AA0E4', + textAlign: 'center', + textShadowColor: '#000', + }, + }, + ], + series: { + type: 'pie', + radius: ['90%', "100%"], + hoverAnimation: false, + data: [ + { + value: this.details.memoryUtilization, + label: { + normal: { + color: '#6AA0E4', + fontSize: 22, + fontWeight: 'bold', + formatter: function(params) { + return params.value + '%'; + }, + position: 'center', + show: true, + } + }, + itemStyle: { + normal: { + color: '#6AA0E4' + } + } + },{ + value: 100-this.details.memoryUtilization, + name: '', + labelLine: { + show: false + }, + itemStyle: { + normal: { + color: '#D8D8D8' + }, + emphasis:{ + color:'#D8D8D8' + } + } + }] + } + }) + + usedmemory5.setOption({ + series: [ + { + type: 'pie', + radius: [0, '100%'], + center: ['50%', '50%'], + label: { + position: 'inside', + formatter: '{b}\n{c}', + color: '#30465D' + }, + labelLine: { + length: 5, + length2: 5 + }, + data: [{ + name: '输入', + value: this.details.volIn + }, + { + name: '输出', + value: this.details.volOut + } + ] + } + ] + }) performanceChart.setOption({ tooltip: { trigger: 'axis' }, legend: { - data: ['CPU使用率', '内存使用率', '健康度', '设备温度'], + data: ['设备温度'], textStyle: { color: '#718096' } @@ -271,7 +609,7 @@ mounted() { xAxis: { type: 'category', boundaryGap: false, - data: [...details.timeList], + data: [...details.temperatureList], axisLine: { lineStyle: { color: '#cbd5e0' @@ -308,15 +646,15 @@ mounted() { ], series: [ { - name: 'CPU使用率', + name: '设备温度', type: 'line', smooth: true, - data: [...details.cpuList], + data: [...details.temperatureList], lineStyle: { - color: '#ed8936' + color: '#4299e1' }, itemStyle: { - color: '#ed8936' + color: '#4299e1' }, areaStyle: { color: { @@ -326,18 +664,75 @@ mounted() { x2: 0, y2: 1, colorStops: [{ - offset: 0, color: 'rgba(237, 137, 54, 0.3)' + offset: 0, color: 'rgba(66, 153, 225, 0.3)' }, { - offset: 1, color: 'rgba(237, 137, 54, 0.1)' + offset: 1, color: 'rgba(66, 153, 225, 0.1)' }] } } + } + ] + }); + performanceChart4.setOption({ + tooltip: { + trigger: 'axis' + }, + legend: { + data: ['健康度'], + textStyle: { + color: '#718096' + } + }, + grid: { + left: '3%', + right: '4%', + bottom: '3%', + containLabel: true + }, + xAxis: { + type: 'category', + boundaryGap: false, + data: [...details.timeList], + axisLine: { + lineStyle: { + color: '#cbd5e0' + } + }, + axisLabel: { + color: '#718096' + } + }, + yAxis: { + type: 'value', + axisLine: { + lineStyle: { + color: '#cbd5e0' + } }, + axisLabel: { + color: '#718096', + formatter: '{value}%' + }, + splitLine: { + lineStyle: { + color: 'rgba(203, 213, 224, 0.6)' + } + } + }, + dataZoom: [ { - name: '内存使用率', + type: 'inside', // 内部滚轮控制 + xAxisIndex: 0, + start: 0, + end: 50 + } + ], + series: [ + { + name: '健康度', type: 'line', smooth: true, - data: [...details.memoryList], + data: [...details.healthList], lineStyle: { color: '#4299e1' }, @@ -358,22 +753,171 @@ mounted() { }] } } + } + ] + }); + performanceChart3.setOption({ + tooltip: { + trigger: 'axis' + }, + legend: { + data: ['CPU使用率'], + textStyle: { + color: '#718096' + } + }, + grid: { + left: '3%', + right: '4%', + bottom: '3%', + containLabel: true + }, + xAxis: { + type: 'category', + boundaryGap: false, + data: [...details.timeList], + axisLine: { + lineStyle: { + color: '#cbd5e0' + } }, - + axisLabel: { + color: '#718096' + } + }, + yAxis: { + type: 'value', + axisLine: { + lineStyle: { + color: '#cbd5e0' + } + }, + axisLabel: { + color: '#718096', + formatter: '{value}%' + }, + splitLine: { + lineStyle: { + color: 'rgba(203, 213, 224, 0.6)' + } + } + }, + dataZoom: [ { - name: '健康度', - type: 'bar', - data: [...details.healthList], + type: 'inside', // 内部滚轮控制 + xAxisIndex: 0, + start: 0, + end: 50 + } + ], + series: [ + { + name: 'CPU使用率', + type: 'line', + smooth: true, + data: [...details.cpuList], + lineStyle: { + color: '#4299e1' + }, itemStyle: { color: '#4299e1' + }, + areaStyle: { + color: { + type: 'linear', + x: 0, + y: 0, + x2: 0, + y2: 1, + colorStops: [{ + offset: 0, color: 'rgba(66, 153, 225, 0.3)' + }, { + offset: 1, color: 'rgba(66, 153, 225, 0.1)' + }] + } + } + } + ] + }); + performanceChart2.setOption({ + tooltip: { + trigger: 'axis' + }, + legend: { + data: ['内存使用率'], + textStyle: { + color: '#718096' + } + }, + grid: { + left: '3%', + right: '4%', + bottom: '3%', + containLabel: true + }, + xAxis: { + type: 'category', + boundaryGap: false, + data: [...details.timeList], + axisLine: { + lineStyle: { + color: '#cbd5e0' } }, + axisLabel: { + color: '#718096' + } + }, + yAxis: { + type: 'value', + axisLine: { + lineStyle: { + color: '#cbd5e0' + } + }, + axisLabel: { + color: '#718096', + formatter: '{value}%' + }, + splitLine: { + lineStyle: { + color: 'rgba(203, 213, 224, 0.6)' + } + } + }, + dataZoom: [ { - name: '设备温度', - type: 'bar', - data: [...details.temperatureList], + type: 'inside', // 内部滚轮控制 + xAxisIndex: 0, + start: 0, + end: 50 + } + ], + series: [ + { + name: '内存使用率', + type: 'line', + smooth: true, + data: [...details.memoryList], + lineStyle: { + color: '#4299e1' + }, itemStyle: { - color: '#ed8936' + color: '#4299e1' + }, + areaStyle: { + color: { + type: 'linear', + x: 0, + y: 0, + x2: 0, + y2: 1, + colorStops: [{ + offset: 0, color: 'rgba(66, 153, 225, 0.3)' + }, { + offset: 1, color: 'rgba(66, 153, 225, 0.1)' + }] + } } } ] @@ -381,6 +925,11 @@ mounted() { // 响应窗口大小变化 window.addEventListener('resize', function() { performanceChart.resize(); + performanceChart2.resize(); + performanceChart3.resize(); + performanceChart4.resize(); + usedmemory.resize(); + usedmemory2.resize(); // trafficChart.resize(); }); }, @@ -619,7 +1168,7 @@ mounted() { .chart-container { width: 100%; - height: 300px; + height: 200px; margin-top: 10px; } diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/history.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/history.vue index cf9bc934..4956198c 100644 --- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/history.vue +++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/history.vue @@ -8,11 +8,22 @@ width="60" type="index" > - - - - - + + + + + + + + + + + @@ -22,6 +33,7 @@