From 814cad17d825834f24f94d7b8c32cd79900dd43a Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Tue, 9 Sep 2025 14:56:05 +0800
Subject: [PATCH 01/12] 2.2.0

---
 env/.env.development | 3 +--
 manifest.config.ts   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/env/.env.development b/env/.env.development
index f246eb6..a95d8f3 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -8,8 +8,7 @@ VITE_SHOW_SOURCEMAP = true
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
 #VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
-#VITE_SERVER_BASEURL = 'http://10.96.108.144:8080/jeecg-boot'
-VITE_SERVER_BASEURL = 'http://10.75.173.194:8080/jeecg-boot'
+VITE_SERVER_BASEURL = 'http://10.96.108.144:8080/jeecg-boot'
 
 #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
diff --git a/manifest.config.ts b/manifest.config.ts
index 4af61d1..c8adea4 100644
--- a/manifest.config.ts
+++ b/manifest.config.ts
@@ -18,7 +18,7 @@ export default defineManifestConfig({
   appid: VITE_UNI_APPID,
   description: '',
   versionName: '2.2.0',
-  versionCode: '20250903',
+  versionCode: '20250909',
   transformPx: false,
   locale: VITE_FALLBACK_LOCALE, // 'zh-Hans'
   /* 5+App特有相关 */

From aa9da6a821ea86416aabd19a1e711c5eb6e1f085 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Tue, 9 Sep 2025 14:56:40 +0800
Subject: [PATCH 02/12] 2.2.0

---
 src/pages/login/login.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 272449f..192171f 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -137,12 +137,12 @@
 			})
 		} else {
 			/*开发环境 */
-			params.captcha = 'app';
+			// params.captcha = 'app';
 			/*生产环境 */
-			// params = {
-			// 	username: Base64.encode(encodeURIComponent(userName.value)),
-			// 	password: Base64.encode(encodeURIComponent(password.value)),
-			// };
+			params = {
+				username: Base64.encode(encodeURIComponent(userName.value)),
+				password: Base64.encode(encodeURIComponent(password.value)),
+			};
 		}
 		login(params)
 	}

From ce9b55751103cd5fbc168137014ed81b30221993 Mon Sep 17 00:00:00 2001
From: liaodeyun <ldeyun@163.com>
Date: Tue, 16 Sep 2025 08:59:06 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=A4=9A=E6=9B=B2=E7=BA=BF=E7=BB=84=E4=BB=B6=20=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=AE=9E=E6=97=B6=E9=87=87=E9=9B=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9E=AC=E6=97=B6=E6=B5=81=E9=87=8F=E7=82=B9=E5=87=BB=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BA=94=E5=88=86=E9=92=9F=E5=AD=98=E7=9B=98=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=8E=86=E5=8F=B2=E8=B6=8B=E5=8A=BF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/production/index.ts                   |   8 +
 .../shishishuju/chart/lssjChart.vue           | 613 +++++-------------
 .../shishishuju/chart/sssjChart.vue           |   4 +-
 src/pages-production/shishishuju/trqSssj.vue  |  11 +-
 .../cxc-szcx-multiLineChart.vue               |  36 +-
 5 files changed, 187 insertions(+), 485 deletions(-)

diff --git a/src/api/production/index.ts b/src/api/production/index.ts
index 6eb4093..5159a3d 100644
--- a/src/api/production/index.ts
+++ b/src/api/production/index.ts
@@ -56,4 +56,12 @@ export function queryJldDataByJldID(params : object) { // 获取计量点五分
 		method: 'GET',
 		data: params
 	})
+}
+
+export function queryJldRbDataByJldID(params : object) { // 获取计量点日报数据
+	return http({
+		url: 'http://10.75.166.6:9999/Gyk/jldls/cxcSssjLssjJldls/getLssjByJldId',
+		method: 'GET',
+		data: params
+	})
 }
\ No newline at end of file
diff --git a/src/pages-production/shishishuju/chart/lssjChart.vue b/src/pages-production/shishishuju/chart/lssjChart.vue
index 3b58067..48a128f 100644
--- a/src/pages-production/shishishuju/chart/lssjChart.vue
+++ b/src/pages-production/shishishuju/chart/lssjChart.vue
@@ -9,499 +9,192 @@
 </route>
 
 <template>
-	<PageLayout navTitle="历史数据图表" backRouteName="index" routeMethod="pushTab">
-		<view class="chart-container">
-			<view class="chart-header">
-				<view class="chart-title-container">
-					<text class="chart-title">{{ chartTitle }}</text>
-				</view>
-
-				<view class="filter-section">
-					<view class="date-picker">
-						<uni-datetime-picker type="datetimerange" v-model="lssjTimeRang" @change="getTime"
-							:placeholder="['开始时间', '结束时间']" />
-					</view>
-
-					<view class="checkbox-container">
-						<label class="checkbox">
-							<checkbox :checked="tableVisibled" @change="onChangeTable" />
-							<text>{{ checkBoxText }}</text>
-						</label>
-					</view>
-				</view>
-			</view>
-
-			<!-- 图表容器 -->
-			<view id="myCharts" class="chart"></view>
-
-			<!-- 数据表格 -->
-			<view v-if="tableVisibled" class="table-container">
-				<uni-table border stripe emptyText="暂无数据" :loading="loading">
-					<uni-tr>
-						<uni-th width="60" align="center">序号</uni-th>
-						<uni-th align="center">日期时间</uni-th>
-						<uni-th align="center">温度(℃)</uni-th>
-						<uni-th align="center">压力(MPa)</uni-th>
-						<uni-th align="center">压差(kPa)</uni-th>
-						<uni-th align="center">瞬时量(Nm³/d)</uni-th>
-						<uni-th align="center">今日量(m³)</uni-th>
-						<uni-th align="center">今日时间(分)</uni-th>
-						<uni-th align="center">仪表状态</uni-th>
-					</uni-tr>
-					<uni-tr v-for="(item, index) in dataSource" :key="index">
-						<uni-td align="center">{{ index + 1 }}</uni-td>
-						<uni-td align="center">{{ formatTableTime(item.createTime) }}</uni-td>
-						<uni-td align="center">{{ item.wd }}</uni-td>
-						<uni-td align="center">{{ item.yl }}</uni-td>
-						<uni-td align="center">{{ item.yc }}</uni-td>
-						<uni-td align="center">{{ item.ssll }}</uni-td>
-						<uni-td align="center">{{ item.jrl }}</uni-td>
-						<uni-td align="center">{{ item.jrsj }}</uni-td>
-						<uni-td align="center">{{ item.zt }}</uni-td>
-					</uni-tr>
-				</uni-table>
-
-				<view class="pagination">
-					<uni-pagination :current="ipagination.current" :pageSize="ipagination.pageSize"
-						:total="ipagination.total" @change="handlePageChange" showTotal />
-				</view>
-			</view>
+	<PageLayout :navbarShow="false" class="page-layout">
+		<view style="color: blue;font-size:18px;text-align: center;margin: 10px;width: 100%;">
+			<wd-text :text="jldData.jldname+ '日报数据'" style="color: blue;font-size:18px;"></wd-text>
 		</view>
+		<view>
+			<uni-datetime-picker type="datetimerange" v-model="lssjTimeRange" @change="getTime" start-placeholder="开始时间"
+				end-placeholder="结束时间" />
+		</view>
+		<view style="text-align: center;padding: 5px;">
+
+			<wd-button custom-class="custom-value" size="small" plain clickable @click="handleForward">前一天</wd-button>
+			<wd-button custom-class="custom-value" size="small" plain clickable @click="handleNext">后一天</wd-button>
+			<wd-button custom-class="custom-value" size="small" plain clickable @click="handleQuery">查询数据</wd-button>
+			<wd-button custom-class="custom-value" size="small" plain clickable @click="handleDrawLine">生成曲线</wd-button>
+
+
+		</view>
+		<view>
+			<scroll-view direction="vertical" style="height: 200px;">
+				<wd-table :data="chartData" height="200px">
+					<wd-table-col prop="createTime" label="日期" align="center"></wd-table-col>
+					<wd-table-col prop="jldName" label="计量点名称" align="center"></wd-table-col>
+					<wd-table-col prop="ql" label="今日流量(m³)" align="center">
+					</wd-table-col>
+				</wd-table>
+			</scroll-view>
+		</view>
+		<view v-if="drawLineFlag">
+			<cxc-szcx-multiLineChart :data-list="chartData" x-field="createTime"
+				:y-fields="lineFields"></cxc-szcx-multiLineChart>
+		</view>
+
 	</PageLayout>
 </template>
 
 <script setup>
 	import {
-		ref,
-		onMounted,
-		onUnmounted,
-		watch,
-		nextTick
-	} from 'vue'
-	import {
-		onLoad
-	} from '@dcloudio/uni-app'
+		queryJldRbDataByJldID
+	} from '@/api/production'
 	import {
 		formatDate
-	} from '@/utils/dateTime.ts'
+	} from '@/utils/dateTime.ts';
+	import {
+		ref,
+		onMounted,
+		computed,
+		nextTick,
+		watchEffect,
+		onUnmounted,
+	} from 'vue';
+
+
+	const lineFields = ref([
+
+		{
+			name: '日流量',
+			field: 'jrl',
+			min: '0',
+			max: '50000',
+			unit: 'm³'
+		}
+	])
 
-	// 定义props
 	const props = defineProps({
-		lineData: {
+		jldData: {
 			type: Object,
-			default: () => ({})
+			default: () => {}
 		}
 	})
+	const chartData = ref([])
+	const drawLineFlag = ref(false)
 
-	// 数据声明
-	const urljlByJldID = ref('https://szcx.zyyt.sinopec.com/Gyk/jldls/cxcSssjLssjJldls/getLssjByJldId')
+	function handleQuery() {
+
+		const jldid = props.jldData.id;
+		queryJldRbDataByJldID({
+			jldId: jldid,
+			startTime: startTime.value,
+			endTime: endTime.value
+		}).then(res => {
+			chartData.value = JSON.parse(res.result)
+
+			chartData.value.forEach(item => {
+				item.createTime = formatDate(item.createTime, "YYYY-MM-DD HH:mm ss")
+			})
+			console.log(123, chartData.value)
+		})
 
 
-	const colorData = [{
-			color: '#000000'
-		},
-		{
-			color: '#00007f'
-		},
-		{
-			color: '#ff0000'
-		},
-		{
-			color: '#005500'
-		},
-		{
-			color: '#55007f'
-		},
-		{
-			color: '#ffff00'
+	}
+
+	function handleDrawLine() {
+		drawLineFlag.value = true
+	}
+	// 前一天 - 以当前选择的起始日期为基准计算
+	function handleForward() {
+		// 使用当前选择的开始时间作为基准，而不是系统当前时间
+		lssjTimeRange.value = getDefaultTimeRange(-1);
+	}
+
+	// 后一天
+	function handleNext() {
+		// 获取当前选择的开始时间
+		const currentStart = new Date(startTime.value);
+		// 获取今天8点的时间对象
+		const today8AM = new Date();
+		today8AM.setHours(8, 0, 0, 0);
+
+		// 允许切换到今天及之前的日期范围
+		if (currentStart < today8AM || isSameDay(currentStart, today8AM)) {
+			lssjTimeRange.value = getDefaultTimeRange(1);
+		} else {
+			// 可添加提示：已经是最新数据
+			uni.showToast({
+				title: '已是最新数据',
+				icon: 'none',
+				duration: 1500
+			});
 		}
-	]
+	}
 
-	const option = ref({})
-	const legendData = ref([])
-	const xData = ref([])
-	const yaxis = ref({
-		type: 'value',
-		name: '',
-		min: 0,
-		max: 500,
-		position: 'left',
-		axisLabel: {
-			formatter: '{value}'
-		},
-		axisLine: {
-			lineStyle: {
-				color: '#61A0A8'
-			}
+	// 获取指定日期偏移的时间范围（每天8:00至次日7:59）
+	const getDefaultTimeRange = (days) => {
+		// 防止原日期对象被污染，使用当前选择的开始时间作为基准
+		var baseDate;
+		if (startTime.value && new Date(startTime.value).toString() !== 'Invalid Date') {
+			baseDate = new Date(startTime.value);
+		} else {
+			// 如果选择的时间无效，则使用当前时间作为 fallback
+			baseDate = new Date();
 		}
-	})
 
-	const yAxis = ref([])
-	const series = ref([])
-	const serie = ref({
-		field: '',
-		name: '',
-		showSymbol: false,
-		type: 'line',
-		data: [],
-		yAxisIndex: 1,
-		lineStyle: {
-			color: '#61A0A8',
-			width: 1
-		},
-		connectNulls: false
-	})
+		// 计算目标日期（基础日期 + 偏移天数）
+		const targetDate = new Date(baseDate);
+		targetDate.setDate(baseDate.getDate() + days);
 
-	const tableVisibled = ref(false)
-	const checkBoxText = ref('显示历史报表')
-	const dataSource = ref([])
-	const loading = ref(false)
-	const ipagination = ref({
-		current: 1,
-		pageSize: 10,
-		total: 0
-	})
+		// 构建开始时间：目标日期的8:00:00
+		const start = new Date(targetDate);
+		start.setHours(8, 0, 0, 0);
 
-	const jldID = ref('')
-	const jldName = ref('')
-	const chartTitle = ref('')
-	const lineName = ref([])
+		// 构建结束时间：目标日期+1天的7:59:59
+		const end = new Date(targetDate);
+		end.setDate(targetDate.getDate() + 1);
+		end.setHours(7, 59, 59, 0);
+
+		// 格式化时间字符串
+		const formattedStart = formatDate(start, 'YYYY-MM-DD HH:mm:ss');
+		const formattedEnd = formatDate(end, 'YYYY-MM-DD HH:mm:ss');
+
+		// 更新响应式变量
+		startTime.value = formattedStart;
+		endTime.value = formattedEnd;
+
+		return [formattedStart, formattedEnd];
+	};
+
+	// 辅助函数：判断两个日期是否是同一天
+	const isSameDay = (date1, date2) => {
+		return date1.getFullYear() === date2.getFullYear() &&
+			date1.getMonth() === date2.getMonth() &&
+			date1.getDate() === date2.getDate();
+	};
+
+	onMounted(() => {
+		// 设置默认时间范围  需要延时等控件渲染好
+		setTimeout(() => {
+			lssjTimeRange.value = getDefaultTimeRange(0)
+		}, 500)
+
+		console.log(lssjTimeRange.value);
+	})
 	const startTime = ref('')
 	const endTime = ref('')
-	const lssjTimeRang = ref([])
-	const myCharts = ref(null)
+	const lssjTimeRange = ref([])
 
-	// 获取当前日期时间范围
-	const getDefaultTimeRange = () => {
-		const now = new Date()
-		const start = new Date(now)
-		start.setHours(8, 0, 0, 0)
-
-		const end = new Date(now)
-		end.setDate(end.getDate() + 1)
-		end.setHours(7, 59, 59, 0)
-
-		return [start.getTime(), end.getTime()]
-	}
-
-	// 初始化图表
-	const initChart = () => {
-		series.value = []
-		yAxis.value = []
-		xData.value = []
-		let positionIndex = 0
-
-		for (let i = 0; i < lineName.value.length; i++) {
-			const yaxisTemp = JSON.parse(JSON.stringify(yaxis.value))
-			legendData.value.push(`${lineName.value[i].name}(${lineName.value[i].unit})`)
-
-			if (lineName.value[i].field === 'ssll') {
-				yaxisTemp.position = 'left'
-			} else {
-				yaxisTemp.position = 'right'
-				yaxisTemp.offset = lineName.value[i].field === 'jrl' ? 60 * positionIndex : 55 * positionIndex
-				positionIndex += 1
-			}
-
-			yaxisTemp.name = `${lineName.value[i].name}(${lineName.value[i].unit})`
-			yaxisTemp.min = lineName.value[i].min
-			yaxisTemp.max = lineName.value[i].max
-			yaxisTemp.axisLine.lineStyle.color = colorData[i].color
-			yAxis.value.push(yaxisTemp)
-
-			const serieTemp = JSON.parse(JSON.stringify(serie.value))
-			serieTemp.name = `${lineName.value[i].name}(${lineName.value[i].unit})`
-			serieTemp.field = lineName.value[i].field
-			serieTemp.lineStyle.color = colorData[i].color
-			serieTemp.yAxisIndex = i
-			series.value.push(serieTemp)
-		}
-
-		option.value = {
-			color: ['#000000', '#00007f', '#ff0000', '#005500', '#55007f', '#ffff00'],
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: {
-					type: 'shadow'
-				}
-			},
-			dataZoom: [{
-				connectNulls: false,
-				id: 'dataZoomX',
-				type: "inside",
-				roam: false,
-				show: true,
-				xAxisIndex: [0],
-				filterMode: 'empty',
-				throttle: 50,
-				zoomOnMouseWheel: true,
-				moveOnMouseMove: true
-			}, {
-				id: 'dataZoomY',
-				type: 'inside',
-				filterMode: 'empty',
-				zoomLock: false,
-				throttle: 50,
-				zoomOnMouseWheel: true,
-				moveOnMouseMove: true
-			}],
-			toolbox: {
-				feature: {
-					dataView: {
-						show: false,
-						readOnly: false
-					},
-					restore: {
-						show: false
-					},
-					saveAsImage: {
-						show: false
-					}
-				}
-			},
-			legend: {
-				data: legendData.value
-			},
-			grid: {
-				top: '10%',
-				left: '3%',
-				right: '10%',
-				bottom: '3%',
-				containLabel: true
-			},
-			xAxis: {
-				type: 'category',
-				axisTick: {
-					alignWithLabel: true
-				},
-				data: xData.value
-			},
-			yAxis: yAxis.value,
-			series: series.value
-		}
-	}
 
 	// 时间选择变化
 	const getTime = (e) => {
 		if (e && e.length === 2) {
-			startTime.value = formatDate(e[0], 'yyyy-MM-dd hh:mm:ss')
-			endTime.value = formatDate(e[1], 'yyyy-MM-dd hh:mm:ss')
-			updateChart()
+			startTime.value = formatDate(e[0], 'YYYY-MM-DD HH:mm:ss')
+			endTime.value = formatDate(e[1], 'YYYY-MM-DD HH:mm:ss')
+			// updateChart()
 		}
 	}
-
-	// 切换表格显示
-	const onChangeTable = (e) => {
-		tableVisibled.value = !tableVisibled.value
-		checkBoxText.value = tableVisibled.value ? '显示历史趋势' : '显示历史报表'
-	}
-
-	// 分页变化
-	const handlePageChange = (e) => {
-		ipagination.value.current = e.current
-		ipagination.value.pageSize = e.pageSize
-	}
-
-	// 格式化表格时间显示
-	const formatTableTime = (time) => {
-		if (!time) return ''
-		return formatDate(time, 'yyyy-MM-dd hh:mm:ss')
-	}
-
-	// 获取数组最大值
-	const maxArrValue = (data) => {
-		if (!data || data.length === 0) return 0
-
-		const list = []
-		for (let i in data) {
-			if (data[i] !== null) {
-				list.push(parseInt(data[i]))
-			}
-		}
-
-		if (list.length === 0) return 0
-
-		list.sort((num1, num2) => num1 - num2)
-		return list[list.length - 1]
-	}
-
-	// 更新图表数据
-	const updateChart = () => {
-		dataSource.value = []
-		xData.value = []
-
-		for (let j = 0; j < series.value.length; j++) {
-			series.value[j].data = []
-		}
-
-		loading.value = true
-
-		getAction(url.list, {
-			jldId: jldID.value,
-			startTime: startTime.value,
-			endTime: endTime.value
-		}).then(res => {
-			loading.value = false
-
-			if (res.success) {
-				const ssData = JSON.parse(res.result)
-				dataSource.value = ssData
-				ipagination.value.total = ssData.length
-
-				for (let i = 0; i < ssData.length; i++) {
-					const ctime = formatDate(ssData[i].createTime, 'yyyy-MM-dd hh:mm:ss')
-					xData.value.push(ctime)
-
-					for (let j = 0; j < series.value.length; j++) {
-						let tempValue = ssData[i][lineName.value[j].field]
-						tempValue = tempValue === 0 ? null : tempValue
-						series.value[j].data.push(tempValue)
-					}
-				}
-
-				for (let mm = 0; mm < series.value.length; mm++) {
-					const maxVal = maxArrValue(series.value[mm].data)
-					yAxis.value[mm].max = Math.round(maxVal * 1.2)
-				}
-
-				option.value.xAxis.data = xData.value
-
-				if (myCharts.value) {
-					myCharts.value.setOption(option.value)
-				}
-			}
-		}).catch(() => {
-			loading.value = false
-		})
-	}
-
-	// 初始化ECharts
-	const initECharts = () => {
-		nextTick(() => {
-			// 在Uniapp中，需要使用uni.createCanvasContext或使用ucharts等替代方案
-			// 这里简化处理，实际使用时需要根据Uniapp的图表方案调整
-			const canvas = document.getElementById('myCharts')
-			if (canvas) {
-				// 初始化ECharts实例
-				myCharts.value = echarts.init(canvas)
-				myCharts.value.setOption(option.value)
-			}
-		})
-	}
-
-	// 监听lineData变化
-	watch(() => props.lineData, (val) => {
-		jldID.value = val.jldID
-		jldName.value = val.jldName
-		chartTitle.value = `${val.jldName}历史趋势`
-		lineName.value = JSON.parse(JSON.stringify(val.lineName))
-		startTime.value = val.startTime
-		endTime.value = val.endTime
-
-		try {
-			if (val.startTime && val.endTime) {
-				const sDt = new Date(val.startTime)
-				const eDt = new Date(val.endTime)
-				lssjTimeRang.value = [sDt.getTime(), eDt.getTime()]
-			} else {
-				lssjTimeRang.value = getDefaultTimeRange()
-			}
-		} catch (e) {
-			console.error('时间格式错误', e)
-			lssjTimeRang.value = getDefaultTimeRange()
-		}
-
-		initChart()
-		updateChart()
-	}, {
-		deep: true,
-		immediate: true
-	})
-
-	// 页面加载
-	onLoad(() => {
-		// 设置默认时间范围
-		lssjTimeRang.value = getDefaultTimeRange()
-
-		// 在Uniapp中需要动态导入echarts或使用其他图表库
-		setTimeout(() => {
-			initECharts()
-		}, 500)
-	})
-
-	// 页面卸载
-	onUnmounted(() => {
-		if (myCharts.value) {
-			myCharts.value.dispose()
-		}
-	})
 </script>
 
 <style scoped>
-	.chart-container {
-		width: 100%;
-		height: 100%;
-		padding: 20rpx;
-		box-sizing: border-box;
-		display: flex;
-		flex-direction: column;
-	}
 
-	.chart-header {
-		margin-bottom: 20rpx;
-	}
-
-	.chart-title-container {
-		width: 100%;
-		text-align: center;
-		margin-bottom: 20rpx;
-	}
-
-	.chart-title {
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #333;
-	}
-
-	.filter-section {
-		display: flex;
-		flex-direction: column;
-		gap: 20rpx;
-		margin-bottom: 20rpx;
-	}
-
-	.date-picker {
-		width: 100%;
-	}
-
-	.checkbox-container {
-		display: flex;
-		align-items: center;
-	}
-
-	.checkbox {
-		display: flex;
-		align-items: center;
-		font-size: 28rpx;
-	}
-
-	.chart {
-		width: 100%;
-		height: 600rpx;
-		background-color: #fff;
-		border-radius: 10rpx;
-		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
-		margin-bottom: 20rpx;
-	}
-
-	.table-container {
-		width: 100%;
-		overflow-x: auto;
-	}
-
-	.pagination {
-		margin-top: 20rpx;
-		display: flex;
-		justify-content: center;
-	}
 </style>
\ No newline at end of file
diff --git a/src/pages-production/shishishuju/chart/sssjChart.vue b/src/pages-production/shishishuju/chart/sssjChart.vue
index 46e9fcd..f14d010 100644
--- a/src/pages-production/shishishuju/chart/sssjChart.vue
+++ b/src/pages-production/shishishuju/chart/sssjChart.vue
@@ -42,8 +42,8 @@
 			</scroll-view>
 		</view>
 		<view v-if="drawLineFlag">
-			<cxc-szcx-multiLineChart :data-list="chartData" x-field="createTime" :y-fields="lineFields"
-				title="文增伴生气外输数据趋势" height="300"></cxc-szcx-multiLineChart>
+			<cxc-szcx-multiLineChart :data-list="chartData" x-field="createTime"
+				:y-fields="lineFields"></cxc-szcx-multiLineChart>
 		</view>
 
 	</PageLayout>
diff --git a/src/pages-production/shishishuju/trqSssj.vue b/src/pages-production/shishishuju/trqSssj.vue
index 534f863..d9b3124 100644
--- a/src/pages-production/shishishuju/trqSssj.vue
+++ b/src/pages-production/shishishuju/trqSssj.vue
@@ -86,13 +86,13 @@
 			<cxc-szcx-stationJl-select v-model="stationID" returnCodeOrID="id" @change="onChange">
 			</cxc-szcx-stationJl-select>
 		</wd-popup>
-		<wd-popup v-model="lssjFlag" position="bottom" custom-style="width:100%;height: 300px;" @close="handleClose">
-			<lssj-chart></lssj-chart>
-		</wd-popup>
+
 		<wd-popup v-model="sssjFlag" position="bottom" custom-style="width:100%;height: 70vh;" @close="handleClose">
 			<sssj-chart :jldData="jldData"></sssj-chart>
 		</wd-popup>
-
+		<wd-popup v-model="lssjFlag" position="bottom" custom-style="width:100%;height: 70vh;" @close="handleClose">
+			<lssj-chart :jldData="jldData"></lssj-chart>
+		</wd-popup>
 	</PageLayout>
 </template>
 <script setup>
@@ -144,7 +144,8 @@
 	}
 
 	function openlssjChart(e) {
-		sssjFlag.value = true;
+		lssjFlag.value = true;
+		jldData.value = e
 		console.log(selectZc.value)
 	}
 
diff --git a/src/uni_modules/cxc-szcx-multiLineChart/components/cxc-szcx-multiLineChart/cxc-szcx-multiLineChart.vue b/src/uni_modules/cxc-szcx-multiLineChart/components/cxc-szcx-multiLineChart/cxc-szcx-multiLineChart.vue
index 721ef79..46d49ae 100644
--- a/src/uni_modules/cxc-szcx-multiLineChart/components/cxc-szcx-multiLineChart/cxc-szcx-multiLineChart.vue
+++ b/src/uni_modules/cxc-szcx-multiLineChart/components/cxc-szcx-multiLineChart/cxc-szcx-multiLineChart.vue
@@ -1,5 +1,5 @@
 <template>
-	<view  >
+	<view>
 		<l-echart ref="chart" @finished="drawChart" />
 	</view>
 </template>
@@ -61,7 +61,7 @@
 
 	// 1. 修复：生成图表配置（返回配置对象，供赋值给chartOption.value）
 	const generateOptions = () => {
-		 
+
 		const serie = []; // 局部变量：存储系列配置
 		const yData = []; // 局部变量：存储Y轴配置
 		const xData = []; // 局部变量：存储X轴数据
@@ -100,7 +100,7 @@
 			const legendName = `${yFieldItem.name}(${yFieldItem.unit})`;
 			legendData.push(legendName);
 
-			 
+
 
 			// 调整Y轴位置（ssll放左侧，其他放右侧）
 			if (yFieldItem.field === 'ssll') {
@@ -120,7 +120,7 @@
 			// yaxisTemp.show=false
 
 			yData.push(yaxisTemp);
-			 
+
 			// 系列配置模板
 			const serieTemp = {
 				field: yFieldItem.field,
@@ -136,7 +136,7 @@
 
 			// 修复this.serie.push错误：向局部变量seriepush
 			serie.push(serieTemp);
-			 
+
 		}
 
 		// 修复：返回完整配置对象
@@ -151,7 +151,7 @@
 				alwaysShowContent: true,
 				axisPointer: {
 					type: 'line',
-					show:false
+					show: false
 				}
 			},
 			toolbox: {
@@ -176,11 +176,11 @@
 				data: legendData,
 				itemGap: 5,
 				padding: [35, 5, 25, 5],
-				type: 'scroll', 
-				show:true
+				type: 'scroll',
+				show: true
 			},
 			grid: {
-				width:'auto',
+				width: 'auto',
 				top: '20%',
 				left: '5px',
 				right: '5px', // 动态调整右侧间距（避免Y轴标签被截断）
@@ -192,7 +192,7 @@
 				axisTick: {
 					alignWithLabel: true
 				},
-				show:true,
+				show: true,
 				data: xData
 			},
 			yAxis: yData,
@@ -203,7 +203,7 @@
 	// 2. 修复：数据处理（正确访问响应式变量）
 	const processSeriesData = () => {
 		const ssData = props.dataList;
-		 
+
 		// 修复：访问chartOption.value的属性
 		const xData = [...chartOption.value.xAxis.data]; // 拷贝原X轴数据（避免直接修改）  series
 		const serie = [...chartOption.value.series]; // 拷贝原系列数据
@@ -229,11 +229,11 @@
 		});
 
 		// 动态调整Y轴最大值（修复this.serie和this.maxArrValue错误）
-		serie.forEach((serieItem, mm) => {			
+		serie.forEach((serieItem, mm) => {
 			const maxValue = maxArrValue(serieItem.data);
-			console.log(1,maxValue)
-			yData[mm].max = Math.round(maxValue * 12)/10 || 100; // 兜底：最大值为0时设为100
-			console.log(2,yData[mm].max)
+			console.log(1, maxValue)
+			yData[mm].max = Math.round(maxValue * 12) / 10 || 100; // 兜底：最大值为0时设为100
+			console.log(2, yData[mm].max)
 		});
 
 		// 修复：更新响应式数据（必须通过.value）
@@ -246,7 +246,7 @@
 			series: serie,
 			yAxis: yData
 		};
-		 
+
 	};
 
 	// 3. 修复：计算数组最大值（过滤NaN，避免排序错误）
@@ -285,7 +285,7 @@
 		// 初始化ECharts实例（去掉setTimeout，用async/await更可靠）
 		const myChart = await chart.value.init(echarts);
 		myChart.setOption(chartOption.value);
- 
+
 	};
 
 
@@ -310,5 +310,5 @@
 </script>
 
 <style scoped>
-	 
+
 </style>
\ No newline at end of file

From 312005b3dc3cd76d72abe8958963cff1d4e071ea Mon Sep 17 00:00:00 2001
From: deyun liao <ldeyun@163.com>
Date: Tue, 16 Sep 2025 02:46:39 +0000
Subject: [PATCH 04/12] Update trqSssj.vue

---
 src/pages-production/shishishuju/trqSssj.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages-production/shishishuju/trqSssj.vue b/src/pages-production/shishishuju/trqSssj.vue
index d9b3124..bcc1c20 100644
--- a/src/pages-production/shishishuju/trqSssj.vue
+++ b/src/pages-production/shishishuju/trqSssj.vue
@@ -204,7 +204,6 @@
 	};
 	onMounted(() => {
 		websocketheart()
-		stationID.value = "1267633458481725442"
 	})
 
 	onUnmounted(() => {

From f382f2434520f56245cd3600daf6ad45bea4e7f6 Mon Sep 17 00:00:00 2001
From: liaodeyun <ldeyun@163.com>
Date: Tue, 16 Sep 2025 22:39:12 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9pages-production?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=8F=8A=E8=B7=B3=E8=BD=AC=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AE=9E=E6=97=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=80=BB=E6=8F=BD=E9=A1=B5=E9=9D=A2=EF=BC=8C=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E6=80=BB=E8=A7=88=E5=8D=A1=E7=89=87=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=87=B3=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E3=80=82=20=E4=BF=AE=E6=94=B9=E4=BA=86tab=E7=BB=8F=E8=90=A5?=
 =?UTF-8?q?=E5=88=86=E5=8C=85=E5=8F=8A=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dataTimeShow.vue               |  61 ++
 src/pages-operate/caiwu/index.vue             |  22 +
 src/pages-operate/jingying/index.vue          |  22 +
 src/pages-production/shishishuju/index.vue    |  49 +-
 src/pages-production/shishishuju/trqSssj.vue  |   6 +-
 src/pages.json                                | 133 ++--
 src/pages/operation/index.vue                 | 116 +++-
 src/pages/production/index.vue                |   4 +-
 src/pages/production/ribaoshuju/rbsjLsxq.vue  | 274 --------
 src/pages/production/ribaoshuju/trqRbsj.vue   | 633 ------------------
 src/pages/production/ribaoshuju/yyRbsj.vue    | 317 ---------
 src/pages/production/shishishuju/aqbjSssj.vue |   8 -
 src/pages/production/shishishuju/gycsSssj.vue |   8 -
 src/pages/production/shishishuju/index.vue    |   7 -
 src/pages/production/shishishuju/nyxhSssj.vue |   8 -
 src/pages/production/shishishuju/trqSssj.vue  | 293 --------
 src/pages/production/shishishuju/ysjSssj.vue  |   8 -
 src/types/uni-pages.d.ts                      |  24 +-
 vite.config.ts                                | 309 ++++-----
 19 files changed, 530 insertions(+), 1772 deletions(-)
 create mode 100644 src/components/dataTimeShow.vue
 create mode 100644 src/pages-operate/caiwu/index.vue
 create mode 100644 src/pages-operate/jingying/index.vue
 delete mode 100644 src/pages/production/ribaoshuju/rbsjLsxq.vue
 delete mode 100644 src/pages/production/ribaoshuju/trqRbsj.vue
 delete mode 100644 src/pages/production/ribaoshuju/yyRbsj.vue
 delete mode 100644 src/pages/production/shishishuju/aqbjSssj.vue
 delete mode 100644 src/pages/production/shishishuju/gycsSssj.vue
 delete mode 100644 src/pages/production/shishishuju/index.vue
 delete mode 100644 src/pages/production/shishishuju/nyxhSssj.vue
 delete mode 100644 src/pages/production/shishishuju/trqSssj.vue
 delete mode 100644 src/pages/production/shishishuju/ysjSssj.vue

diff --git a/src/components/dataTimeShow.vue b/src/components/dataTimeShow.vue
new file mode 100644
index 0000000..dfb4fad
--- /dev/null
+++ b/src/components/dataTimeShow.vue
@@ -0,0 +1,61 @@
+<template>
+	<view class="timeText">
+		<wd-text type="primary" :text="nowDateTime"></wd-text>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		computed,
+		nextTick,
+		watchEffect,
+		onUnmounted,
+	} from 'vue';
+	import {
+		onHide,
+		onShow
+	} from '@dcloudio/uni-app'
+	import {
+		formatDate
+	} from '@/utils/dateTime.ts';
+	const timer1 = ref(null);
+	const nowDateTime = ref("")
+	// 封装心跳函数
+	const getDateTime = () => {
+		// 先清除之前的定时器
+		if (timer1.value) {
+			clearInterval(timer1.value);
+			timer1.value = null;
+		}
+		timer1.value = setInterval(() => {
+			nowDateTime.value = formatDate(new Date(), "YYYY年MM月DD日 HH:mm:ss")
+		}, 1000);
+	};
+	onMounted(() => {
+		getDateTime()
+
+	})
+
+	onUnmounted(() => {
+		clearInterval(timer1.value);
+	})
+
+	onHide(() => {
+		clearInterval(timer1.value);
+		timer1.value = null;
+	})
+
+	onShow(() => {
+		getDateTime()
+	})
+</script>
+
+<style scoped>
+	.timeText {
+		text-align: center;
+		width: 100vw;
+		font-size: 20px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages-operate/caiwu/index.vue b/src/pages-operate/caiwu/index.vue
new file mode 100644
index 0000000..f6cb4df
--- /dev/null
+++ b/src/pages-operate/caiwu/index.vue
@@ -0,0 +1,22 @@
+<route lang="json5" type="page">
+	{
+	layout: 'default',
+	style: {
+	navigationStyle: 'custom',
+	navigationBarTitleText: '计划财务 ',
+	},
+	}
+</route>
+<template>
+	<PageLayout :navbarShow="false">
+		<view>
+			财务管理
+		</view>
+	</PageLayout>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages-operate/jingying/index.vue b/src/pages-operate/jingying/index.vue
new file mode 100644
index 0000000..4c886a1
--- /dev/null
+++ b/src/pages-operate/jingying/index.vue
@@ -0,0 +1,22 @@
+<route lang="json5" type="page">
+	{
+	layout: 'default',
+	style: {
+	navigationStyle: 'custom',
+	navigationBarTitleText: '经营考核 ',
+	},
+	}
+</route>
+<template>
+	<PageLayout :navbarShow="false">
+		<view>
+			经营管理
+		</view>
+	</PageLayout>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages-production/shishishuju/index.vue b/src/pages-production/shishishuju/index.vue
index 467da78..7e99fd4 100644
--- a/src/pages-production/shishishuju/index.vue
+++ b/src/pages-production/shishishuju/index.vue
@@ -1,7 +1,50 @@
+<route lang="json5" type="page">
+	{
+	layout: 'default',
+	style: {
+	navigationStyle: 'custom',
+	navigationBarTitleText: '实时数据 ',
+	},
+	}
+</route>
 <template>
-	<trqSssjVue></trqSssjVue>
+	<PageLayout :navbarShow="false">
+		<view>
+			<view style="text-align:center;padding:10px">
+				<date-time-show></date-time-show>
+			</view>
+			<wd-card title="天然气实时数据">
+				天然气实时数据汇总计算结果，用标签显示出各类天然气的实时数据，需要工业库后台进行计算
+				<template #footer>
+					<wd-button size="small" @click="gotoTrqSssj" plain>查看详情</wd-button>
+				</template>
+			</wd-card>
+
+			<wd-card title="管道运行实时数据">
+				各条管线的天然气实时数据汇总计算结果，用标签显示出各类天然气的实时数据，需要工业库后台进行计算
+				<template #footer>
+					<wd-button size="small" @click="gotoGdSssj" plain>查看详情</wd-button>
+				</template>
+			</wd-card>
+		</view>
+	</PageLayout>
 </template>
 
 <script setup>
-	import trqSssjVue from './trqSssj';
-</script>
\ No newline at end of file
+	import dateTimeShow from '@/components/dataTimeShow.vue'
+
+	function gotoTrqSssj() {
+		uni.navigateTo({
+			url: '/pages-production/shishishuju/trqSssj'
+		})
+	}
+
+	function gotoGdSssj() {
+		uni.navigateTo({
+			url: '/pages-production/shishishuju/trqSssj'
+		})
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages-production/shishishuju/trqSssj.vue b/src/pages-production/shishishuju/trqSssj.vue
index 755cdbc..3b27660 100644
--- a/src/pages-production/shishishuju/trqSssj.vue
+++ b/src/pages-production/shishishuju/trqSssj.vue
@@ -3,14 +3,14 @@
 	layout: 'default',
 	style: {
 	navigationStyle: 'custom',
-	navigationBarTitleText: '生产数据',
+	navigationBarTitleText: '天然气实时数据',
 	},
 	}
 </route>
 <template>
-	<PageLayout :navbarShow="false" class="page-layout">
+	<PageLayout navTitle="天然气实时数据" routeMethod="pushTab">
 		<!-- 标题行 -->
-		<wd-text :text="stationName ? stationName + '实时数据' : '实时数据'"
+		<wd-text :text="stationName ? stationName: ' '"
 			style="color: blue;font-size:18px;text-align: center;margin: 5px;"></wd-text>
 		<wd-cell :title="'时间:' + nowDateTime " center>
 			<wd-button custom-class="custom-value" size="small" plain clickable
diff --git a/src/pages.json b/src/pages.json
index c00cee5..42a9490 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -183,47 +183,6 @@
         "navigationBarTitleText": "工作台",
         "navigationStyle": "custom"
       }
-    },
-    {
-      "path": "pages/production/ribaoshuju/rbsjLsxq",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "历史数据"
-      }
-    },
-    {
-      "path": "pages/production/ribaoshuju/trqRbsj",
-      "type": "page"
-    },
-    {
-      "path": "pages/production/ribaoshuju/yyRbsj",
-      "type": "page"
-    },
-    {
-      "path": "pages/production/shishishuju/aqbjSssj",
-      "type": "page"
-    },
-    {
-      "path": "pages/production/shishishuju/gycsSssj",
-      "type": "page"
-    },
-    {
-      "path": "pages/production/shishishuju/index",
-      "type": "page"
-    },
-    {
-      "path": "pages/production/shishishuju/nyxhSssj",
-      "type": "page"
-    },
-    {
-      "path": "pages/production/shishishuju/trqSssj",
-      "type": "page"
-    },
-    {
-      "path": "pages/production/shishishuju/ysjSssj",
-      "type": "page"
     }
   ],
   "subPackages": [
@@ -384,6 +343,15 @@
     {
       "root": "pages-operate",
       "pages": [
+        {
+          "path": "caiwu/index",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "计划财务 "
+          }
+        },
         {
           "path": "file/detail",
           "type": "page",
@@ -402,6 +370,15 @@
             "navigationBarTitleText": "公文/通知公告/法律法规/上级制度/厂级制度"
           }
         },
+        {
+          "path": "jingying/index",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "经营考核 "
+          }
+        },
         {
           "path": "sc/index",
           "type": "page",
@@ -630,6 +607,80 @@
           "type": "page"
         }
       ]
+    },
+    {
+      "root": "pages-production",
+      "pages": [
+        {
+          "path": "ribaoshuju/rbsjLsxq",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "历史数据"
+          }
+        },
+        {
+          "path": "ribaoshuju/trqRbsj",
+          "type": "page"
+        },
+        {
+          "path": "ribaoshuju/yyRbsj",
+          "type": "page"
+        },
+        {
+          "path": "shishishuju/aqbjSssj",
+          "type": "page"
+        },
+        {
+          "path": "shishishuju/gycsSssj",
+          "type": "page"
+        },
+        {
+          "path": "shishishuju/index",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "实时数据 "
+          }
+        },
+        {
+          "path": "shishishuju/nyxhSssj",
+          "type": "page"
+        },
+        {
+          "path": "shishishuju/trqSssj",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "天然气实时数据"
+          }
+        },
+        {
+          "path": "shishishuju/ysjSssj",
+          "type": "page"
+        },
+        {
+          "path": "shishishuju/chart/lssjChart",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "历史数据图表"
+          }
+        },
+        {
+          "path": "shishishuju/chart/sssjChart",
+          "type": "page",
+          "layout": "default",
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "历史数据图表"
+          }
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/src/pages/operation/index.vue b/src/pages/operation/index.vue
index a801521..1b956fb 100644
--- a/src/pages/operation/index.vue
+++ b/src/pages/operation/index.vue
@@ -9,8 +9,118 @@
 </route>
 <template>
 	<PageLayout :navbarShow="false">
-		<view style="margin: 100px;">
-			功能正在开发中... 请耐心等待
+		<view class="nav">
+			<view class="nav_box">
+				<scroll-view direction="horizontal">
+					<uni-segmented-control :current="current" :values="items" styleType="string" mode="segmented"
+						@clickItem="onClickItem"></uni-segmented-control>
+				</scroll-view>
+			</view>
+		</view>
+		<view class="content">
+
+			<view v-if="current === 0">
+				<scroll-view scroll-y :style="{ height: scrollViewHeight + 'px' }">
+					<caiwu-guanli></caiwu-guanli>
+				</scroll-view>
+			</view>
+			<view v-if="current === 1">
+				<scroll-view scroll-y :style="{ height: scrollViewHeight + 'px' }">
+					<jingying-guanli></jingying-guanli>
+				</scroll-view>
+			</view>
 		</view>
 	</PageLayout>
-</template>
\ No newline at end of file
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		computed,
+		nextTick,
+		watchEffect,
+		onUnmounted
+	} from 'vue';
+	import caiwuGuanli from '@/pages-operate/caiwu/index'
+	import jingyingGuanli from '@/pages-operate/jingying/index'
+	const items = ref(['计划财务', '经营考核', '外部市场'])
+	const current = ref(0)
+	const res = wx.getSystemInfoSync();
+	const statusHeight = res.statusBarHeight; //状态栏高度
+	const cusnavbarheight = (statusHeight + 50) + "px";
+	const scrollViewHeight = ref(0); //滚动控件的高度
+
+	const activeColor = ref("#0000ff")
+	const inActiveColor = ref("#000000")
+
+	function onClickItem(e) {
+		if (current.value != e.currentIndex) {
+			current.value = e.currentIndex;
+		}
+	}
+
+	onMounted(() => {
+		calculateScrollViewHeight();
+		// 使用 Uniapp 提供的窗口大小变化监听方法
+		uni.onWindowResize(calculateScrollViewHeight);
+	});
+
+	onUnmounted(() => {
+		// 移除 Uniapp 窗口大小变化监听
+		uni.offWindowResize(calculateScrollViewHeight);
+	});
+	const calculateScrollViewHeight = () => {
+		// 获取屏幕的总高度
+		const screenHeight = uni.getSystemInfoSync().windowHeight;
+		// 创建一个选择器查询对象
+		const query = uni.createSelectorQuery();
+		// 选择所有需要计算高度的元素
+		query
+			.select('.nav')
+			.boundingClientRect();
+
+		// 执行查询操作
+		query.exec((res) => {
+			let totalHeight = 0;
+			res.forEach((element) => {
+				if (element) {
+					totalHeight += element.height;
+				}
+			});
+			// 计算 scroll-view 的高度
+			scrollViewHeight.value = screenHeight - totalHeight;
+		});
+	};
+</script>
+
+<style lang="scss" scoped>
+	.nav {
+		width: calc(100%);
+		height: v-bind(cusnavbarheight);
+		font-size: 24rpx;
+		//color: #333333;
+		position: fixed;
+		z-index: 99;
+		background-image: url('@/static/navbg.png');
+		background-repeat: no-repeat;
+		background-size: 750rpx 458rpx;
+	}
+
+	.nav_box {
+		font-size: 18;
+
+		position: absolute;
+		bottom: 6rpx;
+		width: calc(100% - 60rpx);
+		left: 30rpx;
+		right: 30rpx;
+	}
+
+	.content {
+		position: absolute;
+		top: v-bind(cusnavbarheight);
+		width: 100%;
+		min-height: calc(100vh - v-bind(cusnavbarheight));
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/production/index.vue b/src/pages/production/index.vue
index 503b8f4..1019e73 100644
--- a/src/pages/production/index.vue
+++ b/src/pages/production/index.vue
@@ -49,8 +49,8 @@
 	//、、东风风光的
 	import trqData from '@/pages-production/ribaoshuju/trqRbsj';
 	import yyData from '@/pages-production/ribaoshuju/yyRbsj';
-	import sssjData from '@/pages-production/shishishuju/trqSssj';
-	const items = ref(['油气实时', '油气历史', '管线运行', '安防监控', '设备运行'])
+	import sssjData from '@/pages-production/shishishuju/index';
+	const items = ref(['实时数据', '日报数据', '安全管理', '工程技术', '仪控设备'])
 	const current = ref(0)
 	const res = wx.getSystemInfoSync();
 	const statusHeight = res.statusBarHeight; //状态栏高度
diff --git a/src/pages/production/ribaoshuju/rbsjLsxq.vue b/src/pages/production/ribaoshuju/rbsjLsxq.vue
deleted file mode 100644
index 8520956..0000000
--- a/src/pages/production/ribaoshuju/rbsjLsxq.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<route lang="json5" type="page">
-	{
-	layout: 'default',
-	style: {
-	navigationStyle: 'custom',
-	navigationBarTitleText: '历史数据',
-	},
-	}
-</route>
-<template>
-	<PageLayout navTitle="历史数据">
-		<view class="stats-container">
-			<uni-title v-if="type === 'trq'" :title="name.unit + '天然气---单位（万方）'" color="blue" type="h2"></uni-title>
-			<uni-title v-if="type === 'yy'" :title="name.dw + '原油---单位（吨）'" color="blue" type="h2"></uni-title>
-		</view>
-		<view class="dateSelect">
-			<cxc-szcx-dateRangeSelect :mode="'range'" v-model="dateRange"></cxc-szcx-dateRangeSelect>
-		</view>
-		<cxc-szcx-lineChart v-if="type === 'trq'" :dataList="dataList" x-field="rqDate" y-field="rq" legend-field="unit"
-			:reference-value="0"></cxc-szcx-lineChart>
-
-		<cxc-szcx-lineChart v-if="type === 'yy'" :dataList="dataList" x-field="scrq" y-field="rcwy" legend-field="dw"
-			:reference-value="0"></cxc-szcx-lineChart>
-		<view style="margin: 0 15px">
-			<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>
-			
-			<wd-table :data="dataList" :height="800" v-if="type === 'trq'" :index="true">
-				<wd-table-col prop="unit" label="名称" :width="screenWidth / 3" align="center"></wd-table-col>
-				<wd-table-col prop="rqDate" label="日期" :width="screenWidth / 4" align="center"></wd-table-col>
-				<wd-table-col prop="rq" label="日气量" :width="screenWidth / 5" align="center"></wd-table-col>
-			</wd-table>
-
-			<wd-table :data="dataList" :height="800" v-if="type === 'yy'" :index="true">
-				<wd-table-col prop="dw" label="名称" :width="screenWidth / 3" align="center"></wd-table-col>
-				<wd-table-col prop="scrq" label="日期" :width="screenWidth / 4" align="center"></wd-table-col>
-				<wd-table-col prop="rcwy" label="日油量" :width="screenWidth / 5" align="center"></wd-table-col>
-			</wd-table>
-
-		</view>
-	</PageLayout>
-</template>
-
-<script setup>
-	import {
-		queryJinriShengchansj,
-		queryJinriYuanyouShengchansj
-	} from '@/api/production';
-	import {
-		formatDate,
-		getDateAfterDays,
-		getDateAfterMonths
-	} from '@/utils/dateTime';
-	const name = ref({});
-	const type = ref('');
-	const dateRange = ref([]);
-	const dataList = ref([]);
-	const endDate = ref('');
-	const startDate = ref('');
-	const dataStats = ref({
-		min: 0,
-		max: 0,
-		avg: 0
-	});
-	const screenWidth = ref(0)
-	const calculateTableHeight = () => {
-		const systemInfo = uni.getSystemInfoSync();
-		screenWidth.value = systemInfo.screenWidth;
-	}
-	const getJinriShengchansj = (tempDateRange) => {
-		// console.log(tempDateRange);
-		// 添加日期有效性检查
-		if (!tempDateRange || tempDateRange.some((date) => !convertToDate(date))) {
-			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');
-			}
-		});
-	};
-
-	const getJinriYuanyouShengchansj = (tempDateRange) => {
-		console.log(tempDateRange);
-		// 添加日期有效性检查
-		if (!tempDateRange || tempDateRange.some((date) => !convertToDate(date))) {
-			console.error('收到无效日期范围:', tempDateRange);
-			return;
-		}
-		let queryParms = {};
-		dataList.value = [];
-		queryParms.dw = name.value.dw;
-		queryParms.scrq_begin = formatDate(tempDateRange[0]);
-		queryParms.scrq_end = formatDate(tempDateRange[1]);
-		queryParms.pageSize = 500;
-
-		// 添加参数有效性检查
-		if (!queryParms.scrq_begin || !queryParms.scrq_end) {
-			console.error('参数格式化失败:', queryParms);
-			return;
-		}
-		console.log(queryParms);
-		queryJinriYuanyouShengchansj(queryParms).then((res) => {
-			if (res.success) {
-				console.log(res);
-				dataList.value = res.result.records;
-				dataStats.value = calculateStats(dataList.value, 'rcwy').reverse();
-			}
-		});
-	};
-
-	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
-		};
-	}
-
-	function convertToDate(str) {
-		try {
-			const date = new Date(str);
-			// 判断日期是否有效
-			if (isNaN(date.getTime())) {
-				return false;
-			}
-			return true;
-		} catch (error) {
-			return false;
-			//TODO handle the exception
-		}
-	}
-	// 修改后（正确）
-	watch(
-		[() => type.value, dateRange], // 监听 type 和 dateRange
-		([newType, newDateRange]) => {
-			if (!newDateRange || !convertToDate(newDateRange[0]) || !convertToDate(newDateRange[1])) {
-				// console.error('无效的日期范围:', newDateRange);
-				return;
-			}
-			// console.log(newType, newDateRange);
-
-			switch (
-				newType // 直接使用 newType
-			) {
-				case 'trq':
-					getJinriShengchansj(newDateRange);
-					break;
-				case 'yy':
-					getJinriYuanyouShengchansj(newDateRange);
-					break;
-				default:
-					console.warn('未知类型:', newType);
-			}
-		}, {
-			immediate: true,
-			deep: true
-		}
-	);
-	onMounted(() => {
-		// nextTick();
-		// getJinriShengchansj(dateRange.value);
-		calculateTableHeight();
-		// 监听屏幕旋转变化
-		uni.onWindowResize(() => {
-			calculateTableHeight();
-		});
-	});
-
-	onLoad((options) => {
-		name.value = JSON.parse(options.data);
-		type.value = options.type;
-		// console.log(name.value, type.value);
-		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];
-		// console.log(1111, dateRange.value);
-	});
-</script>
-
-<style scoped>
-	.stats-container {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		text-align: center;
-		background-color: #f5f5f5;
-		border-radius: 4px;
-		box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-		padding: 10px;
-		margin: 15 15px;
-	}
-
-	.dateSelect {
-		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: 12px;
-		color: #00aa00;
-		font-weight: bold;
-	}
-
-	.stats-item+.stats-item {
-		border-left: 1px solid #ccc;
-		padding-left: 16px;
-	}
-</style>
\ No newline at end of file
diff --git a/src/pages/production/ribaoshuju/trqRbsj.vue b/src/pages/production/ribaoshuju/trqRbsj.vue
deleted file mode 100644
index 9861942..0000000
--- a/src/pages/production/ribaoshuju/trqRbsj.vue
+++ /dev/null
@@ -1,633 +0,0 @@
-<template>
-	<view class="content">
-		<!-- 标题行 -->
-		<view class="header-row">
-			<view class="title">天然气产量</view>
-			<view class="more" @click="selectMore">更多>></view>
-		</view>
-	</view>
-	<view class="container">
-		<view v-for="(item, index) in shishiArrSelect" :key="index" class="card-item"
-			@click="handleCardClick(item.gas)">
-			<view class="card">
-				<text class="title">{{ item.gas }}</text>
-				<view class="content">
-					<text class="label">气量</text>
-					<text class="value">{{ formatNumber(item.dailyVolume) || '-' }}</text>
-				</view>
-				<view class="content">
-					<text class="label">年累计</text>
-					<text class="value">{{ formatNumber(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>
-
-	<wd-popup v-model="popupSelect" position="top" background-color="#fff">
-		<view style="margin-top: 50px">
-			<view class="titlepopup">选择显示更多生产数据</view>
-
-			<view class="popupBtn">
-				<button size="mini" @click="selectDefault" style="padding: 8px 16px;">默认</button>
-				<button size="mini" @click="selectAll" style="padding: 8px 16px;">全选</button>
-				<button size="mini" @click="selectNo" style="padding: 8px 16px;">全不选</button>
-			</view>
-			<view class="popupcheckbox">
-				<uni-data-checkbox style="font-size: 14px" @change="onselectionchange" :localdata="shishiArr"
-					v-model="shishiArrDisplay" multiple :map="{ value: 'gas', text: 'gas' }"></uni-data-checkbox>
-			</view>
-		</view>
-	</wd-popup>
-	<!-- 数据弹窗 -->
-	<wd-popup v-model="popup" position="bottom" closable custom-style="height: 400px;" @close="handleClose">
-		<wd-cell-group :title="tableTitle">
-			<wd-table :data="filteredData" :height="800">
-				<wd-table-col prop="unit" label="名称" :width="screenWidth * 57 / 140 " align="center"></wd-table-col>
-				<wd-table-col prop="rq" label="日气量" :width="screenWidth / 5" align="center"></wd-table-col>
-				<wd-table-col prop="yearVolume" label="年累计" :width="screenWidth / 4" align="center"></wd-table-col>
-				<wd-table-col prop="" label="操作" :width="screenWidth / 7" align="center">
-					<template #value="{row}">
-						<text style="color: red;" @click="goHistory(row)">历史</text>
-					</template>
-				</wd-table-col>
-			</wd-table>
-		</wd-cell-group>
-	</wd-popup>
-</template>
-
-<script setup>
-	import {
-		queryJinriShengchansj,
-		queryYearShengchansj,
-		queryJinriTrqShengchansj
-	} from '@/api/production';
-	import {
-		formatDate,
-		getDateAfterDays
-	} from '@/utils/dateTime';
-
-	const shishiArr = ref([]);
-	const shishiArrSelect = ref([]);
-	const shishiArrDisplay = ref(['气井气', '商品量', '站线综合输差']);
-	const dataJinriUnit = ref([]);
-	const tableTitle = ref('')
-	const filteredData = ref([]);
-	const popup = ref(false);
-	const popupSelect = ref(false);
-	const strDate = ref('');
-
-	const dataJinri = ref([]);
-	const dataJinriSum = ref([]);
-	const dataJinriSumUnit = ref([]);
-
-
-	const qjqNdjs = ref(7500);
-	const splNdjs = ref(7220);
-	const zhqNdjs = ref(300);
-	const zhscNdjs = ref(50);
-	const screenWidth = ref(0)
-	const handleClose = () => {
-		popup.value = false
-	}
-	
-	// 点击卡片处理
-	// const handleCardClick = (gas) => {
-	// 	let queryParms = {};
-	// 	filteredData.value = [];
-	// 	queryParms.day = strDate.value;
-	// 	queryParms.gas = gas;
-	// 	queryParms.unit = '文23气田,户部寨气田';
-	// 	console.log(queryParms);
-	// 	queryJinriTrqShengchansj(queryParms).then((res) => {
-	// 		if (res.success) {
-	// 			console.log(res);
-	// 			filteredData.value = res.result;
-	// 		}
-	// 	});
-
-	// 	popup.value.open();
-	// };
-
-	function selectMore() {
-		popupSelect.value = true
-	}
-
-	function selectAll() {
-		shishiArrDisplay.value = [];
-		// console.log(9, shishiArr.value)
-		shishiArr.value.forEach((item) => {
-			// console.log(10, item)
-			shishiArrDisplay.value.push(item.gas);
-		});
-		onselectionchange()
-		popup.value = false;
-	}
-
-	function selectNo() {
-		shishiArrDisplay.value = [];
-		onselectionchange()
-		popup.value = false;
-	}
-
-	function selectDefault() {
-		shishiArrDisplay.value = ['气井气', '商品量', '站线综合输差'];
-		onselectionchange()
-		popup.value = false;
-	}
-	const onselectionchange = () => {
-		shishiArrSelect.value = [];
-		shishiArrDisplay.value.forEach((item) => {
-			shishiArrSelect.value.push(shishiArr.value.filter((item1) => item1.gas === item)[0]);
-		});
-	};
-
-	const handleCardClick = (gas) => {
-		tableTitle.value = gas + '数据详情 单位(万立方米)'
-		filteredData.value = dataJinriSumUnit.value.filter((item) => item.gas === gas);
-		filteredData.value = filteredData.value.map(item => {
-			return {
-				...item,
-				rq: formatNumber(item.rq),
-				yearVolume: formatNumber(item.yearVolume)
-			}
-		})
-		popup.value = true;
-
-	};
-
-	// 关闭弹窗
-	const closePopup = () => {
-		popup.value = false;
-	};
-	
-	const calculateTableHeight = () => {
-		const systemInfo = uni.getSystemInfoSync();
-		screenWidth.value = systemInfo.screenWidth;
-	}
-	onMounted(() => {
-		getJinriTrqShengchansj();
-		getJinriShengchansj();
-		
-		calculateTableHeight();
-		// 监听屏幕旋转变化
-		uni.onWindowResize(() => {
-			calculateTableHeight();
-		});
-	});
-
-	// 数字格式化
-	const formatNumber = (num) => {
-		let temp = 0;
-		try {
-			temp = parseFloat(num);
-		} catch (error) {
-			//TODO handle the exception
-		}
-
-		return temp.toFixed(4).replace(/\.?0+$/, '');
-	};
-
-	// 自动计算综合输差
-	function calcZhsc(tempArray) {
-		let totalJinqi = {
-			gas: '总进气',
-			dailyVolume: 0,
-			yearVolume: 0,
-			yearPlan: '100',
-			yearPerCent: 0
-		};
-		let totalChuqi = {
-			gas: '总出气',
-			dailyVolume: 0,
-			yearVolume: 0,
-			yearPlan: '100',
-			yearPerCent: 0
-		};
-		const compositeZx = {
-			gas: '站线综合输差',
-			dailyVolume: 0,
-			yearVolume: 0,
-			yearPlan: '100',
-			yearPerCent: 0
-		}; // 综合输差
-		const compositeJc = {
-			gas: '进出综合输差',
-			dailyVolume: 0,
-			yearVolume: 0,
-			yearPlan: '100',
-			yearPerCent: 0
-		};
-		const trqSpl = {
-			gas: '商品量',
-			dailyVolume: 0,
-			yearVolume: 0,
-			yearPlan: '7220',
-			yearPerCent: 0
-		};
-		// 综合输差
-		tempArray.forEach((item) => {
-			if (item.gas === '站输差' || item.gas === '线输差') {
-				compositeZx.dailyVolume += parseFloat(item.dailyVolume) || 0;
-				compositeZx.yearVolume += parseFloat(item.yearVolume) || 0;
-			}
-			if (item.gas === '气井气' || item.gas === '外部气' || item.gas === '返回气') {
-				totalJinqi.dailyVolume += parseFloat(item.dailyVolume) || 0;
-				totalJinqi.yearVolume += parseFloat(item.yearVolume) || 0;
-			}
-			if (item.gas === '自耗气' || item.gas === '用户气' || item.gas === '返采油厂干气') {
-				totalChuqi.dailyVolume += parseFloat(item.dailyVolume) || 0;
-				totalChuqi.yearVolume += parseFloat(item.yearVolume) || 0;
-			}
-			if (item.gas === '气井气' || item.gas === '站输差' || item.gas === '线输差') {
-				trqSpl.dailyVolume += parseFloat(item.dailyVolume) || 0;
-				trqSpl.yearVolume += parseFloat(item.yearVolume) || 0;
-			}
-			if (item.gas === '自耗气') {
-				trqSpl.dailyVolume -= parseFloat(item.dailyVolume) || 0;
-				trqSpl.yearVolume -= parseFloat(item.yearVolume) || 0;
-			}
-		});
-
-		compositeZx.yearPerCent = calcPercent(compositeZx.yearPlan, compositeZx.yearVolume);
-
-		trqSpl.yearPerCent = calcPercent(trqSpl.yearPlan, trqSpl.yearVolume);
-
-		compositeJc.dailyVolume = (-totalJinqi.dailyVolume + totalChuqi.dailyVolume).toFixed(4);
-		compositeJc.yearVolume = (-totalJinqi.yearVolume + totalChuqi.yearVolume).toFixed(4);
-		compositeJc.yearPerCent = calcPercent(compositeJc.yearPlan, compositeJc.yearVolume);
-
-		tempArray.push(compositeZx);
-		tempArray.push(trqSpl);
-
-		return tempArray;
-	}
-
-	const getJinriTrqShengchansj = () => {
-		const now = new Date();
-		if (now.getHours() < 11) {
-			strDate.value = formatDate(getDateAfterDays(now, -1)).toString(); //11点之前  头一天的数据
-		} else {
-			strDate.value = formatDate(now).toString();
-		}
-		let queryParms = {};
-		shishiArr.value = [];
-		queryParms.day = strDate.value;
-		queryJinriTrqShengchansj(queryParms).then((res) => {
-			if (res.success) {
-				console.log(1, res);
-				let temp = res.result;
-
-				temp.forEach((item) => {
-					if (item.gas === '气井气') {
-						item.yearPlan = 7500;
-						item.yearPerCent = calcPercent(item.yearPlan, item.yearVolume);
-					}
-				});
-				shishiArr.value = calcZhsc(temp);
-				nextTick();
-				onselectionchange();
-			}
-		});
-	};
-
-	function goHistory(val) {
-		uni.navigateTo({
-			url: '/pages/production/ribaoshuju/rbsjLsxq?data=' + JSON.stringify(val) + '&type=trq'
-		});
-	}
-
-	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(2)); // 转为数值
-	}
-
-	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;
-		queryJinriShengchansj(queryParms).then((res) => {
-			if (res.success) {
-				dataJinri.value = res.result.records;
-				dataJinriSumUnit.value = sumByUnit(dataJinri.value); //包含gas  unit  rq  cq  totalGas
-				// // 使用 nextTick 等待 DOM 更新
-				nextTick();
-				getYearShengchansj(); //再获取今年以来的数据
-			}
-		});
-	};
-	const getYearShengchansj = () => {
-		const now = new Date();
-		let year = formatDate(now).split('-')[0];
-		let queryParms = {};
-		queryParms.yearStart = year;
-		queryParms.yearEnd = year;
-		queryYearShengchansj(queryParms).then((res) => {
-			if (res.success) {
-				try {
-					let yearData = res.result[year];
-					dataJinriSumUnit.value.forEach((item) => {
-						yearData.forEach((itemYear) => {
-							// // console.log(item, itemYear);
-							if (item.setId === itemYear.setId) {
-								item.yearVolume = itemYear.yearSum || 0;
-							}
-						});
-					});
-					dataJinriSum.value = sumByGas(dataJinriSumUnit.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) {
-		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;
-				const gas = record.gas;
-				// 添加setId计算
-				const setId = record.setId
-				if (gas != "区输差") {
-					if (!summaryMap[setId]) {
-						// 初始化该 gas 类型的汇总对象
-						summaryMap[setId] = {
-							unit: unit,
-							setId: setId,
-							gas: record.gas,
-							rq: 0,
-							sq: 0,
-							totalGas: 0,
-							yearVolume: 0
-						};
-					}
-					// 无论是否是第一次遇到该 unit 类型，都进行累加操作
-					summaryMap[setId].rq += record.rq || 0;
-					summaryMap[setId].sq += record.sq || 0;
-					summaryMap[setId].totalGas += record.totalGas || 0;
-					summaryMap[setId].yearVolume += record.yearVolume || 0;
-				}
-			});
-
-			return Object.values(summaryMap);
-		} catch (error) {
-			//TODO handle the exception
-			// console.log(error);
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.header-row {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 10 10rpx;
-		border-bottom: 1rpx solid #eee;
-		margin-left: 10px;
-		margin-right: 10px;
-	}
-
-	.title {
-		font-size: 30rpx;
-		font-weight: bold;
-		color: #333;
-	}
-
-	.titlepopup {
-		font-size: 35rpx;
-		font-weight: bold;
-		color: #333;
-		text-align: center;
-		padding: 20px;
-		margin-top: 10px;
-	}
-
-	/* 给包裹按钮的容器设置样式 */
-	.popupBtn {
-		display: grid;
-		/* 创建三个等宽的列 */
-		grid-template-columns: repeat(3, 1fr);
-		/* 设置列与列之间的间距 */
-		gap: 2px;
-		margin-bottom: 20px;
-	}
-
-
-
-	/* 添加按钮按下效果 */
-	.popupBtn button:active {
-		opacity: 0.8;
-		transform: scale(0.98);
-		transition: all 0.1s ease;
-	}
-
-
-
-	/* 给按钮设置通用样式 */
-	.popupBtn button {
-		border: none;
-		padding: 0px 10px;
-		background-color: #007BFF;
-		color: white;
-		border-radius: 5px;
-		cursor: pointer;
-	}
-
-	/* 鼠标悬停在按钮上时的样式 */
-	.popupBtn button:hover {
-		background-color: #0056b3;
-	}
-
-	.more {
-		font-size: 26rpx;
-		color: #666;
-		cursor: pointer;
-	}
-
-	.more::after {
-		content: '';
-		width: 8rpx;
-		height: 8rpx;
-		border-top: 2rpx solid #666;
-		border-right: 2rpx solid #666;
-		transform: rotate(45deg);
-		margin-left: 8rpx;
-		vertical-align: middle;
-	}
-
-	/* 鼠标悬停效果 */
-	.more:hover {
-		color: #007aff;
-	}
-
-	.popupcheckbox {
-		/* 使用 Flexbox 布局 */
-		display: flex;
-		flex-wrap: wrap;
-		/* 允许换行 */
-		gap: 2px;
-		/* 设置复选框之间的间距 */
-		margin-left: 20px;
-		margin-bottom: 10px;
-	}
-
-
-	.popupcheckbox .uni-data-checkbox__item {
-		flex-basis: calc((100% / var(4)) - 10px);
-		box-sizing: border-box;
-	}
-
-
-	.container {
-		display: flex;
-		flex-wrap: wrap;
-		padding: 20rpx;
-		gap: 20rpx;
-	}
-
-	.empty {
-		padding: 40rpx;
-		text-align: center;
-		color: #888;
-		font-size: 16rpx;
-	}
-
-	.card-item {
-		flex: 1 1 200rpx; // 基础宽度300rpx，自动伸缩    formatNumber
-		min-width: 240rpx;
-		max-width: calc(50% - 10rpx); // 最大不超过容器一半（考虑间距）
-
-		@media (min-width: 768px) {
-			max-width: calc(33.33% - 14rpx); // 大屏显示3列
-		}
-	}
-
-	.card {
-		background: #ececec;
-		border-radius: 16rpx;
-		padding: 15rpx;
-		box-shadow: 0 4rpx 12rpx rgba(179, 179, 179, 0.1);
-
-		.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-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>
\ No newline at end of file
diff --git a/src/pages/production/ribaoshuju/yyRbsj.vue b/src/pages/production/ribaoshuju/yyRbsj.vue
deleted file mode 100644
index 94ed949..0000000
--- a/src/pages/production/ribaoshuju/yyRbsj.vue
+++ /dev/null
@@ -1,317 +0,0 @@
-<template>
-	<!-- <view style="margin-left: 20rpx;"> <uni-title :title="strDate + '：生产数据'" type="h1" color="red" /> -->
-	<!-- </view> -->
-	<view class="content">
-		<!-- 标题行 -->
-		<view class="header-row">
-			<view class="title">原油产量</view>
-			<view class="more"></view>
-		</view>
-	</view>
-	<view class="container">
-		<view v-for="(item, index) in shishiArr" :key="index" class="card-item" @click="handleCardClick(item.gas)">
-			<view class="card">
-				<!-- <text class="title">{{ item.gas }}</text> -->
-				<view class="content">
-					<text class="label">日油量</text>
-					<text class="value">{{ item.rcwy || '-' }}</text>
-				</view>
-				<view class="content">
-					<text class="label">月累计</text>
-					<text class="value">{{ item.yl || '-' }}</text>
-				</view>
-				<view class="content">
-					<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>
-	<!-- 数据弹窗 -->
-	<wd-popup v-model="popup" position="bottom" closable custom-style="height: 400px;" @close="handleClose">
-		<wd-cell-group title="原油数据详情 单位(吨)">
-			<wd-table :data="dataJinri" :height="800">
-				<wd-table-col prop="dw" label="名称" :width="screenWidth * 29 / 140" align="center"></wd-table-col>
-				<wd-table-col prop="rcwy" label="日油量" :width="screenWidth / 5" align="center"></wd-table-col>
-				<wd-table-col prop="yl" label="月累计" :width="screenWidth / 5" align="center"></wd-table-col>
-				<wd-table-col prop="nl" label="年累计" :width="screenWidth / 4" align="center"></wd-table-col>
-				<wd-table-col prop="" label="操作" :width="screenWidth / 7" align="center">
-					<template #value="{row}">
-						<text style="color: red;" @click="goHistory(row)">历史</text>
-					</template>
-				</wd-table-col>
-			</wd-table>
-		</wd-cell-group>
-	</wd-popup>
-</template>
-
-<script setup>
-	import {
-		queryJinriYuanyouShengchansj
-	} from '@/api/production';
-	import {
-		formatDate,
-		getDateAfterDays
-	} from '@/utils/dateTime';
-	const shishiArr = ref([{
-		gas: '原油产量',
-		rcwy: '',
-		yl: '',
-		nl: '',
-		yearPlan: '1500',
-		yearPerCent: ''
-	}]);
-	const screenWidth = ref(0)
-	const dataJinri = ref([]);
-	const dataJinriSum = ref([]);
-	const popup = ref(false);
-	// 点击卡片处理
-	const handleCardClick = () => {
-		popup.value = true
-	};
-
-	// 关闭弹窗
-	const closePopup = () => {
-		popup.value = false
-	};
-	onMounted(() => {
-		getJinriYuanyouShengchansj();
-		// getYearShengchansj();
-		calculateTableHeight();
-		// 监听屏幕旋转变化
-		uni.onWindowResize(() => {
-			calculateTableHeight();
-		});
-	});
-
-	const strDate = ref('');
-	// 数字格式化
-	const formatNumber = (num) => {
-		if (typeof num !== 'number') return '-';
-		return num.toFixed(4).replace(/\.?0+$/, '');
-	};
-	const handleClose = () => {
-		popup.value = false
-	}
-
-	function goHistory(val) {
-		uni.navigateTo({
-			url: '/pages/production/ribaoshuju/rbsjLsxq?data=' + JSON.stringify(val) + '&type=yy'
-		});
-	}
-	const calculateTableHeight = () => {
-		const systemInfo = uni.getSystemInfoSync();
-		screenWidth.value = systemInfo.screenWidth;
-	}
-	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;
-		queryJinriYuanyouShengchansj(queryParms).then((res) => {
-			if (res.success) {
-				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);
-					});
-				});
-
-				dataJinri.value = dataJinri.value.map(item => {
-					return {
-						...item,
-						rcwy: formatNumber(item.rcwy),
-						yl: formatNumber(item.yl),
-						nl: formatNumber(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(2)); // 转为数值
-	}
-
-	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>
-	.header-row {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 15rpx 0;
-		border-bottom: 1rpx solid #eee;
-		margin-left: 10px;
-		margin-right: 10px;
-
-	}
-
-	.title {
-		font-size: 30rpx;
-		font-weight: bold;
-		color: #333;
-	}
-
-	.more {
-		font-size: 26rpx;
-		color: #666;
-		cursor: pointer;
-	}
-
-	.more::after {
-		content: '';
-		width: 8rpx;
-		height: 8rpx;
-		border-top: 2rpx solid #666;
-		border-right: 2rpx solid #666;
-		transform: rotate(45deg);
-		margin-left: 8rpx;
-		vertical-align: middle;
-	}
-
-	/* 鼠标悬停效果 */
-	.more:hover {
-		color: #007aff;
-	}
-
-	.container {
-		display: flex;
-		flex-wrap: wrap;
-		padding: 20rpx;
-		gap: 20rpx;
-	}
-
-	.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: #ececec;
-		border-radius: 16rpx;
-		padding: 15rpx;
-		box-shadow: 0 4rpx 12rpx rgba(197, 197, 197, 0.1);
-
-		.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-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>
\ No newline at end of file
diff --git a/src/pages/production/shishishuju/aqbjSssj.vue b/src/pages/production/shishishuju/aqbjSssj.vue
deleted file mode 100644
index 02409e3..0000000
--- a/src/pages/production/shishishuju/aqbjSssj.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/pages/production/shishishuju/gycsSssj.vue b/src/pages/production/shishishuju/gycsSssj.vue
deleted file mode 100644
index 02409e3..0000000
--- a/src/pages/production/shishishuju/gycsSssj.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/pages/production/shishishuju/index.vue b/src/pages/production/shishishuju/index.vue
deleted file mode 100644
index 467da78..0000000
--- a/src/pages/production/shishishuju/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-	<trqSssjVue></trqSssjVue>
-</template>
-
-<script setup>
-	import trqSssjVue from './trqSssj';
-</script>
\ No newline at end of file
diff --git a/src/pages/production/shishishuju/nyxhSssj.vue b/src/pages/production/shishishuju/nyxhSssj.vue
deleted file mode 100644
index 02409e3..0000000
--- a/src/pages/production/shishishuju/nyxhSssj.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/pages/production/shishishuju/trqSssj.vue b/src/pages/production/shishishuju/trqSssj.vue
deleted file mode 100644
index b97dc1f..0000000
--- a/src/pages/production/shishishuju/trqSssj.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<template>
-	<PageLayout :navbarShow="false">
-		<!-- 标题行 -->
-		<view class="header-row">
-			<view class="title">天然气实时数据</view>
-			<view style="min-width: 200px;">
-				<cxc-szcx-stationJl-select v-model="stationID" returnCodeOrID="id" @change="onChange">
-				</cxc-szcx-stationJl-select>
-			</view>
-		</view>
-		<!-- <button size="mini" @click="getData">连接WebSocket</button> -->
-
-		<view class="container">
-			<view v-for="(item, index) in jlData" :key="index" class="card">
-				<view class="field-item">
-					<text class="titlejl">{{ stationName }}--{{ item.jldname }}</text>
-					<view class="status-circle"
-						:style="{ backgroundColor:   item.yxzt==='运行' ? '#4CAF50' : '#F44336'  }">
-						{{item.yxzt}}
-					</view>
-
-				</view>
-
-				<view class="field-list">
-					<!-- 压力 -->
-					<view class="field-item">
-						<text class="field-label">压力(MPa)</text>
-						<text class="field-value">{{ formatNumber(item.yl) || '-' }}</text>
-					</view>
-					<!-- 差压 -->
-					<view class="field-item">
-						<text class="field-label">差压(kPa)</text>
-						<text class="field-value">{{ formatNumber(item.yc) || '-' }}</text>
-					</view>
-					<!-- 温度 -->
-					<view class="field-item">
-						<text class="field-label">温度(℃)</text>
-						<text class="field-value">{{ formatNumber(item.wd) || '-' }}</text>
-					</view>
-					<!-- 瞬时流量 -->
-					<view class="field-item">
-						<text class="field-label">瞬时流量(m³/d)</text>
-						<text class="field-value">{{ formatNumber(item.ssll) || '-' }}</text>
-					</view>
-
-					<!-- 今日流量 -->
-					<view class="field-item">
-						<text class="field-label">今日流量(m³)</text>
-						<text class="field-value">{{ formatNumber(item.jrl) || '-' }}</text>
-					</view>
-
-					<!-- 昨日流量 -->
-					<view class="field-item">
-						<text class="field-label">昨日流量(m³)</text>
-						<text class="field-value">{{ formatNumber(item.zrl) || '-' }}</text>
-					</view>
-
-					<!-- 昨日时间 -->
-					<view class="field-item">
-						<text class="field-label">昨日时间(min)</text>
-						<text class="field-value">{{ formatNumber(item.zrsj) || '-' }}</text>
-					</view>
-
-					<!-- 今日时间 -->
-					<view class="field-item">
-						<text class="field-label">今日时间(min)</text>
-						<text class="field-value">{{ formatNumber(item.jrsj) || '-' }}</text>
-					</view>
-				</view>
-			</view>
-		</view>
-	</PageLayout>
-</template>
-
-<script setup>
-	import {
-		queryJldZcList,
-		queryJldDataByZc
-	} from '@/api/production'
-	import {
-		formatDate,
-		getDateAfterDays
-	} from '@/utils/dateTime';
-
-	const stationList = ref([])
-	// 控制弹窗显示与隐藏
-	const popupSelect = ref(null);
-	const stationID = ref("")
-	const stationName = ref("")
-
-	const jlData = ref([])
-
-	const sssjUrl = ref('wss://szcx.zyyt.sinopec.com/Gyk/websocket/')
-	const jlByzc = ref('https://szcx.zyyt.sinopec.com/Gyk/sssj/GetJlByZc')
-
-	//首先链接的地址要先拿在websocket在线调试去调试是否能连接通 不然下面的操作就不知道错误
-	// 建立websocket
-	function connectSocketInit() {
-		console.log(11, )
-		let userID = '1412198011559055361'
-		// 创建一个this.socketTask对象【发送、接收、关闭socket都由这个对象操作】
-		uni.connectSocket({
-			// 【非常重要】必须确保你的服务器是成功的,如果是手机测试千万别使用ws://127.0.0.1:9099【特别容易犯的错误】
-			// url: 'wss://'+this.$api.sellerWebsocket+'/'+this.userinfo.id,
-			url: sssjUrl.value + userID,
-			success(data) {
-				console.log(data);
-				console.log('websocket连接成功');
-			}
-		});
-		// 消息的发送和接收必须在正常连接打开中,才能发送或接收【否则会失败】
-		uni.onSocketOpen(function(res) {
-			console.log('WebSocket连接已打开！');
-		});
-		uni.onSocketMessage(function(res) {
-			console.log('收到服务器内容：' + res.data);
-			
-		});
-		// 这里仅是事件监听【如果socket关闭了会执行】
-		uni.onSocketClose(function(res) {
-			console.log('WebSocket 已关闭！');
-		});
-	}
-
-	function getData() {
-		connectSocketInit()
-	}
-
-	function onChange(e, data) {
-		console.log(2, e, data.value);
-		stationID.value = e
-		stationName.value = data.value.title
-		getScData(); //获取生产数据
-
-	}
-	
-	const getScData= ()=>{
-		uni.request({
-			url: jlByzc.value + '?zhanc=' + stationID.value + '&jldLx=0',
-			method: 'GET',
-			success: (res) => {
-				console.log(res)
-				jlData.value = JSON.parse(res.data.result).JlData;
-			}
-		})
-	}
-	
-	
-	const websock = ref(null);
-	const timer2 = ref(null);
-	// 封装心跳函数
-	const websocketheart = () => {
-		timer2.value = setInterval(() => {
-			if (websock.value && websock.value.readyState === 1) {
-				// 如果连接正常，发送心跳消息
-				// connectSocketInit()
-			}
-			if(stationID.value){
-				getScData();
-			}
-		}, 1000);
-	};
-
-	onMounted(() => {
-		queryJldZcList({
-			pId: '1267633406031953921'
-		}).then((res) => {
-
-			if (res.success) {
-				stationList.value = res.result
-				console.log(1, stationList.value)
-
-			}
-		})
-
-		websocketheart()
-	})
-	
-	onUnmounted(()=>{ //页面销毁删除定时
-		// 销毁定时器
-		console.log(22222)
-		clearInterval(timer2.value);
-	})
-	
-	// 数字格式化
-	const formatNumber = (num) => {
-		let temp = 0;
-		try {
-			temp = parseFloat(num);
-		} catch (error) {
-			//TODO handle the exception
-		}
-
-		return temp.toFixed(4).replace(/\.?0+$/, '');
-	};
-</script>
-
-<style scoped>
-	.header-row {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 10 10rpx;
-		border-bottom: 1rpx solid #eee;
-		margin-left: 10px;
-		margin-right: 10px;
-	}
-
-	.title {
-		font-size: 30rpx;
-		font-weight: bold;
-		color: #333;
-	}
-
-	.titlejl {
-		font-size: 20rpx;
-		vertical-align: middle;
-		font-weight: bold;
-		color: #0055ff;
-		margin-bottom: 15px;
-	}
-
-	.container {
-		display: grid;
-		grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
-		gap: 16px;
-		padding: 16px;
-	}
-
-	.card {
-		background: #fff;
-		border-radius: 8px;
-		padding: 5px;
-		box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
-	}
-
-	.field-list {
-		margin-top: 10px;
-		display: flex;
-		flex-wrap: wrap;
-		/* 允许子元素换行 */
-		gap: 3px;
-	}
-
-	.field-item {
-		display: flex;
-		height: 30px;
-		justify-content: space-between;
-		align-items: center;
-		padding: 5px 5px;
-		background: #f8f9fa;
-		border-radius: 4px;
-		flex-basis: calc(50%-10px);
-		/* 每个元素占据约一半宽度，减去间隙 */
-		box-sizing: border-box;
-		/* 包含内边距和边框 */
-	}
-
-	/* 当屏幕宽度较小时，每个元素占据整行 */
-	@media (max-width: 200px) {
-		.field-item {
-			flex-basis: 100%;
-		}
-	}
-
-	.field-label {
-		color: #666;
-		font-size: 8px;
-		flex: 1;
-		margin-right: 2px;
-		width: 80px;
-		font-weight: 500;
-	}
-
-	.field-value {
-		color: #1890ff;
-		font-weight: 500;
-		font-size: 12px;
-		text-align: right;
-		width: 60px;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.status-circle {
-		width: 70rpx;
-		height: 30rpx;
-		font-size: 12px;
-		vertical-align: middle;
-
-
-	}
-</style>
\ No newline at end of file
diff --git a/src/pages/production/shishishuju/ysjSssj.vue b/src/pages/production/shishishuju/ysjSssj.vue
deleted file mode 100644
index 02409e3..0000000
--- a/src/pages/production/shishishuju/ysjSssj.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 7cc9dd7..85d7163 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -19,15 +19,6 @@ interface NavigateToOptions {
        "/pages/sljd/index" |
        "/pages/user/people" |
        "/pages/workHome/index" |
-       "/pages/production/ribaoshuju/rbsjLsxq" |
-       "/pages/production/ribaoshuju/trqRbsj" |
-       "/pages/production/ribaoshuju/yyRbsj" |
-       "/pages/production/shishishuju/aqbjSssj" |
-       "/pages/production/shishishuju/gycsSssj" |
-       "/pages/production/shishishuju/index" |
-       "/pages/production/shishishuju/nyxhSssj" |
-       "/pages/production/shishishuju/trqSssj" |
-       "/pages/production/shishishuju/ysjSssj" |
        "/pages-home/device-control/office/ALLleader" |
        "/pages-home/device-control/office/index" |
        "/pages-home/device-control/office/officehomedevice" |
@@ -44,8 +35,10 @@ interface NavigateToOptions {
        "/pages-sub/online/online" |
        "/pages-sub/online/onlineCard" |
        "/pages-sub/online/onlineTable" |
+       "/pages-operate/caiwu/index" |
        "/pages-operate/file/detail" |
        "/pages-operate/file/index" |
+       "/pages-operate/jingying/index" |
        "/pages-operate/sc/index" |
        "/pages-humanResource/absence/add" |
        "/pages-humanResource/absence/detail" |
@@ -78,7 +71,18 @@ interface NavigateToOptions {
        "/pages-bpm/SuperiorSystem/index" |
        "/pages-bpm/unconventional/index" |
        "/pages-bpm/unconventional/stamp" |
-       "/pages-bpm/zbkh/index";
+       "/pages-bpm/zbkh/index" |
+       "/pages-production/ribaoshuju/rbsjLsxq" |
+       "/pages-production/ribaoshuju/trqRbsj" |
+       "/pages-production/ribaoshuju/yyRbsj" |
+       "/pages-production/shishishuju/aqbjSssj" |
+       "/pages-production/shishishuju/gycsSssj" |
+       "/pages-production/shishishuju/index" |
+       "/pages-production/shishishuju/nyxhSssj" |
+       "/pages-production/shishishuju/trqSssj" |
+       "/pages-production/shishishuju/ysjSssj" |
+       "/pages-production/shishishuju/chart/lssjChart" |
+       "/pages-production/shishishuju/chart/sssjChart";
 }
 interface RedirectToOptions extends NavigateToOptions {}
 
diff --git a/vite.config.ts b/vite.config.ts
index 117c126..bb350b3 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -23,164 +23,165 @@ import { viteMockServe } from 'vite-plugin-mock'
 
 // https://vitejs.dev/config/
 export default ({ command, mode }) => {
-  // console.log(mode === process.env.NODE_ENV) // true
+	// console.log(mode === process.env.NODE_ENV) // true
 
-  // mode: 区分生产环境还是开发环境
-  console.log('command, mode -> ', command, mode)
-  // pnpm dev:h5 时得到 => serve development
-  // pnpm build:h5 时得到 => build production
-  // pnpm dev:mp-weixin 时得到 => build development (注意区别，command为build)
-  // pnpm build:mp-weixin 时得到 => build production
-  // pnpm dev:app 时得到 => build development (注意区别，command为build)
-  // pnpm build:app 时得到 => build production
-  // dev 和 build 命令可以分别使用 .env.development 和 .env.production 的环境变量
+	// mode: 区分生产环境还是开发环境
+	console.log('command, mode -> ', command, mode)
+	// pnpm dev:h5 时得到 => serve development
+	// pnpm build:h5 时得到 => build production
+	// pnpm dev:mp-weixin 时得到 => build development (注意区别，command为build)
+	// pnpm build:mp-weixin 时得到 => build production
+	// pnpm dev:app 时得到 => build development (注意区别，command为build)
+	// pnpm build:app 时得到 => build production
+	// dev 和 build 命令可以分别使用 .env.development 和 .env.production 的环境变量
 
-  const { UNI_PLATFORM } = process.env
-  console.log('UNI_PLATFORM -> ', UNI_PLATFORM) // 得到 mp-weixin, h5, app 等
+	const { UNI_PLATFORM } = process.env
+	console.log('UNI_PLATFORM -> ', UNI_PLATFORM) // 得到 mp-weixin, h5, app 等
 
-  const env = loadEnv(mode, path.resolve(process.cwd(), 'env'))
-  const {
-    VITE_APP_PORT,
-    VITE_SERVER_BASEURL,
-    VITE_DELETE_CONSOLE,
-    VITE_SHOW_SOURCEMAP,
-    VITE_APP_PROXY,
-    VITE_APP_PROXY_PREFIX,
-    VITE_USE_MOCK,
-	WEBAPP
-  } = env
-  console.log('环境变量 env -> ', env)
+	const env = loadEnv(mode, path.resolve(process.cwd(), 'env'))
+	const {
+		VITE_APP_PORT,
+		VITE_SERVER_BASEURL,
+		VITE_DELETE_CONSOLE,
+		VITE_SHOW_SOURCEMAP,
+		VITE_APP_PROXY,
+		VITE_APP_PROXY_PREFIX,
+		VITE_USE_MOCK,
+		WEBAPP
+	} = env
+	console.log('环境变量 env -> ', env)
 
-  return defineConfig({
-    envDir: './env', // 自定义env目录
+	return defineConfig({
+		envDir: './env', // 自定义env目录
 
-    plugins: [
-      UniPages({
-        exclude: ['**/components/**/**.*'],
-        routeBlockLang: 'json5', // 虽然设了默认值，但是vue文件还是要加上 lang="json5", 这样才能很好地格式化
-        // homePage 通过 vue 文件的 route-block 的type="home"来设定
-        // pages 目录为 src/pages，分包目录不能配置在pages目录下
-        subPackages: [
-          'src/pages-home',
-          'src/pages-message',
-          'src/pages-user',
-          'src/pages-work',
-          'src/pages-sub',
-		  'src/pages-operate',
-		  'src/pages-humanResource',
-		  'src/pages-integrated',
-		  'src/pages-politics',
-		  'src/pages-process',
-		  'src/pages-bpm'
-        ], // 是个数组，可以配置多个，但是不能为pages里面的目录
-        dts: 'src/types/uni-pages.d.ts',
-      }),
-      UniLayouts(),
-      UniPlatform(),
-      UniManifest(),
-      // UniXXX 需要在 Uni 之前引入
-      Uni(),
-      {
-        // 临时解决 dcloudio 官方的 @dcloudio/uni-mp-compiler 出现的编译 BUG
-        // 参考 github issue: https://github.com/dcloudio/uni-app/issues/4952
-        // 自定义插件禁用 vite:vue 插件的 devToolsEnabled，强制编译 vue 模板时 inline 为 true
-        name: 'fix-vite-plugin-vue',
-        configResolved(config) {
-          const plugin = config.plugins.find((p) => p.name === 'vite:vue')
-          if (plugin && plugin.api && plugin.api.options) {
-            plugin.api.options.devToolsEnabled = false
-          }
-        },
-      },
-      UnoCSS(),
-      AutoImport({
-        imports: ['vue', 'uni-app'],
-        dts: 'src/types/auto-import.d.ts',
-        dirs: ['src/hooks'], // 自动导入 hooks
-        eslintrc: { enabled: true },
-        vueTemplate: true, // default false
-      }),
+		plugins: [
+			UniPages({
+				exclude: ['**/components/**/**.*'],
+				routeBlockLang: 'json5', // 虽然设了默认值，但是vue文件还是要加上 lang="json5", 这样才能很好地格式化
+				// homePage 通过 vue 文件的 route-block 的type="home"来设定
+				// pages 目录为 src/pages，分包目录不能配置在pages目录下
+				subPackages: [
+					'src/pages-home',
+					'src/pages-message',
+					'src/pages-user',
+					'src/pages-work',
+					'src/pages-sub',
+					'src/pages-operate',
+					'src/pages-humanResource',
+					'src/pages-integrated',
+					'src/pages-politics',
+					'src/pages-process',
+					'src/pages-bpm',
+					'src/pages-production'
+				], // 是个数组，可以配置多个，但是不能为pages里面的目录
+				dts: 'src/types/uni-pages.d.ts',
+			}),
+			UniLayouts(),
+			UniPlatform(),
+			UniManifest(),
+			// UniXXX 需要在 Uni 之前引入
+			Uni(),
+			{
+				// 临时解决 dcloudio 官方的 @dcloudio/uni-mp-compiler 出现的编译 BUG
+				// 参考 github issue: https://github.com/dcloudio/uni-app/issues/4952
+				// 自定义插件禁用 vite:vue 插件的 devToolsEnabled，强制编译 vue 模板时 inline 为 true
+				name: 'fix-vite-plugin-vue',
+				configResolved(config) {
+					const plugin = config.plugins.find((p) => p.name === 'vite:vue')
+					if (plugin && plugin.api && plugin.api.options) {
+						plugin.api.options.devToolsEnabled = false
+					}
+				},
+			},
+			UnoCSS(),
+			AutoImport({
+				imports: ['vue', 'uni-app'],
+				dts: 'src/types/auto-import.d.ts',
+				dirs: ['src/hooks'], // 自动导入 hooks
+				eslintrc: { enabled: true },
+				vueTemplate: true, // default false
+			}),
 
-      ViteRestart({
-        // 通过这个插件，在修改vite.config.js文件则不需要重新运行也生效配置
-        restart: ['vite.config.js'],
-      }),
-      // h5环境增加 BUILD_TIME 和 BUILD_BRANCH
-      UNI_PLATFORM === 'h5' && {
-        name: 'html-transform',
-        transformIndexHtml(html) {
-          return html.replace('%BUILD_TIME%', dayjs().format('YYYY-MM-DD HH:mm:ss'))
-        },
-      },
-      // 打包分析插件，h5 + 生产环境才弹出
-      UNI_PLATFORM === 'h5' &&
-        mode === 'production' &&
-        visualizer({
-          filename: './node_modules/.cache/visualizer/stats.html',
-          open: true,
-          gzipSize: true,
-          brotliSize: true,
-        }),
-      // 只有在 app 平台时才启用 copyNativeRes 插件
-      UNI_PLATFORM === 'app' && copyNativeRes(),
-      viteMockServe({
-        // 指定 mock 文件目录
-        mockPath: './mock',
-        // 开发服务器才启用mock数据
-        enable: mode === 'development' && JSON.parse(VITE_USE_MOCK),
-      }),
-    ],
-    define: {
-      __UNI_PLATFORM__: JSON.stringify(UNI_PLATFORM),
-      __VITE_APP_PROXY__: JSON.stringify(VITE_APP_PROXY),
-    },
-    css: {
-      postcss: {
-        plugins: [
-          // autoprefixer({
-          //   // 指定目标浏览器
-          //   overrideBrowserslist: ['> 1%', 'last 2 versions'],
-          // }),
-        ],
-      },
-    },
+			ViteRestart({
+				// 通过这个插件，在修改vite.config.js文件则不需要重新运行也生效配置
+				restart: ['vite.config.js'],
+			}),
+			// h5环境增加 BUILD_TIME 和 BUILD_BRANCH
+			UNI_PLATFORM === 'h5' && {
+				name: 'html-transform',
+				transformIndexHtml(html) {
+					return html.replace('%BUILD_TIME%', dayjs().format('YYYY-MM-DD HH:mm:ss'))
+				},
+			},
+			// 打包分析插件，h5 + 生产环境才弹出
+			UNI_PLATFORM === 'h5' &&
+			mode === 'production' &&
+			visualizer({
+				filename: './node_modules/.cache/visualizer/stats.html',
+				open: true,
+				gzipSize: true,
+				brotliSize: true,
+			}),
+			// 只有在 app 平台时才启用 copyNativeRes 插件
+			UNI_PLATFORM === 'app' && copyNativeRes(),
+			viteMockServe({
+				// 指定 mock 文件目录
+				mockPath: './mock',
+				// 开发服务器才启用mock数据
+				enable: mode === 'development' && JSON.parse(VITE_USE_MOCK),
+			}),
+		],
+		define: {
+			__UNI_PLATFORM__: JSON.stringify(UNI_PLATFORM),
+			__VITE_APP_PROXY__: JSON.stringify(VITE_APP_PROXY),
+		},
+		css: {
+			postcss: {
+				plugins: [
+					// autoprefixer({
+					//   // 指定目标浏览器
+					//   overrideBrowserslist: ['> 1%', 'last 2 versions'],
+					// }),
+				],
+			},
+		},
 
-    resolve: {
-      alias: {
-        '@': path.join(process.cwd(), './src'),
-        '@img': path.join(process.cwd(), './src/static/images'),
-      },
-    },
-    server: {
-      host: '0.0.0.0',
-	  headers: { //允许跨域by 闵
-	    'Access-Control-Allow-Origin': '*'
-	  },
-      hmr: true,
-      port: Number.parseInt(VITE_APP_PORT, 10),
-      // 仅 H5 端生效，其他端不生效（其他端走build，不走devServer)
-      proxy: JSON.parse(VITE_APP_PROXY)
-        ? {
-            [VITE_APP_PROXY_PREFIX]: {
-              target: VITE_SERVER_BASEURL,
-              changeOrigin: true,
-              rewrite: (path) => path.replace(new RegExp(`^${VITE_APP_PROXY_PREFIX}`), ''),
-            },
-          }
-        : undefined,
-    },
-    build: {
-      // 方便非h5端调试
-      sourcemap: VITE_SHOW_SOURCEMAP === 'true', // 默认是false
-      target: 'es6',
-      // 开发环境不用压缩
-      minify: mode === 'development' ? false : 'terser',
-      terserOptions: {
-        compress: {
-          drop_console: VITE_DELETE_CONSOLE === 'true',
-          drop_debugger: true,
-        },
-      },
-    },
-  })
-}
+		resolve: {
+			alias: {
+				'@': path.join(process.cwd(), './src'),
+				'@img': path.join(process.cwd(), './src/static/images'),
+			},
+		},
+		server: {
+			host: '0.0.0.0',
+			headers: { //允许跨域by 闵
+				'Access-Control-Allow-Origin': '*'
+			},
+			hmr: true,
+			port: Number.parseInt(VITE_APP_PORT, 10),
+			// 仅 H5 端生效，其他端不生效（其他端走build，不走devServer)
+			proxy: JSON.parse(VITE_APP_PROXY)
+				? {
+					[VITE_APP_PROXY_PREFIX]: {
+						target: VITE_SERVER_BASEURL,
+						changeOrigin: true,
+						rewrite: (path) => path.replace(new RegExp(`^${VITE_APP_PROXY_PREFIX}`), ''),
+					},
+				}
+				: undefined,
+		},
+		build: {
+			// 方便非h5端调试
+			sourcemap: VITE_SHOW_SOURCEMAP === 'true', // 默认是false
+			target: 'es6',
+			// 开发环境不用压缩
+			minify: mode === 'development' ? false : 'terser',
+			terserOptions: {
+				compress: {
+					drop_console: VITE_DELETE_CONSOLE === 'true',
+					drop_debugger: true,
+				},
+			},
+		},
+	})
+}
\ No newline at end of file

From bec69289ac7d2f141253842cb9d2350d04f66639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Wed, 17 Sep 2025 10:39:59 +0800
Subject: [PATCH 06/12] =?UTF-8?q?9.17=E5=BC=A0=E7=A5=A5=E7=91=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/devicecontrol/officedevice.ts         |  9 +++++++
 .../device-control/office/Personaldevices.vue | 27 ++++---------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/api/devicecontrol/officedevice.ts b/src/api/devicecontrol/officedevice.ts
index a2ed01b..14d6c50 100644
--- a/src/api/devicecontrol/officedevice.ts
+++ b/src/api/devicecontrol/officedevice.ts
@@ -10,6 +10,15 @@ export function gethomelist(config : object) { // 获取房间信息
 	})
 }
 
+
+export function gethomelistforApp(config : object) { // 获取房间信息
+	return http({
+		url: '/RoomOperation/RoomOperation/gethomelistforApp',
+		method: 'GET',
+		data: config
+	})
+}
+
 export function testcontiont(config : object) { // 获取房间信息
 	return http({
 		url: mqtturl + '/mqttSubclient/mqttSubclient/testgetcontint',
diff --git a/src/pages-home/device-control/office/Personaldevices.vue b/src/pages-home/device-control/office/Personaldevices.vue
index 48b2747..520c629 100644
--- a/src/pages-home/device-control/office/Personaldevices.vue
+++ b/src/pages-home/device-control/office/Personaldevices.vue
@@ -13,30 +13,11 @@
 							<text class="info-value">{{ room.ssbmname }}</text>
 						</view>
 					</view>
+					<!-- 补位元素，确保网格始终保持两列布局 -->
+					<view v-if="floor.rooms.length % 2 !== 0" class="room-placeholder"></view>
 				</view>
 			</view>
 		</view>
-<!-- 		<view class="connection-section">
-			<button v-if="!connected" @click="connectWebSocket" class="connect-btn">
-				连接WebSocket
-			</button>
-
-			<button @click="disconnectWebSocket" class="disconnect-btn">
-				断开连接
-			</button>
-
-			<text :class="['status', connected ? 'connected' : 'disconnected']">
-				{{ connectionStatus }}
-			</text>
-		</view>
-		<view class="message-container">
-			<text class="subtitle">消息记录</text>
-			<scroll-view scroll-y="true" class="message-list">
-				<view v-for="(item, index) in messages" :key="index" :class="['message-item', item.type]">
-					<text class="message-content">{{ item.content }}</text>
-				</view>
-			</scroll-view>
-		</view> -->
 	</view>
 </template>
 
@@ -48,6 +29,7 @@
 	} from 'vue'
 	import {
 		gethomelist,
+		gethomelistforApp,
 		getMqttPushClient,
 		selectfjkzbmforfjid,
 		createdSwitch,
@@ -90,7 +72,8 @@
 
 	//获取房间信息
 	const getofficehomelist = async () => {
-		await gethomelist().then((res) => {
+		//20250811,张祥瑞,修改查询接口
+		await gethomelistforApp().then((res) => {
 			if (res.success) {
 				homelist.value = res.result.map((item, index) => ({
 					...item,

From 74c0d48277525940da86d0b7385b52ef2736c64f Mon Sep 17 00:00:00 2001
From: lagos <627844378@qq.com>
Date: Wed, 17 Sep 2025 14:55:44 +0800
Subject: [PATCH 07/12] 1.ofice

---
 src/api/devicecontrol/officedevice.ts         |  9 +++++++
 .../device-control/office/Personaldevices.vue | 27 ++++---------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/api/devicecontrol/officedevice.ts b/src/api/devicecontrol/officedevice.ts
index a2ed01b..14d6c50 100644
--- a/src/api/devicecontrol/officedevice.ts
+++ b/src/api/devicecontrol/officedevice.ts
@@ -10,6 +10,15 @@ export function gethomelist(config : object) { // 获取房间信息
 	})
 }
 
+
+export function gethomelistforApp(config : object) { // 获取房间信息
+	return http({
+		url: '/RoomOperation/RoomOperation/gethomelistforApp',
+		method: 'GET',
+		data: config
+	})
+}
+
 export function testcontiont(config : object) { // 获取房间信息
 	return http({
 		url: mqtturl + '/mqttSubclient/mqttSubclient/testgetcontint',
diff --git a/src/pages-home/device-control/office/Personaldevices.vue b/src/pages-home/device-control/office/Personaldevices.vue
index 48b2747..520c629 100644
--- a/src/pages-home/device-control/office/Personaldevices.vue
+++ b/src/pages-home/device-control/office/Personaldevices.vue
@@ -13,30 +13,11 @@
 							<text class="info-value">{{ room.ssbmname }}</text>
 						</view>
 					</view>
+					<!-- 补位元素，确保网格始终保持两列布局 -->
+					<view v-if="floor.rooms.length % 2 !== 0" class="room-placeholder"></view>
 				</view>
 			</view>
 		</view>
-<!-- 		<view class="connection-section">
-			<button v-if="!connected" @click="connectWebSocket" class="connect-btn">
-				连接WebSocket
-			</button>
-
-			<button @click="disconnectWebSocket" class="disconnect-btn">
-				断开连接
-			</button>
-
-			<text :class="['status', connected ? 'connected' : 'disconnected']">
-				{{ connectionStatus }}
-			</text>
-		</view>
-		<view class="message-container">
-			<text class="subtitle">消息记录</text>
-			<scroll-view scroll-y="true" class="message-list">
-				<view v-for="(item, index) in messages" :key="index" :class="['message-item', item.type]">
-					<text class="message-content">{{ item.content }}</text>
-				</view>
-			</scroll-view>
-		</view> -->
 	</view>
 </template>
 
@@ -48,6 +29,7 @@
 	} from 'vue'
 	import {
 		gethomelist,
+		gethomelistforApp,
 		getMqttPushClient,
 		selectfjkzbmforfjid,
 		createdSwitch,
@@ -90,7 +72,8 @@
 
 	//获取房间信息
 	const getofficehomelist = async () => {
-		await gethomelist().then((res) => {
+		//20250811,张祥瑞,修改查询接口
+		await gethomelistforApp().then((res) => {
 			if (res.success) {
 				homelist.value = res.result.map((item, index) => ({
 					...item,

From f56b003766c304310ba39b52a46501b2f81b24bd Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Mon, 22 Sep 2025 09:43:26 +0800
Subject: [PATCH 08/12] 1

---
 env/.env.development      |  4 ++--
 src/manifest.json         |  2 +-
 src/pages/login/login.vue | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/env/.env.development b/env/.env.development
index a95d8f3..fc1bdf6 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -8,9 +8,9 @@ VITE_SHOW_SOURCEMAP = true
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
 #VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
-VITE_SERVER_BASEURL = 'http://10.96.108.144:8080/jeecg-boot'
+#VITE_SERVER_BASEURL = 'http://10.96.108.144:8080/jeecg-boot'
 
-#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
+VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://szcx.zyyt.sinopec.com/jeecg-boot'
 
 
diff --git a/src/manifest.json b/src/manifest.json
index c83b07e..962c0ae 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,7 +3,7 @@
   "appid": "__UNI__9F097F0",
   "description": "",
   "versionName": "2.2.0",
-  "versionCode": "20250903",
+  "versionCode": "20250909",
   "transformPx": false,
   "app-plus": {
     "usingComponents": true,
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 192171f..272449f 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -137,12 +137,12 @@
 			})
 		} else {
 			/*开发环境 */
-			// params.captcha = 'app';
+			params.captcha = 'app';
 			/*生产环境 */
-			params = {
-				username: Base64.encode(encodeURIComponent(userName.value)),
-				password: Base64.encode(encodeURIComponent(password.value)),
-			};
+			// params = {
+			// 	username: Base64.encode(encodeURIComponent(userName.value)),
+			// 	password: Base64.encode(encodeURIComponent(password.value)),
+			// };
 		}
 		login(params)
 	}

From ab9669637bdcd2141332160f96d7282f0d494d8d Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Mon, 22 Sep 2025 16:28:44 +0800
Subject: [PATCH 09/12] 1

---
 env/.env.development | 1 -
 1 file changed, 1 deletion(-)

diff --git a/env/.env.development b/env/.env.development
index 514145c..6474fde 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -9,7 +9,6 @@ VITE_SHOW_SOURCEMAP = true
 VITE_WEBAPP = ''
 #VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
 VITE_SERVER_BASEURL = 'http://10.75.166.6:8080/jeecg-boot'
-#VITE_SERVER_BASEURL = 'http://10.75.173.194:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://10.75.166.6/test'
 
 #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'

From 4ba99e3990691cdbb423eac0e31f65b4fe98f55a Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Tue, 23 Sep 2025 16:47:27 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E8=AF=B7=E5=81=87=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=8A=B3=E8=B5=84=E5=91=98=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                    |  3 +--
 src/api/system/user.ts                  |  2 +-
 src/pages-humanResource/absence/add.vue | 20 +++++++-------------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/env/.env.development b/env/.env.development
index 6474fde..7414cee 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -7,8 +7,7 @@ VITE_SHOW_SOURCEMAP = true
 # 是否启用读取配置文件 min
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
-#VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
-VITE_SERVER_BASEURL = 'http://10.75.166.6:8080/jeecg-boot'
+VITE_SERVER_BASEURL = 'http://10.75.166.174:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://10.75.166.6/test'
 
 #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 7bbc605..71d830e 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -29,7 +29,7 @@ export function editUserApi(config : object) {
 /*根据部门Cod和角色Id查询用户信息*/
 export function queryUserByOrgRoleApi(config : object) {
 	return http({
-		url: '/cxcChangesInPersonnel/cxcChangesInPersonnel/queryByDepCodRoleId',
+		url: '/sys/user/queryByDepCodRoleId',
 		method: 'GET',
 		data: config
 	})
diff --git a/src/pages-humanResource/absence/add.vue b/src/pages-humanResource/absence/add.vue
index 5753e67..0dcbbda 100644
--- a/src/pages-humanResource/absence/add.vue
+++ b/src/pages-humanResource/absence/add.vue
@@ -335,17 +335,13 @@
 			roleId: '1554379432313397250',
 			orgCode: code
 		}).then(res => {
-			if (res.result.length > 0) {
-				model.hr = res.result[0].username
-			}
-			if (!code) {
-				hrData.value = res.result.map(item => {
-					return {
-						label: item.realname,
-						value: item.username
-					}
-				})
-			}
+			model.hr = res.result.user.username
+			hrData.value = res.result.list.map(item => {
+				return {
+					label: item.realname,
+					value: item.username
+				}
+			})
 		})
 	}
 
@@ -364,8 +360,6 @@
 		getZwmcAndExa()
 		/*获取工作单位*/
 		queryDepName()
-		/*获取劳资员*/
-		getHrList()
 		/*获取*/
 		queryHisDate()
 	});

From 9dbae0a56e1f2a8088d6e3521db79e1383be06c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Thu, 25 Sep 2025 10:19:03 +0800
Subject: [PATCH 11/12] =?UTF-8?q?9.25=E5=BC=A0=E7=A5=A5=E7=91=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                               | 2 +-
 src/pages-home/device-control/office/ALLleader.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/env/.env.development b/env/.env.development
index 514145c..f2e675f 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -8,7 +8,7 @@ VITE_SHOW_SOURCEMAP = true
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
 #VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
-VITE_SERVER_BASEURL = 'http://10.75.166.6:8080/jeecg-boot'
+VITE_SERVER_BASEURL = 'http://10.75.166.170:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'http://10.75.173.194:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://10.75.166.6/test'
 
diff --git a/src/pages-home/device-control/office/ALLleader.vue b/src/pages-home/device-control/office/ALLleader.vue
index c7da6a2..587579b 100644
--- a/src/pages-home/device-control/office/ALLleader.vue
+++ b/src/pages-home/device-control/office/ALLleader.vue
@@ -127,7 +127,7 @@
 			if (res.success) {
 				homelist.value = res.result.map((item, index) => ({
 					...item, // 保留原有字段
-					homezt: 0, // 添加homezt字段，默认为0
+					// homezt: 0, // 添加homezt字段，默认为0
 				}));
 				//添加楼层情况
 			}

From 1add87973a102c19d072edc9cf1d53784a7456e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Fri, 26 Sep 2025 09:46:31 +0800
Subject: [PATCH 12/12] =?UTF-8?q?9.26=E5=BC=A0=E7=A5=A5=E7=91=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                          |  2 +-
 src/api/devicecontrol/officedevice.ts         | 30 ++++++++++++++--
 src/common/socket.ts                          | 10 +++---
 .../device-control/office/ALLleader.vue       | 36 ++++++++++++++-----
 .../device-control/office/Personaldevices.vue | 23 +++++++++---
 .../office/officehomedevice.vue               |  6 ++--
 6 files changed, 83 insertions(+), 24 deletions(-)

diff --git a/env/.env.development b/env/.env.development
index 7414cee..a8b1ffb 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -7,7 +7,7 @@ VITE_SHOW_SOURCEMAP = true
 # 是否启用读取配置文件 min
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
-VITE_SERVER_BASEURL = 'http://10.75.166.174:8080/jeecg-boot'
+VITE_SERVER_BASEURL = 'http://10.75.166.170:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://10.75.166.6/test'
 
 #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'
diff --git a/src/api/devicecontrol/officedevice.ts b/src/api/devicecontrol/officedevice.ts
index 14d6c50..720cadb 100644
--- a/src/api/devicecontrol/officedevice.ts
+++ b/src/api/devicecontrol/officedevice.ts
@@ -11,9 +11,27 @@ export function gethomelist(config : object) { // 获取房间信息
 }
 
 
+// export function gethomelistforApp(config : object) { // 获取房间信息
+// 	return http({
+// 		url: '/RoomOperation/RoomOperation/gethomelistforApp',
+// 		method: 'GET',
+// 		data: config
+// 	})
+// }
+
+//张祥瑞20250925修改为该方法
 export function gethomelistforApp(config : object) { // 获取房间信息
 	return http({
-		url: '/RoomOperation/RoomOperation/gethomelistforApp',
+		url: '/RoomAPP/RoomAPP/gethomelistforApp',
+		method: 'GET',
+		data: config
+	})
+}
+//张祥瑞20250925添加方法，传参为房间表id
+export function getfjkzbmforfjidApp(config : object) { // 查询开关状态
+	return http({
+		url: mqtturl +
+			"/mqttcontroller/mqttcontroller/getfjkzbmforfjid",
 		method: 'GET',
 		data: config
 	})
@@ -87,9 +105,17 @@ export function listAllRegions(config : object) { // 查询开关状态
 	})
 }
 
+// export function Selecthomelist(config : object) { // 查询开关状态
+// 	return http({
+// 		url: '/RoomOperation/RoomOperation/Selecthomelist',
+// 		method: 'GET',
+// 		data: config
+// 	})
+// }
+//张祥瑞，20250925修改为该方法
 export function Selecthomelist(config : object) { // 查询开关状态
 	return http({
-		url: '/RoomOperation/RoomOperation/Selecthomelist',
+		url: '/RoomAPP/RoomAPP/SelecthomelistForApp',
 		method: 'GET',
 		data: config
 	})
diff --git a/src/common/socket.ts b/src/common/socket.ts
index facb619..e1ed04a 100644
--- a/src/common/socket.ts
+++ b/src/common/socket.ts
@@ -7,7 +7,7 @@ const baseUrl = import.meta.env.VITE_SERVER_BASEURL
 
 class socket {
 	constructor() {
-		console.log(77777777777777)
+		// console.log(77777777777777)
 		this.socketUrl = baseUrl
 		this.socketStart = false
 		this.socketType = ''
@@ -50,7 +50,7 @@ class socket {
 				})
 				// update-end-author:taoyan date:20220422 for: v2.4.6 的 websocket 服务端，存在性能和安全问题。 #3278
 				uni.onSocketOpen((res) => {
-					console.log("连接进来了--------53333333333323----")
+					// console.log("连接进来了--------53333333333323----")
 					this.socketStart = true
 					callback && callback()
 					console.log('WebSocket连接已打开！')
@@ -85,10 +85,10 @@ class socket {
 	socketReceive() {
 		const _this = this
 		uni.onSocketMessage(function (res) {
-			console.log('APP:--》收到服务器内容：', res)
-			console.log('连接路径----：', baseUrl)
+			// console.log('APP:--》收到服务器内容：', res)
+			// console.log('连接路径----：', baseUrl)
 			if (res.data.startsWith('CONNECTED') || res.data.startsWith('MESSAGE') || res.data.startsWith('RECEIPT')) {
-				console.log('放行----------：', res)
+				// console.log('放行----------：', res)
 				// 放行 STOMP 协议消息，交给 socketTask.onMessage 处理 by 闵
 				return;
 			}
diff --git a/src/pages-home/device-control/office/ALLleader.vue b/src/pages-home/device-control/office/ALLleader.vue
index 587579b..40d3af6 100644
--- a/src/pages-home/device-control/office/ALLleader.vue
+++ b/src/pages-home/device-control/office/ALLleader.vue
@@ -39,7 +39,7 @@
 				</view>
 			</view>
 		</view>
-<!-- 
+		<!-- 
 		<view class="connection-section">
 			<button v-if="!connected" @click="connectWebSocket" class="connect-btn">
 				连接WebSocket
@@ -84,7 +84,8 @@
 		getMqttPushClient,
 		treeChildList,
 		listAllRegions,
-		Selecthomelist
+		Selecthomelist,
+		getfjkzbmforfjidApp
 	} from '@/api/devicecontrol/officedevice';
 	// import socketforleader from '@/common/socketforleader'
 
@@ -176,6 +177,21 @@
 			}
 		}
 	}
+	/**
+	 * 房间信息订阅
+	 * 
+	 */
+	const getfjkzbmforfjid =  () => {
+		//查询开关状态	
+		for (const item of filteredFloors.value) {
+			console.log("00000000000--------------",item)
+			 getfjkzbmforfjidApp({fjbid:item.id}).then((res) => {
+				console.log("订阅成功--------------",res)
+			}).catch((err) => {
+				console.log("订阅失败："+item.fjh+"。失败信息："+err);
+			});
+		}
+	}
 	const getfjkzbm = async (item) => {
 		// console.log("5555----------",item.id)
 		let fjkzbm = {};
@@ -288,8 +304,10 @@
 			filteredFloors.value = groupByFloor(selectBydata)
 			// console.log("数据分组-555---", filteredFloors.value[0].rooms)
 			//分组完进行房间状态查询，张祥瑞
-			getAllswitchByids()
-			
+			console.log("进入房间订阅：")
+			getfjkzbmforfjid();
+			// getAllswitchByids()
+
 		}
 	}
 	//----------------树状展示end-----------
@@ -297,7 +315,7 @@
 	//------------------------以上为数据处理---end-------------
 	//处理返回的消息
 	const handlesocketMessage = (jsonString) => {
-		console.log("1300--666666666666666---", jsonString)
+		// console.log("1300--666666666666666---", jsonString)
 		try {
 			const messageObj = JSON.parse(jsonString);
 
@@ -378,12 +396,12 @@
 			uni.sendSocketMessage({
 				data: connectFrame
 			});
-			console.log("77777777777")
+			// console.log("77777777777")
 		});
 
 		// 监听消息
 		socketTask.onMessage((res) => {
-			console.log("8888888888888888888")
+			// console.log("8888888888888888888")
 			const data = res.data;
 			const [commandLine, ...headerLines] = data.split('\n');
 			const emptyLineIndex = headerLines.findIndex(line => line === '');
@@ -395,8 +413,8 @@
 			}
 
 			const body = headerLines.slice(emptyLineIndex + 1).join('\n').replace(/\x00$/, '');
-			console.log("999999999999999", res)
-			console.log("121212121212", commandLine)
+			// console.log("999999999999999", res)
+			// console.log("121212121212", commandLine)
 			switch (commandLine) {
 				case 'CONNECTED':
 					connectionStatus.value = 'STOMP已连接';
diff --git a/src/pages-home/device-control/office/Personaldevices.vue b/src/pages-home/device-control/office/Personaldevices.vue
index 520c629..f73ea27 100644
--- a/src/pages-home/device-control/office/Personaldevices.vue
+++ b/src/pages-home/device-control/office/Personaldevices.vue
@@ -34,7 +34,8 @@
 		selectfjkzbmforfjid,
 		createdSwitch,
 		listAllRegions,
-		Selecthomelist
+		Selecthomelist,
+		getfjkzbmforfjidApp
 	} from '@/api/devicecontrol/officedevice';
 	// import useWebSocketService from '@/api/devicecontrol/webSocketService'
 
@@ -77,14 +78,28 @@
 			if (res.success) {
 				homelist.value = res.result.map((item, index) => ({
 					...item,
-					homezt: 0, // 添加homezt字段，默认为0
+					// homezt: 0, // 添加homezt字段，默认为0
 				}));
 			}
 		}).catch((err) => {
 			console.log(err);
 		});
 		filteredFloors.value = groupByFloor(homelist)
-		getAllswitchByids();
+		// getAllswitchByids();
+		//获取完房间信息然后订阅
+		getfjkzbmforfjid();
+	}
+	//订阅房间信息
+	const getfjkzbmforfjid = () => {
+		for (const item of filteredFloors.value) {
+			 getfjkzbmforfjidApp({fjbid:item.id}).then((res) => {
+				console.log("订阅成功--------------",res)
+			}).catch((err) => {
+				console.log("订阅失败："+item.fjh+"。失败信息："+err);
+			});
+		}
+		
+		
 	}
 
 	// 数据分组处理
@@ -229,7 +244,7 @@
 		if (res.success) {
 			selectBydata.value = res.result;
 			filteredFloors.value = groupByFloor(selectBydata)
-			getAllswitchByids()
+			// getAllswitchByids()
 		}
 	}
 	//----------------树状展示end-----------
diff --git a/src/pages-home/device-control/office/officehomedevice.vue b/src/pages-home/device-control/office/officehomedevice.vue
index cfdab58..6d7ac64 100644
--- a/src/pages-home/device-control/office/officehomedevice.vue
+++ b/src/pages-home/device-control/office/officehomedevice.vue
@@ -62,15 +62,15 @@
 
 				<view class="ac-controls" v-if="ktpd">
 					<button class="ac-btn" :class="{ 'active': acMode === 1 }" @click="conditioning(1)">
-						<uni-icons type="snow" size="20" color="#3498db"></uni-icons>
+						<!-- <uni-icons type="snow" size="20" color="#3498db"></uni-icons> -->
 						<text>制冷 25°C</text>
 					</button>
 					<button class="ac-btn" :class="{ 'active': acMode === 2 }" @click="conditioning(2)">
-						<uni-icons type="fire" size="20" color="#e74c3c"></uni-icons>
+						<!-- <uni-icons type="fire" size="20" color="#e74c3c"></uni-icons> -->
 						<text>制热 27°C</text>
 					</button>
 					<button class="ac-btn" :class="{ 'active': acMode === 0 }" @click="conditioning(0)">
-						<uni-icons type="close" size="20" color="#7f8c8d"></uni-icons>
+						<!-- <uni-icons type="close" size="20" color="#7f8c8d"></uni-icons> -->
 						<text>关闭空调</text>
 					</button>
 				</view>