diff --git a/pages.json b/pages.json
index a9290f3..f8b6a3c 100644
--- a/pages.json
+++ b/pages.json
@@ -176,6 +176,15 @@
 				// "navigationBarTextStyle": "white"
 			}
 		},
+		{
+			"path": "pages/views/shengchan/ribaoshuju/rbsjLsxq",
+			"style": {
+				// "navigationStyle": "custom"
+				"navigationBarTitleText": "历史详情",
+				"enablePullDownRefresh": false,
+				"navigationBarTextStyle": "white"
+			}
+		},
 		{
 			"path": "pages/userlist/index",
 			"style": {
diff --git a/pages/product/NatrueGas/index.vue b/pages/product/NatrueGas/index.vue
deleted file mode 100644
index c3d2a27..0000000
--- a/pages/product/NatrueGas/index.vue
+++ /dev/null
@@ -1,444 +0,0 @@
-<template>
-	<view :class="{ gray: store.isgray == 1 }">
-		<view class="wrapper f-col aic">
-			<view class="onduty">
-				<view class="title f-row aic jcb"><uni-title :title="strDate + '：生产数据'" type="h3" color="red" /></view>
-				<view class="info">
-					<!-- <uni-title :title="'天然气'" type="h3" color="blue" /> -->
-					<view v-for="(row, rowIndex) in groupedData" :key="rowIndex" class="data-row">
-						<uni-row>
-							<uni-col v-for="(item, colIndex) in row" :key="colIndex" :span="7">
-								<text style="color: black; font-size: 32; font-weight: bold">{{ item.gas }}</text>
-								<view class="value-group">
-									<text style="color: gray; font-size: 24">当日量:</text>
-									<text style="color: blue; font-size: 28; font-weight: bold">{{ item.dailyVolume }}</text>
-									<text style="color: gray; font-size: 24">年累计:</text>
-									<text style="color: blue; font-size: 28; font-weight: bold">{{ item.yearVolume }}</text>
-								</view>
-							</uni-col>
-						</uni-row>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-import { ref, onMounted, computed, nextTick } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
-import { queryJinriShengchansj, queryYearShengchansj } from '@/api/shengchan.js';
-import { formatDate, getDateAfterDays } from '@/utils/dateTime.js';
-import { beforeJump } from '@/utils/index.js';
-import { useStore } from '@/store';
-const store = useStore();
-import dataCom from '@/bpm/dataCom.vue';
-
-const shishiArr = ref([
-	{
-		gas: '气井气',
-		dailyVolume: '',
-		yearVolume: ''
-	},
-	{
-		gas: '伴生气',
-		dailyVolume: '',
-		yearVolume: ''
-	},
-	{
-		gas: '外部气',
-		dailyVolume: '',
-		yearVolume: ''
-	},
-	{
-		gas: '站输差',
-		dailyVolume: '',
-		yearVolume: ''
-	},
-	{
-		gas: '线输差',
-		dailyVolume: '',
-		yearVolume: ''
-	},
-	{
-		gas: '综合输差',
-		dailyVolume: '',
-		yearVolume: ''
-	}
-]);
-
-onMounted(() => {
-	getJinriShengchansj();
-	getYearShengchansj();
-});
-
-const strDate = ref('');
-
-const dataJinri = ref([]);
-const dataJinriSum = ref([]);
-const dataJinriSumUnit = ref([]);
-
-// 计算属性自动分组
-const groupedData = computed(() => {
-	const groups = [];
-	for (let i = 0; i < shishiArr.value.length; i += 3) {
-		groups.push(shishiArr.value.slice(i, i + 3));
-	}
-	return groups;
-});
-const getJinriShengchansj = () => {
-	const now = new Date();
-	if (now.getHours() < 11) {
-		strDate.value = formatDate(getDateAfterDays(now, -1)).toString(); //11点之前  头一天的数据
-	} else {
-		strDate.value = formatDate(now).toString();
-	}
-	let queryParms = {};
-	dataJinri.value = [];
-	dataJinriSum.value = [];
-	dataJinriSumUnit.value = [];
-	queryParms.rqDate = strDate.value;
-	queryParms.pageSize = 100;
-	console.log(queryParms);
-	queryJinriShengchansj(queryParms).then((res) => {
-		if (res.success) {
-			console.log(res);
-			dataJinri.value = res.result.records;
-			dataJinriSumUnit.value = sumByUnit(dataJinri.value); //包含gas  unit  rq  cq  totalGas
-			console.log(dataJinriSumUnit.value);
-			// 使用 nextTick 等待 DOM 更新
-			nextTick();
-			getYearShengchansj(); //再获取今年以来的数据
-		}
-	});
-};
-const getYearShengchansj = () => {
-	const now = new Date();
-	let year = formatDate(now).split('-')[0];
-	let queryParms = {};
-	queryParms.yearStart = year;
-	queryParms.yearEnd = year;
-
-	// console.log(2, queryParms.value);
-	queryYearShengchansj(queryParms).then((res) => {
-		if (res.success) {
-			try {
-				// console.log(res.result);
-				let yearData = res.result[year];
-				console.log(dataJinriSumUnit.value.length, dataJinriSumUnit.value, yearData.length, yearData);
-				dataJinriSumUnit.value.forEach((item) => {
-					yearData.forEach((itemYear) => {
-						// console.log(item, itemYear);
-						if (item.unit === itemYear.unit) {
-							item.yearVolume = itemYear.yearSum || 0;
-						}
-					});
-				});
-				dataJinriSum.value = sumByGas(dataJinriSumUnit.value);
-				console.log(dataJinriSum.value);
-				shishiArr.value.forEach((item) => {
-					dataJinriSum.value.forEach((itemjinri) => {
-						if (item.gas === itemjinri.gas) {
-							// if (item.gas.includes('线')) {
-							// 	item.dailyVolume = itemjinri.totalGas.toFixed(4);
-							// } else {
-							item.dailyVolume = itemjinri.rq.toFixed(4);
-							item.yearVolume = itemjinri.yearVolume.toFixed(4);
-							// }
-						}
-					});
-				});
-			} catch (error) {
-				console.log(error);
-			}
-		}
-	});
-};
-
-function sumByGas(records) {
-	console.log(records);
-	const summaryMap = {};
-	try {
-		records.forEach((record) => {
-			const gas = record.gas;
-			if (!summaryMap[gas]) {
-				// 初始化该 gas 类型的汇总对象
-				summaryMap[gas] = {
-					gas: gas,
-					rq: 0,
-					sq: 0,
-					totalGas: 0,
-					yearVolume: 0
-				};
-			}
-			// 无论是否是第一次遇到该 gas 类型，都进行累加操作
-			summaryMap[gas].rq += record.rq || 0;
-			summaryMap[gas].sq += record.sq || 0;
-			summaryMap[gas].totalGas += record.totalGas || 0;
-			summaryMap[gas].yearVolume += record.yearVolume || 0;
-		});
-		return Object.values(summaryMap);
-	} catch (error) {
-		//TODO handle the exception
-		console.log(error);
-	}
-}
-
-function sumByUnit(records) {
-	console.log(records);
-	const summaryMap = {};
-	try {
-		records.forEach((record) => {
-			const unit = record.unit;
-			if (!summaryMap[unit]) {
-				// 初始化该 gas 类型的汇总对象
-				summaryMap[unit] = {
-					unit: unit,
-					gas: record.gas,
-					rq: 0,
-					sq: 0,
-					totalGas: 0,
-					yearVolume: 0
-				};
-			}
-			// 无论是否是第一次遇到该 unit 类型，都进行累加操作
-			summaryMap[unit].rq += record.rq || 0;
-			summaryMap[unit].sq += record.sq || 0;
-			summaryMap[unit].totalGas += record.totalGas || 0;
-			summaryMap[unit].yearVolume += record.yearVolume || 0;
-		});
-		return Object.values(summaryMap);
-	} catch (error) {
-		//TODO handle the exception
-		console.log(error);
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-// .container {
-// 	padding: 20rpx;
-// 	background-color: #f8f8f8;
-// 	min-height: 100vh;
-// }
-
-.content {
-	padding: 0 30rpx 20rpx 30rpx;
-}
-
-.card-content {
-	padding-right: 5px;
-}
-
-.data-row {
-	margin-bottom: 10rpx;
-}
-
-.value-group {
-	background-color: aliceblue;
-	display: flex;
-	flex-direction: column;
-	border-color: #ff00ff;
-	gap: 5px;
-}
-.uni-col {
-	margin-right: 10px;
-	background-color: #f8f8f8;
-	border-radius: 15rpx;
-}
-.wrapper {
-	padding: 0 30rpx;
-	// transform: translateY(-50rpx);
-
-	.onduty {
-		background: #ffffff;
-		box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.5);
-		border-radius: 16rpx;
-		padding: 20rpx 24rpx 24rpx 24rpx;
-
-		.title {
-			font-size: 32rpx;
-			color: #333333;
-			background-size: 44rpx 12rpx;
-			background-repeat: no-repeat;
-			background-position: left bottom;
-		}
-
-		.info {
-			background: #f8f8f8;
-			border-radius: 8rpx;
-			text-align: left;
-			width: 642rpx;
-			margin-top: 23rpx;
-
-			.info_title {
-				font-size: 24rpx;
-				color: #333333;
-				padding: 24rpx 0;
-				border-bottom: 1px solid #efefef;
-
-				view {
-					flex: 1;
-				}
-			}
-
-			.data_box {
-				font-size: 24rpx;
-				padding-bottom: 24rpx;
-				color: #888888;
-
-				.first {
-					font-weight: bold;
-					color: #333333;
-				}
-
-				.data {
-					margin-top: 23rpx;
-
-					view {
-						flex: 1;
-					}
-				}
-			}
-		}
-	}
-
-	.more {
-		font-size: 24rpx;
-		color: #999999;
-		text-align: right;
-
-		image {
-			width: 10rpx;
-			height: 18rpx;
-		}
-	}
-
-	.list_wrapper {
-		background: #ffffff;
-		box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.5);
-		border-radius: 16rpx;
-		padding: 26rpx 24rpx 24rpx 24rpx;
-		position: relative;
-		margin-top: 30rpx;
-		width: 642rpx;
-
-		&::after {
-			position: absolute;
-			top: 100rpx;
-			left: 0;
-			content: ' ';
-			width: 100%;
-			height: 1px;
-			background-color: #efefef;
-		}
-
-		.zhidu {
-			font-size: 24rpx;
-			color: #666666;
-			justify-content: flex-end;
-			padding-top: 40rpx;
-
-			view {
-				width: 120rpx;
-				height: 60rpx;
-				line-height: 60rpx;
-				text-align: center;
-
-				&:first-child {
-					margin-right: 40rpx;
-				}
-			}
-
-			.active {
-				position: relative;
-				color: #3179d6;
-
-				&::after {
-					content: ' ';
-					width: 120rpx;
-					height: 60rpx;
-					border-radius: 60rpx;
-					left: 50%;
-					top: 50%;
-					transform: translate(-50%, -50%);
-					position: absolute;
-					background-color: rgba(49, 121, 214, 0.1);
-				}
-			}
-		}
-
-		.list_title {
-			text-align: center;
-			padding-bottom: 29rpx;
-			font-size: 32rpx;
-			color: #666666;
-
-			.active {
-				position: relative;
-				color: #3179d6;
-
-				&::after {
-					content: ' ';
-					width: 120rpx;
-					height: 70rpx;
-					border-radius: 70rpx;
-					left: 50%;
-					top: 50%;
-					transform: translate(-50%, -50%);
-					position: absolute;
-					background-color: rgba(49, 121, 214, 0.1);
-				}
-			}
-		}
-
-		.list_box {
-			margin-top: 24rpx;
-
-			.list {
-				margin-bottom: 24rpx;
-				padding: 30rpx 30rpx 35rpx 30rpx;
-				// width: 570rpx;
-				background: #f8f8f8;
-				border-radius: 8rpx;
-
-				.topic {
-					font-size: 28rpx;
-					color: #333333;
-				}
-
-				.time_Box {
-					font-size: 24rpx;
-					color: #888888;
-					margin-top: 20rpx;
-
-					.time {
-						margin-right: 62rpx;
-					}
-
-					.look {
-						position: relative;
-
-						&::before {
-							position: absolute;
-							left: -30rpx;
-							top: 50%;
-							transform: translateY(-50%);
-							content: ' ';
-							width: 2rpx;
-							height: 20rpx;
-							background: #999999;
-						}
-					}
-
-					image {
-						width: 28rpx;
-						height: 22rpx;
-						margin-right: 8rpx;
-					}
-				}
-			}
-		}
-	}
-}
-</style>
diff --git a/pages/product/index.vue b/pages/product/index.vue
deleted file mode 100644
index 2526a18..0000000
--- a/pages/product/index.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-	<view>
-		<view class="nav">生产经营数据</view>
-		<view class="placeholder"></view>
-		<ng-data></ng-data>
-	</view>
-</template>
-
-<script setup>
-const res = wx.getSystemInfoSync();
-const statusHeight = res.statusBarHeight; //状态栏高度
-const cusnavbarheight = statusHeight + 44 + 'px';
-import ngData from './NatrueGas/index.vue';
-</script>
-
-<style lang="scss" scoped>
-.nav {
-	width: calc(100% - 60rpx);
-	padding: 0 30rpx;
-	height: v-bind(cusnavbarheight);
-
-	font-size: 24rpx;
-	color: #ffffff;
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: 99;
-	background-image: url('../../static/my/navbg.png');
-	background-repeat: no-repeat;
-	background-size: 750rpx 458rpx;
-}
-.placeholder {
-	height: v-bind(cusnavbarheight);
-}
-</style>
diff --git a/pages/views/renliziyuan/renyuanxinxi/tongji.vue b/pages/views/renliziyuan/renyuanxinxi/tongji.vue
index d16d0d2..5b20670 100644
--- a/pages/views/renliziyuan/renyuanxinxi/tongji.vue
+++ b/pages/views/renliziyuan/renyuanxinxi/tongji.vue
@@ -6,8 +6,7 @@
 			</uni-row>
 			<uni-row style="margin-bottom: 20rpx; margin-left: 30rpx; margin-right: 30rpx">
 				<uni-col :span="24">
-					<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode"
-						@change="departChange"></trq-depart-select>
+					<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
 				</uni-col>
 			</uni-row>
 			<!-- 概览统计 -->
@@ -72,7 +71,7 @@
 					</uni-col>
 					<uni-col :span="6">
 						<view class="dataStyle">
-							<span @click="detail(item)" style="color: red;">详情</span>
+							<span @click="detail(item)" style="color: red">详情</span>
 							<!-- <button size="mini" type="primary" @click="detail(item)">详情</button> -->
 						</view>
 					</uni-col>
@@ -83,295 +82,290 @@
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive,
-		onMounted
-	} from 'vue';
-	import * as echarts from 'echarts';
+import { ref, reactive, onMounted } from 'vue';
+import * as echarts from 'echarts';
 
-	import {
-		queryRenyuanByDepartID
-	} from '@/api/renyuan.js';
+import { queryRenyuanByDepartID } from '@/api/renyuan.js';
 
-	// 存储下方组件的高度
-	const bottomHeight = ref(0);
-	// 新增加载状态
-	const isLoading = ref(false);
-	const orgCode = ref('');
-	const rawData = ref([]);
-	const tableData = ref([]);
-	const summary = reactive({
-		total: 0,
-		avgAge: 0
+// 存储下方组件的高度
+const bottomHeight = ref(0);
+// 新增加载状态
+const isLoading = ref(false);
+const orgCode = ref('');
+const rawData = ref([]);
+const tableData = ref([]);
+const summary = reactive({
+	total: 0,
+	avgAge: 0
+});
+const chart = ref(null);
+const chartOption = ref({});
+const drillPopup = ref(null);
+const drillList = ref([]);
+const drillTitle = ref('');
+
+function detail(record) {
+	// console.log(record)
+	uni.navigateTo({
+		url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
 	});
-	const chart = ref(null);
-	const chartOption = ref({});
-	const drillPopup = ref(null);
-	const drillList = ref([]);
-	const drillTitle = ref('');
-
-	function detail(record) {
-		// console.log(record)
-		uni.navigateTo({
-			url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
-		});
+}
+// 计算年龄
+const calculateAge = (birthDate) => {
+	const today = new Date();
+	const birth = new Date(birthDate);
+	let age = today.getFullYear() - birth.getFullYear();
+	const monthDiff = today.getMonth() - birth.getMonth();
+	if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birth.getDate())) {
+		age--;
 	}
-	// 计算年龄initChart
-	const calculateAge = (birthDate) => {
-		const today = new Date();
-		const birth = new Date(birthDate);
-		let age = today.getFullYear() - birth.getFullYear();
-		const monthDiff = today.getMonth() - birth.getMonth();
-		if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birth.getDate())) {
-			age--;
-		}
-		return age;
-	};
-	// 加载数据
-	const departChange = async (e, data) => {
-		tableData.value = [];
-		console.log(e);
-		orgCode.value = e;
-		try {
-			// 显示加载状态
+	return age;
+};
+// 加载数据
+const departChange = async (e, data) => {
+	tableData.value = [];
+	console.log(e);
+	orgCode.value = e;
+	try {
+		// 显示加载状态
 
-			isLoading.value = true;
-			if (orgCode.value.length <= 6) {
-				console.log(123242353);
-				uni.showToast({
-					title: '全厂数据较多，请选 下一层级...',
-					icon: 'none',
-					duration: 1000
-				});
-				isLoading.value = false;
-				return;
-			} else {
-				uni.showLoading({
-					title: '数据加载中...',
-					mask: true
-				});
-			}
-
-			let params = {
-				pageSize: 3000,
-				fields: ['xm', 'nl', 'xb', 'xb_dictText', 'orgCode', 'jcdw', 'jcxd', 'jcxdCode']
-			};
-			if (orgCode.value.length <= 9) {
-				params.orgCode = orgCode.value;
-			} else {
-				params.jcxd_code = orgCode.value;
-			}
-			queryRenyuanByDepartID(params)
-				.then((res) => {
-					if (res.success) {
-						processData(res.result.records);
-
-						// 隐藏加载状态
-						isLoading.value = false;
-						uni.hideLoading();
-					}
-				})
-				.catch((err) => {
-					console.log(err);
-					uni.showToast({
-						title: '数据加载失败',
-						icon: 'none',
-						duration: 1000
-					});
-				});
-		} catch (error) {
-			console.log(error);
+		isLoading.value = true;
+		if (orgCode.value.length <= 6) {
+			console.log(123242353);
 			uni.showToast({
-				title: '数据加载失败',
+				title: '全厂数据较多，请选 下一层级...',
 				icon: 'none',
 				duration: 1000
 			});
-		} finally {
-			// 隐藏加载状态
 			isLoading.value = false;
-			uni.hideLoading();
+			return;
+		} else {
+			uni.showLoading({
+				title: '数据加载中...',
+				mask: true
+			});
 		}
-	};
 
-	// 数据处理
-	const processData = (data) => {
-		// 添加年龄字段并过滤有效数据
-		const validData = data
-			.map((item) => ({
-				...item,
-				nl: calculateAge(item.cssj)
-			}))
-			.filter((item) => item.nl >= 21 && item.nl <= 64);
-		// 计算概览数据
-		summary.total = validData.length;
-		summary.avgAge = validData.reduce((sum, cur) => sum + cur.nl, 0) / summary.total || 0;
-		// 生成表格数据
-		// tableData.value = validData;
+		let params = {
+			pageSize: 3000,
+			fields: ['xm', 'nl', 'xb', 'xb_dictText', 'orgCode', 'jcdw', 'jcxd', 'jcxdCode']
+		};
+		if (orgCode.value.length <= 9) {
+			params.orgCode = orgCode.value;
+		} else {
+			params.jcxd_code = orgCode.value;
+		}
+		queryRenyuanByDepartID(params)
+			.then((res) => {
+				if (res.success) {
+					processData(res.result.records);
 
-		groupsData(validData);
-		// 生成图表数据
-		generateChartData(validData);
-	};
-
-	// 计算统计信息...
-	const subOrgStaffs = ref({}); // 按下级单位存储所有人员
-	const ageGroupStaffs = ref({}); // 按年龄段存储所有人员
-
-	const groupsData = (data) => {
-		// 清空旧数据
-		subOrgStaffs.value = {};
-		ageGroupStaffs.value = {};
-		data.reduce((acc, cur) => {
-			// console.log(cur)
-			let subOrg = '';
-			let ageRange = getAgeRange(cur.nl);
-			// console.log(cur.orgCode, cur.jcxdCode)
-			if (cur.orgCode <= 6) {
-				subOrg = cur.orgCode;
-			} else {
-				subOrg = cur.jcxdCode;
-			}
-
-			// 存储到subOrgStaffs
-			if (!subOrgStaffs.value[subOrg]) {
-				subOrgStaffs.value[subOrg] = [];
-			}
-			subOrgStaffs.value[subOrg].push(cur);
-
-			// 存储到ageGroupStaffs
-			if (!ageGroupStaffs.value[ageRange]) {
-				ageGroupStaffs.value[ageRange] = [];
-			}
-			ageGroupStaffs.value[ageRange].push(cur);
+					// 隐藏加载状态
+					isLoading.value = false;
+					uni.hideLoading();
+				}
+			})
+			.catch((err) => {
+				console.log(err);
+				uni.showToast({
+					title: '数据加载失败',
+					icon: 'none',
+					duration: 1000
+				});
+			});
+	} catch (error) {
+		console.log(error);
+		uni.showToast({
+			title: '数据加载失败',
+			icon: 'none',
+			duration: 1000
 		});
-	};
+	} finally {
+		// 隐藏加载状态
+		isLoading.value = false;
+		uni.hideLoading();
+	}
+};
 
-	// 新增年龄范围计算方法
-	const getAgeRange = (age) => {
-		const ranges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
-		const index = Math.floor((age - 21) / 10);
-		return ranges[index] || '其他';
-	};
+// 数据处理
+const processData = (data) => {
+	// 添加年龄字段并过滤有效数据
+	const validData = data
+		.map((item) => ({
+			...item,
+			nl: calculateAge(item.cssj)
+		}))
+		.filter((item) => item.nl >= 21 && item.nl <= 64);
+	// 计算概览数据
+	summary.total = validData.length;
+	summary.avgAge = validData.reduce((sum, cur) => sum + cur.nl, 0) / summary.total || 0;
+	// 生成表格数据
+	// tableData.value = validData;
 
-	// 修改后的显示人员列表方法
-	const showStaffList = (subOrg, ageRange) => {
-		// 从结构化数据中直接获取
-		const targetStaffs = subOrgStaffs.value[subOrg].filter((staff) => getAgeRange(staff.nl) === ageRange);
+	groupsData(validData);
+	// 生成图表数据
+	generateChartData(validData);
+};
 
-		staffList.value = targetStaffs;
-		popupTitle.value = `${subOrg} ${ageRange}人员列表（共${targetStaffs.length}人）`;
-		popup.value.open();
-	};
+// 计算统计信息...
+const subOrgStaffs = ref({}); // 按下级单位存储所有人员
+const ageGroupStaffs = ref({}); // 按年龄段存储所有人员
 
-	// 新增获取指定单位人员的方法
-	const getSubOrgStaffs = (subOrgCode) => {
-		return subOrgStaffs.value[subOrgCode] || [];
-	};
+const groupsData = (data) => {
+	// 清空旧数据
+	subOrgStaffs.value = {};
+	ageGroupStaffs.value = {};
+	data.reduce((acc, cur) => {
+		// console.log(cur)
+		let subOrg = '';
+		let ageRange = getAgeRange(cur.nl);
+		// console.log(cur.orgCode, cur.jcxdCode)
+		if (cur.orgCode <= 6) {
+			subOrg = cur.orgCode;
+		} else {
+			subOrg = cur.jcxdCode;
+		}
 
-	// 新增获取指定年龄段人员的方法
-	const getAgeGroupStaffs = (ageRange) => {
-		return ageGroupStaffs.value[ageRange] || [];
-	};
+		// 存储到subOrgStaffs
+		if (!subOrgStaffs.value[subOrg]) {
+			subOrgStaffs.value[subOrg] = [];
+		}
+		subOrgStaffs.value[subOrg].push(cur);
 
-	// 生成图表数据（修改部分）
-	const generateChartData = (data) => {
-		// 按基层单位分组
-		const ageRanges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
-		const jcdwGroups = data.reduce((acc, cur) => {
-			if (!acc[cur.jcdw]) {
-				acc[cur.jcdw] = {
-					ageGroups: [0, 0, 0, 0, 0] // 21-30,31-40,41-50,51-60,61-64
-				};
-			}
-			const ageGroup = Math.floor((cur.nl - 21) / 10);
-			// console.log(ageGroup, cur.jcdw)
-			if (ageGroup >= 0 && ageGroup <= 4) {
-				acc[cur.jcdw].ageGroups[ageGroup]++;
-			}
-			return acc;
-		}, {});
+		// 存储到ageGroupStaffs
+		if (!ageGroupStaffs.value[ageRange]) {
+			ageGroupStaffs.value[ageRange] = [];
+		}
+		ageGroupStaffs.value[ageRange].push(cur);
+	});
+};
 
-		// 生成分组柱状图配置
-		const xData = Object.keys(jcdwGroups);
+// 新增年龄范围计算方法
+const getAgeRange = (age) => {
+	const ranges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
+	const index = Math.floor((age - 21) / 10);
+	return ranges[index] || '其他';
+};
 
-		const seriesData = ageRanges.map((range, index) => ({
-			name: range,
-			type: 'bar',
-			data: xData.map((jcdw) => jcdwGroups[jcdw].ageGroups[index] || 0),
-			itemStyle: {
-				color: ['#5470C6', '#91CC75', '#FAC858', '#EE6666', '#73C0DE'][index]
-			},
-			// 显示数值标签
-			label: {
-				show: true,
-				position: 'top'
-			}
-			// 设置柱宽为 20 像素
-			// barWidth: 20
-		}));
-		chartOption.value = {
-			title: {
-				text: '人员年龄分组统计',
-				padding: [0, 0, 0, 30]
-			},
-			toolbox: {
-				padding: [0, 30, 0, 0],
-				show: true,
-				feature: {
-					//工具配置项
+// 修改后的显示人员列表方法
+const showStaffList = (subOrg, ageRange) => {
+	// 从结构化数据中直接获取
+	const targetStaffs = subOrgStaffs.value[subOrg].filter((staff) => getAgeRange(staff.nl) === ageRange);
 
-					restore: {
-						show: true //是否显示该工具
-					},
-					saveAsImage: {
-						show: true //是否显示该工具
-					}
-				}
-			},
-			// tooltip: {
-			// 	trigger: 'axis',
-			// 	axisPointer: {
-			// 		type: 'shadow',
-			// 		label: {
-			// 			show: false
-			// 		}
-			// 	}
-			// },
-			grid: {
-				top: '15%',
-				left: '4%',
-				right: '4%',
-				bottom: '10%',
-				containLabel: true
-			},
-			legend: {
-				data: ageRanges,
-				itemGap: 5,
-				padding: [0, 15, 0, 15],
-				y: 'bottom',
-				itemHeight: 8, //高
-				itemWidth: 8, //宽
-				type: 'scroll'
-			},
-			xAxis: {
-				type: 'category',
-				data: xData,
-				axisLabel: {
-					color: '#7F84B5',
-					fontWeight: 300,
-					interval: 0,
-					rotate: 0
+	staffList.value = targetStaffs;
+	popupTitle.value = `${subOrg} ${ageRange}人员列表（共${targetStaffs.length}人）`;
+	popup.value.open();
+};
+
+// 新增获取指定单位人员的方法
+const getSubOrgStaffs = (subOrgCode) => {
+	return subOrgStaffs.value[subOrgCode] || [];
+};
+
+// 新增获取指定年龄段人员的方法
+const getAgeGroupStaffs = (ageRange) => {
+	return ageGroupStaffs.value[ageRange] || [];
+};
+
+// 生成图表数据（修改部分）
+const generateChartData = (data) => {
+	// 按基层单位分组
+	const ageRanges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
+	const jcdwGroups = data.reduce((acc, cur) => {
+		if (!acc[cur.jcdw]) {
+			acc[cur.jcdw] = {
+				ageGroups: [0, 0, 0, 0, 0] // 21-30,31-40,41-50,51-60,61-64
+			};
+		}
+		const ageGroup = Math.floor((cur.nl - 21) / 10);
+		// console.log(ageGroup, cur.jcdw)
+		if (ageGroup >= 0 && ageGroup <= 4) {
+			acc[cur.jcdw].ageGroups[ageGroup]++;
+		}
+		return acc;
+	}, {});
+
+	// 生成分组柱状图配置
+	const xData = Object.keys(jcdwGroups);
+
+	const seriesData = ageRanges.map((range, index) => ({
+		name: range,
+		type: 'bar',
+		data: xData.map((jcdw) => jcdwGroups[jcdw].ageGroups[index] || 0),
+		itemStyle: {
+			color: ['#5470C6', '#91CC75', '#FAC858', '#EE6666', '#73C0DE'][index]
+		},
+		// 显示数值标签
+		label: {
+			show: true,
+			position: 'top'
+		}
+		// 设置柱宽为 20 像素
+		// barWidth: 20
+	}));
+	chartOption.value = {
+		title: {
+			text: '人员年龄分组统计',
+			padding: [0, 0, 0, 30]
+		},
+		toolbox: {
+			padding: [0, 30, 0, 0],
+			show: true,
+			feature: {
+				//工具配置项
+
+				restore: {
+					show: true //是否显示该工具
 				},
-				padding: [0, 10, 0, 10],
-				axisTick: {
-					show: false //刻度线
-				},
-				axisLine: {
-					show: false //不显示坐标轴线
+				saveAsImage: {
+					show: true //是否显示该工具
 				}
+			}
+		},
+		// tooltip: {
+		// 	trigger: 'axis',
+		// 	axisPointer: {
+		// 		type: 'shadow',
+		// 		label: {
+		// 			show: false
+		// 		}
+		// 	}
+		// },
+		grid: {
+			top: '15%',
+			left: '4%',
+			right: '4%',
+			bottom: '10%',
+			containLabel: true
+		},
+		legend: {
+			data: ageRanges,
+			itemGap: 5,
+			padding: [0, 15, 0, 15],
+			y: 'bottom',
+			itemHeight: 8, //高
+			itemWidth: 8, //宽
+			type: 'scroll'
+		},
+		xAxis: {
+			type: 'category',
+			data: xData,
+			axisLabel: {
+				color: '#7F84B5',
+				fontWeight: 300,
+				interval: 0,
+				rotate: 0
 			},
-			yAxis: [{
+			padding: [0, 10, 0, 10],
+			axisTick: {
+				show: false //刻度线
+			},
+			axisLine: {
+				show: false //不显示坐标轴线
+			}
+		},
+		yAxis: [
+			{
 				show: true,
 				boundaryGap: false, //解决数据与线不对应问题
 				type: 'value',
@@ -395,146 +389,147 @@
 				axisLine: {
 					show: false //不显示坐标轴线
 				}
-			}],
+			}
+		],
 
-			series: seriesData
-		};
-
-		// 初始化图表
-		setTimeout(async () => {
-			if (!chart.value) return;
-			const myChart = await chart.value.init(echarts);
-			myChart.setOption(chartOption.value);
-			myChart.on('click', (params) => {
-				console.log(params.seriesName);
-				tableData.value = getAgeGroupStaffs(params.seriesName);
-			});
-		}, 300);
-
-		// #ifdef APP
-		getHeight();
-		// #endif
+		series: seriesData
 	};
 
-	onMounted(() => {
-		// #ifdef APP
-		getHeight();
-		// #endif
-	});
-	// #ifdef APP
-
-	const getHeight = () => {
-		// 获取屏幕高度
-		const systemInfo = uni.getSystemInfoSync();
-		const screenHeight = systemInfo.screenHeight;
-		// 创建选择器查询对象
-		const query = uni.createSelectorQuery();
-		// 获取上方组件的高度
-		query
-			.select('#top1')
-			.boundingClientRect((rect1) => {
-				// 计算上方组件高度总和
-				const topComponentsHeight = rect1.height;
-				// 计算下方组件的高度
-				bottomHeight.value = screenHeight - topComponentsHeight - 415;
-			})
-			.exec();
-	};
-
-	// #endif
 	// 初始化图表
-	const initChart = () => {
-		setTimeout(async () => {
-			if (!chart.value) return;
-			const myChart = await chart.value.init(echarts);
-			myChart.setOption(chartOption.value);
-		}, 300);
-	};
+	setTimeout(async () => {
+		if (!chart.value) return;
+		const myChart = await chart.value.init(echarts);
+		myChart.setOption(chartOption.value);
+		myChart.on('click', (params) => {
+			console.log(params.seriesName);
+			tableData.value = getAgeGroupStaffs(params.seriesName);
+		});
+	}, 300);
+
+	// #ifdef APP
+	getHeight();
+	// #endif
+};
+
+onMounted(() => {
+	// #ifdef APP
+	getHeight();
+	// #endif
+});
+// #ifdef APP
+
+const getHeight = () => {
+	// 获取屏幕高度
+	const systemInfo = uni.getSystemInfoSync();
+	const screenHeight = systemInfo.screenHeight;
+	// 创建选择器查询对象
+	const query = uni.createSelectorQuery();
+	// 获取上方组件的高度
+	query
+		.select('#top1')
+		.boundingClientRect((rect1) => {
+			// 计算上方组件高度总和
+			const topComponentsHeight = rect1.height;
+			// 计算下方组件的高度
+			bottomHeight.value = screenHeight - topComponentsHeight - 415;
+		})
+		.exec();
+};
+
+// #endif
+// 初始化图表
+const initChart = () => {
+	setTimeout(async () => {
+		if (!chart.value) return;
+		const myChart = await chart.value.init(echarts);
+		myChart.setOption(chartOption.value);
+	}, 300);
+};
 </script>
 
 <style scoped>
-	.container {
-		margin: 20, 20, 20, 20rpx;
-	}
+.container {
+	margin: 20, 20, 20, 20rpx;
+}
 
-	.input-group {
-		display: flex;
-		gap: 20rpx;
-		margin-bottom: 30rpx;
-	}
+.input-group {
+	display: flex;
+	gap: 20rpx;
+	margin-bottom: 30rpx;
+}
 
-	.input {
-		flex: 1;
-		border: 1rpx solid #ddd;
-		padding: 15rpx;
-		border-radius: 8rpx;
-	}
+.input {
+	flex: 1;
+	border: 1rpx solid #ddd;
+	padding: 15rpx;
+	border-radius: 8rpx;
+}
 
-	.query-btn {
-		background: #007aff;
-		color: white;
-		padding: 0 40rpx;
-		border-radius: 8rpx;
-	}
+.query-btn {
+	background: #007aff;
+	color: white;
+	padding: 0 40rpx;
+	border-radius: 8rpx;
+}
 
-	.stats-box {
-		display: flex;
-		justify-content: space-around;
-		margin: 30rpx 0;
-		padding: 20rpx;
-		background: #f8f8f8;
-		border-radius: 12rpx;
-	}
+.stats-box {
+	display: flex;
+	justify-content: space-around;
+	margin: 30rpx 0;
+	padding: 20rpx;
+	background: #f8f8f8;
+	border-radius: 12rpx;
+}
 
-	.stat-item {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
+.stat-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
 
-	.label {
-		font-size: 24rpx;
-		color: #666;
-	}
+.label {
+	font-size: 24rpx;
+	color: #666;
+}
 
-	.value {
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #0000ff;
-	}
+.value {
+	font-size: 36rpx;
+	font-weight: bold;
+	color: #0000ff;
+}
 
-	.chart-container {
-		height: 400rpx;
-		margin-top: 20rpx;
-	}
+.chart-container {
+	height: 400rpx;
+	margin-top: 20rpx;
+}
 
-	.titleStyle {
-		font-size: 12px;
-		color: #747474;
-		line-height: 30px;
-		height: 30px;
-		background: #f2f9fc;
-		text-align: center;
-		vertical-align: middle;
-		border-left: 1px solid #919191;
-		border-bottom: 1px solid #919191;
-	}
+.titleStyle {
+	font-size: 12px;
+	color: #747474;
+	line-height: 30px;
+	height: 30px;
+	background: #f2f9fc;
+	text-align: center;
+	vertical-align: middle;
+	border-left: 1px solid #919191;
+	border-bottom: 1px solid #919191;
+}
 
-	/* 内容样式 */
-	.dataStyle {
-		max-font-size: 14px;
-		/* 最大字体限制 */
-		min-font-size: 10px;
-		/* 最小字体限制 */
-		font-size: 12px;
-		color: #00007f;
-		line-height: 30px;
-		height: 30px;
-		font-weight: 500;
-		text-align: center;
-		vertical-align: middle;
-		border-bottom: 1px solid #919191;
-		border-left: 1px solid #919191;
-		text-overflow: ellipsis;
-	}
-</style>
\ No newline at end of file
+/* 内容样式 */
+.dataStyle {
+	max-font-size: 14px;
+	/* 最大字体限制 */
+	min-font-size: 10px;
+	/* 最小字体限制 */
+	font-size: 12px;
+	color: #00007f;
+	line-height: 30px;
+	height: 30px;
+	font-weight: 500;
+	text-align: center;
+	vertical-align: middle;
+	border-bottom: 1px solid #919191;
+	border-left: 1px solid #919191;
+	text-overflow: ellipsis;
+}
+</style>
diff --git a/pages/views/shengchan/ribaoshuju/rbsjLsxq.vue b/pages/views/shengchan/ribaoshuju/rbsjLsxq.vue
new file mode 100644
index 0000000..bb12a63
--- /dev/null
+++ b/pages/views/shengchan/ribaoshuju/rbsjLsxq.vue
@@ -0,0 +1,239 @@
+<template>
+	<view>
+		<view class="stats-container">
+			<uni-title :title="name.unit + '历史数据---单位（万方）'" color="blue" type="h2"></uni-title>
+		</view>
+		<view class="stats-container">
+			<cxc-szcx-dateRangeSelect v-model="dateRange"></cxc-szcx-dateRangeSelect>
+		</view>
+
+		<cxc-szcx-lineChart :dataList="dataList" x-field="rqDate" y-field="rq" legend-field="unit" :reference-value="10"></cxc-szcx-lineChart>
+		<view class="stats-container">
+			<view class="stats-item">最大值: {{ dataStats.max }}</view>
+			<view class="stats-item">最小值: {{ dataStats.min }}</view>
+			<view class="stats-item">平均值: {{ dataStats.average }}</view>
+		</view>
+		<view class="table">
+			<!-- 表头 -->
+			<view class="tr header">
+				<view class="th1">序号</view>
+				<view class="th">名称</view>
+				<view class="th">日期</view>
+				<view class="th">日气量</view>
+			</view>
+			<scroll-view scroll-X="true" scroll-Y="true" class="table-container">
+				<!-- 表格内容 -->
+				<view class="tr" v-for="(item, index) in dataList" :key="index" :class="{ even: index % 2 === 0 }">
+					<view class="td1">{{ index + 1 }}</view>
+					<view class="td">{{ item.unit }}</view>
+					<view class="td">{{ item.rqDate }}</view>
+					<view class="td" :class="{ negative: item.rq < 0 }">
+						{{ item.rq }}
+					</view>
+				</view>
+
+				<!-- 空数据提示 -->
+				<view v-if="!dataList.length" class="empty">暂无相关数据</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, onMounted, computed, nextTick, watchEffect, warn, watch } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { queryJinriShengchansj } from '@/api/shengchan.js';
+import { formatDate, getDateAfterDays, getDateAfterMonths } from '@/utils/dateTime.js';
+const name = ref({});
+const dateRange = ref([]);
+const dataList = ref([]);
+const endDate = ref('');
+const startDate = ref('');
+const dataStats = ref({ min: 0, max: 0, avg: 0 });
+const getJinriShengchansj = (tempDateRange) => {
+	console.log(tempDateRange);
+	// 添加日期有效性检查
+	if (!tempDateRange || tempDateRange.some((date) => !(date instanceof Date) || isNaN(date.getTime()))) {
+		console.error('收到无效日期范围:', tempDateRange);
+		return;
+	}
+	let queryParms = {};
+	dataList.value = [];
+	queryParms.gas = name.value.gas;
+	queryParms.unit = name.value.unit;
+	queryParms.rqDate_begin = formatDate(tempDateRange[0]);
+	queryParms.rqDate_end = formatDate(tempDateRange[1]);
+	queryParms.pageSize = 500;
+
+	// 添加参数有效性检查
+	if (!queryParms.rqDate_begin || !queryParms.rqDate_end) {
+		console.error('参数格式化失败:', queryParms);
+		return;
+	}
+	console.log(queryParms);
+	queryJinriShengchansj(queryParms).then((res) => {
+		if (res.success) {
+			console.log(res);
+			dataList.value = res.result.records;
+			dataStats.value = calculateStats(dataList.value, 'rq');
+		}
+	});
+};
+function calculateStats(data, field) {
+	// 过滤掉 field 字段值为 null 或 undefined 的数据
+	const validData = data.filter((item) => item[field] !== null && item[field] !== undefined);
+	if (validData.length === 0) {
+		return {
+			max: null,
+			min: null,
+			average: null
+		};
+	}
+	// 初始化最大值、最小值和总和
+	let max = validData[0][field];
+	let min = validData[0][field];
+	let sum = 0;
+
+	// 遍历有效数据
+	for (let i = 0; i < validData.length; i++) {
+		const value = validData[i][field];
+		// 更新最大值
+		if (value > max) {
+			max = value;
+		}
+		// 更新最小值
+		if (value < min) {
+			min = value;
+		}
+		// 累加值到总和
+		sum += value;
+	}
+	// 计算平均值
+	const average = (sum / validData.length).toFixed(4);
+
+	return {
+		max: max,
+		min: min,
+		average: average
+	};
+}
+watch(
+	dateRange,
+	(newVal) => {
+		if (!newVal || !(newVal[0] instanceof Date) || !(newVal[1] instanceof Date) || isNaN(newVal[0].getTime()) || isNaN(newVal[1].getTime())) {
+			console.error('无效的日期范围:', newVal);
+			return;
+		}
+		getJinriShengchansj(newVal);
+	},
+	{ deep: true, immediate: true }
+);
+onMounted(() => {
+	const now = new Date();
+
+	if (now.getHours() < 11) {
+		endDate.value = getDateAfterDays(now, -1); //11点之前  头一天的数据
+		startDate.value = getDateAfterMonths(endDate.value, -1); //11点之前  头一天的数据
+	} else {
+		endDate.value = now;
+		startDate.value = getDateAfterMonths(endDate.value, -1); //11点之前  头一天的数据
+	}
+	dateRange.value = [startDate.value, endDate.value];
+	// nextTick();
+	// getJinriShengchansj(dateRange.value);
+});
+
+onLoad((options) => {
+	name.value = JSON.parse(options.data);
+	console.log(name.value);
+});
+</script>
+
+<style scoped>
+.table-container {
+	margin-left: 15px;
+	margin-right: 15px;
+	width: 100%;
+	height: 30vh;
+	overflow: hidden;
+}
+
+.table {
+	min-width: 100%;
+	border: 2rpx solid #e8e8e8;
+
+	.tr {
+		display: flex;
+		border-bottom: 2rpx solid #e8e8e8;
+
+		&.header {
+			background-color: #fafafa;
+			font-weight: 600;
+		}
+
+		&.even {
+			background-color: #f8f8f8;
+		}
+	}
+
+	.th,
+	.td {
+		flex: 1;
+		min-width: 80rpx;
+		padding: 10rpx;
+		font-size: 22rpx;
+		font-weight: bold;
+		color: #333;
+		text-align: center;
+		white-space: nowrap;
+		height: 30rpx;
+		vertical-align: middle;
+	}
+
+	.th1,
+	.td1 {
+		flex: 1;
+		max-width: 40rpx;
+		padding: 10rpx;
+		font-size: 22rpx;
+		font-weight: bold;
+		color: #333;
+		text-align: center;
+		white-space: nowrap;
+		height: 30rpx;
+		vertical-align: middle;
+	}
+
+	.th {
+		background-color: #f0f0f0;
+	}
+
+	.td.negative {
+		color: #ff4444;
+		font-weight: 500;
+	}
+}
+
+.stats-container {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	text-align: center;
+	background-color: #f5f5f5;
+	border-radius: 8px;
+	box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+	padding: 5px;
+	margin: 10px;
+}
+
+.stats-item {
+	font-size: 14px;
+	color: #333;
+	font-weight: bold;
+}
+
+.stats-item + .stats-item {
+	border-left: 1px solid #ccc;
+	padding-left: 16px;
+}
+</style>
diff --git a/pages/views/shengchan/ribaoshuju/trqRbsj.vue b/pages/views/shengchan/ribaoshuju/trqRbsj.vue
index 345c1e9..a24c5a0 100644
--- a/pages/views/shengchan/ribaoshuju/trqRbsj.vue
+++ b/pages/views/shengchan/ribaoshuju/trqRbsj.vue
@@ -1,6 +1,11 @@
 <template>
 	<view :class="{ gray: store.isgray == 1 }">
-		<view style="margin-left: 20rpx;"> <uni-title :title="strDate + '：生产数据'" type="h1" color="red" />
+		<view style="margin-left: 20rpx"><uni-title :title="strDate + '：生产数据'" type="h1" color="red" /></view>
+		<view class="progress-bar">
+			<!-- 动态设置宽度和颜色 -->
+			<view class="progressTime" :style="{ width: `${timePercent}%`, 'background-color': '#00aaff' }"></view>
+			<!-- 显示带符号的百分比 -->
+			<text class="progress-text">全年时间进度:{{ timePercent }}%</text>
 		</view>
 		<view class="container">
 			<view v-for="(item, index) in shishiArr" :key="index" class="card-item" @click="handleCardClick(item.gas)">
@@ -14,6 +19,12 @@
 						<text class="label">年累计</text>
 						<text class="value">{{ item.yearVolume || '-' }}</text>
 					</view>
+					<view class="progress-bar">
+						<!-- 动态设置宽度和颜色 -->
+						<view class="progress" :style="{ width: `${Math.abs(item.yearPerCent)}%`, 'background-color': item.yearPerCent < 0 ? '#ff4444' : '#007aff' }"></view>
+						<!-- 显示带符号的百分比 -->
+						<text v-if="!(item.yearPlan === '' || item.yearPlan === '0')" class="progress-text">{{ item.yearPerCent }}%</text>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -25,424 +36,476 @@
 					<uni-icons type="closeempty" size="24" color="#666" @click="closePopup"></uni-icons>
 				</view>
 
-				<scroll-view scroll-X="true" scroll-Y="true" class="table-container">
-					<view class="table">
-						<!-- 表头 -->
-						<view class="tr header">
-							<view class="th1">序号</view>
-							<view class="th">名称</view>
-							<view class="th">日气量</view>
-							<view class="th">总气量 </view>
-							<view class="th">年累计 </view>
-						</view>
-
+				<view class="table">
+					<!-- 表头 -->
+					<view class="tr header">
+						<view class="th1">序号</view>
+						<view class="th">名称</view>
+						<view class="th">日气量</view>
+						<view class="th">年累计</view>
+						<view class="th1">操作</view>
+					</view>
+					<scroll-view scroll-X="true" scroll-Y="true" class="table-container">
 						<!-- 表格内容 -->
-						<view class="tr" v-for="(item, index) in filteredData" :key="index"
-							:class="{ even: index % 2 === 0 }">
-							<view class="td1">{{ index }}</view>
+						<view class="tr" v-for="(item, index) in filteredData" :key="index" :class="{ even: index % 2 === 0 }">
+							<view class="td1">{{ index + 1 }}</view>
 							<view class="td">{{ item.unit }}</view>
 							<view class="td" :class="{ negative: item.rq < 0 }">
 								{{ formatNumber(item.rq) }}
 							</view>
-
-							<view class="td">{{ formatNumber(item.totalGas) }}</view>
 							<view class="td" :class="{ negative: item.yearVolume < 0 }">
 								{{ formatNumber(item.yearVolume) }}
 							</view>
+							<view class="td1" style="color: red" @click="goHistory(item)">历史</view>
 						</view>
 
 						<!-- 空数据提示 -->
-						<view v-if="!filteredData.length" class="empty">
-							暂无相关数据
-						</view>
-					</view>
-				</scroll-view>
+						<view v-if="!filteredData.length" class="empty">暂无相关数据</view>
+					</scroll-view>
+				</view>
 			</view>
 		</uni-popup>
-
 	</view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		onMounted,
-		computed,
-		nextTick,
-		watchEffect
-	} from 'vue';
-	import {
-		onLoad
-	} from '@dcloudio/uni-app';
-	import {
-		queryJinriShengchansj,
-		queryYearShengchansj
-	} from '@/api/shengchan.js';
-	import {
-		formatDate,
-		getDateAfterDays
-	} from '@/utils/dateTime.js';
-	import {
-		beforeJump
-	} from '@/utils/index.js';
-	import {
-		useStore
-	} from '@/store';
+import { ref, onMounted, computed, nextTick, watchEffect } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { queryJinriShengchansj, queryYearShengchansj } from '@/api/shengchan.js';
+import { formatDate, getDateAfterDays } from '@/utils/dateTime.js';
+import { beforeJump } from '@/utils/index.js';
+import { useStore } from '@/store';
+import { getYearProgress } from '@/utils/dateTime.js';
 
-	const store = useStore();
+const store = useStore();
 
-	const shishiArr = ref([{
-			gas: '气井气',
-			dailyVolume: '',
-			yearVolume: ''
-		},
-		{
-			gas: '伴生气',
-			dailyVolume: '',
-			yearVolume: ''
-		},
-		{
-			gas: '外部气',
-			dailyVolume: '',
-			yearVolume: ''
-		},
-		{
-			gas: '站输差',
-			dailyVolume: '',
-			yearVolume: ''
-		},
-		{
-			gas: '线输差',
-			dailyVolume: '',
-			yearVolume: ''
-		},
-		{
-			gas: '综合输差',
-			dailyVolume: '',
-			yearVolume: ''
+const shishiArr = ref([
+	{
+		gas: '气井气',
+		dailyVolume: '',
+		yearVolume: '',
+		yearPlan: '7500',
+		yearPerCent: ''
+	},
+	{
+		gas: '伴生气',
+		dailyVolume: '',
+		yearVolume: '',
+		yearPlan: '',
+		yearPerCent: ''
+	},
+	{
+		gas: '外部气',
+		dailyVolume: '',
+		yearVolume: '',
+		yearPlan: '',
+		yearPerCent: ''
+	},
+	{
+		gas: '站输差',
+		dailyVolume: '',
+		yearVolume: '',
+		yearPlan: '',
+		yearPerCent: ''
+	},
+	{
+		gas: '线输差',
+		dailyVolume: '',
+		yearVolume: '',
+		yearPlan: '',
+		yearPerCent: ''
+	},
+	{
+		gas: '综合输差',
+		dailyVolume: '',
+		yearVolume: '',
+		yearPlan: '100',
+		yearPerCent: ''
+	}
+]);
+
+const dataJinri = ref([]);
+const dataJinriSum = ref([]);
+const dataJinriSumUnit = ref([]);
+const selectedGas = ref('');
+const filteredData = ref([]);
+const popup = ref(null);
+const timePercent = ref(0);
+
+// 点击卡片处理
+const handleCardClick = (gas) => {
+	selectedGas.value = gas;
+	filteredData.value = dataJinriSumUnit.value.filter((item) => item.gas === gas);
+	popup.value.open();
+};
+
+// 关闭弹窗
+const closePopup = () => {
+	popup.value.close();
+};
+onMounted(() => {
+	getJinriShengchansj();
+	getYearShengchansj();
+	timePercent.value = getYearProgress();
+});
+
+const strDate = ref('');
+// 数字格式化
+const formatNumber = (num) => {
+	if (typeof num !== 'number') return '-';
+	return num.toFixed(4).replace(/\.?0+$/, '');
+};
+
+// 计算属性自动分组
+const groupedData = computed(() => {
+	const groups = [];
+	for (let i = 0; i < shishiArr.value.length; i += 3) {
+		groups.push(shishiArr.value.slice(i, i + 3));
+	}
+	return groups;
+});
+
+// 自动计算综合输差
+watchEffect(() => {
+	const station = shishiArr.value[3]; // 站输差
+	const line = shishiArr.value[4]; // 线输差
+	const composite = shishiArr.value[5]; // 综合输差
+
+	// 日输气量计算
+	const dailyStation = parseFloat(station.dailyVolume) || 0;
+	const dailyLine = parseFloat(line.dailyVolume) || 0;
+	composite.dailyVolume = (dailyStation + dailyLine).toFixed(4);
+
+	// 年输气量计算
+	const yearStation = parseFloat(station.yearVolume) || 0;
+	const yearLine = parseFloat(line.yearVolume) || 0;
+	composite.yearVolume = (yearStation + yearLine).toFixed(4);
+	composite.yearPerCent = calcPercent(composite.yearPlan, composite.yearVolume);
+	console.log(composite);
+});
+
+const getJinriShengchansj = () => {
+	const now = new Date();
+	if (now.getHours() < 11) {
+		strDate.value = formatDate(getDateAfterDays(now, -1)).toString(); //11点之前  头一天的数据
+	} else {
+		strDate.value = formatDate(now).toString();
+	}
+	let queryParms = {};
+	dataJinri.value = [];
+	dataJinriSum.value = [];
+	dataJinriSumUnit.value = [];
+	queryParms.rqDate = strDate.value;
+	queryParms.pageSize = 100;
+	// console.log(queryParms);
+	queryJinriShengchansj(queryParms).then((res) => {
+		if (res.success) {
+			// console.log(res);
+			dataJinri.value = res.result.records;
+			dataJinriSumUnit.value = sumByUnit(dataJinri.value); //包含gas  unit  rq  cq  totalGas
+			// console.log(dataJinriSumUnit.value);
+			// 使用 nextTick 等待 DOM 更新
+			nextTick();
+			getYearShengchansj(); //再获取今年以来的数据
 		}
-	]);
-
-	const dataJinri = ref([]);
-	const dataJinriSum = ref([]);
-	const dataJinriSumUnit = ref([]);
-	const selectedGas = ref('');
-	const filteredData = ref([]);
-	const popup = ref(null);
-	// 点击卡片处理
-	const handleCardClick = (gas) => {
-		selectedGas.value = gas;
-		filteredData.value = dataJinriSumUnit.value.filter(item => item.gas === gas);
-		popup.value.open();
-	};
-
-	// 关闭弹窗
-	const closePopup = () => {
-		popup.value.close();
-	};
-	onMounted(() => {
-		getJinriShengchansj();
-		getYearShengchansj();
 	});
+};
+const getYearShengchansj = () => {
+	const now = new Date();
+	let year = formatDate(now).split('-')[0];
+	let queryParms = {};
+	queryParms.yearStart = year;
+	queryParms.yearEnd = year;
 
-	const strDate = ref('');
-	// 数字格式化
-	const formatNumber = (num) => {
-		if (typeof num !== 'number') return '-';
-		return num.toFixed(4).replace(/\.?0+$/, '');
-	};
+	// // console.log(2, queryParms.value);
+	queryYearShengchansj(queryParms).then((res) => {
+		if (res.success) {
+			try {
+				// // console.log(res.result);
+				let yearData = res.result[year];
+				// console.log(dataJinriSumUnit.value.length, dataJinriSumUnit.value, yearData.length,
+				// yearData);
+				dataJinriSumUnit.value.forEach((item) => {
+					yearData.forEach((itemYear) => {
+						// // console.log(item, itemYear);
+						if (item.unit === itemYear.unit) {
+							item.yearVolume = itemYear.yearSum || 0;
+						}
+					});
+				});
+				dataJinriSum.value = sumByGas(dataJinriSumUnit.value);
+				// console.log(dataJinriSum.value);
+				shishiArr.value.forEach((item) => {
+					dataJinriSum.value.forEach((itemjinri) => {
+						if (item.gas === itemjinri.gas) {
+							item.dailyVolume = itemjinri.rq.toFixed(4);
+							item.yearVolume = itemjinri.yearVolume.toFixed(4);
+							item.yearPerCent = calcPercent(item.yearPlan, item.yearVolume);
+						}
+					});
+				});
 
-	// 计算属性自动分组
-	const groupedData = computed(() => {
-		const groups = [];
-		for (let i = 0; i < shishiArr.value.length; i += 3) {
-			groups.push(shishiArr.value.slice(i, i + 3));
+				// console.log(shishiArr);
+			} catch (error) {
+				// console.log(error);
+			}
 		}
-		return groups;
 	});
-
-	// 自动计算综合输差
-	watchEffect(() => {
-		const station = shishiArr.value[3] // 站输差
-		const line = shishiArr.value[4] // 线输差
-		const composite = shishiArr.value[5] // 综合输差
-
-		// 日输气量计算
-		const dailyStation = parseFloat(station.dailyVolume) || 0
-		const dailyLine = parseFloat(line.dailyVolume) || 0
-		composite.dailyVolume = (dailyStation + dailyLine).toFixed(4)
-
-		// 年输气量计算
-		const yearStation = parseFloat(station.yearVolume) || 0
-		const yearLine = parseFloat(line.yearVolume) || 0
-		composite.yearVolume = (yearStation + yearLine).toFixed(4)
-	})
-
-
-	const getJinriShengchansj = () => {
-		const now = new Date();
-		if (now.getHours() < 11) {
-			strDate.value = formatDate(getDateAfterDays(now, -1)).toString(); //11点之前  头一天的数据
-		} else {
-			strDate.value = formatDate(now).toString();
-		}
-		let queryParms = {};
-		dataJinri.value = [];
-		dataJinriSum.value = [];
-		dataJinriSumUnit.value = [];
-		queryParms.rqDate = strDate.value;
-		queryParms.pageSize = 100;
-		// console.log(queryParms);
-		queryJinriShengchansj(queryParms).then((res) => {
-			if (res.success) {
-				// console.log(res);
-				dataJinri.value = res.result.records;
-				dataJinriSumUnit.value = sumByUnit(dataJinri.value); //包含gas  unit  rq  cq  totalGas
-				// console.log(dataJinriSumUnit.value);
-				// 使用 nextTick 等待 DOM 更新
-				nextTick();
-				getYearShengchansj(); //再获取今年以来的数据
+};
+function goHistory(val) {
+	uni.navigateTo({
+		url: '/pages/views/shengchan/ribaoshuju/rbsjLsxq?data=' + JSON.stringify(val)
+	});
+}
+function calcPercent(yearJihua, yearShiji) {
+	// 计算进度百分比，避免除数为 0
+	// 确保进度百分比不超过 100
+	let plan = parseFloat(yearJihua === '' ? 0 : yearJihua);
+	let shiji = parseFloat(yearShiji);
+	let percent = 0;
+	// 修改原始计算代码
+	if (plan > 0) {
+		percent = (shiji / plan) * 100;
+		percent = Math.min(percent, 100); // 限制最大100%
+	}
+	return parseFloat(percent.toFixed(4)); // 转为数值
+}
+function sumByGas(records) {
+	// console.log(records);
+	const summaryMap = {};
+	try {
+		records.forEach((record) => {
+			const gas = record.gas;
+			if (!summaryMap[gas]) {
+				// 初始化该 gas 类型的汇总对象
+				summaryMap[gas] = {
+					gas: gas,
+					rq: 0,
+					sq: 0,
+					totalGas: 0,
+					yearVolume: 0
+				};
 			}
+			// 无论是否是第一次遇到该 gas 类型，都进行累加操作
+			summaryMap[gas].rq += record.rq || 0;
+			summaryMap[gas].sq += record.sq || 0;
+			summaryMap[gas].totalGas += record.totalGas || 0;
+			summaryMap[gas].yearVolume += record.yearVolume || 0;
 		});
-	};
-	const getYearShengchansj = () => {
-		const now = new Date();
-		let year = formatDate(now).split('-')[0];
-		let queryParms = {};
-		queryParms.yearStart = year;
-		queryParms.yearEnd = year;
+		return Object.values(summaryMap);
+	} catch (error) {
+		//TODO handle the exception
+		// console.log(error);
+	}
+}
 
-		// // console.log(2, queryParms.value);
-		queryYearShengchansj(queryParms).then((res) => {
-			if (res.success) {
-				try {
-					// // console.log(res.result);
-					let yearData = res.result[year];
-					// console.log(dataJinriSumUnit.value.length, dataJinriSumUnit.value, yearData.length,
-					// yearData);
-					dataJinriSumUnit.value.forEach((item) => {
-						yearData.forEach((itemYear) => {
-							// // console.log(item, itemYear);
-							if (item.unit === itemYear.unit) {
-								item.yearVolume = itemYear.yearSum || 0;
-							}
-						});
-					});
-					dataJinriSum.value = sumByGas(dataJinriSumUnit.value);
-					// console.log(dataJinriSum.value);
-					shishiArr.value.forEach((item) => {
-						dataJinriSum.value.forEach((itemjinri) => {
-							if (item.gas === itemjinri.gas) {
-								item.dailyVolume = itemjinri.rq.toFixed(4);
-								item.yearVolume = itemjinri.yearVolume.toFixed(4);
-							}
-						});
-					});
-				} catch (error) {
-					// console.log(error);
-				}
-			}
-		});
-	};
-
-	function sumByGas(records) {
-		// console.log(records);
-		const summaryMap = {};
-		try {
-			records.forEach((record) => {
-				const gas = record.gas;
-				if (!summaryMap[gas]) {
+function sumByUnit(records) {
+	// console.log(records);
+	const summaryMap = {};
+	try {
+		records.forEach((record) => {
+			const unit = record.unit;
+			if (!unit.includes('区')) {
+				if (!summaryMap[unit]) {
 					// 初始化该 gas 类型的汇总对象
-					summaryMap[gas] = {
-						gas: gas,
+					summaryMap[unit] = {
+						unit: unit,
+						gas: record.gas,
 						rq: 0,
 						sq: 0,
 						totalGas: 0,
 						yearVolume: 0
 					};
 				}
-				// 无论是否是第一次遇到该 gas 类型，都进行累加操作
-				summaryMap[gas].rq += record.rq || 0;
-				summaryMap[gas].sq += record.sq || 0;
-				summaryMap[gas].totalGas += record.totalGas || 0;
-				summaryMap[gas].yearVolume += record.yearVolume || 0;
-			});
-			return Object.values(summaryMap);
-		} catch (error) {
-			//TODO handle the exception
-			// console.log(error);
-		}
-	}
+				// 无论是否是第一次遇到该 unit 类型，都进行累加操作
+				summaryMap[unit].rq += record.rq || 0;
+				summaryMap[unit].sq += record.sq || 0;
+				summaryMap[unit].totalGas += record.totalGas || 0;
+				summaryMap[unit].yearVolume += record.yearVolume || 0;
+			}
+		});
 
-	function sumByUnit(records) {
-		// console.log(records);
-		const summaryMap = {};
-		try {
-			records.forEach((record) => {
-				const unit = record.unit;
-				if (!unit.includes('区')) {
-					if (!summaryMap[unit]) {
-						// 初始化该 gas 类型的汇总对象
-						summaryMap[unit] = {
-							unit: unit,
-							gas: record.gas,
-							rq: 0,
-							sq: 0,
-							totalGas: 0,
-							yearVolume: 0
-						};
-					}
-					// 无论是否是第一次遇到该 unit 类型，都进行累加操作
-					summaryMap[unit].rq += record.rq || 0;
-					summaryMap[unit].sq += record.sq || 0;
-					summaryMap[unit].totalGas += record.totalGas || 0;
-					summaryMap[unit].yearVolume += record.yearVolume || 0;
-				}
-			});
-
-			return Object.values(summaryMap);
-		} catch (error) {
-			//TODO handle the exception
-			// console.log(error);
-		}
+		return Object.values(summaryMap);
+	} catch (error) {
+		//TODO handle the exception
+		// console.log(error);
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.container {
+.container {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 20rpx;
+	gap: 20rpx;
+}
+
+.popup-content {
+	padding: 30rpx;
+	max-height: 40vh;
+}
+
+.popup-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 30rpx;
+	padding-bottom: 20rpx;
+	border-bottom: 2rpx solid #eee;
+
+	.title {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+	}
+}
+
+.table-container {
+	width: 100%;
+	height: 30vh;
+	overflow: hidden;
+}
+
+.table {
+	min-width: 100%;
+	border: 2rpx solid #e8e8e8;
+
+	.tr {
 		display: flex;
-		flex-wrap: wrap;
-		padding: 20rpx;
-		gap: 20rpx;
+		border-bottom: 2rpx solid #e8e8e8;
+
+		&.header {
+			background-color: #fafafa;
+			font-weight: 600;
+		}
+
+		&.even {
+			background-color: #f8f8f8;
+		}
 	}
 
-	.popup-content {
-		padding: 30rpx;
-		max-height: 70vh;
+	.th,
+	.td {
+		flex: 1;
+		min-width: 80rpx;
+		padding: 10rpx;
+		font-size: 22rpx;
+		font-weight: bold;
+		color: #333;
+		text-align: center;
+		white-space: nowrap;
+		height: 30rpx;
+		vertical-align: middle;
 	}
 
-	.popup-header {
+	.th1,
+	.td1 {
+		flex: 1;
+		max-width: 40rpx;
+		padding: 10rpx;
+		font-size: 22rpx;
+		font-weight: bold;
+		color: #333;
+		text-align: center;
+		white-space: nowrap;
+		height: 30rpx;
+		vertical-align: middle;
+	}
+
+	.th {
+		background-color: #f0f0f0;
+	}
+
+	.td.negative {
+		color: #ff4444;
+		font-weight: 500;
+	}
+}
+
+.empty {
+	padding: 40rpx;
+	text-align: center;
+	color: #888;
+	font-size: 16rpx;
+}
+
+.card-item {
+	flex: 1 1 200rpx; // 基础宽度300rpx，自动伸缩   selectedGas  formatNumber
+	min-width: 240rpx;
+	max-width: calc(50% - 10rpx); // 最大不超过容器一半（考虑间距）
+
+	@media (min-width: 768px) {
+		max-width: calc(33.33% - 14rpx); // 大屏显示3列
+	}
+}
+
+.card {
+	background: #ffffff;
+	border-radius: 16rpx;
+	padding: 10rpx;
+	box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+
+	.title {
+		display: block;
+		font-size: 28rpx;
+		font-weight: 600;
+		color: #333;
+		margin-bottom: 16rpx;
+	}
+
+	.content {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		margin-bottom: 30rpx;
-		padding-bottom: 20rpx;
-		border-bottom: 2rpx solid #eee;
+		margin-bottom: 10rpx;
 
-		.title {
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #333;
-		}
-	}
-
-	.table-container {
-		width: 100%;
-		height: 30vh;
-		overflow: hidden;
-	}
-
-	.table {
-		min-width: 100%;
-		border: 2rpx solid #e8e8e8;
-
-		.tr {
-			display: flex;
-			border-bottom: 2rpx solid #e8e8e8;
-
-			&.header {
-				background-color: #fafafa;
-				font-weight: 600;
-			}
-
-			&.even {
-				background-color: #f8f8f8;
-			}
+		&:last-child {
+			margin-bottom: 0;
 		}
 
-		.th,
-		.td {
-			flex: 1;
-			min-width: 80rpx;
-			padding: 10rpx;
-			font-size: 20rpx;
-			color: #333;
-			text-align: center;
-			white-space: nowrap;
+		.label {
+			font-size: 24rpx;
+			color: #666;
 		}
 
-		.th1,
-		.td1 {
-			flex: 1;
-			max-width: 40rpx;
-			padding: 10rpx;
-			font-size: 20rpx;
-			color: #333;
-			text-align: center;
-			white-space: nowrap;
-		}
-
-		.th {
-			background-color: #f0f0f0;
-		}
-
-		.td.negative {
-			color: #ff4444;
+		.value {
+			font-size: 28rpx;
+			color: #0000ff;
 			font-weight: 500;
 		}
 	}
+}
 
-	.empty {
-		padding: 40rpx;
-		text-align: center;
-		color: #888;
-		font-size: 16rpx;
-	}
+.progress-item {
+	margin-bottom: 20px;
+}
 
-	.card-item {
-		flex: 1 1 200rpx; // 基础宽度300rpx，自动伸缩   selectedGas  formatNumber
-		min-width: 240rpx;
-		max-width: calc(50% - 10rpx); // 最大不超过容器一半（考虑间距）
+.progress-bar {
+	position: relative;
+	height: 20px;
+	background: #f0f0f0;
+	border-radius: 10px;
+	overflow: hidden;
+}
 
-		@media (min-width: 768px) {
-			max-width: calc(33.33% - 14rpx); // 大屏显示3列
-		}
-	}
+.progress {
+	height: 100%;
+	transition: all 0.3s;
+}
+.progressTime {
+	height: 100%;
+	transition: all 0.3s;
+}
 
-	.card {
-		background: #ffffff;
-		border-radius: 16rpx;
-		padding: 10rpx;
-		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
-
-		.title {
-			display: block;
-			font-size: 28rpx;
-			font-weight: 600;
-			color: #333;
-			margin-bottom: 16rpx;
-		}
-
-		.content {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-bottom: 10rpx;
-
-			&:last-child {
-				margin-bottom: 0;
-			}
-
-			.label {
-				font-size: 24rpx;
-				color: #666;
-			}
-
-			.value {
-				font-size: 28rpx;
-				color: #0000ff;
-				font-weight: 500;
-			}
-		}
-	}
+.progress-text {
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	color: red; /* 保持红色 */
+	font-size: 12px;
+	font-weight: bold;
+	text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); /* 提升可读性 */
+}
 </style>
\ No newline at end of file
diff --git a/pages/views/shengchan/ribaoshuju/yyRbsj.vue b/pages/views/shengchan/ribaoshuju/yyRbsj.vue
index eea775c..8ada7a8 100644
--- a/pages/views/shengchan/ribaoshuju/yyRbsj.vue
+++ b/pages/views/shengchan/ribaoshuju/yyRbsj.vue
@@ -18,6 +18,19 @@
 						<text class="label">年累计</text>
 						<text class="value">{{ item.nl || '-' }}</text>
 					</view>
+
+					<view class="progress-bar">
+						<!-- 动态设置宽度和颜色 -->
+						<view
+							class="progress"
+							:style="{
+								width: `${Math.abs(item.yearPerCent)}%`,
+								'background-color': item.yearPerCent < 0 ? '#ff4444' : '#007aff'
+							}"
+						></view>
+						<!-- 显示带符号的百分比 -->
+						<text v-if="!(item.yearPlan === '' || item.yearPlan === '0')" class="progress-text">{{ item.yearPerCent }}%</text>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -36,13 +49,13 @@
 							<view class="th">序号</view>
 							<view class="th">名称</view>
 							<view class="th">日油量</view>
-							<view class="th">月累计 </view>
-							<view class="th">年累计 </view>
+							<view class="th">月累计</view>
+							<view class="th">年累计</view>
+							<view class="th1">操作</view>
 						</view>
 
 						<!-- 表格内容 -->
-						<view class="tr" v-for="(item, index) in dataJinri" :key="index"
-							:class="{ even: index % 2 === 0 }">
+						<view class="tr" v-for="(item, index) in dataJinri" :key="index" :class="{ even: index % 2 === 0 }">
 							<view class="td">{{ index }}</view>
 							<view class="td">{{ item.dw }}</view>
 							<view class="td">
@@ -52,275 +65,305 @@
 							<view class="td">
 								{{ formatNumber(item.nl) }}
 							</view>
+							<view class="td1" style="color: red" @click="goHistory(item)">历史</view>
 						</view>
 
 						<!-- 空数据提示 -->
-						<view v-if="!dataJinri.length" class="empty">
-							暂无相关数据
-						</view>
+						<view v-if="!dataJinri.length" class="empty">暂无相关数据</view>
 					</view>
 				</scroll-view>
 			</view>
 		</uni-popup>
-
 	</view>
 </template>
 
 <script setup>
-	import {
-		ref,
-		onMounted,
-		computed,
-		nextTick,
-		watchEffect
-	} from 'vue';
-	import {
-		onLoad
-	} from '@dcloudio/uni-app';
-	import {
-		queryJinriYuanyouShengchansj
-	} from '@/api/shengchan.js';
-	import {
-		formatDate,
-		getDateAfterDays
-	} from '@/utils/dateTime.js';
-	import {
-		beforeJump
-	} from '@/utils/index.js';
-	import {
-		useStore
-	} from '@/store';
+import { ref, onMounted, computed, nextTick, watchEffect } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { queryJinriYuanyouShengchansj } from '@/api/shengchan.js';
+import { formatDate, getDateAfterDays } from '@/utils/dateTime.js';
+import { beforeJump } from '@/utils/index.js';
+import { useStore } from '@/store';
 
-	const store = useStore();
-	import dataCom from '@/bpm/dataCom.vue';
+const store = useStore();
+import dataCom from '@/bpm/dataCom.vue';
 
-	const shishiArr = ref([{
-			gas: '原油产量',
-			rcwy: '',
-			yl: '',
-			nl: ''
-		},
-
-	]);
-
-	const dataJinri = ref([]);
-	const dataJinriSum = ref([]);
-	const popup = ref(null);
-	// 点击卡片处理
-	const handleCardClick = () => {
-		popup.value.open();
-	};
-
-	// 关闭弹窗
-	const closePopup = () => {
-		popup.value.close();
-	};
-	onMounted(() => {
-		getJinriYuanyouShengchansj();
-		// getYearShengchansj();
-	});
-
-	const strDate = ref('');
-	// 数字格式化
-	const formatNumber = (num) => {
-		if (typeof num !== 'number') return '-';
-		return num.toFixed(4).replace(/\.?0+$/, '');
-	};
-
-
-
-
-
-	const getJinriYuanyouShengchansj = () => {
-		const now = new Date();
-		if (now.getHours() < 11) {
-			strDate.value = formatDate(getDateAfterDays(now, -1)).toString(); //11点之前  头一天的数据
-		} else {
-			strDate.value = formatDate(now).toString();
-		}
-		let queryParms = {};
-		dataJinri.value = [];
-		dataJinriSum.value = [];
-		queryParms.scrq = strDate.value;
-		queryParms.pageSize = 100;
-		console.log(queryParms);
-		queryJinriYuanyouShengchansj(queryParms).then((res) => {
-			if (res.success) {
-				console.log(res);
-				dataJinri.value = res.result.records;
-				dataJinriSum.value = sumByOil(dataJinri.value); //包含gas  unit  rq  cq  totalGas
-
-
-				console.log(dataJinriSum.value);
-
-				nextTick();
-				shishiArr.value.forEach((item) => {
-					dataJinriSum.value.forEach((itemjinri) => {
-
-						item.rcwy = itemjinri.rcwy.toFixed(4);
-						item.nl = itemjinri.nl.toFixed(4);
-						item.yl = itemjinri.yl.toFixed(4);
-
-					});
-				});
-				// getYearShengchansj(); //再获取今年以来的数据
-			}
-		});
-	};
-
-
-	function sumByOil(records) {
-		console.log(records);
-		const summaryMap = {};
-		try {
-			records.forEach((record) => {
-				const gas = record.gas;
-				if (!summaryMap[gas]) {
-					// 初始化该 gas 类型的汇总对象
-					summaryMap[gas] = {
-						rcwy: 0,
-						yl: 0,
-						nl: 0
-					};
-				}
-				// 无论是否是第一次遇到该 gas 类型，都进行累加操作
-				summaryMap[gas].rcwy += record.rcwy || 0;
-				summaryMap[gas].yl += record.yl || 0;
-				summaryMap[gas].nl += record.nl || 0
-			});
-			return Object.values(summaryMap);
-		} catch (error) {
-			//TODO handle the exception
-			console.log(error);
-		}
+const shishiArr = ref([
+	{
+		gas: '原油产量',
+		rcwy: '',
+		yl: '',
+		nl: '',
+		yearPlan: '1500',
+		yearPerCent: ''
 	}
+]);
+
+const dataJinri = ref([]);
+const dataJinriSum = ref([]);
+const popup = ref(null);
+// 点击卡片处理
+const handleCardClick = () => {
+	popup.value.open();
+};
+
+// 关闭弹窗
+const closePopup = () => {
+	popup.value.close();
+};
+onMounted(() => {
+	getJinriYuanyouShengchansj();
+	// getYearShengchansj();
+});
+
+const strDate = ref('');
+// 数字格式化
+const formatNumber = (num) => {
+	if (typeof num !== 'number') return '-';
+	return num.toFixed(4).replace(/\.?0+$/, '');
+};
+function goHistory(val) {
+	uni.navigateTo({
+		url: '/pages/views/shengchan/ribaoshuju/rbsjLsxq?data=' + JSON.stringify(val)
+	});
+}
+const getJinriYuanyouShengchansj = () => {
+	const now = new Date();
+	if (now.getHours() < 11) {
+		strDate.value = formatDate(getDateAfterDays(now, -1)).toString(); //11点之前  头一天的数据
+	} else {
+		strDate.value = formatDate(now).toString();
+	}
+	let queryParms = {};
+	dataJinri.value = [];
+	dataJinriSum.value = [];
+	queryParms.scrq = strDate.value;
+	queryParms.pageSize = 100;
+	// console.log(queryParms);
+	queryJinriYuanyouShengchansj(queryParms).then((res) => {
+		if (res.success) {
+			// console.log(res);
+			dataJinri.value = res.result.records;
+			dataJinriSum.value = sumByOil(dataJinri.value); //包含gas  unit  rq  cq  totalGas
+			// console.log(dataJinriSum.value);
+			nextTick();
+			shishiArr.value.forEach((item) => {
+				dataJinriSum.value.forEach((itemjinri) => {
+					item.rcwy = itemjinri.rcwy.toFixed(4);
+					item.nl = itemjinri.nl.toFixed(4);
+					item.yl = itemjinri.yl.toFixed(4);
+					item.yearPerCent = calcPercent(item.yearPlan, item.nl);
+				});
+			});
+			// getYearShengchansj(); //再获取今年以来的数据
+		}
+	});
+};
+function calcPercent(yearJihua, yearShiji) {
+	// 计算进度百分比，避免除数为 0
+	// 确保进度百分比不超过 100
+	let plan = parseFloat(yearJihua === '' ? 0 : yearJihua);
+	let shiji = parseFloat(yearShiji);
+	let percent = 0;
+	// 修改原始计算代码
+	if (plan > 0) {
+		percent = (shiji / plan) * 100;
+		percent = Math.min(percent, 100); // 限制最大100%
+	}
+	return parseFloat(percent.toFixed(1)); // 转为数值
+}
+function sumByOil(records) {
+	console.log(records);
+	const summaryMap = {};
+	try {
+		records.forEach((record) => {
+			const gas = record.gas;
+			if (!summaryMap[gas]) {
+				// 初始化该 gas 类型的汇总对象
+				summaryMap[gas] = {
+					rcwy: 0,
+					yl: 0,
+					nl: 0
+				};
+			}
+			// 无论是否是第一次遇到该 gas 类型，都进行累加操作
+			summaryMap[gas].rcwy += record.rcwy || 0;
+			summaryMap[gas].yl += record.yl || 0;
+			summaryMap[gas].nl += record.nl || 0;
+		});
+		return Object.values(summaryMap);
+	} catch (error) {
+		//TODO handle the exception
+		console.log(error);
+	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.container {
+.container {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 20rpx;
+	gap: 20rpx;
+}
+
+.popup-content {
+	padding: 30rpx;
+	max-height: 70vh;
+}
+
+.popup-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 30rpx;
+	padding-bottom: 20rpx;
+	border-bottom: 2rpx solid #eee;
+
+	.title {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+	}
+}
+
+.table-container {
+	width: 100%;
+	height: 30vh;
+	overflow: hidden;
+}
+
+.table {
+	min-width: 100%;
+	border: 2rpx solid #e8e8e8;
+
+	.tr {
 		display: flex;
-		flex-wrap: wrap;
-		padding: 20rpx;
-		gap: 20rpx;
+		border-bottom: 2rpx solid #e8e8e8;
+
+		&.header {
+			background-color: #fafafa;
+			font-weight: 600;
+		}
+
+		&.even {
+			background-color: #f8f8f8;
+		}
 	}
 
-	.popup-content {
-		padding: 30rpx;
-		max-height: 70vh;
+	.th,
+	.td {
+		flex: 1;
+		min-width: 80rpx;
+		padding: 10rpx;
+		font-size: 20rpx;
+		font-weight: 500;
+		color: #333;
+		text-align: center;
+		white-space: nowrap;
+	}
+	.th1,
+	.td1 {
+		flex: 1;
+		max-width: 40rpx;
+		padding: 10rpx;
+		font-size: 22rpx;
+		font-weight: bold;
+		color: #333;
+		text-align: center;
+		white-space: nowrap;
+		height: 30rpx;
+		vertical-align: middle;
 	}
 
-	.popup-header {
+	.th {
+		background-color: #f0f0f0;
+	}
+
+	.td.negative {
+		color: #ff4444;
+		font-weight: 500;
+	}
+}
+
+.empty {
+	padding: 40rpx;
+	text-align: center;
+	color: #888;
+	font-size: 16rpx;
+}
+
+.card-item {
+	flex: 1 1 200rpx; // 基础宽度300rpx，自动伸缩   selectedGas  formatNumber
+	min-width: 200rpx;
+	max-width: calc(50% - 10rpx); // 最大不超过容器一半（考虑间距）
+
+	@media (min-width: 768px) {
+		max-width: calc(33.33% - 14rpx); // 大屏显示3列
+	}
+}
+
+.card {
+	background: #ffffff;
+	border-radius: 16rpx;
+	padding: 10rpx;
+	box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+
+	.title {
+		display: block;
+		font-size: 28rpx;
+		font-weight: 600;
+		color: #333;
+		margin-bottom: 16rpx;
+	}
+
+	.content {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		margin-bottom: 30rpx;
-		padding-bottom: 20rpx;
-		border-bottom: 2rpx solid #eee;
+		margin-bottom: 10rpx;
 
-		.title {
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #333;
-		}
-	}
-
-	.table-container {
-		width: 100%;
-		height: 30vh;
-		overflow: hidden;
-	}
-
-	.table {
-		min-width: 100%;
-		border: 2rpx solid #e8e8e8;
-
-		.tr {
-			display: flex;
-			border-bottom: 2rpx solid #e8e8e8;
-
-			&.header {
-				background-color: #fafafa;
-				font-weight: 600;
-			}
-
-			&.even {
-				background-color: #f8f8f8;
-			}
+		&:last-child {
+			margin-bottom: 0;
 		}
 
-		.th,
-		.td {
-			flex: 1;
-			min-width: 80rpx;
-			padding: 10rpx;
-			font-size: 20rpx;
-			font-weight: 500;
-			color: #333;
-			text-align: center;
-			white-space: nowrap;
+		.label {
+			font-size: 24rpx;
+			color: #666;
 		}
 
-		.th {
-			background-color: #f0f0f0;
-		}
-
-		.td.negative {
-			color: #ff4444;
-			font-weight: 500;
-		}
-	}
-
-	.empty {
-		padding: 40rpx;
-		text-align: center;
-		color: #888;
-		font-size: 16rpx;
-	}
-
-	.card-item {
-		flex: 1 1 200rpx; // 基础宽度300rpx，自动伸缩   selectedGas  formatNumber
-		min-width: 200rpx;
-		max-width: calc(50% - 10rpx); // 最大不超过容器一半（考虑间距）
-
-		@media (min-width: 768px) {
-			max-width: calc(33.33% - 14rpx); // 大屏显示3列
-		}
-	}
-
-	.card {
-		background: #ffffff;
-		border-radius: 16rpx;
-		padding: 10rpx;
-		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
-
-		.title {
-			display: block;
+		.value {
 			font-size: 28rpx;
-			font-weight: 600;
-			color: #333;
-			margin-bottom: 16rpx;
-		}
-
-		.content {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-bottom: 10rpx;
-
-			&:last-child {
-				margin-bottom: 0;
-			}
-
-			.label {
-				font-size: 24rpx;
-				color: #666;
-			}
-
-			.value {
-				font-size: 28rpx;
-				color: #0000ff;
-				font-weight: 500;
-			}
+			color: #0000ff;
+			font-weight: 500;
 		}
 	}
-</style>
\ No newline at end of file
+}
+.progress-item {
+	margin-bottom: 20px;
+}
+
+.progress-bar {
+	position: relative;
+	height: 20px;
+	background: #f0f0f0;
+	border-radius: 10px;
+	overflow: hidden;
+}
+
+.progress {
+	height: 100%;
+	transition: all 0.3s;
+}
+
+.progress-text {
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	color: red; /* 保持红色 */
+	font-size: 12px;
+	font-weight: bold;
+	text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); /* 提升可读性 */
+}
+</style>
diff --git a/utils/dateTime.js b/utils/dateTime.js
index 9095266..f614bbe 100644
--- a/utils/dateTime.js
+++ b/utils/dateTime.js
@@ -52,8 +52,67 @@ function getDateAfterDays(date, days) {
 	return newDate;
 }
 
+function getDateAfterMonths(date, months) {
+	const newDate = new Date(date);
+	const originalDate = date.getDate();
+
+	// 保存原始年月日
+	const originalYear = date.getFullYear();
+	const originalMonth = date.getMonth();
+
+	// 计算目标年月
+	const totalMonths = originalMonth + months;
+	const expectedYear = originalYear + Math.floor(totalMonths / 12);
+	const expectedMonth = totalMonths % 12;
+
+	// 尝试设置新月份
+	newDate.setMonth(totalMonths);
+
+	// 处理月末边界情况
+	if (
+		newDate.getFullYear() !== expectedYear ||
+		newDate.getMonth() !== expectedMonth
+	) {
+		// 当设置月份失败时（如1月31日设置到2月）
+		// 设置为目标月份的最后一天
+		newDate.setFullYear(expectedYear, expectedMonth + 1, 0);
+	} else if (newDate.getDate() !== originalDate) {
+		// 当日期自动变化时（如1月30日设置到2月）
+		// 同样设置为目标月份的最后一天
+		newDate.setDate(0);
+	}
+
+	return newDate;
+}
+
+
+//计算当前日期占全年的进度数据
+// 示例用法
+// console.log(getYearProgress()); // 输出如 "35.42%"
+function getYearProgress() {
+	const now = new Date(); // 当前时间
+	const year = now.getFullYear();
+
+	// 关键时间点
+	const yearStart = new Date(year, 0, 1); // 当年1月1日
+	const nextYearStart = new Date(year + 1, 0, 1); // 下一年1月1日
+
+	// 计算时间差（毫秒）
+	const totalMs = nextYearStart - yearStart; // 全年总时长
+	const passedMs = now - yearStart; // 已过时长
+
+	// 计算百分比（保留2位小数）
+	const progress = ((passedMs / totalMs) * 100).toFixed(2);
+
+	return parseFloat(progress);
+}
+
+
+
 export {
 	formatDate,
 	getDateAfterDays,
-	getDaysDifference
+	getDaysDifference,
+	getDateAfterMonths,
+	getYearProgress
 }
\ No newline at end of file