feat(新增部件管理、报警管理、协会用户管理、油站管理列表)：添加各个页面的数据接口连接及查询事件响应。

admin.ui.plus-master/src/api/admin/reportManagement/alarm/alarmApi.ts

@@ -0,0 +1,33 @@
+import { AxiosResponse } from 'axios'
+import {ContentType, HttpClient, RequestParams} from "/@/api/admin/http-client";
+import {PageInputAlarmFilterModel,alarmFilterModel} from "/@/api/admin/reportManagement/alarm/alarmDto";
+
+export class AlarmApi<SecurityDataType = unknown> extends HttpClient<SecurityDataType>{
+  timer = 500
+  /**
+   * No description
+   *
+   * @tags
+   * @name getPageData
+   * @summary 分页查询
+   * @request GET:
+   * @secure
+   */
+
+  getPage = (data: PageInputAlarmFilterModel, params: RequestParams = {}) =>
+    this.request<alarmFilterModel, any>({
+      path: `/api/app/fuel-dispenser/get-alarm-history-list`,
+      method: 'POST',
+      body: data,
+      secure: true,
+      type: ContentType.Json,
+      format: 'json',
+      ...params,
+    })
+}
+
+
+
+
+
+

admin.ui.plus-master/src/api/admin/reportManagement/alarm/alarmDto.ts

@@ -0,0 +1,123 @@
+/**
+ *  报警管理
+ *  数据对象的Dto
+ * */
+
+/**
+ * And=0,Or=1
+ * @format int32
+ */
+export type DynamicFilterLogic = 0 | 1
+
+/**
+ * Contains=0,StartsWith=1,EndsWith=2,NotContains=3,NotStartsWith=4,NotEndsWith=5,Equal=6,Equals=7,Eq=8,NotEqual=9,GreaterThan=10,GreaterThanOrEqual=11,LessThan=12,LessThanOrEqual=13,Range=14,DateRange=15,Any=16,NotAny=17,Custom=18
+ * @format int32
+ */
+export type DynamicFilterOperator = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18
+export interface DynamicFilterInfo {
+  field?: string | null
+  /** Contains=0,StartsWith=1,EndsWith=2,NotContains=3,NotStartsWith=4,NotEndsWith=5,Equal=6,Equals=7,Eq=8,NotEqual=9,GreaterThan=10,GreaterThanOrEqual=11,LessThan=12,LessThanOrEqual=13,Range=14,DateRange=15,Any=16,NotAny=17,Custom=18 */
+  operator?: DynamicFilterOperator
+  value?: string
+  /** And=0,Or=1 */
+  logic?: DynamicFilterLogic
+  filters?: DynamicFilterInfo[] | null
+}
+
+/**
+ * 列表查询信息
+ */
+export  interface alarmFilterModel_SearchFilter{
+    /**油机id */
+    fuelld?: string,
+    /**加油站 */
+    gasStation?: string,
+    /**油机号*/
+    name?: string,
+    /**序列号*/
+    serialNumber?: string,
+    /**报警来源 */
+    alarmSource?: string,
+    /**报警类型 */
+    alarmType?: string,
+    /**报警描述 */
+    alarmDescription?: string,
+    /**报警设备	 */
+    alarmDevice?: string,
+    /** 油枪*/
+    nozzleControlName?: string,
+    /**创建开始的时间 */
+    CreateBeginTime?: string,
+    /**创建结束的时间 */
+    CreateEndTime?: string,
+  }
+  
+  /**
+   * 列表信息
+   */
+  export interface alarmFilterModel {
+        /**油机id */
+        fuelld?: string | null ,
+        /**加油站 */
+        gasStation?: string | null ,
+        /**油机号*/
+        name?: string | null ,
+        /**序列号*/
+        serialNumber?: string | null ,
+        /**报警来源 */
+        alarmSource?: string | null ,
+        /**报警类型 */
+        alarmType?: string | null ,
+        /**报警描述 */
+        alarmDescription?: string | null ,
+        /**报警设备	 */
+        alarmDevice?: string | null ,
+        /** 油枪*/
+        nozzleControlName?: string | null ,
+        /**创建时间 */
+        createdDate?: string | null ,
+        /**报警历史ID */
+        alarmHistoryID?: string | null ,
+  }
+
+/** 分页信息输出*/
+export interface PageOutputAlarmFilterModel{
+    /**
+     * 数据总数
+     * @format int64
+     */
+    total?: number
+    /** 数据 */
+    list?: alarmFilterModel[] | null
+  }
+  
+/**结果输出*/
+export interface ResultOutputPageOutputAlarmFilterModel{
+/** 是否成功标记 */
+success?: boolean
+/** 编码 */
+code?: string | null
+/** 消息 */
+msg?: string | null
+/** 分页信息输出 */
+data?: PageOutputAlarmFilterModel
+}
+  
+/** 分页信息输入 */
+export interface PageInputAlarmFilterModel{
+/**
+ * 当前页标
+ * @format int32
+ */
+currentPage?: number
+/**
+ * 每页大小
+ * @format int32
+ */
+pageSize?: number
+dynamicFilter?: DynamicFilterInfo
+filter?: alarmFilterModel_SearchFilter
+}
+  
+  
+

admin.ui.plus-master/src/api/admin/reportManagement/association/associationApi.ts

@@ -0,0 +1,27 @@
+import { AxiosResponse } from 'axios'
+import {ContentType, HttpClient, RequestParams} from "/@/api/admin/http-client";
+import {PageInputAssociationFilterModel,associationFilterModel} from "/@/api/admin/reportManagement/association/associationDto";
+
+export class AssociationApi<SecurityDataType = unknown> extends HttpClient<SecurityDataType>{
+  timer = 500
+  /**
+   * No description
+   *
+   * @tags
+   * @name getPageData
+   * @summary 分页查询
+   * @request GET:
+   * @secure
+   */
+
+  getPage = (data: PageInputAssociationFilterModel, params: RequestParams = {}) =>
+    this.request<associationFilterModel, any>({
+      path: `/api/app/fuel-dispenser/get-association-user-list`,
+      method: 'POST',
+      body: data,
+      secure: true,
+      type: ContentType.Json,
+      format: 'json',
+      ...params,
+    })
+}

admin.ui.plus-master/src/api/admin/reportManagement/association/associationDto.ts

@@ -0,0 +1,95 @@
+/**
+ *  协会用户管理
+ *  数据对象的Dto
+ * */
+
+/**
+ * And=0,Or=1
+ * @format int32
+ */
+export type DynamicFilterLogic = 0 | 1
+
+/**
+ * Contains=0,StartsWith=1,EndsWith=2,NotContains=3,NotStartsWith=4,NotEndsWith=5,Equal=6,Equals=7,Eq=8,NotEqual=9,GreaterThan=10,GreaterThanOrEqual=11,LessThan=12,LessThanOrEqual=13,Range=14,DateRange=15,Any=16,NotAny=17,Custom=18
+ * @format int32
+ */
+export type DynamicFilterOperator = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18
+export interface DynamicFilterInfo {
+  field?: string | null
+  /** Contains=0,StartsWith=1,EndsWith=2,NotContains=3,NotStartsWith=4,NotEndsWith=5,Equal=6,Equals=7,Eq=8,NotEqual=9,GreaterThan=10,GreaterThanOrEqual=11,LessThan=12,LessThanOrEqual=13,Range=14,DateRange=15,Any=16,NotAny=17,Custom=18 */
+  operator?: DynamicFilterOperator
+  value?: string
+  /** And=0,Or=1 */
+  logic?: DynamicFilterLogic
+  filters?: DynamicFilterInfo[] | null
+}
+
+/**
+ * 列表查询信息
+ */
+export  interface associationFilterModel_SearchFilter{
+    /**用户名 */
+    name?:string
+  }
+  
+  /**
+   * 列表信息
+   */
+  export interface associationFilterModel {
+    /** 用户名 */
+    name?: string | null ,
+    /** 邮箱 */
+    email?: string | null ,
+    /** 手机号码 */
+    mobile?: string | null ,
+    /** 创建时间 */
+    createdDate?: string | null ,
+    /** 修改时间 */
+    modifiedDate?: string | null ,
+    /** 是否启用用户 */
+    disable?: string | null ,
+    /** 账户是否锁定 */
+    isLock?: string | null ,
+  }
+
+/** 分页信息输出*/
+export interface PageOutputAssociationFilterModel{
+    /**
+     * 数据总数
+     * @format int64
+     */
+    total?: number
+    /** 数据 */
+    list?: associationFilterModel[] | null
+  }
+  
+/**结果输出*/
+export interface ResultOutputPageOutputAssociationFilterModel{
+/** 是否成功标记 */
+success?: boolean
+/** 编码 */
+code?: string | null
+/** 消息 */
+msg?: string | null
+/** 分页信息输出 */
+data?: PageOutputAssociationFilterModel
+}
+  
+/** 分页信息输入 */
+export interface PageInputAssociationFilterModel{
+/**
+ * 当前页标
+ * @format int32
+ */
+currentPage?: number
+/**
+ * 每页大小
+ * @format int32
+ */
+pageSize?: number
+dynamicFilter?: DynamicFilterInfo
+filter?: associationFilterModel_SearchFilter
+}
+  
+  
+

admin.ui.plus-master/src/api/admin/reportManagement/encScreen/encScreenDto.ts

@@ -27,29 +27,25 @@ export interface DynamicFilterInfo {
 /**
  * 加密显示屏列表查询信息
  */
-export  interface encScreenFilterModel_SearchFilter{
-    /**石油公司*/
-    companyName?: string |null,
-    /**加密显示屏状态*/
-    deviceStatus?: string | null,
-    /**站点地址*/
-    stationName?: string | null,
-    /**加油机厂商*/
-    supplierName?: string | null,
-    /**出厂开始的时间 */
-    OutBeginTime: string | null,
-    /**出厂结束的时间 */
-    OutEndTime: string | null,
-    /**安装开始的时间 */
-    CreateBeginTime: string | null,
-    /**安装结束的时间 */
-    CreateEndTime: string | null,
-  }
+export interface encScreenFilterModel_SearchFilter{
+  /**设备类型 */
+  deviceType?:string | null,
+  /**在线状态 */
+  onlineStatus?:string | null,
+  /**设备状态 */
+  deviceStatus?:string | null,
+  /**序列号 */
+  sn?:string | null,
+  /**设备报警级别 */
+  deviceAlarmLevel?:string | null
+}
   
   /**
    * 加密显示屏列表信息
    */
   export interface encScreenFilterModel {
+    /** 序列号 */
+    sn?: number | null ,
     /** 石油公司 */
     companyName?: string | null ,
     /** 加油站名称 */
@@ -58,8 +54,6 @@ export  interface encScreenFilterModel_SearchFilter{
     supplierName?: string | null ,
     /** 加密显示屏厂商 */
     manufacturerName?: string | null ,
-    /** 油机号 */
-    fuelID?: number | null ,
     /** 油枪号 */
     nozzleconName?: string | null ,
     /** 加密显示屏编号 */
@@ -70,7 +64,7 @@ export  interface encScreenFilterModel_SearchFilter{
     onlineStatus?: string | null ,
     /** 安装时间 */
     soldTime?: string | null ,
-    /** 出厂时间 */
+    /** 出场时间 */
     productTime?: string | null 
   }
 

admin.ui.plus-master/src/api/admin/reportManagement/encoder/encoderDto.ts

@@ -27,29 +27,25 @@ export interface DynamicFilterInfo {
 /**
  * 编码器列表查询信息
  */
-export  interface encoderFilterModel_SearchFilter{
-    /**石油公司*/
-    companyName?: string |null,
-    /**编辑器状态*/
-    deviceStatus?: string | null,
-    /**站点地址*/
-    stationName?: string | null,
-    /**加油机厂商*/
-    supplierName?: string | null,
-    /**出厂开始的时间 */
-    OutBeginTime: string | null,
-    /**出厂结束的时间 */
-    OutEndTime: string | null,
-    /**安装开始的时间 */
-    CreateBeginTime: string | null,
-    /**安装结束的时间 */
-    CreateEndTime: string | null,
-  }
+export interface encoderFilterModel_SearchFilter{
+  /**设备类型 */
+  deviceType?:string | null,
+  /**在线状态 */
+  onlineStatus?:string | null,
+  /**设备状态 */
+  deviceStatus?:string | null,
+  /**序列号 */
+  sn?:string | null,
+  /**设备报警级别 */
+  deviceAlarmLevel?:string | null
+}
   
   /**
    * 油机列表信息
    */
   export interface encoderFilterModel {
+    /** 序列号 */
+    sn?: number | null ,
     /** 石油公司 */
     companyName?: string | null ,
     /** 加油站名称 */
@@ -58,8 +54,6 @@ export  interface encoderFilterModel_SearchFilter{
     supplierName?: string | null ,
     /** 编码器厂商 */
     manufacturerName?: string | null ,
-    /** 油机号 */
-    fuelID?: number | null ,
     /** 油枪号 */
     nozzleconName?: string | null ,
     /** 编码器编号 */

admin.ui.plus-master/src/api/admin/reportManagement/gasStation/gasStationApi.ts

@@ -0,0 +1,27 @@
+import { AxiosResponse } from 'axios'
+import {ContentType, HttpClient, RequestParams} from "/@/api/admin/http-client";
+import {PageInputgasStationFilterModel,gasStationFilterModel} from "/@/api/admin/reportManagement/gasStation/gasStationDto";
+
+export class gasStationApi<SecurityDataType = unknown> extends HttpClient<SecurityDataType>{
+  timer = 500
+  /**
+   * No description
+   *
+   * @tags
+   * @name getPageData
+   * @summary 分页查询
+   * @request GET:
+   * @secure
+   */
+
+  getPage = (data: PageInputgasStationFilterModel, params: RequestParams = {}) =>
+    this.request<gasStationFilterModel, any>({
+      path: `/api/app/fuel-dispenser/get-station-list`,
+      method: 'POST',
+      body: data,
+      secure: true,
+      type: ContentType.Json,
+      format: 'json',
+      ...params,
+    })
+}

admin.ui.plus-master/src/api/admin/reportManagement/gasStation/gasStationDto.ts

@@ -0,0 +1,93 @@
+/**
+ *  油站管理 
+ *  数据对象的Dto
+ * */
+
+/**
+ * And=0,Or=1
+ * @format int32
+ */
+export type DynamicFilterLogic = 0 | 1
+
+/**
+ * Contains=0,StartsWith=1,EndsWith=2,NotContains=3,NotStartsWith=4,NotEndsWith=5,Equal=6,Equals=7,Eq=8,NotEqual=9,GreaterThan=10,GreaterThanOrEqual=11,LessThan=12,LessThanOrEqual=13,Range=14,DateRange=15,Any=16,NotAny=17,Custom=18
+ * @format int32
+ */
+export type DynamicFilterOperator = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18
+export interface DynamicFilterInfo {
+  field?: string | null
+  /** Contains=0,StartsWith=1,EndsWith=2,NotContains=3,NotStartsWith=4,NotEndsWith=5,Equal=6,Equals=7,Eq=8,NotEqual=9,GreaterThan=10,GreaterThanOrEqual=11,LessThan=12,LessThanOrEqual=13,Range=14,DateRange=15,Any=16,NotAny=17,Custom=18 */
+  operator?: DynamicFilterOperator
+  value?: string
+  /** And=0,Or=1 */
+  logic?: DynamicFilterLogic
+  filters?: DynamicFilterInfo[] | null
+}
+
+/**
+ * 列表查询信息
+ */
+export  interface gasStationFilterModel_SearchFilter{
+    /**省份*/
+    province?: string,
+    /**加油站名称*/
+    name?: string,
+  }
+  
+  /**
+   * 列表信息
+   */
+  export interface gasStationFilterModel {
+    /** 油站名称 */
+    name?: string | null ,
+    /** 油站类型 */
+    type?: string | null ,
+    /** 油站地址 */
+    address?: string | null ,
+    /** 油站数量 */
+    dispensersTotal?: number | null ,
+    /** 油枪数量 */
+    nozzleControlsTotal?: number | null ,
+  }
+
+/** 分页信息输出*/
+export interface PageOutputgasStationFilterModel{
+    /**
+     * 数据总数
+     * @format int64
+     */
+    total?: number
+    /** 数据 */
+    list?: gasStationFilterModel[] | null
+  }
+  
+/**结果输出*/
+export interface ResultOutputPageOutputoilGunFilterModel{
+/** 是否成功标记 */
+success?: boolean
+/** 编码 */
+code?: string | null
+/** 消息 */
+msg?: string | null
+/** 分页信息输出 */
+data?: PageOutputgasStationFilterModel
+}
+  
+/** 分页信息输入 */
+export interface PageInputgasStationFilterModel{
+/**
+ * 当前页标
+ * @format int32
+ */
+currentPage?: number
+/**
+ * 每页大小
+ * @format int32
+ */
+pageSize?: number
+dynamicFilter?: DynamicFilterInfo
+filter?: gasStationFilterModel_SearchFilter
+}
+  
+  
+

admin.ui.plus-master/src/api/admin/reportManagement/monitorCpu/monitorCpuDto.ts

@@ -28,28 +28,24 @@ export interface DynamicFilterInfo {
  * 监控微处理器列表查询信息
  */
 export  interface monitorCpuFilterModel_SearchFilter{
-    /**石油公司*/
-    companyName?: string |null,
-    /**监控微处理器状态*/
-    deviceStatus?: string | null,
-    /**站点地址*/
-    stationName?: string | null,
-    /**加油机厂商*/
-    supplierName?: string | null,
-    /**出厂开始的时间 */
-    OutBeginTime: string | null,
-    /**出厂结束的时间 */
-    OutEndTime: string | null,
-    /**安装开始的时间 */
-    CreateBeginTime: string | null,
-    /**安装结束的时间 */
-    CreateEndTime: string | null,
+    /**设备类型 */
+  deviceType?:string | null,
+  /**在线状态 */
+  onlineStatus?:string | null,
+  /**设备状态 */
+  deviceStatus?:string | null,
+  /**序列号 */
+  sn?:string | null,
+  /**设备报警级别 */
+  deviceAlarmLevel?:string | null
   }
   
   /**
    * 列表信息
    */
   export interface monitorCpuFilterModel {
+    /** 序列号 */
+    sn?: number | null ,
     /** 石油公司 */
     companyName?: string | null ,
     /** 加油站名称 */
@@ -58,8 +54,6 @@ export  interface monitorCpuFilterModel_SearchFilter{
     supplierName?: string | null ,
     /** 监控微处理器厂商 */
     manufacturerName?: string | null ,
-    /** 油机号 */
-    fuelID?: number | null ,
     /** 油枪号 */
     nozzleconName?: string | null ,
     /** 监控微处理器编号 */
@@ -70,8 +64,8 @@ export  interface monitorCpuFilterModel_SearchFilter{
     onlineStatus?: string | null ,
     /** 安装时间 */
     soldTime?: string | null ,
-    /** 出厂时间 */
-    productTime?: string | null 
+    /** 出场时间 */
+    productTime?: string | null  
   }
 
 /** 分页信息输入 */

admin.ui.plus-master/src/api/admin/reportManagement/oilGun/oilGunApi.ts

@@ -24,38 +24,4 @@ export class OilGunApi<SecurityDataType = unknown> extends HttpClient<SecurityDa
       format: 'json',
       ...params,
     })
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// import {ContentType, HttpClient,RequestParams} from "/@/api/admin/http-client";
-// import {oilGunyRequestBody} from "/@/api/admin/reportManagement/oilGun/oilGunDto";
-// import {AxiosResponse} from "axios";
-
-// export class OilGunApi<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
-//   getPage = (data:oilGunyRequestBody, params: RequestParams = {}) =>
-//     this.request<AxiosResponse, any>({
-//       path: `/api/app/fuel-dispenser/get-nozzlecontrol-list`,
-//       method: 'POST',
-//       body: data,
-//       secure: true,
-//       type: ContentType.Json,
-//       format: 'json',
-//       ...params,
-//     })
-// }
-
+}

admin.ui.plus-master/src/api/admin/reportManagement/oilGun/oilGunDto.ts

@@ -30,22 +30,16 @@ export interface DynamicFilterInfo {
 export  interface oilGunFilterModel_SearchFilter{
     /**石油公司*/
     CompanyName?: string,
-    /**防作弊启用状态*/
-    CheatStatus?: string,
-    /**油枪状态*/
-    OilGunState?: string,
-    /**站点地址*/
+    /**油枪号*/
+    name?: string,
+    /**在线状态 */
+    onlineStatus?:string,
+    /**加油站名称*/
     StationName?: string,
-    /**加油机厂商*/
-    SupplierName?: string,
     /**出厂开始的时间 */
     OutBeginTime: string,
     /**出厂结束的时间 */
     OutEndTime: string,
-    /**安装开始的时间 */
-    CreateBeginTime: string,
-    /**安装结束的时间 */
-    CreateEndTime: string,
   }
   
   /**

admin.ui.plus-master/src/views/admin/statement/accountManagement/index.vue

@@ -1,218 +0,0 @@
-<template>
-    <div class="layout-pd" >
-      <el-row>
-        <!--操作-->
-        <el-col :xs="24" >
-          <el-card class="mt8"  shadow="hover" >
-            <el-form :model="sdkData.Filter" :inline="true" @submit.stop.prevent>
-              <el-form-item prop="name" style="width: 100%">
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="用户ID">
-                    <el-input v-model="sdkData.Filter.UserId"  placeholder="用户ID" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="用户名">
-                    <el-input v-model="sdkData.Filter.UserName"  placeholder="用户名" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="邮箱">
-                    <el-input v-model="sdkData.Filter.Email" placeholder="邮箱" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="手机号码">
-                    <el-input v-model="sdkData.Filter.PhoneNumber" placeholder="手机号码" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="角色">
-                    <el-select  v-model="sdkData.Filter.Role" placeholder="搜索角色" >
-                        <el-option v-for="(value, key) in 1" :key="key" :label="1"  :value="1" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="状态">
-                    <el-select  v-model="sdkData.Filter.State" placeholder="请选择状态" >
-                        <el-option v-for="(value, key) in 1" :key="key" :label="1"  :value="1" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                    <el-form-item label="机构名称">
-                    <el-input v-model="sdkData.Filter.Institution" placeholder="机构名称" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item>
-                    <el-button type="primary" icon="ele-Search" @click="1"> 查询 </el-button>
-                    <el-button type="primary" icon="ele-RefreshRight" @click="1"> 重置 </el-button>
-                  </el-form-item>
-                </el-col>
-              </el-form-item>
-            </el-form>
-          </el-card>
-        </el-col>
-        <!--表格-->
-        <el-col  :xs="24" >
-          <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
-            <el-table ref="multipleTableRef"
-              v-loading="sdkData.loading"
-              stripe :data="sdkData.tableModel"
-              row-key="id"
-              style="width: 100%" >
-              <el-table-column type="selection" width="50"></el-table-column>
-              <el-table-column v-for="column in sdkData.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label" />
-            </el-table>
-            <div class="my-flex my-flex-end" style="margin-top: 20px">
-              <el-pagination
-                v-model:currentPage="sdkData.pageInput.CurrentPage"
-                v-model:page-size="sdkData.pageInput.PageSize"
-                :total="sdkData.total"
-                :page-sizes="[10000, 20000, 50000, 100000]"
-                small
-                background
-                @size-change="1"
-                @current-change="1"
-                layout="total, sizes, prev, pager, next, jumper"
-              />
-            </div>
-          </el-card>
-        </el-col>
-      </el-row>
-      <EditDialog ref="editDialogRef" />
-      <AuditDialog ref="auditDialogRef" />
-    </div>
-  
-  </template>
-  
-  <script setup lang="ts" name="authorize/fuelingsdk">
-  import {defineAsyncComponent, onMounted, reactive, ref, watch, onBeforeMount,getCurrentInstance} from "vue";
-  import { ElTable } from 'element-plus'
-  /**引入组件*/
-  
-  /**sdk授权页面对象 */
-  const sdkData = reactive({
-    time:'',
-    /**加载显示 */
-    loading: false,
-    /**条件查询模块 */
-    Filter: {
-      /**用户id */
-      UserId: "",
-      /**用户名 */
-      UserName: "",
-      /**邮箱*/
-      Email: "",
-      /**手机号码*/
-      PhoneNumber: "",
-      /**角色 */
-      Role: "",
-      /**状态 */
-      State: "",
-      /**机构名称 */
-      Institution: "",
-    } ,
-    /**表格信息 */
-    tableModel: [] ,
-    /**动态表头 */
-    dynamicColumns: [
-      { prop: 'guid', label: '编号' },
-      { prop: 'userName', label: '用户名' },
-      { prop: 'email', label: '邮箱' },
-      { prop: 'phoneNumber', label: '手机号码' },
-      { prop: 'institution', label: '机构' },
-      { prop: 'createTime', label: '创建时间' },
-      { prop: 'updateTime', label: '修改时间' },
-      { prop: 'isUser', label: '是否启用用户' },
-      { prop: 'isFace', label: '是否开通人脸' },
-      { prop: 'isLock', label: '是否已锁定' },
-    ],
-    /**分页标识 */
-    pageInput:{
-      CurrentPage: 1,
-      PageSize: 10000,
-    } ,
-    /**分页总数 */
-    total: 0,
-  } )
-  
-//   /**初始化 */
-//   const init = async () => {
-//     sdkData.loading = true
-//     const query = flattenObject({ Filter: sdkData.Filter})
-//     const res:any = await new OilSdkAuthorAPI().getPageData({...sdkData.pageInput, ...query}).catch(() => {
-//       sdkData.loading = false
-//     })
-//     sdkData.tableModel = res?.data?.list ?? []
-//     sdkData.total = res?.data?.total ?? 0
-//     sdkData.loading = false
-//   }
-  
-//   onMounted(() => {
-//     init()
-//     eventBus.off('refreshView')
-//     eventBus.on('refreshView', async () => {
-//       init()
-//     })
-//   })
-  
-//   onBeforeMount(() => {
-//     eventBus.off('refreshView')
-//   })
-  
-//   /**
-//    * 监听时间变换
-//    */
-//   watch(() => sdkData.time, (newVal ) => {
-//     if(newVal.length === 0){
-//       return
-//     }
-//     sdkData.Filter.BeginTime = newVal?.[0].toString()
-//     sdkData.Filter.EndTime = newVal?.[1].toString()
-//   })
-  
-//   /**条件查询 */
-//   const onQuery = () => {
-//     init()
-//   }
-  
-  /**重置查询条件 */
-//   const resetQuery = () => {
-//     sdkData.Filter.OilCompanies = ''
-//     sdkData.Filter.AntiCheatingState = ''
-//     sdkData.Filter.OilGunState = ''
-//     sdkData.Filter.SiteAddress = ''
-//     sdkData.Filter.Manufacturer =  ''
-//     sdkData.Filter.OutBeginTime = ''
-//     sdkData.Filter.OutEndTime = ''
-//     sdkData.Filter.CreateBeginTime = ''
-//     sdkData.Filter.CreateEndTime = ''
-//     sdkData.time = ''
-//     sdkData.pageInput.CurrentPage = 1
-//   }
-  
-//   /**重置 */
-//   const onReset = () => {
-//     resetQuery()
-//     init()
-//   }
-  
-
-  
-  </script>
-  
-  <style scoped lang="scss">
-  .my-el-link {
-    font-size: 14px;
-  }
-  .el-form .el-col.mb20 {
-    margin: 0 !important;
-  }
-  .el-input, .el-select {
-    width: 240px;
-  }
-  </style>
-  

admin.ui.plus-master/src/views/admin/statement/alarmManagement/index.vue

@@ -4,43 +4,58 @@
         <!--操作-->
         <el-col :xs="24" >
           <el-card class="mt8"  shadow="hover" >
-            <el-form :model="sdkData.Filter" :inline="true" @submit.stop.prevent>
+            <el-form :model="Data.Filter" :inline="true" @submit.stop.prevent>
               <el-form-item prop="name" style="width: 100%">
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="石油公司">
-                    <el-input v-model="sdkData.Filter.OilCompanies"  placeholder="请输入石油公司" clearable></el-input>
+                  <el-form-item label="油机ID">
+                    <el-input v-model="Data.Filter.fuelld"  placeholder="请输入油机ID" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
                   <el-form-item label="加油站">
-                    <el-input v-model="sdkData.Filter.GasStation"  placeholder="请输入加油站" clearable></el-input>
+                    <el-input v-model="Data.Filter.gasStation"  placeholder="请输入加油站" clearable></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
+                  <el-form-item label="油机号">
+                    <el-input v-model="Data.Filter.name" placeholder="请输入油机号" clearable></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
+                  <el-form-item label="序列号">
+                    <el-input v-model="Data.Filter.serialNumber" placeholder="请输入序列号" clearable></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
+                  <el-form-item label="报警来源">
+                    <el-input v-model="Data.Filter.alarmSource" placeholder="请输入报警来源" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
                   <el-form-item label="报警类型">
-                    <el-input v-model="sdkData.Filter.AlarmType" placeholder="请输入报警类型" clearable></el-input>
+                    <el-input v-model="Data.Filter.alarmType" placeholder="请输入报警类型" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="加油机厂商">
-                    <el-select  v-model="sdkData.Filter.Manufacturer" placeholder="请选择加油机厂商" >
-                        <el-option v-for="(value, key) in 1" :key="key" :label="1"  :value="1" />
-                    </el-select>
+                  <el-form-item label="报警描述">
+                    <el-input v-model="Data.Filter.alarmDescription" placeholder="请输入报警描述" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="加油机序列号">
-                    <el-input v-model="sdkData.Filter.OilEnginesId" placeholder="请输入加油机序列号" clearable></el-input>
+                  <el-form-item label="报警设备">
+                    <el-input v-model="Data.Filter.alarmDevice" placeholder="请输入报警设备" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item>
+                  <el-form-item label="油枪">
+                    <el-input v-model="Data.Filter.nozzleControlName" placeholder="请输入油枪" clearable></el-input>
                   </el-form-item>
                 </el-col>
+
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
                   <el-form-item label="创建时间">
                     <el-date-picker
-                      v-model="sdkData.time"
+                      v-model="Data.time"
                       type="datetimerange"
                       value-format="YYYY-MM-DD HH:mm:ss"
                       range-separator="To"
@@ -55,8 +70,8 @@
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
                   <el-form-item>
-                    <el-button type="primary" icon="ele-Search" @click="1"> 查询 </el-button>
-                    <el-button type="primary" icon="ele-RefreshRight" @click="1"> 重置 </el-button>
+                    <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
+                    <el-button type="primary" icon="ele-RefreshRight" @click="onReset"> 重置 </el-button>
                   </el-form-item>
                 </el-col>
               </el-form-item>
@@ -67,23 +82,22 @@
         <el-col  :xs="24" >
           <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
             <el-table ref="multipleTableRef"
-              v-loading="sdkData.loading"
-              stripe :data="sdkData.tableModel"
+              v-loading="Data.loading"
+              stripe :data="Data.tableModel"
               row-key="id"
               style="width: 100%" >
-              <el-table-column type="selection" width="50"></el-table-column>
-              <el-table-column v-for="column in sdkData.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label" />
+              <el-table-column v-for="column in Data.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label" />
             </el-table>
             <div class="my-flex my-flex-end" style="margin-top: 20px">
               <el-pagination
-                v-model:currentPage="sdkData.pageInput.CurrentPage"
-                v-model:page-size="sdkData.pageInput.PageSize"
-                :total="sdkData.total"
-                :page-sizes="[10000, 20000, 50000, 100000]"
+                v-model:currentPage="Data.pageInput.currentPage"
+                v-model:page-size="Data.pageInput.pageSize"
+                :total="Data.total"
+                :page-sizes="[1000, 2000, 5000, 10000]"
                 small
                 background
-                @size-change="1"
-                @current-change="1"
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
                 layout="total, sizes, prev, pager, next, jumper"
               />
             </div>
@@ -97,119 +111,138 @@
   </template>
   
   <script setup lang="ts" name="authorize/fuelingsdk">
-  import {defineAsyncComponent, onMounted, reactive, ref, watch, onBeforeMount,getCurrentInstance} from "vue";
-  import { ElTable } from 'element-plus'
-  /**引入组件*/
+  import {onMounted, reactive, watch} from "vue";
+  import {ElTable } from 'element-plus'
+  import {alarmFilterModel_SearchFilter, alarmFilterModel, PageInputAlarmFilterModel} from "/@/api/admin/reportManagement/alarm/alarmDto";
+  import {AlarmApi} from "/@/api/admin/reportManagement/alarm/alarmApi";
+
   
-  /**sdk授权页面对象 */
-  const sdkData = reactive({
+  /**页面对象 */
+  const Data = reactive({
     time:'',
     /**加载显示 */
     loading: false,
     /**条件查询模块 */
     Filter: {
-      /**石油公司 */
-      OilCompanies: "",
+      /**油机id */
+      fuelld: "",
       /**加油站 */
-      GasStation: "",
-      /**报警类型*/
-      AlarmType: "",
-      /**加油机厂商*/
-      Manufacturer: "",
-      /**加油机序列号 */
-      OilEnginesId: "",
+      gasStation: "",
+      /**油机号*/
+      name: "",
+      /**序列号*/
+      serialNumber: "",
+      /**报警来源 */
+      alarmSource: "",
+      /**报警类型 */
+      alarmType:"",
+      /**报警描述 */
+      alarmDescription:"",
+      /**报警设备	 */
+      alarmDevice:"",
+      /** 油枪*/
+      nozzleControlName:"",
       /**创建开始的时间 */
-      CreateBeginTime: null,
+      CreateBeginTime: "",
       /**创建结束的时间 */
-      CreateEndTime: null,
-    } ,
+      CreateEndTime: "",
+    } as alarmFilterModel_SearchFilter,
     /**表格信息 */
-    tableModel: [] ,
+    tableModel: [] as Array<alarmFilterModel>,
     /**动态表头 */
     dynamicColumns: [
-      { prop: 'guid', label: '编号' },
-      { prop: 'oilCompanies', label: '石油公司' },
+      { prop: 'fuelld', label: '油机id' },
       { prop: 'gasStation', label: '加油站名称' },
-      { prop: 'manufacturer', label: '加油机厂商' },
-      { prop: 'oilEngines', label: '加油机' },
-      { prop: 'oilEnginesType', label: '加油机型号' },
-      { prop: 'oilEnginesId', label: '加油机序列号' },
-      { prop: 'oilGun', label: '油枪' },
-      { prop: 'alarm', label: '报警设备' },
+      { prop: 'name', label: '油机号' },
+      { prop: 'serialNumber', label: '序列号' },
+      { prop: 'alarmSource', label: '报警来源' },
       { prop: 'alarmType', label: '报警类型' },
-      { prop: 'describe', label: '报警描述' },
-      { prop: 'source', label: '来源' },
-      { prop: 'alarmTime', label: '报警时间' },
+      { prop: 'alarmDescription', label: '报警描述' },
+      { prop: 'alarmDevice', label: '报警设备' },
+      { prop: 'nozzleControlName', label: '油枪' },
+      { prop: 'createdDate', label: '创建时间' },
+      { prop: 'alarmHistoryID', label: '报警历史ID' },
     ],
     /**分页标识 */
     pageInput:{
-      CurrentPage: 1,
-      PageSize: 10000,
-    } ,
+      currentPage: 1,
+      pageSize: 10000,
+    } as PageInputAlarmFilterModel,
     /**分页总数 */
     total: 0,
   } )
   
-//   /**初始化 */
-//   const init = async () => {
-//     sdkData.loading = true
-//     const query = flattenObject({ Filter: sdkData.Filter})
-//     const res:any = await new OilSdkAuthorAPI().getPageData({...sdkData.pageInput, ...query}).catch(() => {
-//       sdkData.loading = false
-//     })
-//     sdkData.tableModel = res?.data?.list ?? []
-//     sdkData.total = res?.data?.total ?? 0
-//     sdkData.loading = false
-//   }
+  /**初始化 */
+  const init = async () => {
+    Data.loading = true
+    const res:any = await new AlarmApi().getPage({...Data.pageInput, filter:Data.Filter})
+    Data.tableModel = res?.data?.list ?? []
+    Data.total = res?.data?.total ?? 0
+    Data.loading = false
+  }
   
-//   onMounted(() => {
-//     init()
-//     eventBus.off('refreshView')
-//     eventBus.on('refreshView', async () => {
-//       init()
-//     })
-//   })
+  onMounted(() => {
+    init()
+  })
   
-//   onBeforeMount(() => {
-//     eventBus.off('refreshView')
-//   })
   
-//   /**
-//    * 监听时间变换
-//    */
-//   watch(() => sdkData.time, (newVal ) => {
-//     if(newVal.length === 0){
-//       return
-//     }
-//     sdkData.Filter.BeginTime = newVal?.[0].toString()
-//     sdkData.Filter.EndTime = newVal?.[1].toString()
-//   })
+  /**
+   * 监听时间变换
+   */
+  watch(() => Data.time, (newVal ) => {
+    if(newVal.length === 0){
+      return
+    }
+    Data.Filter.CreateBeginTime = newVal?.[0].toString()
+    Data.Filter.CreateEndTime = newVal?.[1].toString()
+  })
   
-//   /**条件查询 */
-//   const onQuery = () => {
-//     init()
-//   }
+  /**条件查询 */
+  const onQuery = () => {
+    init()
+  }
   
   /**重置查询条件 */
-//   const resetQuery = () => {
-//     sdkData.Filter.OilCompanies = ''
-//     sdkData.Filter.AntiCheatingState = ''
-//     sdkData.Filter.OilGunState = ''
-//     sdkData.Filter.SiteAddress = ''
-//     sdkData.Filter.Manufacturer =  ''
-//     sdkData.Filter.OutBeginTime = ''
-//     sdkData.Filter.OutEndTime = ''
-//     sdkData.Filter.CreateBeginTime = ''
-//     sdkData.Filter.CreateEndTime = ''
-//     sdkData.time = ''
-//     sdkData.pageInput.CurrentPage = 1
-//   }
+  const resetQuery = () => {
+    Data.Filter.fuelld = ''
+    Data.Filter.gasStation = ''
+    Data.Filter.name = ''
+    Data.Filter.serialNumber = ''
+    Data.Filter.alarmSource =  ''
+    Data.Filter.alarmType = ''
+    Data.Filter.alarmDescription = ''
+    Data.Filter.alarmDevice = ''
+    Data.Filter.nozzleControlName = ''
+    Data.Filter.CreateBeginTime = ''
+    Data.Filter.CreateEndTime = ''
+    Data.time = ''
+    Data.pageInput.currentPage = 1
+    Data.pageInput.pageSize = 10000
+  }
   
-//   /**重置 */
-//   const onReset = () => {
-//     resetQuery()
-//     init()
-//   }
+  /**重置 */
+  const onReset = () => {
+    resetQuery()
+    init()
+  }
+
+   /**
+ * 页条变化
+ * @param val
+ */
+const onSizeChange = (val: number) => {
+  Data.pageInput.pageSize = val
+  init()
+}
+
+/**
+ * 页数 变化
+ * @param val
+ */
+const onCurrentChange = (val: number) => {
+  Data.pageInput.currentPage = val
+  init()
+}
   
 
   

admin.ui.plus-master/src/views/admin/statement/alarmRules/components/form-add.vue

@@ -37,7 +37,7 @@
             </el-col>
             <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
               <el-form-item label="发送名单" prop="key">
-                <el-input v-model="formData.editData.key" placeholder="请输入授权码" clearable></el-input>
+                <el-input v-model="formData.editData.key" placeholder="请输入发送名单" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -76,7 +76,8 @@
           <span class="dialog-footer">
             <el-button @click="onCancel" icon="ele-CircleClose" size="default">取 消</el-button>
             <!-- 表单的确认提交按钮 -->
-            <el-button type="primary" :icon="formData.editIcon" @click="onSubmit" size="default">{{formData.buttonText}}</el-button>
+            <el-button type="primary" :icon="formData.editIcon" @click="onSubmit" size="default">确定</el-button>
+            <!--{{formData.buttonText}}  -->
           </span>
         </template>
       </el-dialog>
@@ -136,23 +137,30 @@
   /**表单校验*/
   const rules = reactive<FormRules>({
     oilStation: [
-      { required: true, message: '请输入油站名称', trigger: 'blur' },
+      { required: true, message: '请输入规则名称', trigger: 'blur' },
     ],
     projectName: [
-      { required: true, message: '请输入项目名称', trigger: 'blur' },
+      { required: true, message: '请输入状态', trigger: 'blur' },
     ],
     sn: [
-      { required: true, message: '请输入设备SN号', trigger: 'blur' },
+      { required: true, message: '请输入匹配关键字', trigger: 'blur' },
     ],
     key: [
-      { required: true, message: '请输入设备授权码', trigger: 'blur' },
+      { required: true, message: '请输入发送名单', trigger: 'blur' },
     ],
-    expiedTime: [
-      { type: 'date', required: true, message: '请选择失效期', trigger: 'blur' },
+    key1: [
+      { required: true, message: '请输入发生记录', trigger: 'blur' },
+    ],
+    key2: [
+      { type: 'date',required: true, message: '请输入启用时间', trigger: 'blur' },
+      { validator: validateDate, trigger: 'blur' }
+    ],
+    key3: [
+      { type: 'date',required: true, message: '请输入停用时间', trigger: 'blur' },
       { validator: validateDate, trigger: 'blur' }
     ],
     state: [
-      { required: true, message: '请选择状态', trigger: 'blur' },
+      { required: true, message: '请输入备注', trigger: 'blur' },
     ],
   })
   
@@ -225,8 +233,6 @@
 //     openDialog,
 //   })
 
-
-
 const openDialog = ()=>{
   console.log(111)
   formData.isShowDialog = true

admin.ui.plus-master/src/views/admin/statement/associationManagement/index.vue

@@ -0,0 +1,155 @@
+<template>
+    <div class="layout-pd" >
+      <el-row>
+        <!--操作-->
+        <el-col :xs="24" >
+          <el-card class="mt8"  shadow="hover" >
+            <el-form :model="Data.Filter" :inline="true" @submit.stop.prevent>
+              <el-form-item prop="name" style="width: 100%">
+                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
+                  <el-form-item label="用户名">
+                    <el-input v-model="Data.Filter.name"  placeholder="用户名" clearable></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
+                  <el-form-item>
+                    <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
+                    <el-button type="primary" icon="ele-RefreshRight" @click="onReset"> 重置 </el-button>
+                  </el-form-item>
+                </el-col>
+              </el-form-item>
+            </el-form>
+          </el-card>
+        </el-col>
+        <!--表格-->
+        <el-col  :xs="24" >
+          <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
+            <el-table ref="multipleTableRef"
+              v-loading="Data.loading"
+              stripe :data="Data.tableModel"
+              row-key="id"
+              style="width: 100%" >
+              <el-table-column v-for="column in Data.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label" />
+            </el-table>
+            <div class="my-flex my-flex-end" style="margin-top: 20px">
+              <el-pagination
+                v-model:currentPage="Data.pageInput.currentPage"
+                v-model:page-size="Data.pageInput.pageSize"
+                :total="Data.total"
+                :page-sizes="[10, 20, 50, 100]"
+                small
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                layout="total, sizes, prev, pager, next, jumper"
+              />
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+      <EditDialog ref="editDialogRef" />
+      <AuditDialog ref="auditDialogRef" />
+    </div>
+  
+  </template>
+  
+  <script setup lang="ts" name="authorize/fuelingsdk">
+  import {onMounted, reactive} from "vue";
+  import { ElTable } from 'element-plus'
+  import {associationFilterModel_SearchFilter, associationFilterModel, PageInputAssociationFilterModel} from "/@/api/admin/reportManagement/association/associationDto";
+  import {AssociationApi} from "/@/api/admin/reportManagement/association/associationApi";
+  
+  /**页面对象 */
+  const Data = reactive({
+    time:'',
+    /**加载显示 */
+    loading: false,
+    /**条件查询模块 */
+    Filter: {
+      name: "",
+    } as associationFilterModel_SearchFilter,
+    /**表格信息 */
+    tableModel: [] as Array<associationFilterModel>,
+    /**动态表头 */
+    dynamicColumns: [
+      { prop: 'name', label: '用户名' },
+      { prop: 'email', label: '邮箱' },
+      { prop: 'mobile', label: '手机号码' },
+      { prop: 'createdDate', label: '创建时间' },
+      { prop: 'modifiedDate', label: '修改时间' },
+      { prop: 'disable', label: '是否启用用户' },
+      { prop: 'isLock', label: '账户是否锁定' },
+    ],
+    /**分页标识 */
+    pageInput:{
+      currentPage: 1,
+      pageSize: 10,
+    } as PageInputAssociationFilterModel,
+    /**分页总数 */
+    total: 0,
+  } )
+  
+  /**初始化 */
+  const init = async () => {
+    Data.loading = true
+    const res:any = await new AssociationApi().getPage({...Data.pageInput, filter:Data.Filter})
+    console.log(Data.Filter)
+    Data.tableModel = res?.data?? []
+    Data.total = res?.length ?? 0
+    Data.loading = false
+  }
+  
+  onMounted(() => {
+    init()
+  })
+  
+  /**条件查询 */
+  const onQuery = () => {
+    init()
+  }
+  
+  /**重置查询条件 */
+  const resetQuery = () => {
+    Data.Filter.name = ''
+    Data.pageInput.currentPage = 1
+    Data.pageInput.pageSize = 10
+  }
+  
+  /**重置 */
+  const onReset = () => {
+    resetQuery()
+    init()
+  }
+
+  /**
+ * 页条变化
+ * @param val
+ */
+ const onSizeChange = (val: number) => {
+  Data.pageInput.pageSize = val
+  init()
+}
+
+/**
+ * 页数 变化
+ * @param val
+ */
+const onCurrentChange = (val: number) => {
+  Data.pageInput.currentPage = val
+  init()
+}
+  
+  </script>
+  
+  <style scoped lang="scss">
+  .my-el-link {
+    font-size: 14px;
+  }
+  .el-form .el-col.mb20 {
+    margin: 0 !important;
+  }
+  .el-input, .el-select {
+    width: 240px;
+  }
+  </style>
+  

admin.ui.plus-master/src/views/admin/statement/gasStationManagement/index.vue

@@ -4,26 +4,22 @@
         <!--操作-->
         <el-col :xs="24" >
           <el-card class="mt8"  shadow="hover" >
-            <el-form :model="sdkData.Filter" :inline="true" @submit.stop.prevent>
+            <el-form :model="Data.Filter" :inline="true" @submit.stop.prevent>
               <el-form-item prop="name" style="width: 100%">
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="石油公司">
-                    <el-input v-model="sdkData.Filter.OilCompanies"  placeholder="请输入石油公司" clearable></el-input>
+                  <el-form-item label="省份">
+                    <el-input v-model="Data.Filter.province"  placeholder="请输入省份" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="地址">
-                    <el-input v-model="sdkData.Filter.Address"  placeholder="请输入地址" clearable></el-input>
+                  <el-form-item label="加油站名称">
+                    <el-input v-model="Data.Filter.name"  placeholder="请输入加油站名称" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
                   <el-form-item>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item>
-                    <el-button type="primary" icon="ele-Search" @click="1"> 查询 </el-button>
-                    <el-button type="primary" icon="ele-RefreshRight" @click="1"> 重置 </el-button>
+                    <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
+                    <el-button type="primary" icon="ele-RefreshRight" @click="onReset"> 重置 </el-button>
                   </el-form-item>
                 </el-col>
               </el-form-item>
@@ -34,135 +30,119 @@
         <el-col  :xs="24" >
           <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
             <el-table ref="multipleTableRef"
-              v-loading="sdkData.loading"
-              stripe :data="sdkData.tableModel"
+              v-loading="Data.loading"
+              stripe :data="Data.tableModel"
               row-key="id"
               style="width: 100%" >
-              <el-table-column type="selection" width="50"></el-table-column>
-              <el-table-column v-for="column in sdkData.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label" />
+              <el-table-column v-for="column in Data.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label" />
             </el-table>
             <div class="my-flex my-flex-end" style="margin-top: 20px">
               <el-pagination
-                v-model:currentPage="sdkData.pageInput.CurrentPage"
-                v-model:page-size="sdkData.pageInput.PageSize"
-                :total="sdkData.total"
-                :page-sizes="[10000, 20000, 50000, 100000]"
+                v-model:currentPage="Data.pageInput.currentPage"
+                v-model:page-size="Data.pageInput.pageSize"
+                :total="Data.total"
+                :page-sizes="[10, 20, 50, 100]"
                 small
                 background
-                @size-change="1"
-                @current-change="1"
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
                 layout="total, sizes, prev, pager, next, jumper"
               />
             </div>
           </el-card>
         </el-col>
       </el-row>
-      <EditDialog ref="editDialogRef" />
-      <AuditDialog ref="auditDialogRef" />
     </div>
   
   </template>
   
   <script setup lang="ts" name="authorize/fuelingsdk">
-  import {defineAsyncComponent, onMounted, reactive, ref, watch, onBeforeMount,getCurrentInstance} from "vue";
-  import { ElTable } from 'element-plus'
+  import {onMounted, reactive} from "vue";
+  import {ElTable } from 'element-plus'
+  import {gasStationFilterModel_SearchFilter, gasStationFilterModel, PageInputgasStationFilterModel} from "/@/api/admin/reportManagement/gasStation/gasStationDto";
+  import {gasStationApi} from "/@/api/admin/reportManagement/gasStation/gasStationApi";
   /**引入组件*/
   
-  /**sdk授权页面对象 */
-  const sdkData = reactive({
+  /**页面对象 */
+  const Data = reactive({
     time:'',
     /**加载显示 */
     loading: false,
     /**条件查询模块 */
     Filter: {
-      /**石油公司 */
-      OilCompanies: "",
-      /**地址 */
-      Address: "",
-    } ,
+      /**省份 */
+      province: "",
+      /**加油站名称 */
+      name: "",
+    } as gasStationFilterModel_SearchFilter,
     /**表格信息 */
-    tableModel: [] ,
+    tableModel: [] as Array<gasStationFilterModel>,
     /**动态表头 */
     dynamicColumns: [
-      { prop: 'guid', label: '编号' },
-      { prop: 'province', label: '省份' },
-      { prop: 'oilCompanies', label: '石油公司' },
-      { prop: 'gasStation', label: '加油站名称' },
-      { prop: 'address', label: '地址' },
-      { prop: 'oilEngines', label: '加油机' },
-      { prop: 'oilGun', label: '油枪' },
+      { prop: 'name', label: '油站名称' },
+      { prop: 'type', label: '油站类型' },
+      { prop: 'address', label: '油站地址' },
+      { prop: 'dispensersTotal', label: '油机数量' },
+      { prop: 'nozzleControlsTotal', label: '油枪数量' },
     ],
     /**分页标识 */
     pageInput:{
-      CurrentPage: 1,
-      PageSize: 10000,
-    } ,
+      currentPage: 1,
+      pageSize: 10,
+    } as PageInputgasStationFilterModel,
     /**分页总数 */
     total: 0,
   } )
   
-//   /**初始化 */
-//   const init = async () => {
-//     sdkData.loading = true
-//     const query = flattenObject({ Filter: sdkData.Filter})
-//     const res:any = await new OilSdkAuthorAPI().getPageData({...sdkData.pageInput, ...query}).catch(() => {
-//       sdkData.loading = false
-//     })
-//     sdkData.tableModel = res?.data?.list ?? []
-//     sdkData.total = res?.data?.total ?? 0
-//     sdkData.loading = false
-//   }
-  
-//   onMounted(() => {
-//     init()
-//     eventBus.off('refreshView')
-//     eventBus.on('refreshView', async () => {
-//       init()
-//     })
-//   })
-  
-//   onBeforeMount(() => {
-//     eventBus.off('refreshView')
-//   })
+  /**初始化 */
+  const init = async () => {
+    Data.loading = true
+    const res:any = await new gasStationApi().getPage({...Data.pageInput, filter:Data.Filter})
+    Data.tableModel = res?.data ?? []
+    Data.total = res?.length ?? 0
+    Data.loading = false
+  }
   
-//   /**
-//    * 监听时间变换
-//    */
-//   watch(() => sdkData.time, (newVal ) => {
-//     if(newVal.length === 0){
-//       return
-//     }
-//     sdkData.Filter.BeginTime = newVal?.[0].toString()
-//     sdkData.Filter.EndTime = newVal?.[1].toString()
-//   })
+  onMounted(() => {
+    init()
+  })
   
-//   /**条件查询 */
-//   const onQuery = () => {
-//     init()
-//   }
+  /**条件查询 */
+  const onQuery = () => {
+    init()
+  }
   
   /**重置查询条件 */
-//   const resetQuery = () => {
-//     sdkData.Filter.OilCompanies = ''
-//     sdkData.Filter.AntiCheatingState = ''
-//     sdkData.Filter.OilGunState = ''
-//     sdkData.Filter.SiteAddress = ''
-//     sdkData.Filter.Manufacturer =  ''
-//     sdkData.Filter.OutBeginTime = ''
-//     sdkData.Filter.OutEndTime = ''
-//     sdkData.Filter.CreateBeginTime = ''
-//     sdkData.Filter.CreateEndTime = ''
-//     sdkData.time = ''
-//     sdkData.pageInput.CurrentPage = 1
-//   }
-  
-//   /**重置 */
-//   const onReset = () => {
-//     resetQuery()
-//     init()
-//   }
+  const resetQuery = () => {
+    Data.Filter.name = ''
+    Data.Filter.province = ''
+    Data.pageInput.pageSize = 10
+    Data.pageInput.currentPage = 1
+  }
   
+  /**重置 */
+  const onReset = () => {
+    resetQuery()
+    init()
+  }
+
+    /**
+ * 页条变化
+ * @param val
+ */
+const onSizeChange = (val: number) => {
+  Data.pageInput.pageSize = val
+  init()
+}
 
+/**
+ * 页数 变化
+ * @param val
+ */
+const onCurrentChange = (val: number) => {
+  Data.pageInput.currentPage = val
+  init()
+}
   
   </script>
   

admin.ui.plus-master/src/views/admin/statement/partsManagement/encScreen/index.vue

@@ -7,50 +7,28 @@
             <el-form :model="Data.Filter" :inline="true" @submit.stop.prevent>
               <el-form-item prop="name" style="width: 100%">
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="石油公司">
-                    <el-input v-model="Data.Filter.companyName"  placeholder="请输入石油公司" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="12" :xl="4" class="mb20">
-                  <el-form-item label="出厂时间">
-                    <el-date-picker
-                      v-model="Data.time1"
-                      type="datetimerange"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      range-separator="To"
-                      start-placeholder="Start date"
-                      end-placeholder="End date"
-                    />
+                  <el-form-item label="序列号">
+                    <el-input v-model="Data.Filter.sn"  placeholder="请输入序列号" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="站点地址">
-                    <el-input v-model="Data.Filter.stationName" placeholder="请输入站点地址" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="12" :xl="4" class="mb20">
-                  <el-form-item label="安装时间">
-                    <el-date-picker
-                      v-model="Data.time2"
-                      type="datetimerange"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      range-separator="To"
-                      start-placeholder="Start date"
-                      end-placeholder="End date"
-                    />
+                  <el-form-item label="在线状态">
+                    <el-select  v-model="Data.Filter.onlineStatus" placeholder="请选择在线状态" >
+                        <el-option v-for="(value, key) in selectList.Online" :key="key" :label="value"  :value="key" />
+                    </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="加密显示屏状态">
-                    <el-select  v-model="Data.Filter.deviceStatus" placeholder="请选择加密显示屏状态" >
-                        <el-option v-for="(value, key) in Data.statusList" :key="key" :label="value"  :value="key" />
+                  <el-form-item label="设备状态">
+                    <el-select  v-model="Data.Filter.deviceStatus" placeholder="请选择设备状态" >
+                        <el-option v-for="(value, key) in selectList.Device" :key="key" :label="value"  :value="key" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="加油机厂商">
-                    <el-select  v-model="Data.Filter.supplierName" placeholder="请选择加油机厂商" >
-                        <el-option v-for="(value, key) in Data.supplierList" :key="key" :label="value"  :value="key" />
+                  <el-form-item label="设备报警级别">
+                    <el-select  v-model="Data.Filter.deviceAlarmLevel" placeholder="请选择报警级别" >
+                        <el-option v-for="(value, key) in selectList.Level" :key="key" :label="value"  :value="key" />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -94,47 +72,36 @@
   </template>
   
   <script setup lang="ts" name="partsManagement/encScreen">
-  import {onMounted, reactive,watch} from "vue";
+  import {onMounted, reactive,ref,watch} from "vue";
   import {encScreenFilterModel_SearchFilter, encScreenFilterModel, PageInputEncScreenFilterModel} from "/@/api/admin/reportManagement/encScreen/encScreenDto";
   import {encScreenApi} from "/@/api/admin/reportManagement/encScreen/encScreenApi";
   
   /** 页面对象 */
   const Data = reactive({
-    time1:'',
-    time2:'',
-    /** 选择框列表 */
-    statusList : [] as any,
-    supplierList : [] as any,
     /**加载显示 */
     loading: false,
     /**条件查询模块 */
-    Filter: {
-      /**石油公司 */
-      companyName: "",
-      /**加密显示屏状态 */
-      deviceStatus: "",
-      /**站点地址*/
-      stationName: "",
-      /**加油机厂商*/
-      supplierName: "",
-      /**出厂开始的时间 */
-      OutBeginTime: null,
-      /**出厂结束的时间 */
-      OutEndTime: null,
-      /**安装开始的时间 */
-      CreateBeginTime: null,
-      /**安装结束的时间 */
-      CreateEndTime: null,
-    }  as encScreenFilterModel_SearchFilter ,
+    Filter:{
+      /**设备类型 */
+      deviceType:"DisplayControls",
+      /**在线状态 */
+      onlineStatus:"",
+      /**设备状态 */
+      deviceStatus:"",
+      /**序列号 */
+      sn:"",
+      /**设备报警级别 */
+      deviceAlarmLevel:""
+    } as encScreenFilterModel_SearchFilter,
     /**表格信息 */
     tableModel: [] as Array<encScreenFilterModel>,
     /**动态表头 */
     dynamicColumns: [
+      { prop: 'sn', label: '序列号' },
       { prop: 'companyName', label: '石油公司' },
       { prop: 'stationName', label: '加油站名称' },
       { prop: 'supplierName', label: '加油机厂商' },
       { prop: 'manufacturerName', label: '加密显示屏厂商' },
-      { prop: 'fuelID', label: '油机号' },
       { prop: 'nozzleconName', label: '油枪号' },
       { prop: 'uuid', label: '加密显示屏编号' },
       { prop: 'deviceStatus', label: '加密显示屏状态' },
@@ -150,6 +117,18 @@
     /**分页总数 */
     total: 0,
   } )
+
+    /** 选择框列表 */
+  const selectList = reactive({
+  Online : ["在线","离线"],
+  Device : [
+  "启用",
+  "备案",
+  "维修",
+  "出厂注册"],
+  Level :[1,2,3,4,5]
+
+})
   
   /**初始化 */
   const init = async () => {
@@ -160,32 +139,12 @@
     Data.tableModel = res?.data ?? []
     Data.total = res?.data?.length ?? 0
     Data.loading = false
-
-    // 筛选出 选择框列表内容
-    const aList = res?.data.map((item: { supplierName: any; }) => item.supplierName)
-    const bList = res?.data.map((item: { deviceStatus: any; }) => item.deviceStatus)
-    const getUniqueArray = (arr: Iterable<unknown> | null | undefined) => [...new Set( arr)]
-    Data.supplierList = getUniqueArray(aList)
-    Data.statusList = getUniqueArray(bList)
   }
   
   onMounted(() => {
     init()
   })
   
-  /**
-   * 监听时间变换
-   */
-  watch(() => [Data.time1,Data.time2], (newVal ) => {
-    if(newVal.length === 0){
-      return
-    }
-    Data.Filter.OutBeginTime = newVal?.[0]?.[0]
-    Data.Filter.OutEndTime = newVal?.[0]?.[1]
-    Data.Filter.CreateBeginTime = newVal?.[1]?.[0]
-    Data.Filter.CreateEndTime = newVal?.[1]?.[1]
-  })
-  
   /**条件查询 */
   const onQuery = () => {
     init()
@@ -193,17 +152,12 @@
   
   /**重置查询条件 */
   const resetQuery = () => {
-    Data.Filter.companyName = ''
+    Data.Filter.onlineStatus = ''
     Data.Filter.deviceStatus = ''
-    Data.Filter.stationName = ''
-    Data.Filter.supplierName = ''
-    Data.Filter.OutBeginTime = ''
-    Data.Filter.OutEndTime = ''
-    Data.Filter.CreateBeginTime = ''
-    Data.Filter.CreateEndTime = ''
-    Data.time1 = ''
-    Data.time2 = ''
+    Data.Filter.sn = ''
+    Data.Filter.deviceAlarmLevel = ''
     Data.pageInput.CurrentPage = 1
+    Data.pageInput.PageSize = 10
   }
   
   /**重置 */

admin.ui.plus-master/src/views/admin/statement/partsManagement/encoder/index.vue

@@ -7,55 +7,29 @@
             <el-form :model="Data.Filter" :inline="true" @submit.stop.prevent>
               <el-form-item prop="name" style="width: 100%">
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="石油公司">
-                    <el-input v-model="Data.Filter.companyName"  placeholder="请输入石油公司" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="12" :xl="4" class="mb20">
-                  <el-form-item label="出厂时间">
-                    <el-date-picker
-                      v-model="Data.time1"
-                      type="datetimerange"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      range-separator="To"
-                      start-placeholder="Start date"
-                      end-placeholder="End date"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="站点地址">
-                    <el-input v-model="Data.Filter.stationName" placeholder="请输入站点地址" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="12" :xl="4" class="mb20">
-                  <el-form-item label="安装时间">
-                    <el-date-picker
-                      v-model="Data.time2"
-                      type="datetimerange"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      range-separator="To"
-                      start-placeholder="Start date"
-                      end-placeholder="End date"
-                    />
+                  <el-form-item label="序列号">
+                    <el-input v-model="Data.Filter.sn"  placeholder="请输入序列号" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="编码器状态">
-                    <el-select  v-model="Data.Filter.deviceStatus" placeholder="请选择编码器状态" >
-                        <el-option v-for="(value, key) in Data.statusList" :key="key" :label="value"  :value="key" />
+                  <el-form-item label="在线状态">
+                    <el-select  v-model="Data.Filter.onlineStatus" placeholder="请选择在线状态" >
+                        <el-option v-for="(value, key) in selectList.Online" :key="key" :label="value"  :value="key" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="加油机厂商">
-                    <el-select  v-model="Data.Filter.supplierName" placeholder="请选择加油机厂商" >
-                        <el-option v-for="(value, key) in Data.supplierList" :key="key" :label="value"  :value="key" />
+                  <el-form-item label="设备状态">
+                    <el-select  v-model="Data.Filter.deviceStatus" placeholder="请选择设备状态" >
+                        <el-option v-for="(value, key) in selectList.Device" :key="key" :label="value"  :value="key" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item>
+                  <el-form-item label="设备报警级别">
+                    <el-select  v-model="Data.Filter.deviceAlarmLevel" placeholder="请选择报警级别" >
+                        <el-option v-for="(value, key) in selectList.Level" :key="key" :label="value"  :value="key" />
+                    </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
@@ -99,47 +73,38 @@
   </template>
   
   <script setup lang="ts" name="partsManagement/encoder">
-  import {onMounted, reactive, watch} from "vue";
+  import {onMounted, reactive, ref, watch} from "vue";
   import {encoderFilterModel_SearchFilter, encoderFilterModel, PageInputEncoderFilterModel} from "/@/api/admin/reportManagement/encoder/encoderDto";
   import {encoderApi} from "/@/api/admin/reportManagement/encoder/encoderApi";
 
   /** 页面对象 */
   const Data = reactive({
-    time1:'',
-    time2:'',
-    /** 选择框列表 */
-    statusList : [] as any,
-    supplierList : [] as any,
+
     /**加载显示 */
     loading: false,
     /**条件查询模块 */
-    Filter: {
-      /**石油公司 */
-      companyName: "",
-      /**编辑器状态 */
-      deviceStatus: "",
-      /**站点地址*/
-      stationName: "",
-      /**加油机厂商*/
-      supplierName: "",
-      /**出厂开始的时间 */
-      OutBeginTime: null,
-      /**出厂结束的时间 */
-      OutEndTime: null,
-      /**安装开始的时间 */
-      CreateBeginTime: null,
-      /**安装结束的时间 */
-      CreateEndTime: null,
+    Filter:{
+      /**设备类型 */
+      deviceType:"encoderControls",
+      /**在线状态 */
+      onlineStatus:"",
+      /**设备状态 */
+      deviceStatus:"",
+      /**序列号 */
+      sn:"",
+      /**设备报警级别 */
+      deviceAlarmLevel:""
     } as encoderFilterModel_SearchFilter,
+
     /**表格信息 */
     tableModel: [] as Array<encoderFilterModel>,
     /**动态表头 */
     dynamicColumns: [
+      { prop: 'sn', label: '序列号' },
       { prop: 'companyName', label: '石油公司' },
       { prop: 'stationName', label: '加油站名称' },
       { prop: 'supplierName', label: '加油机厂商' },
       { prop: 'manufacturerName', label: '编码器厂商' },
-      { prop: 'fuelID', label: '油机号' },
       { prop: 'nozzleconName', label: '油枪号' },
       { prop: 'uuid', label: '编码器编号' },
       { prop: 'deviceStatus', label: '编码器状态' },
@@ -155,6 +120,18 @@
     /**分页总数 */
     total: 0,
   } )
+/** 选择框列表 */
+const selectList = reactive({
+  Online : ["在线","离线"],
+  Device : [
+  "启用",
+  "备案",
+  "维修",
+  "出厂注册"],
+  Level :[1,2,3,4,5]
+
+})
+
 
 
 onMounted(() => {
@@ -169,12 +146,6 @@ onMounted(() => {
     Data.total = res?.data?.length ?? 0
     Data.loading = false
 
-    // 筛选出 选择框列表内容
-    const aList = res?.data.map((item: { supplierName: any; }) => item.supplierName)
-    const bList = res?.data.map((item: { deviceStatus: any; }) => item.deviceStatus)
-    const getUniqueArray = (arr: Iterable<unknown> | null | undefined) => [...new Set( arr)]
-    Data.supplierList = getUniqueArray(aList)
-    Data.statusList = getUniqueArray(bList)
   }
 
   /**条件查询 */
@@ -183,16 +154,11 @@ onMounted(() => {
   }
   /**重置查询条件 */
   const resetQuery = () => {
-    Data.Filter.companyName = ''
+    Data.Filter.onlineStatus = ''
     Data.Filter.deviceStatus = ''
-    Data.Filter.stationName = ''
-    Data.Filter.supplierName = ''
-    Data.Filter.OutBeginTime = ''
-    Data.Filter.OutEndTime = ''
-    Data.Filter.CreateBeginTime = ''
-    Data.Filter.CreateEndTime = ''
-    Data.time1 = ''
-    Data.time2 = ''
+    Data.Filter.sn = ''
+    Data.Filter.deviceAlarmLevel = ''
+    Data.pageInput.PageSize = 10
     Data.pageInput.CurrentPage = 1
   }
 
@@ -223,15 +189,15 @@ const onCurrentChange = (val: number) => {
   /**
    * 监听时间变换
    */
-  watch(() => [Data.time1,Data.time2], (newVal ) => {
-    if(newVal.length === 0){
-      return
-    }
-    Data.Filter.OutBeginTime = newVal?.[0]?.[0]
-    Data.Filter.OutEndTime = newVal?.[0]?.[1]
-    Data.Filter.CreateBeginTime = newVal?.[1]?.[0]
-    Data.Filter.CreateEndTime = newVal?.[1]?.[0]
-  })
+  // watch(() => [Data.time1,Data.time2], (newVal ) => {
+  //   if(newVal.length === 0){
+  //     return
+  //   }
+  //   Data.Filter.OutBeginTime = newVal?.[0]?.[0]
+  //   Data.Filter.OutEndTime = newVal?.[0]?.[1]
+  //   Data.Filter.CreateBeginTime = newVal?.[1]?.[0]
+  //   Data.Filter.CreateEndTime = newVal?.[1]?.[0]
+  // })
   
   </script>
   

admin.ui.plus-master/src/views/admin/statement/partsManagement/monitorCpu/index.vue

@@ -7,55 +7,29 @@
             <el-form :model="Data.Filter" :inline="true" @submit.stop.prevent>
               <el-form-item prop="name" style="width: 100%">
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="石油公司">
-                    <el-input v-model="Data.Filter.companyName"  placeholder="请输入石油公司" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="12" :xl="4" class="mb20">
-                  <el-form-item label="出厂时间">
-                    <el-date-picker
-                      v-model="Data.time1"
-                      type="datetimerange"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      range-separator="To"
-                      start-placeholder="Start date"
-                      end-placeholder="End date"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="站点地址">
-                    <el-input v-model="Data.Filter.stationName" placeholder="请输入站点地址" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="12" :xl="4" class="mb20">
-                  <el-form-item label="安装时间">
-                    <el-date-picker
-                      v-model="Data.time2"
-                      type="datetimerange"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      range-separator="To"
-                      start-placeholder="Start date"
-                      end-placeholder="End date"
-                    />
+                  <el-form-item label="序列号">
+                    <el-input v-model="Data.Filter.sn"  placeholder="请输入序列号" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="油机厂商">
-                    <el-select  v-model="Data.Filter.supplierName" placeholder="请选择加油机厂商" >
-                        <el-option v-for="(value, key) in Data.supplierList" :key="key" :label="value"  :value="key" />
+                  <el-form-item label="在线状态">
+                    <el-select  v-model="Data.Filter.onlineStatus" placeholder="请选择在线状态" >
+                        <el-option v-for="(value, key) in selectList.Online" :key="key" :label="value"  :value="key" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="状态">
-                    <el-select  v-model="Data.Filter.deviceStatus" placeholder="请选择监控微处理器状态" >
-                        <el-option v-for="(value, key) in Data.statusList" :key="key" :label="value"  :value="key" />
+                  <el-form-item label="设备状态">
+                    <el-select  v-model="Data.Filter.deviceStatus" placeholder="请选择设备状态" >
+                        <el-option v-for="(value, key) in selectList.Device" :key="key" :label="value"  :value="key" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item>
+                  <el-form-item label="设备报警级别">
+                    <el-select  v-model="Data.Filter.deviceAlarmLevel" placeholder="请选择报警级别" >
+                        <el-option v-for="(value, key) in selectList.Level" :key="key" :label="value"  :value="key" />
+                    </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
@@ -102,50 +76,40 @@
   import {onMounted, reactive,watch} from "vue";
   import {monitorCpuFilterModel_SearchFilter, monitorCpuFilterModel, PageInputMonitorCpuFilterModel} from "/@/api/admin/reportManagement/monitorCpu/monitorCpuDto";
   import {monitorCpuApi} from "/@/api/admin/reportManagement/monitorCpu/monitorCpuApi";
+  import { ref } from "vue";
   
   /** 对象 */
   const Data = reactive({
-    time1:'',
-    time2:'',
-    /** 选择框列表 */
-    statusList : [] as any,
-    supplierList : [] as any,
     /**加载显示 */
     loading: false,
     /**条件查询模块 */
-    Filter: {
-      /**石油公司 */
-      companyName: "",
-      /**监控微处理器状态 */
-      deviceStatus: "",
-      /**站点地址*/
-      stationName: "",
-      /**加油机厂商*/
-      supplierName: "",
-      /**出厂开始的时间 */
-      OutBeginTime: null,
-      /**出厂结束的时间 */
-      OutEndTime: null,
-      /**安装开始的时间 */
-      CreateBeginTime: null,
-      /**安装结束的时间 */
-      CreateEndTime: null,
-    } as monitorCpuFilterModel_SearchFilter,
+    Filter:{
+      /**设备类型 */
+      deviceType:"monitoring",
+      /**在线状态 */
+      onlineStatus:"",
+      /**设备状态 */
+      deviceStatus:"",
+      /**序列号 */
+      sn:"",
+      /**设备报警级别 */
+      deviceAlarmLevel:""
+    }  as monitorCpuFilterModel_SearchFilter,
     /**表格信息 */
     tableModel: [] as Array<monitorCpuFilterModel>,
     /**动态表头 */
     dynamicColumns: [
+      { prop: 'sn', label: '序列号' },
       { prop: 'companyName', label: '石油公司' },
       { prop: 'stationName', label: '加油站名称' },
       { prop: 'supplierName', label: '加油机厂商' },
       { prop: 'manufacturerName', label: '监控微处理器厂商' },
-      { prop: 'fuelID', label: '油机号' },
       { prop: 'nozzleconName', label: '油枪号' },
       { prop: 'uuid', label: '监控微处理器编号' },
       { prop: 'deviceStatus', label: '监控微处理器状态' },
-      { prop: 'onlineState', label: '在线状态' },
-      { prop: 'createTime', label: '安装时间' },
-      { prop: 'outTime', label: '出厂时间' },
+      { prop: 'onlineStatus', label: '在线状态' },
+      { prop: 'soldTime', label: '安装时间' },
+      { prop: 'productTime', label: '出厂时间' },
     ],
     /**分页标识 */
     pageInput:{
@@ -155,6 +119,18 @@
     /**分页总数 */
     total: 0,
   } )
+      /** 选择框列表 */
+  const selectList = reactive({
+  Online : ["在线","离线"],
+  Device : [
+  "启用",
+  "备案",
+  "维修",
+  "出厂注册"],
+  Level :[1,2,3,4,5]
+
+})
+
 
   /**初始化 */
   const init = async () => {
@@ -166,30 +142,12 @@
     Data.total = res?.data?.length ?? 0
     Data.loading = false
 
-    // 筛选出 选择框列表内容
-    let aList = res?.data.map((item: { supplierName: any; }) => item.supplierName)
-    let bList = res?.data.map((item: { deviceStatus: any; }) => item.deviceStatus)
-    const getUniqueArray = (arr: Iterable<unknown> | null | undefined) => [...new Set(arr)]
-    Data.supplierList = getUniqueArray(aList)
-    Data.statusList = getUniqueArray(bList)
   }
   
   onMounted(() => {
     init()
   })
-  
-  /**
-   * 监听时间变换
-   */
-  watch(() => [Data.time1,Data.time2], (newVal ) => {
-    if(newVal.length === 0){
-      return
-    }
-    Data.Filter.OutBeginTime = newVal?.[0]?.[0]
-    Data.Filter.OutEndTime = newVal?.[0]?.[1]
-    Data.Filter.CreateBeginTime = newVal?.[1]?.[0]
-    Data.Filter.CreateEndTime = newVal?.[1]?.[1]
-  })
+
   
   /**条件查询 */
   const onQuery = () => {
@@ -198,17 +156,12 @@
   
   /**重置查询条件 */
   const resetQuery = () => {
-    Data.Filter.companyName = ''
+    Data.Filter.onlineStatus = ''
     Data.Filter.deviceStatus = ''
-    Data.Filter.stationName = ''
-    Data.Filter.supplierName = ''
-    Data.Filter.OutBeginTime = ''
-    Data.Filter.OutEndTime = ''
-    Data.Filter.CreateBeginTime = ''
-    Data.Filter.CreateEndTime = ''
-    Data.time1 = ''
-    Data.time2 = ''
+    Data.Filter.sn = ''
+    Data.Filter.deviceAlarmLevel = ''
     Data.pageInput.CurrentPage = 1
+    Data.pageInput.PageSize = 10
   }
   
   /**重置 */

admin.ui.plus-master/src/views/admin/statement/partsManagement/oilGun/index.vue

@@ -11,29 +11,28 @@
                     <el-input v-model="Data.Filter.CompanyName"  placeholder="请输入石油公司" clearable></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="12" :xl="4" class="mb20">
-                  <el-form-item label="出厂时间">
-                    <el-date-picker
-                      v-model="Data.time1"
-                      type="datetimerange"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      range-separator="To"
-                      start-placeholder="Start date"
-                      end-placeholder="End date"
-                    />
+                
+                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
+                  <el-form-item label="油枪号">
+                    <el-input v-model="Data.Filter.name"  placeholder="请输入油枪号" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="油枪状态">
-                    <el-select  v-model="Data.Filter.OilGunState" placeholder="请选择油枪状态">
-                        <el-option v-for="(value, key) in 1" :key="key" :label="value"  :value="key" />
-                    </el-select>
+                  <el-form-item label="加油站名称">
+                    <el-input v-model="Data.Filter.StationName" placeholder="请输入加油站名称" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="安装时间">
+                  <el-form-item label="在线状态">
+                    <el-select  v-model="Data.Filter.onlineStatus" placeholder="请选择在线状态" >
+                        <el-option v-for="(value, key) in selectList.Online" :key="key" :label="value"  :value="value" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="12" :xl="4" class="mb20">
+                  <el-form-item label="出厂时间">
                     <el-date-picker
-                      v-model="Data.time2"
+                      v-model="Data.time1"
                       type="datetimerange"
                       value-format="YYYY-MM-DD HH:mm:ss"
                       range-separator="To"
@@ -42,29 +41,6 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item >
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="站点地址">
-                    <el-input v-model="Data.Filter.StationName" placeholder="请输入站点地址" clearable></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="加油机厂商">
-                    <el-select  v-model="Data.Filter.SupplierName" placeholder="请选择加油机厂商" >
-                        <el-option v-for="(value, key) in Data.supplierList" :key="key" :label="value"  :value="key" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
-                  <el-form-item label="防作弊启用状态">
-                    <el-select  v-model="Data.Filter.CheatStatus" placeholder="请选择防作弊启用状态" >
-                        <el-option v-for="(value, key) in Data.statusList" :key="key" :label="value"  :value="key" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
                   <el-form-item>
                     <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
@@ -110,10 +86,10 @@
   import {oilGunFilterModel_SearchFilter, oilGunFilterModel, PageInputoilGunFilterModel} from "/@/api/admin/reportManagement/oilGun/oilGunDto";
   import {OilGunApi} from "/@/api/admin/reportManagement/oilGun/oilGunApi";
 
+  
   /**页面对象 */
   const Data = reactive({
     time1:'',
-    time2:'',
     /** 选择框列表 */
     statusList : [] as any,
     supplierList : [] as any,
@@ -121,24 +97,18 @@
     loading: false,
     /**条件查询模块 */
     Filter: {
+      /**油枪号 */
+      name:"",
+      /**加油站名称 */
+      StationName: "",
       /**石油公司 */
       CompanyName: "",
-      /**防作弊启用状态 */
-      CheatStatus: "",
-      /**油枪状态 */
-      OilGunState: "",  // 接口未添加该内容
-      /**站点地址*/
-      StationName: "",
-      /**加油机厂商*/
-      SupplierName: "",
+      /**在线状态 */
+      onlineStatus:"",
       /**出厂开始的时间 */
       OutBeginTime: "",
       /**出厂结束的时间 */
       OutEndTime: "",
-      /**安装开始的时间 */
-      CreateBeginTime: "",
-      /**安装结束的时间 */
-      CreateEndTime: "",
     } as oilGunFilterModel_SearchFilter,
     /**表格信息 */
     tableModel: [] as Array<oilGunFilterModel>,
@@ -169,6 +139,18 @@
     } as PageInputoilGunFilterModel,
     })
 
+/** 选择框列表 */
+const selectList = reactive({
+  Online : ["在线","离线"],
+  Device : [
+  "启用",
+  "备案",
+  "维修",
+  "出厂注册"],
+  Level :[1,2,3,4,5]
+
+})
+
 onMounted(() => {
   init()
 })
@@ -177,16 +159,10 @@ onMounted(() => {
 const init = async () => {
   Data.loading = true
   const res:any = await new OilGunApi().getPage({...Data.pageInput, filter:Data.Filter})
+  console.log(res)
   Data.tableModel = res?.data ?? []
   Data.total = res?.data?.length ?? 0
   Data.loading = false
-  
-  // 筛选出 选择框列表内容
-  const aList = res?.data.map((item: { supplierName: any; }) => item.supplierName)
-  const bList = res?.data.map((item: { cheatStatus: any; }) => item.cheatStatus)
-  const getUniqueArray = (arr: Iterable<unknown> | null | undefined) => [...new Set( arr)];
-  Data.supplierList = getUniqueArray(aList)
-  Data.statusList = getUniqueArray(bList)
 }
 
 const onQuery = () =>{
@@ -195,18 +171,15 @@ const onQuery = () =>{
 
   /**重置查询条件 */
   const resetQuery = () => {
-    Data.Filter.CompanyName = ''
-    Data.Filter.CheatStatus = ''
-    Data.Filter.OilGunState = ''
     Data.Filter.StationName = ''
-    Data.Filter.SupplierName =  ''
+    Data.Filter.CompanyName = ''
+    Data.Filter.onlineStatus = ''
     Data.Filter.OutBeginTime = ''
     Data.Filter.OutEndTime = ''
-    Data.Filter.CreateBeginTime = ''
-    Data.Filter.CreateEndTime = ''
+    Data.Filter.name = ''
     Data.time1 = ''
-    Data.time2 = ''
     Data.pageInput.currentPage = 1
+    Data.pageInput.pageSize = 10
   }
     /**重置 */
   const onReset = () => {
@@ -235,14 +208,12 @@ const onCurrentChange = (val: number) => {
   /**
    * 监听时间变换
    */
-  watch(() => [Data.time1,Data.time2], (newVal) => {
+  watch(() => Data.time1, (newVal) => {
     if(newVal.length === 0){
     return
     }
-    Data.Filter.OutBeginTime = newVal[0]?.[0]
-    Data.Filter.OutEndTime = newVal[0]?.[1]
-    Data.Filter.CreateBeginTime = newVal[1]?.[0]
-    Data.Filter.CreateEndTime = newVal[1]?.[1]
+    Data.Filter.OutBeginTime = newVal[0]?.[0] ?? ''
+    Data.Filter.OutEndTime = newVal[0]?.[1] ?? ''
   })
 
   </script>

admin.ui.plus-master/src/views/admin/statement/sendMessage/index.vue

@@ -0,0 +1,110 @@
+<template>
+    <div class="layout-pd" >
+      <el-row>
+        <!--操作-->
+        <el-col :xs="24" >
+          <el-card style="text-align: center;font-weight: 600;font-size: large;">
+            信息发送列表
+          </el-card>
+        </el-col>
+        <!--表格-->
+        <el-col  :xs="24" >
+          <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
+            <el-table ref="multipleTableRef"
+              v-loading="Data.loading"
+              stripe :data="Data.tableModel"
+              row-key="id"
+              style="width: 100%" >
+              <el-table-column v-for="column in Data.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label" />
+            </el-table>
+            <div class="my-flex my-flex-end" style="margin-top: 20px">
+              <el-pagination
+                v-model:currentPage="Data.pageInput.currentPage"
+                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"
+              />
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>
+  
+  </template>
+  
+  <script setup lang="ts" name="partsManagement/oilGun">
+  import {onMounted, reactive, watch} from "vue";
+
+  
+  /**页面对象 */
+  const Data = reactive({
+    /** 选择框列表 */
+    statusList : [] as any,
+    supplierList : [] as any,
+    /**加载显示 */
+    loading: false,
+    /**条件查询模块 */
+    
+    /**表格信息 */
+    tableModel: [],
+    /**动态表头 */
+    dynamicColumns: [
+      { prop: '', label: '发送ID' },
+      { prop: '', label: '渠道' },
+      { prop: '', label: '手机号' },
+      { prop: '', label: '微信id' },
+      { prop: '', label: '发送时间' },
+      { prop: '', label: '发送内容' },
+      { prop: '', label: '规则id' },
+      { prop: '', label: '备注' },
+    ],
+    /**分页总数 */
+    total: 0,
+    /**分页标识 */
+    pageInput:{
+      currentPage: 1,
+      pageSize: 10,
+    },
+    })
+
+
+
+  /**
+ * 页条变化
+ * @param val
+ */
+const onSizeChange = (val: number) => {
+  Data.pageInput.pageSize = val
+//   init()
+}
+
+/**
+ * 页数 变化
+ * @param val
+ */
+const onCurrentChange = (val: number) => {
+  Data.pageInput.currentPage = val
+//   init()
+}
+  
+
+
+  </script>
+  
+  <style scoped lang="scss">
+  .my-el-link {
+    font-size: 14px;
+  }
+  .el-form .el-col.mb20 {
+    margin: 0 !important;
+  }
+  .el-input, .el-select {
+    width: 240px;
+  }
+  </style>
+