From 945385db931d7dda678fe53474ade5d765c248ce Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 27 May 2025 13:23:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ui):=20=E4=BC=98=E5=8C=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=95=8C=E9=9D=A2=E5=92=8C=E6=95=B0=E6=8D=AE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改记录时间筛选功能
- 调整异常类型默认值
-隐藏某些列的展示
- 更新触发规则相关逻辑
- 优化首页数据展示
- 更换登录背景图片
- 调整导航栏异常类型展示
---
 src/layout/components/Navbar.vue              | 11 +++++-----
 .../ems/record/recordAlarmData/index.vue      | 22 +++++++++----------
 .../ems/record/recordAlarmRule/index.vue      | 18 +++++++--------
 src/views/index.vue                           | 14 ++++++------
 src/views/login.vue                           |  2 +-
 5 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index a4d364c..15176bd 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -70,11 +70,12 @@
       >
         <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="异常设备" align="center" prop="deviceName"/>
-        <el-table-column label="异常类型" align="center" prop="alarmType">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.alarm_type" :value="scope.row.alarmType"/>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="异常类型" align="center" prop="alarmType">-->
+<!--          <template slot-scope="scope">-->
+<!--            <dict-tag :options="dict.type.alarm_type" :value="scope.row.alarmType"/>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column label="异常类型" align="center" prop="cause"/>
         <el-table-column label="异常数据" align="center" prop="alarmData"/>
         <el-table-column label="异常状态" align="center" prop="alarmStatus">
           <template slot-scope="scope">
diff --git a/src/views/ems/record/recordAlarmData/index.vue b/src/views/ems/record/recordAlarmData/index.vue
index 6dabc0a..0d88d4a 100644
--- a/src/views/ems/record/recordAlarmData/index.vue
+++ b/src/views/ems/record/recordAlarmData/index.vue
@@ -17,15 +17,15 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="记录时间" prop="collectTime">-->
-<!--        <el-date-picker clearable-->
-<!--                        v-model="queryParams.collectTime"-->
-<!--                        type="date"-->
-<!--                        value-format="yyyy-MM-dd"-->
-<!--                        placeholder="请选择记录时间"-->
-<!--        >-->
-<!--        </el-date-picker>-->
-<!--      </el-form-item>-->
+      <el-form-item label="记录时间" prop="collectTime">
+        <el-date-picker clearable
+                        v-model="queryParams.collectTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择记录时间"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item label="异常类型" prop="alarmType">
         <el-select v-model="queryParams.alarmType" placeholder="请选择异常类型" clearable>
           <el-option
@@ -277,7 +277,7 @@ export default {
         monitorId: null,
         collectDeviceId: null,
         collectTime: null,
-        alarmType: '1',
+        alarmType: null,
         alarmStatus: null,
         alarmData: null,
         operationName: null,
@@ -296,7 +296,7 @@ export default {
       columns: [
         { key: 0, label: `自增标识`, visible: false },
         { key: 1, label: `计量设备编号`, visible: true },
-        { key: 2, label: `采集设备编号`, visible: true },
+        { key: 2, label: `采集设备编号`, visible: false },
         { key: 3, label: `记录时间`, visible: true },
         { key: 4, label: `异常类型`, visible: true },
         { key: 5, label: `异常状态`, visible: true },
diff --git a/src/views/ems/record/recordAlarmRule/index.vue b/src/views/ems/record/recordAlarmRule/index.vue
index 18c740f..f1c1f49 100644
--- a/src/views/ems/record/recordAlarmRule/index.vue
+++ b/src/views/ems/record/recordAlarmRule/index.vue
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="触发规则" prop="triggerRule">
+       <el-form-item label="触发规则" prop="triggerRule">
         <el-select v-model="queryParams.triggerRule" placeholder="请选择触发规则" clearable>
           <el-option
             v-for="dict in dict.type.trigger_rule"
@@ -18,7 +18,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
 <!--      <el-form-item label="通知用户" prop="notifyUser">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.notifyUser"-->
@@ -161,10 +161,10 @@
 <!--          </el-date-picker>-->
 <!--        </el-form-item>-->
 <!--        <el-form-item label="能源类型" prop="energyType">-->
-<!--          <el-input v-model="form.energyType" placeholder="请输入能源类型"/>-->
+<!--          <el-input v-model="form.energyType" placeholder="请输入能源类型" disabled/>-->
 <!--        </el-form-item>-->
-        <!-- <el-form-item label="触发规则" prop="triggerRule">
-          <el-radio-group v-model="form.triggerRule" disabled>
+         <el-form-item label="触发规则" prop="triggerRule">
+          <el-radio-group v-model="form.triggerRule" >
             <el-radio
               v-for="dict in dict.type.trigger_rule"
               :key="dict.value"
@@ -172,7 +172,7 @@
             >{{ dict.label }}
             </el-radio>
           </el-radio-group>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="监测字段" prop="monitorField" v-if="selectedMonitorType === 6 || selectedMonitorType === 10">
           <el-select v-model="form.monitorField" placeholder="请选择监测字段">
             <el-option v-for="dict in dict.type.monitor_field" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -244,7 +244,7 @@ export default {
         monitorId: null,
         collectTime: null,
         energyType: null,
-        triggerRule: 0,
+        triggerRule: null,
         monitorField: null,
         timeRange: null,
         triggerValue: null,
@@ -266,7 +266,7 @@ export default {
         { key: 3, label: `计量设备`, visible: true },
         { key: 4, label: `记录时间`, visible: false },
         { key: 5, label: `能源类型`, visible: false },
-        { key: 6, label: `触发规则`, visible: false },
+        { key: 6, label: `触发规则`, visible: true },
         { key: 7, label: `触发阈值次数`, visible: false },
         { key: 8, label: `时间范围(分)`, visible: false },
         { key: 9, label: `触发阈值量`, visible: true },
@@ -307,7 +307,7 @@ export default {
         monitorId: null,
         collectTime: null,
         energyType: null,
-        triggerRule: 0,
+        triggerRule: null,
         monitorField: null,
         timeRange: null,
         triggerValue: null,
diff --git a/src/views/index.vue b/src/views/index.vue
index 221656a..728105a 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="dashboard-container">
     <!-- 页面标题 -->
-    <div class="page-header">
-      <h1 class="page-title">机场行李系统设备健康监测系统</h1>
-      <div class="page-subtitle">首页</div>
-    </div>
+<!--    <div class="page-header">-->
+<!--      <h1 class="page-title">机场行李系统设备健康监测系统</h1>-->
+<!--      <div class="page-subtitle">首页</div>-->
+<!--    </div>-->
 
     <!-- 统计卡片区域 -->
     <div class="stats-section">
@@ -18,7 +18,7 @@
             <div class="stat-label">设备总数</div>
           </div>
         </div>
-        
+
         <div class="stat-card alarm-rule">
           <div class="stat-icon">
             <i class="el-icon-warning"></i>
@@ -28,7 +28,7 @@
             <div class="stat-label">异常规则数量</div>
           </div>
         </div>
-        
+
         <div class="stat-card alarm-data">
           <div class="stat-icon">
             <i class="el-icon-bell"></i>
@@ -130,7 +130,7 @@
             <!-- 无数据提示 -->
             <div v-if="!hasData(device)" class="no-data">
               <i class="el-icon-warning-outline"></i>
-              <span>无最新数据</span>
+              <span>当天无最新数据</span>
             </div>
           </div>
 
diff --git a/src/views/login.vue b/src/views/login.vue
index 0878d27..aa91dea 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -162,7 +162,7 @@ export default {
   align-items: center;
   height: 100%;
   //background-image: url("../assets/images/login-background.jpg");
-  background-image: url("../assets/images/tao.png");
+  background-image: url("../assets/images/mesnac.jpg");
   background-size: cover;
 }
 .title {