From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

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

diff --git a/admin/src/views/business/admissionStatistics.vue b/admin/src/views/business/admissionStatistics.vue
index fbe4ea1..afcddff 100644
--- a/admin/src/views/business/admissionStatistics.vue
+++ b/admin/src/views/business/admissionStatistics.vue
@@ -83,29 +83,31 @@
                     </div>
                     <el-button type="primary" icon="el-icon-upload2" style="margin-left: 20px;" @click="daochu">瀵煎嚭</el-button>
                 </div>
-                <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>
+                <template v-if="column.length > 0">
+                    <el-table
+                        style="width: 100%; margin-top: 15px;"
+                        :data="list"
+                        header-row-style="background-color: #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>
             <div class="main_table_list1">
                 <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="background-color: #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>
@@ -165,10 +167,25 @@
       getReportLists() {
         getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 1 })
           .then(res => {
-            if (res.length === 0) return
 
             this.column = res[0]
-            this.list = res.slice(1, res.length);
+
+            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() {
@@ -227,7 +244,10 @@
             containLabel: true
           },
           tooltip: {
-            trigger: 'item'
+            trigger: 'axis',
+            axisPointer: {
+              type: 'line'
+            }
           },
           xAxis: {
             type: 'category',
@@ -237,6 +257,12 @@
             type: 'value',
             axisLine: {
               show: true
+            },
+            axisLabel: {
+              formatter: function (value) {
+                // 鍥涜垗浜斿叆鍒版渶杩戠殑鏁存暟
+                return Math.round(value);
+              }
             }
           },
           graphic: {
@@ -323,7 +349,7 @@
 
         let option = {
           tooltip: {
-            trigger: 'item'
+            trigger: 'item',
           },
           legend: {
             show: false,
@@ -338,7 +364,7 @@
               labelLine: {
                 normal: {
                   length: 30,
-                  length2: 100,
+                  length2: 70,
                 }
               },
               label: {
@@ -480,7 +506,7 @@
                 background-color: #ffffff;
                 padding: 20px;
                 box-sizing: border-box;
-                flex: 1;
+                width: 69%;
                 .title {
                     display: flex;
                     align-items: center;
@@ -489,6 +515,14 @@
                         font-size: 18px;
                         color: #222222;
                     }
+                }
+                .list_wu {
+                    width: 100%;
+                    height: 100px;
+                    line-height: 100px;
+                    text-align: center;
+                    font-size: 16px;
+                    color: #222222;
                 }
                 .list_head {
                     width: 100%;
@@ -536,7 +570,7 @@
             }
             .main_table_list1 {
                 margin-left: 10px;
-                width: 520px;
+                width: 30%;
                 padding: 20px;
                 box-sizing: border-box;
                 flex-shrink: 0;
@@ -546,6 +580,14 @@
                     font-size: 18px;
                     color: #222222;
                 }
+                .list_wu {
+                    width: 100%;
+                    height: 100px;
+                    line-height: 100px;
+                    text-align: center;
+                    font-size: 16px;
+                    color: #222222;
+                }
                 .list_head {
                     width: 100%;
                     height: 50px;

--
Gitblit v1.9.3