From 572df690f72ed4a077d934823f261dec39b3cc7d Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 08 九月 2026 17:11:34 +0800
Subject: [PATCH] feat&bug:文档内容修改

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html |   63 ++++++++++++++++++++++++++-----
 1 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html
index 930fbf8..d12a7b0 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html
@@ -37,6 +37,39 @@
         align-items: center;
         justify-content: center;
     }
+    .income-overview {
+        display: grid;
+        grid-template-columns: repeat(4, minmax(180px, 1fr));
+        gap: 16px;
+        width: 100%;
+        max-width: 1280px;
+        margin: 18px 0;
+        text-align: left;
+    }
+    .income-card {
+        min-height: 82px;
+        padding: 16px 18px;
+        border: 1px solid #e4e7ed;
+        border-radius: 6px;
+        background: #fff;
+        color: #606266;
+        font-size: 14px;
+        box-shadow: 0 1px 3px rgba(0, 0, 0, .04);
+    }
+    .income-card strong {
+        display: block;
+        margin-top: 8px;
+        color: #303133;
+        font-size: 22px;
+        font-weight: 600;
+    }
+    .income-card.total-card { border-top: 3px solid #1ab394; }
+    .income-card.net-card { border-top: 3px solid #409eff; }
+    .income-card.coupon-card { border-top: 3px solid #e6a23c; }
+    .income-card.refund-card { border-top: 3px solid #f56c6c; }
+    \@media (max-width: 992px) {
+        .income-overview { grid-template-columns: repeat(2, minmax(180px, 1fr)); }
+    }
 </style>
 <div class="ibox float-e-margins">
     <div class="ibox-content">
@@ -78,16 +111,18 @@
                             <div class="form-group">
                                 <div class="col-sm-10">
                                     <h2>营收数据</h2>
-                                    </br>
-                                        <div id = "money1" style="width: 1500px" >
-                                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span id="totalIncome">总营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                            <span id="yearIncome">本年度营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                            <span id="monthIncome">本月度营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                            <span id="weekIncome">本周营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                            <span id="todayIncome">本日营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                            </br>
-                                            </br>
+                                    <div id="money1">
+                                        <div class="income-overview">
+                                            <div class="income-card total-card">总营收金额<strong id="totalIncome">0</strong></div>
+                                            <div class="income-card net-card">净收入金额<strong id="netIncomeAmount">0</strong></div>
+                                            <div class="income-card coupon-card">优惠券抵扣金额<strong id="couponDeductionAmount">0</strong></div>
+                                            <div class="income-card refund-card">退款金额<strong id="refundAmount">0</strong></div>
                                         </div>
+                                        <span id="yearIncome" style="display:none"></span>
+                                        <span id="monthIncome" style="display:none"></span>
+                                        <span id="weekIncome" style="display:none"></span>
+                                        <span id="todayIncome" style="display:none"></span>
+                                    </div>
                                     <div id="income" style="width: 1280px;height:500px;"></div>
                                 </div>
                                 <div class="col-sm-10">
@@ -340,8 +375,14 @@
             var t3 = document.getElementById("monthIncome");
             var t4 = document.getElementById("weekIncome");
             var t5 = document.getElementById("todayIncome");
-            t1.innerText = "总营收:"+list[0]+"         ";
-            t2.innerText = "年度营收:"+list[1]+"         ";
+            var netIncomeAmount = document.getElementById("netIncomeAmount");
+            var couponDeductionAmount = document.getElementById("couponDeductionAmount");
+            var refundAmount = document.getElementById("refundAmount");
+            t1.innerText = list[0] || 0;
+            t2.innerText = "年度应收:"+list[1]+"         ";
+            netIncomeAmount.innerText = resp.netIncomeAmount || 0;
+            couponDeductionAmount.innerText = resp.couponDeductionAmount || 0;
+            refundAmount.innerText = resp.refundAmount || 0;
             t3.innerText = "月度营收:"+list[2]+"         ";
             t4.innerText = "周度营收:"+list[3]+"         ";
             t5.innerText = "日度营收:"+list[4]+"         ";

--
Gitblit v1.7.1