From 51b7dd754adb1a813627e79db900a9b2601725e6 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 18 Mar 2025 18:23:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=97=A5=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=8F=AD=E6=AC=A1=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/dailyReportNew/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue
index dce5ee5..cd5da59 100644
--- a/src/views/mes/dailyReportNew/index.vue
+++ b/src/views/mes/dailyReportNew/index.vue
@@ -90,6 +90,7 @@
       <el-table-column prop="sapCode" label="产线编码" width="90"/>
       <!--<el-table-column prop="sapName" label="产线名称" width="160"/>-->
 			<el-table-column prop="equipmentName" label="组别" width="90"/>
+      <el-table-column prop="shiftDesc" label="班次" width="80"/>
 			<el-table-column prop="prodType" label="品类" width="80"/>
 			<el-table-column prop="teamLeaderName" label="组长" width="100" :formatter="teamLeaderFormate"/>
             <el-table-column prop="workorderCode" label="工单号" width="150"/>

From ea21eaad6c6463f2e650a7cc867b64ff593705ca Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 19 Mar 2025 11:09:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kanban/spectaculars/index.vue | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/kanban/spectaculars/index.vue b/src/views/kanban/spectaculars/index.vue
index d680a48..aa01912 100644
--- a/src/views/kanban/spectaculars/index.vue
+++ b/src/views/kanban/spectaculars/index.vue
@@ -46,7 +46,7 @@
             <div class="right">
               <div class="equipmentinfobox">
                 <div class="box">
-                  <div class="title">点检待检数</div>
+                  <div class="title">日点检待检数</div>
                   <div class="number">
                     <div class="number1">
                       {{ equipmentinfo.spotInspectionPendCheck || "0" }}
@@ -55,7 +55,7 @@
                 </div>
 
                 <div class="box">
-                  <div class="title">巡检待检数</div>
+                  <div class="title">月巡检待检数</div>
                   <div class="number">
                     <div class="number1" style="color: #ff4d4f">
                       {{ equipmentinfo.inspectionPendCheck || "0" }}
@@ -67,7 +67,7 @@
             <div class="right">
               <div class="equipmentinfobox">
                 <div class="box">
-                  <div class="title">点检完成数</div>
+                  <div class="title">日点检完成数</div>
                   <div class="number">
                     <div class="number1">
                       {{ equipmentinfo.spotInspectionFinish || "0" }}
@@ -75,7 +75,7 @@
                   </div>
                 </div>
                 <div class="box">
-                  <div class="title">巡检完成数</div>
+                  <div class="title">月巡检完成数</div>
                   <div class="number">
                     <div class="number1" style="color: #ff4d4f">
                       {{ equipmentinfo.inspectionFinish || "0" }}
@@ -87,7 +87,7 @@
             <div class="right">
               <div class="equipmentinfobox">
                 <div class="box">
-                  <div class="title">点检完成率</div>
+                  <div class="title">日点检完成率</div>
                   <div class="number">
                     <div class="number1">
                       {{ (equipmentinfo.spotInspectionFinishRate || "0")+'%' }}
@@ -96,7 +96,7 @@
                   </div>
                 </div>
                 <div class="box">
-                  <div class="title">巡检完成率</div>
+                  <div class="title">月巡检完成率</div>
                   <div class="number">
                     <div class="number1" style="color: #ff4d4f">
                       {{ (equipmentinfo.inspectionFinishRate || "0") +'%'}}
@@ -130,6 +130,7 @@
                   <el-select
                     v-model="formInlineone.workStatus"
                     clearable
+                    size="small"
                     placeholder="维修状态"
                   >
                     <el-option
@@ -145,6 +146,7 @@
                   <el-input
                     v-model="formInlineone.equipmentName"
                     clearable
+                    size="small"
                     placeholder="设备名称"
                   ></el-input>
                 </el-form-item>
@@ -152,6 +154,7 @@
                   <el-select
                     v-model="formInlineone.timeDimension"
                     placeholder="时间维度"
+                    size="small"
                   >
                     <el-option label="日" value="dd"></el-option>
                     <el-option label="月" value="mm"></el-option>
@@ -238,6 +241,7 @@
                 <el-select
                   v-model="formInlinetwo.orderStatus"
                   clearable
+                  size="small"
                   placeholder="工单状态"
                 >
                   <el-option
@@ -252,6 +256,7 @@
                 <el-input
                   v-model="formInlinetwo.equipmentName"
                   clearable
+                  size="small"
                   placeholder="设备名称"
                 ></el-input>
               </el-form-item>
@@ -260,6 +265,7 @@
                 <el-select
                   v-model="formInlinetwo.timeDimension"
                   placeholder="时间维度"
+                  size="small"
                 >
                   <el-option label="日" value="dd"></el-option>
                   <el-option label="月" value="mm"></el-option>
@@ -346,6 +352,7 @@
                 <el-select
                   v-model="formInlinethree.orderStatus"
                   clearable
+                  size="small"
                   placeholder="工单状态"
                 >
                   <el-option
@@ -360,6 +367,7 @@
                 <el-input
                   v-model="formInlinethree.equipmentName"
                   clearable
+                  size="small"
                   placeholder="设备名称"
                 ></el-input>
               </el-form-item>
@@ -367,6 +375,7 @@
                 <el-select
                   v-model="formInlinethree.timeDimension"
                   placeholder="时间维度"
+                  size="small"
                 >
                   <el-option label="日" value="dd"></el-option>
                   <el-option label="月" value="mm"></el-option>
@@ -957,7 +966,7 @@ export default {
               }
             }
             .title {
-              width: 100px;
+              width: 120px;
               height: 40px;
               color: #ffffff;
               font-size: 20px;

From 80e694d7b167726caf7a9c2aaf7feb29671e6c88 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 19 Mar 2025 11:33:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/kanban/spectaculars/index.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/kanban/spectaculars/index.vue b/src/views/kanban/spectaculars/index.vue
index aa01912..12f0e11 100644
--- a/src/views/kanban/spectaculars/index.vue
+++ b/src/views/kanban/spectaculars/index.vue
@@ -87,7 +87,7 @@
             <div class="right">
               <div class="equipmentinfobox">
                 <div class="box">
-                  <div class="title">日点检完成率</div>
+                  <div class="title">点检完成率</div>
                   <div class="number">
                     <div class="number1">
                       {{ (equipmentinfo.spotInspectionFinishRate || "0")+'%' }}
@@ -96,7 +96,7 @@
                   </div>
                 </div>
                 <div class="box">
-                  <div class="title">月巡检完成率</div>
+                  <div class="title">巡检完成率</div>
                   <div class="number">
                     <div class="number1" style="color: #ff4d4f">
                       {{ (equipmentinfo.inspectionFinishRate || "0") +'%'}}
@@ -367,7 +367,8 @@
                 <el-input
                   v-model="formInlinethree.equipmentName"
                   clearable
-                  size="small"
+                 
+                  width="160px"
                   placeholder="设备名称"
                 ></el-input>
               </el-form-item>
@@ -1271,4 +1272,8 @@ export default {
   margin-bottom: 10px;
   margin-right: 8px;
 }
+.demo-form-inline input select{
+  display: block;
+  margin-right: 10px;
+}
 </style>