feat(前端)：FCC订单页

Edge.Core/Core/database/MysqlDbContext.cs

@@ -37,7 +37,7 @@ namespace Edge.Core.Core.database
 
         public DbSet<FccNozzleInfo> NozzleInfos { get; set; }
 
-        public DbSet<FccOrderInfo> fccOrderInfos { get; set; }
+        public DbSet<FccOrderInfo> FccOrderInfos { get; set; }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

Edge.Core/Domain/FccOrderInfo/FccOrderInfo.cs

@@ -78,6 +78,11 @@ namespace Edge.Core.Domain.FccOrderInfo
         /// </summary>
         public decimal? AmountPayable { get; set; }
 
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { get; set; }
+
         /// <summary>
         /// 是否已上传云端—— 0：未上传；1：已上传；2：不需要上传
         /// </summary>

Edge.Core/Domain/FccOrderInfo/Input/OrderInfoPageInput.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Edge.Core.Domain.FccOrderInfo.Input
+{
+    /// <summary>
+    /// fcc 前端订单页面查询过滤对象
+    /// </summary>
+    public class OrderInfoPageInput
+    {
+        /// <summary>
+        /// 页码
+        /// </summary>
+        public int page {  get; set; }
+
+        /// <summary>
+        /// 页数
+        /// </summary>
+        public int pageSize { get; set; }
+
+        /// <summary>
+        /// 油品名
+        /// </summary>
+        public string? oilName { get; set; }
+
+        /// <summary>
+        /// 枪号
+        /// </summary>
+        public int? nozzleNum { get; set; }
+
+        /// <summary>
+        /// 开始检索时间
+        /// </summary>
+        public DateTime? startCheckTime { get; set; }
+
+        /// <summary>
+        /// 介绍检索时间
+        /// </summary>
+        public DateTime? endCheckTime { get; set; }
+
+        ///// <summary>
+        ///// 流水号
+        ///// </summary>
+        //public int? ttc { get; set; }
+
+        ///// <summary>
+        ///// 支付状态
+        ///// </summary>
+        //public int? paymentStatus { get; set; }
+    }
+}

Edge.Core/Domain/FccOrderInfo/Output/OrderInfoOutput.cs

@@ -1,8 +1,45 @@
 
 namespace Edge.Core.Domain.FccOrderInfo.Output
 {
+    /// <summary>
+    /// fcc 订单页分页查询结果对象
+    /// </summary>
     public class OrderInfoOutput
     {
+        /// <summary>
+        /// 总数
+        /// </summary>
+        public int Total { get; set; }
+
+        /// <summary>
+        /// 订单
+        /// </summary>
+        public List<OrderInfo> List { get; set; }
+        
+    }
+
+    /// <summary>
+    /// fcc 订单页数据对象
+    /// </summary>
+    public class OrderInfo
+    {
+        public OrderInfo(FccOrderInfo fccOrderInfo)
+        {
+            this.Id = fccOrderInfo.Id;
+            this.CloundOrderId = fccOrderInfo.CloundOrderId;
+            this.Ttc = fccOrderInfo.Ttc;
+            this.NozzleNum = fccOrderInfo.NozzleNum;
+            this.OilName = fccOrderInfo.OilName;
+            this.Amount = fccOrderInfo.Amount;
+            this.Volume = fccOrderInfo.Volume;
+            this.AmountPayable = fccOrderInfo.AmountPayable;
+            this.Price = fccOrderInfo.Price;
+            this.AuthorizationTime = fccOrderInfo.AuthorizationTime;
+            this.EndTime = fccOrderInfo.EndTime;
+            this.PaymentTime = fccOrderInfo.PaymentTime;
+            this.PaymentStatus = fccOrderInfo.PaymentStatus;
+            this.PayType = fccOrderInfo.PayType;
+        }
         /// <summary>
         /// 订单id
         /// </summary>
@@ -66,7 +103,12 @@ namespace Edge.Core.Domain.FccOrderInfo.Output
         /// <summary>
         /// 实际支付金额
         /// </summary>
-        public decimal AmountPayable { get; set; }
+        public decimal? AmountPayable { get; set; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { get; set; }
 
         /// <summary>
         /// 是否已上传云端—— 0：未上传；1：已上传；2：不需要上传

Edge.Core/Edge.Core.csproj

@@ -38,8 +38,4 @@
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Domain\FccOrderInfo\Input\" />
-  </ItemGroup>
-
 </Project>

Edge.Core/Processor/Communicator/IClinet.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Edge.Core.Processor.Communicator
 {
-    internal interface IClinet
+    public interface IClinet
     {
         /// <summary>
         /// 获取链接客户端

HengshanPaymentTerminal/HengshanPayTermHandler.cs

@@ -457,6 +457,7 @@ namespace HengshanPaymentTerminal
                             {
                                 SendNozzleStatus(nozzleState,isBusy);
                             }
+                            break;
                         }
                         break;
                     }
@@ -743,6 +744,23 @@ namespace HengshanPaymentTerminal
 
                 await SendRequestToMachine("发送二维码", BitConverter.ToString(commandAndNozzle).Replace("-", ""), sendBytes);
             }
+
+            //var testAuthorization = new MqttAuthorizationRequest()
+            //{
+            //    NozzleNum = 1,
+            //    AuthorizationTime = DateTime.Now,
+            //    AuthorizationType = 1,
+            //    Value = 3.00m
+            //};
+            //await SendAuthorization(testAuthorization);
+
+            //var testUnAuthorization = new MqttUnAhorizationRequest()
+            //{
+            //    NozzleNum = 1,
+            //    AuthorizationTime = DateTime.Now,
+            //    Ttc = 111
+            //};
+            //await SendUnAuthorizartion(testUnAuthorization);
         }
 
         /// <summary>
@@ -821,7 +839,7 @@ namespace HengshanPaymentTerminal
                 logger.Info($"{sendTag}: add request {sendKey} to dic is {isAdd}");
 
                 client?.Client.Send(requestBytes);
-
+                logger.Info($"send request to machine:{BitConverter.ToString(requestBytes).Replace("-", " ")}");
                 try
                 {
                     TaskCompletionSource<CommonMessage>? value;
@@ -870,7 +888,7 @@ namespace HengshanPaymentTerminal
              * 后支付时直接将数据库直接插入
              * 预支付时由于是云端先创建订单，发起授权响应成功后会插入数据库，响应成功时会回复授权时间，枪号，流水号
              */
-            FccOrderInfo? fccOrderInfo = MysqlDbContext.fccOrderInfos
+            FccOrderInfo? fccOrderInfo = MysqlDbContext.FccOrderInfos
                 .Where(order =>
                     order.NozzleNum == orderFromMachine.nozzleNum && order.Ttc == orderFromMachine.ttc
                     && order.AuthorizationTime == orderFromMachine.dispenserTime)
@@ -878,7 +896,7 @@ namespace HengshanPaymentTerminal
             if (fccOrderInfo == null)
             {
                 logger.Info($"receive order from machine,find order from database is null");
-                MysqlDbContext.fccOrderInfos.Add(orderByMessage);
+                MysqlDbContext.FccOrderInfos.Add(orderByMessage);
                 MysqlDbContext.SaveChanges();
                 return orderByMessage;
             }
@@ -903,7 +921,7 @@ namespace HengshanPaymentTerminal
             // 后支付填充云端id
             if(response != null && createTransaction.type == 2)
             {
-                FccOrderInfo? currentOrder = MysqlDbContext.fccOrderInfos
+                FccOrderInfo? currentOrder = MysqlDbContext.FccOrderInfos
                 .Where(order =>
                     order.NozzleNum == fccOrderInfo.NozzleNum && order.Ttc == fccOrderInfo.Ttc
                     && order.AuthorizationTime == fccOrderInfo.AuthorizationTime)
@@ -928,9 +946,9 @@ namespace HengshanPaymentTerminal
             //发送云端
             SendNozzleStatu sendNozzleStatu = new SendNozzleStatu(nozzleState);
             logger.Info($"send nozzle state to cloud,{sendNozzleStatu.NozzleId}-{sendNozzleStatu.Status}");
-            //HttpResponseMessage httpResponseMessage = await httpClientUtil.SendNozzleStatu(JsonConvert.SerializeObject(sendNozzleStatu));
-            //Response<object>? response = JsonConvert.DeserializeObject<Response<object>>(await httpResponseMessage.Content.ReadAsStringAsync());
-            //logger.Info($"reveice send nozzle state response:{JsonConvert.SerializeObject(response)}");
+            HttpResponseMessage httpResponseMessage = await httpClientUtil.SendNozzleStatu(JsonConvert.SerializeObject(sendNozzleStatu));
+            Response<object>? response = JsonConvert.DeserializeObject<Response<object>>(await httpResponseMessage.Content.ReadAsStringAsync());
+            logger.Info($"reveice send nozzle state response:{JsonConvert.SerializeObject(response)}");
         }
 
         /// <summary>

HengshanPaymentTerminal/Http/Request/HttpRequest.cs

@@ -83,9 +83,10 @@ namespace HengshanPaymentTerminal.Http.Request
             } else
             {
                 this.type = 1;
+                this.userid = auserID;
             }
             
-            this.userid = auserID;
+            
         }
 
         /// <summary>

HengshanPaymentTerminal/StateMachineMessageCutter.cs

@@ -52,7 +52,7 @@ namespace HengshanPaymentTerminal
             {
                 byte[] tempBytes = window.ToArray();
                 string receiveStr = BitConverter.ToString(tempBytes).Replace("-", " ");
-                innerLogger.Info($"receive data : ${receiveStr}");
+                //innerLogger.Info($"receive data : ${receiveStr}");
 
                 //查找包头位置
                 int findIndex = -1;
@@ -64,7 +64,7 @@ namespace HengshanPaymentTerminal
                         break;
                     }
                 }
-                innerLogger.Info($"find head index = ${findIndex}");
+                //innerLogger.Info($"find head index = ${findIndex}");
                 //若没有找到包头，证明目前缓存中都是垃圾数据，清掉
                 if (findIndex == -1)
                 {
@@ -82,7 +82,7 @@ namespace HengshanPaymentTerminal
                 int dataLen = Bcd2Int(tempBytes[4], tempBytes[5]);
                 byte[] reduceFAData = Reduce0xFAPair(tempBytes);
                 string reduceFADataStr = BitConverter.ToString(reduceFAData).Replace("-", " ");
-                innerLogger.Info($"data length is ${dataLen},reduceFAData len is ${reduceFAData.Length},value is ${reduceFADataStr}");
+                //innerLogger.Info($"data length is ${dataLen},reduceFAData len is ${reduceFAData.Length},value is ${reduceFADataStr}");
                 //去除多余FA后，实际数据不足有效数据长度，表示有粘包，仍非完整数据，等待下一轮接收数据再处理
                 if(reduceFAData.Length < dataLen + 2)
                 {
@@ -103,6 +103,7 @@ namespace HengshanPaymentTerminal
 
                 //获取到实际数据包，并将缓存数据删除
                 Message = reduceFAData;
+                if (reduceFAData[6] != 0x10) innerLogger.Info($"receive data : ${reduceFAData}");
                 var safe = OnMessageCut;
                 safe?.Invoke(this, null);
                 window.RemoveRange(0, tempBytes.Length);

src/FccLife.Web/Controller/OrderInfoController.cs

@@ -0,0 +1,28 @@
+using Edge.Core.Domain.FccOrderInfo.Input;
+using Edge.Core.Domain.FccOrderInfo.Output;
+using FccLite.Web.Services.FccOrderInfo;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+
+namespace FccLite.Web.Controller
+{
+    [Route("qrFueling/order")]
+    [ApiController]
+    public class OrderInfoController : ControllerBase
+    {
+        static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+        private readonly IOrderInfoService _orderInfoService;
+        public OrderInfoController(IOrderInfoService orderInfoService)
+        {
+            this._orderInfoService = orderInfoService;
+        }
+
+        [HttpPost("getPage")]
+        public async Task<IActionResult> GetPage(OrderInfoPageInput orderInfoPageInput)
+        {
+            logger.Info($"order get page:{JsonConvert.SerializeObject(orderInfoPageInput)}");
+            OrderInfoOutput orderInfoOutput = await _orderInfoService.GetPage(orderInfoPageInput);
+            return Ok(orderInfoOutput);
+        }
+    }
+}

src/FccLife.Web/Controller/TestController.cs

@@ -0,0 +1,23 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Routing;
+
+namespace FccLite.Web.Controller
+{
+    [Route("/qrFueling/test")]
+    [ApiController]
+    public class TestController : ControllerBase
+    {
+        
+        //[HttpPost("testAuthorization")]
+        //public async Task<IActionResult> TestAuthorization()
+        //{
+
+        //}
+
+        //[HttpPost("testUnAuthorization")]
+        //public async Task<IActionResult> TestUnAuthorization()
+        //{
+
+        //}
+    }
+}

src/FccLife.Web/Program.cs

@@ -13,6 +13,8 @@ using Edge.Core.Processor.Dispatcher.ProcessorLoader;
 using Edge.Core.Core.database;
 using Edge.Core.HttpClient;
 using HengshanPaymentTerminal.Http;
+using FccLite.Web.Services.FccOrderInfo;
+using FccLite.Web.Repositories.FccOrderInfo;
 
 var builder = WebApplication.CreateBuilder(args);
  DefaultDispatcher processorsDispatcher = null;
@@ -37,6 +39,8 @@ builder.Services.AddScoped<ITankInfoService, TankInfoServiceImpl>();
 builder.Services.AddScoped<ITankReposity, TankReposity>();
 builder.Services.AddScoped<INozzleInfnService, NozzleInfoServiceImpl>();
 builder.Services.AddScoped<INozzleInfoReposity, NozzleInfoReposity>();
+builder.Services.AddScoped<IOrderInfoService, OrderInfoService>();
+builder.Services.AddScoped<IOrderInfoReposity, OrderInfoReposity>();
 builder.Services.AddScoped<IHttpClient, HttpClientService>();
 builder.Services.AddScoped<IHttpClientUtil, HttpClientUtils>();
 

src/FccLife.Web/Repositories/FccOrderInfo/IOrderInfoReposity.cs

@@ -0,0 +1,10 @@
+using Edge.Core.Domain.FccOrderInfo;
+using Edge.Core.Domain.FccOrderInfo.Input;
+
+namespace FccLite.Web.Repositories.FccOrderInfo
+{
+    public interface IOrderInfoReposity
+    {
+        Task<IEnumerable<Edge.Core.Domain.FccOrderInfo.FccOrderInfo>> GetPage(OrderInfoPageInput orderInfoPageInput);
+    }
+}

src/FccLife.Web/Repositories/FccOrderInfo/OrderInfoReposity.cs

@@ -0,0 +1,31 @@
+using Edge.Core.Core.database;
+using Edge.Core.Domain.FccOrderInfo.Input;
+using Microsoft.EntityFrameworkCore;
+
+namespace FccLite.Web.Repositories.FccOrderInfo
+{
+    public class OrderInfoReposity : IOrderInfoReposity
+    {
+        static NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
+        private readonly MysqlDbContext _dbContext;
+        public OrderInfoReposity(MysqlDbContext mysqlDbContext) 
+        {
+            _dbContext = mysqlDbContext;
+        }
+
+        public async Task<IEnumerable<Edge.Core.Domain.FccOrderInfo.FccOrderInfo>> GetPage(OrderInfoPageInput orderInfoPageInput)
+        {
+            IQueryable<Edge.Core.Domain.FccOrderInfo.FccOrderInfo> query = _dbContext.FccOrderInfos.AsQueryable();
+
+            query = query.Where(order => order.IsDelete == 0);
+            query = query.WhereIf(orderInfoPageInput.oilName != null && "".Equals(orderInfoPageInput.oilName),order => order.OilName.Equals(orderInfoPageInput.oilName));
+            query = query.WhereIf(orderInfoPageInput.nozzleNum != null, order => order.NozzleNum == orderInfoPageInput.nozzleNum);
+            //query = query.WhereIf(orderInfoPageInput.ttc != null, order => order.Ttc == orderInfoPageInput.ttc);
+            if (orderInfoPageInput.startCheckTime != null && orderInfoPageInput.endCheckTime != null)
+            {
+                query = query.Where(order => order.EndTime != null && (order.EndTime >= orderInfoPageInput.startCheckTime && order.EndTime <= orderInfoPageInput.endCheckTime));
+            }
+            return await query.Skip((orderInfoPageInput.page - 1) * orderInfoPageInput.pageSize).Take(orderInfoPageInput.pageSize).ToListAsync();
+        }
+    }
+}

src/FccLife.Web/Services/FccOrderInfo/IOrderInfoService.cs

@@ -0,0 +1,15 @@
+using Edge.Core.Domain.FccOrderInfo.Input;
+using Edge.Core.Domain.FccOrderInfo.Output;
+
+namespace FccLite.Web.Services.FccOrderInfo
+{
+    public interface IOrderInfoService
+    {
+        /// <summary>
+        /// 分页获取订单
+        /// </summary>
+        /// <param name="orderInfoOutput">过滤条件</param>
+        /// <returns></returns>
+        Task<OrderInfoOutput> GetPage(OrderInfoPageInput orderInfoPageInput);
+    }
+}

src/FccLife.Web/Services/FccOrderInfo/OrderInfoService.cs

@@ -0,0 +1,28 @@
+using Edge.Core.Domain.FccOrderInfo.Input;
+using Edge.Core.Domain.FccOrderInfo.Output;
+using FccLite.Web.Repositories.FccOrderInfo;
+
+namespace FccLite.Web.Services.FccOrderInfo
+{
+    public class OrderInfoService : IOrderInfoService
+    {
+        private readonly IOrderInfoReposity _orderInfoReposity;
+        public OrderInfoService(IOrderInfoReposity orderInfoReposity) 
+        {
+            _orderInfoReposity = orderInfoReposity;
+        }
+
+
+        public async Task<OrderInfoOutput> GetPage(OrderInfoPageInput orderInfoPageInput)
+        {
+            //throw new NotImplementedException();
+            IEnumerable<Edge.Core.Domain.FccOrderInfo.FccOrderInfo> enumerable = await _orderInfoReposity.GetPage(orderInfoPageInput);
+            List<OrderInfo> orderInfos = enumerable.Select(order => new OrderInfo(order)).ToList();
+            return new OrderInfoOutput()
+            {
+                Total = orderInfos.Count,
+                List = orderInfos
+            };
+        }
+    }
+}

src/FccWeb/admin.ui.plus-master/src/api/admin/orderDto/QRBookDto.ts

@@ -0,0 +1,14 @@
+export interface OrderInfoFilter{
+    /**油枪号 */
+    nozzleNum: null,
+    /**油品 */
+    oilName: null,
+    // /**支付方式 */
+    // CompanyName: "",
+    // /**状态 */
+    // onlineStatus: "",
+    /**加油开始的时间 */
+    startCheckTime?: Date | null,
+    /**加油结束的时间 */
+    endCheckTime?: Date | null,
+}

src/FccWeb/admin.ui.plus-master/src/api/api.ts

@@ -131,7 +131,13 @@ export const deleteOilInfo = (data:any)=>{
 }
 
 /** ----- 订单 ----- */
-
+export const getOrderInfoPage = (data:any) => {
+	return request({
+		url:'/qrFueling/order/getPage',
+		method:'post',
+		data:data,
+	})
+}
 
 
 

src/FccWeb/admin.ui.plus-master/src/views/admin/order/index.vue

@@ -8,16 +8,16 @@
                         <el-form-item prop="name" style="width: 100%">
                             <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                                 <el-form-item label="油枪">
-                                    <el-input v-model="Data.Filter.CompanyName" placeholder="请输入油枪"
+                                    <el-input v-model="Data.Filter.nozzleNum" placeholder="请输入油枪"
                                         clearable></el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                                 <el-form-item label="油品">
-                                    <el-input v-model="Data.Filter.name" placeholder="请输入油品" clearable></el-input>
+                                    <el-input v-model="Data.Filter.oilName" placeholder="请输入油品" clearable></el-input>
                                 </el-form-item>
                             </el-col>
-                            <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                            <!-- <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                                 <el-form-item label="状态">
                                     <el-select v-model="Data.Filter.StationName" placeholder="请选择状态">
                                         <el-option v-for="(value, key) in selectList.Online" :key="key" :label="value"
@@ -32,7 +32,7 @@
                                             :value="value" />
                                     </el-select>
                                 </el-form-item>
-                            </el-col>
+                            </el-col> -->
                             <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                                 <el-form-item label="加油时间">
                                     <el-date-picker v-model="Data.time1" type="datetimerange"
@@ -71,7 +71,7 @@
                         </el-table-column>
                     </el-table>
                     <div class="my-flex my-flex-end" style="margin-top: 20px">
-                        <el-pagination v-model:currentPage="Data.pageInput.currentPage"
+                        <el-pagination v-model:currentPage="Data.pageInput.page"
                             v-model:page-size="Data.pageInput.pageSize" :total="Data.total"
                             :page-sizes="[5, 10, 20, 50, 100]" small background @size-change="onSizeChange"
                             @current-change="onCurrentChange" layout="total, sizes, prev, pager, next, jumper" />
@@ -84,8 +84,9 @@
 </template>
 
 <script setup lang="ts" name="partsManagement/oilGun">
-import { reactive } from "vue";
-
+import { onMounted, reactive, watch } from "vue";
+import { getOrderInfoPage } from "/@/api/api";
+import { OrderInfoFilter } from "/@/api/admin/orderDto/QRBookDto";
 
 /**页面对象 */
 const Data = reactive({
@@ -94,46 +95,35 @@ const Data = reactive({
     loading: false,
     /**条件查询模块 */
     Filter: {
-        /**油枪 */
-        name: "",
+        /**油枪号 */
+        nozzleNum: null,
         /**油品 */
-        StationName: "",
-        /**支付方式 */
-        CompanyName: "",
-        /**状态 */
-        onlineStatus: "",
+        oilName: null,
+        // /**支付方式 */
+        // CompanyName: "",
+        // /**状态 */
+        // onlineStatus: "",
         /**加油开始的时间 */
-        OutBeginTime: "",
+        startCheckTime: null,
         /**加油结束的时间 */
-        OutEndTime: "",
-    },
+        endCheckTime: null,
+    } as OrderInfoFilter,
     /**表格信息 */
-    tableModel: [
-        {
-            'name': 1,
-            'companyName': 1,
-            'stationName': 1,
-            'fuelName': 1,
-            'code': 1,
-            'alarming': 1,
-            'fuelId': 1,
-        }
-    ],
+    tableModel: [],
     /**动态表头 */
     dynamicColumns: [
-        { prop: 'name', label: '流水号' },
-        { prop: 'companyName', label: '油机号' },
-        { prop: 'stationName', label: '油枪|油品' },
-        { prop: 'fuelName', label: '单价|升数' },
-        { prop: 'code', label: '金额' },
-        { prop: 'alarming', label: '加油时间' },
-        { prop: 'fuelId', label: '支付状态' },
+        { prop: 'ttc', label: '流水号' },
+        { prop: 'nozzleAndOil', label: '油枪|油品' },
+        { prop: 'priceAndVolume', label: '单价|升数' },
+        { prop: 'amount', label: '金额' },
+        { prop: 'endTime', label: '挂枪时间' },
+        // { prop: 'fuelId', label: '支付状态' },
     ],
     /**分页总数 */
     total: 0,
     /**分页标识 */
     pageInput: {
-        currentPage: 1,
+        page: 1,
         pageSize: 10,
     },
 })
@@ -149,11 +139,92 @@ const selectList = reactive({
     Level: [1, 2, 3, 4, 5]
 })
 
+/** 查询订单 */
+const onQuery = (async () => {
+    Data.loading = true;
+
+    var orders = await getOrderInfoPage({
+        ...Data.pageInput,
+        ...Data.Filter
+    });
+    console.log(orders)
+    Data.total = orders.total;
+    Data.tableModel =  orders.list.map(order => {
+         return {
+            'ttc': order.ttc,
+            'nozzleAndOil': order.nozzleNum + "|" + order.oilName,
+            'priceAndVolume': order.price + "|" + order.volume,
+            'amount': order.amount,
+            'endTime': order.endTime,
+         }
+    })
+
+    Data.loading = false;
+})
+
+/** 重置查询条件 */
+const onReset = () => {
+    Data.Filter = {
+        /**油枪号 */
+        nozzleNum: null,
+        /**油品 */
+        oilName: null,
+        // /**支付方式 */
+        // CompanyName: "",
+        // /**状态 */
+        // onlineStatus: "",
+        /**加油开始的时间 */
+        startCheckTime: null,
+        /**加油结束的时间 */
+        endCheckTime: null,
+    }
+    Data.time1 = ""
+}
+
+/** 页数修改 */
+const onSizeChange = (pageSize) => {
+    Data.pageInput.pageSize = pageSize
+}
+
+/** 页码修改 */
+const onCurrentChange = (page) => {
+    Data.pageInput.page = page
+}
+
 /** 操作 */
 const toView = ((data: any) => {
     console.log('查看')
 })
 
+// 挂载时
+onMounted(async () => {
+    await onQuery()
+})
+
+/** 过滤条件监听——枪号 */
+watch(() => Data.Filter.nozzleNum,(val) => {
+    if(val) {
+        Data.Filter.nozzleNum = val
+    } else {
+        Data.Filter.nozzleNum = null
+    }
+})
+
+/** 过滤条件监听——油品 */
+watch(() => Data.Filter.oilName,(val) => {
+    if(val) {
+        Data.Filter.oilName = val
+    } else {
+        Data.Filter.oilName = null
+    }
+})
+
+/** 过滤条件监听——时间 */
+watch(() => Data.time1,(val) => {
+    if(val?.length === 0) return
+    Data.Filter.startCheckTime = new Date(val?.[0].toString());
+    Data.Filter.endCheckTime = new Date(val?.[1].toString());
+})
 </script>
 
 <style scoped lang="scss">