Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

修改bug
Merge pull request 'projects/mesxc-dy' (#374 ) from projects/mesxc-dy into projects/mesxc-test
2024-04-26 10:51:48 +08:00 · 2024-04-26 10:51:24 +08:00 · 2024-04-26 10:39:55 +08:00 · 2024-04-26 10:36:29 +08:00 · 2024-04-26 10:16:38 +08:00 · 2024-04-26 10:16:07 +08:00
29 changed files with 1696 additions and 1021 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,3 @@
 .dockerignore
-dist
+#dist
 node_modules
--- a/.drone.yml
+++ 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
--- a/.env.dev
+++ b/.env.dev
@@ -1,8 +1,8 @@
 ###
 # @Author: zhp
 # @Date: 2024-04-12 14:30:48
- # @LastEditTime: 2024-04-23 17:25:25
- # @LastEditors: DY
+ # @LastEditTime: 2024-04-25 10:07:02
+ # @LastEditors: zhp
 # @Description:
 ###
 # 开发环境配置
@@ -13,7 +13,7 @@ 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://192.168.1.104:48082'
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://192.168.1.101:48082'

--- a/24
+++ b/24
@@ -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/
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
    "benz-amr-recorder": "^1.1.5",
    "bpmn-js-token-simulation": "0.10.0",
    "clipboard": "2.0.8",
-    "code-brick-zj": "^1.0.5",
+    "code-brick-zj": "^1.1.0",
    "core-js": "^3.26.0",
    "crypto-js": "^4.0.0",
    "diagram-js": "^12.3.0",
--- a/src/api/quality/rawMaterialTraceability.js
+++ b/src/api/quality/rawMaterialTraceability.js
@@ -1,8 +1,8 @@
 /*
 * @Author: zhp
 * @Date: 2023-10-31 10:55:20
- * @LastEditTime: 2023-12-06 14:09:14
- * @LastEditors: zhp
+ * @LastEditTime: 2024-04-25 15:28:44
+ * @LastEditors: DY
 * @Description:
 */
 import request from '@/utils/request'
@@ -34,11 +34,11 @@ export function exportEnergyPlcExcel(query) {
  })
 }

-export function getOriginalGlassRetrace(query) {
+export function getOriginalGlassRetrace(data) {
   return request({
    url: '/base/original-glass-statistics/originalGlassRetrace',
-    method: 'get',
-    params: query,
+    method: 'post',
+    data
  })
 }

--- 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
+  })
+}
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-04-22 09:42:45
+ * @LastEditTime: 2024-04-25 09:03:50
 * @LastEditors: zhp
 * @Description:
 -->
@@ -628,7 +628,7 @@ export default {
            `<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.productArea) + '㎡' || ''}</span>`,
            `<span style="color:rgba(255,255,255,0.5)">${this.NumFormat(item.wasteArea) + '㎡' || ''}</span>`,
            `<div style = "${(item.product * 100).toFixed(0) >= 91 ? 'display:block;color:#00FFF7' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</div>
-           <div style = "${(item.product * 100).toFixed(0) <= 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(0) + '%' || ''}</div>`
+           <div style = "${(item.product * 100).toFixed(0) <= 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>`
          ])
          this.cutConfig.data = cutArr
          // this.$nextTick(() => {
--- a/src/views/OperationalOverview/components/ISRAChart.vue
+++ b/src/views/OperationalOverview/components/ISRAChart.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-01-29 13:45:56
- * @LastEditTime: 2024-04-17 15:48:21
+ * @LastEditTime: 2024-04-24 15:48:32
 * @LastEditors: zhp
 * @Description:
 -->
@@ -113,7 +113,7 @@ export default {
 				color:this.colors,
 				title:{
 					text: num,
-					subtext: '总数/片',
+					subtext: '总数/个',
 					top: '32%',
 					left: '49%',
 					textAlign: 'center',
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-07-19 15:18:30
 * @LastEditors: zhp
- * @LastEditTime: 2024-04-24 14:48:00
+ * @LastEditTime: 2024-04-26 09:57:41
 * @Description:
 -->
 <template>
@@ -42,21 +42,27 @@
              <el-row v-for="op in orderList" :key="op.id" style="margin-bottom: .5em;overflow: hidden;">
                <!-- <el-col :span="12"> -->
                <!-- <div style="height: 34px;"> -->
-                <span style="display: inline-block;width: 330px;">
-                  <span class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name }}</span>
-                  <el-divider class="split" v-if="op.specifications" direction="vertical"></el-divider>
+                <span style="display: inline-block;width: 400px">
+                  <span v-if="op.name" class="now-secondary-title" style="font-size: 14px;opacity: calc(.6);">{{ op.name
+                  }}</span>
+                  <el-divider v-if="op.specifications" class="split" direction="vertical"></el-divider>
                  <!-- <span v-if="op.size" class="split"></span> -->
                  <span v-if="op.specifications" class="orderSize" style="font-size: 14px;opacity: calc(.6);">{{
-                    op.specifications }}</span>
+                  op.specifications }}</span>
                  <el-divider class="split" v-if="op.planQuantity" direction="vertical"></el-divider>
                  <span v-if="op.planQuantity" class="orderPlan" style="font-size: 14px;opacity: calc(.6);">{{
-                    op.planQuantity }}</span>
+                  op.planQuantity }}</span>
+                  <span v-if="op.planQuantity" class="orderFinishTwo"
+                    style="font-size: 14px;opacity: calc(.6);">片</span>
                </span>
-                <span v-if="op.actualQuantity" class="orderFinish" style="font-size: 14px;margin-left: 130px;">{{
-                  op.actualQuantity
-                  }}</span>
+                <!-- <span style="overflow: hidden;"> -->
+                <span class="orderFinish" style="font-size: 14px;margin-left: 40px;">{{
+                op.actualQuantity
+                }}</span>
+                <span v-if="op.actualQuantity" class="orderFinishTwo" style="font-size: 14px">片</span>
                <el-divider class="split" style="background-color: rgba(0, 255, 247, 1)" v-if="op.actualQuantity"
                  direction="vertical"></el-divider>
+                <!-- </span> -->
                <!-- </div> -->
                <el-progress style="width: 620px;" text-color="rgba(0, 255, 247, 1)" :stroke-width="10"
                  define-back-color="rgba(32, 57, 96, 1)" :percentage="op.progressRate" class="custom-progress-bar" />
@@ -80,7 +86,7 @@
          </base-container>
        </el-col>
        <el-col :style="{ margin: 8 + 'px' + ' 0' }" :span="12">
-          <base-container  :show-time="true" :no-content-padding="true" :height="318 + 338 + 16" :size="'eqStatus'"
+          <base-container :show-time="true" :no-content-padding="true" :height="318 + 338 + 16" :size="'eqStatus'"
            :title="'产线产量及良品率'" :title-icon="'productLine'">
            <div class="myLegend">
              <div class=" barCircleLegend"></div>
@@ -110,78 +116,79 @@ const qualityYearList = [
 	{
 		name: '翻转机',
 		code: 'EQ20240110112358000235',
-		status: '正常',
+		status: '运行',
    error: true,
 	},
 	{
 		name: '烘干炉',
 		code: 'EQ20240110112537000241',
-		status: '计划停机',
+		status: '停机',
    error: true,
 	},
 	{
 		name: '清洗机',
 		code: '	EQ20240110112310000232',
-    status: '正常',
+    status: '故障',
    error: true,
 	},
 	{
 		name: '钢化清洗机',
 		code: 'EQ20240110111700000208',
-    status: '正常',
+    status: '故障',
    error: true,
 	},
 	{
 		name: '固化机',
 		code: 'EQ20240110111700000201',
-    status: '正常',
+    status: '停机',
    error: false,
 	},
 	{
 		name: '磨边清洗机',
 		code: '	EQ20240110111700000208',
-    status: '正常',
+    status: '停机',
    error: true,
 	},
 	{
 		name: '预热机',
 		code: 'EQ20240110111700000205',
-		status: '故障',
+    status: '运行',
    error: false,
 	},
 	{
 		name: '下片机',
-		code: 'EQ20240115151435000279',
+    code: 'EQ20240115151435000279',
+    status: '故障',
    error: true,
 	},
 	{
 		name: '冷却机',
 		code: 'EQ20240110111700000203',
-    status: '正常',
+    status: '运行',
    error: false,
 	},
 	{
 		name: 'A储片机106',
 		code: 'EQ20240110111700000202',
-    status: '正常',
+    status: '停机',
    error: true,
 	},
 	{
 		name: '二次清洗机',
 		code: 'EQ20240110111700000209',
-    status: '正常',
+    status: '停机',
    error: true,
 	},
 	{
 		name: '二次磨边机',
 		code: '	EQ20240110110927000181',
-    status: '正常',
+    status: '停机',
    error: false,
 	},
 	{
 		name: '测试设备',
 		code: 'EQ20240110111700000201',
-    status: '正常',
+    status: '运行',
    error: true,
 	},
 ];
@@ -292,11 +299,11 @@ export default {
 			// equipmentList:[],
 			EnergyMonitoringList: [],
 			eqConfig: {
-				header: ['序号', '设备名称', '设备编码', '设备状态', '是否故障'],
+        header: ['序号', '产线名', '设备名称', '设备状态'],
 				headerBGC: 'rgba(32, 55, 96, 0.8)',
 				oddRowBGC: 'rgba(32, 55, 96, 0.8)',
 				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-				columnWidth: [70, 100, 200, 90, 90],
+				columnWidth: [70, 150, 200, 120],
 				align: ['center'],
 				data: [],
 				// index:true,
@@ -373,15 +380,15 @@ export default {
 		this.websocketClose();
 		this.SJGWebsocketClose();
 	},
-	mounted() {
+  mounted() {
 		let detData = [
 			{
 				id: '1',
-				name: '测试工单',
+        name: '镀釉光伏玻璃GW',
        progressRate: 0.933333,
        specifications: '1100*5554*22',
-        plan: 11111,
-        actualQuantity:111,
+        plan: 111111111111,
+        actualQuantity:1000000111111,
 			},
 			{
 				id: '2',
@@ -452,12 +459,12 @@ export default {
 		this.orderList = detData.map((ele, index) => {
 			if (ele.progressRate && ele.progressRate != 1) {
 				return {
-					id: ele.id,
-					name: ele.name,
+          id: ele.id,
+          name: this.getStr(String(ele.name), 8),
          progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
-          specifications: ele.specifications ?  '规格' + ele.specifications :null,
-          planQuantity: ele.plan ? '计划' + ele.plan + '片' : null,
-          actualQuantity: ele.actualQuantity + '片',
+          specifications: ele.specifications ? '规格' + ele.specifications : '',
+          planQuantity: ele.plan ? '计划' + this.getStr(String(ele.plan), 6) : '',
+          actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity), 6) : '',
 				};
 			}
 		});
@@ -473,16 +480,14 @@ export default {
 			this.EnergyMonitoringNameList,
 			this.EnergyMonitoringList
 		);
-		let eqArr = this.qualityYearList.map((item, index) => [
+    let eqArr = this.qualityYearList.map((item, index) => [
 			`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
            </span>`,
 			// formatDate(item.planStartTime) || '',
-			`
+      `<span style="color:rgba(255,255,255,0.5)">${item.lineName || ''}</span>`,`
          <span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
            </span>`,
-			`<span style="color:rgba(255,255,255,0.5)">${item.code || ''}</span>`,
-      `<span style="color:rgba(255,255,255,0.5)"><div style="${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 ' : '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 style="color:rgba(255,255,255,0.5)"><div style="${item.error == false ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '}"></div>  ${item.error == true ? '是' : '否' || ''}</span>`,
+      `<span style="color:rgba(255,255,255,0.5)"><div style="${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 #FFBD02;width:6px;height:6px;border-radius: 50%;background-color: #FFBD02;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0'}"></div>  ${item.status || ''}</span>`,
 		]);
    this.eqConfig.data = eqArr;
    let data = [
@@ -561,6 +566,15 @@ export default {
 	//   removeEventListener('resize', resizeFun)
 	// },
  methods: {
+    getStr(str,num) {
+          //你要处理的字符串
+      if (str.length > num) {      //如果字符长度超过10，后面的字符就变成...可自行调整长度和代替字符
+        str = str.substr(0, num) + "..."   //截取从第一个字符开始，往后取10个字符，剩余的用...代替
+        return str
+      } else {
+        return str
+      }
+    },
 		getData() {
 			let processArr = qualityMonthList.map((item, index) => [
 				// console.log(item)
@@ -729,12 +743,12 @@ export default {
 					this.orderList = this.SJGWsData.detData.map((ele, index) => {
 						if (ele.progressRate && ele.progressRate != 1) {
 							return {
-								id: ele.id,
-								name: ele.name,
+                id: ele.id,
+                name: this.getStr(String(ele.name), 8),
                progressRate: parseFloat((ele.progressRate * 100).toFixed(0)),
-                specifications: ele.specifications ?  '规格' + ele.specifications :null,
-                planQuantity: ele.planQuantity  ? '计划' + ele.planQuantity + '片' : null,
-                actualQuantity: ele.actualQuantity ? ele.actualQuantity + '片' : null,
+                specifications: ele.specifications ? '规格' + ele.specifications : '',
+                planQuantity: ele.planQuantity ? '计划' + this.getStr(String(ele.planQuantity),6) : '',
+                actualQuantity: ele.actualQuantity ? this.getStr(String(ele.actualQuantity), 6) : '',
 							};
 						}
 					});
@@ -743,13 +757,13 @@ export default {
 					let eqArr = this.SJGWsData.detData.map((item, index) => [
 						`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
            </span>`,
+            `<span style="color:rgba(255,255,255,0.5)">${item.lineName || ''
+            }</span>`,
 						`<span style="color:rgba(255,255,255,0.5)" >${item.name || ''}
            </span>`,
-						`<span style="color:rgba(255,255,255,0.5)">${
-							item.code || ''
-						}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.status == '正常' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${item.status || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == false ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:10px 10px 0 0 '}"></div>  ${item.error == true ?'是' :'否'  || ''}</span>`,
+
+            `<span style="color:rgba(255,255,255,0.5)"><div style="${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 #FFBD02;width:6px;height:6px;border-radius: 50%;background-color: #FFBD02;float:left;margin:13px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0'}"></div>  ${item.status || ''}</span>`,
+            // `<span style="color:rgba(255,255,255,0.5)"><div style="${item.error == false ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:10px 10px 0 0 '}"></div>  ${item.error == true ?'是' :'否'  || ''}</span>`,
 					]);
          this.eqConfig.data = eqArr;
          // this.$nextTick(() => {
@@ -971,7 +985,7 @@ export default {

 .now-secondary-title {
  display: inline-block;
-  width: 70px;
+  width: 110px;
 	margin: 0;
 	font-size: 14px;
 	line-height: 2em;
@@ -990,16 +1004,27 @@ export default {
  width: 60px;
  margin: 0;
  font-size: 14px;
+  text-align: right;
+  color: rgba(0, 255, 247, 1);
+}
+.orderFinishTwo{
+  display: inline-block;
+  width: 15px;
+  margin: 0;
+  font-size: 14px;
  line-height: 2em;
+  // text-overflow: ellipsis;
+  // white-space: nowrap;
+  // overflow: hidden;
  text-align: right;
  color: rgba(0, 255, 247, 1);
 }
 .orderPlan {
  display: inline-block;
-  width: 100px;
+  // width: 80px;
  margin: 0;
  font-size: 14px;
-  line-height: 2em;
+  // line-height: 2em;
  color: #fff;
  text-align: left;
 }
--- 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',
--- a/src/views/databoard/deepProcessing/EqAlarm.vue
+++ b/src/views/databoard/deepProcessing/EqAlarm.vue
@@ -32,11 +32,11 @@ export default {
 		return {
 			timestr: '',
 			config: {
-				header: ['序号', '设备名称', '设备编码', '设备状态', '是否故障'],
+				header: ['序号', '产线名', '设备名称', '设备状态'],
 				headerBGC: 'rgba(32, 55, 96, 0.8)',
 				oddRowBGC: 'rgba(32, 55, 96, 0.8)',
 				evenRowBGC: 'rgba(14, 32, 62, 0.8)',
-				columnWidth: [60, 150, 190],
+				columnWidth: [60, 120, 280],
 				align: ['center'],
 				data: [],
 				// data: [
@@ -63,18 +63,20 @@ export default {
 			handler(newVal, oldVal) {
 				let outArr = this.sjgEquipment.map((item, index) => [
 					index + 1,
+					`<span title=${item.lineName || ''}>${item.lineName || ''}</span>`,
 					`<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="${
-						item.error == false
-							? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
-							: 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '
-					}"></div>  ${item.error == true ? '是' : '否' || ''}</span>`,
+					// `<span"><div style="${
+					// 	item.error == false
+					// 		? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:13px 10px 0 0 '
+					// 		: 'box-shadow: 0px 0px 2px 1px red;width:6px;height:6px;border-radius: 50%;  background-color: red;float:left;margin:13px 10px 0 0 '
+					// }"></div>  ${item.error == true ? '是' : '否' || ''}</span>`,
 				]);
 				this.config.data = outArr;
 				this.$refs['eqScrollBoard'].updateRows(outArr);
--- a/src/views/databoard/kiln/GasHandle.vue
+++ b/src/views/databoard/kiln/GasHandle.vue
@@ -80,7 +80,7 @@
 					</span>
 				</ShadowRect>

-				<ShadowRect>
+				<!-- <ShadowRect>
 					<span
 						style="
 							font-size: 20px;
@@ -99,7 +99,7 @@
 								: ''
 						}}mg/m³
 					</span>
-				</ShadowRect>
+				</ShadowRect> -->
 			</div>
 			<KilnLine :horizontal="true" />
 			<div
@@ -130,8 +130,9 @@
 						align-items: center;
 						justify-content: space-between;
 					">
+					<!-- :options="['氧气含量', '二氧化硫', '氮氧化物', '颗粒物']" -->
 					<SelectorBtnGroup
-						:options="['氧气含量', '二氧化硫', '氮氧化物', '颗粒物']"
+						:options="['氧气含量', '二氧化硫', '氮氧化物']"
 						@emitFun="toggleType"
 						:active="chartType" />
 					<SelectorBtnGroup
--- a/src/views/quality/base/qualityIsra/index.vue
+++ b/src/views/quality/base/qualityIsra/index.vue
@@ -86,16 +86,19 @@ import moment from 'moment';
 // import DialogForm from './dialogForm.vue';
 import * as echarts from 'echarts';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import { getCorePLList } from '@/api/base/coreProductionLine';
+import { parseTime } from '@/utils/ruoyi';

 // import basicPageMixin from '@/mixins/lb/basicPageMixin';
 export default {
-  name: 'statisticalData',
+  name: 'QualityIsra',
 	// components: {
 	// 	DialogForm,
 	// },
  mixins: [tableHeightMixin],
 	data() {
    return {
+      isFold: false,
      list: [],
      dynamicProps: [],
      activeName: 'day',
@@ -106,6 +109,16 @@ export default {
      weekListUrl: '/base/quality-isra-statistics/weekList',
      monthListUrl: '/base/quality-isra-statistics/monthList',
      searchBarFormConfig: [
+        {
+          type: 'select',
+          label: '是否报废',
+          placeholder: '请选择是否报废',
+          param: 'checkDiscard',
+          selectOptions: [
+            { name: '否', id: 0 },
+						{ name: '是', id: 1 }
+          ],
+        },
        {
          type: 'select',
          label: '缺陷类型',
@@ -114,6 +127,17 @@ export default {
          selectOptions: [],
          labelField: 'name',
          valueField: 'name',
+          defaultSelect: [],
+          filterable: true
+        },
+        {
+          type: 'select',
+          label: '产线',
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'name',
+          param: 'lineName',
+          filterable: true,
          defaultSelect: []
        },
 				{
@@ -139,8 +163,9 @@ export default {
 			],
 			// 查询参数
 			queryParams: {
+        checkDiscard: undefined,
        checkType:undefined,
-        // productionId: undefined,
+        lineName: undefined,
        startTime: undefined,
        endTime: undefined,
 				// productionLineId: null,
@@ -149,6 +174,7 @@ export default {
  },
 	created() {
 		// this.getProductLineList();
+    // this.isFold = this.searchBarWidth('QualityIsraBox', 1198);
  },
  computed: {
    tableProps() {
@@ -168,29 +194,20 @@ export default {
    },
  },
  mounted() {
-    // if (this.$route.query.woIdString) {
-    //   console.log(this.$route.query.woIdString)
-    //   this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
-    //   // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
-    //   // let arr =[]
-    //   this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
-    //   console.log(this.searchBarFormConfig[0].defaultSelect);
-    // }
-    // if (this.$route.params.startTime && this.$route.params.endTime) {
-    //   this.searchBarFormConfig[0].defaultSelect = [
-    //     this.$route.params.startTime,
-    //     this.$route.params.endTime,
-    //   ];
-    //   this.queryParams.param = {};
-    //   this.$set(
-    //     this.queryParams.param,
-    //     'startTime',
-    //     this.$route.params.startTime
-    //   );
-    //   this.$set(this.queryParams.param, 'endTime', this.$route.params.endTime);
-    // } else {
-    //   this.searchBarFormConfig[0].defaultSelect = [];
-    // }
+    if (this.$route.query.lineName) {
+      // console.log('打印看看产线', this.$route.query.lineName)
+      this.queryParams.lineName = this.$route.query.lineName
+      this.searchBarFormConfig[2].defaultSelect = this.$route.query.lineName
+    }
+    if (this.$route.query.originalGlassOutputTime) {
+      console.log('你好', this.$route.query.originalGlassOutputTime)
+      this.queryParams.startTime = parseTime(new Date(Number(this.$route.query.originalGlassOutputTime)))
+      this.queryParams.endTime = parseTime(new Date(Number(this.$route.query.originalGlassOutputTime)))
+      this.searchBarFormConfig[3].defaultSelect = [
+        this.queryParams.startTime,
+        this.queryParams.endTime,
+      ];
+    }
    this.getList()
    this.getData()
    this.getDict()
@@ -393,8 +410,12 @@ export default {
          pageNo:1
        }
      });
-      console.log(res)
-      this.searchBarFormConfig[0].selectOptions = res.data.list
+      // console.log(res)
+      this.searchBarFormConfig[1].selectOptions = res.data.list
+      await getCorePLList().then((res) => {
+				// console.log(res);
+				this.searchBarFormConfig[2].selectOptions = res.data;
+			})
      // this.searchBarFormConfig[1].selectOptions = res.data.map((item) => {
      //   return {
      //     name: item.name,
@@ -425,7 +446,7 @@ export default {
    },
 		/** 查询列表 */
    async getDataList() {
-      console.log(this.queryParams);
+      console.log('查询条件', this.queryParams);
 			this.loading = true;
 			// 执行查询
      const {
@@ -467,7 +488,10 @@ export default {
    },
 		/** 取消按钮 */
    handleSearchBarBtnClick(val) {
+      console.log('11111', val)
      if (val.btnName === 'search') {
+        this.queryParams.checkDiscard = (val?.checkDiscard === 0 || val?.checkDiscard === 1) ? val?.checkDiscard : undefined
+        this.queryParams.lineName = val.lineName ? val.lineName : undefined
        this.queryParams.checkType = val.checkType ? val.checkType : undefined
        // this.queryParams.productionId = val.productionId ? val.productionId : undefined
        this.queryParams.startTime = val.checkTime ? val.checkTime[0] : undefined
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/src/views/quality/monitoring/originalGlassRetrace/index.vue
@@ -1,20 +1,59 @@
 <!--
 * @Author: zwq
 * @Date: 2023-08-01 14:55:51
- * @LastEditors: zhp
- * @LastEditTime: 2024-04-07 16:25:19
+ * @LastEditors: DY
+ * @LastEditTime: 2024-04-26 09:58:51
 * @Description:
 -->
 <template>
  <div class="app-container">
-    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+    <!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
+    <el-form
+			:inline="true"
+			:model="listQuery"
+			class="blueTip">
+      <el-form-item label="合格证号" prop="certificateNumber">
+				<el-input size="small" v-model="listQuery.certificateNumber" clearable placeholder="合格证号" @blur="countTimes(1)" @clear="countArray[0] = false"></el-input>
+			</el-form-item>
+      <el-form-item label="成品周转编号" prop="packagingCode">
+				<el-input size="small" v-model="listQuery.packagingCode" clearable placeholder="成品周转编号" @blur="countTimes(2)" @clear="countArray[1] = false"></el-input>
+			</el-form-item>
+      <el-form-item label="原片周转编号" prop="glassCode">
+				<el-input size="small" v-model="listQuery.glassCode" clearable placeholder="原片周转编号" @blur="countTimes(3)" @clear="countArray[2] = false"></el-input>
+			</el-form-item>
+			<el-form-item label="包装全检时间及产线" prop="val">
+				<el-date-picker
+					v-model="listQuery.packTime"
+					value-format="timestamp"
+					type="datetime"
+					size="small"
+          clearable
+					placeholder="包装全检时间"
+          @change="countTimes('timestamp3')"
+        />
+        <el-select v-model="listQuery.lineName" size="small" clearable filterable placeholder="产线" @change="countTimes('timestamp3')" style="margin-left: 5px">
+          <el-option v-for="(item, index) in lineOptions" :key="index" :label="item.name" :value="item.name"></el-option>
+        </el-select>
+			</el-form-item>
+      <el-form-item>
+        <el-button
+          v-if="this.$auth.hasPermi('monitoring:rawMaterial-traceability:query')"
+          type="primary"
+          size="small"
+          @click="getList">
+          查询
+        </el-button>
+      </el-form-item>
+		</el-form>
+    <!-- <base-table :max-height="tableH" :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+      :table-data="list"> -->
+    <base-table :max-height="tableH" :table-props="tableProps"
      :table-data="list">
-      <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-        @clickBtn="handleClick" /> -->
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="220" label="缺陷操作" :method-list="tableBtn"
+        @clickBtn="handleClick" />
    </base-table>
-    <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-      @pagination="getList" />
+    <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
+      @pagination="getList" /> -->
    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" /> -->
  </div>
 </template>
@@ -23,61 +62,76 @@
 // import AddOrUpdate from './add-or-updata';
 // import unitDict from './unitDict';
 // import basicPage from '../mixins/basic-page';
-import { publicFormatter } from '@/utils/dict';
+// import { publicFormatter } from '@/utils/dict';
 import { parseTime } from '../mixins/code-filter';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import { getCorePLList } from '@/api/base/coreProductionLine';

-import {
-  getOriginalGlassRetrace,
-  getWorkOrderList,
-  // exportEnergyPlcExcel
-} from '@/api/quality/rawMaterialTraceability';
+import { getOriginalGlassRetrace } from '@/api/quality/rawMaterialTraceability';

 const tableProps = [
-
  {
-    prop: 'orderName',
-    label: '订单名称',
+    prop: 'certificateNumber',
+    label: '合格证号',
+    minWidth: 120,
+		showOverflowtooltip: true,
+    filter: (val) => val ? val : '--'
  },
  {
-    prop: 'workOrderName',
-    label: '工单名称',
-  },
-  {
-    prop: 'palletNumber',
-    label: '托号',
-  },
-  {
-    prop: 'transportQuantity',
-    label: '该托片数',
+    prop: 'boxNumber',
+    label: '箱号',
+    minWidth: 150,
+		showOverflowtooltip: true,
+    filter: (val) => val ? val : '--'
  },
  {
    prop: 'packagingCode',
-    label: '包装条码',
-  },
-  {
-    prop: 'originalGlassLineName',
-    label: '原片产线',
-  },
-  {
-    prop: 'originalGlassOutputTime',
-    label: '原片下片时间',
-    filter: parseTime
+    label: '成品周转编号',
+    minWidth: 180,
+		showOverflowtooltip: true,
+    filter: (val) => val ? val : '--'
  },
  {
    prop: 'deepProcessingLineName',
    label: '深加工产线',
+    minWidth: 120,
+		showOverflowtooltip: true,
+    filter: (val) => val ? val : '--'
  },
  {
    prop: 'deepProcessingInputTime',
    label: '深加工上片时间',
-    filter: parseTime
+    // filter: (val) => parseTime(val) ? parseTime(val) : '--',
+    filter: parseTime,
+    minWidth: 180,
+		showOverflowtooltip: true
  },
  {
-    prop: 'productionOutputTime',
+    prop: 'deepProcessingOutputTime',
    label: '深加工下片时间',
-    filter: parseTime
+    filter: parseTime,
+    minWidth: 180,
+		showOverflowtooltip: true
  },
+  {
+    prop: 'glassCode',
+    label: '原片周转编码',
+    minWidth: 150,
+		showOverflowtooltip: true
+  },
+  {
+    prop: 'originalGlassLineName',
+    label: '原片产线',
+    minWidth: 150,
+		showOverflowtooltip: true
+  },
+  {
+    prop: 'originalGlassOutputTime',
+    label: '原片下片时间',
+    filter: parseTime,
+    minWidth: 180,
+		showOverflowtooltip: true
+  }
  // {
  //   prop: 'scrapDetail',
  //   label: '详情',
@@ -90,62 +144,90 @@ export default {
  mixins: [tableHeightMixin],
  data() {
    return {
-      // urlOptions: {
-      //   getDataListURL: getMaterialUseLogPage,
-      //   // deleteURL: deletePackingType,
-      //   // exportURL: exportPackingExcel,
-      // },
+      lineOptions: [],
      tableProps,
-      // tableBtn: [
-      //   // this.$auth.hasPermi(`base:packaging-print-log:update`)
-      //   //   ?
-      //     {
-      //       type: 'edit',
-      //       btnName: '编辑',
-      //     },
-      //     // : undefined,
-      //   // this.$auth.hasPermi(`base:packaging-print-log:delete`)
-      //   //   ?
-      //     {
-      //       type: 'delete',
-      //       btnName: '删除',
-      //     }
-      //     // : undefined,
+      tableBtn: [
+        // this.$auth.hasPermi(`base:packaging-print-log:update`)
+        //   ?
+          {
+            type: 'detail0',
+            btnName: '成品缺陷详情',
+          },
+          // : undefined,
+        // this.$auth.hasPermi(`base:packaging-print-log:delete`)
+        //   ?
+          {
+            type: 'detail1',
+            btnName: '原片缺陷详情',
+          }
+          // : undefined,

-      // ].filter((v) => v),
+      ].filter((v) => v),
      list: [],
      listQuery: {
-        pageSize: 10,
-        pageNo: 1,
-        total: 0,
-        workOrderId: undefined,
-        startTime: undefined,
-        endTime:undefined,
+        // pageSize: 10,
+        // pageNo: 1,
+        // total: 0,
+        certificateNumber: undefined,
+        packagingCode: undefined,
+        packTime: null,
+        lineName: null,
+        glassCode: undefined
      },
+      useTime: false,
+      countArray: [false, false, false, false],
      // tableH: this.tableHeight(260),
      formConfig: [
+        // {
+        //   type: 'select',
+        //   label: '工单',
+        //   selectOptions: [],
+        //   labelField: 'name',
+        //   valueField: 'name',
+        //   param: 'workOrderName',
+        //   filterable: true
+        // },
+        {
+          type: 'input',
+          label: '合格证号',
+          placeholder: '合格证号',
+          param: 'certificateNumber',
+
+        },
+        {
+          type: 'input',
+          label: '成品周转编号',
+          placeholder: '成品周转编号',
+          param: 'packagingCode'
+        },
+        {
+          type: 'datePicker',
+          label: '包装全检时间及产线',
+          dateType: 'datetimerange',
+          format: 'timestamp',
+          valueFormat: "timestamp",
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 250
+        },
        {
          type: 'select',
-          label: '工单',
+          label: '',
          selectOptions: [],
          labelField: 'name',
          valueField: 'name',
-          param: 'workOrderName',
+          param: 'lineName',
          filterable: true
        },
-        // {
-        //   type: 'datePicker',
-        //   label: '时间段',
-        //   dateType: 'daterange',
-        //   format: 'yyyy-MM-dd',
-        //   valueFormat: "yyyy-MM-dd",
-        //   rangeSeparator: '-',
-        //   startPlaceholder: '开始时间',
-        //   endPlaceholder: '结束时间',
-        //   param: 'timeVal',
-        //   defaultSelect: [],
-        //   width: 250
-        // },
+        {
+          type: 'input',
+          label: '原片周转编号',
+          placeholder: '原片周转编号',
+          param: 'glassCode'
+        },
        {

          type: this.$auth.hasPermi('monitoring:rawMaterial-traceability:query') ? 'button' : '',
@@ -191,41 +273,86 @@ export default {
    // window.addEventListener('resize', () => {
    //   this.tableH = this.tableHeight(260)
    // })
-    this.getList()
+    countArray: [false, false, false, false],
+    this.useTime = false
+    // this.getList()
    this.getDict()
  },
  methods: {
+    handleClick(raw) {
+			if (raw.type === 'detail1') {
+        // 原片缺陷
+				this.$router.push({
+          path: '/quality/base/quality-isra',
+          query: {
+            // deepProcessingLineId: raw.data.deepProcessingLineId,
+            lineName: raw.data.deepProcessingLineName,
+            originalGlassOutputTime: raw.data.originalGlassOutputTime
+          },
+        });
+			} else {
+				// 成品缺陷
+				this.$router.push({
+          path: '/quality/base/quality-inspection-data/detection-information/statistical-data',
+          query: {
+            startTime: raw.data.deepProcessingInputTime,
+            endTime: raw.data.deepProcessingOutputTime
+          },
+        });
+			}
+		},
+    countTimes(val) {
+      if (val === 1) {
+        this.countArray[0] = this.listQuery.certificateNumber !== '' && this.listQuery.certificateNumber !== undefined
+      }
+      if (val === 2) {
+        this.countArray[1] = this.listQuery?.packagingCode !== '' && this.listQuery?.packagingCode !== undefined
+      }
+      if (val === 3) {
+        this.countArray[2] = this.listQuery?.glassCode !== '' && this.listQuery?.glassCode !== undefined
+      }
+      if (val === 'timestamp3') {
+        if ((this.listQuery.packTime !== '' && this.listQuery.packTime !== null) || (this.listQuery?.lineName !== '' && this.listQuery.lineName !== null)) {
+          this.useTime = true
+          this.countArray[3] = true
+        } else {
+          this.useTime = false
+          this.countArray[3] = true
+        }
+      }
+    },
    getList() {
-      getOriginalGlassRetrace({ ...this.listQuery }).then(res => {
-        console.log(res);
-        this.list = res.data || []
-        console.log(this.list);
-        // this.listQuery.total = res.data.total || 0
-      })
+      let trueArray = this.countArray.filter(val => val === true)
+      if (trueArray.length !== 1) {
+        this.$message.error('请选择一个条件进行查询！')
+      } else {
+        if (this.useTime === true) {
+          if (this.listQuery.packTime !== null && this.listQuery.packTime !== '' && this.listQuery.lineName !== null && this.listQuery.lineName !== '') {
+            getOriginalGlassRetrace({ ...this.listQuery }).then(res => {
+              console.log(res);
+              this.list = res.data || []
+              console.log(this.list);
+              // this.listQuery.total = res.data.total || 0
+            })
+          } else {
+            this.$message.error('选择包装全检时，时间和产线均为必填！')
+          }
+        } else {
+          getOriginalGlassRetrace({ ...this.listQuery }).then(res => {
+            console.log(res);
+            this.list = res.data || []
+            console.log(this.list);
+          })
+        }
+      }
+      
    },
    getDict() {
-      // 获取产品的属性列表
-      // getCustomerList().then((response) => {
-      //   console.log(response);
-      //   this.customerList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      // getModelList().then((response) => {
-      //   console.log(response);
-      //   this.modelList = response.data
-      //   // this.listQuery.total = response.data.total;
-      // })
-      getWorkOrderList().then((response) => {
-        // console.log(response);
-        this.formConfig[0].selectOptions = response.data.map((item) => {
-          return {
-            name: item.name,
-            id: item.id
-          }
-        })
-        console.log(this.formConfig[0].selectOptions);
-        // this.listQuery.total = response.data.total;
-      })
+      // 获取产线
+      getCorePLList().then((res) => {
+				console.log(res);
+				this.lineOptions = res.data;
+			})
    },
    // handleExport() {
    //   // 处理查询参数
@@ -243,7 +370,7 @@ export default {
    buttonClick(val) {
      console.log(val)
      if (val.btnName === 'search') {
-        this.listQuery.workOrderName = val.workOrderName ? val.workOrderName :undefined
+        this.listQuery.certificateNumber = val.certificateNumber ? val.certificateNumber :undefined
        // this.queryParams.status = val.status
        // if (val.timeVal && val.timeVal.length != 0 ) {
        // this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
@@ -272,3 +399,17 @@ export default {
  },
 };
 </script>
+
+<style scoped>
+.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>
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@@ -60,26 +60,26 @@ export default {
      list: [],
      dynamicProps:[],
      searchBarFormConfig: [
-        {
-          type: 'select',
-          label: '工单名称',
-          placeholder: '请选择工单名称',
-          param: 'workOrderIdList',
-          selectOptions: [],
-          multiple: true,
-          labelField: 'name',
-          valueField: 'id',
-          defaultSelect: [],
-          filterable: true
-        },
-				{
-					type: 'select',
-					label: '产品',
-          placeholder: '请选择产品',
-          param: 'productionId',
-          selectOptions: [],
-          filterable: true
-				},
+        // {
+        //   type: 'select',
+        //   label: '工单名称',
+        //   placeholder: '请选择工单名称',
+        //   param: 'workOrderIdList',
+        //   selectOptions: [],
+        //   multiple: true,
+        //   labelField: 'name',
+        //   valueField: 'id',
+        //   defaultSelect: [],
+        //   filterable: true
+        // },
+				// {
+				// 	type: 'select',
+				// 	label: '产品',
+        //   placeholder: '请选择产品',
+        //   param: 'productionId',
+        //   selectOptions: [],
+        //   filterable: true
+				// },
 				// {
 				// 	type: 'input',
 				// 	label: '检测内容',
@@ -193,8 +193,8 @@ export default {
 			// },
 			// 查询参数
 			queryParams: {
-        workOrderIdList:undefined,
-        productionId: undefined,
+        // workOrderIdList:undefined,
+        // productionId: undefined,
        startTime: undefined,
        endTime: undefined,
 				// productionLineId: null,
@@ -207,16 +207,16 @@ export default {
  computed: {
    tableProps() {
      return [
-        {
-          // width: 128,
-          prop: 'workOrderName',
-          label: '工单名称',
-        },
-        {
-          // width: 128,
-          prop: 'productionName',
-          label: '产品',
-        },
+        // {
+        //   // width: 128,
+        //   prop: 'workOrderName',
+        //   label: '工单名称',
+        // },
+        // {
+        //   // width: 128,
+        //   prop: 'productionName',
+        //   label: '产品',
+        // },
        {
          // width: 160,
          prop: 'inspectionContent',
@@ -259,17 +259,17 @@ export default {
    },
  },
  mounted() {
-    if (this.$route.query.woIdString) {
-      console.log(this.$route.query.woIdString)
-      this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
-      // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
-      // let arr =[]
-      this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
-      console.log(this.searchBarFormConfig[0].defaultSelect);
-    }
+    // if (this.$route.query.woIdString) {
+    //   console.log(this.$route.query.woIdString)
+    //   this.queryParams.workOrderIdList = this.$route.query.woIdString.split(',')
+    //   // this.queryParams.workOrderIdList = [this.$route.query.woIdString]
+    //   // let arr =[]
+    //   this.searchBarFormConfig[0].defaultSelect = this.$route.query.woIdString.split(',')
+    //   console.log(this.searchBarFormConfig[0].defaultSelect);
+    // }
    if (this.$route.query.startTime && this.$route.query.endTime) {
      // console.log(this.$route.query.startTime);
-      this.searchBarFormConfig[2].defaultSelect = [moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss'), moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss'),]
+      this.searchBarFormConfig[0].defaultSelect = [moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss'), moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss'),]
      this.queryParams.startTime = moment(Number(this.$route.query.startTime)).format('yyyy-MM-DD HH:mm:ss')
      this.queryParams.endTime = moment(Number(this.$route.query.endTime)).format('yyyy-MM-DD HH:mm:ss')
    }
@@ -370,8 +370,8 @@ export default {
 		/** 取消按钮 */
    handleSearchBarBtnClick(val) {
      if (val.btnName === 'search') {
-        this.queryParams.workOrderIdList = val.workOrderIdList ? val.workOrderIdList : undefined
-        this.queryParams.productionId = val.productionId ? val.productionId : undefined
+        // this.queryParams.workOrderIdList = val.workOrderIdList ? val.workOrderIdList : undefined
+        // this.queryParams.productionId = val.productionId ? val.productionId : undefined
        this.queryParams.startTime = val.checkTime ? val.checkTime[0] : undefined
        this.queryParams.endTime = val.checkTime ? val.checkTime[1] : undefined
        this.getList()
--- a/src/views/report/Environmental/sectionProduction/index.vue
+++ b/src/views/report/Environmental/sectionProduction/index.vue
@@ -75,7 +75,7 @@ export default {
 					selectOptions: [
 						{ id: '1', name: '当前班次' },
 						{ id: '2', name: '近24小时' },
-						{ id: '3', name: '日报' },
+						{ id: '3', name: '昨日日报' },
 					],
 					defaultSelect: '1',
 					param: 'timeType',
@@ -112,7 +112,7 @@ export default {
 					selectOptions: [
 						{ id: '1', name: '当前班次' },
 						{ id: '2', name: '近24小时' },
-						{ id: '3', name: '日报' },
+						{ id: '3', name: '昨日日报' },
 					],
 					param: 'timeType',
 					clearable: false,
@@ -196,6 +196,7 @@ export default {
 				this.tableProp = [];
 				let timeArr = this.uniqueTime(data, 'timeStr');
 				let arr = [];
+				let arr1 = [];
 				timeArr.map((item) => {
 					let obj = {};
 					obj.prop = item.timeStr;
@@ -203,7 +204,17 @@ export default {
 					obj.minWidth = 140;
 					arr.push(obj);
 				});
-				this.tableProp = this.tableProp1.concat(arr); //表头
+				let obj1 = {};
+				obj1.children = arr.length > 0 ? arr : [{ label: '合计' }];
+				obj1.label =
+					'24小时原片工段产量表(' +
+					moment(this.queryParams.startTime).format('YYYY-MM-DD HH:mm:ss') +
+					'-' +
+					moment(this.queryParams.endTime).format('YYYY-MM-DD HH:mm:ss') +
+					')';
+				arr1.push(obj1);
+				this.tableProp = this.tableProp1.concat(arr1); //表头
+				console.log(this.tableProp);
 				this.transferData(data);
 			});
 		},
@@ -286,7 +297,6 @@ export default {
 		transferData(data) {
 			let tempData = [];
 			let lineNum = 0; //第一条产线
-			let sumArr = [];
 			for (let i = 0; i < data.length; i++) {
 				if (i === 0) {
 					this.procedureName.map((item) => {
@@ -299,37 +309,28 @@ export default {
 					});
 					lineNum++;
 				} else {
-					if (data[i].timeStr === '总计') {
-						sumArr.push(data[i]);
-					} else {
-						if (data[i].lineName === data[i - 1].lineName) {
-							//相同产线,添加列
-							let startNum = 5 * (lineNum - 1);
-							let endNum = 5 * lineNum - 1;
-							for (let k = startNum; k <= endNum; k++) {
-								let str = this.procedureName[k % 5];
-								tempData[k][data[i].timeStr] = data[i][str.ename];
-							}
-						} else {
-							//不同产线，同时添加5行
-							this.procedureName.map((item) => {
-								let obj = {};
-								obj.lineName = data[i].lineName;
-								obj.procedure = item.name;
-								obj.eName = item.ename;
-								obj[data[i].timeStr] = data[i][item.ename];
-								tempData.push(obj);
-							});
-							lineNum++;
+					if (data[i].lineName === data[i - 1].lineName) {
+						//相同产线,添加列
+						let startNum = 5 * (lineNum - 1);
+						let endNum = 5 * lineNum - 1;
+						for (let k = startNum; k <= endNum; k++) {
+							let str = this.procedureName[k % 5];
+							tempData[k][data[i].timeStr] = data[i][str.ename];
 						}
+					} else {
+						//不同产线，同时添加5行
+						this.procedureName.map((item) => {
+							let obj = {};
+							obj.lineName = data[i].lineName;
+							obj.procedure = item.name;
+							obj.eName = item.ename;
+							obj[data[i].timeStr] = data[i][item.ename];
+							tempData.push(obj);
+						});
+						lineNum++;
 					}
 				}
 			}
-			for (let j = 0; j < tempData.length; j++) {
-				sumArr.map((item) => {
-					tempData[j]['总计'] = item[tempData[j].eName];
-				});
-			}
 			this.tableData = tempData;

 			this.$nextTick(() => {
@@ -395,7 +396,17 @@ export default {
 					arr.push(obj);
 				});
 				arr.push({ prop: 'sum', label: '合计' });
-				this.tableProp2 = this.tableProp1.concat(arr); //表头
+				let arr1 = [];
+				let obj1 = {};
+				obj1.children = arr;
+				obj1.label =
+					'24小时深加工工段产量表(' +
+					moment(this.queryParams2.startTime).format('YYYY-MM-DD HH:mm:ss') +
+					'-' +
+					moment(this.queryParams2.endTime).format('YYYY-MM-DD HH:mm:ss') +
+					')';
+				arr1.push(obj1);
+				this.tableProp2 = this.tableProp1.concat(arr1); //表头
 				this.getSpanArr(this.tableData2);
 				this.$nextTick(() => {
 					this.reTable2();
--- a/src/views/report/Product/monthly.vue
+++ b/src/views/report/Product/monthly.vue
@@ -1,141 +1,389 @@
 <!--
 * @Author: Do not edit
 * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-23 17:06:16
+ * @LastEditTime: 2024-04-26 10:32:29
 * @LastEditors: DY
 * @Description: 
 -->
 <template>
-  <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>
-      </el-form-item>
-      <el-button v-if="this.$auth.hasPermi('base:report-auto-production:query')" type="primary" size="small" @click="search()">
-        查询
-      </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" />
-  </div>
+	<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="timestamp"
+					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
+			ref="productionDataMonthTable11"
+			id="productionDataMonthTable1"
+			:table-props="tableProps"
+			:table-data="tableData"
+			:span-method="objectSpanMethod1"
+			@emitFun="handleEmitFun"
+			:max-height="tableH" />
+		<base-table
+		ref="productionDataMonthTable22"
+			id="productionDataMonthTable2"
+			: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 proMonth from '../productionMonthReport/index.vue'
+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';
+import tableHeightMixin from '@/mixins/lb/tableHeightMixin';

 export default {
-  components: { monthWeek, proMonth },
-  data() {
-    return {
-      listQuery: {
-				// pageSize: 10,
-				// pageNo: 1,
-				// total: 0,
-				reportType: 4,
-				reportTime: []
-      },
-      startTimeStamp: '',
-      endTimeStamp: '',
-      reportTime: '',
-      glassWeekShow: false,
-      proWeekShow: false
-    }
-  },
-  created() {
-    this.getCurrentMonthFirst()
-    this.glassWeekShow = true
-    this.proWeekShow = true
-  },
-  methods: {
-    getCurrentMonthFirst() {
-      const date = new Date();
-      date.setDate(1);
-      this.reportTime = date
-      // console.log(date)
-      this.changeTime(date)
-      // console.log(date.valueOf());
-    },
-    handleExport() {
-      this.$nextTick(() => {
-        this.$refs['monthWeek'].handleExport()
-        this.$refs['proMonth'].handleExport()
-      })
-    },
-    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
+	// components: { monthWeek, proMonth },
+	mixins: [tableHeightMixin],
+	data() {
+		return {
+			heightNum: 350,
+			listQuery: {
+				time: '',
+			},
+			// startTimeStamp: '',
+			// endTimeStamp: '',
+			// reportTime: '',
+			// glassWeekShow: false,
+			// proWeekShow: false,
+			tableData: [],
+			tableProps: [],
+			tableData1: [],
+			tableProps1: [],
+			resData: [],
+			span1: [], //表格1的合并规则
+			resData1: [],
+			span2: []
+		};
+	},
+	created() {
+		let now = new Date()
+    now.setHours(0, 0, 0, 0)
+    now.setDate(1)
+    let startOfMonth = now.getTime()
+    this.listQuery.time = startOfMonth
+	},
+	mounted() {
+		this.getList();
+	},
+	methods: {
+		getTime1() {
+			const firstDayOfMonth = new Date(this.listQuery.time)
+			const lastDayOfMonth = new Date(firstDayOfMonth.getFullYear(), firstDayOfMonth.getMonth() + 1, 0, 0, 0, 0, 0)
+			// console.log('时间', parseTime(firstDayOfMonth), parseTime(lastDayOfMonth))
+			this.$set(this.tableProps[2], 'label', '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')')
+			this.$set(this.tableProps1[2], 'label', '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')') 
+			// this.tableProps[2].label = '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')'
+			// this.tableProps1[2].label = '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')'
+			console.log(this.tableProps, this.tableProps1)
+		},
+		async getList() {
+			const firstDayOfMonth = new Date(this.listQuery.time)
+			const lastDayOfMonth = new Date(firstDayOfMonth.getFullYear(), firstDayOfMonth.getMonth() + 1, 0, 0, 0, 0, 0)
+			this.tableData = [];
+			this.tableProps = [
+				{
+					prop: 'lineName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'paramsName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'xc',
+					label: '许昌安彩月原片生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')',
+					// align: 'center',
+					children: []
+				}
+			];
+			this.tableData1 = [];
+			this.tableProps1 = [
+				{
+					prop: 'lineName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'paramsName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true,
+				},
+				{
+					prop: 'xc1',
+					label: '许昌安彩月成品生产汇总(' + parseTime(firstDayOfMonth) + '-' + parseTime(lastDayOfMonth) + ')',
+					// align: 'center',
+					children: []
+				}
+			];
+			await productionMonthY(this.listQuery).then((res) => {
+				this.resData = res.data;
+				// 设置表头
+				Object.keys(this.resData).forEach((item) => {
+					this.tableProps[2].children.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[2].children.push({
+						prop: item,
+						label: item,
+						'show-overflow-tooltip': true,
+					});
+				});
+				this.buildTableData1(this.resData1);
+			});
+			// this.getTime1()
+		},
+		// 设置表格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);
+						}
 					}
-        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 = []
+				} 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);
+			this.$nextTick(() => {
+				this.reTable1();
+			});
+		},
+		// 设置表格数据
+		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);
+			this.$nextTick(() => {
+				this.reTable();
+			});
+		},
+		reTable() {
+			this.$refs.productionDataMonthTable11.doLayout('productionDataMonthTable1');
+		},
+		reTable1() {
+			this.$refs.productionDataMonthTable22.doLayout('productionDataMonthTable2');
+		},
+		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;
+					}
+				}
 			}
 		},
-    //时间戳转为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)
-		}
-  }
-}
+		// 获取合并行
+		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(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;
+		},
+		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;
-  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>
--- a/src/views/report/Product/weekly.vue
+++ b/src/views/report/Product/weekly.vue
@@ -1,14 +1,14 @@
 <!--
 * @Author: Do not edit
 * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-23 15:43:36
+ * @LastEditTime: 2024-04-25 14:31:53
 * @LastEditors: DY
 * @Description: 
 -->
 <template>
  <div class="weekly">
    <el-form :inline="true" :model="listQuery" class="blueTip">
-      <el-form-item>
+      <el-form-item label="周" prop="reportTime">
        <el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime"
          :picker-options="{firstDayOfWeek: 4}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
          style="width: 350px" placeholder="选择周">
@@ -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(() => {
--- a/src/views/report/Product/year.vue
+++ b/src/views/report/Product/year.vue
@@ -1,117 +1,387 @@
 <!--
 * @Author: Do not edit
 * @Date: 2024-04-22 15:49:56
- * @LastEditTime: 2024-04-23 17:16:11
+ * @LastEditTime: 2024-04-26 10:34:12
 * @LastEditors: DY
 * @Description: 
 -->
 <template>
-  <div class="weekly">
-    <el-form :inline="true" :model="listQuery" class="blueTip">
-      <el-form-item label="年" prop="reportTime">
-          <el-date-picker v-model="reportTime" type="year" size="small" @change="changeTime"
-            :picker-options="{firstDayOfWeek: 1}" :format="'yyyy 年' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
-            style="width: 350px" 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>
-      <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" />
-    <proYear v-if="proYearShow" ref="proYear" :product="false" :params="listQuery" />
-  </div>
+	<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="timestamp"
+					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="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
+		ref="productionDataYearTable11"
+			id="productionDataYearTable1"
+			:table-props="tableProps"
+			:table-data="tableData"
+			:span-method="objectSpanMethod1"
+			@emitFun="handleEmitFun"
+			:max-height="tableH" />
+		<base-table
+		ref="productionDataYearTable22"
+			id="productionDataYearTable2"
+			: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 proYear from '../productionYearReport/index.vue'
+import { productionYearY, productionYearD } 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: { glassYear, proYear },
-  data() {
-    return {
-      listQuery: {
-				// pageSize: 10,
-				// pageNo: 1,
-				// total: 0,
-				reportType: 5,
-				reportTime: []
-      },
-      startTimeStamp: '',
-      endTimeStamp: '',
-      reportTime: '',
-      glassYearShow: false,
-      proYearShow: false
-    }
-  },
-  created() {
-    this.getCurrentYearFirst()
-    this.glassYearShow = true
-    this.proYearShow = true
-  },
-  methods: {
-    handleExport() {
-      this.$nextTick(() => {
-        this.$refs['glassYear'].handleExport()
-        this.$refs['proYear'].handleExport()
-      })
-    },
-    search() {
-      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 = []
+	// components: { monthWeek, proMonth },
+	mixins: [tableHeightMixin],
+	data() {
+		return {
+			heightNum: 350,
+			listQuery: {
+				time: '',
+			},
+			// startTimeStamp: '',
+			// endTimeStamp: '',
+			// reportTime: '',
+			// glassWeekShow: false,
+			// proWeekShow: false,
+			tableData: [],
+			tableProps: [],
+			tableData1: [],
+			tableProps1: [],
+			resData: [],
+			span1: [], //表格1的合并规则
+			resData1: [],
+			span2: []
+		};
+	},
+	created() {
+		let now = new Date()
+    now.setHours(0, 0, 0, 0)
+    now.setDate(1)
+		now.setMonth(0)
+    let startOfMonth = now.getTime()
+    // let firstDayOfMonth = new Date(startOfMonth)
+		// console.log('看看', parseTime(firstDayOfMonth))
+    this.listQuery.time = startOfMonth
+	},
+	mounted() {
+		this.getList();
+	},
+	methods: {
+		getTime() {
+			const firstDayOfYear = new Date(this.listQuery.time)
+			const lastDayOfYear = new Date(firstDayOfYear.getFullYear() + 1, 0, 0, 0, 0, 0, 0)
+			// console.log('时间', parseTime(firstDayOfMonth), parseTime(lastDayOfMonth))
+			this.tableProps[0].label = '许昌安彩年原片生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')'
+			this.tableProps1[0].label = '许昌安彩年成品生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')'
+		},
+		async getList() {
+			// this.getTime()
+			const firstDayOfYear = new Date(this.listQuery.time)
+			const lastDayOfYear = new Date(firstDayOfYear.getFullYear() + 1, 0, 0, 0, 0, 0, 0)
+			this.tableData = [];
+			this.tableProps = [
+				{
+					prop: 'lineName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'paramsName',
+					label: '',
+					fixed: true,
+					width: 120,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'xc',
+					label: '许昌安彩年原片生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')',
+					// align: 'center',
+					children: []
+				}
+			];
+			this.tableData1 = [];
+			this.tableProps1 = [
+				{
+					prop: 'lineName',
+					label: '',
+					fixed: true,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'paramsName',
+					label: '',
+					fixed: true,
+					'show-overflow-tooltip': true
+				},
+				{
+					prop: 'xc1',
+					label: '许昌安彩年成品生产汇总(' + parseTime(firstDayOfYear) + '-' + parseTime(lastDayOfYear) + ')',
+					// align: 'center',
+					children: []
+				}
+			];
+			await productionYearY(this.listQuery).then((res) => {
+				this.resData = res.data;
+				// 设置表头
+				Object.keys(this.resData).forEach((item) => {
+					this.tableProps[2].children.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[2].children.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);
+			this.$nextTick(() => {
+				this.reTable1();
+			});
+		},
+		// 设置表格数据
+		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);
+			this.$nextTick(() => {
+				this.reTable();
+			});
+		},
+		reTable() {
+			this.$refs.productionDataYearTable11.doLayout('productionDataYearTable1');
+		},
+		reTable1() {
+			this.$refs.productionDataYearTable22.doLayout('productionDataYearTable2');
+		},
+		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;
+					}
+				}
 			}
 		},
-    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)
+		// 获取合并行
+		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;
-  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>
--- a/src/views/report/ingredientReport/day.vue
+++ b/src/views/report/ingredientReport/day.vue
@@ -1,10 +1,3 @@
-<!--
- * @Author: zhp
- * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-24 13:52:45
- * @LastEditors: zhp
- * @Description:
-->
 <template>
  <div class="app-container">
    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
@@ -24,10 +17,13 @@
      </el-table-column>
    </el-table> -->

-    <el-table class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%">
-      <el-table-column align="center" prop="" label="配料日报" width="120">
+    <el-table id="exportTable" :header-cell-style="{
+      background: '#F2F4F9',
+      color: '#606266'
+    }" class="baseTable" :span-method="objectSpanMethod" :data="tableData" style="width: 100%">
+      <el-table-column align="center" prop="" :label=" '配料日报' + time " width="120">
        <el-table-column label="原料样式" align="right" width="150">
-          <el-table-column  prop="className" label="时间" width="120">
+          <el-table-column prop="className" label="时间" width="120">
          </el-table-column>
        </el-table-column>
        <el-table-column align="center" prop="putType" label="" width="180">
@@ -36,7 +32,7 @@
        <el-table-column prop="activityName"></el-table-column>
        <el-table-column prop="message"></el-table-column>
      </el-table-column> -->
-        <el-table-column align="center" style="text-align: center;" v-for="(item,index) in codeList " :prop="item"
+        <el-table-column align="center" style="text-align: center;" v-for="(item, index) in codeList " :prop="item"
          :label="item">
          <!-- <template slot-scope="scope">
          <el-col :span="12">
@@ -77,6 +73,7 @@ import {
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
+import moment from 'moment'
 // import { getList, } from "@/api/base/qualityScrapType";
 const headers = [
  // {
@@ -122,7 +119,7 @@ const headers = [
 ];

 export default {
-  mixins: [ tableHeightMixin],
+  mixins: [tableHeightMixin],
  data() {
    return {
      urlOptions: {
@@ -130,34 +127,33 @@ export default {
        // deleteURL: deleteQualityHotMaterial,
        // exportURL: exportFactoryExcel,
      },
-      codeList: ['sj1', 'sj2', 'sj3', 'sj4', 'sj5', 'sj7', 'sj8', 'sj10', 'sj11', 'sj12', 'sj13', 'sj14'],
+      codeList: ['sj1', 'sj2', 'sj3', 'sj4', 'sj5', 'sj7', 'sj8', 'sj10', 'sj11','sj14'],
      tableData: [],
      listQuery: {
        startTime: undefined,
-        endTime:undefined
+        endTime: undefined
      },
+      time: '',
      formConfig: [
        {
          type: 'datePicker',
-          label: '时间段',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd HH:mm:ss',
+          label: '时间',
+          dateType: 'date',
+          format: 'yyyy-MM-dd',
          valueFormat: "timestamp",
          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
          param: 'checkTime',
-          defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
-          width: 350
+          defaultSelect: Date.now(),
+          width: 150
        },
        {
-          type:'button',
+          type: 'button',
          btnName: '查询',
          name: 'search',
          color: 'primary',
        },
        {
-          type:'button',
+          type: 'button',
          btnName: '导出',
          name: 'export',
          color: 'primary',
@@ -173,14 +169,29 @@ export default {
  },
  mounted() {
    // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
-    this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
+    this.listQuery.startTime = Date.now()
+    this.time = moment(new Date((Date.now())).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now() + 24*60*60*1000).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss')
+    this.listQuery.endTime = Date.now()
    // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
    this.getDataList()
    // this.getSpanArr(this.tableData)
    // this.getDict();
  },
  methods: {
+    timestampToTime(date) {
+      // 时间戳为10位需*1000，时间戳为13位不需乘1000
+      // var date = new Date(timestamp * 1000);
+      var Y = date.getFullYear() + "-";
+      var M =
+        (date.getMonth() + 1 < 10
+          ? "0" + (date.getMonth() + 1)
+          : date.getMonth() + 1) + "-";
+      var D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
+      var h = date.getHours() + ":";
+      var m = date.getMinutes() + ":";
+      var s = date.getSeconds();
+      return Y + M + D + h + m + s;
+    },
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      let spanOneArr = [], concatOne = 0;
      this.tableData.map((item, index) => {
@@ -206,23 +217,23 @@ export default {
          colspan: _col
        }
      }
-      if (columnIndex === 1 ) {
+      if (columnIndex === 1) {
        if (rowIndex === 0 || rowIndex === 2 || rowIndex === 4 || rowIndex === 6 || rowIndex === 8 || rowIndex === 10) {
          return {
            rowspan: 2,
            colspan: 1
          }
+        }
      }
-      }
-      if (columnIndex === 1)  {
-        if (rowIndex %2 == 1) {
+      if (columnIndex === 1) {
+        if (rowIndex % 2 == 1) {
          return {
            rowspan: 1,
            colspan: 2
          }
        }
      }
-      if (columnIndex === 4 || columnIndex === 5 || columnIndex === 6 || columnIndex === 7 || columnIndex === 8 || columnIndex === 9 || columnIndex === 10 || columnIndex === 11 || columnIndex === 12 || columnIndex === 13) {
+      if (columnIndex === 4 || columnIndex === 5 || columnIndex === 6 || columnIndex === 7 || columnIndex === 8 || columnIndex === 9 || columnIndex === 10 || columnIndex === 11 ) {
        if (rowIndex % 2 == 0) {
          return {
            rowspan: 2,
@@ -255,7 +266,7 @@ export default {
            //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
            new Blob([wbout], { type: "application/octet-stream" }),
            //设置导出文件名称
-            "切割堆垛日报表.xlsx"
+            "配料日报.xlsx"
          );
        } catch (e) {
          if (typeof console !== "undefined") console.log(e, wbout);
@@ -285,7 +296,7 @@ export default {
        let arr = [
          {
            classType: 1,
-            className:'白班(8:00-20:00)',
+            className: '白班(8:00-20:00)',
            'sj1': null,
            'sj2': null,
            'sj3': null,
@@ -295,10 +306,9 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
-            putType: '投入数量'
+            putType: '原料投入(kg)'
          },
          {
            classType: 1,
@@ -312,8 +322,7 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
            'sj1+sj2': null,
            putType: ''
@@ -330,8 +339,7 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
            putType: '投入次数'
          },
@@ -347,8 +355,7 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
            'sj1+sj2': null,
            putType: ''
@@ -365,10 +372,9 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
-            putType: '投入数量',
+            putType: '原料投入(kg)',
          },
          {
            classType: 2,
@@ -382,14 +388,13 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
            'sj1+sj2': null,
            putType: ''
          },
          {
-            classType:2,
+            classType: 2,
            className: '夜班(20:00-8:00)',
            'sj1': null,
            'sj2': null,
@@ -400,8 +405,7 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
            putType: '投入次数',
          },
@@ -417,8 +421,7 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
            'sj1+sj2': null,
            putType: ''
@@ -435,10 +438,9 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
-            putType: '投入数量',
+            putType: '原料投入(kg)',
          },
          {
            classType: 3,
@@ -452,10 +454,9 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
-            'sj1+sj2':null,
+            'sj1+sj2': null,
            putType: ''
          },
          {
@@ -470,8 +471,7 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
            putType: '投入次数',
          },
@@ -487,41 +487,40 @@ export default {
            'sj8': null,
            'sj10': null,
            'sj11': null,
-            'sj12': null,
-            'sj13': null,
+
            'sj14': null,
            'sj1+sj2': null,
            putType: ''
          },
        ]
        res.data.forEach((ele) => {
-          if(ele.classType === 1 && ele.code == 'sj1+sj2') {
-            arr[1]['putType'] = ele.putNum
-            arr[3]['putType'] = ele.useNum
+          if (ele.classType === 1 && ele.code == 'sj1+sj2') {
+            arr[1]['putType'] = ele.useNum
+            arr[3]['putType'] = ele.putNum
            // arr[1]['sj2'] = ele.putNum
            // arr[3]['sj2'] = ele.useNum
          } else if (ele.classType === 2 && ele.code == 'sj1+sj2') {
-            arr[5]['putType'] = ele.putNum
-            arr[7]['putType'] = ele.useNum
+            arr[5]['putType'] = ele.useNum
+            arr[7]['putType'] = ele.putNum
            // arr[5]['sj2'] = ele.putNum
            // arr[7]['sj2'] = ele.useNum
          } else if (ele.classType === 3 && ele.code == 'sj1+sj2') {
-            arr[9]['putType'] = ele.putNum
-            arr[11]['putType'] = ele.useNum
+            arr[9]['putType'] = ele.useNum
+            arr[11]['putType'] = ele.putNum
            // arr[9]['sj2'] = ele.putNum
            // arr[11]['sj2'] = ele.useNum
          }
          this.codeList.forEach((item) => {
            if (ele.classType === 1 && ele.code == item) {
              // console.log(arr[0][item])
-              arr[0][item] = ele.putNum
-              arr[2][item] = ele.useNum
+              arr[0][item] = ele.useNum
+              arr[2][item] = ele.putNum
            } else if (ele.classType === 2 && ele.code == item) {
-              arr[4][item] = ele.putNum
-              arr[6][item] = ele.useNum
+              arr[4][item] = ele.useNum
+              arr[6][item] = ele.putNum
            } else if (ele.classType === 3 && ele.code == item) {
-              arr[8][item] = ele.putNum
-              arr[10][item] = ele.useNum
+              arr[8][item] = ele.useNum
+              arr[10][item] = ele.putNum
            }
          })
        })
@@ -532,10 +531,13 @@ export default {
      });
    },
    buttonClick(val) {
+      console.log(val.checkTime)
+      // Date.now() - 24 * 60 * 60 - 1000
      switch (val.btnName) {
        case 'search':
-          this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
-          this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
+          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime).setHours(8, 0, 0, 0)).getTime() : undefined;
+          this.time = moment(new Date((val.checkTime)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).format('YYYY-MM-DD HH:mm:ss')
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).getTime() : undefined;
          this.getDataList();
          break;
        case 'export':
@@ -549,6 +551,10 @@ export default {
 };
 </script>
 <style scoped>
+.baseTable{
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 ::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
  background-color: #EAF1FC;
 }
@@ -557,6 +563,7 @@ export default {
  padding: 0;
  height: 35px;
 }
+
 ::v-deep.el-table thead.is-group th {
  background: none;
 }
@@ -567,6 +574,7 @@ export default {
 ::v-deep.el-table thead.is-group tr:nth-child(2) th:nth-child(1) {
  border-bottom: none;
 }
+
 ::v-deep.el-table thead.is-group tr:nth-child(2) th:first-of-type:before {
  content: '';
  position: absolute;
--- 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
        );
        /* 获取二进制字符串作为输出 */
--- 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
        );
        /* 获取二进制字符串作为输出 */
--- 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
        );
        /* 获取二进制字符串作为输出 */
--- a/src/views/report/qcReport/cutDayReport/index.vue
+++ b/src/views/report/qcReport/cutDayReport/index.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-24 09:34:36
+ * @LastEditTime: 2024-04-26 10:44:00
 * @LastEditors: zhp
 * @Description:
 -->
@@ -17,6 +17,12 @@
        </el-table-column>
      </el-table-column>
    </el-table>
+    <el-table class="baseTable" :max-height="tableH" id="exportTableChild" :data="tableDataChild" style="width: 100%">
+      <el-table-column v-for="item in tablePropsChild" :prop="item.prop" :label="item.label" align="center">
+        <el-table-column v-for="it in item.children" :prop="it.prop" :label="it.label" align="center">
+        </el-table-column>
+      </el-table-column>
+    </el-table>
    <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
      @pagination="getDataList" /> -->
    <!-- <base-dialog
@@ -42,6 +48,37 @@ import {
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
 import { parseTime } from '../../../core/mixins/code-filter';
+
+const tablePropsChild = [
+  {
+    prop: '',
+    label: '人工堆垛人员'
+  },
+  {
+    prop: '',
+    label: '规格mm'
+  },
+  {
+    prop: '',
+    label: '片数'
+  },
+  {
+    prop: '',
+    label: '规格mm'
+  },
+  {
+    prop: '',
+    label: '片数'
+  },
+  {
+    prop: '',
+    label: '规格mm'
+  },
+  {
+    prop: '',
+    label: '片数'
+  },
+]
 // import { getList, } from "@/api/base/qualityScrapType";
 const tableProps = [
  // {
@@ -121,14 +158,16 @@ export default {
        // deleteURL: deleteQualityHotMaterial,
        // exportURL: exportFactoryExcel,
      },
+      tablePropsChild,
      tableProps,
      tableData: [],
+      tableDataChild:[],
      mergeArr: [],//记录合并行数
      pos: 0,
      listQuery: {
        startTime: undefined,
        endTime: undefined,
-        lineId: null,
+        lineId: undefined,
      },
      formConfig: [
        // {
@@ -150,13 +189,13 @@ export default {
          type: 'datePicker',
          label: '时间段',
          dateType: 'daterange',
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd',
          valueFormat: "timestamp",
          rangeSeparator: '-',
          startPlaceholder: '开始时间',
          endPlaceholder: '结束时间',
          param: 'checkTime',
-          defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
+          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime(), new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000],
          width: 350
        },
        {
@@ -166,6 +205,7 @@ export default {
          labelField: 'name',
          valueField: 'id',
          param: 'lineId',
+          multiple:true,
          filterable: true
        },
        {
@@ -193,9 +233,10 @@ export default {
  },
  created() { },
  mounted() {
-    // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
-    this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
+    // this.formConfig[1].defaultSelect[0] =
+    // this.formConfig[1].defaultSelect[0] =
+    this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime()
+    this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime() + 24 * 60 * 60 * 1000
    // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
    this.getDataList()
    this.getDict()
@@ -287,7 +328,36 @@ export default {
            //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
            new Blob([wbout], { type: "application/octet-stream" }),
            //设置导出文件名称
-            "原片各线堆垛表.xlsx"
+            "切割堆垛日报.xlsx"
+          );
+        } catch (e) {
+          if (typeof console !== "undefined") console.log(e, wbout);
+        }
+        return wbout;
+        //do something......
+      })
+      var xlsxParam = { raw: true };
+      /* 从表生成工作簿对象 */
+      import('xlsx').then(excel => {
+        var wb = excel.utils.table_to_book(
+          document.querySelector("#exportTableChild"),
+          xlsxParam
+        );
+        /* 获取二进制字符串作为输出 */
+        var wbout = excel.write(wb, {
+          bookType: "xlsx",
+          bookSST: true,
+          type: "array",
+        });
+        try {
+          FileSaver.saveAs(
+            //Blob 对象表示一个不可变、原始数据的类文件对象。
+            //Blob 表示的不一定是JavaScript原生格式的数据。
+            //File 接口基于Blob，继承了 blob 的功能并将其扩展使其支持用户系统上的文件。
+            //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
+            new Blob([wbout], { type: "application/octet-stream" }),
+            //设置导出文件名称
+            "切割堆垛日报.xlsx"
          );
        } catch (e) {
          if (typeof console !== "undefined") console.log(e, wbout);
@@ -295,7 +365,6 @@ export default {
        return wbout;
        //do something......
      })
-
    },
    // otherMethods(val) {
    //   if (val.type === 'detail') {
@@ -395,8 +464,8 @@ export default {
          // this.listQuery.materialId = val.materialId ? val.materialId : undefined;
          // this.listQuery.startTime = '1706144404000';
          // this.listQuery.endTime = '1706230804000';
-          this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
-          this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
+          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() : undefined;
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() + 24*60*60*1000 : undefined;
          this.listQuery.lineId = val.lineId ? val.lineId : undefined
          this.getDataList();
          break;
@@ -425,6 +494,10 @@ export default {
 };
 </script>
 <style scoped>
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 ::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
  background-color: #EAF1FC;
 }
--- a/src/views/report/qcReport/fullInspection/index.vue
+++ b/src/views/report/qcReport/fullInspection/index.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-18 14:08:46
- * @LastEditTime: 2024-04-24 14:41:01
+ * @LastEditTime: 2024-04-26 09:10:53
 * @LastEditors: zhp
 * @Description:
 -->
@@ -9,11 +9,11 @@
  <div class="app-container">
    <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
      <el-form-item label="时间" prop="startTime">
-        <el-date-picker v-model="listQuery.startTime" value-format="timestamp" type="date" placeholder="选择日期">
+        <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="date" placeholder="选择日期">
        </el-date-picker>
      </el-form-item>
      <el-form-item label="产线" prop="productionLineId">
-        <el-select v-model="listQuery.productionLineId" placeholder="请选择">
+        <el-select v-model="listQuery.productionLineId" placeholder="请选择" clearable>
          <el-option v-for="item in lineList" :key="item.id" :label="item.name" :value="item.id">
          </el-option>
        </el-select>
@@ -46,7 +46,10 @@
      </el-table-column>
    </el-table> -->

-    <el-table class="baseTable" :data="tableData" style="width: 100%">
+    <el-table :header-cell-style="{
+      background: '#F2F4F9',
+      color: '#606266'
+    }" class=" baseTable" :data="tableData" style="width: 100%">
      <el-table-column label="时间" align="right" width="150">
        <el-table-column prop="name" label="缺陷" width="120">
        </el-table-column>
@@ -59,21 +62,6 @@
      </el-table-column> -->
      <el-table-column v-for="(item, index) in codeList " :prop="item.prop" :label="item.label">
      </el-table-column>
-      <div slot="append" v-if="this.tableData.length != 0" style="text-align: center">
-        <!--在此处添加你想要插入在表格最后一行的内容-->
-        <el-col :span="8">
-          人工监测人员
-        </el-col>
-        <el-col :span="8">
-          <!-- {{  }} -->
-        </el-col>
-        <el-col :span="8">
-          合计
-        </el-col>
-        <el-col :span="8">
-          {{ sum }}
-        </el-col>
-      </div>
    </el-table>
    <!-- <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
      @pagination="getDataList" /> -->
@@ -160,59 +148,59 @@ export default {
      radio:'晚班查询',
      lineList:[],
      codeList: [
-        {
-          label: '19:00',
-          prop: 'num0'
+        // {
+        //   label: '19:00',
+        //   prop: 'num0'

-        },
-        {
-          label: '20:00',
-          prop: 'num1'
-        },
-        {
-          label: '21:00',
-          prop: 'num2'
-        },
-        {
-          label: '22:00',
-          prop: 'num3'
-        },
-        {
-          label: '23:00',
-          prop: 'num4'
-        },
-        {
-          label: '00:00',
-          prop: 'num5'
-        },
-        {
-          label: '01:00',
-          prop: 'num6'
-        },
-        {
-          label: '02:00',
-          prop: 'num7'
-        },
-        {
-          label: '03:00',
-          prop: 'num8'
-        },
-        {
-          label: '04:00',
-          prop: 'num9'
-        },
-        {
-          label: '05:00',
-          prop: 'num10'
-        },
-        {
-          label: '06:00',
-          prop: 'num11'
-        },
-        {
-          label: '不良合计',
-          prop: 'sum'
-        }
+        // },
+        // {
+        //   label: '20:00',
+        //   prop: 'num1'
+        // },
+        // {
+        //   label: '21:00',
+        //   prop: 'num2'
+        // },
+        // {
+        //   label: '22:00',
+        //   prop: 'num3'
+        // },
+        // {
+        //   label: '23:00',
+        //   prop: 'num4'
+        // },
+        // {
+        //   label: '00:00',
+        //   prop: 'num5'
+        // },
+        // {
+        //   label: '01:00',
+        //   prop: 'num6'
+        // },
+        // {
+        //   label: '02:00',
+        //   prop: 'num7'
+        // },
+        // {
+        //   label: '03:00',
+        //   prop: 'num8'
+        // },
+        // {
+        //   label: '04:00',
+        //   prop: 'num9'
+        // },
+        // {
+        //   label: '05:00',
+        //   prop: 'num10'
+        // },
+        // {
+        //   label: '06:00',
+        //   prop: 'num11'
+        // },
+        // {
+        //   label: '不良合计',
+        //   prop: 'sum'
+        // }
      ],
      tableData: [],
      formConfig: [
@@ -226,7 +214,7 @@ export default {
          startPlaceholder: '开始时间',
          endPlaceholder: '结束时间',
          param: 'checkTime',
-          defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
+          defaultSelect: [Date.now() - 24 * 60 * 60*1000, Date.now()],
          width: 350
        },
        {
@@ -255,7 +243,7 @@ export default {
    // this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
    // this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
    // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
-    this.listQuery.startTime = new Date(new Date().setHours(1, 9, 0, 0)).getTime()
+    this.listQuery.startTime = new Date()
    this.getDataList()
    this.getDict()
    // this.getSpanArr(this.tableData)
@@ -268,28 +256,12 @@ export default {
      this.lineList = res.data
    },
    // objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-    //   let spanOneArr = [], concatOne = 0;
-    //   this.tableData.map((item, index) => {
-    //     if (index === 0) {
-    //       spanOneArr.push(1);
-    //     } else {
-    //       //第一列需合并相同内容的判断条件
-    //       if (item.className === this.tableData[index - 1].className) {
-    //         spanOneArr[concatOne] += 1;
-    //         spanOneArr.push(0);
-    //       } else {
-    //         spanOneArr.push(1);
-    //         concatOne = index;
-    //       };
-    //     }
-    //   });
-
-    //   if (columnIndex === 0) {
-    //     const _row = spanOneArr[rowIndex];
-    //     const _col = _row > 0 ? 1 : 0;
-    //     return {
-    //       rowspan: _row,
-    //       colspan: _col
+    //   if (columnIndex === 1) {
+    //     if (rowIndex === this.tableData.length-1) {
+    //       return {
+    //         rowspan: 1,
+    //         colspan: 4
+    //       }
    //     }
    //   }
    // },
@@ -310,134 +282,7 @@ export default {
      return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
    },
    handleGetClass(e) {
-      let str = this.listQuery.startTime
-      // console.log(str);
-      this.listQuery.startTime = new Date(new Date(str).setHours(0, 7, 0, 0)).getTime()
-      // console.log(startTime1)
-      this.codeList = []
-      if (e === '早班查询') {
-        let arr = [
-          {
-            label: '07:00',
-            prop:'num0'
-          },
-          {
-            label: '08:00',
-            prop: 'num1'
-          },
-          {
-            label: '09:00',
-            prop: 'num2'
-          },
-          {
-            label: '10:00',
-            prop: 'num3'
-          },
-          {
-            label: '11:00',
-            prop: 'num4'
-          },
-          {
-            label: '12:00',
-            prop: 'num5'
-          },
-          {
-            label: '13:00',
-            prop: 'num6'
-          },
-          {
-            label: '14:00',
-            prop: 'num7'
-          },
-          {
-            label: '15:00',
-            prop: 'num8'
-          },
-          {
-            label: '16:00',
-            prop: 'num9'
-          },
-          {
-            label: '17:00',
-            prop: 'num10'
-          },
-          {
-            label: '18:00',
-            prop: 'num11'
-          },
-          {
-            label: '不良合计',
-            prop: 'sum'
-          }
-        ]
-        arr.forEach((ele,index) => [
-          this.codeList.push(ele)
-        ])
        this.getDataList()
-      } else {
-        let str = this.listQuery.startTime
-        // console.log(str);
-        this.listQuery.startTime = new Date(new Date(str).setHours(0, 7, 0, 0)).getTime()
-       let  arr = [
-          {
-           label: '19:00',
-           prop: 'num0'
-
-          },
-          {
-            label: '20:00',
-            prop: 'num1'
-          },
-          {
-            label: '21:00',
-            prop: 'num2'
-          },
-          {
-            label: '22:00',
-            prop: 'num3'
-          },
-          {
-            label: '23:00',
-            prop: 'num4'
-          },
-          {
-            label: '00:00',
-            prop: 'num5'
-          },
-          {
-            label: '01:00',
-            prop: 'num6'
-          },
-          {
-            label: '02:00',
-            prop: 'num7'
-          },
-          {
-            label: '03:00',
-            prop: 'num8'
-          },
-          {
-            label: '04:00',
-            prop: 'num9'
-          },
-          {
-            label: '05:00',
-            prop: 'num10'
-          },
-          {
-            label: '06:00',
-            prop: 'num11'
-         },
-         {
-           label: '不良合计',
-           prop: 'sum'
-         }
-        ]
-        arr.forEach((ele, index) => [
-          this.codeList.push(ele)
-        ])
-        this.getDataList()
-      }
    },
    handleExport() {
      // 处理查询参数
@@ -463,7 +308,7 @@ export default {
            //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
            new Blob([wbout], { type: "application/octet-stream" }),
            //设置导出文件名称
-            "原片各线堆垛表.xlsx"
+            "全检检验记录.xlsx"
          );
        } catch (e) {
          if (typeof console !== "undefined") console.log(e, wbout);
@@ -484,28 +329,45 @@ export default {
    // },
    // 获取数据列表
    getDataList() {
-      if (this.radio === '晚班查询') {
-        let str = this.listQuery.startTime
-        // console.log(str);
-        this.listQuery.startTime = new Date(new Date(str).setHours(1, 9, 0, 0)).getTime()
+      var str = null
+      if (this.radio == '晚班查询') {
+        console.log(this.radio);
+        str = new Date(new Date(this.listQuery.startTime).setHours(19, 0, 0, 0)).getTime()
      } else {
-        let str = this.listQuery.startTime
-        // console.log(str);
-        this.listQuery.startTime = new Date(new Date(str).setHours(0, 7, 0, 0)).getTime()
+        str = new Date(new Date(this.listQuery.startTime).setHours(7, 0, 0, 0)).getTime()
      }
-      this.dataListLoading = true;
+      // this.dataListLoading = true;
      // this.listQuery.startTime = '1713197388000';
      // this.listQuery.endTime = '1713254961000';
      this.urlOptions.getDataListURL({
        // productionLineId: '1696716506443354114',
-        // startTime: '1705618800000'
+        // startTime: '1705618800000',
        productionLineId: this.listQuery.productionLineId,
-        startTime:this.listQuery.startTime
+        startTime: str
      },).then(res => {
        let count = 0
        let arr = []
        console.log(res.data)
-        this.sum = res.data.allSum
+
+        res.data.timeStrList.push('不良合计')
+        this.codeList = res.data.timeStrList.map((ele, index) => {
+          if (ele === '不良合计') {
+            return {
+              label: ele,
+              prop: 'sum'
+            }
+          } else {
+            return {
+              label: ele,
+              prop: 'num' + index
+            }
+          }
+
+        })
+        console.log(this.codeList)
+        // res.data.timeStrList.forEach((ele, index) => [
+        //   this.codeList.push(ele)
+        // ])
        for (let i in res.data.qualityInspectionRecordReportLineVOMap) {
          count ++,
          console.log(res.data.qualityInspectionRecordReportLineVOMap[i])
@@ -526,130 +388,11 @@ export default {
        }
        console.log(arr);
        this.tableData = arr
-        // console.log(res)
-        // console.log(res.data)
-        // let arr = [
-        //   {
-        //     classType: 1,
-        //     className: '白班(8:00-20:00)',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入数量'
-        //   },
-        //   {
-        //     classType: 1,
-        //     className: '白班(8:00-20:00)',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入次数'
-        //   },
-        //   {
-        //     classType: 2,
-        //     className: '夜班(20:00-8:00)',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入数量',
-        //   },
-        //   {
-        //     classType: 2,
-        //     className: '夜班(20:00-8:00)',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入次数',
-        //   },
-        //   {
-        //     classType: 1,
-        //     className: '全天',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入数量',
-        //   },
-        //   {
-        //     classType: 2,
-        //     className: '全天',
-        //     'sj1': null,
-        //     'sj2': null,
-        //     'sj3': null,
-        //     'sj4': null,
-        //     'sj5': null,
-        //     'sj7': null,
-        //     'sj8': null,
-        //     'sj10': null,
-        //     'sj11': null,
-        //     'sj12': null,
-        //     'sj13': null,
-        //     'sj14': null,
-        //     putType: '投入次数',
-        //   }
-        // ]
-        // res.data.forEach((ele) => {
-        //   this.codeList.forEach((item) => {
-        //     if (ele.classType === 1 && ele.code == item) {
-        //       // console.log(arr[0][item])
-        //       arr[0][item] = ele.putNum
-        //       arr[1][item] = ele.useNum
-        //     } else if (ele.classType === 2 && ele.code == item) {
-        //       arr[2][item] = ele.putNum
-        //       arr[3][item] = ele.useNum
-        //     } else if (ele.classType === 3 && ele.code == item) {
-        //       arr[4][item] = ele.putNum
-        //       arr[5][item] = ele.useNum
-        //     }
-        //   })
-        // })
-        // // console.log(arr)
-        // this.tableData = arr
-        // this.dataListLoading = false;
+        this.tableData.push({
+          name: '检验员',
+          num11: '合计',
+          sum: res.data.allSum
+        })
      });
    },
    buttonClick(val) {
@@ -670,6 +413,10 @@ export default {
 };
 </script>
 <style scoped>
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 ::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
  background-color: #EAF1FC;
 }
--- a/src/views/report/qcReport/israLineReport/index.vue
+++ b/src/views/report/qcReport/israLineReport/index.vue
@@ -25,7 +25,7 @@ const tableProp1 = [
 	{
 		prop: 'lineName',
 		label: '生产线',
-		width: 110,
+		width: 90,
 		fixed: true,
 	},
 	{
@@ -71,6 +71,7 @@ export default {
 					label: '产线',
 					selectOptions: [],
 					param: 'lineId',
+					multiple: true,
 				},
 				{
 					type: 'button',
@@ -92,7 +93,7 @@ export default {
 			queryParams: {
 				startTime: '',
 				endTime: '',
-				lineId: '',
+				lineId: [],
 			},
 			tableProp1,
 			tableProp: [],
@@ -108,8 +109,9 @@ export default {
 		let start = moment().format('yyyy-MM-DD');
 		let end = moment().format('yyyy-MM-DD');
 		this.formConfig[0].defaultSelect = [start, end];
-		this.queryParams.startTime = moment(start + ' 00:00:00').valueOf();
-		this.queryParams.endTime = moment(end + ' 23:59:59').valueOf();
+		this.queryParams.startTime =
+			moment(start + ' 00:00:00').valueOf() + 25200000;
+		this.queryParams.endTime = moment(end + ' 23:59:59').valueOf() + 25200000;
 		this.getList();
 	},
 	methods: {
@@ -238,12 +240,10 @@ export default {
 		buttonClick(val) {
 			if (val.btnName === 'search') {
 				if (val.timeVal && val.timeVal.length > 0) {
-					this.queryParams.startTime = moment(
-						val.timeVal[0] + ' 00:00:00'
-					).valueOf();
-					this.queryParams.endTime = moment(
-						val.timeVal[1] + ' 23:59:59'
-					).valueOf();
+					this.queryParams.startTime =
+						moment(val.timeVal[0] + ' 00:00:00').valueOf() + 25200000;
+					this.queryParams.endTime =
+						moment(val.timeVal[1] + ' 23:59:59').valueOf() + 25200000;
 				}
 				this.queryParams.lineId = val.lineId;
 				this.getList();
--- a/src/views/report/qcReport/lineReport.vue
+++ b/src/views/report/qcReport/lineReport.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-18 10:01:33
- * @LastEditTime: 2024-04-24 09:56:20
+ * @LastEditTime: 2024-04-26 10:44:27
 * @LastEditors: zhp
 * @Description:
 -->
@@ -56,7 +56,7 @@ const tableProps = [
  },
  {
    prop: 'equipmentName',
-    label: '',
+    label: '机械手名称',
    width: '200'
  },
  {
@@ -104,7 +104,7 @@ export default {
      listQuery: {
        startTime: undefined,
        endTime: undefined,
-        lineId:null,
+        lineId:undefined,
      },
      formConfig: [
        // {
@@ -132,7 +132,7 @@ export default {
          startPlaceholder: '开始时间',
          endPlaceholder: '结束时间',
          param: 'checkTime',
-          defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
+          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()],
          width: 350
        },
        {
@@ -142,6 +142,7 @@ export default {
          labelField: 'name',
          valueField: 'id',
          param: 'lineId',
+          multiple:true,
          filterable: true
        },
        {
@@ -170,8 +171,8 @@ export default {
  created() { },
  mounted() {
    // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
-    this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
+    this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000
+    this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()
    // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
    this.getDataList()
    this.getDict()
@@ -365,8 +366,8 @@ export default {
          // this.listQuery.materialId = val.materialId ? val.materialId : undefined;
          // this.listQuery.startTime = '1706144404000';
          // this.listQuery.endTime = '1706230804000';
-          this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
-          this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
+          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000 : undefined;
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() : undefined;
          this.listQuery.lineId = val.lineId ? val.lineId : undefined
          this.getDataList();
          break;
@@ -395,6 +396,11 @@ export default {
 };
 </script>
 <style>
+
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 .baseTable .el-table__body tr.current-row>td.el-table__cell {
  background-color: #EAF1FC;
 }
--- a/src/views/report/qcReport/optimizeCutData.vue
+++ b/src/views/report/qcReport/optimizeCutData.vue
@@ -1,14 +1,14 @@
 <!--
 * @Author: zhp
 * @Date: 2024-04-18 15:07:53
- * @LastEditTime: 2024-04-24 09:58:07
+ * @LastEditTime: 2024-04-26 10:44:41
 * @LastEditors: zhp
 * @Description:
 -->
 <template>
  <div class="app-container">
    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-    <el-table :header-cell-style="{
+    <el-table :max-height="tableH" :header-cell-style="{
      background: '#F2F4F9',
      color: '#606266'
    }" class="baseTable" border id="exportTable" :data="tableData" style="width: 100%" :span-method="objectSpanMethod">
@@ -40,6 +40,8 @@ import {
 } from '@/api/report/qcReport';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 import FileSaver from 'file-saver'
+// import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+
 // import { getList, } from "@/api/base/qualityScrapType";
 const tableProps = [
  // {
@@ -54,7 +56,7 @@ const tableProps = [
  },
  {
    prop: 'dataType',
-    label: '',
+    label: '类别',
    width: '150',
  },
  {
@@ -67,11 +69,16 @@ const tableProps = [
  },
  {
    prop: 'area',
-    label: '面积'
+    label: '面积(㎡)'
  },
  {
    prop: 'rate',
-    label: '占比%',
+    label: '占比(%)',
+    // filter: (val) => val == false ? '不合格' : '合格',
+  },
+  {
+    prop: 'rateSum',
+    label: '综合成品率(%)',
    // filter: (val) => val == false ? '不合格' : '合格',
  },
  // {
@@ -129,7 +136,7 @@ export default {
          startPlaceholder: '开始时间',
          endPlaceholder: '结束时间',
          param: 'checkTime',
-          defaultSelect: [Date.now() - 24 * 60 * 60 - 1000, Date.now()],
+          defaultSelect: [new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000, new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()],
          width: 350
        },
        {
@@ -139,6 +146,7 @@ export default {
          labelField: 'name',
          valueField: 'id',
          param: 'lineId',
+          multiple:true,
          filterable: true
        },
        {
@@ -167,8 +175,8 @@ export default {
  created() { },
  mounted() {
    // this.formConfig[1].defaultSelect[]
-    this.listQuery.startTime = this.formConfig[0].defaultSelect[0]
-    this.listQuery.endTime = this.formConfig[0].defaultSelect[1]
+    this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000
+    this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()
    // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
    this.getDataList()
    this.getDict()
@@ -286,14 +294,15 @@ export default {
        // })
        this.tableData = response.data.map((ele) => {
          return {
-            dataType: ele.dataType == 1 ? '成品' : ele.dataType == 2 ? '取样' : '废版',
+            dataType: ele.dataType == 1 ? '成品' : ele.dataType == 2 ? '取样板' : ele.dataType == 4 ? '合计' : ele.dataType == 3 ? '废版' : '',
            code: ele.code,
            putNum: ele.putNum,
            lineName: ele.lineName,
-            type: ele.type,
+            type: ele.type == '合计' ? '' : ele.type,
            pieces: ele.pieces,
            area: ele.area,
-            rate: (ele.rate * 100).toFixed(2)
+            rate: ele.lineName != '总计' &&  ele.rate ? (ele.rate * 100).toFixed(2) : '',
+            rateSum: ele.lineName === '总计' ? (ele.rate * 100).toFixed(2) : ''
            // useNum: ele.useNum,
            // num: ele.num,
            // size: typeof (ele.size)
@@ -357,8 +366,10 @@ export default {
          // this.listQuery.materialId = val.materialId ? val.materialId : undefined;
          // this.listQuery.startTime = '1706144404000';
          // this.listQuery.endTime = '1706230804000';
-          this.listQuery.startTime = val.checkTime ? val.checkTime[0] : undefined;
-          this.listQuery.endTime = val.checkTime ? val.checkTime[1] : undefined;
+          // this.listQuery.startTime = new Date(new Date(Date.now()).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000
+          // this.listQuery.endTime = new Date(new Date(Date.now()).setHours(6, 59, 59)).getTime()
+          this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime[0]).setHours(7, 0, 0, 0)).getTime() - 24 * 60 * 60 * 1000 : undefined;
+          this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime[1]).setHours(6, 59, 59)).getTime() : undefined;
          this.listQuery.lineId = val.lineId ? val.lineId : undefined
          this.getDataList();
          break;
@@ -387,6 +398,10 @@ export default {
 };
 </script>
 <style scoped>
+.baseTable {
+  border-color: #D1D4DB;
+  background-color: #F2F4F9;
+}
 ::v-deep.baseTable .el-table__body tr.current-row>td.el-table__cell {
  background-color: #EAF1FC;
 }
Author	SHA1	Message	Date
‘937886381’	1537b1be58	Merge branch 'projects/mesxc-test' into projects/mesxc-zhp	2024-04-26 10:51:48 +08:00
‘937886381’	b2304941a4	修改bug	2024-04-26 10:51:24 +08:00
juzi	14b2a49053	Merge pull request 'projects/mesxc-dy' (#374 ) from projects/mesxc-dy into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #374	2024-04-26 10:39:55 +08:00
helloDy	6adac714f0	time	2024-04-26 10:36:29 +08:00
helloDy	0349f3cde0	Merge branch 'projects/mesxc-test' into projects/mesxc-dy	2024-04-26 10:16:38 +08:00
helloDy	4cafa78908	原片追溯，报表日期	2024-04-26 10:16:07 +08:00
juzi	61ef172534	Merge pull request 'projects/mesxc-zhp' (#373 ) from projects/mesxc-zhp into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #373	2024-04-26 10:15:45 +08:00
‘937886381’	19d913a49e	Merge branch 'projects/mesxc-test' into projects/mesxc-zhp	2024-04-26 09:58:48 +08:00
‘937886381’	70c3fd44d6	修改bug	2024-04-26 09:58:14 +08:00
juzi	78d6f0bb23	Merge pull request 'projects/mesxc-zhp' (#372 ) from projects/mesxc-zhp into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #372	2024-04-26 09:54:08 +08:00
‘937886381’	cf51eff0b7	修改bug	2024-04-26 09:52:37 +08:00
‘937886381’	539dddf217	修改bug	2024-04-26 09:51:31 +08:00
‘937886381’	317d01934b	Merge branch 'projects/mesxc-test' into projects/mesxc-zhp	2024-04-26 09:28:46 +08:00
‘937886381’	cdfe5c9c1b	修改bug	2024-04-26 09:28:24 +08:00
juzi	c1ea5157a5	Merge pull request 'projects/mesxc-zjl' (#371 ) from projects/mesxc-zjl into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #371	2024-04-26 08:56:39 +08:00
juzi	41ceefc20e	Merge branch 'projects/mesxc-test' into projects/mesxc-zjl	2024-04-26 08:51:25 +08:00
juzi	54425859b5	报表	2024-04-26 08:50:32 +08:00
juzi	a2a4f8dccd	Merge pull request 'projects/mesxc-zhp' (#370 ) from projects/mesxc-zhp into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #370	2024-04-26 08:49:53 +08:00
‘937886381’	fd3b054108	修改bug	2024-04-26 08:42:24 +08:00
‘937886381’	dacae0cbd8	修改bug	2024-04-26 08:32:32 +08:00
‘937886381’	be83c8196e	修改bug	2024-04-25 18:50:58 +08:00
‘937886381’	ef3f5d3fe7	修改bug	2024-04-25 17:14:16 +08:00
‘937886381’	ec550f22ec	修改bug	2024-04-25 17:08:59 +08:00
‘937886381’	60633ac581	Merge branch 'projects/mesxc-test' into projects/mesxc-zhp	2024-04-25 17:03:24 +08:00
‘937886381’	9351b82d11	修改bug	2024-04-25 17:02:52 +08:00
juzi	5e4227ba25	Merge pull request 'projects/mesxc-zjl' (#369 ) from projects/mesxc-zjl into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #369	2024-04-25 14:50:30 +08:00
juzi	82f63dc4ff	Merge branch 'projects/mesxc-test' into projects/mesxc-zjl	2024-04-25 14:49:08 +08:00
juzi	9a29185410	1	2024-04-25 14:46:32 +08:00
juzi	43e824f958	Merge pull request 'projects/mesxc-dy' (#368 ) from projects/mesxc-dy into projects/mesxc-test Some checks are pending continuous-integration/drone/push Build is running Details Reviewed-on: #368	2024-04-25 14:45:40 +08:00
helloDy	de831b339f	Merge branch 'projects/mesxc-test' into projects/mesxc-dy	2024-04-25 14:44:05 +08:00
helloDy	f0105c377c	bug and 原片	2024-04-25 14:43:29 +08:00
juzi	3ba5574669	Merge pull request 'projects/mesxc-zhp' (#367 ) from projects/mesxc-zhp into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #367	2024-04-25 14:21:29 +08:00
‘937886381’	082988d6d7	Merge branch 'projects/mesxc-test' into projects/mesxc-zhp	2024-04-25 13:57:11 +08:00
‘937886381’	7acb861919	修改bug	2024-04-25 13:56:49 +08:00
juzi	c41153a946	Merge pull request 'projects/mesxc-zjl' (#366 ) from projects/mesxc-zjl into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #366	2024-04-25 11:09:31 +08:00
juzi	6d658d9212	Merge branch 'projects/mesxc-test' into projects/mesxc-zjl	2024-04-25 11:08:15 +08:00
juzi	bf4bab2f3c	烟气隐藏	2024-04-25 11:06:16 +08:00
juzi	20f0efa413	Merge pull request 'projects/mesxc-zhp' (#365 ) from projects/mesxc-zhp into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #365	2024-04-25 10:58:01 +08:00
‘937886381’	c48f81b1d9	Merge branch 'projects/mesxc-test' into projects/mesxc-zhp	2024-04-25 10:19:25 +08:00
‘937886381’	7233720c2e	修改bug	2024-04-25 10:19:02 +08:00
juzi	6a491ff498	Merge pull request 'projects/mesxc-zhp' (#364 ) from projects/mesxc-zhp into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #364	2024-04-25 10:08:47 +08:00
‘937886381’	be607e4bf3	解决冲突	2024-04-25 10:07:19 +08:00
‘937886381’	87ef42e277	修改bug	2024-04-25 10:05:41 +08:00
juzi	aa65a7e97e	Merge pull request 'projects/mesxc-dy' (#363 ) from projects/mesxc-dy into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #363	2024-04-25 10:01:22 +08:00
helloDy	b8d26c87d8	月报年报	2024-04-25 09:57:13 +08:00
juzi	b89f510e61	Merge pull request '1' (#362 ) from projects/mesxc-zjl into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #362	2024-04-25 09:13:09 +08:00
helloDy	0e60f426bc	Merge branch 'projects/mesxc-test' into projects/mesxc-dy	2024-04-25 09:11:00 +08:00
helloDy	21f4879394	date	2024-04-25 09:10:28 +08:00
juzi	067cd4765e	1	2024-04-25 09:04:29 +08:00
juzi	3c4fe6daaa	Merge pull request 'projects/mesxc-dy' (#361 ) from projects/mesxc-dy into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #361	2024-04-25 08:42:57 +08:00
helloDy	e24f9c1079	Merge branch 'projects/mesxc-test' into projects/mesxc-dy	2024-04-25 08:40:38 +08:00
helloDy	61567ce86a	生产数据汇总	2024-04-25 08:40:08 +08:00
juzi	2ee66714ca	Merge pull request '修改' (#360 ) from projects/mesxc-zjl into projects/mesxc-test Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #360	2024-04-24 17:06:02 +08:00
juzi	ab5867c4fd	修改	2024-04-24 17:05:19 +08:00
shr	9a53391999	👷 添加自动构建发布配置 Some checks failed continuous-integration/drone/push Build is failing Details	2024-04-24 16:03:10 +08:00