diff --git a/ALOps_sys_fe/alops-ui/public/favicon.ico b/ALOps_sys_fe/alops-ui/public/favicon.ico deleted file mode 100644 index e2637602..00000000 Binary files a/ALOps_sys_fe/alops-ui/public/favicon.ico and /dev/null differ diff --git a/ALOps_sys_fe/alops-ui/public/index.html b/ALOps_sys_fe/alops-ui/public/index.html index 7ddb4e3f..2754cc0b 100644 --- a/ALOps_sys_fe/alops-ui/public/index.html +++ b/ALOps_sys_fe/alops-ui/public/index.html @@ -5,7 +5,6 @@ - <%= webpackConfig.name %> diff --git a/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue b/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue index a053e075..35de9d86 100644 --- a/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue +++ b/ALOps_sys_fe/alops-ui/src/views/device/files/index.vue @@ -346,7 +346,8 @@ export default { pageNum: 1, pageSize: 10, name: undefined, - status: undefined + status: undefined, + floor: undefined }, // 表单校验 rules: { @@ -408,6 +409,11 @@ export default { } }, created() { + // 检查路由参数是否有floor + const floor = this.$route.query.floor; + if (floor) { + this.queryParams.floor = floor; + } this.getList() this.getDeviceTypeList() this.getDeviceManuList() 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 4f273296..de4e043b 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 @@ -10,9 +10,9 @@ {{cardData.name}} - + - {{ cardData.status ? '正常' : '停用' }} + {{ cardData.status == 1 ? '在线' : '离线' }} 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 fd0c9baf..343f06e2 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 @@ -9,9 +9,9 @@ {{details.name}} - + - {{ details.status ? '正常' : '停用' }} + {{ details.status == 1 ? '在线' : '离线' }}
@@ -1050,6 +1050,7 @@ mounted() { font-size: 14px; font-weight: 600; color: #2d3748; + padding-left: 18px; } .chart-container { diff --git a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/message/index.vue b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/message/index.vue index ef0981ed..231f417b 100644 --- a/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/message/index.vue +++ b/ALOps_sys_fe/alops-ui/src/views/inMonitoring/inMonitor/message/index.vue @@ -44,27 +44,31 @@ width="60" type="index" > - + - + + + - + - + @@ -98,12 +102,21 @@ - + 确 定 取 消 - + + + + +
+

{{ contentDialogContent }}

+
+ + 关 闭 +
@@ -148,6 +161,17 @@ export default { deptName: undefined, // 默认密码 initPassword: undefined, + // 内容查看弹窗相关 + contentDialogVisible: false, + contentDialogTitle: '', + contentDialogContent: '', + // 内容显示样式 + contentStyles: { + wordBreak: 'break-all', + whiteSpace: 'pre-wrap', + fontSize: '14px', + lineHeight: '1.8' + }, // 日期范围 dateRange: [], // 岗位选项 @@ -180,7 +204,8 @@ export default { pageNum: 1, pageSize: 10, name: undefined, - status: undefined + status: undefined, + level: undefined }, // 表单校验 rules: { @@ -200,6 +225,11 @@ export default { } }, created() { + // 检查路由参数是否有level + const level = this.$route.query.level; + if (level) { + this.queryParams.level = level; + } this.getList() }, methods: { @@ -325,7 +355,32 @@ export default { // 提交上传文件 submitFileForm() { this.$refs.upload.submit() + }, + + /** 显示内容弹窗 */ + showContentDialog(title, content) { + // 只有当内容存在时才显示弹窗 + if (content && content.trim() !== '') { + this.contentDialogTitle = title; + this.contentDialogContent = content; + this.contentDialogVisible = true; + } } } } - \ No newline at end of file + + + \ No newline at end of file diff --git a/ALOps_sys_fe/alops-ui/src/views/index.vue b/ALOps_sys_fe/alops-ui/src/views/index.vue index cb8b8dc9..bbc663f5 100644 --- a/ALOps_sys_fe/alops-ui/src/views/index.vue +++ b/ALOps_sys_fe/alops-ui/src/views/index.vue @@ -3,7 +3,7 @@
-

设备监控中心大屏 - 智能管理版

+

唐山烟草网络设备智能监管平台

{{ currentTime }}
@@ -37,7 +37,7 @@
+ class="floor-device-card" @click="jumpToDeviceFiles(floor.floor)">
{{ floor.floor }}
{{ floor.count }}
@@ -52,11 +52,11 @@
设备信息统计
-
+
{{ totalDevices }}
设备总数
-
+
{{ onlineDevices }}
在线设备数
@@ -377,6 +377,19 @@ export default { this.refreshDeviceStatus(); }, 60000); }, + activated() { + // 每次进入首页时刷新数据 + this.refreshDeviceStatus(); + this.loadDeviceTypeData(); + this.loadAlertStatistics(); + this.loadAlertTimes(); + this.loadFloorDeviceDistribution(); + this.updateTimeDisplay(); + + // 更新最后刷新时间 + this.updateTime = this.currentTime; + }, + beforeDestroy() { // 移除事件监听 window.removeEventListener('resize', this.handleResize); @@ -385,6 +398,14 @@ export default { } }, methods: { + // 跳转到设备档案页面 + goToDeviceFiles() { + this.$router.push('/device/files'); + }, + // 跳转到设备状态监控页面 + goToDeviceStateMonitor() { + this.$router.push('/inMonitoring/devicesState'); + }, // 处理日期范围变化，将结束时间设置为23:59:59 handleDateRangeChange(range) { if (range && range.length === 2) { @@ -868,6 +889,37 @@ export default { } else { this.warningLevelFilter = level; } + + // 年度预警跳转到预警信息页面 + if (level === 'annual') { + this.$router.push('/inMonitoring/inMonitoring/message'); + } + // 1-3级预警跳转到预警信息页面并传递级别参数 + else if (level === 'level1') { + this.$router.push({ + path: '/inMonitoring/inMonitoring/message', + query: { level: '1' } + }); + } + else if (level === 'level2') { + this.$router.push({ + path: '/inMonitoring/inMonitoring/message', + query: { level: '2' } + }); + } + else if (level === 'level3') { + this.$router.push({ + path: '/inMonitoring/inMonitoring/message', + query: { level: '3' } + }); + } + }, + // 跳转到设备档案页面并传递楼层参数 + jumpToDeviceFiles(floor) { + this.$router.push({ + path: '/device/files', + query: { floor: floor } + }); }, refreshDeviceStatus() { @@ -983,14 +1035,24 @@ export default { } .index-box { - background-color: #0a1633; - color: #e6e6e6; - overflow: auto; - padding: 16px; - min-height: 100%; - position: relative; - box-sizing: border-box; - } + background-color: #0a1633; + color: #e6e6e6; + overflow: auto; + padding: 16px; + min-height: 100%; + position: relative; + box-sizing: border-box; + } + + /* 可点击元素的样式 */ + .clickable-item { + cursor: pointer; + transition: all 0.3s; + } + + .clickable-item:hover { + background-color: #f0f9ff; + } .dashboard { width: 100%;