From fbef639ab4b66d0d8cc8c25d8a3b1fadf4ae53c2 Mon Sep 17 00:00:00 2001
From: Wangxin <wangxin@icanag.com>
Date: Sun, 9 Nov 2025 20:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90web=E3=80=91=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ALOps_sys_fe/alops-ui/.env.development        |  2 +-
 ALOps_sys_fe/alops-ui/.env.production         |  2 +-
 ALOps_sys_fe/alops-ui/package.json            |  2 +-
 ALOps_sys_fe/alops-ui/public/index.html       |  3 +-
 .../src/layout/components/Sidebar/Logo.vue    |  2 +-
 .../src/views/QandA/knowledge/index.vue       | 45 ++++++++++++++++++-
 .../inMonitoring/inMonitor/message/index.vue  | 10 ++++-
 ALOps_sys_fe/alops-ui/src/views/index.vue     |  4 +-
 8 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/ALOps_sys_fe/alops-ui/.env.development b/ALOps_sys_fe/alops-ui/.env.development
index fb5fbac8..e71bf2b4 100644
--- a/ALOps_sys_fe/alops-ui/.env.development
+++ b/ALOps_sys_fe/alops-ui/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 中国烟草
+VUE_APP_TITLE = 唐山烟草网络设备智能监管平台
 
 # 开发环境配置
 ENV = 'development'
diff --git a/ALOps_sys_fe/alops-ui/.env.production b/ALOps_sys_fe/alops-ui/.env.production
index d23f04e4..4ee328cb 100644
--- a/ALOps_sys_fe/alops-ui/.env.production
+++ b/ALOps_sys_fe/alops-ui/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 中国烟草
+VUE_APP_TITLE = 唐山烟草网络设备智能监管平台
 
 # 生产环境配置
 ENV = 'production'
diff --git a/ALOps_sys_fe/alops-ui/package.json b/ALOps_sys_fe/alops-ui/package.json
index e006c998..76fbb0c0 100644
--- a/ALOps_sys_fe/alops-ui/package.json
+++ b/ALOps_sys_fe/alops-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.9.0",
-  "description": "中国烟草",
+  "description": "唐山烟草网络设备智能监管平台",
   "author": "若依",
   "license": "MIT",
   "scripts": {
diff --git a/ALOps_sys_fe/alops-ui/public/index.html b/ALOps_sys_fe/alops-ui/public/index.html
index 2754cc0b..10a5ed57 100644
--- a/ALOps_sys_fe/alops-ui/public/index.html
+++ b/ALOps_sys_fe/alops-ui/public/index.html
@@ -4,9 +4,10 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
+    <link rel="icon" href="data:;base64,iVBORw0KGgo=">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-    <title><%= webpackConfig.name %></title>
+    <title>唐山烟草网络设备智能监管平台</title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
     html,
diff --git a/ALOps_sys_fe/alops-ui/src/layout/components/Sidebar/Logo.vue b/ALOps_sys_fe/alops-ui/src/layout/components/Sidebar/Logo.vue
index 4ec53ebc..083f49e2 100644
--- a/ALOps_sys_fe/alops-ui/src/layout/components/Sidebar/Logo.vue
+++ b/ALOps_sys_fe/alops-ui/src/layout/components/Sidebar/Logo.vue
@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: process.env.VUE_APP_TITLE,
+      title: '中国烟草',
       logo: logoImg
     }
   }
diff --git a/ALOps_sys_fe/alops-ui/src/views/QandA/knowledge/index.vue b/ALOps_sys_fe/alops-ui/src/views/QandA/knowledge/index.vue
index 52b08df1..1c3c7891 100644
--- a/ALOps_sys_fe/alops-ui/src/views/QandA/knowledge/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/QandA/knowledge/index.vue
@@ -22,7 +22,7 @@
               <el-table-column label="文件名称" align="center" key="source" prop="source" :show-overflow-tooltip="true" />
               <el-table-column label="更新时间" align="center" prop="uploadTime" width="160">
                 <template slot-scope="scope">
-                  <span>{{ parseTime(scope.row.uploadTime) }}</span>
+                  <span>{{ formatISOTime(scope.row.uploadTime) }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
@@ -56,6 +56,8 @@
             :data="{ source: form.source }"
             :on-preview="handlePreview"
             :on-remove="handleRemove"
+            :on-error="handleUploadError"
+            :before-upload="beforeUpload"
             :file-list="fileList"
             :headers="headers"
             :auto-upload="false">
@@ -298,6 +300,22 @@ export default {
         this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
+    /** 格式化ISO时间字符串 */
+    formatISOTime(isoString) {
+      if (!isoString) return '';
+      const date = new Date(isoString);
+      if (isNaN(date.getTime())) return isoString;
+      
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      const hours = String(date.getHours()).padStart(2, '0');
+      const minutes = String(date.getMinutes()).padStart(2, '0');
+      const seconds = String(date.getSeconds()).padStart(2, '0');
+      
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    },
+    
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/user/export', {
@@ -318,6 +336,31 @@ export default {
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true
     },
+    // 文件上传前校验
+    beforeUpload(file) {
+      const isDocx = file.name.endsWith('.docx');
+      const isTxt = file.name.endsWith('.txt');
+      const isLt5M = file.size / 1024 / 1024 < 5;
+
+      if (!isDocx && !isTxt) {
+        this.$message.error('只允许上传docx/txt格式的文件!');
+        return false;
+      }
+      if (!isLt5M) {
+        this.$message.error('文件大小不能超过5MB!');
+        return false;
+      }
+      return true;
+    },
+    
+    // 文件上传失败处理
+    handleUploadError(err, file, fileList) {
+      this.upload.isUploading = false;
+      // 显示错误消息
+      this.$modal.msgError("上传失败，请重试");
+      console.error('上传失败:', err);
+    },
+    
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
       this.upload.isUploading = false;
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 b29ebf75..abd2e46a 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
@@ -9,6 +9,12 @@
               <el-form-item label="预警时间">
                 <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd hh:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
               </el-form-item>
+              <el-form-item label="设备编号" prop="equNumber">
+                <el-input v-model="queryParams.equNumber" placeholder="设备编号" clearable style="width: 240px" />
+              </el-form-item>
+              <el-form-item label="设备名称" prop="name">
+                <el-input v-model="queryParams.name" placeholder="设备名称" clearable style="width: 240px" />
+              </el-form-item>
               <el-form-item label="预警等级" prop="level">
                 <el-select v-model="queryParams.level" placeholder="预警等级" clearable style="width: 240px">
                   <el-option v-for="dict in dict.type.warning_level" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -39,11 +45,11 @@
 
             <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="50" align="center" />
-              <el-table-column
-                label="序号"
+              <el-table-column label="序号"
                 width="60"
                 type="index"
               ></el-table-column>              
+              <el-table-column label="设备名称" align="center" key="name" prop="name" width="150" :show-overflow-tooltip="true" />
               <el-table-column label="预警时间" align="center" key="occurTime" prop="occurTime" :show-overflow-tooltip="true" />
               <el-table-column label="预警等级" align="center" key="level" prop="level" :show-overflow-tooltip="true" />
               <el-table-column label="预警信息" align="center" key="message" prop="message" width="200" :show-overflow-tooltip="true">
diff --git a/ALOps_sys_fe/alops-ui/src/views/index.vue b/ALOps_sys_fe/alops-ui/src/views/index.vue
index 7d7859f2..1caf5ad3 100644
--- a/ALOps_sys_fe/alops-ui/src/views/index.vue
+++ b/ALOps_sys_fe/alops-ui/src/views/index.vue
@@ -926,9 +926,11 @@ export default {
                 },
                 // 跳转到设备档案页面并传递楼层参数
                 jumpToDeviceFiles(floor) {
+                    // 移除'层'字并转换为数字
+                    const floorNumber = Number(String(floor).replace('层', ''));
                     this.$router.push({
                         path: '/device/files',
-                        query: { floor: floor }
+                        query: { floor: floorNumber }
                     });
                 },