From 42355bd1eff96d50be933bc3062e0e9551641aab Mon Sep 17 00:00:00 2001 From: userGyl Date: Wed, 17 Dec 2025 17:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9-=E6=96=B0=E5=A2=9E=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ln_jq_app/assets/html/car.png | Bin 0 -> 6754 bytes ln_jq_app/assets/html/map.html | 4 +- .../lib/pages/b_page/history/controller.dart | 186 +++++++++++++ ln_jq_app/lib/pages/b_page/history/view.dart | 249 ++++++++++++++++++ ln_jq_app/lib/pages/b_page/site/view.dart | 66 +++-- 5 files changed, 476 insertions(+), 29 deletions(-) create mode 100644 ln_jq_app/assets/html/car.png create mode 100644 ln_jq_app/lib/pages/b_page/history/controller.dart create mode 100644 ln_jq_app/lib/pages/b_page/history/view.dart diff --git a/ln_jq_app/assets/html/car.png b/ln_jq_app/assets/html/car.png new file mode 100644 index 0000000000000000000000000000000000000000..5f5ba0a947ed485e890db49386838b4bad502d0c GIT binary patch literal 6754 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 UCptFqe;w2Hv~OuuYS>5o7klGh?EnA( literal 0 HcmV?d00001 diff --git a/ln_jq_app/assets/html/map.html b/ln_jq_app/assets/html/map.html index 3ef4926..3df0453 100644 --- a/ln_jq_app/assets/html/map.html +++ b/ln_jq_app/assets/html/map.html @@ -248,8 +248,8 @@ marker = new AMap.Marker({ map: map, position: position, - icon: "https://webapi.amap.com/images/car.png", - offset: new AMap.Pixel(-26, -13), + icon: "car.png", + offset: new AMap.Pixel(-23.5, -15), autoRotation: true, angle: isNaN(rawAngle) ? 0 : rawAngle, }); diff --git a/ln_jq_app/lib/pages/b_page/history/controller.dart b/ln_jq_app/lib/pages/b_page/history/controller.dart new file mode 100644 index 0000000..3a17016 --- /dev/null +++ b/ln_jq_app/lib/pages/b_page/history/controller.dart @@ -0,0 +1,186 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:getx_scaffold/getx_scaffold.dart'; +import 'package:ln_jq_app/common/model/base_model.dart'; +import 'package:ln_jq_app/pages/b_page/site/controller.dart'; // Reuse ReservationModel + +class HistoryController extends GetxController { + // --- 定义 API 需要的日期格式化器 --- + final DateFormat _apiDateFormat = DateFormat('yyyy-MM-dd'); + + // 默认查询最近7天 + final Rx startDate = DateTime.now().subtract(const Duration(days: 7)).obs; + final Rx endDate = DateTime.now().obs; + final TextEditingController plateNumberController = TextEditingController(); + + final RxString totalHydrogen = '0 kg'.obs; + final RxString totalCompletions = '0 次'.obs; + + final RxList historyList = [].obs; + final RxBool isLoading = true.obs; + final RxBool hasData = false.obs; + + String get formattedStartDate => DateFormat('yyyy/MM/dd').format(startDate.value); + + String get formattedEndDate => DateFormat('yyyy/MM/dd').format(endDate.value); + + @override + void onInit() { + super.onInit(); + fetchHistoryData(); + } + + Future fetchHistoryData() async { + isLoading.value = true; + try { + var response = await HttpService.to.post( + "appointment/orderAddHyd/sitOrderPage", + data: { + // --- 直接使用 DateFormat 来格式化日期 --- + 'startDate': _apiDateFormat.format(startDate.value), + 'endDate': _apiDateFormat.format(endDate.value), + 'plateNumber': plateNumberController.text, + 'pageNum': 1, + 'pageSize': 50, + 'stationName': "", // 加氢站名称 + }, + ); + + if (response == null || response.data == null) { + showToast('无法获取历史记录'); + _resetData(); + return; + } + + final baseModel = BaseModel.fromJson(response.data); + if (baseModel.code == 0 && baseModel.data != null) { + final dataMap = baseModel.data as Map; + + totalHydrogen.value = '${dataMap['totalHydrogen'] ?? 0} kg'; + totalCompletions.value = '${dataMap['totalCompletions'] ?? 0} 次'; + + final List listFromServer = dataMap['records'] ?? []; + historyList.assignAll( + listFromServer + .map((item) => ReservationModel.fromJson(item as Map)) + .toList(), + ); + hasData.value = historyList.isNotEmpty; + } else { + showToast(baseModel.message); + _resetData(); + } + } catch (e) { + showToast('获取历史记录失败: $e'); + _resetData(); + } finally { + isLoading.value = false; + } + } + + void _resetData() { + totalHydrogen.value = '0 kg'; + totalCompletions.value = '0 次'; + historyList.clear(); + hasData.value = false; + } + + void pickDate(BuildContext context, bool isStartDate) { + // 确定当前操作的日期和临时存储变量 + final DateTime initialDate = isStartDate ? startDate.value : endDate.value; + DateTime tempDate = initialDate; + + // 定义全局的最早可选日期 + final DateTime globalMinimumDate = DateTime(2025, 12, 1); + + // 动态计算当前选择器的最小/最大日期范围 + DateTime minimumDate; + DateTime? maximumDate; // 声明为可空，因为两个日期都可能没有最大限制 + + if (isStartDate) { + // 当选择【开始日期】时 它的最小日期就是全局最小日期 + minimumDate = globalMinimumDate; + // 最大日期没有限制 + maximumDate = null; + } else { + // 当选择【结束日期】时 它的最小日期不能早于当前的开始日期 + minimumDate = startDate.value; + // 确认结束日期没有最大限制 --- + //最大日期没有限制 + maximumDate = null; + } + + Get.bottomSheet( + Container( + height: 300, + decoration: const BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(16), + topRight: Radius.circular(16), + ), + ), + child: Column( + children: [ + // 顶部的取消和确认按钮 + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + TextButton( + onPressed: () => Get.back(), + child: const Text('取消', style: TextStyle(color: Colors.grey)), + ), + TextButton( + onPressed: () { + // 4. 确认后，更新对应的日期变量 + if (isStartDate) { + startDate.value = tempDate; + // 如果新的开始日期晚于结束日期，自动将结束日期调整为同一天 + if (tempDate.isAfter(endDate.value)) { + endDate.value = tempDate; + } + } else { + endDate.value = tempDate; + } + Get.back(); + + // 选择日期后自动刷新数据 + fetchHistoryData(); + }, + child: const Text( + '确认', + style: TextStyle(fontWeight: FontWeight.bold), + ), + ), + ], + ), + ), + const Divider(height: 1), + // 日期选择器 + Expanded( + child: CupertinoDatePicker( + mode: CupertinoDatePickerMode.date, + initialDateTime: initialDate, + // 应用动态计算好的最小/最大日期 + minimumDate: minimumDate, + maximumDate: maximumDate, + onDateTimeChanged: (DateTime newDate) { + tempDate = newDate; + }, + ), + ), + ], + ), + ), + backgroundColor: Colors.transparent, // 使底部工作表外的区域透明 + ); + } + + @override + void onClose() { + plateNumberController.dispose(); + super.onClose(); + } +} diff --git a/ln_jq_app/lib/pages/b_page/history/view.dart b/ln_jq_app/lib/pages/b_page/history/view.dart new file mode 100644 index 0000000..fb3d9c4 --- /dev/null +++ b/ln_jq_app/lib/pages/b_page/history/view.dart @@ -0,0 +1,249 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:ln_jq_app/common/styles/theme.dart'; +import 'package:ln_jq_app/pages/b_page/history/controller.dart'; +import 'package:ln_jq_app/pages/b_page/site/controller.dart'; // Reuse ReservationModel + +class HistoryPage extends GetView { + const HistoryPage({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + Get.put(HistoryController()); + + return Scaffold( + appBar: AppBar(title: const Text('历史记录'), centerTitle: true), + body: Padding( + padding: const EdgeInsets.all(12.0), + child: Column( + children: [ + _buildFilterCard(context), + const SizedBox(height: 12), + _buildSummaryCard(), + const SizedBox(height: 12), + _buildListHeader(), + Expanded(child: _buildHistoryList()), + ], + ), + ), + ); + } + + Widget _buildFilterCard(BuildContext context) { + return Card( + elevation: 2, + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Text('时间范围', style: TextStyle(fontSize: 14, color: Colors.grey)), + const SizedBox(height: 8), + Row( + children: [ + Expanded(child: _buildDateField(context, true)), + const Padding( + padding: EdgeInsets.symmetric(horizontal: 8.0), + child: Text('至'), + ), + Expanded(child: _buildDateField(context, false)), + ], + ), + const SizedBox(height: 16), + const Text('车牌号', style: TextStyle(fontSize: 14, color: Colors.grey)), + const SizedBox(height: 8), + SizedBox( + height: 44, + child: TextField( + controller: controller.plateNumberController, + decoration: InputDecoration( + hintText: '请输入车牌号', + border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)), + contentPadding: const EdgeInsets.symmetric(horizontal: 12), + ), + ), + ), + const SizedBox(height: 16), + ElevatedButton.icon( + onPressed: () { + FocusScope.of(context).unfocus(); // Hide keyboard + controller.fetchHistoryData(); + }, + icon: const Icon(Icons.search, size: 20), + label: const Text('查询'), + style: ElevatedButton.styleFrom( + minimumSize: const Size(double.infinity, 44), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), + ), + ), + ], + ), + ), + ); + } + + Widget _buildSummaryCard() { + return Card( + elevation: 2, + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 20.0), + child: Obx( + () => Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + _buildSummaryItem('实际加氢总量', controller.totalHydrogen.value, Colors.blue), + const SizedBox(width: 1, height: 40, child: VerticalDivider()), + _buildSummaryItem( + '预约完成次数', + controller.totalCompletions.value, + Colors.green, + ), + ], + ), + ), + ), + ); + } + + Widget _buildHistoryList() { + return Obx(() { + if (controller.isLoading.value) { + return const Center(child: CircularProgressIndicator()); + } + if (!controller.hasData.value) { + return const Center(child: Text('没有找到相关记录')); + } + return ListView.builder( + itemCount: controller.historyList.length, + itemBuilder: (context, index) { + final ReservationModel item = controller.historyList[index]; + return Card( + margin: const EdgeInsets.only(bottom: 8), + child: ListTile( + title: Text('车牌号: ${item.plateNumber}'), + subtitle: Text.rich( + TextSpan( + children: [ + TextSpan( + text: '加氢站: ${item.stationName}\n', + style: TextStyle(fontSize: 16), + ), + TextSpan( + text: '时间: ${item.time}\n', + style: TextStyle(fontSize: 16), + ), + TextSpan( + text: '加氢量：', + ), + TextSpan( + text: '${item.amount}', + style: TextStyle(fontSize: 16, color: AppTheme.themeColor), + ), + ], + ), + ) + , + trailing: + // 状态标签 + _buildStatusChip(item.status), + ), + ); + }, + ); + }); + } + + Widget _buildStatusChip(ReservationStatus status) { + String text; + Color color; + switch (status) { + case ReservationStatus.pending: + text = '待加氢'; + color = Colors.orange; + break; + case ReservationStatus.completed: + text = '已加氢'; + color = Colors.greenAccent; + break; + case ReservationStatus.rejected: + text = '拒绝加氢'; + color = Colors.red; + break; + case ReservationStatus.unadded: + text = '未加氢'; + color = Colors.red; + break; + default: + text = '未知状态'; + color = Colors.grey; + break; + } + return Container( + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + decoration: BoxDecoration( + color: color.withOpacity(0.1), + borderRadius: BorderRadius.circular(12), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(Icons.circle, color: color, size: 8), + const SizedBox(width: 4), + Text( + text, + style: TextStyle(color: color, fontSize: 12, fontWeight: FontWeight.bold), + ), + ], + ), + ); + } + + Widget _buildDateField(BuildContext context, bool isStart) { + return Obx( + () => InkWell( + onTap: () => controller.pickDate(context, isStart), + child: Container( + height: 44, + padding: const EdgeInsets.symmetric(horizontal: 12), + decoration: BoxDecoration( + border: Border.all(color: Colors.grey.shade400), + borderRadius: BorderRadius.circular(8), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text(isStart ? controller.formattedStartDate : controller.formattedEndDate), + const Icon(Icons.calendar_today, size: 18, color: Colors.grey), + ], + ), + ), + ), + ); + } + + Widget _buildSummaryItem(String label, String value, Color color) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text(label, style: const TextStyle(color: Colors.grey, fontSize: 14)), + const SizedBox(height: 8), + Text( + value, + style: TextStyle(color: color, fontSize: 22, fontWeight: FontWeight.bold), + ), + ], + ); + } + + Widget _buildListHeader() { + return const Padding( + padding: EdgeInsets.symmetric(vertical: 8.0, horizontal: 14.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text('加氢明细', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold)), + ], + ), + ); + } +} diff --git a/ln_jq_app/lib/pages/b_page/site/view.dart b/ln_jq_app/lib/pages/b_page/site/view.dart index abdc2dc..9012495 100644 --- a/ln_jq_app/lib/pages/b_page/site/view.dart +++ b/ln_jq_app/lib/pages/b_page/site/view.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:getx_scaffold/getx_scaffold.dart'; import 'package:ln_jq_app/common/styles/theme.dart'; +import 'package:ln_jq_app/pages/b_page/history/view.dart'; import 'controller.dart'; @@ -114,48 +115,59 @@ class SitePage extends GetView { Card( elevation: 3, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)), - margin: const EdgeInsets.only(bottom: 12), + margin: EdgeInsets.only(bottom: 12), clipBehavior: Clip.antiAlias, child: Column( children: [ Container( color: Colors.blue, - padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0), + padding: EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0), child: Row( children: [ - const Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - '今日预约信息', - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.bold, - color: Colors.white, + Expanded( + child: GestureDetector( + onTap: () { + controller.renderData(); + }, + child: Row( + children: [ + Text( + '今日预约信息', + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + color: Colors.white, + ), ), - ), - SizedBox(height: 2), - Text( - 'Reservation Information', - style: TextStyle(fontSize: 12, color: Colors.white70), - ), - ], + SizedBox( + width: 32, + height: 32, + child: const Icon( + Icons.refresh, + size: 18, + color: Colors.white, + ), + ), + ], + ), ), ), - ElevatedButton.icon( + ElevatedButton( onPressed: () { - controller.renderData(); + Get.to(() => const HistoryPage()); }, - icon: const Icon(Icons.refresh, size: 16), - label: const Text('刷新'), style: ElevatedButton.styleFrom( - foregroundColor: Colors.blue, - backgroundColor: Colors.white, - padding: const EdgeInsets.symmetric(horizontal: 12), + backgroundColor: Colors.blue.shade700, + foregroundColor: Colors.white, + padding: EdgeInsets.symmetric(horizontal: 12, vertical: 4), shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(16), + borderRadius: BorderRadius.circular(5), ), + elevation: 2, + ), + child: const Text( + '历史记录', + style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold), ), ), ],