更新大屏

Reviewed-on: #467

src/api/core/monitoring/auto.js

@@ -118,3 +118,10 @@ export function getProcessAutoReportLastGroup(data) {
 		data: data,
 	});
 }
+export function getPLlistByFactory(data) {
+	return request({
+		url: 'base/production-line/listByFactory',
+		method: 'post',
+		data: data,
+	});
+}

src/api/core/monitoring/data24.js

@@ -15,3 +15,11 @@ export function getPdlDataOneDay(data) {
     data: data
   })
 }
+// 获得近24小时产线生产数据-新版
+export function getSectionDataOneDay(data) {
+  return request({
+    url: '/monitoring/production-monitor/getSectionDataOneDay',
+    method: 'post',
+    data: data
+  })
+}

src/views/base/dataBoard/components/CenterBottomL.vue

@@ -2,7 +2,7 @@
   <div class='centerBottomL'>
     <div class='title'>
       <svg-icon icon-class="dataBoard3" class='icon'/>
-      <span>本月数据</span>
+      <span>当月数据</span>
     </div>
     <div class='dataBox' style='top:50px'>
       <p>
@@ -37,7 +37,7 @@ export default {
   watch: {
     dataObj(val) {
       val.monthAndLastMonth && val.monthAndLastMonth.forEach(item => {
-        if (item.dataType === "本月") {
+        if (item.dataType === "当月") {
           this.monthData = item
         }
       })

src/views/base/dataBoard/components/CenterTop.vue

@@ -1,62 +1,195 @@
 <template>
-  <div ref="centerTopBox" class='centerTopBox'>
+	<div ref="centerTopBox" class="centerTopBox">
 		<div>
-      <video src="/static/videos/01.webm" muted autoplay loop class='videoStyle'></video>
+			<video
+				src="/static/videos/01.webm"
+				muted
+				autoplay
+				loop
+				class="videoStyle"></video>
+			<div class="zhegaiceng" v-if="dataObj">
 				<div
-        class='eqTipBox'
+					v-show="
-        v-show='showTooltip'
+						!dataObj.productionDet.find((val) => val.line == 1).isProduction
-        :style="'left:'+tooltipStyle.left+'px;top:'+tooltipStyle.top+'px;'"
+					"
-      >
+					class="production-line1"
-        <p><span class='eqTipTitle'>设备名称:</span><span class='eqTipNum'>{{eqTipMsg.name}}</span></p>
+					data-line="1"
-        <p><span class='eqTipTitle'>进口数量:</span><span class='eqTipNum'>{{eqTipMsg.input}}</span></p>
+					data-status="stopped">
-        <p><span class='eqTipTitle'>出口数量:</span><span class='eqTipNum'>{{eqTipMsg.output}}</span></p>
+					<!-- 半透明渐变遮罩 -->
-        <p><span class='eqTipTitle'>报警状态:</span>
+					<div class="line-mask"></div>
-          <span class='eqTipNum'>
+					<!-- 状态标签 -->
-            <img v-show='eqTipMsg.alarm' :src='dotY' width='16'/>
+					<div class="line-status-tag">
-            <img v-show='!eqTipMsg.alarm' :src='dotG' width='16'/>
+						<span class="status-dot stopped"></span>
+						产线1 已停产
+					</div>
+				</div>
+				<div
+					v-show="
+						!dataObj.productionDet.find((val) => val.line == 2).isProduction
+					"
+					class="production-line2"
+					data-line="2"
+					data-status="stopped">
+					<!-- 半透明渐变遮罩 -->
+					<div class="line-mask"></div>
+					<!-- 状态标签 -->
+					<div class="line-status-tag">
+						<span class="status-dot stopped"></span>
+						产线2 已停产
+					</div>
+				</div>
+				<div
+					v-show="
+						!dataObj.productionDet.find((val) => val.line == 3).isProduction
+					"
+					class="production-line3"
+					data-line="3"
+					data-status="stopped">
+					<!-- 半透明渐变遮罩 -->
+					<div class="line-mask"></div>
+					<!-- 状态标签 -->
+					<div class="line-status-tag">
+						<span class="status-dot stopped"></span>
+						产线3 已停产
+					</div>
+				</div>
+				<div
+					v-show="
+						!dataObj.productionDet.find((val) => val.line == 4).isProduction
+					"
+					class="production-line4"
+					data-line="4"
+					data-status="stopped">
+					<!-- 半透明渐变遮罩 -->
+					<div class="line-mask"></div>
+					<!-- 状态标签 -->
+					<div class="line-status-tag">
+						<span class="status-dot stopped"></span>
+						产线4 已停产
+					</div>
+				</div>
+				<div
+					v-show="
+						!dataObj.productionDet.find((val) => val.line == 5).isProduction
+					"
+					class="production-line5"
+					data-line="5"
+					data-status="stopped">
+					<!-- 半透明渐变遮罩 -->
+					<div class="line-mask"></div>
+					<!-- 状态标签 -->
+					<div class="line-status-tag">
+						<span class="status-dot stopped"></span>
+						产线5 已停产
+					</div>
+				</div>
+			</div>
+			<div
+				class="eqTipBox"
+				v-show="showTooltip"
+				:style="
+					'left:' + tooltipStyle.left + 'px;top:' + tooltipStyle.top + 'px;'
+				">
+				<p>
+					<span class="eqTipTitle">设备名称:</span>
+					<span class="eqTipNum">{{ eqTipMsg.name }}</span>
+				</p>
+				<p>
+					<span class="eqTipTitle">进口数量:</span>
+					<span class="eqTipNum">{{ eqTipMsg.input }}</span>
+				</p>
+				<p>
+					<span class="eqTipTitle">出口数量:</span>
+					<span class="eqTipNum">{{ eqTipMsg.output }}</span>
+				</p>
+				<p>
+					<span class="eqTipTitle">报警状态:</span>
+					<span class="eqTipNum">
+						<img v-show="eqTipMsg.alarm" :src="dotY" width="16" />
+						<img v-show="!eqTipMsg.alarm" :src="dotG" width="16" />
 						{{ eqTipMsg.alarm ? '报警' : '未报警' }}
 					</span>
 				</p>
-        <p><span class='eqTipTitle'>在线状态:</span>
+				<p>
-          <span class='eqTipNum'>
+					<span class="eqTipTitle">在线状态:</span>
-            <img v-show='eqTipMsg.status' :src='dotG' width='16'/>
+					<span class="eqTipNum">
-            <img v-show='!eqTipMsg.status' :src='dotR' width='16'/>
+						<img v-show="eqTipMsg.status" :src="dotG" width="16" />
+						<img v-show="!eqTipMsg.status" :src="dotR" width="16" />
 						{{ eqTipMsg.status ? '在线' : '离线' }}
 					</span>
 				</p>
 			</div>
 			<!-- 设备 -->
-      <div class='eqBox'>
+			<div class="eqBox">
 				<!-- line-从上到下-从右往左 -->
 				<span
-          v-for='(item,index) in eqList'
+					v-for="(item, index) in eqList"
-          :key='index'
+					:key="index"
-          :style="'width:'+item.w+'px;height:'+item.h+'px;left:'+item.l+'px;top:'+item.t+'px'"
+					:style="
+						'width:' +
+						item.w +
+						'px;height:' +
+						item.h +
+						'px;left:' +
+						item.l +
+						'px;top:' +
+						item.t +
+						'px'
+					"
 					@mouseenter="handleMouseEnter(item, $event)"
-          @mouseleave="handleMouseLeave"
+					@mouseleave="handleMouseLeave"></span>
-        ></span>
 			</div>
 		</div>
-    <div class='centerTopTopBox'>
+		<div class="centerTopTopBox">
-      <div style='display: inline-block;'>
+			<div style="display: inline-block">
-        <img src="../../../../assets/images/dataBoard/centerNumB.png" alt="" width='203'>
+				<img
-        <p class='num'>{{dataObj?.productRate || '-'}}%</p>
+					src="../../../../assets/images/dataBoard/centerNumB.png"
-        <p class='title'>成品率</p>
+					alt=""
+					width="203" />
+				<p class="num" style="font-size: 25px">
+					<span style="color: #2e7dff">
+						{{ dataObj?.productRateYesterday ?? '-' }}%
+					</span>
+					<span style="color: #999">/</span>
+					<span style="color: #ff8a00">
+						{{ dataObj?.productRate30day ?? '-' }}%
+					</span>
+				</p>
+				<p class="title">昨日/近30天成品率</p>
 			</div>
-      <div style='display: inline-block;'>
+			<div style="display: inline-block">
-        <img src="../../../../assets/images/dataBoard/centerNumY.png" alt="" width='261'>
+				<img
-        <p class='num' style='width: 260px;padding-left: 20px;'>{{dataObj?.todayProduct ? formatThousands(dataObj.todayProduct) : '-'}}</p>
+					src="../../../../assets/images/dataBoard/centerNumY.png"
-        <p class='title' style='color:#FFB625'>今日产量</p>
+					alt=""
+					width="261" />
+				<p class="num" style="width: 260px; padding-left: 20px">
+					{{
+						dataObj?.todayProduct ? formatThousands(dataObj.todayProduct) : '-'
+					}}
+				</p>
+				<p class="title" style="color: #ffb625">当日产量</p>
 			</div>
-      <div style='display: inline-block;'>
+			<div style="display: inline-block">
-        <img src="../../../../assets/images/dataBoard/centerNumY.png" alt="" width='261'>
+				<img
-        <p class='num' style='width: 260px;padding-left: 20px;'>{{dataObj?.monthProduct ? formatThousands(dataObj.monthProduct) : '-'}}</p>
+					src="../../../../assets/images/dataBoard/centerNumY.png"
-        <p class='title' style='color:#FFB625'>本月产量</p>
+					alt=""
+					width="261" />
+				<p class="num" style="width: 260px; padding-left: 20px">
+					{{
+						dataObj?.monthProduct ? formatThousands(dataObj.monthProduct) : '-'
+					}}
+				</p>
+				<p class="title" style="color: #ffb625">当月产量</p>
 			</div>
-      <div style='display: inline-block;'>
+			<div style="display: inline-block">
-        <img src="../../../../assets/images/dataBoard/centerNumB.png" alt="" width='203'>
+				<img
-        <p class='num'>{{dataObj?.alarmNum ? formatThousands(dataObj.alarmNum) : '-'}}</p>
+					src="../../../../assets/images/dataBoard/centerNumB.png"
-        <p class='title'>设备报警数</p>
+					alt=""
+					width="203" />
+				<p class="num">
+					{{ dataObj?.alarmNum ? formatThousands(dataObj.alarmNum) : '-' }}
+				</p>
+				<p class="title">设备报警数</p>
 			</div>
 		</div>
 	</div>
@@ -69,7 +202,7 @@ export default {
 			showTooltip: false,
 			tooltipStyle: {
 				left: 0,
-        top: 0
+				top: 0,
 			},
 			dotY: require('../../../../assets/images/dataBoard/dotY.png'),
 			dotR: require('../../../../assets/images/dataBoard/dotR.png'),
@@ -188,44 +321,45 @@ export default {
 				{ name: 'A5-包装清洗机-1', id: 501501, w: 30, h: 18, l: 185, t: 473 },
 				{ name: 'A5-包装清洗机-2', id: 501502, w: 30, h: 18, l: 185, t: 511 },
 				{ name: 'A5-铺纸机-1', id: 501601, w: 18, h: 15, l: 144, t: 475 },
-        {name:'A5-铺纸机-2',id:501602,w:18,h:15,l:144,t:511}
+				{ name: 'A5-铺纸机-2', id: 501602, w: 18, h: 15, l: 144, t: 511 },
 			],
 			eqTipMsg: {
 				name: '',
 				input: null,
 				output: null,
 				alarm: '未报警',
-        status:'在线'
+				status: '在线',
-      }
+			},
-    }
+		};
 	},
 	props: {
 		scaleNum: {
 			type: Number,
-      default: 1
+			default: 1,
 		},
 		dataObj: {
 			type: Object,
-      default: () => {}
+			default: () => {},
-    }
+		},
 	},
 	watch: {
 		scaleNum(val) {
-      this.scaleNum = val
+			this.scaleNum = val;
 		},
 		dataObj(val) {
-      val.equipmentDets && val.equipmentDets.forEach(item => {
+			val.equipmentDets &&
-        this.eqList.forEach(eq => {
+				val.equipmentDets.forEach((item) => {
+					this.eqList.forEach((eq) => {
 						if (eq.id == item.id) {
-            eq.name = item.name
+							eq.name = item.name;
-            eq.input = item.input
+							eq.input = item.input;
-            eq.output = item.output
+							eq.output = item.output;
-            eq.alarm = item.isError
+							eq.alarm = item.isError;
-            eq.status = item.isRun
+							eq.status = item.isRun;
-          }
-        })
-      })
 						}
+					});
+				});
+		},
 	},
 	mounted() {},
 	methods: {
@@ -243,7 +377,7 @@ export default {
 			this.showTooltip = false;
 		},
 		updateTooltipPosition(event) {
-      const rect = this.$refs.centerTopBox.getBoundingClientRect()
+			const rect = this.$refs.centerTopBox.getBoundingClientRect();
 			const offset = 15;
 			const tooltipWidth = 315 * this.scaleNum;
 			const tooltipHeight = 170 * this.scaleNum;
@@ -261,9 +395,9 @@ export default {
 			}
 			this.tooltipStyle.left = posX / this.scaleNum;
 			this.tooltipStyle.top = posY / this.scaleNum;
-    }
+		},
-  }
+	},
-}
+};
 </script>
 <style lang="scss" scoped>
 p {
@@ -272,7 +406,8 @@ p{
 .centerTopBox {
 	width: 1041px;
 	height: 600px;
-  background: url('../../../../assets/images/dataBoard/center-top.png') no-repeat;
+	background: url('../../../../assets/images/dataBoard/center-top.png')
+		no-repeat;
 	background-size: 100%;
 	position: absolute;
 	left: 440px;
@@ -296,7 +431,7 @@ p{
 		span {
 			display: inline-block;
 			font-size: 20px;
-      color: #FFFFFF;
+			color: #ffffff;
 			letter-spacing: 1px;
 			vertical-align: middle;
 		}
@@ -314,6 +449,82 @@ p{
 			text-overflow: ellipsis;
 		}
 	}
+	.zhegaiceng {
+		.production-line1 {
+			position: absolute;
+			left: 3px;
+			top: 160px;
+			width: 99%;
+			height: 70px;
+		}
+		.production-line2 {
+			position: absolute;
+			left: 3px;
+			top: 232px;
+			width: 99%;
+			height: 75px;
+		}
+		.production-line3 {
+			position: absolute;
+			left: 3px;
+			top: 306px;
+			width: 99%;
+			height: 68px;
+		}
+		.production-line4 {
+			position: absolute;
+			left: 3px;
+			top: 372px;
+			width: 99%;
+			height: 86px;
+		}
+		.production-line5 {
+			position: absolute;
+			left: 3px;
+			top: 460px;
+			width: 99%;
+			height: 80px;
+		}
+
+		.line-mask {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(
+				to right,
+				rgba(14, 14, 14, 0.9),
+				rgba(14, 14, 14, 0.7),
+				rgba(14, 14, 14, 0.9)
+			);
+		}
+		.line-status-tag {
+			position: absolute;
+			top: 50%;
+			left: 40%;
+			transform: translateY(-50%);
+			padding: 6px 12px;
+			background: rgba(0, 0, 0, 0.8);
+			color: #fff;
+			border-radius: 4px;
+			font-size: 25px;
+			z-index: 10;
+			/* 新增：让内部元素 flex 垂直居中 */
+			display: flex;
+			align-items: center; /* 核心：垂直居中 */
+			gap: 6px; /* 控制点和文字的间距，避免重叠 */
+		}
+		.status-dot {
+			display: inline-block;
+			width: 8px;
+			height: 8px;
+			border-radius: 50%;
+			/* 移除可能影响对齐的 margin-top/margin-bottom */
+			margin: 0;
+		}
+		.status-dot.stopped {
+			background: #ff3d3d;
+		}
+	}
 	.eqBox {
 		span {
 			display: inline-block;
@@ -333,7 +544,7 @@ p{
 			box-sizing: border-box;
 			font-weight: 500;
 			font-size: 38px;
-      color: #FFFFFF;
+			color: #ffffff;
 			text-shadow: 0px 5px 2px rgba(0, 0, 0, 0.62);
 			text-align: center;
 			position: absolute;
@@ -342,7 +553,7 @@ p{
 		.title {
 			font-weight: 500;
 			font-size: 20px;
-      color: #00C8F7;
+			color: #00c8f7;
 			letter-spacing: 2px;
 			text-shadow: 0px 5px 2px rgba(0, 0, 0, 0.62);
 			text-align: center;

src/views/base/dataBoard/components/LeftBottom.vue

@@ -1,17 +1,20 @@
 <template>
-  <div class='leftBottomBox'>
+	<div class="leftBottomBox">
-    <div class='title'>
+		<div class="title">
-      <svg-icon icon-class="dataBoard2" class='icon'/>
+			<svg-icon icon-class="dataBoard2" class="icon" />
 			<span>投入产出及良品率</span>
 		</div>
-    <div v-if='xData.length === 0' class='noData'>暂无数据</div>
+		<div v-if="xData.length === 0" class="noData">暂无数据</div>
 		<div v-else>
 			<div class="top_legend">
 				<span class="chart_legend_icon1">投入</span>
 				<span class="chart_legend_icon2">产出</span>
-        <span><span class="chart_legend_icon3"></span>良品率</span>
+				<span>
+					<span class="chart_legend_icon3"></span>
+					良品率
+				</span>
 			</div>
-      <div id='inOutputChart' style='width: 400px;height: 290px;'></div>
+			<div id="inOutputChart" style="width: 400px; height: 290px"></div>
 		</div>
 	</div>
 </template>
@@ -22,25 +25,26 @@ export default {
 	props: {
 		dataObj: {
 			type: Object,
-      default: () => {}
+			default: () => {},
-    }
+		},
 	},
 	watch: {
 		dataObj(val) {
-      this.xData = []
+			this.xData = [];
-      this.inputData = []
+			this.inputData = [];
-      this.outputData = []
+			this.outputData = [];
-      this.goodRateData = []
+			this.goodRateData = [];
-      val.monthBar && val.monthBar.forEach(item => {
+			val.monthBar &&
-        this.xData.push(item.dataType)
+				val.monthBar.forEach((item) => {
-        this.inputData.push(item.inputNum)
+					this.xData.push(item.dataType);
-        this.outputData.push(item.outputNum)
+					this.inputData.push(item.inputNum);
-        this.goodRateData.push(item.goodRate)
+					this.outputData.push(item.outputNum);
-      })
+					this.goodRateData.push(item.goodRate.toFixed(2));
+				});
 			this.$nextTick(() => {
 				this.initChart();
-      })
+			});
-    }
+		},
 	},
 	data() {
 		return {
@@ -50,7 +54,7 @@ export default {
 			inputData: [],
 			outputData: [],
 			goodRateData: [],
-    }
+		};
 	},
 	mounted() {},
 	methods: {
@@ -60,10 +64,10 @@ export default {
 				this.chart !== '' &&
 				this.chart !== undefined
 			) {
-        this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
+				this.chart.dispose(); // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
 			}
-      this.chartDom = document.getElementById('inOutputChart')
+			this.chartDom = document.getElementById('inOutputChart');
-      this.chart = echarts.init(this.chartDom)
+			this.chart = echarts.init(this.chartDom);
 			var option;
 			option = {
 				grid: { top: 40, right: 10, bottom: 5, left: 10, containLabel: true },
@@ -71,85 +75,90 @@ export default {
 					show: false,
 				},
 				xAxis: {
-          type: "category",
+					type: 'category',
 					data: this.xData,
 					axisLabel: {
-            color: "#fff",
+						color: '#fff',
 						fontSize: 10,
 						interval: 0,
-            rotate:30
+						rotate: 30,
 					},
 					axisTick: { show: false },
 					axisLine: {
 						lineStyle: {
 							width: 2,
-              color: "#5982B2",
+							color: '#5982B2',
 						},
 					},
 				},
-        yAxis: [{
+				yAxis: [
-          name: "单位/片",
+					{
+						name: '单位/片',
 						nameTextStyle: {
-            color: "#DFF1FE",
+							color: '#DFF1FE',
 							fontSize: 12,
 						},
-          type: "value",
+						type: 'value',
 						axisLabel: {
-            color: "#DFF1FE",
+							color: '#DFF1FE',
 							fontSize: 12,
-            formatter: "{value}",
+							formatter: '{value}',
 						},
 						axisLine: {
 							show: true,
 							lineStyle: {
 								width: 2,
-              color: "#5982B2",
+								color: '#5982B2',
 							},
 						},
 						splitLine: {
 							lineStyle: {
 								width: 2,
-              color: "#5982B2",
+								color: '#5982B2',
 							},
 						},
-        },{
+					},
-          name: "良品率/%",
+					{
+						name: '良品率/%',
 						nameTextStyle: {
-            color: "#DFF1FE",
+							color: '#DFF1FE',
 							fontSize: 12,
 						},
-          type: "value",
+						type: 'value',
+						max: 100,
+						min: 80,
 						axisLabel: {
-            color: "#DFF1FE",
+							color: '#DFF1FE',
 							fontSize: 12,
-            formatter: "{value}",
+							formatter: '{value}',
 						},
 						axisLine: {
 							show: true,
 							lineStyle: {
 								width: 2,
-              color: "#5982B2",
+								color: '#5982B2',
 							},
 						},
 						splitLine: {
 							lineStyle: {
 								width: 2,
-              color: "#5982B2",
+								color: '#5982B2',
 							},
 						},
-        }],
+					},
+				],
 				tooltip: {
-          trigger: "axis",
+					trigger: 'axis',
 					axisPointer: {
-            type: "shadow",
+						type: 'shadow',
 					},
-          className: "qhd-chart-tooltip",
+					className: 'qhd-chart-tooltip',
 					show: true,
 				},
 				series: [
 					{
 						data: this.inputData,
-            type: "bar",
+						type: 'bar',
 						barWidth: 10,
 						barGap: 0,
 						itemStyle: {
@@ -161,7 +170,7 @@ export default {
 					},
 					{
 						data: this.outputData,
-            type: "bar",
+						type: 'bar',
 						barWidth: 10,
 						itemStyle: {
 							color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -172,7 +181,7 @@ export default {
 					},
 					{
 						data: this.goodRateData,
-            type: "line",
+						type: 'line',
 						yAxisIndex: 1,
 						symbol: 'circle',
 						symbolSize: 7,
@@ -183,20 +192,21 @@ export default {
 								{ offset: 0.2, color: 'rgba(18, 255, 245, 0.2)' },
 								{ offset: 0.4, color: 'rgba(18, 255, 245, 0)' },
 							]),
-            }
+						},
-          }
+					},
 				],
-      }
+			};
 			option && this.chart.setOption(option);
-    }
+		},
-  }
+	},
-}
+};
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .leftBottomBox {
 	width: 402px;
 	height: 332px;
-  background: url('../../../../assets/images/dataBoard/left-bottom.png') no-repeat;
+	background: url('../../../../assets/images/dataBoard/left-bottom.png')
+		no-repeat;
 	background-size: 100%;
 	position: absolute;
 	left: 23px;
@@ -212,7 +222,7 @@ export default {
 		}
 		span {
 			font-size: 24px;
-      color: #52FFF1;
+			color: #52fff1;
 			line-height: 24px;
 			vertical-align: middle;
 		}
@@ -231,21 +241,21 @@ export default {
 		}
 		.chart_legend_icon1:before {
 			display: inline-block;
-      content: "";
+			content: '';
 			width: 10px;
 			height: 10px;
 			margin-right: 5px;
 			border-radius: 2px;
-      background: #73F8E0;
+			background: #73f8e0;
 		}
 		.chart_legend_icon2:before {
 			display: inline-block;
-      content: "";
+			content: '';
 			width: 10px;
 			height: 10px;
 			margin-right: 5px;
 			border-radius: 2px;
-      background: #497EFF;
+			background: #497eff;
 		}
 		.chart_legend_icon3 {
 			display: inline-block;
@@ -253,15 +263,15 @@ export default {
 			height: 8px;
 			margin-right: 8px;
 			border-radius: 4px;
-      background: #73F8E0;
+			background: #73f8e0;
 			position: relative;
 		}
 		.chart_legend_icon3:before {
 			display: inline-block;
-      content: "";
+			content: '';
 			width: 16px;
 			height: 2px;
-      background: #73F8E0;
+			background: #73f8e0;
 			position: absolute;
 			top: 3px;
 			left: -4px;

src/views/base/dataBoard/components/LeftTop.vue

@@ -6,7 +6,7 @@
     </div>
     <div class='title-split'>
       <img src="../../../../assets//images/dataBoard/leftbar.png" alt="">
-      <span class='text'>本日</span>
+      <span class='text'>当日</span>
       <img src="../../../../assets//images/dataBoard/rightbar.png" alt="">
     </div>
     <div class='data-box'>
@@ -20,11 +20,11 @@
       </div>
       <div class='right-data' style="top:15px;">
         <p><span class='num'>{{todayData?.inputNum ? formatThousands(todayData.inputNum) : '-'}}</span><span class='text'>片数</span></p>
-        <p><span class='num'>{{todayData?.inputArea ? formatThousands(todayData.inputArea) : '-'}}</span><span class='text'>面积/㎡</span></p>
+        <!-- <p><span class='num'>{{todayData?.inputArea ? formatThousands(todayData.inputArea) : '-'}}</span><span class='text'>面积/㎡</span></p> -->
       </div>
       <div class='right-data' style="top:132px;">
         <p><span class='num'>{{todayData?.outputNum ? formatThousands(todayData.outputNum) : '-'}}</span><span class='text'>片数</span></p>
-        <p><span class='num'>{{todayData?.outputArea ? formatThousands(todayData.outputArea) : '-'}}</span><span class='text'>面积/㎡</span></p>
+        <!-- <p><span class='num'>{{todayData?.outputArea ? formatThousands(todayData.outputArea) : '-'}}</span><span class='text'>面积/㎡</span></p> -->
       </div>
     </div>
     <div class='title-split'>
@@ -43,11 +43,11 @@
       </div>
       <div class='right-data' style="top:15px;">
         <p><span class='num'>{{yesterdayData?.inputNum ? formatThousands(yesterdayData.inputNum) : '-'}}</span><span class='text'>片数</span></p>
-        <p><span class='num'>{{yesterdayData?.inputArea ? formatThousands(yesterdayData.inputArea) : '-'}}</span><span class='text'>面积/㎡</span></p>
+        <!-- <p><span class='num'>{{yesterdayData?.inputArea ? formatThousands(yesterdayData.inputArea) : '-'}}</span><span class='text'>面积/㎡</span></p> -->
       </div>
       <div class='right-data' style="top:132px;">
         <p><span class='num'>{{yesterdayData?.outputNum ? formatThousands(yesterdayData.outputNum) : '-'}}</span><span class='text'>片数</span></p>
-        <p><span class='num'>{{yesterdayData?.outputArea ? formatThousands(yesterdayData.outputArea) : '-'}}</span><span class='text'>面积/㎡</span></p>
+        <!-- <p><span class='num'>{{yesterdayData?.outputArea ? formatThousands(yesterdayData.outputArea) : '-'}}</span><span class='text'>面积/㎡</span></p> -->
       </div>
     </div>
   </div>
@@ -155,6 +155,7 @@ export default {
         color: #FFFFFF;
         letter-spacing: 1px;
         text-shadow: 0px 4px 2px rgba(0,0,0,0.62);
+        line-height: 90px;
       }
     }
   }

src/views/base/dataBoard/components/RightBottom.vue

@@ -2,7 +2,7 @@
   <div class='rightBottomBox'>
     <div class='title'>
       <svg-icon icon-class="dataBoard3" class='icon'/>
-      <span>本月<span class='dotted'></span>班组生产排名</span>
+      <span>当月<span class='dotted'></span>班组生产排名</span>
     </div>
     <div class='rankingLeft'>
       <div class='rankingLeftTitle'>产量</div>

src/views/base/dataBoard/components/RightTop.vue

@@ -21,7 +21,7 @@
         </div>
         <div class='box' style='width: 115px;'>
           <p class='name'>
-            <span style='margin-right: 3px;'>本月</span>
+            <span style='margin-right: 3px;'>当月</span>
             <img v-show='nokSumDet.month >= nokSumDet.lastMonth' src="../../../../assets/images/dataBoard/arrUp.png" alt="" width='5' height='15'>
             <img v-show='nokSumDet.month < nokSumDet.lastMonth' src="../../../../assets/images/dataBoard/arrDown.png" alt="" width='5' height='15'>
           </p>
@@ -29,7 +29,7 @@
         </div>
         <div class='box' style='width: 110px;'>
           <p class='name'>
-            <span style='margin-right: 3px;'>本年</span>
+            <span style='margin-right: 3px;'>当年</span>
             <img v-show='nokSumDet.year >= nokSumDet.lastYear' src="../../../../assets/images/dataBoard/arrUp.png" alt="" width='5' height='15'>
             <img v-show='nokSumDet.year < nokSumDet.lastYear' src="../../../../assets/images/dataBoard/arrDown.png" alt="" width='5' height='15'>
           </p>

src/views/base/material/add-or-updata.vue

@@ -89,6 +89,31 @@ export default {
 	},
 	created() {},
   methods: {
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          if (response.code === 1001033 || response.code === 1001034) {
+            return this.$modal.msgError(response.msg);
+          }
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
+    },
   },
 };
 </script>

src/views/base/materialPricing/add-or-updata.vue

@@ -120,6 +120,29 @@ export default {
 							.label;
 				}
 			});
+    },
+    dataFormSubmit() {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        // 修改的提交
+        if (this.dataForm.id) {
+          this.urlOptions.updateURL(this.dataForm).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.visible = false;
+            this.$emit("refreshDataList");
+          });
+          return;
+        }
+        // 添加的提交
+        this.urlOptions.createURL(this.dataForm).then(response => {
+          console.log('response', response);
+          this.$modal.msgSuccess("新增成功");
+          this.visible = false;
+          this.$emit("refreshDataList");
+        });
+      });
     },
 	},
 };

src/views/core/analysis/balanceAnalysis/index.vue

@@ -7,46 +7,20 @@
 -->
 <template>
   <div class="app-container">
-		<search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @select-changed="handleSearchBarChanged"
-			:formConfigs="formConfig"
-			ref="searchBarForm"
-			@select-changed="handleSearchBarChanged"
       @headBtnClick="buttonClick" />
     <div v-if="showData.length">
-			<base-table
+      <base-table class="right-aside" v-loading="dataListLoading" :table-props="tableProps" :page="1" :limit="999"
-				class="right-aside"
-				v-loading="dataListLoading"
-				:table-props="tableProps"
-				:page="1"
-				:limit="999"
         :table-data="showData">
-				<method-btn
+        <method-btn v-if="showData.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
-					v-if="showData.length"
-					slot="handleBtn"
-					:width="80"
-					label="操作"
-					:method-list="tableBtn"
           @clickBtn="handleClick" />
       </base-table>
-			<barChart
+      <barChart v-for="item in chartData" :key="item.name + 'echart'" style="margin-top: 50px" height="600px"
-				v-for="item in chartData"
+        :id="item.name + 'echart'" :title="item.name + ' 节拍趋势图'" :bar-data="item" />
-				:key="item.name + 'echart'"
-				style="margin-top: 50px"
-				height="600px"
-				:id="item.name + 'echart'"
-				:title="item.name + ' 节拍趋势图'"
-				:bar-data="item" />
     </div>
     <div v-else class="no-data-bg"></div>
-		<base-dialog
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
-			:dialogTitle="addOrEditTitle"
+      @confirm="handleConfirm" :before-close="handleCancel" close-on-click-modal top="0" width="50%">
-			:dialogVisible="addOrUpdateVisible"
-			@cancel="handleCancel"
-			@confirm="handleConfirm"
-			:before-close="handleCancel"
-			close-on-click-modal
-      top="0"
-			width="50%">
       <eq-detail ref="eqDetail" />
       <slot name="footer">
         <el-row slot="footer" type="flex" justify="end">
@@ -64,7 +38,7 @@
 <script>
 import eqDetail from './eq-detail';
 import { parseTime } from '../../mixins/code-filter';
-import { getPdList } from '@/api/core/monitoring/auto';
+import { getPLlistByFactory } from '@/api/core/monitoring/auto';
 import { getNewCTNow, getNewCTCharts } from '@/api/core/analysis/index';
 import { getFactoryPage } from '@/api/core/base/factory';
 // import codeFilter from '../../mixins/code-filter'
@@ -135,6 +109,8 @@ export default {
           label: '工厂',
           selectOptions: [],
           param: 'factoryId',
+          collapseTags: true,
+          multiple: true,
           onchange: true,
         },
         {
@@ -142,6 +118,7 @@ export default {
           label: '产线',
           selectOptions: [],
           param: 'lineId',
+          collapseTags: true,
           multiple: true,
         },
         {
@@ -183,7 +160,7 @@ export default {
     // 获取当前时间
     const now = new Date();
     // 获取前一天的同一时间
-		const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000);
+    const yesterday = new Date(now.getTime());
     // 设置为00:00:00
     yesterday.setHours(0, 0, 0, 0);
     // 设置为23:59:59
@@ -232,9 +209,9 @@ export default {
       return exportTableOut;
     },
     getPdLineList() {
-			getPdList().then((res) => {
+      // getPLlistByFactory().then((res) => {
-				this.formConfig[1].selectOptions = res.data || [];
+      // 	this.formConfig[1].selectOptions = res.data || [];
-			});
+      // });
       const params = {
         pageSize: 100,
         pageNo: 1,
@@ -274,7 +251,7 @@ export default {
     handleSearchBarChanged({ param, value }) {
       this.listQuery.lineId = [];
       this.$refs.searchBarForm.formInline.lineId = undefined;
-			getPdList(value).then((res) => {
+      getPLlistByFactory({ factoryIds: this.$refs.searchBarForm.formInline.factoryId }).then((res) => {
         this.formConfig[1].selectOptions = res.data || [];
       });
     },

src/views/core/base/equipmentType/index.vue

@@ -92,6 +92,8 @@ export default {
 					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
 				},
 				{ prop: 'name', label: '设备类型名称' },
+				{ prop: 'isCraft', label: '是否为生产设备',
+					filter: (val) => val?'是': '否', },
 				{ prop: 'code', label: '设备类型编码' },
 				{ prop: 'remark', label: '备注' },
 			],

src/views/core/monitoring/data24/index.vue

@@ -17,14 +17,14 @@
 				:table-props="tableProps"
 				:table-data="tableData"
 				:max-height="tableH"
-			@emitFun="handleEmitFun"
+				:span-method="mergeColumnHandler"
-		/>
+				@emitFun="handleEmitFun" />
 		</div>
 	</div>
 </template>
 
 <script>
-import { getPdlDataOneDay } from '@/api/core/monitoring/data24'
+import { getSectionDataOneDay } from '@/api/core/monitoring/data24';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
 
 export default {
@@ -35,7 +35,7 @@ export default {
 	data() {
 		return {
 			urlOptions: {
-				getDataListURL: getPdlDataOneDay
+				getDataListURL: getSectionDataOneDay,
 			},
 			initing: false,
 			queryParams: {
@@ -45,6 +45,7 @@ export default {
 			list: [],
 			arr: [],
 			spanArr: [],
+			spanArrProLine: [], // 产线合并行数组
 			timeList: [],
 			tableData: [],
 			tableProps: [],
@@ -58,78 +59,130 @@ export default {
 	methods: {
 		/** 构建tableProps - 依据第一个元素所提供的信息 */
 		buildProps(plData) {
-			plData.forEach(item => {
+			this.timeList = []; // 重置避免重复
-				this.timeList.push(item.name)
+			this.arr = [];      // 重置避免重复
-			})
+			plData.forEach((item) => {
-			const timeArray = Array.from(new Set(this.timeList))
+				this.timeList.push(item.name);
-			console.log('nihc', timeArray)
+			});
+			const timeArray = Array.from(new Set(this.timeList));
 			for (const times of timeArray) {
-				if (times !== '投入数量' && times !== '产出数量' && times !== '报废数量' && times !== '产出面积') {
+				if (!['投入数', '产出数', '报废数量', '报废比例'].includes(times)) {
 					const subprop = {
-						label: times.slice(0, 10) + ' ' + times.slice(11),
+						label: `${times.slice(0, 10)} ${times.slice(11)}`,
 						align: 'center',
 						children: [
-							{ prop: times + '_in', label: '投入数量',
+							{
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
+								prop: `${times}_in`,
-							{ prop: times + '_out', label: '产出数量',
+								label: '投入数',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
+								filter: (val) => (val != null ? val : '-'),
-							{ prop: times + '_junk', label: '报废数量',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), },
-							{ prop: times + '_area', label: '产出面积',
-							filter: (val) => (val != null ? val.toFixed(2) : '-'), }
-						]
-					}
-					this.arr.push(subprop)
-				}
-			}
-			this.tableProps = this.arr
 							},
-		setRowSpan(arr) {
+							{
-      let count = 0
+								prop: `${times}_out`,
+								label: '产出数',
+								filter: (val) => (val != null ? val : '-'),
+							},
+							{
+								prop: `${times}_junk`,
+								label: '报废数量',
+								filter: (val) => (val != null ? val : '-'),
+							},
+							{
+								prop: `${times}_area`,
+								label: '报废比例',
+								filter: (val) => (val != null ? val.toFixed(2) : '-'),
+							},
+						],
+					};
+					this.arr.push(subprop);
+				}
+			}
+			this.tableProps = [
+				{
+					prop: 'proLineName',
+					label: '产线',
+					fixed: 'left',
+          width: 120,
+					showOverflowTooltip: true,
+				},
+				{
+					prop: 'spec',
+					label: '产品规格',
+					fixed: 'left',
+          width: 110,
+					showOverflowTooltip: true,
+					filter: (val) => val != null ? val.join(' / ') : '-',
+				},
+				{
+					prop: 'sectionName',
+					label: '工段名称',
+					fixed: 'left',
+          width: 120,
+					showOverflowTooltip: true,
+				},
+				{
+					prop: 'allNum',
+					label: '生产总数',
+					fixed: 'left',
+					showOverflowTooltip: true,
+				},
+				...this.arr
+			];
+		},
+		/** 通用合并行计算方法 */
+		calcRowSpan(arr) {
+			const spanArr = [];
+			let count = 0;
 			arr.forEach((item, index) => {
 				if (index === 0) {
-          this.spanArr.push(1)
+					spanArr.push(1);
 				} else {
 					if (item === arr[index - 1]) {
-            this.spanArr[count] += 1
+						spanArr[count] += 1;
-            this.spanArr.push(0)
+						spanArr.push(0);
 					} else {
-            count = index
+						count = index;
-            this.spanArr.push(1)
+						spanArr.push(1);
 					}
 				}
-      })
+			});
-      console.log('打印数组长度', this.spanArr)
+			return spanArr;
 		},
 
 		/** 把 list 里的数据转换成 tableProps 对应的格式 */
 		convertList(list) {
-			let sectionArr= []
+			this.tableData = []; // 重置避免重复
-			console.log('打印看下数据list', list)
+			const proLineNames = []; // 存储产线名称用于计算合并
-			list.forEach((ele, index) => {
+			const specNames = [];    // 存储规格名称用于计算合并
-				let tempData = []
+
-				ele.data.forEach(item => {
+			list.forEach((ele) => {
-					item.children.forEach(params => {
+				const tempData = {};
-						if (params.dynamicName === '投入数量') {
+				// 基础字段赋值
-							tempData[item.dynamicName + '_in'] = params.dynamicValue
+				tempData.proLineName = ele.proLineName;
-						} else if (params.dynamicName === '产出数量') {
+				tempData.spec = ele.spec;
-							tempData[item.dynamicName + '_out'] = params.dynamicValue
+				tempData.sectionName = ele.sectionName;
-						} else if (params.dynamicName === '报废数量') {
+				tempData.allNum = ele.allNum;
-							tempData[item.dynamicName + '_junk'] = params.dynamicValue
+
-						} else {
+				// 动态字段赋值
-							tempData[item.dynamicName + '_area'] = params.dynamicValue
+				ele.data.forEach((item) => {
-						}
+					item.children.forEach((params) => {
-					})
+						const keyMap = {
-				})
+							'投入数': `${item.dynamicName}_in`,
-				tempData['proLineName'] = ele.proLineName
+							'产出数': `${item.dynamicName}_out`,
-				tempData['spec'] = ele.spec
+							'报废数量': `${item.dynamicName}_junk`,
-				this.tableData.push(tempData)
+							'报废比例': `${item.dynamicName}_area`,
-				console.log('看看数据', this.tableData, tempData)
+						};
-				const { proLineName } = tempData
+						const key = keyMap[params.dynamicName];
-				sectionArr.push(proLineName)
+						if (key) tempData[key] = params.dynamicValue;
-			})
+					});
-			this.setRowSpan(sectionArr)
+				});
-			console.log('工段名称列表', sectionArr)
+
+				this.tableData.push(tempData);
+				proLineNames.push(ele.proLineName);
+				specNames.push(ele.spec);
+			});
+
+			// 计算合并行数组
+			this.spanArrProLine = this.calcRowSpan(proLineNames);
 		},
 
 		buildData(data) {
@@ -138,38 +191,55 @@ export default {
 
 		/** 合并table列的规则 */
 		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
-			if (columnIndex == 0) {
+			// 列索引0: 产线列, 列索引1: 产品规格列
-				if (this.spanArr[rowIndex]) {
+			if (columnIndex === 0) {
-					return [
+				return {
-						this.spanArr[rowIndex], // row span
+					rowspan: this.spanArrProLine[rowIndex] || 0,
-						1, // col span
+					colspan: this.spanArrProLine[rowIndex] ? 1 : 0
-					];
+				};
-				} else {
-					return [0, 0];
 			}
+			if (columnIndex === 1) {
+				return {
+					rowspan: this.spanArrProLine[rowIndex] || 0,
+					colspan: this.spanArrProLine[rowIndex] ? 1 : 0
+				};
 			}
+			// 其他列不合并
+			return { rowspan: 1, colspan: 1 };
 		},
 
 		async getList() {
-      this.urlOptions.getDataListURL().then(res => {
+			this.urlOptions.getDataListURL().then((res) => {
-        console.log('看看数据', res)
+				console.log('看看数据', res);
 				this.arr = [
 					{
 						prop: 'proLineName',
-            label: '生产线',
+						label: '产线',
 						fixed: 'left',
-						showOverflowTooltip: true
+						showOverflowTooltip: true,
 					},
 					{
 						prop: 'spec',
 						label: '产品规格',
 						fixed: 'left',
-						showOverflowTooltip: true
+						showOverflowTooltip: true,
-          }
+					},
-				]
+					{
+						prop: 'sectionName',
+						label: '工段名称',
+						fixed: 'left',
+						showOverflowTooltip: true,
+					},
+					{
+						prop: 'allNum',
+						label: '生产总数',
+						fixed: 'left',
+						showOverflowTooltip: true,
+					},
+				];
 				this.buildProps(res.data.nameData);
 				this.buildData(res.data.data);
-      })
+			});
 
 			// // const data = this.res.data;
 			// // console.log('recent-24', data);

src/views/core/monitoring/lineAuto/index.vue

@@ -190,7 +190,160 @@ import barChart from './BarChart.vue';
 import ButtonNav from '@/components/ButtonNav';
 import { listData } from '@/api/system/dict/data';
 // 表格列配置
-const tableProps = [
+
+export default {
+  components: { barChart, ButtonNav, baseTableS },
+  data() {
+    return {
+      urlOptions: { getDataListURL: getLineAuto },
+      listQuery: {
+        lineId: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+        timeType: 1 // 1-当天，2-自定义
+      },
+      isPeriodicReport: false,
+      reportTypeMap: {
+        1: '日报',
+        2: '周报',
+        3: '月报',
+        4: '年报'
+      },
+      activeLabel: 'table', // 当班数据tab
+      activeLabelDay: 'table', // 当天数据tab
+      fileName: '',
+      headFormValue: {},
+      dataListLoading: false,
+      factoryColumns: [],
+      factoryColumnsDay: [],
+      activeName: 'product',
+      tableBtn: [],
+      showData: [],
+      tableData: [],
+      tableData2: [], // 示例数据，实际从接口获取
+      productTableData: [],
+      productTableDataDay: [],
+      tableDataCustom: [],
+      list: [], // 折线图数据
+      timeTypeOptions: {
+        productLine: [ // 按产线监控（包含上一班）
+          { id: 1, name: '当天' },
+          { id: 2, name: '自定义' },
+          { id: 3, name: '上一班' }
+        ],
+        product: [ // 按产品监控（不含上一班）
+          { id: 1, name: '当天' },
+          { id: 2, name: '自定义' },
+          { id: 3, name: '上一班' }
+        ]
+      },
+      formConfig: [
+        {
+          type: 'select',
+          label: '时间维度',
+          selectOptions: [
+            { id: 1, name: '当天' },
+            { id: 2, name: '自定义' },
+            { id: 3, name: '上一班' }
+          ],
+          width: 100,
+          onchange: true,
+          // defaultSelect: 1,
+          clearable: false,
+          param: 'timeType'
+        },
+        {
+          type: '',
+          label: '查询类型',
+          selectOptions: [
+            { id: 1, name: '统计数据' },
+            { id: 2, name: '周期性汇总报表' }
+          ],
+          width: 120,
+          onchange: true,
+          param: 'searchType'
+        },
+        {
+          type: 'select',
+          label: '工厂',
+          selectOptions: [],
+          param: 'factoryId',
+          multiple: true,
+          onchange: true
+        },
+        {
+          type: 'select',
+          label: '产线',
+          selectOptions: [],
+          param: 'lineId',
+          multiple: true,
+          onchange: true
+        },
+        {
+          type: 'select',
+          label: '产品工艺',
+          selectOptions: [],
+          param: 'process',
+          multiple: true,
+          labelField: 'label',
+          valueField: 'label',
+        },
+        {
+          type: '',
+          label: '产品类型',
+          selectOptions: [
+            { id: 1, name: '面板' },
+            { id: 2, name: '背板' },
+          ],
+          multiple: true,
+          param: 'processType',
+        },
+        {
+          type: '',
+          label: '报表类型',
+          selectOptions: [
+            { id: 1, name: '日' },
+            { id: 2, name: '周' },
+            { id: 3, name: '月' },
+            { id: 4, name: '年' }
+          ],
+          onchange: true,
+          width: 80,
+          param: 'reportType'
+        },
+        {
+          type: '',
+          label: '时间范围',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'timestamp',
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          width: 350
+        },
+        { type: 'button', btnName: '查询', name: 'search', color: 'primary' },
+        { type: 'separate' },
+        { type: 'button', btnName: '导出', name: 'export', color: 'warning' },
+        {
+          type: 'button',
+          btnName: '重置',
+          name: 'reset',
+        },
+        // {
+        //   type: 'label', // 初始隐藏
+        //   label: '刷新时间', // 自定义标识
+        //   // slot: 'currentTimeSlot', // 自定义插槽名
+        //   // width: 200, // 宽度适配
+        // },
+      ]
+    };
+  },
+  computed: {
+    tableProps() {
+      const props = [
         {
           prop: 'factoryName',
           label: '工厂',
@@ -213,6 +366,12 @@ const tableProps = [
           label: '产品工艺',
           fixed: true
         },
+        (this.isPeriodicReport ? {
+          prop: 'reportDate',
+          label: '日期',
+          fixed: true,
+          width: 120
+        } : ''),
         {
           prop: 'inputN',
           label: '投入',
@@ -359,158 +518,8 @@ const tableProps = [
           ]
         }
       ];
-
+      return props
-export default {
-  components: { barChart, ButtonNav, baseTableS },
-  data() {
-    return {
-      urlOptions: { getDataListURL: getLineAuto },
-      listQuery: {
-        lineId: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-        timeType: 1 // 1-当天，2-自定义
     },
-      reportTypeMap: {
-        1: '日报',
-        2: '周报',
-        3: '月报',
-        4: '年报'
-      },
-      activeLabel: 'table', // 当班数据tab
-      activeLabelDay: 'table', // 当天数据tab
-      fileName: '',
-      headFormValue:{},
-      dataListLoading: false,
-      tableProps,
-      factoryColumns: [],
-      factoryColumnsDay: [],
-      activeName: 'product',
-      tableBtn: [],
-      showData: [],
-      tableData: [],
-      tableData2: [], // 示例数据，实际从接口获取
-      productTableData: [],
-      productTableDataDay: [],
-      tableDataCustom: [],
-      list: [], // 折线图数据
-      timeTypeOptions: {
-        productLine: [ // 按产线监控（包含上一班）
-          { id: 1, name: '当天' },
-          { id: 2, name: '自定义' },
-          { id: 3, name: '上一班' }
-        ],
-        product: [ // 按产品监控（不含上一班）
-          { id: 1, name: '当天' },
-          { id: 2, name: '自定义' },
-          { id: 3, name: '上一班' }
-        ]
-      },
-      formConfig: [
-        {
-          type: 'select',
-          label: '时间维度',
-          selectOptions: [
-            { id: 1, name: '当天' },
-            { id: 2, name: '自定义' },
-            { id: 3, name: '上一班' }
-          ],
-          width: 100,
-          onchange: true,
-          // defaultSelect: 1,
-          clearable: false,
-          param: 'timeType'
-        },
-        {
-          type: '',
-          label: '查询类型',
-          selectOptions: [
-            { id: 1, name: '统计数据' },
-            { id: 2, name: '周期性汇总报表' }
-          ],
-          width: 120,
-          onchange: true,
-          param: 'searchType'
-        },
-        {
-          type: 'select',
-          label: '工厂',
-          selectOptions: [],
-          param: 'factoryId',
-          multiple: true,
-          onchange: true
-        },
-        {
-          type: 'select',
-          label: '产线',
-          selectOptions: [],
-          param: 'lineId',
-          multiple: true,
-          onchange: true
-        },
-        {
-          type: 'select',
-          label: '产品工艺',
-          selectOptions: [],
-          param: 'process',
-          multiple: true,
-          labelField: 'label',
-          valueField: 'label',
-        },
-        {
-          type: '',
-          label: '产品类型',
-          selectOptions: [
-            { id: 1, name: '面板' },
-            { id: 2, name: '背板' },
-          ],
-          multiple: true,
-          param: 'processType',
-        },
-        {
-          type: '',
-          label: '报表类型',
-          selectOptions: [
-            { id: 1, name: '日' },
-            { id: 2, name: '周' },
-            { id: 3, name: '月' },
-            { id: 4, name: '年' }
-          ],
-          onchange: true,
-          width: 80,
-          param: 'reportType'
-        },
-        {
-          type: '',
-          label: '时间范围',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'timestamp',
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          width: 350
-        },
-        { type: 'button', btnName: '查询', name: 'search', color: 'primary' },
-        { type: 'separate' },
-        { type: 'button', btnName: '导出', name: 'export', color: 'warning' },
-        {
-          type: 'button',
-          btnName: '重置',
-          name: 'reset',
-        },
-        // {
-        //   type: 'label', // 初始隐藏
-        //   label: '刷新时间', // 自定义标识
-        //   // slot: 'currentTimeSlot', // 自定义插槽名
-        //   // width: 200, // 宽度适配
-        // },
-      ]
-    };
-  },
-  computed: {
     productTableProps() {
       // 当班数据的完整表头（基础列 + 当班动态表头）
       const baseColumns = [
@@ -530,14 +539,20 @@ export default {
           prop: 'processType',
           label: '产品类型',
           filter: (val) => (val === 1 ? '面板' : '背板'),
-          fixed: true,
           sortable: true,
+          fixed: true
         },
         {
           prop: 'factoryName',
           label: '工厂',
           fixed: true
-        }
+        },
+        (this.isPeriodicReport ? {
+          prop: 'reportDate',
+          label: '日期',
+          fixed: true,
+          width: 120
+        } : ''),
       ];
       return [...baseColumns, ...this.factoryColumns];
     },
@@ -559,7 +574,7 @@ export default {
         {
           prop: 'processType',
           label: '产品类型',
-          filter: (val) => (val === 1 ? '面板' : '背板'),
+          filter: (val) => (val != 1 ? '面板' : '背板'),
           sortable: true,
           fixed: true
         },
@@ -567,7 +582,13 @@ export default {
           prop: 'factoryName',
           label: '工厂',
           fixed: true
-        }
+        },
+        (this.isPeriodicReport ? {
+          prop: 'reportDate',
+          label: '日期',
+          fixed: true,
+          width: 120
+        } : ''),
       ];
       return [...baseColumns, ...this.factoryColumnsDay];
     }
@@ -704,46 +725,59 @@ export default {
       }
     },
 
-    // 导出表格
+    // 导出表格（改为async方法，支持await调用）
-    handleExport() {
+    async handleExport() {
       // 按产线监控
       if (this.activeName === 'productLine') {
         if (this.listQuery.timeType === 1) {
           // 产线-当天：导出当班 + 当天两个表格（自定义汇总文件名）
-          this.exportMultipleTables([
+          await this.exportMultipleTables([
             { ref: 'lineCurrentShiftTable', name: '产线监控_当班数据' },
             { ref: 'lineTodayTable', name: '产线监控_当天数据' }
           ], '产线监控_当班及当天数据汇总'); // 传入自定义汇总文件名
-        } else if (this.listQuery.timeType === 1) {
+        } else if (this.listQuery.timeType === 3) {
-          // 产线-当天：导出当班 + 当天两个表格（自定义汇总文件名）
+          // 修复：注释错误，原为“产线-当天”，实际是“产线-上一班”
-          this.exportMultipleTables([
+          // 产线-上一班：导出单个表格
-            { ref: 'lineCurrentShiftTable', name: '产线监控_上一班数据' },
+          await this.exportSingleTable('lineCustomTable', '产线监控_上一班时间数据');
-            { ref: 'lineTodayTable', name: '产线监控_当天数据' }
-          ], '产线监控_当班及当天数据汇总'); // 传入自定义汇总文件名
         } else {
           // 产线-自定义：导出一个表格（自定义文件名）
-          this.exportSingleTable('lineCustomTable', '产线监控_自定义时间数据');
+          await this.exportSingleTable('lineCustomTable', '产线监控_自定义时间数据');
         }
       }
       // 按产品监控
       else {
         if (this.listQuery.timeType === 1) {
           // 产品-当天：导出当班 + 当天两个表格（自定义汇总文件名）
-          this.exportMultipleTables([
+          await this.exportMultipleTables([
             { ref: 'productCurrentShiftTable', name: '产品监控_当班数据' },
-            { ref: 'productTodayTable', name: '产品监控_当天数据' }
+            { ref: 'productCurrentShiftTable', name: '产品监控_当天数据' }
           ], '产品监控_当班及当天数据汇总'); // 传入自定义汇总文件名
+        } else if (this.listQuery.timeType === 3) {
+          // 修复：注释错误，原为“产线-当天”，实际是“产品-上一班”
+          // 产品-上一班：导出单个表格
+          await this.exportSingleTable('productCustomTable', '产品监控_上一班时间数据');
         } else {
           // 产品-自定义：导出一个表格（自定义文件名）
-          this.exportSingleTable('productCustomTable', '产品监控_自定义时间数据');
+          await this.exportSingleTable('productCustomTable', '产品监控_自定义时间数据');
         }
       }
     },
 
-    // 导出单个表格（保持原有逻辑，文件名由调用方传入，已区分不同场景）
+    // 导出单个表格（改为async方法，使用await获取DOM）
-    exportSingleTable(refName, fileName) {
+    async exportSingleTable(refName, fileName) {
-      const table = this.getTableDom(refName);
+      try {
-      if (!table) return;
+        // 关键修复：使用await等待getTableDom返回DOM元素（而非Promise）
+        const table = await this.getTableDom(refName);
+        if (!table) {
+          this.$message.warning(`无法导出：${refName}表格DOM获取失败`);
+          return;
+        }
+
+        // 确认table是原生DOM元素后再调用cloneNode
+        if (!(table instanceof HTMLElement)) {
+          this.$message.error(`无法导出：${refName}表格不是合法的DOM元素`);
+          return;
+        }
 
         const clonedTable = table.cloneNode(true);
         this.adjustTableForExport(clonedTable);
@@ -751,16 +785,31 @@ export default {
         const workbook = XLSX.utils.table_to_book(clonedTable);
         const fullName = `${fileName}_${this.formatDate()}.xlsx`;
         XLSX.writeFile(workbook, fullName);
+      } catch (error) {
+        this.$message.error(`导出表格失败：${error.message}`);
+        console.error('单个表格导出错误：', error);
+      }
     },
 
-    // 导出多个表格（新增自定义汇总文件名参数，适配不同选项卡）
+    // 导出多个表格（改为async方法，使用await获取DOM）
-    exportMultipleTables(tables, customSummaryName) {
+    async exportMultipleTables(tables, customSummaryName) {
+      try {
         const workbook = XLSX.utils.book_new();
         let hasValidTable = false;
 
-      tables.forEach(({ ref, name }) => {
+        // 遍历表格配置，使用await获取每个表格的DOM
-        const table = this.getTableDom(ref);
+        for (const { ref, name } of tables) { // 改用for...of循环，支持await
-        if (!table) return;
+          const table = await this.getTableDom(ref);
+          if (!table) {
+            this.$message.warning(`${ref}表格DOM获取失败，跳过该表格`);
+            continue;
+          }
+
+          // 确认table是原生DOM元素
+          if (!(table instanceof HTMLElement)) {
+            this.$message.warning(`${ref}表格不是合法的DOM元素，跳过该表格`);
+            continue;
+          }
 
           hasValidTable = true;
           const clonedTable = table.cloneNode(true);
@@ -768,30 +817,65 @@ export default {
 
           const worksheet = XLSX.utils.table_to_sheet(clonedTable);
           XLSX.utils.book_append_sheet(workbook, worksheet, name);
-      });
+        }
 
         if (!hasValidTable) {
-        this.$message.warning('未找到有效表格数据');
+          this.$message.warning('未找到有效表格数据，导出失败');
           return;
         }
 
         // 动态生成汇总文件名：自定义名称 + 日期
         const fullName = `${customSummaryName}_${this.formatDate()}.xlsx`;
         XLSX.writeFile(workbook, fullName);
+      } catch (error) {
+        this.$message.error(`导出多个表格失败：${error.message}`);
+        console.error('多个表格导出错误：', error);
+      }
     },
-    // 辅助方法：获取表格DOM元素（包含表头）
+
-    getTableDom(refName) {
+    /**
+     * 获取表格DOM元素（支持异步重试）
+     * @param {string} refName - 表格的ref名称
+     * @param {number} retryCount - 当前重试次数（内部使用，外部调用无需传参）
+     * @returns {Promise<HTMLElement|null>} 表格DOM元素Promise
+     */
+    async getTableDom(refName, retryCount = 0) {
+      // 1. 配置常量，便于维护
+      const maxRetry = 5; // 最大重试次数
+      const retryDelay = 300; // 每次重试延迟时间(ms)
+
+      // 2. 设置激活标签，确保重试时也能执行该逻辑
+      this.activeLabel = 'table';
+      this.activeLabelDay = 'table';
+      // 若需调试，可保留日志
+      // console.log(`[getTableDom-${refName}] activeLabel:`, this.activeLabel, 'activeLabelDay:', this.activeLabelDay);
+
+      // 3. 获取表格组件
       const tableComponent = this.$refs[refName];
+
+      // 4. 表格组件不存在时，处理重试逻辑
       if (!tableComponent) {
-        this.$message.warning(`未找到${refName}表格`);
+        // 达到最大重试次数，返回失败
+        if (retryCount >= maxRetry) {
+          this.$message.warning(`未找到${refName}表格，已达到最大重试次数（${maxRetry}次）`);
           return null;
         }
-      // 获取完整表格容器（包含表头和表体）
+
+        // 未达到最大重试次数，延迟后重试
+        this.$message.warning(`未找到${refName}表格，将进行第${retryCount + 1}次重试...`);
+        await new Promise(resolve => setTimeout(resolve, retryDelay));
+        // 递归调用并返回结果
+        return this.getTableDom(refName, retryCount + 1);
+      }
+
+      // 5. 获取完整表格容器（包含表头和表体）
       const tableContainer = tableComponent.$el.querySelector('.el-table');
       if (!tableContainer) {
-        this.$message.warning(`${refName}表格数据为空`);
+        this.$message.warning(`${refName}表格容器不存在（可能表格数据为空）`);
         return null;
       }
+
+      // 6. 成功获取表格DOM，返回结果
       return tableContainer;
     },
 
@@ -856,7 +940,7 @@ export default {
       if (mainTable && allHeaderRows.length > 0) {
         const newThead = document.createElement('thead');
         // 按层级添加表头行
-        allHeaderRows.forEach(cells => {
+        allHeaderRows.forEach((cells, rowIndex) => {
           const newTr = document.createElement('tr');
           cells.forEach(cell => {
             // 复制单元格（避免DOM残留引用问题）
@@ -867,6 +951,18 @@ export default {
         });
         // 将新表头插入主表体最前面
         mainTable.insertBefore(newThead, mainTable.firstChild);
+
+        // ================ 新增：修改第一列表头为“序号” ================
+        // 找到第一层级的第一个表头单元格（<th>）
+        const firstHeaderCell = newThead.querySelector('tr:first-child th:first-child');
+        if (firstHeaderCell) {
+          // 清空原有内容，设置为“序号”
+          firstHeaderCell.innerHTML = ''; // 清空原有内容（包括子元素）
+          firstHeaderCell.textContent = '序号'; // 设置纯文本“序号”（更稳定）
+          // 可选：添加样式（如居中，根据需求调整）
+          // firstHeaderCell.style.textAlign = 'center';
+        }
+        // =============================================================
       }
 
       // 7. 合并固定列数据到主表体（仅处理tbody数据）
@@ -897,6 +993,23 @@ export default {
           }
         });
       }
+
+      // ================ 可选优化：为tbody第一列添加序号数字 ================
+      // 如果表格体的第一列原本无数据，可补充1、2、3...的序号
+      if (mainTable) {
+        const tbodyRows = mainTable.querySelectorAll('tbody tr');
+        tbodyRows.forEach((row, index) => {
+          const firstTd = row.querySelector('td:first-child');
+          if (firstTd) {
+            // 清空原有内容，设置为序号（index+1，因为索引从0开始）
+            firstTd.innerHTML = '';
+            firstTd.textContent = index + 1;
+            // 可选：居中显示
+            // firstTd.style.textAlign = 'center';
+          }
+        });
+      }
+      // =============================================================
     },
 
     // 辅助方法：格式化日期（用于文件名）
@@ -1517,6 +1630,7 @@ export default {
     // 搜索栏下拉选择变化
     handleSearchBarChanged({ param, value }) {
       if (param === 'timeType') {
+        this.isPeriodicReport = false
         this.tableData2 = []
         this.tableDataCustom = []
         this.tableData = []
@@ -1584,15 +1698,59 @@ export default {
         }
 
       } else if (param === 'searchType') {
+        this.isPeriodicReport = value === 2;
+        if (this.$refs.searchBarForm && this.$refs.searchBarForm.formInline) {
+          const formInline = this.$refs.searchBarForm.formInline;
+          formInline.reportType = ''
+          // 精准判断：只有字段存在时，才置为undefined（不存在则不处理）
+          if ('timeVal' in formInline) {
+            formInline.timeVal = undefined;
+          }
+          if ('timeValWeek' in formInline) {
+            formInline.timeValWeek = undefined;
+          }
+          if ('timeValMonth' in formInline) {
+            formInline.timeValMonth = undefined;
+          }
+          if ('timeValYear' in formInline) {
+            formInline.timeValYear = undefined;
+          }
+        }
+        // const formInline = this.$refs.searchBarForm.formInline;
+        this.listQuery.startTime = undefined
+        this.listQuery.endTime = undefined
+        console.log(this.listQuery, 'list');
         if (value === 1) {
           // 统计数据：显示时间范围，隐藏报表类型
-          this.formConfig[7].type = 'datePicker';
+          this.formConfig[7] = {
+            type: 'datePicker',
+            label: '时间范围',
+            dateType: 'datetimerange',
+            format: 'yyyy-MM-dd HH:mm:ss',
+            valueFormat: 'timestamp',
+            rangeSeparator: '-',
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
+            param: 'timeVal',
+            width: 350
+          };
           this.formConfig[6].type = '';
-          this.$refs.searchBarForm.formInline.timeVal = undefined;
+
         } else {
           // 周期性报表：显示报表类型，隐藏时间范围
           this.formConfig[6].type = 'select';
-          this.formConfig[7].type = 'datePicker';
+          this.formConfig[7] = {
+            type: 'datePicker',
+            label: '时间范围',
+            dateType: 'datetimerange',
+            format: 'yyyy-MM-dd HH:mm:ss',
+            valueFormat: 'timestamp',
+            rangeSeparator: '-',
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
+            param: 'timeVal',
+            width: 350
+          };
         }
       } else if (param === 'reportType') {
         if (this.$refs.searchBarForm && this.$refs.searchBarForm.formInline) {

src/views/core/monitoring/productAuto/index.vue

@@ -190,7 +190,154 @@ import barChart from './BarChart.vue';
 import ButtonNav from '@/components/ButtonNav';
 import { listData } from '@/api/system/dict/data';
 // 表格列配置
-const tableProps = [
+export default {
+  components: { barChart, ButtonNav, baseTableS },
+  data() {
+    return {
+      urlOptions: { getDataListURL: getLineAuto },
+      listQuery: {
+        lineId: [],
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+        timeType: 1 // 1-当天，2-自定义
+      },
+      reportTypeMap: {
+        1: '日报',
+        2: '周报',
+        3: '月报',
+        4: '年报'
+      },
+      activeLabel: 'table', // 当班数据tab
+      activeLabelDay: 'table', // 当天数据tab
+      fileName: '',
+      dataListLoading: false,
+      factoryColumns: [],
+      factoryColumnsDay: [],
+      activeName: 'product',
+      headFormValue: {},
+      tableBtn: [],
+      showData: [],
+      isPeriodicReport: false,
+      tableData: [],
+      tableData2: [], // 示例数据，实际从接口获取
+      productTableData: [],
+      productTableDataDay: [],
+      tableDataCustom: [],
+      list: [], // 折线图数据
+      timeTypeOptions: {
+        productLine: [ // 按产线监控（包含上一班）
+          { id: 1, name: '当天' },
+          { id: 2, name: '自定义' },
+          { id: 3, name: '上一班' }
+        ],
+        product: [ // 按产品监控（不含上一班）
+          { id: 1, name: '当天' },
+          { id: 2, name: '自定义' },
+          { id: 3, name: '上一班' }
+
+        ]
+      },
+      formConfig: [
+        {
+          type: 'select',
+          label: '时间维度',
+          selectOptions: [
+            { id: 1, name: '当天' },
+            { id: 2, name: '自定义' },
+            { id: 3, name: '上一班' }
+          ],
+          width: 100,
+          onchange: true,
+          // defaultSelect: 1,
+          clearable: false,
+          param: 'timeType'
+        },
+        {
+          type: '',
+          label: '查询类型',
+          selectOptions: [
+            { id: 1, name: '统计数据' },
+            { id: 2, name: '周期性汇总报表' }
+          ],
+          width: 120,
+          onchange: true,
+          param: 'searchType'
+        },
+        {
+          type: 'select',
+          label: '工厂',
+          selectOptions: [],
+          param: 'factoryId',
+          multiple: true,
+          onchange: true
+        },
+        {
+          type: 'select',
+          label: '产线',
+          selectOptions: [],
+          param: 'lineId',
+          multiple: true,
+          onchange: true
+        },
+        {
+          type: 'select',
+          label: '产品工艺',
+          selectOptions: [],
+          param: 'process',
+          multiple: true,
+          labelField: 'label',
+          valueField: 'label',
+        },
+        {
+          type: '',
+          label: '产品类型',
+          selectOptions: [
+            { id: 1, name: '面板' },
+            { id: 2, name: '背板' },
+          ],
+          multiple: true,
+          param: 'processType',
+        },
+        {
+          type: '',
+          label: '报表类型',
+          selectOptions: [
+            { id: 1, name: '日' },
+            { id: 2, name: '周' },
+            { id: 3, name: '月' },
+            { id: 4, name: '年' }
+          ],
+          width: 80,
+          onchange: true,
+          param: 'reportType'
+        },
+        {
+          type: '',
+          label: '时间范围',
+          dateType: 'datetimerange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'timestamp',
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          width: 350
+        },
+        { type: 'button', btnName: '查询', name: 'search', color: 'primary' },
+        { type: 'separate' },
+        { type: 'button', btnName: '导出', name: 'export', color: 'warning' },
+        {
+          type: 'button',
+          btnName: '重置',
+          name: 'reset',
+        },
+      ]
+    };
+  },
+  computed: {
+    tableProps() {
+      const props = [
         {
           prop: 'factoryName',
           label: '工厂',
@@ -213,6 +360,12 @@ const tableProps = [
           label: '产品工艺',
           fixed: true
         },
+        (this.isPeriodicReport ? {
+          prop: 'reportDate',
+          label: '日期',
+          fixed: true,
+          width: 120
+        } : ''),
         {
           prop: 'inputN',
           label: '投入',
@@ -359,153 +512,8 @@ const tableProps = [
           ]
         }
       ];
-
+      return props
-export default {
-  components: { barChart, ButtonNav, baseTableS },
-  data() {
-    return {
-      urlOptions: { getDataListURL: getLineAuto },
-      listQuery: {
-        lineId: [],
-        pageSize: 10,
-        pageNo: 1,
-        total: 1,
-        timeType: 1 // 1-当天，2-自定义
     },
-      reportTypeMap: {
-        1: '日报',
-        2: '周报',
-        3: '月报',
-        4: '年报'
-      },
-      activeLabel: 'table', // 当班数据tab
-      activeLabelDay: 'table', // 当天数据tab
-      fileName: '',
-      dataListLoading: false,
-      tableProps,
-      factoryColumns: [],
-      factoryColumnsDay: [],
-      activeName: 'product',
-      headFormValue: {},
-      tableBtn: [],
-      showData: [],
-      tableData: [],
-      tableData2: [], // 示例数据，实际从接口获取
-      productTableData: [],
-      productTableDataDay: [],
-      tableDataCustom: [],
-      list: [], // 折线图数据
-      timeTypeOptions: {
-        productLine: [ // 按产线监控（包含上一班）
-          { id: 1, name: '当天' },
-          { id: 2, name: '自定义' },
-          { id: 3, name: '上一班' }
-        ],
-        product: [ // 按产品监控（不含上一班）
-          { id: 1, name: '当天' },
-          { id: 2, name: '自定义' },
-          { id: 3, name: '上一班' }
-
-        ]
-      },
-      formConfig: [
-        {
-          type: 'select',
-          label: '时间维度',
-          selectOptions: [
-            { id: 1, name: '当天' },
-            { id: 2, name: '自定义' },
-            { id: 3, name: '上一班' }
-          ],
-          width: 100,
-          onchange: true,
-          // defaultSelect: 1,
-          clearable: false,
-          param: 'timeType'
-        },
-        {
-          type: '',
-          label: '查询类型',
-          selectOptions: [
-            { id: 1, name: '统计数据' },
-            { id: 2, name: '周期性汇总报表' }
-          ],
-          width: 120,
-          onchange: true,
-          param: 'searchType'
-        },
-        {
-          type: 'select',
-          label: '工厂',
-          selectOptions: [],
-          param: 'factoryId',
-          multiple: true,
-          onchange: true
-        },
-        {
-          type: 'select',
-          label: '产线',
-          selectOptions: [],
-          param: 'lineId',
-          multiple: true,
-          onchange: true
-        },
-        {
-          type: 'select',
-          label: '产品工艺',
-          selectOptions: [],
-          param: 'process',
-          multiple: true,
-          labelField: 'label',
-          valueField: 'label',
-        },
-        {
-          type: '',
-          label: '产品类型',
-          selectOptions: [
-            { id: 1, name: '面板' },
-            { id: 2, name: '背板' },
-          ],
-          multiple: true,
-          param: 'processType',
-        },
-        {
-          type: '',
-          label: '报表类型',
-          selectOptions: [
-            { id: 1, name: '日' },
-            { id: 2, name: '周' },
-            { id: 3, name: '月' },
-            { id: 4, name: '年' }
-          ],
-          width: 80,
-          onchange: true,
-          param: 'reportType'
-        },
-        {
-          type: '',
-          label: '时间范围',
-          dateType: 'datetimerange',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'timestamp',
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          width: 350
-        },
-        { type: 'button', btnName: '查询', name: 'search', color: 'primary' },
-        { type: 'separate' },
-        { type: 'button', btnName: '导出', name: 'export', color: 'warning' },
-        {
-          type: 'button',
-          btnName: '重置',
-          name: 'reset',
-        },
-      ]
-    };
-  },
-  computed: {
     productTableProps() {
       // 当班数据的完整表头（基础列 + 当班动态表头）
       const baseColumns = [
@@ -532,7 +540,13 @@ export default {
           prop: 'factoryName',
           label: '工厂',
           fixed: true
-        }
+        },
+        (this.isPeriodicReport ? {
+          prop: 'reportDate',
+          label: '日期',
+          fixed: true,
+          width: 120
+        } : ''),
       ];
       return [...baseColumns, ...this.factoryColumns];
     },
@@ -562,7 +576,13 @@ export default {
           prop: 'factoryName',
           label: '工厂',
           fixed: true
-        }
+        },
+        (this.isPeriodicReport ? {
+          prop: 'reportDate',
+          label: '日期',
+          fixed: true,
+          width: 120
+        } : ''),
       ];
       return [...baseColumns, ...this.factoryColumnsDay];
     }
@@ -787,46 +807,59 @@ export default {
       }
 
     },
-    // 导出表格
+    // 导出表格（改为async方法，支持await调用）
-    handleExport() {
+    async handleExport() {
       // 按产线监控
       if (this.activeName === 'productLine') {
         if (this.listQuery.timeType === 1) {
           // 产线-当天：导出当班 + 当天两个表格（自定义汇总文件名）
-          this.exportMultipleTables([
+          await this.exportMultipleTables([
             { ref: 'lineCurrentShiftTable', name: '产线监控_当班数据' },
             { ref: 'lineTodayTable', name: '产线监控_当天数据' }
           ], '产线监控_当班及当天数据汇总'); // 传入自定义汇总文件名
-        } else if (this.listQuery.timeType === 1) {
+        } else if (this.listQuery.timeType === 3) {
-          // 产线-当天：导出当班 + 当天两个表格（自定义汇总文件名）
+          // 修复：注释错误，原为“产线-当天”，实际是“产线-上一班”
-          this.exportMultipleTables([
+          // 产线-上一班：导出单个表格
-            { ref: 'lineCurrentShiftTable', name: '产线监控_上一班数据' },
+          await this.exportSingleTable('lineCustomTable', '产线监控_上一班时间数据');
-            { ref: 'lineTodayTable', name: '产线监控_当天数据' }
-          ], '产线监控_当班及当天数据汇总'); // 传入自定义汇总文件名
         } else {
           // 产线-自定义：导出一个表格（自定义文件名）
-          this.exportSingleTable('lineCustomTable', '产线监控_自定义时间数据');
+          await this.exportSingleTable('lineCustomTable', '产线监控_自定义时间数据');
         }
       }
       // 按产品监控
       else {
         if (this.listQuery.timeType === 1) {
           // 产品-当天：导出当班 + 当天两个表格（自定义汇总文件名）
-          this.exportMultipleTables([
+          await this.exportMultipleTables([
             { ref: 'productCurrentShiftTable', name: '产品监控_当班数据' },
-            { ref: 'productTodayTable', name: '产品监控_当天数据' }
+            { ref: 'productCurrentShiftTable', name: '产品监控_当天数据' }
           ], '产品监控_当班及当天数据汇总'); // 传入自定义汇总文件名
+        } else if (this.listQuery.timeType === 3) {
+          // 修复：注释错误，原为“产线-当天”，实际是“产品-上一班”
+          // 产品-上一班：导出单个表格
+          await this.exportSingleTable('productCustomTable', '产品监控_上一班时间数据');
         } else {
           // 产品-自定义：导出一个表格（自定义文件名）
-          this.exportSingleTable('productCustomTable', '产品监控_自定义时间数据');
+          await this.exportSingleTable('productCustomTable', '产品监控_自定义时间数据');
         }
       }
     },
 
-    // 导出单个表格（保持原有逻辑，文件名由调用方传入，已区分不同场景）
+    // 导出单个表格（改为async方法，使用await获取DOM）
-    exportSingleTable(refName, fileName) {
+    async exportSingleTable(refName, fileName) {
-      const table = this.getTableDom(refName);
+      try {
-      if (!table) return;
+        // 关键修复：使用await等待getTableDom返回DOM元素（而非Promise）
+        const table = await this.getTableDom(refName);
+        if (!table) {
+          this.$message.warning(`无法导出：${refName}表格DOM获取失败`);
+          return;
+        }
+
+        // 确认table是原生DOM元素后再调用cloneNode
+        if (!(table instanceof HTMLElement)) {
+          this.$message.error(`无法导出：${refName}表格不是合法的DOM元素`);
+          return;
+        }
 
         const clonedTable = table.cloneNode(true);
         this.adjustTableForExport(clonedTable);
@@ -834,16 +867,31 @@ export default {
         const workbook = XLSX.utils.table_to_book(clonedTable);
         const fullName = `${fileName}_${this.formatDate()}.xlsx`;
         XLSX.writeFile(workbook, fullName);
+      } catch (error) {
+        this.$message.error(`导出表格失败：${error.message}`);
+        console.error('单个表格导出错误：', error);
+      }
     },
 
-    // 导出多个表格（新增自定义汇总文件名参数，适配不同选项卡）
+    // 导出多个表格（改为async方法，使用await获取DOM）
-    exportMultipleTables(tables, customSummaryName) {
+    async exportMultipleTables(tables, customSummaryName) {
+      try {
         const workbook = XLSX.utils.book_new();
         let hasValidTable = false;
 
-      tables.forEach(({ ref, name }) => {
+        // 遍历表格配置，使用await获取每个表格的DOM
-        const table = this.getTableDom(ref);
+        for (const { ref, name } of tables) { // 改用for...of循环，支持await
-        if (!table) return;
+          const table = await this.getTableDom(ref);
+          if (!table) {
+            this.$message.warning(`${ref}表格DOM获取失败，跳过该表格`);
+            continue;
+          }
+
+          // 确认table是原生DOM元素
+          if (!(table instanceof HTMLElement)) {
+            this.$message.warning(`${ref}表格不是合法的DOM元素，跳过该表格`);
+            continue;
+          }
 
           hasValidTable = true;
           const clonedTable = table.cloneNode(true);
@@ -851,33 +899,67 @@ export default {
 
           const worksheet = XLSX.utils.table_to_sheet(clonedTable);
           XLSX.utils.book_append_sheet(workbook, worksheet, name);
-      });
+        }
 
         if (!hasValidTable) {
-        this.$message.warning('未找到有效表格数据');
+          this.$message.warning('未找到有效表格数据，导出失败');
           return;
         }
 
         // 动态生成汇总文件名：自定义名称 + 日期
         const fullName = `${customSummaryName}_${this.formatDate()}.xlsx`;
         XLSX.writeFile(workbook, fullName);
-    },
+      } catch (error) {
-    // 辅助方法：获取表格DOM元素（包含表头）
+        this.$message.error(`导出多个表格失败：${error.message}`);
-    getTableDom(refName) {
+        console.error('多个表格导出错误：', error);
-      const tableComponent = this.$refs[refName];
-      if (!tableComponent) {
-        this.$message.warning(`未找到${refName}表格`);
-        return null;
       }
-      // 获取完整表格容器（包含表头和表体）
-      const tableContainer = tableComponent.$el.querySelector('.el-table');
-      if (!tableContainer) {
-        this.$message.warning(`${refName}表格数据为空`);
-        return null;
-      }
-      return tableContainer;
     },
 
+    /**
+     * 获取表格DOM元素（支持异步重试）
+     * @param {string} refName - 表格的ref名称
+     * @param {number} retryCount - 当前重试次数（内部使用，外部调用无需传参）
+     * @returns {Promise<HTMLElement|null>} 表格DOM元素Promise
+     */
+    async getTableDom(refName, retryCount = 0) {
+      // 1. 配置常量，便于维护
+      const maxRetry = 5; // 最大重试次数
+      const retryDelay = 300; // 每次重试延迟时间(ms)
+
+      // 2. 设置激活标签，确保重试时也能执行该逻辑
+      this.activeLabel = 'table';
+      this.activeLabelDay = 'table';
+      // 若需调试，可保留日志
+      // console.log(`[getTableDom-${refName}] activeLabel:`, this.activeLabel, 'activeLabelDay:', this.activeLabelDay);
+
+      // 3. 获取表格组件
+      const tableComponent = this.$refs[refName];
+
+      // 4. 表格组件不存在时，处理重试逻辑
+      if (!tableComponent) {
+        // 达到最大重试次数，返回失败
+        if (retryCount >= maxRetry) {
+          this.$message.warning(`未找到${refName}表格，已达到最大重试次数（${maxRetry}次）`);
+          return null;
+        }
+
+        // 未达到最大重试次数，延迟后重试
+        this.$message.warning(`未找到${refName}表格，将进行第${retryCount + 1}次重试...`);
+        await new Promise(resolve => setTimeout(resolve, retryDelay));
+        // 递归调用并返回结果
+        return this.getTableDom(refName, retryCount + 1);
+      }
+
+      // 5. 获取完整表格容器（包含表头和表体）
+      const tableContainer = tableComponent.$el.querySelector('.el-table');
+      if (!tableContainer) {
+        this.$message.warning(`${refName}表格容器不存在（可能表格数据为空）`);
+        return null;
+      }
+
+      // 6. 成功获取表格DOM，返回结果
+      return tableContainer;
+    },
     // 重点修复：调整表格结构（解决表头重复问题）
     adjustTableForExport(tableContainer) {
       // 1. 移除空表格提示和分页等无关元素
@@ -939,7 +1021,7 @@ export default {
       if (mainTable && allHeaderRows.length > 0) {
         const newThead = document.createElement('thead');
         // 按层级添加表头行
-        allHeaderRows.forEach(cells => {
+        allHeaderRows.forEach((cells, rowIndex) => {
           const newTr = document.createElement('tr');
           cells.forEach(cell => {
             // 复制单元格（避免DOM残留引用问题）
@@ -950,6 +1032,18 @@ export default {
         });
         // 将新表头插入主表体最前面
         mainTable.insertBefore(newThead, mainTable.firstChild);
+
+        // ================ 新增：修改第一列表头为“序号” ================
+        // 找到第一层级的第一个表头单元格（<th>）
+        const firstHeaderCell = newThead.querySelector('tr:first-child th:first-child');
+        if (firstHeaderCell) {
+          // 清空原有内容，设置为“序号”
+          firstHeaderCell.innerHTML = ''; // 清空原有内容（包括子元素）
+          firstHeaderCell.textContent = '序号'; // 设置纯文本“序号”（更稳定）
+          // 可选：添加样式（如居中，根据需求调整）
+          // firstHeaderCell.style.textAlign = 'center';
+        }
+        // =============================================================
       }
 
       // 7. 合并固定列数据到主表体（仅处理tbody数据）
@@ -980,6 +1074,23 @@ export default {
           }
         });
       }
+
+      // ================ 可选优化：为tbody第一列添加序号数字 ================
+      // 如果表格体的第一列原本无数据，可补充1、2、3...的序号
+      if (mainTable) {
+        const tbodyRows = mainTable.querySelectorAll('tbody tr');
+        tbodyRows.forEach((row, index) => {
+          const firstTd = row.querySelector('td:first-child');
+          if (firstTd) {
+            // 清空原有内容，设置为序号（index+1，因为索引从0开始）
+            firstTd.innerHTML = '';
+            firstTd.textContent = index + 1;
+            // 可选：居中显示
+            // firstTd.style.textAlign = 'center';
+          }
+        });
+      }
+      // =============================================================
     },
 
     // 辅助方法：格式化日期（用于文件名）
@@ -1003,7 +1114,45 @@ export default {
         this.formConfig[2].selectOptions = res.data.list || [];
       });
     },
+    getWeekTimeRange(date) {
+      const targetDate = new Date(date);
+      const day = targetDate.getDay() || 7; // 周日转为7
+      const year = targetDate.getFullYear();
+      const month = targetDate.getMonth();
+      const dateNum = targetDate.getDate();
 
+      // 本周一 00:00:00
+      const startDate = new Date(year, month, dateNum - day + 1);
+      startDate.setHours(0, 0, 0, 0);
+
+      // 本周日 23:59:59
+      const endDate = new Date(year, month, dateNum - day + 7);
+      endDate.setHours(23, 59, 59, 999);
+
+      return {
+        startTime: startDate.getTime(),
+        endTime: endDate.getTime()
+      };
+    },
+
+    // 辅助函数：获取本年的开始和结束时间戳（1月1日00:00:00 到 12月31日23:59:59）
+    getYearTimeRange(date) {
+      const targetDate = new Date(date);
+      const year = targetDate.getFullYear();
+
+      // 本年1月1日 00:00:00
+      const startDate = new Date(year, 0, 1);
+      startDate.setHours(0, 0, 0, 0);
+
+      // 本年12月31日 23:59:59
+      const endDate = new Date(year, 11, 31);
+      endDate.setHours(23, 59, 59, 999);
+
+      return {
+        startTime: startDate.getTime(),
+        endTime: endDate.getTime()
+      };
+    },
     // 搜索/导出按钮点击
     buttonClick(val) {
       this.headFormValue = val
@@ -1498,6 +1647,7 @@ export default {
     handleSearchBarChanged({ param, value }) {
       console.log(value, param);
       if (param === 'timeType') {
+        this.isPeriodicReport = false
         this.tableData = []
         this.tableDataCustom = []
         this.tableData2 = []
@@ -1566,15 +1716,60 @@ export default {
           this.formConfig[7].type = '';
         }
       } else if (param === 'searchType') {
+        this.isPeriodicReport = value === 2;
+        console.log('this.isPeriodicReport ', this.isPeriodicReport);
+        if (this.$refs.searchBarForm && this.$refs.searchBarForm.formInline) {
+          const formInline = this.$refs.searchBarForm.formInline;
+          formInline.reportType = ''
+          // 精准判断：只有字段存在时，才置为undefined（不存在则不处理）
+          if ('timeVal' in formInline) {
+            formInline.timeVal = undefined;
+          }
+          if ('timeValWeek' in formInline) {
+            formInline.timeValWeek = undefined;
+          }
+          if ('timeValMonth' in formInline) {
+            formInline.timeValMonth = undefined;
+          }
+          if ('timeValYear' in formInline) {
+            formInline.timeValYear = undefined;
+          }
+        }
+        // const formInline = this.$refs.searchBarForm.formInline;
+        this.listQuery.startTime = undefined
+        this.listQuery.endTime = undefined
+        console.log(this.listQuery, 'list');
         if (value === 1) {
           // 统计数据：显示时间范围，隐藏报表类型
-          this.formConfig[7].type = 'datePicker';
+          this.formConfig[7] = {
+            type: 'datePicker',
+            label: '时间范围',
+            dateType: 'datetimerange',
+            format: 'yyyy-MM-dd HH:mm:ss',
+            valueFormat: 'timestamp',
+            rangeSeparator: '-',
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
+            param: 'timeVal',
+            width: 350
+          };
           this.formConfig[6].type = '';
-          this.$refs.searchBarForm.formInline.timeVal = undefined;
+
         } else {
           // 周期性报表：显示报表类型，隐藏时间范围
           this.formConfig[6].type = 'select';
-          this.formConfig[7].type = 'datePicker';
+          this.formConfig[7] = {
+            type: 'datePicker',
+            label: '时间范围',
+            dateType: 'datetimerange',
+            format: 'yyyy-MM-dd HH:mm:ss',
+            valueFormat: 'timestamp',
+            rangeSeparator: '-',
+            startPlaceholder: '开始时间',
+            endPlaceholder: '结束时间',
+            param: 'timeVal',
+            width: 350
+          };
         }
       } else if (param === 'reportType') {
         if (this.$refs.searchBarForm && this.$refs.searchBarForm.formInline) {