From c5d918c95d2349ea24153b39d4d87e4cbd99c2ed Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 20 Jun 2025 13:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=A8=E6=88=BF=E6=95=B0=E6=8D=AE=E6=80=BB?=
 =?UTF-8?q?=E8=A7=88=E8=8D=89=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kitchen/dashboard/SubGroup.vue | 38 +++++++++++++++++++-----
 src/views/kitchen/index.vue              | 12 ++------
 src/views/login1.vue                     |  2 +-
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/views/kitchen/dashboard/SubGroup.vue b/src/views/kitchen/dashboard/SubGroup.vue
index f38517ca..ecdbea33 100644
--- a/src/views/kitchen/dashboard/SubGroup.vue
+++ b/src/views/kitchen/dashboard/SubGroup.vue
@@ -1,31 +1,53 @@
 <template>
   <el-row :gutter="36" class="panel-group">
-    <el-col :span="12" class="card-panel-col" v-for="(item,index) in topData" :key="index">
+    <el-col :span="12" class="card-panel-col">
       <div class="card-panel"> 
         <div class="card-panel-description">
-          <div class="card-panel-text">{{item.name}}</div>
+          <div class="card-panel-text">健康证管理</div>
           <div style="width: 100%;height: 80px;display: flex;">
             <div>
               <div style="font-weight: normal;">正常</div>
-              <div>{{item.num1}}</div>
+              <div>{{topData.num1}}</div>
             </div>
             <div>
               <div style="font-weight: normal;">缺失</div>
-              <div>{{item.num2}}</div>
+              <div>{{topData.num2}}</div>
             </div>
             <div>
               <div style="font-weight: normal;">临期</div>
-              <div>{{item.num3}}</div>
+              <div>{{topData.num3}}</div>
             </div>
             <div>
               <div style="font-weight: normal;">过期</div>
-              <div>{{item.num4}}</div>
+              <div>{{topData.num4}}</div>
             </div> 
           </div> 
           <!-- <count-to :start-val="0" :end-val="item.num" :duration="2000" class="card-panel-num" /> -->
         </div> 
       </div>
     </el-col>
+    <el-col :span="12" class="card-panel-col">
+      <div class="card-panel"> 
+        <div class="card-panel-description">
+          <div class="card-panel-text">健康证管理</div>
+          <div style="width: 100%;height: 80px;display: flex;">
+            <div>
+              <div style="font-weight: normal;">环境报警记录</div>
+              <div>{{topData.num1}}</div>
+            </div>
+            <div>
+              <div style="font-weight: normal;">门禁报警记录</div>
+              <div>{{topData.num2}}</div>
+            </div>
+            <div>
+              <div style="font-weight: normal;">监控报警记录</div>
+              <div>{{topData.num3}}</div>
+            </div>  
+          </div> 
+          <!-- <count-to :start-val="0" :end-val="item.num" :duration="2000" class="card-panel-num" /> -->
+        </div> 
+      </div>
+    </el-col>
   </el-row>
 </template>
 
@@ -38,8 +60,8 @@ export default {
   },
   props: {
     topData: {
-      type: Array,
-      default: []
+      type: Object,
+      default: {}
     }
   },
   methods: {
diff --git a/src/views/kitchen/index.vue b/src/views/kitchen/index.vue
index e12ea910..d204f746 100644
--- a/src/views/kitchen/index.vue
+++ b/src/views/kitchen/index.vue
@@ -115,20 +115,12 @@ export default {
           "lastDate": "2025-05-15"
         }
       ],
-      subTopAreaOptions:[
-        { 
-          "name": "健康证管理",
+      subTopAreaOptions:{  
           "num1": 1, 
           "num2": 2, 
           "num3": 3, 
           "num4": 4, 
-        },{
-          "name": "报警记录", 
-          "num1": 1, 
-          "num2": 2, 
-          "num3": 3, 
-        }
-      ],
+        },
       type1:1,
       type2:1,
       type3:1,
diff --git a/src/views/login1.vue b/src/views/login1.vue
index 4b5fd668..879a6736 100644
--- a/src/views/login1.vue
+++ b/src/views/login1.vue
@@ -20,7 +20,7 @@
                 v-model="loginForm.password"
                 type="password"
                 auto-complete="off"
-                placeholder="密码"
+                placeholder="密码" show-password
                 @keyup.enter.native="handleLogin"
               >
                 <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>