diff --git a/ALOps_sys_fe/alops-ui/src/api/message/index.js b/ALOps_sys_fe/alops-ui/src/api/message/index.js
new file mode 100644
index 00000000..0fcd0dab
--- /dev/null
+++ b/ALOps_sys_fe/alops-ui/src/api/message/index.js
@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+import { parseStrEmpty } from "@/utils/ruoyi";
+
+// 查询预警消息列表
+export function messageList(query) {
+ return request({
+ url: '/message/list',
+ method: 'get',
+ params: query
+ })
+}
+
+
+
+
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 3a374f1d..a47e6aba 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
@@ -227,6 +227,9 @@
+
+
+
@@ -245,10 +248,12 @@ import Interface from './interface.vue'
import Vlan from './vlan.vue'
import Routing from './routing.vue'
import LineChart from './LineChart.vue'
+import Veneer from './veneer.vue'
+
export default {
name: "cardItem",
- components: { History, Interface, Vlan, Routing, LineChart },
+ components: { History, Interface, Vlan, Routing, LineChart, Veneer},
data() {
return {
DateValue: [dayjs().subtract(1, 'month').format('YYYY-MM-DD HH:mm:ss'),dayjs().format('YYYY-MM-DD HH:mm:ss')],
@@ -258,6 +263,7 @@ export default {
{ name: '接口信息' },
{ name: 'VLAN信息' },
{ name: '路由表信息' },
+ { name: 'venner信息' },
],
tabIndex: 0,
dsId:null,
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 91e92cb0..f3687bd7 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
@@ -10,17 +10,17 @@
>
- {{ scope.row.occurTime || '--' }}
+ {{ scope.row.occurTime !== undefined && scope.row.occurTime !== null ? scope.row.occurTime : '--' }}
- {{ scope.row.level || '--' }}
+ {{ scope.row.level !== undefined && scope.row.level !== null ? scope.row.level : '--' }}
- {{ scope.row.message || '--' }}
+ {{ scope.row.message !== undefined && scope.row.message !== null ? scope.row.message : '--' }}
@@ -39,7 +39,7 @@
- {{ scope.row.handler || '--' }}
+ {{ scope.row.handler !== undefined && scope.row.handler !== null ? scope.row.handler : '--' }}
diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/interface.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/interface.vue
index 50cd32bb..cb7d24dc 100644
--- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/interface.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/interface.vue
@@ -10,12 +10,12 @@
>
- {{ parseTime(scope.row.gatherTime) || '--' }}
+ {{ parseTime(scope.row.gatherTime) !== undefined && parseTime(scope.row.gatherTime) !== null ? parseTime(scope.row.gatherTime) : '--' }}
- {{ scope.row.id || '--' }}
+ {{ scope.row.id !== undefined && scope.row.id !== null ? scope.row.id : '--' }}
@@ -25,37 +25,37 @@
- {{ scope.row.inFlow || '--' }}
+ {{ scope.row.inFlow !== undefined && scope.row.inFlow !== null ? scope.row.inFlow : '--' }}
- {{ scope.row.outFlow || '--' }}
+ {{ scope.row.outFlow !== undefined && scope.row.outFlow !== null ? scope.row.outFlow : '--' }}
- {{ scope.row.inBandwidth || '--' }}
+ {{ scope.row.inBandwidth !== undefined && scope.row.inBandwidth !== null ? scope.row.inBandwidth : '--' }}
- {{ scope.row.outBandwidth || '--' }}
+ {{ scope.row.outBandwidth !== undefined && scope.row.outBandwidth !== null ? scope.row.outBandwidth : '--' }}
- {{ scope.row.lossRate || '--' }}
+ {{ scope.row.lossRate !== undefined && scope.row.lossRate !== null ? scope.row.lossRate : '--' }}
- {{ scope.row.errorRate || '--' }}
+ {{ scope.row.errorRate !== undefined && scope.row.errorRate !== null ? scope.row.errorRate : '--' }}
- {{ scope.row.rate || '--' }}
+ {{ scope.row.rate !== undefined && scope.row.rate !== null ? scope.row.rate : '--' }}
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
index 4e1af7dd..70c5191c 100644
--- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/routing.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/routing.vue
@@ -10,17 +10,17 @@
>
- {{ scope.row.desAddress || '--' }}
+ {{ scope.row.desAddress !== undefined && scope.row.desAddress !== null ? scope.row.desAddress : '--' }}
- {{ scope.row.subnetMask || '--' }}
+ {{ scope.row.subnetMask !== undefined && scope.row.subnetMask !== null ? scope.row.subnetMask : '--' }}
- {{ scope.row.nextHop || '--' }}
+ {{ scope.row.nextHop !== undefined && scope.row.nextHop !== null ? scope.row.nextHop : '--' }}
diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/veneer.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/veneer.vue
new file mode 100644
index 00000000..fb17a395
--- /dev/null
+++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/veneer.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+ {{ scope.row.id !== undefined && scope.row.id !== null ? scope.row.id : '--' }}
+
+
+
+
+ {{ scope.row.veneerId !== undefined && scope.row.veneerId !== null ? scope.row.veneerId : '--' }}
+
+
+
+
+ {{ scope.row.equId !== undefined && scope.row.equId !== null ? scope.row.equId : '--' }}
+
+
+
+
+ {{ scope.row.veneerStatus !== undefined && scope.row.veneerStatus !== null ? scope.row.veneerStatus : '--' }}
+
+
+
+
+ {{ scope.row.equGatherId !== undefined && scope.row.equGatherId !== null ? scope.row.equGatherId : '--' }}
+
+
+
+
+
+
+
+
+
\ 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
index d9dcc453..051946d0 100644
--- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/vlan.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/vlan.vue
@@ -10,17 +10,17 @@
>
- {{ scope.row.mainId || '--' }}
+ {{ scope.row.mainId !== undefined && scope.row.mainId !== null ? scope.row.mainId : '--' }}
- {{ scope.row.ipAddress || '--' }}
+ {{ scope.row.ipAddress !== undefined && scope.row.ipAddress !== null ? scope.row.ipAddress : '--' }}
- {{ scope.row.subnetMask || '--' }}
+ {{ scope.row.subnetMask !== undefined && scope.row.subnetMask !== null ? scope.row.subnetMask : '--' }}
@@ -52,7 +52,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
- pageSize: 10,
+ pageSize: 1000,
name: undefined
},
}
diff --git a/ALOps_sys_fe/alops-ui/src/views/index.vue b/ALOps_sys_fe/alops-ui/src/views/index.vue
index 07ff5052..ce9628df 100644
--- a/ALOps_sys_fe/alops-ui/src/views/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/index.vue
@@ -375,7 +375,7 @@ export default {
// 定期更新设备状态数据(每分钟更新一次)
setInterval(() => {
this.refreshDeviceStatus();
- }, 60000);
+ }, 600000);
},
beforeDestroy() {
// 移除事件监听
diff --git a/ALOps_sys_fe/alops-ui/src/views/message/index.vue b/ALOps_sys_fe/alops-ui/src/views/message/index.vue
new file mode 100644
index 00000000..5d2c7238
--- /dev/null
+++ b/ALOps_sys_fe/alops-ui/src/views/message/index.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.content || '--' }}
+
+
+
+
+
+ {{ scope.row.status === 'unread' ? '未读' : '已读' }}
+
+
+
+
+
+ {{ scope.row.title || '--' }}
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+