src/api/report/qcReport.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2024-04-18 09:27:54
- * @LastEditTime: 2024-04-23 13:37:12
+ * @LastEditTime: 2024-04-23 15:16:12
  * @LastEditors: zhp
  * @Description:
  */
@@ -78,3 +78,19 @@ export function getCuttingReportDataList(data) {
     data: data
   })
 }
+
+export function getProcessingLineDataList(data) {
+  return request({
+    url: 'extend/customized-reports/getProcessingLine',
+    method: 'get',
+    data: data
+  })
+}
+
+export function getOriginalLineDataList(data) {
+  return request({
+    url: 'extend/customized-reports/getOriginalLine',
+    method: 'get',
+    data: data
+  })
+}

src/views/OperationalOverview/components/coldDoubleYChart.vue

@@ -2,7 +2,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-04-22 09:36:58
+ * @LastEditTime: 2024-04-23 14:04:24
  * @LastEditors: zhp
  * @Description:
 -->
@@ -266,12 +266,9 @@ export default {
             // },
           },
           {
-            min: function() { // 取最小值向下取整为最小刻度
+            min: 0,
-              return 0
+            max: 100000,
-            },
+            minInterval: 5,//间隔
-            max: function(value) { // 取最大值向上取整为最大刻度
-              return Math.ceil(value.max)
-            },
             scale: true,
             type: 'value',
             name: '产量/㎡', // y轴上方的单位

src/views/OperationalOverview/components/doubleYChart .vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-04-16 13:37:38
+ * @LastEditTime: 2024-04-23 14:06:05
  * @LastEditors: zhp
  * @Description:
 -->
@@ -265,12 +265,9 @@ export default {
               // },
             },
             {
-              // min: function() { // 取最小值向下取整为最小刻度
+              min: 0,
-              //   return 0
+              max: 100000,
-              // },
+              minInterval: 5,//间隔
-              // max: function(value) { // 取最大值向上取整为最大刻度
-              //   return Math.ceil(value.max)
-              // },
               scale: true,
               type: 'value',
               name: '产量/片', // y轴上方的单位

src/views/report/ingredientReport/day.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-22 08:42:07
+ * @LastEditTime: 2024-04-23 15:23:05
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,6 +36,19 @@
         <el-table-column prop="message"></el-table-column>
       </el-table-column> -->
       <el-table-column v-for="(item,index) in codeList " :prop="item" :label="item">
+        <!-- <template slot-scope="scope">
+          <el-col :span="12">
+            {{ codeList[index] }}
+          </el-col>
+          <el-col :span="12">
+
+          </el-col>
+          <el-row>
+            <el-col :span="24">
+              {{ scope.row.sj2 }}
+            </el-col>
+          </el-row>
+        </template> -->
       </el-table-column>
     </el-table>
     <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@@ -172,7 +185,7 @@ export default {
           spanOneArr.push(1);
         } else {
           //第一列需合并相同内容的判断条件
-          if (item.className === this.tableData[index - 1].className) {
+          if (item.classType === this.tableData[index - 1].classType) {
             spanOneArr[concatOne] += 1;
             spanOneArr.push(0);
           } else {
@@ -190,6 +203,22 @@ export default {
           colspan: _col
         }
       }
+      if (columnIndex === 1 ) {
+        if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) {
+          return {
+            rowspan: 2,
+            colspan: 1
+          }
+      }
+      }
+      if (columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4 || columnIndex === 5 || columnIndex === 6)  {
+        if (rowIndex === 1 || rowIndex === 3 || rowIndex === 5 || rowIndex === 7 || rowIndex === 9 || rowIndex === 11) {
+          return {
+            rowspan: 1,
+            colspan: 2
+          }
+        }
+      }
     },
     handleExport() {
       // 处理查询参数
@@ -260,6 +289,23 @@ export default {
             'sj14': null,
             putType: '投入数量'
           },
+          {
+            classType: 1,
+            className: '白班(8:00-20:00)',
+            'sj1': null,
+            'sj2': null,
+            'sj3': null,
+            'sj4': null,
+            'sj5': null,
+            'sj7': null,
+            'sj8': null,
+            'sj10': null,
+            'sj11': null,
+            'sj12': null,
+            'sj13': null,
+            'sj14': null,
+            putType: ''
+          },
           {
             classType: 1,
             className: '白班(8:00-20:00)',
@@ -277,6 +323,23 @@ export default {
             'sj14': null,
             putType: '投入次数'
           },
+          {
+            classType: 1,
+            className: '白班(8:00-20:00)',
+            'sj1': null,
+            'sj2': null,
+            'sj3': null,
+            'sj4': null,
+            'sj5': null,
+            'sj7': null,
+            'sj8': null,
+            'sj10': null,
+            'sj11': null,
+            'sj12': null,
+            'sj13': null,
+            'sj14': null,
+            putType: ''
+          },
           {
             classType: 2,
             className: '夜班(20:00-8:00)',
@@ -294,6 +357,23 @@ export default {
             'sj14': null,
             putType: '投入数量',
           },
+          {
+            classType: 2,
+            className: '夜班(8:00-20:00)',
+            'sj1': null,
+            'sj2': null,
+            'sj3': null,
+            'sj4': null,
+            'sj5': null,
+            'sj7': null,
+            'sj8': null,
+            'sj10': null,
+            'sj11': null,
+            'sj12': null,
+            'sj13': null,
+            'sj14': null,
+            putType: ''
+          },
           {
             classType:2,
             className: '夜班(20:00-8:00)',
@@ -312,7 +392,24 @@ export default {
             putType: '投入次数',
           },
           {
-            classType: 1,
+            classType: 2,
+            className: '夜班(8:00-20:00)',
+            'sj1': null,
+            'sj2': null,
+            'sj3': null,
+            'sj4': null,
+            'sj5': null,
+            'sj7': null,
+            'sj8': null,
+            'sj10': null,
+            'sj11': null,
+            'sj12': null,
+            'sj13': null,
+            'sj14': null,
+            putType: ''
+          },
+          {
+            classType: 3,
             className: '全天',
             'sj1': null,
             'sj2': null,
@@ -329,7 +426,24 @@ export default {
             putType: '投入数量',
           },
           {
-            classType: 2,
+            classType: 3,
+            className: '全天',
+            'sj1': null,
+            'sj2': null,
+            'sj3': null,
+            'sj4': null,
+            'sj5': null,
+            'sj7': null,
+            'sj8': null,
+            'sj10': null,
+            'sj11': null,
+            'sj12': null,
+            'sj13': null,
+            'sj14': null,
+            putType: ''
+          },
+          {
+            classType: 3,
             className: '全天',
             'sj1': null,
             'sj2': null,
@@ -344,20 +458,37 @@ export default {
             'sj13': null,
             'sj14': null,
             putType: '投入次数',
-          }
+          },
+          {
+            classType: 3,
+            className: '全天',
+            'sj1': null,
+            'sj2': null,
+            'sj3': null,
+            'sj4': null,
+            'sj5': null,
+            'sj7': null,
+            'sj8': null,
+            'sj10': null,
+            'sj11': null,
+            'sj12': null,
+            'sj13': null,
+            'sj14': null,
+            putType: ''
+          },
         ]
         res.data.forEach((ele) => {
           this.codeList.forEach((item) => {
             if (ele.classType === 1 && ele.code == item) {
               // console.log(arr[0][item])
               arr[0][item] = ele.putNum
-              arr[1][item] = ele.useNum
+              arr[2][item] = ele.useNum
             } else if (ele.classType === 2 && ele.code == item) {
-              arr[2][item] = ele.putNum
-              arr[3][item] = ele.useNum
-            } else if (ele.classType === 3 && ele.code == item) {
               arr[4][item] = ele.putNum
-              arr[5][item] = ele.useNum
+              arr[6][item] = ele.useNum
+            } else if (ele.classType === 3 && ele.code == item) {
+              arr[8][item] = ele.putNum
+              arr[10][item] = ele.useNum
             }
           })
         })

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-23 13:46:29
+ * @LastEditTime: 2024-04-23 15:15:22
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,7 +36,7 @@
 // import basicPage from '../../../core/mixins/basic-page';
 // import { parseTime } from '../../../core/mixins/code-filter';
 import {
-  getCWSectionList,
+  getOriginalLineDataList,
   getCuttingReportDataList
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
@@ -154,7 +154,7 @@ export default {
           endPlaceholder: '结束时间',
           param: 'checkTime',
           defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
-          width: 250
+          width: 350
         },
         {
           type: 'select',
@@ -201,7 +201,7 @@ export default {
   },
   methods: {
     async getDict() {
-      const res = await getCWSectionList()
+      const res = await getOriginalLineDataList()
       console.log(res)
       this.formConfig[1].selectOptions = res.data
     },

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-23 13:51:05
+ * @LastEditTime: 2024-04-23 15:08:44
  * @LastEditors: zhp
  * @Description:
 -->
@@ -222,7 +222,7 @@ export default {
           endPlaceholder: '结束时间',
           param: 'checkTime',
           defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
-          width: 250
+          width: 350
         },
         {
           type: 'button',
@@ -653,25 +653,24 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
-.baseTable .el-table__body tr.current-row>td.el-table__cell {
+::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
   background-color: #EAF1FC;
 }
 
-.baseTable .el-table .el-table__cell {
+::v-deep .baseTable .el-table .el-table__cell {
   padding: 0;
   height: 35px;
 }
-
+::v-deep.el-table thead.is-group th {
-.el-table thead.is-group th {
   background: none;
 }
 
-.el-table thead.is-group tr:first-of-type th:first-of-type {
+::v-deep.el-table thead.is-group tr:first-of-type th:first-of-type {
   border-bottom: none;
 }
 
-.el-table thead.is-group tr:first-of-type th:first-of-type:before {
+::v-deep.el-table thead.is-group tr:first-of-type th:first-of-type:before {
   content: '';
   position: absolute;
   width: 1px;
@@ -687,7 +686,7 @@ export default {
   transform-origin: top;
 }
 
-.el-table thead.is-group tr:last-of-type th:first-of-type:before {
+::v-deep.el-table thead.is-group tr:last-of-type th:first-of-type:before {
   content: '';
   position: absolute;
   width: 1px;
@@ -702,4 +701,5 @@ export default {
   /*这里需要自己调整，根据线的位置*/
   transform-origin: bottom;
 }
+
 </style>

src/views/report/qcReport/lineReport.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-23 13:51:30
+ * @LastEditTime: 2024-04-23 15:15:45
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,7 +36,7 @@
 // import { parseTime } from '../../../core/mixins/code-filter';
 import {
   getOriginalData,
-  getCWSectionList
+  getOriginalLineDataList
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
@@ -129,7 +129,7 @@ export default {
           endPlaceholder: '结束时间',
           param: 'checkTime',
           defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
-          width: 250
+          width: 350
         },
         {
           type: 'select',
@@ -176,7 +176,7 @@ export default {
   },
   methods: {
     async getDict() {
-      const res = await getCWSectionList()
+      const res = await getOriginalLineDataList()
       console.log(res)
       this.formConfig[1].selectOptions = res.data
     },

src/views/report/qcReport/optimizeCutData.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-23 13:51:20
+ * @LastEditTime: 2024-04-23 15:15:52
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,7 +36,7 @@
 // import { parseTime } from '../../../core/mixins/code-filter';
 import {
   getCuttingtData,
-  getCWSectionList
+  getOriginalLineDataList
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
@@ -99,7 +99,7 @@ export default {
       listQuery: {
         startTime: undefined,
         endTime: undefined,
-        lineId:null
+        lineId:undefined
       },
       formConfig: [
         // {
@@ -128,7 +128,7 @@ export default {
           endPlaceholder: '结束时间',
           param: 'checkTime',
           defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
-          width: 250
+          width: 350
         },
         {
           type: 'select',
@@ -175,7 +175,7 @@ export default {
   },
   methods: {
     async getDict() {
-      const res = await getCWSectionList()
+      const res = await getOriginalLineDataList()
       console.log(res)
       this.formConfig[1].selectOptions = res.data
     },