.dockerignore

@@ -1,3 +1,3 @@
 .dockerignore
-dist
+#dist
 node_modules

.drone.yml

@@ -0,0 +1,59 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: build
+  image: node:16-alpine
+  pull: if_not_exists
+  environment:
+    NODE_ENV: ""
+  commands:
+  #- yarn install --frozen-lockfile
+  - yarn install 
+  - env ${NODE_ENV} yarn build:prod 
+
+- name: publish
+  image: docker:dind
+  pull: if_not_exists
+  volumes:
+  - name: dockersock
+    path: /var/run/docker.sock
+  - name: dockerconfig
+    path: /root/.docker
+  commands:
+  - docker build -t hub.kszny.picaiba.com/kszny/xcac-ui ./
+  - docker push hub.kszny.picaiba.com/kszny/xcac-ui
+  depends_on:
+  - build
+
+- name: deploy
+  image: appleboy/drone-ssh
+  pull: if-not-exists
+  settings:
+    host:
+      - 172.24.145.74
+    username: root
+    password: Root@123
+    port: 22
+    command_timeout: 2m
+    script:
+    - docker pull hub.kszny.picaiba.com/kszny/xcac-ui
+    - docker run --rm -v /data/www/xcac:/tmp hub.kszny.picaiba.com/kszny/xcac-ui sh -c "rm -rf /tmp/* && mv -f /html /tmp"
+  depends_on:
+  - publish
+
+volumes:
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: dockerconfig
+  host:
+    path: /root/.docker
+
+trigger:
+  branch:
+  - projects/mesxc-test
+  event:
+  - push

.env.dev

@@ -1,7 +1,7 @@
 ###
  # @Author: zhp
  # @Date: 2024-04-12 14:30:48
- # @LastEditTime: 2024-04-25 09:43:17
+ # @LastEditTime: 2024-04-25 10:07:02
  # @LastEditors: zhp
  # @Description:
 ###

Dockerfile

@@ -1,21 +1,3 @@
-FROM node:16-alpine as build-stage
+FROM busybox 
-
+LABEL maintainer thomas.hairong@gmail.com
-WORKDIR /admim
+COPY dist /html/
-
-COPY .npmrc package.json yarn.lock ./
-RUN --mount=type=cache,id=yarn-store,target=/root/.yarn-store \
-    yarn install --frozen-lockfile
-
-COPY . .
-ARG NODE_ENV=""
-RUN env ${NODE_ENV} yarn build:prod
-
-## -- stage: dist => nginx --
-FROM nginx:alpine
-
-ENV TZ=Asia/Shanghai
-
-COPY ./nginx.conf /etc/nginx/conf.d/default.conf
-COPY --from=build-stage /admim/dist /usr/share/nginx/html
-
-EXPOSE 80

src/api/report/glass.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-12-08 10:26:48
- * @LastEditTime: 2023-12-13 17:16:00
+ * @LastEditTime: 2024-04-24 16:31:37
  * @LastEditors: DY
  * @Description: 
  */
@@ -59,3 +59,39 @@ export function exportGlasscExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 生产月报查询--冷端生产线
+export function productionMonthY(data) {
+  return request({
+    url: '/extend/customized-reports/productionMonthY',
+    method: 'post',
+    data: data
+  })
+}
+
+// 生产月报查询--深加工生产线
+export function productionMonthD(data) {
+  return request({
+    url: '/extend/customized-reports/productionMonthD',
+    method: 'post',
+    data: data
+  })
+}
+
+// 生产年报查询--冷端生产线
+export function productionYearY(data) {
+  return request({
+    url: '/extend/customized-reports/productionYearY',
+    method: 'post',
+    data: data
+  })
+}
+
+// 生产年报查询--冷端生产线
+export function productionYearD(data) {
+  return request({
+    url: '/extend/customized-reports/productionYearD',
+    method: 'post',
+    data: data
+  })
+}

src/views/databoard/components/ISRAChart.vue

@@ -85,7 +85,7 @@ export default {
 				color: this.colors,
 				title: {
 					text: num,
-					subtext: '总数',
+					subtext: '总数/个',
 					top: '32%',
 					left: '49%',
 					textAlign: 'center',

src/views/databoard/deepProcessing/EqAlarm.vue

@@ -66,8 +66,10 @@ export default {
 					`<span title=${item.name || ''}>${item.name || ''}</span>`,
 					`<span title=${item.code || ''}>${item.code || ''}</span>`,
 					`<span><div style="${
-						item.status == '正常'
+						item.status == '运行'
 							? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
+							: item.status == '故障'
+							? 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '
 							: 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:13px 10px 0 0 '
 					}"></div>  ${item.status || ''}</span>`,
 					`<span"><div style="${

src/views/report/Product/monthly.vue

@@ -1,140 +1,340 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-23 17:06:16
+ * @LastEditTime: 2024-04-25 09:53:41
  * @LastEditors: DY
  * @Description: 
 -->
 <template>
 	<div class="weekly">
-    <el-form :inline="true" :model="listQuery" class="blueTip">
+		<el-form
-      <el-form-item label="月" prop="reportTime">
+			:inline="true"
-        <el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
+			:model="listQuery"
-        </el-date-picker>
+			class="blueTip">
+			<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 v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" @click="search()">
+			<el-button
+				v-if="this.$auth.hasPermi('base:report-auto-production:query')"
+				type="primary"
+				size="small"
+				@click="getList">
 				查询
 			</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
+			<el-button
-        @click="handleExport">导出</el-button>
+				v-if="
+					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>
-    <monthWeek v-if="glassWeekShow" ref="monthWeek" :product="false" :params="listQuery" />
+		<base-table
-    <proMonth v-if="proWeekShow" ref="proMonth" :product="false" :params="listQuery" />
+			:table-props="tableProps"
+			: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 monthWeek from '../glass/month.vue'
+import { productionMonthY, productionMonthD } from '@/api/report/glass';
-import proMonth from '../productionMonthReport/index.vue'
 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 {
-  components: { monthWeek, proMonth },
+	// components: { monthWeek, proMonth },
+	mixins: [tableHeightMixin],
 	data() {
 		return {
+			heightNum: 350,
 			listQuery: {
-				// pageSize: 10,
+				time: '',
-				// pageNo: 1,
-				// total: 0,
-				reportType: 4,
-				reportTime: []
 			},
-      startTimeStamp: '',
+			// startTimeStamp: '',
-      endTimeStamp: '',
+			// endTimeStamp: '',
-      reportTime: '',
+			// reportTime: '',
-      glassWeekShow: false,
+			// glassWeekShow: false,
-      proWeekShow: false
+			// proWeekShow: false,
-    }
+			tableData: [],
+			tableProps: [],
+			tableData1: [],
+			tableProps1: [],
+			resData: [],
+			span1: [], //表格1的合并规则
+			resData1: [],
+			span2: []
+		};
 	},
 	created() {
-    this.getCurrentMonthFirst()
+		let now = new Date()
-    this.glassWeekShow = true
+    now.setHours(0, 0, 0, 0)
-    this.proWeekShow = true
+    now.setDate(1)
+    let startOfMonth = now.getTime()
+    let firstDayOfMonth = new Date(startOfMonth)
+    this.listQuery.time = parseTime(firstDayOfMonth)
+	},
+	mounted() {
+		this.getList();
 	},
 	methods: {
-    getCurrentMonthFirst() {
+		async getList() {
-      const date = new Date();
+			this.tableData = [];
-      date.setDate(1);
+			this.tableProps = [
-      this.reportTime = date
+				{
-      // console.log(date)
+					prop: 'lineName',
-      this.changeTime(date)
+					label: '',
-      // console.log(date.valueOf());
+					fixed: true,
+				},
+				{
+					prop: 'paramsName',
+					label: '',
+					fixed: true,
+				},
+			];
+			this.tableData1 = [];
+			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) => {
+					this.tableProps.push({
+						prop: item,
+						label: item,
+						'show-overflow-tooltip': true,
+					});
+				});
+				this.buildTableData(this.resData);
+			});
+			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) {
+			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() {
-      this.$nextTick(() => {
+			const xlsxParam = { raw: true };
-        this.$refs['monthWeek'].handleExport()
+			let tables = document.querySelector('.el-table').cloneNode(true)
-        this.$refs['proMonth'].handleExport()
+			const fix = tables.querySelector('.el-table__fixed')
-      })
+			const fixRight = tables.querySelector('.el-table__fixed-right')
+			if (fix) {
+				tables.removeChild(tables.querySelector('.el-table__fixed'))
+			}
+			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',
+				bookSST: true,
+				type: 'array',
+			});
+			try {
+				FileSaver.saveAs(
+					new Blob([wbout], { type: 'application/octet-stream' }),
+					fileName
+				);
+				this.$message.success('导出成功');
+			} catch (e) {
+				if (typeof console !== 'undefined') console.log(e, wbout);
+			}
+			return wbout;
 		},
-    search() {
+		handleEmitFun(payload) {
-      this.$nextTick(() => {
+			console.log('payload', payload);
-        this.$refs['monthWeek'].getDataList()
-        this.$refs['proMonth'].getDataList()
-      })
 		},
-    changeTime(val) {
-      console.log(val)
-			if(val) {
-					const timeStamp = val.getMonth(); //标准时间转为时间戳，毫秒级别
-					const fullyear = val.getFullYear()
-					let days = 0
-					switch (timeStamp) {
-            case 0:
-            case 2:
-            case 4:
-            case 6:
-            case 7:
-            case 9:
-            case 11:
-							days = 31
-							break
-            case 3:
-            case 4:
-            case 8:
-            case 10:
-							days = 30
-							break
-						case 1:
-							if ((fullyear % 400 === 0) || (fullyear % 4 === 0 && fullyear % 100 !== 0)) {
-								days = 29
-							} else {
-								days = 28
-              }
-              break
-					}
-        this.startTimeStamp = this.timeFun(new Date(fullyear, timeStamp, 1, 7, 0, 1).getTime()); //开始时间
-        this.endTimeStamp = this.timeFun(new Date(fullyear, timeStamp, days, 7, 0, 0).getTime()); //结束时间
-					console.log(this.startTimeStamp, this.endTimeStamp)
-        this.listQuery.reportTime[0] = parseTime(new Date(fullyear, timeStamp, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-					this.listQuery.reportTime[1] = parseTime(new Date(fullyear, timeStamp, days, 7, 0, 0).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
-			} else {
-					this.listQuery.reportTime = []
-			}
 	},
-    //时间戳转为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-top: 16px;
+	padding: 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;
 }

src/views/report/Product/weekly.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-23 15:43:36
+ * @LastEditTime: 2024-04-24 15:28:44
  * @LastEditors: DY
  * @Description: 
 -->
@@ -28,7 +28,9 @@
 <script>
 import glassWeek from '../glass/weekly.vue'
 import proWeek from '../productionWeekReport/index.vue'
-import { parseTime } from '../../core/mixins/code-filter';
+import { parseTime } from '../../core/mixins/code-filter'
+import FileSaver from 'file-saver'
+import * as XLSX from 'xlsx/xlsx.mjs'
 
 export default {
   components: { glassWeek, proWeek },
@@ -45,7 +47,8 @@ export default {
       endTimeStamp: '',
       reportTime: '',
       glassWeekShow: false,
-      proWeekShow: false
+      proWeekShow: false,
+      proTabaleData: []
     }
   },
   created() {
@@ -54,11 +57,35 @@ export default {
     this.proWeekShow = true
   },
   methods: {
+    // handleExport() {
+    //   this.$nextTick(() => {
+    //     this.$refs['glassWeek'].handleExport()
+    //     this.$refs['proWeek'].handleExport()
+    //   })
+    // },
     handleExport() {
-      this.$nextTick(() => {
+      const xlsxParam = { raw: true }
-        this.$refs['glassWeek'].handleExport()
+      let workbook = XLSX.utils.book_new()
-        this.$refs['proWeek'].handleExport()
+      var ws = XLSX.utils.table_to_sheet( document.querySelector('#exportTable'), xlsxParam)
-      })
+      XLSX.utils.book_append_sheet(workbook, ws, '许昌安彩周原片生产汇总')
+      var prows = XLSX.utils.table_to_sheet( document.querySelector('#exportproductionTable'), xlsxParam)
+      XLSX.utils.book_append_sheet(workbook, prows, '许昌安彩周成品生产汇总')
+      let fileName = '生产数据汇总表-周报.xlsx';
+      var wbout = XLSX.write(workbook, {
+        bookType: 'xlsx',
+        bookSST: true,
+        type: 'array',
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([wbout], { type: 'application/octet-stream' }),
+          fileName
+        );
+        this.$message.success('导出成功');
+      } catch (e) {
+        if (typeof console !== 'undefined') console.log(e, wbout);
+      }
+      return wbout;
     },
     search() {
       this.$nextTick(() => {

src/views/report/Product/year.vue

@@ -1,116 +1,340 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-23 17:16:11
+ * @LastEditTime: 2024-04-25 09:54:39
  * @LastEditors: DY
  * @Description: 
 -->
 <template>
 	<div class="weekly">
-    <el-form :inline="true" :model="listQuery" class="blueTip">
+		<el-form
-      <el-form-item label="年" prop="reportTime">
+			:inline="true"
-          <el-date-picker v-model="reportTime" type="year" size="small" @change="changeTime"
+			:model="listQuery"
-            :picker-options="{firstDayOfWeek: 1}" :format="'yyyy 年' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
+			class="blueTip">
-            style="width: 350px" placeholder="选择年">
+			<el-form-item
-          </el-date-picker>
+				label="月"
+				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 v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" @click="search()">
+			<el-button
+				v-if="this.$auth.hasPermi('base:report-auto-production:query')"
+				type="primary"
+				size="small"
+				@click="getList">
 				查询
 			</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
+			<el-button
-        @click="handleExport">导出</el-button>
+				v-if="
+					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>
-    <glassYear v-if="glassYearShow" ref="glassYear" :product="false" :params="listQuery" />
+		<base-table
-    <proYear v-if="proYearShow" ref="proYear" :product="false" :params="listQuery" />
+			:table-props="tableProps"
+			: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 glassYear from '../glass/year.vue'
+import { productionYearY, productionYearD } from '@/api/report/glass';
-import proYear from '../productionYearReport/index.vue'
 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 {
-  components: { glassYear, proYear },
+	// components: { monthWeek, proMonth },
+	mixins: [tableHeightMixin],
 	data() {
 		return {
+			heightNum: 350,
 			listQuery: {
-				// pageSize: 10,
+				time: '',
-				// pageNo: 1,
-				// total: 0,
-				reportType: 5,
-				reportTime: []
 			},
-      startTimeStamp: '',
+			// startTimeStamp: '',
-      endTimeStamp: '',
+			// endTimeStamp: '',
-      reportTime: '',
+			// reportTime: '',
-      glassYearShow: false,
+			// glassWeekShow: false,
-      proYearShow: false
+			// proWeekShow: false,
-    }
+			tableData: [],
+			tableProps: [],
+			tableData1: [],
+			tableProps1: [],
+			resData: [],
+			span1: [], //表格1的合并规则
+			resData1: [],
+			span2: []
+		};
 	},
 	created() {
-    this.getCurrentYearFirst()
+		let now = new Date()
-    this.glassYearShow = true
+    now.setHours(0, 0, 0, 0)
-    this.proYearShow = true
+    now.setDate(1)
+    let startOfMonth = now.getTime()
+    let firstDayOfMonth = new Date(startOfMonth)
+    this.listQuery.time = parseTime(firstDayOfMonth)
+	},
+	mounted() {
+		this.getList();
 	},
 	methods: {
-    handleExport() {
+		async getList() {
-      this.$nextTick(() => {
+			this.tableData = [];
-        this.$refs['glassYear'].handleExport()
+			this.tableProps = [
-        this.$refs['proYear'].handleExport()
+				{
-      })
+					prop: 'lineName',
+					label: '',
+					fixed: true,
 				},
-    search() {
+				{
-      this.$nextTick(() => {
+					prop: 'paramsName',
-        this.$refs['glassYear'].getDataList()
+					label: '',
-        this.$refs['proYear'].getDataList()
+					fixed: true,
-      })
 				},
-    changeTime(val) {
+			];
-			if(val) {
+			this.tableData1 = [];
-					// let timeStamp = val.getTime(); //标准时间转为时间戳，毫秒级别
+			this.tableProps1 = [
-        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()); //结束时间
+					prop: 'lineName',
-        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
+					label: '',
-        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
+					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 {
-					this.listQuery.reportTime = []
+					for (let j = 0; j < subKeys.length; j++) {
-			}
+						for (let k = 0; k < sub2Keys.length; k++) {
-		},
+							for (let v = 0; v < tempData.length; v++) {
-    getCurrentYearFirst() {
+								if (
-      let date = new Date();
+									tempData[v].lineName === subKeys[j] &&
-      date.setDate(1);
+									tempData[v].paramsName === sub2Keys[k]
-      date.setMonth(0);
+								) {
-      this.reportTime = date;
+									tempData[v][keys[i]] = data[keys[i]][subKeys[j]][sub2Keys[k]];
-      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)
-		},
 								}
 							}
+						}
+					}
+				}
+			}
+			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 };
+			let tables = document.querySelector('.el-table').cloneNode(true)
+			const fix = tables.querySelector('.el-table__fixed')
+			const fixRight = tables.querySelector('.el-table__fixed-right')
+			if (fix) {
+				tables.removeChild(tables.querySelector('.el-table__fixed'))
+			}
+			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',
+				bookSST: true,
+				type: 'array',
+			});
+			try {
+				FileSaver.saveAs(
+					new Blob([wbout], { type: 'application/octet-stream' }),
+					fileName
+				);
+				this.$message.success('导出成功');
+			} catch (e) {
+				if (typeof console !== 'undefined') console.log(e, wbout);
+			}
+			return wbout;
+		},
+		handleEmitFun(payload) {
+			console.log('payload', payload);
+		},
+	},
+};
 </script>
 
 <style scoped>
 .weekly {
-  padding-top: 16px;
+	padding: 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;
 }

src/views/report/productionMonthReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-23 16:58:06
+ * @LastEditTime: 2024-04-24 15:27:49
  * @LastEditors: DY
  * @Description:
 -->
@@ -26,7 +26,7 @@
         <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
       </el-row>
     </div>
-    <el-table id="exportTable" :data="list" style="width: 100%" :header-cell-style="{
+    <el-table id="exportproductionTable" :data="list" style="width: 100%" :header-cell-style="{
       background: '#F2F4F9',
       color: '#606266'
     }">
@@ -496,7 +496,7 @@ export default {
       /* 从表生成工作簿对象 */
       import('xlsx').then(excel => {
         var wb = excel.utils.table_to_book(
-          document.querySelector("#exportTable"),
+          document.querySelector("#exportproductionTable"),
           xlsxParam
         );
         /* 获取二进制字符串作为输出 */

src/views/report/productionWeekReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-23 16:58:12
+ * @LastEditTime: 2024-04-24 15:29:21
  * @LastEditors: DY
  * @Description:
 -->
@@ -28,7 +28,7 @@
         <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
       </el-row>
     </div>
-    <el-table id="exportTable" :data="list" style="width: 100%" :header-cell-style="{
+    <el-table id="exportproductionTable" :data="list" style="width: 100%" :header-cell-style="{
       background: '#F2F4F9',
       color: '#606266'
     }">
@@ -517,7 +517,7 @@ export default {
       /* 从表生成工作簿对象 */
       import('xlsx').then(excel => {
         var wb = excel.utils.table_to_book(
-          document.querySelector("#exportTable"),
+          document.querySelector("#exportproductionTable"),
           xlsxParam
         );
         /* 获取二进制字符串作为输出 */

src/views/report/productionYearReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-04-23 17:21:04
+ * @LastEditTime: 2024-04-24 15:28:10
  * @LastEditors: DY
  * @Description:
 -->
@@ -30,7 +30,7 @@
         <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
       </el-row>
     </div>
-    <el-table id="exportTable" :data="list" style="width: 100%" :header-cell-style="{
+    <el-table id="exportproductionTable" :data="list" style="width: 100%" :header-cell-style="{
       background: '#F2F4F9',
       color: '#606266'
     }">
@@ -452,7 +452,7 @@ export default {
       /* 从表生成工作簿对象 */
       import('xlsx').then(excel => {
         var wb = excel.utils.table_to_book(
-          document.querySelector("#exportTable"),
+          document.querySelector("#exportproductionTable"),
           xlsxParam
         );
         /* 获取二进制字符串作为输出 */