Merge pull request 'projects/mesxc-zhp' (#372) from projects/mesxc-zhp into projects/mesxc-test

Reviewed-on: #372

src/views/OperationalOverview/processingBoard.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-04-26 08:32:02
+ * @LastEditTime: 2024-04-26 09:52:16
  * @Description:
 -->
 <template>
@@ -44,18 +44,18 @@
                 <!-- <div style="height: 34px;"> -->
                 <span style="display: inline-block;width: 400px;height: 10px;">
                   <span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span>
-                  <el-divider class="split" v-if="op.name" direction="vertical"></el-divider>
+                  <el-divider v-if="op.specifications" class="split" direction="vertical"></el-divider>
                   <!-- <span v-if="op.size" class="split"></span> -->
-                  <span v-if="op.specifications" class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
+                  <span class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
                   op.specifications }}</span>
-                  <el-divider class="split" v-if="op.specifications" direction="vertical"></el-divider>
-                  <span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
+                  <el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider>
+                  <span class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
                   op.planQuantity }}</span>
                   <span v-if="op.planQuantity" class="orderFinishTwo"
                     style="font-size: 14px;opacity: calc(.6);">片</span>
                 </span>
                 <!-- <span style="overflow: hidden;"> -->
-                <span v-if="op.actualQuantity" class="orderFinish" style="font-size: 14px;margin-left: 40px;">{{
+                <span class="orderFinish" style="font-size: 14px;margin-left: 40px;">{{
                 op.actualQuantity
                 }}</span>
                 <span v-if="op.actualQuantity" class="orderFinishTwo" style="font-size: 14px">片</span>
@@ -746,7 +746,7 @@ export default {
                 name: this.getStr(String(ele.name), 8),
                 progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
                 specifications: ele.specifications ? '规格' + ele.specifications : '',
-                planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan),6) : '',
+                planQuantity: ele.planQuantity ? '计划' + this.getStr(String(ele.planQuantity),6) : '',
                 actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity), 6) : '',
 							};
 						}
@@ -756,11 +756,11 @@ export default {
 					let eqArr = this.SJGWsData.detData.map((item, index) => [
 						`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
             </span>`,
+            `<span style="color:rgba(255,255,255,0.5)">${item.lineName || ''
+            }</span>`,
 						`<span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
             </span>`,
-						`<span style="color:rgba(255,255,255,0.5)">${
-            item.lineName || ''
-						}</span>`,
+
             `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0' : item.status == '停机' ? 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;background-color: #FFBD02;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0'}"></div>  ${item.status || ''}</span>`,
             // `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == false ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:10px 10px 0 0 '}"></div>  ${item.error == true ?'是' :'否'  || ''}</span>`,
 					]);

src/views/report/qcReport/fullInspection/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-25 17:13:28
+ * @LastEditTime: 2024-04-26 09:10:53
  * @LastEditors: zhp
  * @Description:
 -->
@@ -13,7 +13,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="产线" prop="productionLineId">
-        <el-select v-model="listQuery.productionLineId" placeholder="请选择">
+        <el-select v-model="listQuery.productionLineId" placeholder="请选择" clearable>
           <el-option v-for="item in lineList" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>

src/views/report/qcReport/lineReport.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-25 17:13:43
+ * @LastEditTime: 2024-04-26 09:42:54
  * @LastEditors: zhp
  * @Description:
 -->
@@ -56,7 +56,7 @@ const tableProps = [
   },
   {
     prop: 'equipmentName',
-    label: '',
+    label: '机械手名称',
     width: '200'
   },
   {

src/views/report/qcReport/optimizeCutData.vue

@@ -1,14 +1,14 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-26 08:42:00
+ * @LastEditTime: 2024-04-26 09:41:54
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <el-table :header-cell-style="{
+    <el-table :max-height="tableH" :header-cell-style="{
       background: '#F2F4F9',
       color: '#606266'
     }" class="baseTable" border id="exportTable" :data="tableData" style="width: 100%" :span-method="objectSpanMethod">
@@ -40,6 +40,8 @@ import {
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
+// import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 // import { getList, } from "@/api/base/qualityScrapType";
 const tableProps = [
   // {
@@ -54,7 +56,7 @@ const tableProps = [
   },
   {
     prop: 'dataType',
-    label: '',
+    label: '类别',
     width: '150',
   },
   {
@@ -71,7 +73,12 @@ const tableProps = [
   },
   {
     prop: 'rate',
-    label: '占比%',
+    label: '占比(%)',
+    // filter: (val) => val == false ? '不合格' : '合格',
+  },
+  {
+    prop: 'rateSum',
+    label: '综合成品率(%)',
     // filter: (val) => val == false ? '不合格' : '合格',
   },
   // {
@@ -286,14 +293,15 @@ export default {
         // })
         this.tableData = response.data.map((ele) => {
           return {
-            dataType: ele.dataType == 1 ? '成品' : ele.dataType == 2 ? '取样' : '废版',
+            dataType: ele.dataType == 1 ? '成品' : ele.dataType == 2 ? '取样板' : ele.dataType == 4 ? '合计' : ele.dataType == 3 ? '废版' : '',
             code: ele.code,
             putNum: ele.putNum,
             lineName: ele.lineName,
-            type: ele.type,
+            type: ele.type == '合计' ? '' : ele.type,
             pieces: ele.pieces,
             area: ele.area,
-            rate: (ele.rate * 100).toFixed(2)
+            rate: ele.lineName != '总计' &&  ele.rate ? (ele.rate * 100).toFixed(2) : '',
+            rateSum: ele.lineName === '总计' ? (ele.rate * 100).toFixed(2) : ''
             // useNum: ele.useNum,
             // num: ele.num,
             // size: typeof (ele.size)