src/views/report/Product/monthly.vue

@@ -1,68 +1,42 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-25 09:53:41
+ * @LastEditTime: 2024-04-25 08:39:13
  * @LastEditors: DY
  * @Description: 
 -->
 <template>
   <div class="weekly">
-		<el-form
+    <el-form :inline="true" :model="listQuery" class="blueTip">
-			:inline="true"
+      <el-form-item label="月" prop="reportTime">
-			:model="listQuery"
+        <el-date-picker v-model="listQuery.time" value-format="yyyy-MM-dd HH:mm:ss" type="month" size="small" placeholder="选择月">
-			class="blueTip">
+        </el-date-picker>
-			<el-form-item
-				label="月"
-				prop="reportTime">
-				<el-date-picker
-					v-model="listQuery.time"
-					value-format="yyyy-MM-dd HH:mm:ss"
-					type="month"
-					size="small"
-					placeholder="选择月"></el-date-picker>
       </el-form-item>
-			<el-button
+      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" @click="getList">
-				v-if="this.$auth.hasPermi('base:report-auto-production:query')"
-				type="primary"
-				size="small"
-				@click="getList">
         查询
       </el-button>
-			<el-button
+      <el-button v-if="this.$auth.hasPermiAnd(['base:report-auto-original-glass:export', 'base:report-auto-production:export'])" type="primary" size="small" plain
-				v-if="
+        @click="handleExport">导出</el-button>
-					this.$auth.hasPermiAnd([
-						'base:report-auto-original-glass:export',
-						'base:report-auto-production:export',
-					])
-				"
-				type="primary"
-				size="small"
-				plain
-				@click="handleExport">
-				导出
-			</el-button>
     </el-form>
     <base-table
 			:table-props="tableProps"
 			:table-data="tableData"
-			:span-method="objectSpanMethod1"
+      :span-method="mergeColumnHandler"
-			@emitFun="handleEmitFun"
-			:max-height="tableH" />
-		<base-table
-			:table-props="tableProps1"
-			:table-data="tableData1"
-			:span-method="objectSpanMethod1"
 			@emitFun="handleEmitFun"
 			:max-height="tableH"
-			style="margin-top: 15px" />
+		/>
+    <!-- <monthWeek v-if="glassWeekShow" ref="monthWeek" :product="false" :params="listQuery" />
+    <proMonth v-if="proWeekShow" ref="proMonth" :product="false" :params="listQuery" /> -->
   </div>
 </template>
 
 <script>
-import { productionMonthY, productionMonthD } from '@/api/report/glass';
+// import monthWeek from '../glass/month.vue'
-import { parseTime } from '../../core/mixins/code-filter';
+// import proMonth from '../productionMonthReport/index.vue'
-import FileSaver from 'file-saver';
+import { productionMonthY } from '@/api/report/glass';
-import * as XLSX from 'xlsx/xlsx.mjs';
+import { parseTime } from '../../core/mixins/code-filter'
+import FileSaver from 'file-saver'
+import * as XLSX from 'xlsx/xlsx.mjs'
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
@@ -70,9 +44,9 @@ export default {
   mixins: [tableHeightMixin],
   data() {
     return {
-			heightNum: 350,
+      heightNum: 240,
       listQuery: {
-				time: '',
+				time: parseTime(new Date())
       },
       // startTimeStamp: '',
       // endTimeStamp: '',
@@ -80,225 +54,112 @@ export default {
       // glassWeekShow: false,
       // proWeekShow: false,
       tableData: [],
-			tableProps: [],
+			tableProps: [
-			tableData1: [],
+        {
-			tableProps1: [],
+          prop: 'lineName',
-			resData: [],
+          label: ''
-			span1: [], //表格1的合并规则
+        },
-			resData1: [],
+        {
-			span2: []
+          prop: 'paramsName',
-		};
+          label: ''
+        }
+      ],
+      resData: []
+    }
   },
   created() {
-		let now = new Date()
+    // this.getCurrentMonthFirst()
-    now.setHours(0, 0, 0, 0)
+    // this.glassWeekShow = true
-    now.setDate(1)
+    // this.proWeekShow = true
-    let startOfMonth = now.getTime()
-    let firstDayOfMonth = new Date(startOfMonth)
-    this.listQuery.time = parseTime(firstDayOfMonth)
   },
   mounted() {
-		this.getList();
+    this.getList()
   },
   methods: {
+    /** 合并table列的规则 */
+		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
+			// if (columnIndex == 0 || columnIndex == 1) {
+			// 	if (this.spanInfo[rowIndex]) {
+			// 		return [
+			// 			this.spanInfo[rowIndex], // row span
+			// 			1, // col span
+			// 		];
+			// 	} else {
+			// 		return [0, 0];
+			// 	}
+			// }
+		},
     async getList() {
-			this.tableData = [];
+      this.tableData = []
       this.tableProps = [
         {
           prop: 'lineName',
-					label: '',
+          label: ''
-					fixed: true,
         },
         {
           prop: 'paramsName',
-					label: '',
+          label: ''
-					fixed: true,
+        }
-				},
+      ]
-			];
+      await productionMonthY(this.listQuery).then(res => {
-			this.tableData1 = [];
+        this.resData = res.data
-			this.tableProps1 = [
-				{
-					prop: 'lineName',
-					label: '',
-					fixed: true,
-				},
-				{
-					prop: 'paramsName',
-					label: '',
-					fixed: true,
-				},
-			];
-			await productionMonthY(this.listQuery).then((res) => {
-				this.resData = res.data;
         // 设置表头
-				Object.keys(this.resData).forEach((item) => {
+        Object.keys(this.resData).forEach(item => {
           this.tableProps.push({
             prop: item,
             label: item,
-						'show-overflow-tooltip': true,
+            'show-overflow-tooltip': true
-					});
+          })
-				});
+        })
-				this.buildTableData(this.resData);
+        this.buildTableData()
-			});
+      })
-			await productionMonthD(this.listQuery).then((res) => {
-				this.resData1 = res.data;
-				// 设置表头
-				Object.keys(this.resData1).forEach((item) => {
-					this.tableProps1.push({
-						prop: item,
-						label: item,
-						'show-overflow-tooltip': true,
-					});
-				});
-				this.buildTableData1(this.resData1);
-			});
-		},
-		// 设置表格2数据
-		buildTableData1(data) {
-			let keys = Object.keys(data);
-			let tempData = [];
-			let subKeys = Object.keys(data[keys[0]]);
-			let sub2Keys = Object.keys(data[keys[0]][subKeys[0]]);
-			for (let i = 0; i < keys.length; i++) {
-				if (i === 0) {
-					for (let j = 0; j < subKeys.length; j++) {
-						for (let k = 0; k < sub2Keys.length; k++) {
-							let obj = {};
-							obj.lineName = subKeys[j];
-							obj.paramsName = sub2Keys[k];
-							obj[keys[0]] = data[keys[0]][subKeys[j]][sub2Keys[k]];
-							tempData.push(obj);
-						}
-					}
-				} else {
-					for (let j = 0; j < subKeys.length; j++) {
-						for (let k = 0; k < sub2Keys.length; k++) {
-							for (let v = 0; v < tempData.length; v++) {
-								if (
-									tempData[v].lineName === subKeys[j] &&
-									tempData[v].paramsName === sub2Keys[k]
-								) {
-									tempData[v][keys[i]] = data[keys[i]][subKeys[j]][sub2Keys[k]];
-								}
-							}
-						}
-					}
-				}
-			}
-			this.tableData1 = tempData;
-			this.getSpanArr1(this.tableData1);
     },
     // 设置表格数据
-		buildTableData(data) {
+    buildTableData() {
-			let keys = Object.keys(data);
+      const temp = Object.values(this.resData)
-			let tempData = [];
+      console.log('temp', temp)
-			let subKeys = Object.keys(data[keys[0]]);
+      const dataArray = []
-			let sub2Keys = Object.keys(data[keys[0]][subKeys[0]]);
+      // Object.entries(this.resData).forEach(en => {
-			for (let i = 0; i < keys.length; i++) {
+      //   console.log('你好', en)
-				if (i === 0) {
+        // const date = en[0]
-					for (let j = 0; j < subKeys.length; j++) {
+        // let valueArray = []
-						for (let k = 0; k < sub2Keys.length; k++) {
+        // Object.entries(en[1]).forEach((values, sequence) => {
-							let obj = {};
+        //   let yValue = {}
-							obj.lineName = subKeys[j];
+        //   yValue['line'] = values[0]
-							obj.paramsName = sub2Keys[k];
+        //   Object.entries(values[1]).forEach((lastV, index) => {
-							obj[keys[0]] = data[keys[0]][subKeys[j]][sub2Keys[k]];
+        //     console.log(lastV)
-							tempData.push(obj);
+        //     const tempValue = {}
-						}
+        //     if (values[0] === yValue['line']) {
-					}
+        //       tempValue[values[0]] = lastV[1]
-				} else {
+        //     }
-					for (let j = 0; j < subKeys.length; j++) {
+        //     valueArray.push(tempValue)
-						for (let k = 0; k < sub2Keys.length; k++) {
+        //   })
-							for (let v = 0; v < tempData.length; v++) {
+        //   yValue[date+'-'+sequence] = valueArray
-								if (
+        //   dataArray.push(yValue)
-									tempData[v].lineName === subKeys[j] &&
+        // })
-									tempData[v].paramsName === sub2Keys[k]
+      // })
-								) {
+      // for (let key in temp) {
-									tempData[v][keys[i]] = data[keys[i]][subKeys[j]][sub2Keys[k]];
+      //   console.log('你好', temp[key])
-								}
+      // }
-							}
+      // 产线
-						}
+      Object.keys(temp[0]).forEach(item => {
-					}
+        // 规格循环
-				}
+        Object.keys(Object.values(temp[0])[0]).forEach(it => {
-			}
+          const row = {
-			this.tableData = tempData;
+            lineName: item,
-			this.getSpanArr(this.tableData);
+            paramsName: it
-		},
-		getSpanArr1(data) {
-			this.span2 = [];
-			for (var i = 0; i < data.length; i++) {
-				if (i === 0) {
-					this.span2.push(1);
-					this.index1 = 0;
-				} else {
-					if (data[i].lineName === data[i - 1].lineName) {
-						this.span2[this.index1] += 1;
-						this.span2.push(0);
-					} else {
-						this.span2.push(1);
-						this.index1 = i;
-					}
-				}
-			}
-		},
-		// 获取合并行
-		getSpanArr(data) {
-			this.span1 = [];
-			for (var i = 0; i < data.length; i++) {
-				if (i === 0) {
-					this.span1.push(1);
-					this.index = 0;
-				} else {
-					if (data[i].lineName === data[i - 1].lineName) {
-						this.span1[this.index] += 1;
-						this.span1.push(0);
-					} else {
-						this.span1.push(1);
-						this.index = i;
-					}
-				}
-			}
-		},
-		objectSpanMethod1({ rowIndex, columnIndex }) {
-			if (columnIndex === 0) {
-				const _row = this.span1[rowIndex];
-				return {
-					rowspan: _row,
-					colspan: 1,
-				};
           }
+          this.tableData.push(row)
+        })
+      })
     },
     handleExport() {
-			const xlsxParam = { raw: true };
+      const xlsxParam = { raw: true }
-			let tables = document.querySelector('.el-table').cloneNode(true)
+      let workbook = XLSX.utils.book_new()
-			const fix = tables.querySelector('.el-table__fixed')
+      var ws = XLSX.utils.table_to_sheet( document.querySelector('#exportTable'), xlsxParam)
-			const fixRight = tables.querySelector('.el-table__fixed-right')
+      XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩月原片生产汇总')
-			if (fix) {
+      var prows = XLSX.utils.table_to_sheet( document.querySelector('#exportproductionTable'), xlsxParam)
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
+      XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩月成品生产汇总')
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let workbook = XLSX.utils.book_new();
-			var ws = XLSX.utils.table_to_sheet(
-				tables,
-				xlsxParam
-			);
-			XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩月原片生产汇总');
-
-			let tables1 = document.querySelectorAll('.el-table')[1].cloneNode(true)
-			const fix1 = tables1.querySelector('.el-table__fixed')
-			const fixRight1 = tables1.querySelector('.el-table__fixed-right')
-			if (fix1) {
-				tables1.removeChild(fix1)
-			}
-			if (fixRight1) {
-				tables1.removeChild(fixRight1)
-			}
-			var prows = XLSX.utils.table_to_sheet(
-				tables1,
-				xlsxParam
-			);
-			XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩月成品生产汇总');
       let fileName = '生产数据汇总表-月报.xlsx';
       var wbout = XLSX.write(workbook, {
         bookType: 'xlsx',
@@ -318,9 +179,9 @@ export default {
     },
     handleEmitFun(payload) {
 			console.log('payload', payload);
-		},
+		}
-	},
+  }
-};
+}
 </script>
 
 <style scoped>
@@ -332,9 +193,9 @@ export default {
   content: '';
   width: 4px;
   height: 18px;
-	background: #0b58ff;
+  background: #0B58FF;
   border-radius: 1px;
-	margin-right: 8px;
+  margin-right: 8PX;
   margin-top: 8px;
   margin-left: 16px;
 }

src/views/report/Product/year.vue

@@ -1,304 +1,68 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-25 09:54:39
+ * @LastEditTime: 2024-04-24 15:49:32
  * @LastEditors: DY
  * @Description: 
 -->
 <template>
   <div class="weekly">
-		<el-form
+    <el-form :inline="true" :model="listQuery" class="blueTip">
-			:inline="true"
+      <el-form-item label="年" prop="reportTime">
-			:model="listQuery"
+          <el-date-picker v-model="reportTime" type="year" size="small" @change="changeTime"
-			class="blueTip">
+            :picker-options="{firstDayOfWeek: 1}" :format="'yyyy 年' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
-			<el-form-item
+            style="width: 350px" placeholder="选择年">
-				label="月"
+          </el-date-picker>
-				prop="reportTime">
-				<el-date-picker
-					v-model="listQuery.time"
-					value-format="yyyy-MM-dd HH:mm:ss"
-					type="year"
-					size="small"
-					placeholder="选择年"></el-date-picker>
         </el-form-item>
-			<el-button
+      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" @click="search()">
-				v-if="this.$auth.hasPermi('base:report-auto-production:query')"
-				type="primary"
-				size="small"
-				@click="getList">
         查询
       </el-button>
-			<el-button
+      <el-button v-if="this.$auth.hasPermiAnd(['base:report-auto-original-glass:export', 'base:report-auto-production:export'])" type="primary" size="small" plain
-				v-if="
+        @click="handleExport">导出</el-button>
-					this.$auth.hasPermiAnd([
-						'base:report-auto-original-glass:export',
-						'base:report-auto-production:export',
-					])
-				"
-				type="primary"
-				size="small"
-				plain
-				@click="handleExport">
-				导出
-			</el-button>
     </el-form>
-		<base-table
+    <glassYear v-if="glassYearShow" ref="glassYear" :product="false" :params="listQuery" />
-			:table-props="tableProps"
+    <proYear v-if="proYearShow" ref="proYear" :product="false" :params="listQuery" />
-			:table-data="tableData"
-			:span-method="objectSpanMethod1"
-			@emitFun="handleEmitFun"
-			:max-height="tableH" />
-		<base-table
-			:table-props="tableProps1"
-			:table-data="tableData1"
-			:span-method="objectSpanMethod1"
-			@emitFun="handleEmitFun"
-			:max-height="tableH"
-			style="margin-top: 15px" />
   </div>
 </template>
 
 <script>
-import { productionYearY, productionYearD } from '@/api/report/glass';
+import glassYear from '../glass/year.vue'
-import { parseTime } from '../../core/mixins/code-filter';
+import proYear from '../productionYearReport/index.vue'
-import FileSaver from 'file-saver';
+import { parseTime } from '../../core/mixins/code-filter'
-import * as XLSX from 'xlsx/xlsx.mjs';
+import FileSaver from 'file-saver'
-import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import * as XLSX from 'xlsx/xlsx.mjs'
 
 export default {
-	// components: { monthWeek, proMonth },
+  components: { glassYear, proYear },
-	mixins: [tableHeightMixin],
   data() {
     return {
-			heightNum: 350,
       listQuery: {
-				time: '',
+				// pageSize: 10,
+				// pageNo: 1,
+				// total: 0,
+				reportType: 5,
+				reportTime: []
       },
-			// startTimeStamp: '',
+      startTimeStamp: '',
-			// endTimeStamp: '',
+      endTimeStamp: '',
-			// reportTime: '',
+      reportTime: '',
-			// glassWeekShow: false,
+      glassYearShow: false,
-			// proWeekShow: false,
+      proYearShow: false
-			tableData: [],
+    }
-			tableProps: [],
-			tableData1: [],
-			tableProps1: [],
-			resData: [],
-			span1: [], //表格1的合并规则
-			resData1: [],
-			span2: []
-		};
   },
   created() {
-		let now = new Date()
+    this.getCurrentYearFirst()
-    now.setHours(0, 0, 0, 0)
+    this.glassYearShow = true
-    now.setDate(1)
+    this.proYearShow = true
-    let startOfMonth = now.getTime()
-    let firstDayOfMonth = new Date(startOfMonth)
-    this.listQuery.time = parseTime(firstDayOfMonth)
-	},
-	mounted() {
-		this.getList();
   },
   methods: {
-		async getList() {
-			this.tableData = [];
-			this.tableProps = [
-				{
-					prop: 'lineName',
-					label: '',
-					fixed: true,
-				},
-				{
-					prop: 'paramsName',
-					label: '',
-					fixed: true,
-				},
-			];
-			this.tableData1 = [];
-			this.tableProps1 = [
-				{
-					prop: 'lineName',
-					label: '',
-					fixed: true,
-				},
-				{
-					prop: 'paramsName',
-					label: '',
-					fixed: true,
-				},
-			];
-			await productionYearY(this.listQuery).then((res) => {
-				this.resData = res.data;
-				// 设置表头
-				Object.keys(this.resData).forEach((item) => {
-					this.tableProps.push({
-						prop: item,
-						label: item,
-						'show-overflow-tooltip': true,
-					});
-				});
-				this.buildTableData(this.resData);
-			});
-			await productionYearD(this.listQuery).then((res) => {
-				this.resData1 = res.data;
-				// 设置表头
-				Object.keys(this.resData1).forEach((item) => {
-					this.tableProps1.push({
-						prop: item,
-						label: item,
-						'show-overflow-tooltip': true,
-					});
-				});
-				this.buildTableData1(this.resData1);
-			});
-		},
-		// 设置表格2数据
-		buildTableData1(data) {
-			let keys = Object.keys(data);
-			let tempData = [];
-			let subKeys = Object.keys(data[keys[0]]);
-			let sub2Keys = Object.keys(data[keys[0]][subKeys[0]]);
-			for (let i = 0; i < keys.length; i++) {
-				if (i === 0) {
-					for (let j = 0; j < subKeys.length; j++) {
-						for (let k = 0; k < sub2Keys.length; k++) {
-							let obj = {};
-							obj.lineName = subKeys[j];
-							obj.paramsName = sub2Keys[k];
-							obj[keys[0]] = data[keys[0]][subKeys[j]][sub2Keys[k]];
-							tempData.push(obj);
-						}
-					}
-				} else {
-					for (let j = 0; j < subKeys.length; j++) {
-						for (let k = 0; k < sub2Keys.length; k++) {
-							for (let v = 0; v < tempData.length; v++) {
-								if (
-									tempData[v].lineName === subKeys[j] &&
-									tempData[v].paramsName === sub2Keys[k]
-								) {
-									tempData[v][keys[i]] = data[keys[i]][subKeys[j]][sub2Keys[k]];
-								}
-							}
-						}
-					}
-				}
-			}
-			this.tableData1 = tempData;
-			this.getSpanArr1(this.tableData1);
-		},
-		// 设置表格数据
-		buildTableData(data) {
-			let keys = Object.keys(data);
-			let tempData = [];
-			let subKeys = Object.keys(data[keys[0]]);
-			let sub2Keys = Object.keys(data[keys[0]][subKeys[0]]);
-			for (let i = 0; i < keys.length; i++) {
-				if (i === 0) {
-					for (let j = 0; j < subKeys.length; j++) {
-						for (let k = 0; k < sub2Keys.length; k++) {
-							let obj = {};
-							obj.lineName = subKeys[j];
-							obj.paramsName = sub2Keys[k];
-							obj[keys[0]] = data[keys[0]][subKeys[j]][sub2Keys[k]];
-							tempData.push(obj);
-						}
-					}
-				} else {
-					for (let j = 0; j < subKeys.length; j++) {
-						for (let k = 0; k < sub2Keys.length; k++) {
-							for (let v = 0; v < tempData.length; v++) {
-								if (
-									tempData[v].lineName === subKeys[j] &&
-									tempData[v].paramsName === sub2Keys[k]
-								) {
-									tempData[v][keys[i]] = data[keys[i]][subKeys[j]][sub2Keys[k]];
-								}
-							}
-						}
-					}
-				}
-			}
-			this.tableData = tempData;
-			this.getSpanArr(this.tableData);
-		},
-		getSpanArr1(data) {
-			this.span2 = [];
-			for (var i = 0; i < data.length; i++) {
-				if (i === 0) {
-					this.span2.push(1);
-					this.index1 = 0;
-				} else {
-					if (data[i].lineName === data[i - 1].lineName) {
-						this.span2[this.index1] += 1;
-						this.span2.push(0);
-					} else {
-						this.span2.push(1);
-						this.index1 = i;
-					}
-				}
-			}
-		},
-		// 获取合并行
-		getSpanArr(data) {
-			this.span1 = [];
-			for (var i = 0; i < data.length; i++) {
-				if (i === 0) {
-					this.span1.push(1);
-					this.index = 0;
-				} else {
-					if (data[i].lineName === data[i - 1].lineName) {
-						this.span1[this.index] += 1;
-						this.span1.push(0);
-					} else {
-						this.span1.push(1);
-						this.index = i;
-					}
-				}
-			}
-		},
-		objectSpanMethod1({ rowIndex, columnIndex }) {
-			if (columnIndex === 0) {
-				const _row = this.span1[rowIndex];
-				return {
-					rowspan: _row,
-					colspan: 1,
-				};
-			}
-		},
     handleExport() {
-			const xlsxParam = { raw: true };
+      const xlsxParam = { raw: true }
-			let tables = document.querySelector('.el-table').cloneNode(true)
+      let workbook = XLSX.utils.book_new()
-			const fix = tables.querySelector('.el-table__fixed')
+      var ws = XLSX.utils.table_to_sheet( document.querySelector('#exportTable'), xlsxParam)
-			const fixRight = tables.querySelector('.el-table__fixed-right')
+      XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩年原片生产汇总')
-			if (fix) {
+      var prows = XLSX.utils.table_to_sheet( document.querySelector('#exportproductionTable'), xlsxParam)
-				tables.removeChild(tables.querySelector('.el-table__fixed'))
+      XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩年成品生产汇总')
-			}
-			if (fixRight) {
-				tables.removeChild(tables.querySelector('.el-table__fixed-right'))
-			}
-			let workbook = XLSX.utils.book_new();
-			var ws = XLSX.utils.table_to_sheet(
-				tables,
-				xlsxParam
-			);
-			XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩年原片生产汇总');
-
-			let tables1 = document.querySelectorAll('.el-table')[1].cloneNode(true)
-			const fix1 = tables1.querySelector('.el-table__fixed')
-			const fixRight1 = tables1.querySelector('.el-table__fixed-right')
-			if (fix1) {
-				tables1.removeChild(tables1.querySelector('.el-table__fixed'))
-			}
-			if (fixRight1) {
-				tables1.removeChild(tables1.querySelector('.el-table__fixed-right'))
-			}
-			var prows = XLSX.utils.table_to_sheet(
-				tables1,
-				xlsxParam
-			);
-			XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩年成品生产汇总');
       let fileName = '生产数据汇总表-年报.xlsx';
       var wbout = XLSX.write(workbook, {
         bookType: 'xlsx',
@@ -316,25 +80,57 @@ export default {
       }
       return wbout;
     },
-		handleEmitFun(payload) {
+    search() {
-			console.log('payload', payload);
+      this.$nextTick(() => {
+        this.$refs['glassYear'].getDataList()
+        this.$refs['proYear'].getDataList()
+      })
     },
+    changeTime(val) {
+			if(val) {
+					// let timeStamp = val.getTime(); //标准时间转为时间戳，毫秒级别
+        this.endTimeStamp = this.timeFun(new Date(val.getFullYear(),11, 31, 7, 0, 0).getTime()); //开始时间
+        this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()); //结束时间
+        this.listQuery.reportTime[0] = parseTime(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = parseTime(new Date(val.getFullYear(), 11, 31, 7, 0, 0).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+			} else {
+					this.listQuery.reportTime = []
+			}
 		},
-};
+    getCurrentYearFirst() {
+      let date = new Date();
+      date.setDate(1);
+      date.setMonth(0);
+      this.reportTime = date;
+      this.startTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 0, 1,7,0,1).getTime()); //开始时间
+      this.endTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 11, 31, 7, 0, 0).getTime()); //结束时间
+      this.listQuery.reportTime[0] = parseTime(new Date(new Date().getFullYear(), 0, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+      this.listQuery.reportTime[1] = parseTime(new Date(new Date().getFullYear(), 11, 31, 7, 0, 0).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 100
+    },
+    //时间戳转为yy-mm-dd hh:mm:ss
+		timeFun(unixtimestamp) {
+				var unixtimestamp = new Date(unixtimestamp);
+				var year = 1900 + unixtimestamp.getYear();
+				var month = "0" + (unixtimestamp.getMonth() + 1);
+				var date = "0" + unixtimestamp.getDate();
+				return year + "-" + month.substring(month.length - 2, month.length) + "-" + date.substring(date.length - 2, date.length)
+		},
+  }
+}
 </script>
 
 <style scoped>
 .weekly {
-	padding: 16px;
+  padding-top: 16px;
 }
 .blueTip::before{
   display: inline-block;
   content: '';
   width: 4px;
   height: 18px;
-	background: #0b58ff;
+  background: #0B58FF;
   border-radius: 1px;
-	margin-right: 8px;
+  margin-right: 8PX;
   margin-top: 8px;
   margin-left: 16px;
 }