From c0e9ac907ee658802f68eb4e770942e34e87cfd0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 25 七月 2025 16:43:50 +0800
Subject: [PATCH] Merge branches 'master' and 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

---
 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html |   56 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
index f7e7696..a87f13b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/home.html
@@ -46,18 +46,18 @@
 							<h1 class="no-margins" id="newNetcardriver">0</h1>
 							<small>在线司机</small>
 						</div>
-						<!--						<div class="ibox-content">-->
-						<!--							<h1 class="no-margins" id="orderDetail1">0</h1>-->
-						<!--							<small>快车订单数</small>-->
-						<!--						</div>-->
+												<div class="ibox-content">
+													<h1 class="no-margins" id="orderDetail1">0</h1>
+													<small>快车订单数</small>
+												</div>
 						<div class="ibox-content">
 							<h1 class="no-margins" id="orderDetail2">0</h1>
 							<small>出租车订单</small>
 						</div>
-						<!--						<div class="ibox-content">-->
-						<!--							<h1 class="no-margins" id="orderDetail3">0</h1>-->
-						<!--							<small>跨城出行订单</small>-->
-						<!--						</div>-->
+												<div class="ibox-content">
+													<h1 class="no-margins" id="orderDetail3">0</h1>
+													<small>跨城出行订单</small>
+												</div>
 						<!--						<div class="ibox-content">-->
 						<!--							<h1 class="no-margins" id="orderDetail4">0</h1>-->
 						<!--							<small>同城小件物流订单</small>-->
@@ -116,18 +116,18 @@
 							<h1 class="no-margins" id="netcarDriverSum1">0</h1>
 							<small>新增司机</small>
 						</div>
-						<!--						<div class="ibox-content">-->
-						<!--							<h1 class="no-margins" id="orderDetail11">0</h1>-->
-						<!--							<small>快车订单数</small>-->
-						<!--						</div>-->
+												<div class="ibox-content">
+													<h1 class="no-margins" id="orderDetail11">0</h1>
+													<small>快车订单数</small>
+												</div>
 						<div class="ibox-content">
 							<h1 class="no-margins" id="orderDetail21">0</h1>
 							<small>出租车订单数</small>
 						</div>
-						<!--						<div class="ibox-content">-->
-						<!--							<h1 class="no-margins" id="orderDetail31">0</h1>-->
-						<!--							<small>跨城出行订单数</small>-->
-						<!--						</div>-->
+												<div class="ibox-content">
+													<h1 class="no-margins" id="orderDetail31">0</h1>
+													<small>跨城出行订单数</small>
+												</div>
 						<!--						<div class="ibox-content">-->
 						<!--							<h1 class="no-margins" id="orderDetail41">0</h1>-->
 						<!--							<small>同城小件物流订单数</small>-->
@@ -164,24 +164,24 @@
 							</h1>
 							<small>用户注册趋势图</small>
 						</div>
-						<!--						<div class="ibox-content">-->
-						<!--							<h1 class="no-margins">-->
-						<!--								<span class="dynamicsparkline" id="orderDetail12">Loading..</span>-->
-						<!--							</h1>-->
-						<!--							<small>快车订单趋势图</small>-->
-						<!--						</div>-->
+												<div class="ibox-content">
+													<h1 class="no-margins">
+														<span class="dynamicsparkline" id="orderDetail12">Loading..</span>
+													</h1>
+													<small>快车订单趋势图</small>
+												</div>
 						<div class="ibox-content">
 							<h1 class="no-margins">
 								<span class="dynamicsparkline" id="orderDetail22">Loading..</span>
 							</h1>
 							<small>出租车订单趋势图</small>
 						</div>
-						<!--						<div class="ibox-content">-->
-						<!--							<h1 class="no-margins">-->
-						<!--								<span class="dynamicsparkline" id="orderDetail32">Loading..</span>-->
-						<!--							</h1>-->
-						<!--							<small>跨城出行订单趋势图</small>-->
-						<!--						</div>-->
+												<div class="ibox-content">
+													<h1 class="no-margins">
+														<span class="dynamicsparkline" id="orderDetail32">Loading..</span>
+													</h1>
+													<small>跨城出行订单趋势图</small>
+												</div>
 						<!--						<div class="ibox-content">-->
 						<!--							<h1 class="no-margins">-->
 						<!--								<span class="dynamicsparkline" id="orderDetail42">Loading..</span>-->

--
Gitblit v1.7.1