From 94de735233383fe644ec0401465e8e85c8999179 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 06 三月 2026 10:01:09 +0800
Subject: [PATCH] 钥匙柜开门添加 指纹方式

---
 admin/src/views/business/admissionStatistics.vue |   62 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/admin/src/views/business/admissionStatistics.vue b/admin/src/views/business/admissionStatistics.vue
index 91c4840..d23e857 100644
--- a/admin/src/views/business/admissionStatistics.vue
+++ b/admin/src/views/business/admissionStatistics.vue
@@ -84,14 +84,14 @@
                     <el-button type="primary" icon="el-icon-upload2" style="margin-left: 20px;" @click="daochu">瀵煎嚭</el-button>
                 </div>
                 <template v-if="column.length > 0">
-                    <div class="list_head">
-                        <div class="list_head_item" v-for="(item, index) in column" :key="index">{{item}}</div>
-                    </div>
-                    <div class="table_box">
-                        <div class="list_content" v-for="(item, index) in list" :key="index">
-                            <div class="list_head_item" v-for="(child, i) in item" :key="i">{{child}}</div>
-                        </div>
-                    </div>
+                    <el-table
+                        style="width: 100%; margin-top: 15px;"
+                        :data="list"
+                        :header-row-style="{ backgroundColor: '#F7F7F7' }"
+                        border
+                    >
+                        <el-table-column :prop="item" :label="item" align="center" :fixed="index === 0 ? true : index === column.length - 1 ? 'right' : false" v-for="(item, index) in column" :key="index"></el-table-column>
+                    </el-table>
                 </template>
                 <div class="list_wu" v-else>鏆傛棤鏁版嵁</div>
             </div>
@@ -99,16 +99,15 @@
                 <div class="title">
                     <span>鏈勾浜哄憳绱鍏ュ洯缁熻</span>
                 </div>
-                <div class="list_head">
-                    <div class="list_head_item">浜哄憳鍒嗙被</div>
-                    <div class="list_head_item">鍏ュ洯娆℃暟</div>
-                </div>
-                <div class="table_box">
-                    <div class="list_content" v-for="(item, index) in info.yearSortList" :key="index">
-                        <div class="list_head_item">{{item.name}}</div>
-                        <div class="list_head_item">{{item.total}}</div>
-                    </div>
-                </div>
+                <el-table
+                    style="width: 100%; margin-top: 15px;"
+                    :data="info.yearSortList"
+                    :header-row-style="{ backgroundColor: '#F7F7F7' }"
+                    border
+                >
+                    <el-table-column prop="name" label="浜哄憳鍒嗙被" align="center"></el-table-column>
+                    <el-table-column prop="total" label="鍏ュ洯娆℃暟" align="center"></el-table-column>
+                </el-table>
             </div>
         </div>
     </div>
@@ -168,14 +167,27 @@
       getReportLists() {
         getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 1 })
           .then(res => {
-            if (res.length === 0) {
+            if (!res || res.length === 0) {
               this.column = []
               this.list = []
               return
             }
-
-            this.column = res[0]
-            this.list = res.slice(1, res.length);
+              this.column = res[0]
+              this.list = res.slice(1).map(row => {
+                const obj = {};
+                this.column.forEach((header, index) => {
+                  obj[header] = row[index];
+                });
+                return obj;
+              });
+            // if (res.length === 0) {
+            //   this.column = []
+            //   this.list = []
+            //   return
+            // }
+            //
+            // this.column = res[0]
+            // this.list = res.slice(1, res.length);
           })
       },
       changeDateType() {
@@ -489,14 +501,14 @@
 
         .main_table {
             display: flex;
-            align-items: start;
+            align-items: flex-start;
             justify-content: space-between;
             margin-top: 10px;
             .main_table_list {
                 background-color: #ffffff;
                 padding: 20px;
                 box-sizing: border-box;
-                flex: 1;
+                width: 69%;
                 .title {
                     display: flex;
                     align-items: center;
@@ -560,7 +572,7 @@
             }
             .main_table_list1 {
                 margin-left: 10px;
-                width: 520px;
+                width: 30%;
                 padding: 20px;
                 box-sizing: border-box;
                 flex-shrink: 0;

--
Gitblit v1.9.3