Merge remote-tracking branch 'origin/master'

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" }}
@@ -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,8 @@
                 <el-input
                   v-model="formInlinethree.equipmentName"
                   clearable
+                 
+                  width="160px"
                   placeholder="设备名称"
                 ></el-input>
               </el-form-item>
@@ -367,6 +376,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 +967,7 @@ export default {
               }
             }
             .title {
-              width: 100px;
+              width: 120px;
               height: 40px;
               color: #ffffff;
               font-size: 20px;
@@ -1262,4 +1272,8 @@ export default {
   margin-bottom: 10px;
   margin-right: 8px;
 }
+.demo-form-inline input select{
+  display: block;
+  margin-right: 10px;
+}
 </style> 

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"/>