From bb5951df768c7b2158247053981702fe9d2a32a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=89=E6=B5=A9=E8=8C=B9?=
 <oncwnuLslB1QkZmG_6L-1aBuubMg@git.weixin.qq.com>
Date: Tue, 30 Sep 2025 00:29:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=81=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97=E3=80=81=E6=8A=A5?=
 =?UTF-8?q?=E8=AD=A6=E8=AE=B0=E5=BD=95=E8=A1=A8=E6=A0=BC=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                    |   5 +
 src/components/AlarmRecord.vue |   4 +-
 src/components/SystemLog.vue   |   4 +-
 src/pages.json                 |   1 +
 src/pages/alarm/index.vue      |  17 ++-
 src/pages/log/index.vue        | 223 ++++++++++++++++++++-------------
 src/pages/visual/index.vue     |  93 --------------
 src/utils/sendMqtt.js          |  15 ++-
 8 files changed, 164 insertions(+), 198 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a8f18e9..3c3147c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -78,10 +78,15 @@ page {
   // top: 0;
   // left: 0;
   // right: 0;
+  height: 40px;
   z-index: 1000;
   background-color: #3f51b5;
   padding: 20rpx 30rpx;
   box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.1);
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
 }
 
 .header-title {
diff --git a/src/components/AlarmRecord.vue b/src/components/AlarmRecord.vue
index d226969..03ca36f 100644
--- a/src/components/AlarmRecord.vue
+++ b/src/components/AlarmRecord.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="page-container alarm-record-container">
     <!-- 页面头部 -->
-    <view class="page-header">
+    <!-- <view class="page-header">
       <view class="header-left">
         <text class="page-title">报警记录</text>
       </view>
@@ -13,7 +13,7 @@
           <text class="system-title-text">移动式检修车间系统</text>
         </view>
       </view>
-    </view>
+    </view> -->
     
     <!-- 报警表格 -->
     <view class="page-content">
diff --git a/src/components/SystemLog.vue b/src/components/SystemLog.vue
index 38abf7e..0220335 100644
--- a/src/components/SystemLog.vue
+++ b/src/components/SystemLog.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="page-container system-log-container">
     <!-- 页面头部 -->
-    <view class="page-header">
+    <!-- <view class="page-header">
       <view class="header-left">
         <text class="page-title">日志</text>
       </view>
@@ -13,7 +13,7 @@
           <text class="system-title-text">移动式检修车间系统</text>
         </view>
       </view>
-    </view>
+    </view> -->
     
     <!-- 日志表格 -->
     <view class="page-content">
diff --git a/src/pages.json b/src/pages.json
index 1c6aa66..05d563f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -61,6 +61,7 @@
 		"selectedColor": "#3f51b5",
 		"backgroundColor": "#ffffff",
 		"borderStyle": "black",
+		"fontSize": "14px",
 		"list": [
 			{
 				"pagePath": "pages/environment/index",
diff --git a/src/pages/alarm/index.vue b/src/pages/alarm/index.vue
index 9cc89ff..b9d8fb6 100644
--- a/src/pages/alarm/index.vue
+++ b/src/pages/alarm/index.vue
@@ -7,9 +7,10 @@
     
     <!-- 内容区域 -->
     <view class="tabbar-content">
+      <AlarmRecord />
     
     <!-- 报警统计 -->
-    <view class="alarm-statistics">
+    <!-- <view class="alarm-statistics">
       <view class="stat-item">
         <text class="stat-label">总报警数</text>
         <text class="stat-value total">{{ totalAlarms }}</text>
@@ -26,10 +27,10 @@
         <text class="stat-label">紧急报警</text>
         <text class="stat-value urgent">{{ urgentAlarms }}</text>
       </view>
-    </view>
+    </view> -->
     
     <!-- 筛选区域 -->
-    <view class="filter-section">
+    <!-- <view class="filter-section">
       <view class="filter-row">
         <view class="filter-item">
           <text class="filter-label">报警级别</text>
@@ -65,10 +66,10 @@
         
         <button class="search-button" @click="searchAlarms">搜索</button>
       </view>
-    </view>
+    </view> -->
     
     <!-- 报警列表 -->
-    <view class="alarms-container">
+    <!-- <view class="alarms-container">
       <view class="alarms-header">
         <text class="alarms-title">报警详情</text>
         <view class="header-actions">
@@ -121,13 +122,17 @@
           </view>
         </view>
       </scroll-view>
-    </view>
+    </view> -->
     </view>
   </view>
 </template>
 
 <script>
+import AlarmRecord from '@/components/AlarmRecord.vue'
 export default {
+  components: {
+    AlarmRecord
+  },
   data() {
     return {
       totalAlarms: 28,
diff --git a/src/pages/log/index.vue b/src/pages/log/index.vue
index 1f50c26..3ef4d3e 100644
--- a/src/pages/log/index.vue
+++ b/src/pages/log/index.vue
@@ -7,9 +7,19 @@
     
     <!-- 内容区域 -->
     <view class="tabbar-content">
+      <!-- <view class="filter-item">
+          <text class="filter-label">时间范围</text>
+          <picker mode="date" :value="logDate" @change="onDateChange">
+            <view class="picker-view">
+              <text>{{ logDate }}</text>
+              <text class="picker-arrow">▼</text>
+            </view>
+          </picker>
+        </view> -->
+      <SystemLog />
     
     <!-- 筛选区域 -->
-    <view class="filter-section">
+    <!-- <view class="filter-section">
       <view class="filter-row">
         <view class="filter-item">
           <text class="filter-label">日志级别</text>
@@ -21,15 +31,6 @@
           </picker>
         </view>
         
-        <view class="filter-item">
-          <text class="filter-label">时间范围</text>
-          <picker mode="date" :value="logDate" @change="onDateChange">
-            <view class="picker-view">
-              <text>{{ logDate }}</text>
-              <text class="picker-arrow">▼</text>
-            </view>
-          </picker>
-        </view>
       </view>
       
       <view class="filter-row">
@@ -40,52 +41,40 @@
         
         <button class="search-button" @click="searchLogs">搜索</button>
       </view>
-    </view>
+    </view> -->
     
-    <!-- 统计信息 -->
-    <view class="statistics-section">
-      <view class="stat-item">
-        <text class="stat-label">总日志数</text>
-        <text class="stat-value">{{ totalLogs }}</text>
-      </view>
-      <view class="stat-item">
-        <text class="stat-label">错误日志</text>
-        <text class="stat-value error">{{ errorLogs }}</text>
-      </view>
-      <view class="stat-item">
-        <text class="stat-label">警告日志</text>
-        <text class="stat-value warning">{{ warningLogs }}</text>
-      </view>
-      <view class="stat-item">
-        <text class="stat-label">信息日志</text>
-        <text class="stat-value info">{{ infoLogs }}</text>
-      </view>
-    </view>
-    
-    <!-- 日志列表 -->
-    <view class="logs-container">
+    <!-- 日志表格 -->
+    <!-- <view class="logs-container">
       <view class="logs-header">
-        <text class="logs-title">日志详情</text>
+        <text class="logs-title">系统日志</text>
         <view class="header-actions">
           <button class="action-button" @click="refreshLogs">刷新</button>
           <button class="action-button" @click="exportLogs">导出</button>
           <button class="action-button clear" @click="clearLogs">清空</button>
         </view>
-      </view>
+      </view> -->
       
-      <scroll-view class="logs-list" scroll-y="true" @scrolltolower="loadMoreLogs">
-        <view class="log-item" v-for="(log, index) in logs" :key="index" :class="log.level">
-          <view class="log-header">
-            <view class="log-level" :class="log.level">
-              <text>{{ log.levelText }}</text>
+      <!-- 表格头部 -->
+      <!-- <view class="table-header">
+        <view class="table-cell event-header">事件</view>
+        <view class="table-cell time-header">时间</view>
+        <view class="table-cell status-header">状态</view>
+      </view> -->
+      
+      <!-- 表格内容 -->
+      <!-- <scroll-view class="table-content" scroll-y="true" @scrolltolower="loadMoreLogs">
+        <view class="table-row" v-for="(log, index) in logs" :key="index" :class="log.level">
+          <view class="table-cell event-cell">
+            <text class="event-message">{{ log.message }}</text>
+            <text class="event-details" v-if="log.details">{{ log.details }}</text>
+          </view>
+          <view class="table-cell time-cell">
+            <text class="time-text">{{ log.time }}</text>
+          </view>
+          <view class="table-cell status-cell">
+            <view class="status-badge" :class="log.level">
+              <text class="status-text">{{ log.levelText }}</text>
             </view>
-            <text class="log-time">{{ log.time }}</text>
-          </view>
-          <view class="log-content">
-            <text class="log-message">{{ log.message }}</text>
-          </view>
-          <view class="log-details" v-if="log.details">
-            <text class="log-details-text">{{ log.details }}</text>
           </view>
         </view>
         
@@ -93,13 +82,17 @@
           <text class="load-more-text">加载更多...</text>
         </view>
       </scroll-view>
-    </view>
+    </view> -->
     </view>
   </view>
 </template>
 
 <script>
+import SystemLog from '@/components/SystemLog.vue'
 export default {
+  components: {
+    SystemLog
+  },
   data() {
     return {
       levelIndex: 0,
@@ -351,8 +344,8 @@ export default {
 
 .logs-container {
   background: white;
-  border-radius: 15rpx;
-  box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.1);
+  border-radius: 12rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.05);
   overflow: hidden;
 }
 
@@ -360,7 +353,7 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 30rpx;
+  padding: 25rpx;
   border-bottom: 2rpx solid #f0f0f0;
 }
 
@@ -387,39 +380,115 @@ export default {
   }
 }
 
-.logs-list {
+/* 表格样式 */
+.table-header {
+  display: flex;
+  background-color: #f8f9fa;
+  border-bottom: 2rpx solid #e0e0e0;
+}
+
+.table-cell {
+  padding: 20rpx 15rpx;
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
+  border-right: 1rpx solid #e0e0e0;
+  
+  &:last-child {
+    border-right: none;
+  }
+}
+
+.event-header {
+  flex: 2;
+  text-align: left;
+}
+
+.time-header {
+  flex: 1.2;
+  text-align: center;
+}
+
+.status-header {
+  flex: 0.8;
+  text-align: center;
+}
+
+.table-content {
   height: 600rpx;
 }
 
-.log-item {
-  padding: 30rpx;
-  border-bottom: 2rpx solid #f0f0f0;
+.table-row {
+  display: flex;
+  border-bottom: 1rpx solid #f0f0f0;
   
   &:last-child {
     border-bottom: none;
   }
   
+  &:hover {
+    background-color: #f8f9fa;
+  }
+  
   &.error {
-    border-left: 8rpx solid #ff4444;
+    background-color: #fff5f5;
   }
   
   &.warning {
-    border-left: 8rpx solid #ff9800;
+    background-color: #fffbf0;
   }
   
   &.info {
-    border-left: 8rpx solid #2196f3;
+    background-color: #f0f8ff;
   }
 }
 
-.log-header {
+.event-cell {
+  flex: 2;
+  padding: 20rpx 15rpx;
   display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 15rpx;
+  flex-direction: column;
+  gap: 8rpx;
 }
 
-.log-level {
+.event-message {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 1.4;
+}
+
+.event-details {
+  font-size: 24rpx;
+  color: #666;
+  line-height: 1.3;
+  background-color: #f8f8f8;
+  padding: 8rpx 12rpx;
+  border-radius: 6rpx;
+}
+
+.time-cell {
+  flex: 1.2;
+  padding: 20rpx 15rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.time-text {
+  font-size: 24rpx;
+  color: #666;
+  text-align: center;
+}
+
+.status-cell {
+  flex: 0.8;
+  padding: 20rpx 15rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.status-badge {
   padding: 8rpx 16rpx;
   border-radius: 20rpx;
   font-size: 22rpx;
@@ -441,32 +510,8 @@ export default {
   }
 }
 
-.log-time {
-  font-size: 24rpx;
-  color: #666;
-}
-
-.log-content {
-  margin-bottom: 10rpx;
-}
-
-.log-message {
-  font-size: 28rpx;
-  color: #333;
-  line-height: 1.5;
-}
-
-.log-details {
-  background-color: #f8f8f8;
-  padding: 15rpx;
-  border-radius: 8rpx;
-  margin-top: 10rpx;
-}
-
-.log-details-text {
-  font-size: 24rpx;
-  color: #666;
-  line-height: 1.4;
+.status-text {
+  font-size: 22rpx;
 }
 
 .load-more {
diff --git a/src/pages/visual/index.vue b/src/pages/visual/index.vue
index 483018f..c88e579 100644
--- a/src/pages/visual/index.vue
+++ b/src/pages/visual/index.vue
@@ -7,99 +7,6 @@
     
     <!-- 内容区域 -->
     <view class="tabbar-content">
-    
-    <!-- 摄像头状态 -->
-    <view class="camera-status">
-      <view class="status-item">
-        <view class="status-icon camera-icon">📹</view>
-        <view class="status-info">
-          <text class="status-label">摄像头状态</text>
-          <text class="status-value" :class="cameraStatus.class">{{ cameraStatus.text }}</text>
-        </view>
-      </view>
-      
-      <view class="status-item">
-        <view class="status-icon recording-icon">🔴</view>
-        <view class="status-info">
-          <text class="status-label">录制状态</text>
-          <text class="status-value" :class="recordingStatus.class">{{ recordingStatus.text }}</text>
-        </view>
-      </view>
-    </view>
-    
-    <!-- 视频区域 -->
-    <view class="video-container">
-      <view class="video-placeholder" v-if="!videoLoaded">
-        <image class="placeholder-image" src="/static/camera-placeholder.jpg" mode="aspectFit"></image>
-        <text class="placeholder-text">摄像头未连接</text>
-        <button class="connect-button" @click="connectCamera">连接摄像头</button>
-      </view>
-      
-      <view class="video-player" v-else>
-        <text class="video-text">实时视频流</text>
-        <view class="video-controls">
-          <button class="control-button" @click="toggleRecording">
-            {{ isRecording ? '停止录制' : '开始录制' }}
-          </button>
-          <button class="control-button" @click="takeSnapshot">拍照</button>
-          <button class="control-button" @click="toggleFullscreen">全屏</button>
-        </view>
-      </view>
-    </view>
-    
-    <!-- 监控设置 -->
-    <view class="monitoring-settings">
-      <view class="settings-header">
-        <text class="settings-title">监控设置</text>
-      </view>
-      
-      <view class="setting-item">
-        <text class="setting-label">录制质量</text>
-        <picker :value="qualityIndex" :range="qualityOptions" @change="onQualityChange">
-          <view class="picker-view">
-            <text>{{ qualityOptions[qualityIndex] }}</text>
-            <text class="picker-arrow">▼</text>
-          </view>
-        </picker>
-      </view>
-      
-      <view class="setting-item">
-        <text class="setting-label">录制时长</text>
-        <picker :value="durationIndex" :range="durationOptions" @change="onDurationChange">
-          <view class="picker-view">
-            <text>{{ durationOptions[durationIndex] }}</text>
-            <text class="picker-arrow">▼</text>
-          </view>
-        </picker>
-      </view>
-      
-      <view class="setting-item">
-        <text class="setting-label">自动保存</text>
-        <switch :checked="autoSave" @change="onAutoSaveChange" color="#3f51b5"/>
-      </view>
-    </view>
-    
-    <!-- 录制历史 -->
-    <view class="recording-history">
-      <view class="history-header">
-        <text class="history-title">录制历史</text>
-        <button class="clear-button" @click="clearHistory">清空</button>
-      </view>
-      
-      <scroll-view class="history-list" scroll-y="true">
-        <view class="history-item" v-for="(item, index) in historyList" :key="index">
-          <view class="history-info">
-            <text class="history-time">{{ item.time }}</text>
-            <text class="history-duration">{{ item.duration }}</text>
-          </view>
-          <view class="history-actions">
-            <button class="action-button" @click="playVideo(item)">播放</button>
-            <button class="action-button" @click="downloadVideo(item)">下载</button>
-            <button class="action-button delete" @click="deleteVideo(item)">删除</button>
-          </view>
-        </view>
-      </scroll-view>
-    </view>
     </view>
   </view>
 </template>
diff --git a/src/utils/sendMqtt.js b/src/utils/sendMqtt.js
index 8ca4b6a..0aa6b3e 100644
--- a/src/utils/sendMqtt.js
+++ b/src/utils/sendMqtt.js
@@ -88,11 +88,14 @@ const createMqtt = () => {
 		
 		// 连接失败时隐藏loading
 		uni.hideLoading();
-		uni.showToast({
-			title: 'MQTT连接失败' + mqtturl,
-			icon: 'error',
-			duration: 3000
-		});
+		// uni.showToast({
+		// 	title: 'MQTT连接失败',
+		// 	icon: 'error',
+		// 	duration: 3000
+		// });
+		
+		// 重置客户端，允许重试
+		client = null;
 	}
 };
 
@@ -105,7 +108,7 @@ const initEventHandleMqtt = (topicUrl) => {
 		
 		// 显示连接成功提示
 		uni.showToast({
-			title: 'MQTT连接成功' + mqtturl,
+			title: 'MQTT连接成功',
 			icon: 'success',
 			duration: 2000
 		});