feat：前端优化

admin.ui.plus-master/src/components/StatusBox.vue

@@ -0,0 +1,85 @@
+<template>
+    <div class="status-box" :class="boxColorClass">
+      <span :class="textColorClass">{{ displayText }}</span>
+    </div>
+  </template>
+  
+  <script>
+  export default {
+    name: 'StatusBox',
+    props: {
+      status: {
+        type: [Number,String],
+        required: true
+      }
+    },
+    computed: {
+      displayText() {
+        switch (this.status) {
+          case 1: return '成功'
+          case 0: return '未测试'
+          case 2: return '失败'
+          case "已生产": return '已生产'
+          default: return '失败'
+        }
+      },
+      textColorClass() {
+        switch (this.status) {
+          case 1: return 'green'
+          case 0: return 'blue'
+          case 2: return 'red'
+          default: return 'red'
+        }
+      },
+      boxColorClass() {
+        switch (this.status) {
+          case 1: return 'green'
+          case 0: return 'blue'
+          case 2: return 'red'
+          default: return 'red'
+        }
+      }
+    }
+  }
+  </script>
+  
+  <style scoped>
+  .status-box {
+    width: 50px;
+    height: 30px;
+    background-color: white;
+    border: 1px solid;
+    border-radius: 15px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: 500;
+  }
+  
+  .status-box.green {
+    background-color: #e1fce2;
+    border-color: green;
+  }
+  
+  .status-box.red {
+    border-color: red;
+    background-color: #f8dcdc;
+  }
+  
+  .status-box.blue {
+    border-color: blue;
+    background-color: #ddd1fd;
+  }
+  
+  span.green {
+    color: green;
+  }
+  
+  span.red {
+    color: red;
+  }
+  
+  span.blue {
+    color: blue;
+  }
+  </style>

admin.ui.plus-master/src/views/admin/PCBA/boardFunctionResult/index.vue

@@ -4,7 +4,7 @@
       <!--操作-->
       <el-col :xs="24">
         <el-card class="mt8" shadow="hover">
-          <el-form :model="state.filter" :inline="true" @submit.stop.prevent>
+          <el-form :model="state.filter" :inline="true" @submit.stop.prevent label-width="100px">
             <el-form-item prop="name" style="width: 100%">
               <el-row :gutter="20">
                 <!-- 第一行 -->
@@ -47,7 +47,12 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :xs="24" :sm="16" :md="12" :lg="10" :xl="8" 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.lastTestUser" 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.createTimeRange"
@@ -59,11 +64,6 @@
                     />
                   </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.lastTestUser" placeholder="单行输入" clearable></el-input>
-                  </el-form-item>
-                </el-col>
               </el-row>
             </el-form-item>
           </el-form>

admin.ui.plus-master/src/views/admin/PCBA/boardList/index.vue

@@ -4,7 +4,7 @@
       <!--操作-->
       <el-col :xs="24">
         <el-card class="mt8" shadow="hover">
-          <el-form :model="state.filter" :inline="true" @submit.stop.prevent>
+          <el-form :model="state.filter" :inline="true" @submit.stop.prevent label-width="100px">
             <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="序列号">
@@ -73,9 +73,7 @@
             <el-table-column prop="lastTestTime" label="最近检测时间" />
             <el-table-column prop="lastTestState" label="最新检测状态">
               <template #default="{ row }">
-                <div :style="{ color: getPCBATestState(row.lastTestState).color }" class="bold-font">
-                  {{ getPCBATestState(row.lastTestState).name }}
-                </div>
+                <status-box :status="row.lastTestState" />
               </template>
             </el-table-column>
             <el-table-column prop="lastTestUser" label="最新检测员" />
@@ -116,6 +114,7 @@ import { BoardListApi } from '/@/api/admin/PCBA/boardListApi';
 import { BoardListDto } from '/@/api/admin/PCBA/boardListDto';
 import type { pageInput } from "/@/api/admin/shareDto/shareDto";
 import { useGlobalCacheStore } from "/@/stores/globalCacheStore";
+import  StatusBox from "/@/components/StatusBox.vue"
 
 /**获取全局缓存*/
 const globalCacheStore = useGlobalCacheStore();
@@ -123,18 +122,6 @@ const globalCacheStore = useGlobalCacheStore();
 const PCBATestState = ref(globalCacheStore.getGlobalStore().get('pcbaTestState'));
 const PCBABoardType = ref(globalCacheStore.getGlobalStore().get('pcbaBoardType'));
 
-const getPCBATestState = (val) => {
-  val = String(val);
-  if (PCBATestState.value?.has(val)) {
-    const stateObj = PCBATestState.value.get(val);
-    if (stateObj.name === '未测试') {
-      return { ...stateObj, color:'royalblue' };
-    }
-    return stateObj;
-  } else {
-    return { name: val, color: 'inherit' };
-  }
-};
 
 const getPCBABoardType = (val) => {
   val = String(val);

admin.ui.plus-master/src/views/admin/PCBA/boardTestRecord/index.vue

@@ -4,7 +4,7 @@
       <!--操作-->
       <el-col :xs="24">
         <el-card class="mt8" shadow="hover">
-          <el-form :model="state.filter" :inline="true" @submit.stop.prevent>
+          <el-form :model="state.filter" :inline="true" @submit.stop.prevent label-width="100px">
             <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="序列号">
@@ -67,13 +67,12 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
                   />
-                  <el-button type="primary" icon="ele-Search" @click="onQuery" style="margin-left: 80vh;"> 查询 </el-button>
                 </el-form-item>
               </el-col>
             </el-form-item>
           </el-form>
           <div class="my-flex my-flex-start" style="margin-top: -35px;">
-
+            <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
           </div>
         </el-card>
       </el-col>

admin.ui.plus-master/src/views/admin/product/record/index.vue

@@ -54,8 +54,8 @@
               <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
               <el-button type="primary" icon="ele-RefreshRight" @click="onReset"> 重置 </el-button>
             </el-row>
-            <!-- <el-button v-auth="'api:admin:file:upload-file'" type="primary" icon="ele-Upload" @click="onUpload"> 上传
-            </el-button> -->
+            <el-button v-auth="'api:admin:file:upload-file'" type="primary" icon="ele-Upload" @click="onUpload"> 上传
+            </el-button>
           </el-row>
 
         </el-card>
@@ -74,9 +74,10 @@
             <el-table-column prop="software_v" label="软件版本" />
             <el-table-column prop="status" label="状态" width="120">
               <template #default="{ row }">
-                <div :style="{ color: getComponentStatusType(row.status).color }" class="bold-font">
+                <!-- <div :style="{ color: getComponentStatusType(row.status).color }" class="bold-font">
                   {{ getComponentStatusType(row.status).name }}
-                </div>
+                </div> -->
+                <StatusBox :status="getComponentStatusType(row.status).name" />
               </template>
             </el-table-column>
             <!-- <el-table-column prop="key_name" label="中化密钥"  >
@@ -173,6 +174,7 @@ import { ComponentGetPageOutPut } from "/@/api/admin/productionManagement/Commun
 import router from "/@/router";
 
 import { useGlobalCacheStore } from "/@/stores/globalCacheStore";
+import StatusBox from '/@/components/StatusBox.vue';
 
 /**获取全局缓存*/
 const globalCacheStore = useGlobalCacheStore()

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

@@ -12,22 +12,30 @@
                   <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>
               </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 :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="显示屏状态">
+                  <el-select  placeholder="请选择状态">
+                                   <el-option label="所有" :value="''"></el-option>
+                                   <el-option label="已备案" :value="''"></el-option>
+                                   <el-option label="未备案" :value="''"></el-option>
+                                 </el-select> 
+                  </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-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item label="在线状态">
+                  <el-select  placeholder="请选择状态">
+                                   <el-option label="所有" :value="''"></el-option>
+                                   <el-option label="在线" :value="''"></el-option>
+                                   <el-option label="离线" :value="''"></el-option>
+                                 </el-select>             
                 </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-date-picker
                     v-model="state.filter.FixTime"
@@ -39,6 +47,11 @@
                   />
                 </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-date-picker
@@ -98,6 +111,8 @@
         OilCompanyName: "",
 /**序列号 */
         SerialNumber: "",
+// 在线状态
+        onlineStatus:"",  
 /**绑定加油机厂商 */
         BindingDispenserManufacturer: "",
 /**安全装置状态 */

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

@@ -5,13 +5,27 @@
 <!--操作-->
       <el-col :xs="24" >
         <el-card class="mt8"  shadow="hover" >
-<el-form :model="state.filter" :inline="true" @submit.stop.prevent>
+<el-form :model="state.filter" :inline="true" @submit.stop.prevent class="fengexian">
             <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="8" :xl="6" class="mb20">
+                <el-form-item label="安装时间">
+                  <el-date-picker
+                     v-model="value1"
+                     format="YYYY-MM-DD"
+                     type="daterange"
+                     start-placeholder="开始时间"
+                     end-placeholder="结束时间"
+                     :clearable="false"
+                     :shortcuts="shortcuts"
+                     @change="change"
+                   ></el-date-picker>
+                 </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>
@@ -51,8 +65,13 @@
                   />
                 </el-form-item>
               </el-col> -->
+
+
+
 </el-form-item>
           </el-form>
+
+          <hr>
 <div class="my-flex my-flex-start" >
 <el-button  type="primary" icon="ele-CirclePlus" @click="onQuery"> 查询 </el-button>
 </div>
@@ -88,6 +107,10 @@
   import eventBus from "/@/utils/mitt";
   import { PageInput,encodercontrolsDto } from "/@/api/admin/reportManagement/encodercontrols/encodercontrolsdto";
   import {Api} from "/@/api/admin/reportManagement/encodercontrols/encodercontrolsapi";
+
+// 安装日期假数据
+const value1 = ref('')
+
 /**数据对象*/
   const state = reactive({
     /**加载显示 */
@@ -166,4 +189,13 @@ state.tableModel = res?.data?.list ?? []
         }
 </script>
 <style scoped lang="scss">
+
+.fengexian{
+  margin-bottom: -20px;
+}
+
+.my-flex{
+  margin-top: 20px;
+}
+
   </style>

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

@@ -23,6 +23,18 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                <el-form-item label="选择时间">
+                  <el-date-picker
+                    v-model="value1"
+                    type="datetimerange"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    range-separator="To"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  />
+                </el-form-item>
+              </el-col>
             </el-form-item>
           </el-form>
 
@@ -58,12 +70,15 @@
 </template>
 
 <script setup lang="ts" name="authorize/fuelingsdk">
-import { onMounted, reactive } from "vue";
+import { onMounted, reactive, ref } 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";
 /**引入组件*/
 
+// 安装日期假数据
+const value1 = ref('')
+
 /**页面对象 */
 const Data = reactive({
   time: '',

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

@@ -44,11 +44,19 @@
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="安装时间">
-                  <el-date-picker type="datetime" v-model="value1"
-                                  value-format="YYYY-MM-DD HH:mm:ss" range-separator="To" date-format="MMM DD, YYYY" time-format="HH:mm"
-                                  placeholder="请输入安装时间"  :style="{ width: '240px' }" />
+                  <el-date-picker
+                     v-model="value1"
+                     format="YYYY-MM-DD"
+                     type="daterange"
+                     start-placeholder="开始时间"
+                     end-placeholder="结束时间"
+                     :clearable="false"
+                     :shortcuts="shortcuts"
+                     @change="change"
+                   ></el-date-picker>
                  </el-form-item>
                </el-col>   
+
             </el-form-item>
           </el-form>
 

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

@@ -141,7 +141,7 @@
                   </template>
                 </el-popover>
               </div>
-              <div class="item right">
+              <div class="item">
                 <el-link class="my-el-link mr12 ml12" @click="toPage()" type="primary" size="small" :underline="false"
                   target="_blank">查看更多>></el-link>
               </div>

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

@@ -5,18 +5,19 @@
 <!--操作-->
       <el-col :xs="24" >
         <el-card class="mt8"  shadow="hover" >
-<el-form :model="state.filter" :inline="true" @submit.stop.prevent>
+<el-form :model="state.filter" :inline="true" @submit.stop.prevent label-width="100px">
             <el-form-item prop="name" style="width: 100%">
-<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" 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-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                <el-form-item label="加油站名称">
+                  <el-input v-model="state.filter.stationName" 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>
@@ -38,21 +39,43 @@
                     end-placeholder="End date"
                   />
                 </el-form-item>
+              </el-col> -->
+              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                <el-form-item label="序列号">
+                  <el-input v-model="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-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                <el-form-item label="编码器状态">
+                  <el-select  placeholder="请选择状态">
+                                   <el-option label="所有" :value="''"></el-option>
+                                   <el-option label="启用" :value="''"></el-option>
+                                   <el-option label="未知" :value="''"></el-option>
+                                 </el-select>                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                <el-form-item label="在线状态">
+                  <el-select  placeholder="请选择状态">
+                                   <el-option label="所有" :value="''"></el-option>
+                                   <el-option label="在线" :value="''"></el-option>
+                                   <el-option label="离线" :value="''"></el-option>
+                                 </el-select>                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                <el-form-item label="选择时间">
                   <el-date-picker
                     v-model="state.filter.SoldTime"
                     type="datetimerange"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     range-separator="To"
-                    start-placeholder="Start date"
-                    end-placeholder="End date"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
                   />
                 </el-form-item>
-              </el-col> -->
+              </el-col>
 </el-form-item>
           </el-form>
+          <hr class="custom-hr">
 <div class="my-flex my-flex-start" >
 <el-button  type="primary" icon="ele-CirclePlus" @click="onQuery"> 查询 </el-button>
 </div>
@@ -96,6 +119,10 @@
       filter: {
 /**石油公司 */
         OilCompanyName: "",
+        // 加油站名称
+        stationName:"",
+        // 在线状态
+        onlineStatus:"",
 /**序列号 */
         SerialNumber: "",
 /**绑定加油机厂商 */
@@ -166,4 +193,9 @@ state.tableModel = res?.data?.list ?? []
         }
 </script>
 <style scoped lang="scss">
+.custom-hr {
+  margin: -20px 0 10px 0;
+  border: none;
+  border-top: 1px solid #ebeef5; /* 使用 Element Plus 的分隔线颜色 */
+}
   </style>

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

@@ -63,6 +63,9 @@
 <!--      </el-col>-->
 <!--    </el-row>-->
   </div>
+  <div class="version">
+    托肯恒山科技有效公司  V 4.1.1  
+  </div>
 </template>
 
 <script setup lang="ts" name="example/home">
@@ -739,4 +742,13 @@ $homeNavLengh: 8;
   }
 
 }
+
+.version{
+  display: flex;
+  justify-content: center;
+  margin-top: 4vh;
+  font-size: 3vh;
+  font-family:'Courier New', Courier, monospace;
+  font-weight: 700;
+}
 </style>