.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: zhp
  # @Date: 2024-04-12 14:30:48
- # @LastEditTime: 2024-04-23 13:52:57
+ # @LastEditTime: 2024-04-22 16:16:52
  # @LastEditors: zhp
  # @Description:
 ###
@@ -12,8 +12,8 @@ ENV = 'development'
 VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
+VUE_APP_BASE_API = 'http://192.168.1.104:48082'
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
 

src/api/report/customizedReports.js

@@ -1,45 +0,0 @@
-import request from '@/utils/request'
-// 原片工段数据
-export function originalSection(data) {
-  return request({
-    url: '/extend/customized-reports/originalSection',
-    method: 'post',
-    data: data
-  })
-}
-
-// 原片产线数据
-export function getOriginalLine(query) {
-  return request({
-    url: '/extend/customized-reports/getOriginalLine',
-    method: 'get',
-    params: query
-  })
-}
-
-// 深加工产线数据
-export function getProcessingLine(query) {
-  return request({
-    url: '/extend/customized-reports/getProcessingLine',
-    method: 'get',
-    params: query
-  })
-}
-
-// 深加工工段数据
-export function processing(data) {
-  return request({
-    url: '/extend/customized-reports/processing',
-    method: 'post',
-    data: data
-  })
-}
-
-// isra数据记录
-export function israData(data) {
-  return request({
-    url: '/extend/customized-reports/isra',
-    method: 'post',
-    data: data
-  })
-}

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-22 16:21:26
  * @LastEditors: zhp
  * @Description:
  */
@@ -62,19 +62,3 @@ export function updateAutoDailyData(data) {
     data: data
   })
 }
-
-export function getCWSectionList(query) {
-  return request({
-    url: 'base/core-production-line/listAll',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getCuttingReportDataList(data) {
-  return request({
-    url: 'extend/customized-reports/cuttingReport',
-    method: 'post',
-    data: data
-  })
-}

src/views/order/monitoring/orderCompletionMonitoring/index.vue

@@ -376,7 +376,7 @@ export default {
 	},
 };
 </script>
-<style lang="scss">
+<style lang='scss'>
 .orderMonitoring {
 	.el-tabs__nav::after {
 		content: '';
@@ -431,4 +431,4 @@ export default {
 		vertical-align: bottom;
 	}
 }
-</style>
+</style>

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-04-23 09:05:08
+ * @LastEditTime: 2024-04-22 16:14:19
  * @LastEditors: zhp
  * @Description:
 -->
@@ -16,9 +16,9 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="small"
+          <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
             @click="getDataList">查询</el-button>
-          <el-button  type="primary" size="small"
+          <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
             plain @click="handleExport">导出</el-button>
         </el-form-item>
       </el-form>

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

@@ -1,437 +0,0 @@
-<template>
-	<div class="app-container sectionProductionReport">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			class="sectionProductionTable1"
-			:table-props="tableProp"
-			:table-data="tableData"
-			:span-method="objectSpanMethod"
-			:max-height="tableH" />
-		<!-- 搜索工作栏 -->
-		<search-bar
-			style="margin-top: 10px"
-			:formConfigs="formConfig2"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick2" />
-		<base-table
-			class="sectionProductionTable2"
-			:table-props="tableProp2"
-			:table-data="tableData2"
-			:span-method="objectSpanMethod2"
-			:max-height="tableH" />
-	</div>
-</template>
-<script>
-const tableProp1 = [
-	{
-		prop: 'lineName',
-		label: '生产线',
-		width: 110,
-		fixed: true,
-	},
-	{
-		label: '时间',
-		fixed: true,
-		width: 110,
-		children: [
-			{
-				prop: 'procedure',
-				label: '工序',
-				width: 140,
-			},
-		],
-	},
-];
-import {
-	originalSection,
-	getOriginalLine,
-	getProcessingLine,
-	processing,
-} from '@/api/report/customizedReports';
-import FileSaver from 'file-saver';
-import moment from 'moment';
-export default {
-	name: 'SectionProduction',
-	data() {
-		return {
-			tableH: this.tableHeight(280) / 2,
-			formConfig: [
-				{
-					type: 'select',
-					label: '生产线',
-					selectOptions: [],
-					param: 'lineId',
-				},
-				{
-					type: 'select',
-					label: '时间',
-					selectOptions: [
-						{ id: '1', name: '当前班次' },
-						{ id: '2', name: '近24小时' },
-						{ id: '3', name: '日报' },
-					],
-					defaultSelect: '1',
-					param: 'timeType',
-					clearable: false,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					plain: true,
-					color: 'primary',
-				},
-			],
-			formConfig2: [
-				{
-					type: 'select',
-					label: '生产线',
-					selectOptions: [],
-					param: 'lineId',
-				},
-				{
-					type: 'select',
-					label: '时间',
-					defaultSelect: '1',
-					selectOptions: [
-						{ id: '1', name: '当前班次' },
-						{ id: '2', name: '近24小时' },
-						{ id: '3', name: '日报' },
-					],
-					param: 'timeType',
-					clearable: false,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					plain: true,
-					color: 'primary',
-				},
-			],
-			queryParams: {
-				startTime: '1706114700000',
-				endTime: '1706190300000',
-				lineId: '',
-			},
-			queryParams2: {
-				startTime: '1706114700000',
-				endTime: '1706190300000',
-				lineId: '',
-			},
-			tableProp1,
-			tableProp: [],
-			tableData: [],
-			tableProp2: [],
-			tableData2: [],
-			procedureName: [
-				{ name: '压延(拉引量t)', ename: 'calenderingCapacity' },
-				{ name: '优化切割(片)', ename: 'cuttingNum' },
-				{ name: '堆垛(片)', ename: 'unloadPieces' },
-				{ name: '堆垛(托)', ename: 'unloadCount' },
-				{ name: '良品率(%)', ename: 'rate' },
-			],
-			span: [], //表2第一列合并
-		};
-	},
-	created() {
-		window.addEventListener('resize', this._setTableHeight);
-	},
-	destroyed() {
-		window.removeEventListener('resize', this._setTableHeight);
-	},
-	mounted() {
-		this.getLine();
-		this.tableProp = this.tableProp1;
-		this.tableProp2 = this.tableProp1;
-		this.getList();
-		this.getList2();
-	},
-	methods: {
-		_setTableHeight() {
-			this.tableH = this.tableHeight(280) / 2;
-		},
-		getLine() {
-			getOriginalLine().then((res) => {
-				this.formConfig[0].selectOptions = res.data || [];
-			});
-			getProcessingLine().then((res) => {
-				this.formConfig2[0].selectOptions = res.data || [];
-			});
-		},
-		getList() {
-			// 获取数据
-			originalSection({ ...this.queryParams }).then((res) => {
-				let data = res.data;
-				let timeArr = this.uniqueTime(data, 'timeStr');
-				this.tableProp = [];
-				let arr = [];
-				timeArr.map((item) => {
-					let obj = {};
-					obj.prop = item.timeStr;
-					obj.label = item.timeStr;
-					obj.minWidth = 140;
-					arr.push(obj);
-				});
-				this.tableProp = this.tableProp1.concat(arr); //表头
-				this.transferData(data);
-			});
-		},
-		getTime(val) {
-			switch (val) {
-				case '1':
-					let nowTime = moment().valueOf();
-					let dTime = moment(
-						moment().format('YYYY-MM-DD') + ' 07:00:00'
-					).valueOf();
-					let nTime = moment(
-						moment().format('YYYY-MM-DD') + ' 19:00:00'
-					).valueOf();
-					let fTime =
-						moment(moment().valueOf() - 86400).format('YYYY-MM-DD') +
-						' 19:00:00';
-					console.log(fTime);
-					// if (nowTime >= dTime) {
-					// 	return [dTime, nowTime]
-					// }else if (){
-
-					// }
-					break;
-				case '2':
-					break;
-				default:
-			}
-		},
-		buttonClick(val) {
-			if (val.btnName === 'search') {
-				this.queryParams.lineId = val.lineId;
-				this.getTime(val.timeType);
-				this.getList();
-			} else {
-				//导出
-				this.exportTable('.sectionProductionTable1', '原片工段数据.xlsx', 0);
-			}
-		},
-		//导出表格
-		exportTable(className, fileName, num) {
-			// 处理查询参数
-			var fix = document.querySelectorAll('.el-table__fixed')[num];
-			var table = document.querySelector(className).childNodes[0];
-			var wb;
-			import('xlsx').then((excel) => {
-				if (fix) {
-					wb = excel.utils.table_to_book(table.removeChild(fix));
-					table.appendChild(fix);
-				} else {
-					wb = excel.utils.table_to_book(table);
-				}
-				/* 获取二进制字符串作为输出 */
-				var wbout = excel.write(wb, {
-					bookType: 'xlsx',
-					bookSST: true,
-					type: 'array',
-				});
-				try {
-					FileSaver.saveAs(
-						new Blob([wbout], { type: 'application/octet-stream' }),
-						//设置导出文件名称
-						fileName
-					);
-				} catch (e) {
-					if (typeof console !== 'undefined') console.log(e, wbout);
-				}
-				return wbout;
-			});
-		},
-		transferData(data) {
-			let tempData = [];
-			let lineNum = 0; //第一条产线
-			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[data[i].timeStr] = data[i][item.ename];
-						tempData.push(obj);
-					});
-					lineNum++;
-				} else {
-					if (data[i].lineName === data[i - 1].lineName) {
-						//相同产线,添加列
-						let startNum = 5 * (lineNum - 1);
-						let endNum = 5 * lineNum - 1;
-						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[data[i].timeStr] = data[i][item.ename];
-							tempData.push(obj);
-						});
-						lineNum++;
-					}
-				}
-			}
-			this.tableData = tempData;
-		},
-		// 时间去重
-		uniqueTime(arr, prop) {
-			return arr.filter((value, index, self) => {
-				return (
-					self.findIndex((t) => {
-						return t[prop] === value[prop];
-					}) === index
-				);
-			});
-		},
-		// 合并第一列
-		objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-			if (columnIndex === 0) {
-				if (rowIndex % 5 === 0) {
-					return {
-						rowspan: 5,
-						colspan: 1,
-					};
-				} else {
-					return {
-						rowspan: 0,
-						colspan: 0,
-					};
-				}
-			}
-		},
-		getList2() {
-			// 获取数据
-			processing({ ...this.queryParams2 }).then((res) => {
-				this.tableData2 = [];
-				let data = res.data;
-				for (let i = 0; i < data.length; i++) {
-					for (let j = 0; j < data[i].productDet.length; j++) {
-						let obj = {};
-						obj.lineName = data[i].lineName;
-						obj.procedure = data[i].productDet[j].name;
-						data[i].productDet[j].data.map((item) => {
-							obj[item.timeStr] = item.input || null;
-						});
-						obj.sum = data[i].productDet[j].allInput;
-						this.tableData2.push(obj);
-					}
-				}
-				let arr = [];
-				let propsArr = data[0].timeStr || [];
-				propsArr.map((t) => {
-					let obj = {};
-					obj.prop = t;
-					obj.label = t;
-					obj.minWidth = 140;
-					arr.push(obj);
-				});
-				arr.push({ prop: 'sum', label: '合计' });
-				this.tableProp2 = this.tableProp1.concat(arr); //表头
-				this.getSpanArr(this.tableData2);
-			});
-		},
-		// 表格2
-		buttonClick2(val) {
-			if (val.btnName === 'search') {
-				this.queryParams2.lineId = val.lineId;
-				this.getList2();
-			} else {
-				this.exportTable('.sectionProductionTable2', '深加工工段数据.xlsx', 1);
-			}
-		},
-		// 获取合并行
-		getSpanArr(data) {
-			this.span = [];
-			for (var i = 0; i < data.length; i++) {
-				if (i === 0) {
-					this.span.push(1);
-					this.index = 0;
-				} else {
-					if (data[i].lineName === data[i - 1].lineName) {
-						this.span[this.index] += 1;
-						this.span.push(0);
-					} else {
-						this.span.push(1);
-						this.index = i;
-					}
-				}
-			}
-		},
-		objectSpanMethod2({ rowIndex, columnIndex }) {
-			if (columnIndex === 0) {
-				const _row = this.span[rowIndex];
-				return {
-					rowspan: _row,
-					colspan: 1,
-				};
-			}
-		},
-	},
-};
-</script>
-<style lang="scss">
-.sectionProductionReport {
-	.el-table thead.is-group tr:first-of-type th:nth-child(2) {
-		border-bottom: none;
-	}
-	.el-table thead.is-group tr:first-of-type th:nth-child(2) div.cell {
-		padding-left: 82px;
-	}
-	.el-table th.el-table__cell {
-		height: 28px;
-	}
-	.el-table thead.is-group tr:first-of-type th:nth-child(2):before {
-		content: '';
-		position: absolute;
-		height: 80px;
-		top: 0;
-		left: 0;
-		background-color: #ebeef5;
-		transform: rotate(-70deg);
-		-webkit-transform-origin: top;
-		transform-origin: top;
-		width: 1px;
-	}
-	.el-table thead.is-group tr:last-of-type th:nth-child(1):before {
-		content: '';
-		position: absolute;
-		height: 67px;
-		top: 0;
-		left: 75px;
-		background-color: #ebeef5;
-		transform: rotate(-70deg);
-		-webkit-transform-origin: top;
-		transform-origin: top;
-		width: 1px;
-	}
-}
-</style>

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

@@ -1,22 +1,10 @@
-<!--
- * @Author: zhp
- * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-23 13:46:29
- * @LastEditors: zhp
- * @Description:
--->
 <template>
   <div class="app-container">
     <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <el-table :header-cell-style="{
+    <base-table :max-height="tableH" v-loading="dataListLoading" :table-props="tableProps" :table-data="tableData">
-      background: '#F2F4F9',
+      <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-      color: '#606266'
+        @clickBtn="handleClick" /> -->
-    }" class="baseTable" :max-height="tableH" id="exportTable" :data="tableData" style="width: 100%">
+    </base-table>
-      <el-table-column v-for="item in tableProps" :prop="item.prop" :label="item.label" align="center">
-        <el-table-column v-for="it in item.children" :prop="it.prop" :label="it.label" align="center">
-        </el-table-column>
-      </el-table-column>
-    </el-table>
     <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
       @pagination="getDataList" /> -->
     <!-- <base-dialog
@@ -36,8 +24,7 @@
 // import basicPage from '../../../core/mixins/basic-page';
 // import { parseTime } from '../../../core/mixins/code-filter';
 import {
-  getCWSectionList,
+  getOriginalData
-  getCuttingReportDataList
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
@@ -49,83 +36,56 @@ const tableProps = [
   //   filter: parseTime
   // },
   {
-    prop: '',
+    prop: 'lineName',
-    label: '切割堆垛日报',
+    label: '产线'
-    children:[
+  },
-      {
+  {
-        prop: 'lineName',
+    prop: 'equipmentName',
-        label: '产线'
+    label: ''
-      },
+  },
-      {
+  {
-        prop: 'className',
+    prop: 'num',
-        label: '班组'
+    label: '片数'
-      },
+  },
-      {
+  {
-        prop: 'groupName',
+    prop: 'area',
-        label: '班次'
+    label: '面积'
-      },
+  },
-      {
+  {
-        prop: 'size',
+    prop: 'countNum',
-        label: '规格 mm 长*宽'
+    label: '托数',
-      },
+    // filter: (val) => val == false ? '不合格' : '合格',
-      {
+  },
-        prop: 'thickness',
+  {
-        label: '厚度'
+    prop: 'size',
-      },
+    label: '规格',
-      {
+    // filter: (val) => val == 1 ? 'A' : val == 2 ? 'B' : 'C',
-        prop: 'glassCode',
+  },
-        label: '周转编号',
+  // {
-      },
+  //   prop: 'checkerName',
-      {
+  //   label: '检测人员'
-        prop: 'stackingType',
+  // },
-        label: '堆垛方式',
+  // {
-        filter: (val) => val == 1 ? '集装架' : '堵头箱',
+  //   prop: 'checkTime',
-      },
+  //   label: '检测时间',
-      {
+  //   filter: parseTime
-        prop: 'pieces',
+  // },
-        label: '片数',
-      },
-      {
-        prop: 'originCode',
-        label: '堆垛工位',
-      },
-      {
-        prop: 'endTime',
-        label: '堆垛时间',
-      },
-      {
-        prop: 'dusting',
-        label: '堆垛情况',
-      },
-      {
-        prop: 'palletNumber',
-        label: '堆垛时间',
-      },
-      {
-        prop: 'endTime',
-        label: '集装架号',
-      },
-    ]
-  }
 ];
 
 export default {
-  mixins: [tableHeightMixin],
+  mixins: [ tableHeightMixin],
   data() {
     return {
       urlOptions: {
-        getDataListURL: getCuttingReportDataList,
+        getDataListURL: getOriginalData,
         // deleteURL: deleteQualityHotMaterial,
         // exportURL: exportFactoryExcel,
       },
       tableProps,
       tableData: [],
-      mergeArr: [],//记录合并行数
-      pos: 0,
       listQuery: {
         startTime: undefined,
-        endTime: undefined,
+        endTime:undefined
-        lineId: null,
       },
       formConfig: [
         // {
@@ -148,25 +108,16 @@ export default {
           label: '时间段',
           dateType: 'daterange',
           format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: "timestamp",
+          // valueFormat: "yyyy-MM-dd HH:mm:ss",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'checkTime',
-          defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
+          defaultSelect: [],
           width: 250
         },
         {
-          type: 'select',
+          type: this.$auth.hasPermi('base:quality-hot-material:query') ? 'button' : '',
-          label: '产线',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'lineId',
-          filterable: true
-        },
-        {
-          type: 'button',
           btnName: '查询',
           name: 'search',
           color: 'primary',
@@ -176,7 +127,7 @@ export default {
         //   // type: 'separate',
         // },
         {
-          type: 'button',
+          type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'button' : '',
           btnName: '导出',
           name: 'export',
           color: 'success',
@@ -190,79 +141,12 @@ export default {
   },
   created() { },
   mounted() {
-    // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
-    this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
-    // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
     this.getDataList()
-    this.getDict()
-    // this.getSpanArr(this.tableData)
     // this.getDict();
   },
   methods: {
-    async getDict() {
-      const res = await getCWSectionList()
-      console.log(res)
-      this.formConfig[1].selectOptions = res.data
-    },
-    // getSummaries(param) {
-    //   console.log(columns)
-
-    //   const { columns, data } = param;
-    //   const sums = [];
-    //   columns.forEach((column, index) => {
-    //     if (index === 0) {
-    //       sums[index] = '合计';
-    //       return;
-    //     }
-    //     const values = data.map(item => Number(item[column.property]));
-    //     // const data = data.map(item => !Number(item[column.property]));
-    //     if (!values.every(value => isNaN(value))) {
-    //       sums[index] = values.reduce((prev, curr) => {
-    //         const value = Number(curr);
-    //         if (!isNaN(value)) {
-    //           return prev + curr;
-    //         } else {
-    //           return prev;
-    //         }
-    //       }, 0);
-    //       sums[index] += ' ';
-    //     } else {
-    //       sums[index] = '-';
-    //     }
-    //   });
-
-    //   return sums;
-    // },
-    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      let spanOneArr = [], concatOne = 0;
-      this.tableData.map((item, index) => {
-        if (index === 0) {
-          spanOneArr.push(1);
-        } else {
-          //第一列需合并相同内容的判断条件
-          if (item.lineName === this.tableData[index - 1].lineName) {
-            spanOneArr[concatOne] += 1;
-            spanOneArr.push(0);
-          } else {
-            spanOneArr.push(1);
-            concatOne = index;
-          };
-        }
-      });
-
-      if (columnIndex === 0) {
-        const _row = spanOneArr[rowIndex];
-        const _col = _row > 0 ? 1 : 0;
-        return {
-          rowspan: _row,
-          colspan: _col
-        }
-      }
-    },
     handleExport() {
       // 处理查询参数
-      console.log(this.$refs);
       var xlsxParam = { raw: true };
       /* 从表生成工作簿对象 */
       import('xlsx').then(excel => {
@@ -306,39 +190,10 @@ export default {
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-      // this.listQuery.startTime = '1711095616000';
+      this.listQuery.startTime = '1711095616000';
-      // this.listQuery.endTime = '1711183743000';
+      this.listQuery.endTime = '1711183743000';
       this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        // this.getSpanArr(this.tableData)
-        // response.data.forEach((ele) => {
-        //   console.log(ele.size.substring(2, ele.size.length - 2))
-        //   // console.log(Object.prototype.toString.call(ele.size))
-        //   // // if (Object.prototype.toString.call(ele.size) === Array) {
-        //   //   console.log(11111)
-        //   //   console.log();
-        //   // }
-        // })
         this.tableData = response.data
-        // let obj = {}
-        // response.data.reduce((prev, curr) => {
-        //   console.log(prev, curr)
-        // })
-        // this.tableData.forEach((ele) => {
-        //   ele.size.substring(2, ele.size.length - 2)
-        //   // console.log(Object.prototype.toString.call(ele.size))
-        //   // // if (Object.prototype.toString.call(ele.size) === Array) {
-        //   //   console.log(11111)
-        //   //   console.log();
-        //   // }
-        // })
-        // let obj = {}
-        // this.tableData.forEach(ele => {
-        //   obj.num += ele.num
-        //   obj.area += ele.num
-        //   obj.count += ele.num
-
-        // })
-        // console.log(obj);
         // this.listQuery.total = response.data.total;
         this.dataListLoading = false;
       });
@@ -378,7 +233,6 @@ export default {
           // this.listQuery.endTime = '1706230804000';
           this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
           this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
-          this.listQuery.lineId = val.lineId ? val.lineId : undefined
           this.getDataList();
           break;
         // case 'reset':
@@ -405,13 +259,3 @@ export default {
   },
 };
 </script>
-<style>
-.baseTable .el-table__body tr.current-row>td.el-table__cell {
-  background-color: #EAF1FC;
-}
-
-.baseTable .el-table .el-table__cell {
-  padding: 0;
-  height: 35px;
-}
-</style>

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

@@ -1,35 +1,13 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-23 13:51:05
+ * @LastEditTime: 2024-04-22 17:10:49
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div class="app-container">
-    <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-      <el-form-item label="日" prop="startTime">
-        <el-date-picker v-model="listQuery.startTime" value-format="timestamp" type="date" placeholder="选择日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="产线" prop="productionLineId">
-        <el-select v-model="listQuery.productionLineId" placeholder="请选择">
-          <el-option v-for="item in lineList" :key="item.id" :label="item.name" :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="" prop="">
-        <el-radio-group v-model="radio" @input="handleGetClass">
-          <el-radio-button label="早班查询"></el-radio-button>
-          <el-radio-button label="晚班查询"></el-radio-button>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" size="small" @click="getDataList">查询</el-button>
-        <el-button type="primary" size="small" plain @click="handleExport">导出</el-button>
-      </el-form-item>
-    </el-form>
     <!-- <el-table show-summary :header-cell-style="{
       background: '#F2F4F9',
       color: '#606266'
@@ -46,29 +24,19 @@
       </el-table-column>
     </el-table> -->
 
-    <el-table class="baseTable" :data="tableData" style="width: 100%">
+    <el-table class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%">
-      <el-table-column label="时间" align="right" width="150">
+      <el-table-column label="原料样式" align="right" width="150">
-        <el-table-column prop="name" label="缺陷" width="120">
+        <el-table-column prop="className" label="时间" width="120">
         </el-table-column>
       </el-table-column>
-      <!-- <el-table-column prop="putType" label="" width="180">
+      <el-table-column prop="putType" label="" width="180">
-      </el-table-column> -->
+      </el-table-column>
       <!-- <el-table-column prop label="参考标准及评价方法">
         <el-table-column prop="activityName"></el-table-column>
         <el-table-column prop="message"></el-table-column>
       </el-table-column> -->
-      <el-table-column v-for="(item, index) in codeList " :prop="item.prop" :label="item.label">
+      <el-table-column v-for="(item, index) in codeList " :prop="item" :label="item">
       </el-table-column>
-      <div slot="append" v-if="this.tableData.length != 0" style="text-align: center">
-        <!--在此处添加你想要插入在表格最后一行的内容-->
-
-        <el-col :span="8">
-          合计
-        </el-col>
-        <el-col :span="8">
-          {{ sum }}
-        </el-col>
-      </div>
     </el-table>
     <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
       @pagination="getDataList" /> -->
@@ -89,8 +57,7 @@
 // import basicPage from '../../../core/mixins/basic-page';
 // import { parseTime } from '../../../core/mixins/code-filter';
 import {
-  getQualityRecordReport,
+  getQualityRecordReport
-  getCWSectionList
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
@@ -147,68 +114,7 @@ export default {
         // deleteURL: deleteQualityHotMaterial,
         // exportURL: exportFactoryExcel,
       },
-      listQuery: {
+      codeList: ['sj1', 'sj2', 'sj3', 'sj4', 'sj5', 'sj7', 'sj8', 'sj10', 'sj11', 'sj12', 'sj13', 'sj14'],
-        startTime: null,
-        productionLineId:null,
-      },
-      sum:null,
-      radio:'晚班查询',
-      lineList:[],
-      codeList: [
-        {
-          label: '19:00',
-          prop: 'num0'
-
-        },
-        {
-          label: '20:00',
-          prop: 'num1'
-        },
-        {
-          label: '21:00',
-          prop: 'num2'
-        },
-        {
-          label: '22:00',
-          prop: 'num3'
-        },
-        {
-          label: '23:00',
-          prop: 'num4'
-        },
-        {
-          label: '00:00',
-          prop: 'num5'
-        },
-        {
-          label: '01:00',
-          prop: 'num6'
-        },
-        {
-          label: '02:00',
-          prop: 'num7'
-        },
-        {
-          label: '03:00',
-          prop: 'num8'
-        },
-        {
-          label: '04:00',
-          prop: 'num9'
-        },
-        {
-          label: '05:00',
-          prop: 'num10'
-        },
-        {
-          label: '06:00',
-          prop: 'num11'
-        },
-        {
-          label: '合计',
-          prop: 'sum'
-        }
-      ],
       tableData: [],
       formConfig: [
         {
@@ -250,186 +156,35 @@ export default {
     // this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
     // this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
-    this.listQuery.startTime = new Date(new Date().setHours(1, 9, 0, 0)).getTime()
     this.getDataList()
-    this.getDict()
     // this.getSpanArr(this.tableData)
     // this.getDict();
   },
   methods: {
-    async getDict() {
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      const res = await getCWSectionList()
+      let spanOneArr = [], concatOne = 0;
-      console.log(res)
+      this.tableData.map((item, index) => {
-      this.lineList = res.data
+        if (index === 0) {
-    },
+          spanOneArr.push(1);
-    // objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        } else {
-    //   let spanOneArr = [], concatOne = 0;
+          //第一列需合并相同内容的判断条件
-    //   this.tableData.map((item, index) => {
+          if (item.className === this.tableData[index - 1].className) {
-    //     if (index === 0) {
+            spanOneArr[concatOne] += 1;
-    //       spanOneArr.push(1);
+            spanOneArr.push(0);
-    //     } else {
+          } else {
-    //       //第一列需合并相同内容的判断条件
+            spanOneArr.push(1);
-    //       if (item.className === this.tableData[index - 1].className) {
+            concatOne = index;
-    //         spanOneArr[concatOne] += 1;
+          };
-    //         spanOneArr.push(0);
+        }
-    //       } else {
+      });
-    //         spanOneArr.push(1);
-    //         concatOne = index;
-    //       };
-    //     }
-    //   });
 
-    //   if (columnIndex === 0) {
+      if (columnIndex === 0) {
-    //     const _row = spanOneArr[rowIndex];
+        const _row = spanOneArr[rowIndex];
-    //     const _col = _row > 0 ? 1 : 0;
+        const _col = _row > 0 ? 1 : 0;
-    //     return {
+        return {
-    //       rowspan: _row,
+          rowspan: _row,
-    //       colspan: _col
+          colspan: _col
-    //     }
+        }
-    //   }
-    // },
-    formatDateTime(time) {
-      var date = new Date(time);
-      var y = date.getFullYear();
-      var m = date.getMonth() + 1;
-      m = m < 10 ? ('0' + m) : m;
-      var d = date.getDate();
-      d = d < 10 ? ('0' + d) : d;
-      var h = date.getHours();
-      h = h < 10 ? ('0' + h) : h;
-      var minute = date.getMinutes();
-      var second = date.getSeconds();
-      minute = minute < 10 ? ('0' + minute) : minute;
-      second = second < 10 ? ('0' + second) : second;
-
-      return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
-    },
-    handleGetClass(e) {
-
-      this.listQuery.startTime = new Date(new Date().setHours(0, 7, 0, 0)).getTime()
-      // console.log(startTime1)
-      this.codeList = []
-      if (e === '早班查询') {
-        let arr = [
-          {
-            label: '07:00',
-            prop:'num0'
-          },
-          {
-            label: '08:00',
-            prop: 'num1'
-          },
-          {
-            label: '09:00',
-            prop: 'num2'
-          },
-          {
-            label: '10:00',
-            prop: 'num3'
-          },
-          {
-            label: '11:00',
-            prop: 'num4'
-          },
-          {
-            label: '12:00',
-            prop: 'num5'
-          },
-          {
-            label: '13:00',
-            prop: 'num6'
-          },
-          {
-            label: '14:00',
-            prop: 'num7'
-          },
-          {
-            label: '15:00',
-            prop: 'num8'
-          },
-          {
-            label: '16:00',
-            prop: 'num9'
-          },
-          {
-            label: '17:00',
-            prop: 'num10'
-          },
-          {
-            label: '18:00',
-            prop: 'num11'
-          },
-          {
-            label: '合计',
-            prop: 'sum'
-          }
-        ]
-        arr.forEach((ele,index) => [
-          this.codeList.push(ele)
-        ])
-        this.getDataList()
-      } else {
-        // this.codeList = []
-        this.listQuery.startTime = new Date(new Date().setHours(1, 9, 0, 0)).getTime()
-       let  arr = [
-          {
-           label: '19:00',
-           prop: 'num0'
-
-          },
-          {
-            label: '20:00',
-            prop: 'num1'
-          },
-          {
-            label: '21:00',
-            prop: 'num2'
-          },
-          {
-            label: '22:00',
-            prop: 'num3'
-          },
-          {
-            label: '23:00',
-            prop: 'num4'
-          },
-          {
-            label: '00:00',
-            prop: 'num5'
-          },
-          {
-            label: '01:00',
-            prop: 'num6'
-          },
-          {
-            label: '02:00',
-            prop: 'num7'
-          },
-          {
-            label: '03:00',
-            prop: 'num8'
-          },
-          {
-            label: '04:00',
-            prop: 'num9'
-          },
-          {
-            label: '05:00',
-            prop: 'num10'
-          },
-          {
-            label: '06:00',
-            prop: 'num11'
-         },
-         {
-           label: '合计',
-           prop: 'sum'
-         }
-        ]
-        arr.forEach((ele, index) => [
-          this.codeList.push(ele)
-        ])
-        this.getDataList()
       }
     },
     handleExport() {
@@ -481,35 +236,10 @@ export default {
       // this.listQuery.startTime = '1713197388000';
       // this.listQuery.endTime = '1713254961000';
       this.urlOptions.getDataListURL({
-        // productionLineId: '1696716506443354114',
+        productionLineId: '1696716506443354114',
-        // startTime: '1705618800000'
+        startTime: '1705618800000'
-        productionLineId: this.listQuery.productionLineId,
-        startTime:this.listQuery.startTime
       },).then(res => {
-        let count = 0
+        console.log(res.data);
-        let arr = []
-        console.log(res.data)
-        this.sum = res.data.allSum
-        for (let i in res.data.qualityInspectionRecordReportLineVOMap) {
-          count ++,
-          console.log(res.data.qualityInspectionRecordReportLineVOMap[i])
-          // arr.push({
-
-          // })
-          // console.log(arr)
-          let obj = {
-            name: res.data.qualityInspectionRecordReportLineVOMap[i].content,
-            sum: res.data.qualityInspectionRecordReportLineVOMap[i].sum,
-          }
-          res.data.qualityInspectionRecordReportLineVOMap[i].nums.forEach((ele, index) => {
-            obj['num' +index] = ele
-            // console.log(arr[count])
-            // arr[count]['num'+index] = ele
-          })
-          arr.push(obj)
-        }
-        console.log(arr);
-        this.tableData = arr
         // console.log(res)
         // console.log(res.data)
         // let arr = [

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

@@ -1,338 +0,0 @@
-<template>
-	<div class="app-container isra-line-report">
-		<!-- 搜索工作栏 -->
-		<search-bar
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@headBtnClick="buttonClick" />
-		<base-table
-			class="israLineReportTable1"
-			:table-props="tableProp"
-			:table-data="tableData"
-			:span-method="objectSpanMethod"
-			:max-height="tableH" />
-	</div>
-</template>
-<script>
-const tableProp1 = [
-	{
-		prop: 'dataStr',
-		label: '日期',
-		width: 110,
-		fixed: true,
-	},
-	{
-		prop: 'lineName',
-		label: '生产线',
-		width: 110,
-		fixed: true,
-	},
-	{
-		label: '类型',
-		fixed: true,
-		width: 110,
-		children: [
-			{
-				prop: 'className',
-				label: '班次',
-				width: 140,
-			},
-		],
-	},
-];
-import { israData } from '@/api/report/customizedReports';
-import moment from 'moment';
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
-import { getOriginalLine } from '@/api/report/customizedReports';
-import FileSaver from 'file-saver';
-export default {
-	name: 'IsraLineReport',
-	mixins: [tableHeightMixin],
-	data() {
-		return {
-			heightNum: 215,
-			formConfig: [
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'timeVal',
-					defaultSelect: [],
-					width: 250,
-				},
-				{
-					type: 'select',
-					label: '产线',
-					selectOptions: [],
-					param: 'lineId',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				{
-					type: 'separate',
-				},
-				{
-					type: 'button',
-					btnName: '导出',
-					name: 'export',
-					plain: true,
-					color: 'primary',
-				},
-			],
-			queryParams: {
-				startTime: '',
-				endTime: '',
-				lineId: '',
-			},
-			tableProp1,
-			tableProp: [],
-			tableData: [],
-			span: [], //表第一列合并
-		};
-	},
-	created() {
-		this.getLine();
-	},
-	mounted() {
-		this.tableProp = this.tableProp1;
-		let start = moment().format('yyyy-MM-DD');
-		let end = moment().format('yyyy-MM-DD');
-		this.formConfig[0].defaultSelect = [start, end];
-		this.queryParams.startTime = moment(start + ' 00:00:00').valueOf();
-		this.queryParams.endTime = moment(end + ' 23:59:59').valueOf();
-		this.getList();
-	},
-	methods: {
-		getLine() {
-			getOriginalLine().then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
-			});
-		},
-		getList() {
-			israData({ ...this.queryParams }).then((res) => {
-				this.tableProp = [];
-				let data = res.data;
-				if (data.length > 0) {
-					let typeArr = data[0].allType;
-					let arr = [];
-					typeArr &&
-						typeArr.map((item) => {
-							let obj = {};
-							obj.prop = item.name;
-							obj.label = item.name;
-							obj.minWidth = 120;
-							arr.push(obj);
-						});
-					this.tableProp = this.tableProp1.concat(arr); //表头
-					this.transformData(data);
-				}
-			});
-		},
-		transformData(data) {
-			let part1Data = [];
-			let part2Data = [];
-			for (let i = 0; i < data.length; i++) {
-				let obj = {};
-				let arr = [];
-				arr = this.uniqueLine(data[i].allClass, 'lineName');
-				obj.dataStr = data[i].dataStr;
-				obj.dayClass = [];
-				obj.allClass = [];
-				obj.nightClass = [];
-				obj.num = arr.length;
-				arr.length > 0 &&
-					arr.map((item) => {
-						// 白班
-						let dobj = {};
-						dobj.className = '白班';
-						dobj.dataStr = data[i].dataStr;
-						for (let a = 0; a < data[i].dayClass.length; a++) {
-							dobj.lineName = item.lineName;
-							if (item.lineName === data[i].dayClass[a].lineName) {
-								dobj[data[i].dayClass[a].checkType] =
-									data[i].dayClass[a].checkNum;
-							}
-						}
-						obj.dayClass.push(dobj);
-						// 夜班
-						let nobj = {};
-						nobj.className = '夜班';
-						nobj.dataStr = data[i].dataStr;
-						for (let a = 0; a < data[i].nightClass.length; a++) {
-							nobj.lineName = item.lineName;
-							if (item.lineName === data[i].nightClass[a].lineName) {
-								nobj[data[i].nightClass[a].checkType] =
-									data[i].nightClass[a].checkNum;
-							}
-						}
-						obj.nightClass.push(nobj);
-						// 合计
-						let sobj = {};
-						sobj.className = '合计';
-						sobj.dataStr = data[i].dataStr;
-						for (let a = 0; a < data[i].allClass.length; a++) {
-							sobj.lineName = item.lineName;
-							if (item.lineName === data[i].allClass[a].lineName) {
-								sobj[data[i].allClass[a].checkType] =
-									data[i].allClass[a].checkNum;
-							}
-						}
-						obj.allClass.push(sobj);
-					});
-				part1Data.push(obj);
-			}
-			for (let j = 0; j < part1Data.length; j++) {
-				for (let k = 0; k < part1Data[j].num; k++) {
-					part2Data.push(part1Data[j].dayClass[k]);
-					part2Data.push(part1Data[j].nightClass[k]);
-					part2Data.push(part1Data[j].allClass[k]);
-				}
-			}
-			this.tableData = part2Data;
-			this.getSpanArr(this.tableData);
-		},
-		// 产线去重
-		uniqueLine(arr, prop) {
-			return arr.filter((value, index, self) => {
-				return (
-					self.findIndex((t) => {
-						return t[prop] === value[prop];
-					}) === index
-				);
-			});
-		},
-		// 获取合并行
-		getSpanArr(data) {
-			this.span = [];
-			for (var i = 0; i < data.length; i++) {
-				if (i === 0) {
-					this.span.push(1);
-					this.index = 0;
-				} else {
-					if (data[i].dataStr === data[i - 1].dataStr) {
-						this.span[this.index] += 1;
-						this.span.push(0);
-					} else {
-						this.span.push(1);
-						this.index = i;
-					}
-				}
-			}
-		},
-		buttonClick(val) {
-			if (val.btnName === 'search') {
-				if (val.timeVal && val.timeVal.length > 0) {
-					this.queryParams.startTime = moment(
-						val.timeVal[0] + ' 00:00:00'
-					).valueOf();
-					this.queryParams.endTime = moment(
-						val.timeVal[1] + ' 23:59:59'
-					).valueOf();
-				}
-				this.queryParams.lineId = val.lineId;
-				this.getList();
-			} else {
-				// 导出
-				this.exportTable();
-			}
-		},
-		exportTable() {
-			// 处理查询参数
-			var fix = document.querySelectorAll('.el-table__fixed')[0];
-			var table = document.querySelector('.israLineReportTable1').childNodes[0];
-			var wb;
-			import('xlsx').then((excel) => {
-				if (fix) {
-					wb = excel.utils.table_to_book(table.removeChild(fix));
-					table.appendChild(fix);
-				} else {
-					wb = excel.utils.table_to_book(table);
-				}
-				/* 获取二进制字符串作为输出 */
-				var wbout = excel.write(wb, {
-					bookType: 'xlsx',
-					bookSST: true,
-					type: 'array',
-				});
-				try {
-					FileSaver.saveAs(
-						new Blob([wbout], { type: 'application/octet-stream' }),
-						//设置导出文件名称
-						'原片各线isra数据.xlsx'
-					);
-				} catch (e) {
-					if (typeof console !== 'undefined') console.log(e, wbout);
-				}
-				return wbout;
-			});
-		},
-		objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-			if (columnIndex === 0) {
-				const _row = this.span[rowIndex];
-				return {
-					rowspan: _row,
-					colspan: 1,
-				};
-			} else if (columnIndex === 1) {
-				if (rowIndex % 3 === 0) {
-					return {
-						rowspan: 3,
-						colspan: 1,
-					};
-				} else {
-					return {
-						rowspan: 0,
-						colspan: 0,
-					};
-				}
-			}
-		},
-	},
-};
-</script>
-<style lang="scss">
-.isra-line-report {
-	.el-table thead.is-group tr:first-of-type th:nth-child(3) {
-		border-bottom: none;
-	}
-	.el-table thead.is-group tr:first-of-type th:nth-child(3) div.cell {
-		padding-left: 82px;
-	}
-	.el-table th.el-table__cell {
-		height: 28px;
-	}
-	.el-table thead.is-group tr:first-of-type th:nth-child(3):before {
-		content: '';
-		position: absolute;
-		height: 80px;
-		top: 0;
-		left: 0;
-		background-color: #ebeef5;
-		transform: rotate(-70deg);
-		-webkit-transform-origin: top;
-		transform-origin: top;
-		width: 1px;
-	}
-	.el-table thead.is-group tr:last-of-type th:nth-child(1):before {
-		content: '';
-		position: absolute;
-		height: 67px;
-		top: 0;
-		left: 75px;
-		background-color: #ebeef5;
-		transform: rotate(-70deg);
-		-webkit-transform-origin: top;
-		transform-origin: top;
-		width: 1px;
-	}
-}
-</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-22 14:42:31
  * @LastEditors: zhp
  * @Description:
 -->
@@ -35,8 +35,7 @@
 // import basicPage from '../../../core/mixins/basic-page';
 // import { parseTime } from '../../../core/mixins/code-filter';
 import {
-  getOriginalData,
+  getOriginalData
-  getCWSectionList
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
@@ -99,8 +98,7 @@ export default {
       pos: 0,
       listQuery: {
         startTime: undefined,
-        endTime: undefined,
+        endTime:undefined
-        lineId:null,
       },
       formConfig: [
         // {
@@ -131,15 +129,6 @@ export default {
           defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
           width: 250
         },
-        {
-          type: 'select',
-          label: '产线',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'lineId',
-          filterable: true
-        },
         {
           type:'button',
           btnName: '查询',
@@ -170,16 +159,10 @@ export default {
     this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
     this.getDataList()
-    this.getDict()
     // this.getSpanArr(this.tableData)
     // this.getDict();
   },
   methods: {
-    async getDict() {
-      const res = await getCWSectionList()
-      console.log(res)
-      this.formConfig[1].selectOptions = res.data
-    },
     // getSummaries(param) {
     //   console.log(columns)
 
@@ -281,8 +264,8 @@ export default {
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-      // this.listQuery.startTime = '1711095616000';
+      this.listQuery.startTime = '1711095616000';
-      // this.listQuery.endTime = '1711183743000';
+      this.listQuery.endTime = '1711183743000';
       this.urlOptions.getDataListURL(this.listQuery).then(response => {
         // this.getSpanArr(this.tableData)
         // response.data.forEach((ele) => {
@@ -363,7 +346,6 @@ export default {
           // this.listQuery.endTime = '1706230804000';
           this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
           this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
-          this.listQuery.lineId = val.lineId ? val.lineId : undefined
           this.getDataList();
           break;
         // case 'reset':

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-18 15:26:50
  * @LastEditors: zhp
  * @Description:
 -->
@@ -35,8 +35,7 @@
 // import basicPage from '../../../core/mixins/basic-page';
 // import { parseTime } from '../../../core/mixins/code-filter';
 import {
-  getCuttingtData,
+  getCuttingtData
-  getCWSectionList
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
@@ -98,8 +97,7 @@ export default {
       pos: 0,
       listQuery: {
         startTime: undefined,
-        endTime: undefined,
+        endTime:undefined
-        lineId:null
       },
       formConfig: [
         // {
@@ -130,15 +128,6 @@ export default {
           defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
           width: 250
         },
-        {
-          type: 'select',
-          label: '产线',
-          selectOptions: [],
-          labelField: 'name',
-          valueField: 'id',
-          param: 'lineId',
-          filterable: true
-        },
         {
           type:'button',
           btnName: '查询',
@@ -169,16 +158,10 @@ export default {
     this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
     // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
     this.getDataList()
-    this.getDict()
     // this.getSpanArr(this.tableData)
     // this.getDict();
   },
   methods: {
-    async getDict() {
-      const res = await getCWSectionList()
-      console.log(res)
-      this.formConfig[1].selectOptions = res.data
-    },
     getSummaries(param) {
       console.log(columns)
 
@@ -298,8 +281,8 @@ export default {
     // 获取数据列表
     getDataList() {
       this.dataListLoading = true;
-      // this.listQuery.startTime = '1706144404000';
+      this.listQuery.startTime = '1706144404000';
-      // this.listQuery.endTime = '1706230804000';
+      this.listQuery.endTime = '1706230804000';
       this.urlOptions.getDataListURL(this.listQuery).then(response => {
         // this.getSpanArr(this.tableData)
         // response.data.forEach((ele) => {
@@ -385,7 +368,6 @@ export default {
           // this.listQuery.endTime = '1706230804000';
           this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
           this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
-          this.listQuery.lineId = val.lineId ? val.lineId : undefined
           this.getDataList();
           break;
         // case 'reset':