Ver código fonte

feat:按钮优化和页面输入框调整

huang, kai (Contractor) 1 mês atrás
pai
commit
17e789ef1e

+ 4 - 2
admin.ui.plus-master/.env.development

@@ -3,8 +3,10 @@ ENV = 'development'
 
 # 本地环境接口地址
 # VITE_API_URL = 'http://ipos.biz:8070'
- VITE_API_URL = 'http://localhost:8003'
-#VITE_API_URL = 'http://dev.hsfuel.com:8070'
+#  VITE_API_URL = 'http://localhost:8003'
+VITE_API_URL = 'http://dev.hsfuel.com:8070'
 # VITE_API_URL = 'http://47.101.220.106:8070'
 # VITE_API_URL = 'http://ipos.biz:8070'
 
+
+

+ 76 - 68
admin.ui.plus-master/src/components/StatusBox.vue

@@ -14,46 +14,35 @@
       }
     },
     computed: {
-      // displayText() {
-      //   switch (this.status) {
-      //     // PCBA-主板检测列表
-      //     case '成功': return '成功'
-      //     case '未测试': return '未测试'
-      //     case '失败': return '失败'
-      //     // 生产管理-部件电子档案
-      //     case "已生产": return '已生产'
-      //     case "生产中": return '生产中'
-      //     case "已装机": return '已装机'
-      //     case "待灌注": return '待灌注'
-      //     case "已灌注": return '已灌注'
-      //     case "已备案": return '已备案'
-      //     default: return '失败'
-      //   }
-      // },
       textColorClass() {
         switch (this.status) {
-          // PCBA-主板检测列表
-          case '成功': return 'green'
+         // PCBA-主板检测列表
+         case '成功': return 'green'
           case '未测试': return 'blue'
           case '失败': return 'red'
-          // 生产管理-部件电子档案
-          case "已生产": return 'blue'
-          case "生产中": return 'grey'
-          case "已装机": return 'green'
+
+          // 生产管理-部件电子档案   
+          // 电子档案-显示屏
+          case "已生产": return 'green'
+          case "生产中": return 'blue'
+          case "已装机": return 'littleGreen'
+
           case "待灌注": return 'yellow'
-          case "已灌注": return 'grey'
-          case "已备案": return 'green'
+          case "已灌注": return 'blueGreen'
+          case "已备案": return 'blue'
+
           // 生产管理-部件类型
           case "启用": return 'green'
           case "未启用": return 'red'
 
           case "出厂注册": return 'blue'
           case '在线': return 'green'
-          // 生产管理-电子说明书          
+
+         // 生产管理-电子说明书          
           case "开启": return 'green'
           case "关闭": return 'red'
 
-          // 生产管理-软件包管理          
+         // 生产管理-软件包管理          
           case '已发布': return 'green'
           case '待发布': return 'blue'
           case '失效': return 'red'
@@ -65,20 +54,14 @@
           // 电子档案-加油机列表
           case '已启用': return 'green'
           case '已禁用': return 'red'
+          
           case '开启': return 'green'
           case '未开启': return 'red'
-
-          // 电子档案-显示屏
-          case "已生产": return 'blue'
-          case "生产中": return 'hotpink'
-          case "已装机": return 'green'
-          case "待灌注": return 'red'
-          case "已灌注": return 'yelbluevioletlow'
-          case "已备案": return 'gray'
           
           // 电子档案-安全装置
           case "已出厂注册": return 'blue'
 
+
           default: return 'red'
         }
       },
@@ -88,13 +71,17 @@
           case '成功': return 'green'
           case '未测试': return 'blue'
           case '失败': return 'red'
-          // 生产管理-部件电子档案
-          case "已生产": return 'blue'
-          case "生产中": return 'grey'
-          case "已装机": return 'green'
+
+          // 生产管理-部件电子档案   
+          // 电子档案-显示屏
+          case "已生产": return 'green'
+          case "生产中": return 'blue'
+          case "已装机": return 'littleGreen'
+
           case "待灌注": return 'yellow'
-          case "已灌注": return 'grey'
-          case "已备案": return 'green'
+          case "已灌注": return 'blueGreen'
+          case "已备案": return 'blue'
+
           // 生产管理-部件类型
           case "启用": return 'green'
           case "未启用": return 'red'
@@ -118,16 +105,9 @@
           // 电子档案-加油机列表
           case '已启用': return 'green'
           case '已禁用': return 'red'
+
           case '开启': return 'green'
           case '未开启': return 'red'
-
-          // 电子档案-显示屏
-          case "已生产": return 'blue'
-          case "生产中": return 'hotpink'
-          case "已装机": return 'green'
-          case "待灌注": return 'red'
-          case "已灌注": return 'yelbluevioletlow'
-          case "已备案": return 'gray'
           
           // 电子档案-安全装置
           case "已出厂注册": return 'blue'
@@ -142,12 +122,11 @@
   
   <style scoped>
   .status-box {
-    width: 100%;
-    height: 100%;
+    width: 62px;
+    height: 30px;
     background-color: white;
     border: 1px solid;
     border-radius: 15px;
-    padding: 4px;
     box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
     display: flex;
     justify-content: center;
@@ -155,19 +134,33 @@
     font-weight: 400;
   }
   
+
+  .status-box.blueGreen {
+    background-color: #76C7C0;
+    border-color: #286a88;
+  }
+
+  .status-box.littleGreen {
+    background-color: #A5D6A7;
+    border-color: #43b346;
+  }
+
   .status-box.green {
-    background-color: #e1fce2;
-    border-color: green;
+    background-color: #6EC664;
+    border-color: #3e7440;
   }
   
   .status-box.red {
-    border-color: red;
-    background-color: #f8dcdc;
+    border-color: rgb(204, 75, 75);
+    background-color: rgb(212, 102, 102);
+  }
+  .status-box.littleBlue{
+    border-color: #9dbbd8;
+    background-color: #B3C6D8;
   }
-  
   .status-box.blue {
-    border-color: blue;
-    background-color: #ddd1fd;
+    border-color: #4d3beb;
+    background-color: #4A90E2;
   }
   
   .status-box.gray {
@@ -176,8 +169,8 @@
   }
 
   .status-box.yellow {
-    border-color:yellow;
-    background-color:#fefff4;
+    border-color:rgb(165, 165, 32);
+    background-color:#FBBD08;
   }
 
   .status-box.yelbluevioletlow {
@@ -190,32 +183,47 @@
     background-color:rgb(248, 196, 222);
   }
 
+  span.blueGreen {
+    color: white;
+  }
+  
   span.green {
-    color: green;
+    color: white;
   }
   
   span.red {
-    color: red;
+    color: white;
   }
   
   span.blue {
-    color: blue;
+    color: white;
   }
 
   span.grey{
-    color: gray;
+    color: white;
+  }
+
+  span.littleBlue {
+    color: white;
+  }
+
+  span.littleGreen {
+    color: white;
   }
 
   .status-box.yellow {
-    color: yellow;
+    color: white;
   }
 
   .status-box.yelbluevioletlow{
-    color: blueviolet;
+    color: white;
   }
 
-.status-box.status-box.hotpink{
-  color: hotpink;
+  .status-box.status-box.hotpink{
+  color: white;
 }
 
+
+
+
   </style>

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

@@ -8,17 +8,17 @@
             <el-form-item prop="name" style="width: 100%">
               <el-row :gutter="20">
                 <!-- 第一行 -->
-                <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.serno" 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="8" :xl="6" class="mb20">
                   <el-form-item label="外部序列号">
                     <el-input v-model="state.filter.exserno" 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="8" :xl="6" class="mb20">
                   <el-form-item label="主板类型">
                     <el-select v-model="state.filter.boardType" placeholder="">
                       <el-option v-for="(value, key) in PCBABoardType" :key="key" :label="value[1].name"
@@ -27,7 +27,7 @@
                   </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="8" :xl="6" class="mb20">
                   <el-form-item label="功能码">
                     <el-select v-model="state.filter.code" default-first-option="true" filterable allow-create
                                value-key="code"
@@ -39,7 +39,7 @@
                     </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="8" :xl="6" class="mb20">
                   <el-form-item label="测试结果">
                     <el-select v-model="state.filter.result" placeholder="">
                       <el-option v-for="(value, key) in PCBATestState" :key="key" :label="value[1].name"
@@ -47,13 +47,13 @@
                     </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="8" :xl="6" 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-form-item label="创建时间">
                     <el-date-picker
                         v-model="state.filter.createTimeRange"
                         type="daterange"
@@ -291,4 +291,21 @@ const init = async () => {
   margin-top:-3vh;
   margin-bottom:5vh;
 }
+
+.el-input,
+.el-select {
+  width: 240px;
+}
+
+/* 输入框标签固定四个字符宽度 */
+::v-deep .el-form-item__label {
+  // 字体大小14,4个字符,12px右间距
+  width: 14*4px+12px;
+  justify-content: start;
+}
+
+/* 数据表头 设置灰色样式 */
+::v-deep .el-table th.el-table__cell {
+  background-color: #F6F6F6;
+}
 </style>    

+ 21 - 4
admin.ui.plus-master/src/views/admin/PCBA/boardFunctionSummary/index.vue

@@ -7,7 +7,7 @@
         <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-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
   <el-form-item label="主板类型">
                   <el-select v-model="state.filter.boardType" placeholder="">
                     <el-option v-for="(value, key) in PCBABoardType" :key="key" :label="value[1].name"
@@ -15,13 +15,13 @@
                   </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="8" :xl="6" 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="6" 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-date-picker
                     v-model="state.filter.createTimeRange"
                     type="daterange"
@@ -294,4 +294,21 @@ const tableData = ctx.$refs.myTable.data;
   margin-top:-3vh;
   margin-bottom:5vh;
 }
+
+.el-input,
+.el-select {
+  width: 240px;
+}
+
+/* 输入框标签固定四个字符宽度 */
+::v-deep .el-form-item__label {
+  // 字体大小14,4个字符,12px右间距
+  width: 14*4px+12px;
+  justify-content: start;
+}
+
+/* 数据表头 设置灰色样式 */
+::v-deep .el-table th.el-table__cell {
+  background-color: #F6F6F6;
+}
   </style>

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

@@ -6,17 +6,17 @@
         <el-card class="mt8" shadow="hover">
           <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.serno" 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="8" :xl="6" class="mb20">
                 <el-form-item label="外部序列号">
                   <el-input v-model="state.filter.exserno" 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="8" :xl="6" class="mb20">
                 <el-form-item label="主板类型">
                   <el-select v-model="state.filter.boardType" placeholder="">
                     <el-option v-for="(value, key) in PCBABoardType" :key="key" :label="value[1].name"
@@ -24,7 +24,7 @@
                   </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="8" :xl="6" class="mb20">
                 <el-form-item label="最新测试状态">
                   <el-select v-model="state.filter.lastTestState" placeholder="">
                     <el-option v-for="(value, key) in PCBATestState" :key="key" :label="value[1].name"
@@ -32,12 +32,12 @@
                   </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="8" :xl="6" 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="6" class="mb20">
+              <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.createTimeRange"
@@ -257,4 +257,21 @@ const init = async () => {
   margin-top:-3vh;
   margin-bottom:5vh;
 }
+
+.el-input,
+.el-select {
+  width: 240px;
+}
+
+/* 输入框标签固定四个字符宽度 */
+::v-deep .el-form-item__label {
+  // 字体大小14,4个字符,12px右间距
+  width: 14*4px+12px;
+  justify-content: start;
+}
+
+/* 数据表头 设置灰色样式 */
+::v-deep .el-table th.el-table__cell {
+  background-color: #F6F6F6;
+}
   </style>    

+ 20 - 4
admin.ui.plus-master/src/views/admin/PCBA/boardSummary/index.vue

@@ -6,7 +6,7 @@
         <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-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="主板类型">
                   <el-select v-model="state.filter.boardType" placeholder="">
                     <el-option v-for="(value, key) in PCBABoardType" :key="key" :label="value[1].name"
@@ -14,13 +14,13 @@
                   </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="8" :xl="6" 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-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                <el-form-item label="创建时间">
                   <el-date-picker
                     v-model="state.filter.createTimeRange"
                     type="daterange"
@@ -254,4 +254,20 @@ const onCurrentChange = () => {
   margin-top:-3vh;
   margin-bottom:5vh;
 }
+.el-input,
+.el-select {
+  width: 240px;
+}
+
+/* 输入框标签固定四个字符宽度 */
+::v-deep .el-form-item__label {
+  // 字体大小14,4个字符,12px右间距
+  width: 14*4px+12px;
+  justify-content: start;
+}
+
+/* 数据表头 设置灰色样式 */
+::v-deep .el-table th.el-table__cell {
+  background-color: #F6F6F6;
+}
 </style>

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

@@ -6,17 +6,17 @@
         <el-card class="mt8" shadow="hover">
           <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.serno" 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="8" :xl="6" class="mb20">
                 <el-form-item label="外部序列号">
                   <el-input v-model="state.filter.exserno" 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="8" :xl="6" class="mb20">
                 <el-form-item label="主板类型">
                   <el-select v-model="state.filter.boardType" placeholder="">
                     <el-option v-for="(value, key) in PCBABoardType" :key="key" :label="value[1].name"
@@ -24,7 +24,7 @@
                   </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="8" :xl="6" class="mb20">
                 <el-form-item label="功能码">
                   <el-select v-model="state.filter.functionCode" default-first-option="true" filterable allow-create 
                     value-key="code"
@@ -36,7 +36,7 @@
                   </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="8" :xl="6" class="mb20">
                 <el-form-item label="检测类型">
                   <el-select v-model="state.filter.testType" placeholder="">
                     <el-option v-for="(value, key) in PCBATestType" :key="key" :label="value[1].name"
@@ -44,12 +44,12 @@
                   </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="8" :xl="6" class="mb20">
                 <el-form-item label="测试员">
                   <el-input v-model="state.filter.user" 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="8" :xl="6" class="mb20">
                 <el-form-item label="测试结果">
                   <el-select v-model="state.filter.result" placeholder="">
                     <el-option v-for="(value, key) in PCBATestState" :key="key" :label="value[1].name"
@@ -57,8 +57,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" 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-date-picker
                     v-model="state.filter.testTimeRange"
                     type="daterange"
@@ -310,4 +310,21 @@ const init = async () => {
   margin-top:-3vh;
   margin-bottom:5vh;
 }
+
+.el-input,
+.el-select {
+  width: 240px;
+}
+
+/* 输入框标签固定四个字符宽度 */
+::v-deep .el-form-item__label {
+  // 字体大小14,4个字符,12px右间距
+  width: 14*4px+12px;
+  justify-content: start;
+}
+
+/* 数据表头 设置灰色样式 */
+::v-deep .el-table th.el-table__cell {
+  background-color: #F6F6F6;
+}
   </style>

+ 5 - 5
admin.ui.plus-master/src/views/admin/application/softwarePackageManagement/index.vue

@@ -6,7 +6,7 @@
         <el-card class="mt8" shadow="hover">
           <el-form :model="softwareData.Filter" @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-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="软件类型">
                   <el-select v-model="softwareData.Filter.softwareType" placeholder="请选择软件类型" style="width: 200px;">
                     <el-option v-for="(value, key) in softwareType" :key="key" :label="value[1].name"
@@ -14,17 +14,17 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :md="8" :lg="8" :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="softwareData.Filter.softwareName" placeholder="单行输入" clearable></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :md="8" :lg="8" :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="softwareData.Filter.version" placeholder="单行输入" clearable></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
+              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="设备类型">
                   <el-select v-model="softwareData.Filter.equipmentType" placeholder="请选择设备类型" style="width: 200px;">
                     <el-option v-for="(value, key) in equipmentType" :key="key" :label="value[1].name"
@@ -32,7 +32,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="4" class="mb20">
+              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="选择时间">
                   <el-date-picker v-model="softwareData.time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
                     range-separator="To" start-placeholder="Start date" end-placeholder="End date" />

+ 8 - 2
admin.ui.plus-master/src/views/admin/authorize/fuelingFTPofDate/index.vue

@@ -18,8 +18,14 @@
                   @keyup.enter="onQuery" />
               </el-form-item>
               <el-form-item label="密钥使用日期" style="width: 45%;">
-                <el-input type="date" v-model="state.filter.useDate" style="width: 100%;" @keyup.enter="onQuery" value-format="yyyy/MM" />
-              </el-form-item>
+                <el-date-picker 
+                  v-model="state.filter.useDate" 
+                  type="date" 
+                  style="width: 100%;" 
+                  placeholder="请选择日期" 
+                  value-format="yyyy/MM/DD" 
+                />             
+               </el-form-item>
             </el-form>
           </div>
           <div v-if="state.pwdDisplay" style="width: 100%;">

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

@@ -33,11 +33,11 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-            <el-form-item label="说明" prop="explain">
+            <el-form-item label="软件包更新说明" prop="explain">
               <el-input v-model="formData.editData.explain" placeholder="请输入说明" rows="6" clearable type="textarea"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20 beizhu">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="formData.editData.remark" placeholder="请输入备注" rows="6" clearable type="textarea"></el-input>
             </el-form-item>
@@ -197,6 +197,13 @@ defineExpose({
   openDialog,
 })
 </script>
-<style scoped lang="scss">
 
+<style scoped lang="scss">
+:deep(.el-form-item__label) {
+  width: 120px !important; 
+  text-align: right;
+  justify-content: flex-end;
+  padding-right: 12px;
+}
 </style>
+

+ 1 - 1
admin.ui.plus-master/src/views/admin/authorize/softwarePackageManagement/index.vue

@@ -35,7 +35,7 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
-                              <el-form-item label="状态">
+                              <el-form-item label="状态" style="width: 308px;">
                                   <el-select  placeholder="请选择上传状态">
                                    <el-option label="所有" :value="''"></el-option>
                                    <el-option label="已发布" :value="''"></el-option>

+ 5 - 5
admin.ui.plus-master/src/views/admin/product/qrBook/index.vue

@@ -6,14 +6,14 @@
                 <el-card class="mt8" shadow="hover">
                     <el-form :model="qrBookData.Filter" @submit.stop.prevent>
                         <el-form-item prop="name" style="width: 100%;">
-                            <el-col :xs="24" :sm="12" :md="8" :lg="6" class="mb20">
+                            <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                                 <el-form-item label="上传人">
                                     <el-input v-model="qrBookData.Filter.Author" placeholder="单行输入"
                                         clearable></el-input>
                                 </el-form-item>
                             </el-col>
 
-                            <el-col :xs="24" :sm="12" :md="8" :lg="6" class="mb20">
+                            <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                                 <el-form-item label="文件名">
                                     <el-input v-model="qrBookData.Filter.FileName" placeholder="单行输入"
                                         clearable></el-input>
@@ -21,7 +21,7 @@
                             </el-col>
 
                             <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
-                              <el-form-item label="状态">
+                                <el-form-item label="状态">
                                   <el-select  placeholder="请选择上传状态">
                                    <el-option label="所有" :value="''"></el-option>
                                    <el-option label="开启" :value="''"></el-option>
@@ -31,8 +31,8 @@
                            </el-col>
                         </el-form-item>
                         
-                        <el-col :xs="24" :md="8" :lg="8" :xl="6" 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-date-picker v-model="qrBookData.time" type="datetimerange"
                                         value-format="YYYY-MM-DD HH:mm:ss" range-separator="To"
                                         start-placeholder="开始日期" end-placeholder="结束日期" />

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

@@ -7,17 +7,17 @@
         <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="6" 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.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-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-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>
@@ -27,7 +27,7 @@
                   <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-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="安全装置状态">
                   <el-select v-model="state.filter.DeviceStatus" placeholder="请输入在线状态">
                     <el-option label="所有" :value="''"></el-option>
@@ -35,8 +35,8 @@
                   </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-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                <el-form-item label="安装时间">
                   <el-date-picker
                     v-model="state.filter.FixTime"
                     type="datetimerange"

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

@@ -7,17 +7,17 @@
         <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-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-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-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="显示屏状态">
                   <el-select v-model="state.filter.deviceStatus" placeholder="请选择状态">
                                    <el-option label="所有" :value="''"></el-option>
@@ -25,7 +25,7 @@
                                  </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="8" :xl="6" class="mb20">
                 <el-form-item label="在线状态">
                   <el-select v-model="state.filter.onlineStatus" placeholder="请选择状态">
                                    <el-option label="所有" :value="''"></el-option>
@@ -243,4 +243,20 @@ state.tableModel = res?.data?.list ?? []
         }
 </script>
 <style scoped lang="scss">
+.el-input,
+.el-select {
+  width: 240px;
+}
+
+/* 输入框标签固定四个字符宽度 */
+::v-deep .el-form-item__label {
+  // 字体大小14,4个字符,12px右间距
+  width: 14*5px+12px;
+  justify-content: start;
+}
+
+/* 数据表头 设置灰色样式 */
+::v-deep .el-table th.el-table__cell {
+  background-color: #F6F6F6;
+}
   </style>

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

@@ -325,7 +325,7 @@ const getColor = (value: string): string => {
 
 onMounted(() => {
  // 初始化分页大小
- oilEngineData.pageInput.PageSize = pageState.pageInput.pageSize;
+ oilEngineData.pageInput.pageSize = pageState.pageInput.pageSize;
   init()
   eventBus.off('refreshView')
   eventBus.on('refreshView', async () => {

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

@@ -29,7 +29,7 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
-                <el-form-item label="出厂时间">
+                <el-form-item label="出厂时间" style="width:310px">
                   <el-date-picker v-model="Data.time1" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss"
                     range-separator="To" start-placeholder="开始日期" end-placeholder="结束日期" />
                 </el-form-item>

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

@@ -61,8 +61,8 @@
 
                                  </el-select>                </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="16" :md="12" :lg="12" :xl="10" 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-date-picker
                     v-model="state.filter.SoldTime"
                     type="datetimerange"
@@ -243,5 +243,21 @@ state.tableModel = res?.data?.list ?? []
   margin: -20px 0 10px 0;
   border: none;
   border-top: 1px solid #ebeef5; /* 使用 Element Plus 的分隔线颜色 */
+}
+.el-input,
+.el-select {
+  width: 240px;
+}
+
+/* 输入框标签固定四个字符宽度 */
+::v-deep .el-form-item__label {
+  // 字体大小14,4个字符,12px右间距
+  width: 14*4px+12px;
+  justify-content: start;
+}
+
+/* 数据表头 设置灰色样式 */
+::v-deep .el-table th.el-table__cell {
+  background-color: #F6F6F6;
 }
   </style>