From 9a53391999370426b11fc471a5822d14879af856 Mon Sep 17 00:00:00 2001
From: shr <thomas.hairong@gmail.com>
Date: Wed, 24 Apr 2024 15:58:53 +0800
Subject: [PATCH 1/5] =?UTF-8?q?:construction=5Fworker:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=9E=84=E5=BB=BA=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .dockerignore |  2 +-
 .drone.yml    | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
 Dockerfile    | 24 +++------------------
 3 files changed, 63 insertions(+), 22 deletions(-)
 create mode 100644 .drone.yml

diff --git a/.dockerignore b/.dockerignore
index ddc40edd..2922bcb2 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,3 @@
 .dockerignore
-dist
+#dist
 node_modules
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 00000000..9e1ba9ba
--- /dev/null
+++ b/.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
diff --git a/Dockerfile b/Dockerfile
index 4764e741..0aa70ed0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,3 @@
-FROM node:16-alpine as build-stage
-
-WORKDIR /admim
-
-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
+FROM busybox 
+LABEL maintainer thomas.hairong@gmail.com
+COPY dist /html/

From ab5867c4fd94f07e03a23ee09f7ddc42bf887302 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Wed, 24 Apr 2024 17:05:19 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                       | 3 ++-
 src/views/databoard/components/ISRAChart.vue   | 2 +-
 src/views/databoard/deepProcessing/EqAlarm.vue | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.env.dev b/.env.dev
index 2d9cb29e..dd91d53e 100644
--- a/.env.dev
+++ b/.env.dev
@@ -13,7 +13,8 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.176:48082'
+# VUE_APP_BASE_API = 'http://xcac.mes.picaiba.com/'
+# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.1.101:48082'
 
diff --git a/src/views/databoard/components/ISRAChart.vue b/src/views/databoard/components/ISRAChart.vue
index 0e1ee1ea..76347619 100644
--- a/src/views/databoard/components/ISRAChart.vue
+++ b/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',
diff --git a/src/views/databoard/deepProcessing/EqAlarm.vue b/src/views/databoard/deepProcessing/EqAlarm.vue
index 65c107f3..805da998 100644
--- a/src/views/databoard/deepProcessing/EqAlarm.vue
+++ b/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="${

From 61567ce86aa52a9c84112c25a6a902c7c7e22f1a Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Thu, 25 Apr 2024 08:40:08 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/glass.js                       |  38 ++-
 src/views/report/Product/monthly.vue          | 233 +++++++++++-------
 src/views/report/Product/weekly.vue           |  41 ++-
 src/views/report/Product/year.vue             |  32 ++-
 .../report/productionMonthReport/index.vue    |   6 +-
 .../report/productionWeekReport/index.vue     |   6 +-
 .../report/productionYearReport/index.vue     |   6 +-
 7 files changed, 253 insertions(+), 109 deletions(-)

diff --git a/src/api/report/glass.js b/src/api/report/glass.js
index 00b52fd3..2d98f242 100644
--- a/src/api/report/glass.js
+++ b/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
+  })
+}
diff --git a/src/views/report/Product/monthly.vue b/src/views/report/Product/monthly.vue
index cdc5028b..a6342cc7 100644
--- a/src/views/report/Product/monthly.vue
+++ b/src/views/report/Product/monthly.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-23 17:06:16
+ * @LastEditTime: 2024-04-25 08:39:13
  * @LastEditors: DY
  * @Description: 
 -->
@@ -9,115 +9,176 @@
   <div class="weekly">
     <el-form :inline="true" :model="listQuery" class="blueTip">
       <el-form-item label="月" prop="reportTime">
-        <el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
+        <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
         @click="handleExport">导出</el-button>
     </el-form>
-    <monthWeek v-if="glassWeekShow" ref="monthWeek" :product="false" :params="listQuery" />
-    <proMonth v-if="proWeekShow" ref="proMonth" :product="false" :params="listQuery" />
+    <base-table
+			:table-props="tableProps"
+			:table-data="tableData"
+      :span-method="mergeColumnHandler"
+			@emitFun="handleEmitFun"
+			:max-height="tableH"
+		/>
+    <!-- <monthWeek v-if="glassWeekShow" ref="monthWeek" :product="false" :params="listQuery" />
+    <proMonth v-if="proWeekShow" ref="proMonth" :product="false" :params="listQuery" /> -->
   </div>
 </template>
 
 <script>
-import monthWeek from '../glass/month.vue'
-import proMonth from '../productionMonthReport/index.vue'
-import { parseTime } from '../../core/mixins/code-filter';
+// import monthWeek from '../glass/month.vue'
+// import proMonth from '../productionMonthReport/index.vue'
+import { productionMonthY } from '@/api/report/glass';
+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: 240,
       listQuery: {
-				// pageSize: 10,
-				// pageNo: 1,
-				// total: 0,
-				reportType: 4,
-				reportTime: []
+				time: parseTime(new Date())
       },
-      startTimeStamp: '',
-      endTimeStamp: '',
-      reportTime: '',
-      glassWeekShow: false,
-      proWeekShow: false
+      // startTimeStamp: '',
+      // endTimeStamp: '',
+      // reportTime: '',
+      // glassWeekShow: false,
+      // proWeekShow: false,
+      tableData: [],
+			tableProps: [
+        {
+          prop: 'lineName',
+          label: ''
+        },
+        {
+          prop: 'paramsName',
+          label: ''
+        }
+      ],
+      resData: []
     }
   },
   created() {
-    this.getCurrentMonthFirst()
-    this.glassWeekShow = true
-    this.proWeekShow = true
+    // this.getCurrentMonthFirst()
+    // this.glassWeekShow = true
+    // this.proWeekShow = true
+  },
+  mounted() {
+    this.getList()
   },
   methods: {
-    getCurrentMonthFirst() {
-      const date = new Date();
-      date.setDate(1);
-      this.reportTime = date
-      // console.log(date)
-      this.changeTime(date)
-      // console.log(date.valueOf());
+    /** 合并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.tableProps = [
+        {
+          prop: 'lineName',
+          label: ''
+        },
+        {
+          prop: 'paramsName',
+          label: ''
+        }
+      ]
+      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()
+      })
+    },
+    // 设置表格数据
+    buildTableData() {
+      const temp = Object.values(this.resData)
+      console.log('temp', temp)
+      const dataArray = []
+      // Object.entries(this.resData).forEach(en => {
+      //   console.log('你好', en)
+        // const date = en[0]
+        // let valueArray = []
+        // Object.entries(en[1]).forEach((values, sequence) => {
+        //   let yValue = {}
+        //   yValue['line'] = values[0]
+        //   Object.entries(values[1]).forEach((lastV, index) => {
+        //     console.log(lastV)
+        //     const tempValue = {}
+        //     if (values[0] === yValue['line']) {
+        //       tempValue[values[0]] = lastV[1]
+        //     }
+        //     valueArray.push(tempValue)
+        //   })
+        //   yValue[date+'-'+sequence] = valueArray
+        //   dataArray.push(yValue)
+        // })
+      // })
+      // for (let key in temp) {
+      //   console.log('你好', temp[key])
+      // }
+      // 产线
+      Object.keys(temp[0]).forEach(item => {
+        // 规格循环
+        Object.keys(Object.values(temp[0])[0]).forEach(it => {
+          const row = {
+            lineName: item,
+            paramsName: it
+          }
+          this.tableData.push(row)
+        })
+      })
     },
     handleExport() {
-      this.$nextTick(() => {
-        this.$refs['monthWeek'].handleExport()
-        this.$refs['proMonth'].handleExport()
-      })
+      const xlsxParam = { raw: true }
+      let workbook = XLSX.utils.book_new()
+      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(() => {
-        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)
+    handleEmitFun(payload) {
+			console.log('payload', payload);
 		}
   }
 }
@@ -125,7 +186,7 @@ export default {
 
 <style scoped>
 .weekly {
-  padding-top: 16px;
+  padding: 16px;
 }
 .blueTip::before{
   display: inline-block;
diff --git a/src/views/report/Product/weekly.vue b/src/views/report/Product/weekly.vue
index 42cb7ee4..378aa55a 100644
--- a/src/views/report/Product/weekly.vue
+++ b/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(() => {
-        this.$refs['glassWeek'].handleExport()
-        this.$refs['proWeek'].handleExport()
-      })
+      const xlsxParam = { raw: true }
+      let workbook = XLSX.utils.book_new()
+      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(() => {
diff --git a/src/views/report/Product/year.vue b/src/views/report/Product/year.vue
index dced1829..c8eca855 100644
--- a/src/views/report/Product/year.vue
+++ b/src/views/report/Product/year.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-23 17:16:11
+ * @LastEditTime: 2024-04-24 15:49:32
  * @LastEditors: DY
  * @Description: 
 -->
@@ -28,7 +28,9 @@
 <script>
 import glassYear from '../glass/year.vue'
 import proYear from '../productionYearReport/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: { glassYear, proYear },
@@ -55,10 +57,28 @@ export default {
   },
   methods: {
     handleExport() {
-      this.$nextTick(() => {
-        this.$refs['glassYear'].handleExport()
-        this.$refs['proYear'].handleExport()
-      })
+      const xlsxParam = { raw: true }
+      let workbook = XLSX.utils.book_new()
+      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(() => {
diff --git a/src/views/report/productionMonthReport/index.vue b/src/views/report/productionMonthReport/index.vue
index 97d50d20..649570d0 100644
--- a/src/views/report/productionMonthReport/index.vue
+++ b/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
         );
         /* 获取二进制字符串作为输出 */
diff --git a/src/views/report/productionWeekReport/index.vue b/src/views/report/productionWeekReport/index.vue
index 90b24211..cf67175f 100644
--- a/src/views/report/productionWeekReport/index.vue
+++ b/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
         );
         /* 获取二进制字符串作为输出 */
diff --git a/src/views/report/productionYearReport/index.vue b/src/views/report/productionYearReport/index.vue
index 4740f1d8..0315c056 100644
--- a/src/views/report/productionYearReport/index.vue
+++ b/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
         );
         /* 获取二进制字符串作为输出 */

From 067cd4765ed7e8e65bba7bbee8d39dcbb9c0fe54 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 25 Apr 2024 09:04:29 +0800
Subject: [PATCH 4/5] 1

---
 src/views/report/Product/monthly.vue | 384 +++++++++++++++------------
 1 file changed, 213 insertions(+), 171 deletions(-)

diff --git a/src/views/report/Product/monthly.vue b/src/views/report/Product/monthly.vue
index a6342cc7..6e658e42 100644
--- a/src/views/report/Product/monthly.vue
+++ b/src/views/report/Product/monthly.vue
@@ -6,197 +6,239 @@
  * @Description: 
 -->
 <template>
-  <div class="weekly">
-    <el-form :inline="true" :model="listQuery" 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="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
-        @click="handleExport">导出</el-button>
-    </el-form>
-    <base-table
+	<div class="weekly">
+		<el-form
+			:inline="true"
+			:model="listQuery"
+			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="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
+				@click="handleExport">
+				导出
+			</el-button>
+		</el-form>
+		<base-table
 			:table-props="tableProps"
 			:table-data="tableData"
-      :span-method="mergeColumnHandler"
+			:span-method="objectSpanMethod1"
 			@emitFun="handleEmitFun"
-			:max-height="tableH"
-		/>
-    <!-- <monthWeek v-if="glassWeekShow" ref="monthWeek" :product="false" :params="listQuery" />
+			:max-height="tableH" />
+		<!-- <monthWeek v-if="glassWeekShow" ref="monthWeek" :product="false" :params="listQuery" />
     <proMonth v-if="proWeekShow" ref="proMonth" :product="false" :params="listQuery" /> -->
-  </div>
+	</div>
 </template>
 
 <script>
 // import monthWeek from '../glass/month.vue'
 // import proMonth from '../productionMonthReport/index.vue'
 import { productionMonthY } from '@/api/report/glass';
-import { parseTime } from '../../core/mixins/code-filter'
-import FileSaver from 'file-saver'
-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 {
-  // components: { monthWeek, proMonth },
-  mixins: [tableHeightMixin],
-  data() {
-    return {
-      heightNum: 240,
-      listQuery: {
-				time: parseTime(new Date())
-      },
-      // startTimeStamp: '',
-      // endTimeStamp: '',
-      // reportTime: '',
-      // glassWeekShow: false,
-      // proWeekShow: false,
-      tableData: [],
+	// components: { monthWeek, proMonth },
+	mixins: [tableHeightMixin],
+	data() {
+		return {
+			heightNum: 240,
+			listQuery: {
+				time: parseTime(new Date()),
+			},
+			// startTimeStamp: '',
+			// endTimeStamp: '',
+			// reportTime: '',
+			// glassWeekShow: false,
+			// proWeekShow: false,
+			tableData: [],
 			tableProps: [
-        {
-          prop: 'lineName',
-          label: ''
-        },
-        {
-          prop: 'paramsName',
-          label: ''
-        }
-      ],
-      resData: []
-    }
-  },
-  created() {
-    // this.getCurrentMonthFirst()
-    // this.glassWeekShow = true
-    // this.proWeekShow = true
-  },
-  mounted() {
-    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];
-			// 	}
-			// }
+				{
+					prop: 'lineName',
+					label: '',
+				},
+				{
+					prop: 'paramsName',
+					label: '',
+				},
+			],
+			resData: [],
+			span1: [], //表格1的合并规则
+		};
+	},
+	created() {
+		// this.getCurrentMonthFirst()
+		// this.glassWeekShow = true
+		// this.proWeekShow = true
+	},
+	mounted() {
+		this.getList();
+	},
+	methods: {
+		async getList() {
+			this.tableData = [];
+			this.tableProps = [
+				{
+					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);
+			});
 		},
-    async getList() {
-      this.tableData = []
-      this.tableProps = [
-        {
-          prop: 'lineName',
-          label: ''
-        },
-        {
-          prop: 'paramsName',
-          label: ''
-        }
-      ]
-      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()
-      })
-    },
-    // 设置表格数据
-    buildTableData() {
-      const temp = Object.values(this.resData)
-      console.log('temp', temp)
-      const dataArray = []
-      // Object.entries(this.resData).forEach(en => {
-      //   console.log('你好', en)
-        // const date = en[0]
-        // let valueArray = []
-        // Object.entries(en[1]).forEach((values, sequence) => {
-        //   let yValue = {}
-        //   yValue['line'] = values[0]
-        //   Object.entries(values[1]).forEach((lastV, index) => {
-        //     console.log(lastV)
-        //     const tempValue = {}
-        //     if (values[0] === yValue['line']) {
-        //       tempValue[values[0]] = lastV[1]
-        //     }
-        //     valueArray.push(tempValue)
-        //   })
-        //   yValue[date+'-'+sequence] = valueArray
-        //   dataArray.push(yValue)
-        // })
-      // })
-      // for (let key in temp) {
-      //   console.log('你好', temp[key])
-      // }
-      // 产线
-      Object.keys(temp[0]).forEach(item => {
-        // 规格循环
-        Object.keys(Object.values(temp[0])[0]).forEach(it => {
-          const row = {
-            lineName: item,
-            paramsName: it
-          }
-          this.tableData.push(row)
-        })
-      })
-    },
-    handleExport() {
-      const xlsxParam = { raw: true }
-      let workbook = XLSX.utils.book_new()
-      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;
-    },
-    handleEmitFun(payload) {
+		// 设置表格数据
+		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);
+		},
+		// 获取合并行
+		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 workbook = XLSX.utils.book_new();
+			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;
+		},
+		handleEmitFun(payload) {
 			console.log('payload', payload);
-		}
-  }
-}
+		},
+	},
+};
 </script>
 
 <style scoped>
 .weekly {
-  padding: 16px;
+	padding: 16px;
 }
-.blueTip::before{
-  display: inline-block;
-  content: '';
-  width: 4px;
-  height: 18px;
-  background: #0B58FF;
-  border-radius: 1px;
-  margin-right: 8PX;
-  margin-top: 8px;
-  margin-left: 16px;
+.blueTip::before {
+	display: inline-block;
+	content: '';
+	width: 4px;
+	height: 18px;
+	background: #0b58ff;
+	border-radius: 1px;
+	margin-right: 8px;
+	margin-top: 8px;
+	margin-left: 16px;
 }
 </style>

From 21f48793941f933311a0a92b78a701f7473fd8ae Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Thu, 25 Apr 2024 09:10:28 +0800
Subject: [PATCH 5/5] date

---
 src/views/report/Product/monthly.vue | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/views/report/Product/monthly.vue b/src/views/report/Product/monthly.vue
index a6342cc7..0e9c077e 100644
--- a/src/views/report/Product/monthly.vue
+++ b/src/views/report/Product/monthly.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-25 08:39:13
+ * @LastEditTime: 2024-04-25 09:10:07
  * @LastEditors: DY
  * @Description: 
 -->
@@ -33,7 +33,7 @@
 <script>
 // import monthWeek from '../glass/month.vue'
 // import proMonth from '../productionMonthReport/index.vue'
-import { productionMonthY } from '@/api/report/glass';
+import { productionMonthY, productionMonthD } from '@/api/report/glass';
 import { parseTime } from '../../core/mixins/code-filter'
 import FileSaver from 'file-saver'
 import * as XLSX from 'xlsx/xlsx.mjs'
@@ -46,7 +46,7 @@ export default {
     return {
       heightNum: 240,
       listQuery: {
-				time: parseTime(new Date())
+				time: ''
       },
       // startTimeStamp: '',
       // endTimeStamp: '',
@@ -68,9 +68,12 @@ export default {
     }
   },
   created() {
-    // this.getCurrentMonthFirst()
-    // this.glassWeekShow = true
-    // this.proWeekShow = true
+    let now = new Date()
+    now.setHours(0, 0, 0, 0)
+    now.setDate(1)
+    let startOfMonth = now.getTime()
+    let firstDayOfMonth = new Date(startOfMonth)
+    this.listQuery.time = parseTime(firstDayOfMonth)
   },
   mounted() {
     this.getList()
@@ -113,6 +116,19 @@ export default {
         })
         this.buildTableData()
       })
+      await productionMonthD(this.listQuery).then(res => {
+        console.log('11', res.data)
+        // this.resData = res.data
+        // // 设置表头
+        // Object.keys(this.resData).forEach(item => {
+        //   this.tableProps.push({
+        //     prop: item,
+        //     label: item,
+        //     'show-overflow-tooltip': true
+        //   })
+        // })
+        // this.buildTableData()
+      })
     },
     // 设置表格数据
     buildTableData() {