From 9039f8db87a3c57c79f5b1ab25d27ab494829d0c Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Thu, 6 Nov 2025 21:37:33 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alops-ui/src/api/message/index.js         | 15 +++
 .../alops-ui/src/views/message/index.vue      | 95 +++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 ALOps_sys_fe/alops-ui/src/api/message/index.js
 create mode 100644 ALOps_sys_fe/alops-ui/src/views/message/index.vue

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/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 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <splitpanes :horizontal="this.$store.getters.device === 'mobile'" class="default-theme">
+        <!--设备档案-->
+        <pane size="84">
+          <el-col>
+            <el-table v-loading="loading" :data="dataList">
+              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column
+                label="序号"
+                width="60"
+                type="index"
+              ></el-table-column>              
+              <el-table-column label="消息ID" align="center" key="id" prop="id" width="80" />
+              <el-table-column label="用户ID" align="center" key="userId" prop="userId" width="80" />
+              <el-table-column label="消息内容" align="center" key="content" prop="content" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.content || '--' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="消息状态" align="center" key="status" prop="status" width="100">
+                <template slot-scope="scope">
+                  <el-tag :type="scope.row.status === 'unread' ? 'primary' : 'success'">
+                    {{ scope.row.status === 'unread' ? '未读' : '已读' }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="标题" align="center" key="title" prop="title" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.title || '--' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+          </el-col>
+        </pane>
+      </splitpanes>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { messageList } from "@/api/message/index"
+import { Splitpanes, Pane } from "splitpanes"
+import "splitpanes/dist/splitpanes.css"
+
+export default {
+  name: "Message",
+  components: { Splitpanes, Pane },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+
+
+      // 总条数
+      total: 0,
+      // 消息数据列表
+      dataList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        status: undefined
+      },
+
+    }
+  },
+
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询设备列表 */
+    getList() {
+      this.loading = true
+      messageList(this.queryParams).then(response => {
+          this.dataList = response.data || []
+          this.total = response.data?.length || 0
+          this.loading = false
+        }
+      )
+    },
+
+
+  }
+}
+</script>

From f1d706c75909bbc55dca2d29f891c60da97d8eda Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Thu, 6 Nov 2025 21:49:13 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=A9=BA=E7=8A=B6=E6=80=81=E5=88=A4=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inMonitoring/devicesState/history.vue      |  8 ++++----
 .../inMonitoring/devicesState/interface.vue    | 18 +++++++++---------
 .../inMonitoring/devicesState/routing.vue      |  6 +++---
 .../views/inMonitoring/devicesState/vlan.vue   |  6 +++---
 4 files changed, 19 insertions(+), 19 deletions(-)

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 @@
           ></el-table-column>
           <el-table-column label="预警时间" align="center" key="occurTime" prop="occurTime">
             <template slot-scope="scope">
-              <span>{{ scope.row.occurTime || '--' }}</span>
+              <span>{{ scope.row.occurTime !== undefined && scope.row.occurTime !== null ? scope.row.occurTime : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="预警等级" align="center" key="level" prop="level" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.level || '--' }}</span>
+              <span>{{ scope.row.level !== undefined && scope.row.level !== null ? scope.row.level : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="预警信息" align="center" key="message" prop="message" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.message || '--' }}</span>
+              <span>{{ scope.row.message !== undefined && scope.row.message !== null ? scope.row.message : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="预警状态" align="center" key="status" prop="status" :show-overflow-tooltip="true">
@@ -39,7 +39,7 @@
 
           <el-table-column label="处理人" align="center" key="handler" prop="handler" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
-              <span >{{ scope.row.handler || '--' }}</span>
+              <span >{{ scope.row.handler !== undefined && scope.row.handler !== null ? scope.row.handler : '--' }}</span>
             </template>
           </el-table-column>
 
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 @@
           ></el-table-column>
           <el-table-column label="采集时间" align="center" prop="gatherTime" width="160">
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.gatherTime) || '--' }}</span>
+              <span>{{ parseTime(scope.row.gatherTime) !== undefined && parseTime(scope.row.gatherTime) !== null ? parseTime(scope.row.gatherTime) : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="接口ID" align="center" key="id" prop="id" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.id || '--' }}</span>
+              <span>{{ scope.row.id !== undefined && scope.row.id !== null ? scope.row.id : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="双工模式" align="center" key="commuicateMode" prop="commuicateMode" :show-overflow-tooltip="true">
@@ -25,37 +25,37 @@
           </el-table-column>
           <el-table-column label="入方向流量" align="center" key="inFlow" prop="inFlow" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.inFlow || '--' }}</span>
+              <span>{{ scope.row.inFlow !== undefined && scope.row.inFlow !== null ? scope.row.inFlow : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="出方向流量" align="center" key="outFlow" prop="outFlow" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.outFlow || '--' }}</span>
+              <span>{{ scope.row.outFlow !== undefined && scope.row.outFlow !== null ? scope.row.outFlow : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="入方向宽带占用率%" align="center" key="inBandwidth" prop="inBandwidth" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.inBandwidth || '--' }}</span>
+              <span>{{ scope.row.inBandwidth !== undefined && scope.row.inBandwidth !== null ? scope.row.inBandwidth : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="出方向宽带占用率%" align="center" key="outBandwidth" prop="outBandwidth" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.outBandwidth || '--' }}</span>
+              <span>{{ scope.row.outBandwidth !== undefined && scope.row.outBandwidth !== null ? scope.row.outBandwidth : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="丢包率" align="center" key="lossRate" prop="lossRate" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.lossRate || '--' }}</span>
+              <span>{{ scope.row.lossRate !== undefined && scope.row.lossRate !== null ? scope.row.lossRate : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="错包率" align="center" key="errorRate" prop="errorRate" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.errorRate || '--' }}</span>
+              <span>{{ scope.row.errorRate !== undefined && scope.row.errorRate !== null ? scope.row.errorRate : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="传输速率" align="center" key="rate" prop="rate" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.rate || '--' }}</span>
+              <span>{{ scope.row.rate !== undefined && scope.row.rate !== null ? scope.row.rate : '--' }}</span>
             </template>
           </el-table-column>
         </el-table>
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 @@
           ></el-table-column>
           <el-table-column label="目的地址" align="center" key="desAddress" prop="desAddress" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.desAddress || '--' }}</span>
+              <span>{{ scope.row.desAddress !== undefined && scope.row.desAddress !== null ? scope.row.desAddress : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="子网掩码" align="center" key="subnetMask" prop="subnetMask" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.subnetMask || '--' }}</span>
+              <span>{{ scope.row.subnetMask !== undefined && scope.row.subnetMask !== null ? scope.row.subnetMask : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="下一跳地址" align="center" key="nextHop" prop="nextHop" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.nextHop || '--' }}</span>
+              <span>{{ scope.row.nextHop !== undefined && scope.row.nextHop !== null ? scope.row.nextHop : '--' }}</span>
             </template>
           </el-table-column>
         </el-table>
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..29de0312 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 @@
           ></el-table-column>
           <el-table-column label="ManID" align="center" key="mainId" prop="mainId" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.mainId || '--' }}</span>
+              <span>{{ scope.row.mainId !== undefined && scope.row.mainId !== null ? scope.row.mainId : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="IP地址" align="center" key="ipAddress" prop="ipAddress" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.ipAddress || '--' }}</span>
+              <span>{{ scope.row.ipAddress !== undefined && scope.row.ipAddress !== null ? scope.row.ipAddress : '--' }}</span>
             </template>
           </el-table-column>
           <el-table-column label="子网掩码" align="center" key="subnetMask" prop="subnetMask" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span>{{ scope.row.subnetMask || '--' }}</span>
+              <span>{{ scope.row.subnetMask !== undefined && scope.row.subnetMask !== null ? scope.row.subnetMask : '--' }}</span>
             </template>
           </el-table-column>
         </el-table>

From ddc716eabd782942f72911eb44b0367091c61c0f Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Thu, 6 Nov 2025 21:58:50 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E7=AB=99=E5=86=85?=
 =?UTF-8?q?=E4=BF=A1=E5=BC=B9=E7=AA=97=E6=94=B9=E4=B8=80=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ALOps_sys_fe/alops-ui/src/views/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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() {
                 // 移除事件监听

From 50d5e5e02225efa29806cb334b05cd755377fdf8 Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Thu, 6 Nov 2025 22:20:33 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90web=E3=80=91=20=E6=B7=BB=E5=8A=A0v?=
 =?UTF-8?q?eneer=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inMonitoring/devicesState/detail.vue      |  8 +-
 .../inMonitoring/devicesState/veneer.vue      | 93 +++++++++++++++++++
 .../views/inMonitoring/devicesState/vlan.vue  |  2 +-
 3 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 ALOps_sys_fe/alops-ui/src/views/inMonitoring/devicesState/veneer.vue

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 @@
                       <div class="bottom-item" v-if="tabIndex == 3">
                         <Routing :dsId="dsId"/>
                       </div>
+                      <div class="bottom-item" v-if="tabIndex == 4">
+                        <Veneer :dsId="dsId"/>
+                      </div>
                     </div>
                 </div>
             </div>
@@ -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/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 @@
+<template>
+  <div class="">
+    <el-row :gutter="20">
+      <el-col>
+        <el-table v-loading="loading" :data="userList">
+          <el-table-column
+            label="序号"
+            width="60"
+            type="index"
+          ></el-table-column>
+          <el-table-column label="ID" align="center" key="id" prop="id" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ scope.row.id !== undefined && scope.row.id !== null ? scope.row.id : '--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="单板ID" align="center" key="veneerId" prop="veneerId" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ scope.row.veneerId !== undefined && scope.row.veneerId !== null ? scope.row.veneerId : '--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="设备ID" align="center" key="equId" prop="equId" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ scope.row.equId !== undefined && scope.row.equId !== null ? scope.row.equId : '--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="单板状态" align="center" key="veneerStatus" prop="veneerStatus" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ scope.row.veneerStatus !== undefined && scope.row.veneerStatus !== null ? scope.row.veneerStatus : '--' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="采集ID" align="center" key="equGatherId" prop="equGatherId" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ scope.row.equGatherId !== undefined && scope.row.equGatherId !== null ? scope.row.equGatherId : '--' }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { systemVeneer } from "@/api/inMonitoring/devicesState"
+import "@riophae/vue-treeselect/dist/vue-treeselect.css"
+import "splitpanes/dist/splitpanes.css"
+
+export default {
+  props: {
+    dsId: {
+      type: String,
+      default: 'chart'
+    }
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 类型表格数据
+      userList: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: undefined
+      },
+    }
+  },
+  created() {
+  },
+  watch: {
+    dsId: {
+      handler(val) {
+        this.getList(val)
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    /** 查询类型列表 */
+    getList(id) {
+      this.loading = true
+      systemVeneer(id).then(response => {
+          this.userList = response.rows
+          this.loading = false
+        }
+      )
+    }
+  }
+}
+</script>
\ 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 29de0312..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
@@ -52,7 +52,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 1000,
         name: undefined
       },
     }