style(油机列表):新增“加油站”搜索框，新增“设备状态”、“在线状态”搜索框下拉框选项

feat(软件包管理)：新增“编辑软件包”、“上传软件包”的”版本“数据有效格式校验功能

admin.ui.plus-master/src/api/admin/reportManagement/listOfOilEngines/listOfOilEnginesDto.ts

@@ -22,8 +22,10 @@ export interface DynamicFilterInfo {
  * 油机列表查询信息
  */
 export  interface FuelDispenserDto_SearchFilter{
-  /**加油机名称*/
+  /**加油号*/
   name?: string,
+  /**加油站*/
+  gasStation?: string,
   /**加油机机型*/
   model?: string,
   /**设备状态*/
@@ -36,7 +38,7 @@ export  interface FuelDispenserDto_SearchFilter{
  * 油机列表信息
  */
 export  interface FuelDispenserDto{
-  /**加油机名称*/
+  /**加油号*/
   name?: string,
   /**石油公司*/
   oilCompany?: string,

admin.ui.plus-master/src/views/admin/authorize/softwarePackageManagement/components/form-edit.vue

@@ -90,6 +90,15 @@ const formData = reactive({
   editData:{} as softwarePackageManagement_TableData,
   fileValue: null,
 })
+/**有效版本号选择校验*/
+const validateVersion = (rule: any, value: any, callback: any) => {
+  const versionPattern: RegExp = /^\d.*\d$/; // 正则表达式，以数字开头和结尾，并且包含数字和点号（.）
+  if (!versionPattern.test(value)) {
+    callback(new Error('输入的版本号格式错误'))
+  } else {
+    callback()
+  }
+}
 
 
 /**表单校验*/
@@ -105,6 +114,7 @@ const rules = reactive<FormRules>({
   ],
   version: [
     { required: true, message: '请输入版本号', trigger: 'blur' },
+    { validator: validateVersion, trigger: 'blur' }
   ],
 })
 
@@ -154,7 +164,7 @@ const uploadFileRef = ref(null);
 const onSubmit =  () => {
 debugger
   formRef.value.validate(async (valid: boolean) =>{
-    //if(!valid) return
+    if(!valid) return
 
     formData.loading = true
     let res = {} as any

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

@@ -7,8 +7,13 @@
           <el-form :model="oilEngineData.filterModel" :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="oilEngineData.filterModel.name" placeholder="请输入加油机名称" clearable></el-input>
+                <el-form-item label="油机号">
+                  <el-input v-model="oilEngineData.filterModel.name" 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="oilEngineData.filterModel.gasStation" placeholder="请输入加油站" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
@@ -18,12 +23,18 @@
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
                 <el-form-item label="设备状态">
-                  <el-input v-model="oilEngineData.filterModel.deviceStatus" placeholder="请输入设备状态" clearable></el-input>
+                  <el-select  v-model="oilEngineData.filterModel.deviceStatus" placeholder="请输入设备状态" >
+                    <el-option v-for="(value, key) in FuelDispenserEnum" :key="key" :label="value"  :value="key" />
+                  </el-select>
+                  <!-- <el-input v-model="oilEngineData.filterModel.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-input v-model="oilEngineData.filterModel.onlineStatus" placeholder="请输入在线状态" clearable></el-input>
+                  <el-select  v-model="oilEngineData.filterModel.onlineStatus" placeholder="请输入在线状态" >
+                    <el-option v-for="(value, key) in OnlineStatus" :key="key" :label="value"  :value="key" />
+                  </el-select>
+                  <!-- <el-input v-model="oilEngineData.filterModel.onlineStatus" placeholder="请输入在线状态" clearable></el-input> -->
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
@@ -40,7 +51,7 @@
       <el-col :xs="24">
         <el-card style="height: 70vh"  class="my-fill mt8" shadow="hover">
           <el-table v-loading="oilEngineData.loading" stripe :data="oilEngineData.tableModel" row-key="id" style="width: 100%">
-            <el-table-column prop="name" label="加油机名称"  />
+            <el-table-column prop="name" label="油机号"  />
             <el-table-column prop="oilCompany" label="石油公司"  />
             <el-table-column prop="gasStation" label="加油站"  />
             <el-table-column prop="serialNumber" label="序列号"  />
@@ -118,8 +129,10 @@ const oilEngineStatus = ref(globalCacheStore.getGlobalStore().get('oilEngineStat
   const oilEngineData = reactive({
   loading: false,
   filterModel: {
-    /**加油机名称*/
+    /**油机号*/
     name: "",
+     /**加油站*/
+    gasStation:"",
     /**加油机机型*/
     model: "",
     /**设备状态*/
@@ -134,6 +147,18 @@ const oilEngineStatus = ref(globalCacheStore.getGlobalStore().get('oilEngineStat
   } as PageInputFuelDispenserDto,
   tableModel: [] as Array<FuelDispenserDto>
 })
+ /**设备状态*/
+enum FuelDispenserEnum {
+  enable = '启用',
+  register = '备案',
+  disable='维修',
+  factory='出产注册'
+}
+/**在线状态*/
+enum OnlineStatus {
+  online = '在线',
+  offline = '离线'
+}
 /**将filterModel对象成.的连接方式*/
 const flattenObject = (obj, parentKey = '') => {
   const result = {};
@@ -151,7 +176,6 @@ const flattenObject = (obj, parentKey = '') => {
 
   return result;
 }
-
 /**初始化 */
 const init = async () => {
   oilEngineData.loading = true
@@ -164,6 +188,7 @@ const init = async () => {
 /**重置查询条件 */
 const resetQuery = () => {
   oilEngineData.filterModel.name = ''
+  oilEngineData.filterModel.gasStation = ''
   oilEngineData.filterModel.model = ''
   oilEngineData.filterModel.deviceStatus = ''
   oilEngineData.filterModel.onlineStatus = ''

admin.ui.plus-master/src/views/admin/workbench/index.vue

@@ -302,7 +302,6 @@ const initLineChart = () => {
 const initPieChart = () => {
   if (!state.global.dispose.some((b: any) => b === state.global.homeChartTwo)) state.global.homeChartTwo.dispose()
   state.global.homeChartTwo = markRaw(echarts.init(homePieRef.value, state.charts.theme))
-
   var data = []
   for (var i = 0; i < pieChart.getName.length; i++) {
     data.push({ name: pieChart.getName[i], value: pieChart.getValue[i] })