Browse Source

调整样式

Your Name 1 tháng trước cách đây
mục cha
commit
5a394fc8bd

+ 2 - 2
admin.ui.plus-master/.env.production

@@ -9,7 +9,7 @@ VITE_PUBLIC_PATH = '/'
 
 # 线上环境接口地址
 # VITE_API_URL = 'http://ipos.biz:8070'
- VITE_API_URL = 'http://localhost:8000'
-#VITE_API_URL = 'http://dev.hsfuel.com:8070'
+# VITE_API_URL = 'http://localhost:8000'
+VITE_API_URL = 'http://dev.hsfuel.com:8070'
 # VITE_API_URL = 'http://47.101.220.106:8070'
 # VITE_API_URL = 'http://ipos.biz:8070'

+ 1 - 1
admin.ui.plus-master/src/api/admin/reportManagement/BlackBox/BlackBoxapi.ts

@@ -14,7 +14,7 @@ import { AxiosResponse } from 'axios'
 getList = (query:PageInput ,params: RequestParams = {}) : any  =>
       this.request<BlackBoxDto,any>({
         path:'/api/app/fuel-dispenser/get-black-box-list',
-        method: 'GET',
+        method: 'Post',
         query:query,
         secure: true,
         format: 'json',

+ 23 - 0
admin.ui.plus-master/src/api/admin/reportManagement/displayControl/displayControlapi.ts

@@ -0,0 +1,23 @@
+import { AxiosResponse } from 'axios'
+  import { ContentType, HttpClient, RequestParams } from "/@/api/admin/http-client";
+  import {PageInput,encodercontrolsDto} from "/@/api/admin/reportManagement/encodercontrols/encodercontrolsdto";
+  export class Api<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
+    /**
+   * No description
+   *
+   * @tags
+   * @name GetList
+   * @summary 查询列表
+   * @request GET:'/api/app/fuel-dispenser/get-black-box-list'
+   * @secure
+   */
+getList = (query:PageInput ,params: RequestParams = {}) : any  =>
+      this.request<encodercontrolsDto,any>({
+        path:'/api/app/fuel-dispenser/get-display-control-list',
+        method: 'Post',
+        query:query,
+        secure: true,
+        format: 'json',
+        ...params
+      })
+    }

+ 56 - 0
admin.ui.plus-master/src/api/admin/reportManagement/displayControl/displayControldto.ts

@@ -0,0 +1,56 @@
+/** 查询信息输出 */
+  export interface ResultOutputPageOutputencodercontrolsDto{
+  /** 是否成功标记 */
+  success?: boolean
+  /** 编码 */
+  code?: string | null
+  /** 消息 */
+  msg?: string | null
+  /** 数据 */
+ data?:PageOutputencodercontrolsDto[] | null
+}
+    export interface PageOutputencodercontrolsDto{
+      /**
+      * 数据总数
+      * @format int64
+      */
+      total?: number
+      /** 数据 */
+      list?: encodercontrolsDto[] | null
+    }
+    export interface encodercontrolsDto{
+   /** 石油公司 */
+      oilCompanyName?: string
+   /** 软件版本号 */
+      softwareVersion?: string
+   /** 硬件版本号 */
+      hardwareVersion?: string
+   /** 序列号 */
+      serialNumber?: string
+   /** 绑定加油机厂商 */
+      bindingDispenserManufacturer?: string
+   /** 部件出厂加油机厂商 */
+      componentManufacturer?: string
+   /** 加油站名称 */
+      stationName?: string
+   /** 安全装置厂家 */
+      safetyDeviceManufacturer?: string
+   /** 油机号 */
+      dispenserNumber?: integer
+   /** 油枪号 */
+      nozzleNumber?: integer
+   /** 安全装置状态 */
+      deviceStatus?: string
+      onlineStatus?: string
+   /** 安装时间 */
+      fixTime?: string
+   /** 出厂时间 */
+      soldTime?: string
+
+}
+export interface PageInput {
+      /**当前页数 */
+      currentPage?: number
+      /**展示页数 */
+      pageSize?: number
+    }

+ 23 - 0
admin.ui.plus-master/src/api/admin/reportManagement/encodercontrols/encodercontrolsapi.ts

@@ -0,0 +1,23 @@
+import { AxiosResponse } from 'axios'
+  import { ContentType, HttpClient, RequestParams } from "/@/api/admin/http-client";
+  import {PageInput,encodercontrolsDto} from "/@/api/admin/reportManagement/encodercontrols/encodercontrolsdto";
+  export class Api<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
+    /**
+   * No description
+   *
+   * @tags
+   * @name GetList
+   * @summary 查询列表
+   * @request GET:'/api/app/fuel-dispenser/get-black-box-list'
+   * @secure
+   */
+getList = (query:PageInput ,params: RequestParams = {}) : any  =>
+      this.request<encodercontrolsDto,any>({
+        path:'/api/app/fuel-dispenser/get-encodercontrols-list',
+        method: 'Post',
+        query:query,
+        secure: true,
+        format: 'json',
+        ...params
+      })
+    }

+ 56 - 0
admin.ui.plus-master/src/api/admin/reportManagement/encodercontrols/encodercontrolsdto.ts

@@ -0,0 +1,56 @@
+/** 查询信息输出 */
+  export interface ResultOutputPageOutputencodercontrolsDto{
+  /** 是否成功标记 */
+  success?: boolean
+  /** 编码 */
+  code?: string | null
+  /** 消息 */
+  msg?: string | null
+  /** 数据 */
+ data?:PageOutputencodercontrolsDto[] | null
+}
+    export interface PageOutputencodercontrolsDto{
+      /**
+      * 数据总数
+      * @format int64
+      */
+      total?: number
+      /** 数据 */
+      list?: encodercontrolsDto[] | null
+    }
+    export interface encodercontrolsDto{
+   /** 石油公司 */
+      oilCompanyName?: string
+   /** 软件版本号 */
+      softwareVersion?: string
+   /** 硬件版本号 */
+      hardwareVersion?: string
+   /** 序列号 */
+      serialNumber?: string
+   /** 绑定加油机厂商 */
+      bindingDispenserManufacturer?: string
+   /** 部件出厂加油机厂商 */
+      componentManufacturer?: string
+   /** 加油站名称 */
+      stationName?: string
+   /** 安全装置厂家 */
+      safetyDeviceManufacturer?: string
+   /** 油机号 */
+      dispenserNumber?: integer
+   /** 油枪号 */
+      nozzleNumber?: integer
+   /** 安全装置状态 */
+      deviceStatus?: string
+      onlineStatus?: string
+   /** 安装时间 */
+      fixTime?: string
+   /** 出厂时间 */
+      soldTime?: string
+
+}
+export interface PageInput {
+      /**当前页数 */
+      currentPage?: number
+      /**展示页数 */
+      pageSize?: number
+    }

+ 23 - 0
admin.ui.plus-master/src/api/admin/reportManagement/taxcontrol/taxcontrolapi.ts

@@ -0,0 +1,23 @@
+import { AxiosResponse } from 'axios'
+  import { ContentType, HttpClient, RequestParams } from "/@/api/admin/http-client";
+  import {PageInput,encodercontrolsDto} from "/@/api/admin/reportManagement/encodercontrols/encodercontrolsdto";
+  export class Api<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
+    /**
+   * No description
+   *
+   * @tags
+   * @name GetList
+   * @summary 查询列表
+   * @request GET:'/api/app/fuel-dispenser/get-black-box-list'
+   * @secure
+   */
+getList = (query:PageInput ,params: RequestParams = {}) : any  =>
+      this.request<encodercontrolsDto,any>({
+        path:'/api/app/fuel-dispenser/get-tax-control-list',
+        method: 'Post',
+        query:query,
+        secure: true,
+        format: 'json',
+        ...params
+      })
+    }

+ 56 - 0
admin.ui.plus-master/src/api/admin/reportManagement/taxcontrol/taxcontroldto.ts

@@ -0,0 +1,56 @@
+/** 查询信息输出 */
+  export interface ResultOutputPageOutputencodercontrolsDto{
+  /** 是否成功标记 */
+  success?: boolean
+  /** 编码 */
+  code?: string | null
+  /** 消息 */
+  msg?: string | null
+  /** 数据 */
+ data?:PageOutputencodercontrolsDto[] | null
+}
+    export interface PageOutputencodercontrolsDto{
+      /**
+      * 数据总数
+      * @format int64
+      */
+      total?: number
+      /** 数据 */
+      list?: encodercontrolsDto[] | null
+    }
+    export interface encodercontrolsDto{
+   /** 石油公司 */
+      oilCompanyName?: string
+   /** 软件版本号 */
+      softwareVersion?: string
+   /** 硬件版本号 */
+      hardwareVersion?: string
+   /** 序列号 */
+      serialNumber?: string
+   /** 绑定加油机厂商 */
+      bindingDispenserManufacturer?: string
+   /** 部件出厂加油机厂商 */
+      componentManufacturer?: string
+   /** 加油站名称 */
+      stationName?: string
+   /** 安全装置厂家 */
+      safetyDeviceManufacturer?: string
+   /** 油机号 */
+      dispenserNumber?: integer
+   /** 油枪号 */
+      nozzleNumber?: integer
+   /** 安全装置状态 */
+      deviceStatus?: string
+      onlineStatus?: string
+   /** 安装时间 */
+      fixTime?: string
+   /** 出厂时间 */
+      soldTime?: string
+
+}
+export interface PageInput {
+      /**当前页数 */
+      currentPage?: number
+      /**展示页数 */
+      pageSize?: number
+    }

+ 2 - 2
admin.ui.plus-master/src/views/admin/statement/BlackBox/index.vue

@@ -12,7 +12,7 @@
                   <el-input v-model="state.filter.OilCompanyName" placeholder="单行输入" clearable></el-input>
                 </el-form-item>
               </el-col>
-<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+<!-- <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
                 <el-form-item label="序列号">
                   <el-input v-model="state.filter.SerialNumber" placeholder="单行输入" clearable></el-input>
                 </el-form-item>
@@ -50,7 +50,7 @@
                     end-placeholder="End date"
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
 </el-form-item>
           </el-form>
 <div class="my-flex my-flex-start" >

+ 162 - 0
admin.ui.plus-master/src/views/admin/statement/displayControl/index.vue

@@ -0,0 +1,162 @@
+
+<template>
+  <div class="layout-pd">
+    <el-row>
+<!--操作-->
+      <el-col :xs="24" >
+        <el-card class="mt8"  shadow="hover" >
+<el-form :model="state.filter" :inline="true" @submit.stop.prevent>
+            <el-form-item prop="name" style="width: 100%">
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="石油公司">
+                  <el-input v-model="state.filter.OilCompanyName" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<!-- <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="序列号">
+                  <el-input v-model="state.filter.SerialNumber" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="绑定加油机厂商">
+                  <el-input v-model="state.filter.BindingDispenserManufacturer" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="安全装置状态">
+                  <el-input v-model="state.filter.DeviceStatus" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+            <el-form-item label="选择时间">
+                  <el-date-picker
+                    v-model="state.filter.FixTime"
+                    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="6" :xl="4" class="mb20">
+            <el-form-item label="选择时间">
+                  <el-date-picker
+                    v-model="state.filter.SoldTime"
+                    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-form-item>
+          </el-form>
+<div class="my-flex my-flex-start" >
+<el-button  type="primary" icon="ele-CirclePlus" @click="onQuery"> 查询 </el-button>
+</div>
+</el-card>
+      </el-col>
+<!--表格-->
+      <el-col  :xs="24" >
+        <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
+<el-table v-loading="state.loading" stripe :data="state.tableModel" row-key="id" style="width: 100%">
+        <el-table-column v-for="column in state.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label"  >
+        </el-table-column>
+</el-table>
+<div class="my-flex my-flex-end" style="margin-top: 20px">
+            <el-pagination
+              v-model:currentPage="state.pageInput.CurrentPage"
+              v-model:page-size="state.pageInput.PageSize"
+              :total="state.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>
+    </div>
+  </template>
+  <script setup lang="ts">
+  import {onBeforeMount, onMounted, reactive, ref, watch} from "vue";
+  import eventBus from "/@/utils/mitt";
+  import { PageInput,encodercontrolsDto } from "/@/api/admin/reportManagement/displayControl/displayControldto";
+  import {Api} from "/@/api/admin/reportManagement/displayControl/displayControlapi";
+/**数据对象*/
+  const state = reactive({
+    /**加载显示 */
+    loading: false,
+    /**条件查询模块 */
+      filter: {
+/**石油公司 */
+        OilCompanyName: "",
+/**序列号 */
+        SerialNumber: "",
+/**绑定加油机厂商 */
+        BindingDispenserManufacturer: "",
+/**安全装置状态 */
+        DeviceStatus: "",
+/**安装时间 */
+        FixTime: "",
+/**出厂时间 */
+        SoldTime: "",},
+  /**表格信息 */
+tableModel: [] as encodercontrolsDto,
+    /**动态表头 */
+    dynamicColumns: [
+{ prop: 'oilCompanyName', label: '石油公司' },
+{ prop: 'stationName', label: '加油站名称' },
+{ prop: 'serialNumber', label: '显示屏编号' },
+{ prop: 'bindingDispenserManufacturer', label: '绑定加油机厂商' },
+{ prop: 'componentManufacturer', label: '部件出厂加油机厂商' },
+{ prop: 'safetyDeviceManufacturer', label: '安全装置厂家' },
+{ prop: 'dispenserNumber', label: '油机号' },
+{ prop: 'nozzleNumber', label: '油枪号' },
+{ prop: 'deviceStatus', label: '显示屏状态' },
+{ prop: 'onlineStatus', label: '在线状态' },
+{ prop: 'fixTime', label: '安装时间' },
+{ prop: 'soldTime', label: '出厂时间' },],
+/**分页标识 */
+    pageInput:{
+      currentPage: 1,
+      pageSize: 10,
+    } as PageInput,
+    /**分页总数 */
+    total: 0,
+})
+  onMounted(() => {
+    init()
+    eventBus.off('refreshView')
+    eventBus.on('refreshView', async () => {
+      await init()
+    })
+    console.log()
+  })
+  onBeforeMount(() => {
+    eventBus.off('refreshView')
+  })
+  /**
+  * 监听变换
+  */
+  watch(() => {})
+/**条件查询 */
+          const onQuery = () => {
+          init()
+        }
+        /**初始化 */
+        const init = async () => {
+          state.loading = true
+const res:any = await new Api().getList({...state.pageInput, Filter:state.filter})
+            state.total = res?.data?.total ?? 0
+state.tableModel = res?.data?.list ?? []
+          state.loading = false
+        }
+</script>
+<style scoped lang="scss">
+  </style>

+ 162 - 0
admin.ui.plus-master/src/views/admin/statement/encodercontrols/index.vue

@@ -0,0 +1,162 @@
+
+<template>
+  <div class="layout-pd">
+    <el-row>
+<!--操作-->
+      <el-col :xs="24" >
+        <el-card class="mt8"  shadow="hover" >
+<el-form :model="state.filter" :inline="true" @submit.stop.prevent>
+            <el-form-item prop="name" style="width: 100%">
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="石油公司">
+                  <el-input v-model="state.filter.OilCompanyName" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<!-- <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="序列号">
+                  <el-input v-model="state.filter.SerialNumber" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="绑定加油机厂商">
+                  <el-input v-model="state.filter.BindingDispenserManufacturer" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="安全装置状态">
+                  <el-input v-model="state.filter.DeviceStatus" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+            <el-form-item label="选择时间">
+                  <el-date-picker
+                    v-model="state.filter.FixTime"
+                    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="6" :xl="4" class="mb20">
+            <el-form-item label="选择时间">
+                  <el-date-picker
+                    v-model="state.filter.SoldTime"
+                    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-form-item>
+          </el-form>
+<div class="my-flex my-flex-start" >
+<el-button  type="primary" icon="ele-CirclePlus" @click="onQuery"> 查询 </el-button>
+</div>
+</el-card>
+      </el-col>
+<!--表格-->
+      <el-col  :xs="24" >
+        <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
+<el-table v-loading="state.loading" stripe :data="state.tableModel" row-key="id" style="width: 100%">
+        <el-table-column v-for="column in state.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label"  >
+        </el-table-column>
+</el-table>
+<div class="my-flex my-flex-end" style="margin-top: 20px">
+            <el-pagination
+              v-model:currentPage="state.pageInput.CurrentPage"
+              v-model:page-size="state.pageInput.PageSize"
+              :total="state.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>
+    </div>
+  </template>
+  <script setup lang="ts">
+  import {onBeforeMount, onMounted, reactive, ref, watch} from "vue";
+  import eventBus from "/@/utils/mitt";
+  import { PageInput,encodercontrolsDto } from "/@/api/admin/reportManagement/encodercontrols/encodercontrolsdto";
+  import {Api} from "/@/api/admin/reportManagement/encodercontrols/encodercontrolsapi";
+/**数据对象*/
+  const state = reactive({
+    /**加载显示 */
+    loading: false,
+    /**条件查询模块 */
+      filter: {
+/**石油公司 */
+        OilCompanyName: "",
+/**序列号 */
+        SerialNumber: "",
+/**绑定加油机厂商 */
+        BindingDispenserManufacturer: "",
+/**安全装置状态 */
+        DeviceStatus: "",
+/**安装时间 */
+        FixTime: "",
+/**出厂时间 */
+        SoldTime: "",},
+  /**表格信息 */
+tableModel: [] as encodercontrolsDto,
+    /**动态表头 */
+    dynamicColumns: [
+{ prop: 'oilCompanyName', label: '石油公司' },
+{ prop: 'stationName', label: '加油站名称' },
+{ prop: 'serialNumber', label: '编码器编号' },
+{ prop: 'bindingDispenserManufacturer', label: '绑定加油机厂商' },
+{ prop: 'componentManufacturer', label: '部件出厂加油机厂商' },
+{ prop: 'safetyDeviceManufacturer', label: '安全装置厂家' },
+{ prop: 'dispenserNumber', label: '油机号' },
+{ prop: 'nozzleNumber', label: '油枪号' },
+{ prop: 'deviceStatus', label: '编码器状态' },
+{ prop: 'onlineStatus', label: '在线状态' },
+{ prop: 'fixTime', label: '安装时间' },
+{ prop: 'soldTime', label: '出厂时间' },],
+/**分页标识 */
+    pageInput:{
+      currentPage: 1,
+      pageSize: 10,
+    } as PageInput,
+    /**分页总数 */
+    total: 0,
+})
+  onMounted(() => {
+    init()
+    eventBus.off('refreshView')
+    eventBus.on('refreshView', async () => {
+      await init()
+    })
+    console.log()
+  })
+  onBeforeMount(() => {
+    eventBus.off('refreshView')
+  })
+  /**
+  * 监听变换
+  */
+  watch(() => {})
+/**条件查询 */
+          const onQuery = () => {
+          init()
+        }
+        /**初始化 */
+        const init = async () => {
+          state.loading = true
+const res:any = await new Api().getList({...state.pageInput, Filter:state.filter})
+            state.total = res?.data?.total ?? 0
+state.tableModel = res?.data?.list ?? []
+          state.loading = false
+        }
+</script>
+<style scoped lang="scss">
+  </style>

+ 162 - 0
admin.ui.plus-master/src/views/admin/statement/taxcontrol/index.vue

@@ -0,0 +1,162 @@
+
+<template>
+  <div class="layout-pd">
+    <el-row>
+<!--操作-->
+      <el-col :xs="24" >
+        <el-card class="mt8"  shadow="hover" >
+<el-form :model="state.filter" :inline="true" @submit.stop.prevent>
+            <el-form-item prop="name" style="width: 100%">
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="石油公司">
+                  <el-input v-model="state.filter.OilCompanyName" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<!-- <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="序列号">
+                  <el-input v-model="state.filter.SerialNumber" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="绑定加油机厂商">
+                  <el-input v-model="state.filter.BindingDispenserManufacturer" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="安全装置状态">
+                  <el-input v-model="state.filter.DeviceStatus" placeholder="单行输入" clearable></el-input>
+                </el-form-item>
+              </el-col>
+<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+            <el-form-item label="选择时间">
+                  <el-date-picker
+                    v-model="state.filter.FixTime"
+                    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="6" :xl="4" class="mb20">
+            <el-form-item label="选择时间">
+                  <el-date-picker
+                    v-model="state.filter.SoldTime"
+                    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-form-item>
+          </el-form>
+<div class="my-flex my-flex-start" >
+<el-button  type="primary" icon="ele-CirclePlus" @click="onQuery"> 查询 </el-button>
+</div>
+</el-card>
+      </el-col>
+<!--表格-->
+      <el-col  :xs="24" >
+        <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
+<el-table v-loading="state.loading" stripe :data="state.tableModel" row-key="id" style="width: 100%">
+        <el-table-column v-for="column in state.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label"  >
+        </el-table-column>
+</el-table>
+<div class="my-flex my-flex-end" style="margin-top: 20px">
+            <el-pagination
+              v-model:currentPage="state.pageInput.CurrentPage"
+              v-model:page-size="state.pageInput.PageSize"
+              :total="state.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>
+    </div>
+  </template>
+  <script setup lang="ts">
+  import {onBeforeMount, onMounted, reactive, ref, watch} from "vue";
+  import eventBus from "/@/utils/mitt";
+  import { PageInput,encodercontrolsDto } from "/@/api/admin/reportManagement/taxcontrol/taxcontroldto";
+  import {Api} from "/@/api/admin/reportManagement/taxcontrol/taxcontrolapi";
+/**数据对象*/
+  const state = reactive({
+    /**加载显示 */
+    loading: false,
+    /**条件查询模块 */
+      filter: {
+/**石油公司 */
+        OilCompanyName: "",
+/**序列号 */
+        SerialNumber: "",
+/**绑定加油机厂商 */
+        BindingDispenserManufacturer: "",
+/**安全装置状态 */
+        DeviceStatus: "",
+/**安装时间 */
+        FixTime: "",
+/**出厂时间 */
+        SoldTime: "",},
+  /**表格信息 */
+tableModel: [] as encodercontrolsDto,
+    /**动态表头 */
+    dynamicColumns: [
+{ prop: 'oilCompanyName', label: '石油公司' },
+{ prop: 'stationName', label: '加油站名称' },
+{ prop: 'serialNumber', label: '编码器编号' },
+{ prop: 'bindingDispenserManufacturer', label: '绑定加油机厂商' },
+{ prop: 'componentManufacturer', label: '部件出厂加油机厂商' },
+{ prop: 'safetyDeviceManufacturer', label: '安全装置厂家' },
+{ prop: 'dispenserNumber', label: '油机号' },
+{ prop: 'nozzleNumber', label: '油枪号' },
+{ prop: 'deviceStatus', label: '编码器状态' },
+{ prop: 'onlineStatus', label: '在线状态' },
+{ prop: 'fixTime', label: '安装时间' },
+{ prop: 'soldTime', label: '出厂时间' },],
+/**分页标识 */
+    pageInput:{
+      currentPage: 1,
+      pageSize: 10,
+    } as PageInput,
+    /**分页总数 */
+    total: 0,
+})
+  onMounted(() => {
+    init()
+    eventBus.off('refreshView')
+    eventBus.on('refreshView', async () => {
+      await init()
+    })
+    console.log()
+  })
+  onBeforeMount(() => {
+    eventBus.off('refreshView')
+  })
+  /**
+  * 监听变换
+  */
+  watch(() => {})
+/**条件查询 */
+          const onQuery = () => {
+          init()
+        }
+        /**初始化 */
+        const init = async () => {
+          state.loading = true
+const res:any = await new Api().getList({...state.pageInput, Filter:state.filter})
+            state.total = res?.data?.total ?? 0
+state.tableModel = res?.data?.list ?? []
+          state.loading = false
+        }
+</script>
+<style scoped lang="scss">
+  </style>