src/views/OperationalOverview/components/coldDoubleYChart.vue

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

src/views/report/Environmental/sectionProduction/index.vue

@@ -3,11 +3,10 @@
 		<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
+			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<base-table
 			class="sectionProductionTable1"
-			ref="sectionProductionTable11"
-			id="sectionProductionTable1"
 			:table-props="tableProp"
 			:table-data="tableData"
 			:span-method="objectSpanMethod"
@@ -16,11 +15,10 @@
 		<search-bar
 			style="margin-top: 10px"
 			:formConfigs="formConfig2"
+			ref="searchBarForm"
 			@headBtnClick="buttonClick2" />
 		<base-table
 			class="sectionProductionTable2"
-			ref="sectionProductionTable22"
-			id="sectionProductionTable2"
 			:table-props="tableProp2"
 			:table-data="tableData2"
 			:span-method="objectSpanMethod2"
@@ -32,18 +30,17 @@ const tableProp1 = [
 	{
 		prop: 'lineName',
 		label: '生产线',
-		width: 80,
+		width: 110,
 		fixed: true,
 	},
 	{
 		label: '时间',
 		fixed: true,
-		width: 140,
+		width: 110,
 		children: [
 			{
 				prop: 'procedure',
 				label: '工序',
-				fixed: true,
 				width: 140,
 			},
 		],
@@ -135,13 +132,13 @@ export default {
 				},
 			],
 			queryParams: {
-				startTime: '',
+				startTime: '1706114700000',
-				endTime: '',
+				endTime: '1706190300000',
 				lineId: '',
 			},
 			queryParams2: {
-				startTime: '',
+				startTime: '1706114700000',
-				endTime: '',
+				endTime: '1706190300000',
 				lineId: '',
 			},
 			tableProp1,
@@ -169,11 +166,6 @@ export default {
 		this.getLine();
 		this.tableProp = this.tableProp1;
 		this.tableProp2 = this.tableProp1;
-		let arr = this.getTime('1');
-		this.queryParams.startTime = arr[0];
-		this.queryParams.endTime = arr[1];
-		this.queryParams2.startTime = arr[0];
-		this.queryParams2.endTime = arr[1];
 		this.getList();
 		this.getList2();
 	},
@@ -193,8 +185,8 @@ export default {
 			// 获取数据
 			originalSection({ ...this.queryParams }).then((res) => {
 				let data = res.data;
-				this.tableProp = [];
 				let timeArr = this.uniqueTime(data, 'timeStr');
+				this.tableProp = [];
 				let arr = [];
 				timeArr.map((item) => {
 					let obj = {};
@@ -208,44 +200,34 @@ export default {
 			});
 		},
 		getTime(val) {
-			let nowTime = moment().valueOf();
-			let dTime = moment(moment().format('YYYY-MM-DD') + ' 07:00:00').valueOf();
 			switch (val) {
 				case '1':
-					let fTime = moment(
+					let nowTime = moment().valueOf();
-						moment(moment().valueOf() - 86400000).format('YYYY-MM-DD') +
+					let dTime = moment(
-							' 19:00:00'
+						moment().format('YYYY-MM-DD') + ' 07:00:00'
 					).valueOf();
 					let nTime = moment(
 						moment().format('YYYY-MM-DD') + ' 19:00:00'
 					).valueOf();
-					if (nowTime <= dTime) {
+					let fTime =
-						return [fTime, nowTime];
+						moment(moment().valueOf() - 86400).format('YYYY-MM-DD') +
-					} else if (nowTime > dTime && nowTime <= nTime) {
+						' 19:00:00';
-						return [dTime, nowTime];
+					console.log(fTime);
-					} else {
+					// if (nowTime >= dTime) {
-						return [nTime, nowTime];
+					// 	return [dTime, nowTime]
-					}
+					// }else if (){
+
+					// }
 					break;
 				case '2':
-					let lastTime = nowTime - 86400000;
-					return [lastTime, nowTime];
 					break;
 				default:
-					let f1Time = dTime - 86400000 * 2;
-					let f2Time = dTime - 86400000;
-					if (nowTime <= dTime) {
-						return [f1Time, f2Time];
-					} else {
-						return [f2Time, dTime];
-					}
 			}
 		},
 		buttonClick(val) {
 			if (val.btnName === 'search') {
 				this.queryParams.lineId = val.lineId;
-				this.queryParams.startTime = this.getTime(val.timeType)[0];
+				this.getTime(val.timeType);
-				this.queryParams.endTime = this.getTime(val.timeType)[1];
 				this.getList();
 			} else {
 				//导出
@@ -286,61 +268,39 @@ export default {
 		transferData(data) {
 			let tempData = [];
 			let lineNum = 0; //第一条产线
-			let sumArr = [];
 			for (let i = 0; i < data.length; i++) {
 				if (i === 0) {
 					this.procedureName.map((item) => {
 						let obj = {};
 						obj.lineName = data[i].lineName;
 						obj.procedure = item.name;
-						obj.eName = item.ename;
 						obj[data[i].timeStr] = data[i][item.ename];
 						tempData.push(obj);
 					});
 					lineNum++;
 				} else {
-					if (data[i].timeStr === '总计') {
+					if (data[i].lineName === data[i - 1].lineName) {
-						sumArr.push(data[i]);
+						//相同产线,添加列
-					} else {
+						let startNum = 5 * (lineNum - 1);
-						if (data[i].lineName === data[i - 1].lineName) {
+						let endNum = 5 * lineNum - 1;
-							//相同产线,添加列
+						for (let k = startNum; k <= endNum; k++) {
-							let startNum = 5 * (lineNum - 1);
+							let str = this.procedureName[k % 5];
-							let endNum = 5 * lineNum - 1;
+							tempData[k][data[i].timeStr] = data[i][str.ename];
-							for (let k = startNum; k <= endNum; k++) {
-								let str = this.procedureName[k % 5];
-								tempData[k][data[i].timeStr] = data[i][str.ename];
-							}
-						} else {
-							//不同产线，同时添加5行
-							this.procedureName.map((item) => {
-								let obj = {};
-								obj.lineName = data[i].lineName;
-								obj.procedure = item.name;
-								obj.eName = item.ename;
-								obj[data[i].timeStr] = data[i][item.ename];
-								tempData.push(obj);
-							});
-							lineNum++;
 						}
+					} else {
+						//不同产线，同时添加5行
+						this.procedureName.map((item) => {
+							let obj = {};
+							obj.lineName = data[i].lineName;
+							obj.procedure = item.name;
+							obj[data[i].timeStr] = data[i][item.ename];
+							tempData.push(obj);
+						});
+						lineNum++;
 					}
 				}
 			}
-			for (let j = 0; j < tempData.length; j++) {
-				sumArr.map((item) => {
-					tempData[j]['总计'] = item[tempData[j].eName];
-				});
-			}
 			this.tableData = tempData;
-
-			this.$nextTick(() => {
-				this.reTable1();
-			});
-		},
-		reTable1() {
-			this.$refs.sectionProductionTable11.doLayout('sectionProductionTable1');
-		},
-		reTable2() {
-			this.$refs.sectionProductionTable22.doLayout('sectionProductionTable2');
 		},
 		// 时间去重
 		uniqueTime(arr, prop) {
@@ -397,17 +357,12 @@ export default {
 				arr.push({ prop: 'sum', label: '合计' });
 				this.tableProp2 = this.tableProp1.concat(arr); //表头
 				this.getSpanArr(this.tableData2);
-				this.$nextTick(() => {
-					this.reTable2();
-				});
 			});
 		},
 		// 表格2
 		buttonClick2(val) {
 			if (val.btnName === 'search') {
 				this.queryParams2.lineId = val.lineId;
-				this.queryParams2.startTime = this.getTime(val.timeType)[0];
-				this.queryParams2.endTime = this.getTime(val.timeType)[1];
 				this.getList2();
 			} else {
 				this.exportTable('.sectionProductionTable2', '深加工工段数据.xlsx', 1);

src/views/report/ingredientReport/day.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-23 15:05:47
+ * @LastEditTime: 2024-04-22 08:42:07
  * @LastEditors: zhp
  * @Description:
 -->
@@ -36,19 +36,6 @@
         <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"
@@ -185,7 +172,7 @@ export default {
           spanOneArr.push(1);
         } else {
           //第一列需合并相同内容的判断条件
-          if (item.classType === this.tableData[index - 1].classType) {
+          if (item.className === this.tableData[index - 1].className) {
             spanOneArr[concatOne] += 1;
             spanOneArr.push(0);
           } else {
@@ -203,14 +190,6 @@ 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
-      //     }
-      // }
-      // }
     },
     handleExport() {
       // 处理查询参数
@@ -281,23 +260,6 @@ 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)',
@@ -315,23 +277,6 @@ 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)',
@@ -349,23 +294,6 @@ 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)',
@@ -384,24 +312,7 @@ export default {
             putType: '投入次数',
           },
           {
-            classType: 2,
+            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: 3,
             className: '全天',
             'sj1': null,
             'sj2': null,
@@ -418,24 +329,7 @@ export default {
             putType: '投入数量',
           },
           {
-            classType: 3,
+            classType: 2,
-            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,
@@ -450,37 +344,20 @@ 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[2][item] = ele.useNum
+              arr[1][item] = ele.useNum
             } else if (ele.classType === 2 && ele.code == item) {
-              arr[4][item] = ele.putNum
+              arr[2][item] = ele.putNum
-              arr[6][item] = ele.useNum
+              arr[3][item] = ele.useNum
             } else if (ele.classType === 3 && ele.code == item) {
-              arr[8][item] = ele.putNum
+              arr[4][item] = ele.putNum
-              arr[10][item] = ele.useNum
+              arr[5][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 15:08:51
+ * @LastEditTime: 2024-04-23 13:46:29
  * @LastEditors: zhp
  * @Description:
 -->
@@ -154,7 +154,7 @@ export default {
           endPlaceholder: '结束时间',
           param: 'checkTime',
           defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
-          width: 350
+          width: 250
         },
         {
           type: 'select',

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

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

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

@@ -3,11 +3,10 @@
 		<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
+			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<base-table
 			class="israLineReportTable1"
-			ref="israLineReportTable11"
-			id="israLineReportTable1"
 			:table-props="tableProp"
 			:table-data="tableData"
 			:span-method="objectSpanMethod"
@@ -200,12 +199,6 @@ export default {
 			}
 			this.tableData = part2Data;
 			this.getSpanArr(this.tableData);
-			this.$nextTick(() => {
-				this.reTable();
-			});
-		},
-		reTable() {
-			this.$refs.israLineReportTable11.doLayout('israLineReportTable1');
 		},
 		// 产线去重
 		uniqueLine(arr, prop) {

src/views/report/qcReport/lineReport.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-23 15:08:40
+ * @LastEditTime: 2024-04-23 13:51:30
  * @LastEditors: zhp
  * @Description:
 -->
@@ -129,7 +129,7 @@ export default {
           endPlaceholder: '结束时间',
           param: 'checkTime',
           defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
-          width: 350
+          width: 250
         },
         {
           type: 'select',

src/views/report/qcReport/optimizeCutData.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-23 15:07:51
+ * @LastEditTime: 2024-04-23 13:51:20
  * @LastEditors: zhp
  * @Description:
 -->
@@ -99,7 +99,7 @@ export default {
       listQuery: {
         startTime: undefined,
         endTime: undefined,
-        lineId:undefined
+        lineId:null
       },
       formConfig: [
         // {
@@ -128,7 +128,7 @@ export default {
           endPlaceholder: '结束时间',
           param: 'checkTime',
           defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
-          width: 350
+          width: 250
         },
         {
           type: 'select',