diff --git a/package-lock.json b/package-lock.json
index ed89a0e..392b1ea 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "cxc-szcx-uniapp",
+  "name": "cxc-szcx-uniapp-master",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -19,7 +19,7 @@
     },
     "node_modules/base-64": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
       "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
     },
     "node_modules/dayjs": {
@@ -61,7 +61,7 @@
     },
     "base-64": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
       "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
     },
     "dayjs": {
diff --git a/pages/views/renliziyuan/renyuanxinxi/qttongji.vue b/pages/views/renliziyuan/renyuanxinxi/qttongji.vue
index 09cd3a9..a465508 100644
--- a/pages/views/renliziyuan/renyuanxinxi/qttongji.vue
+++ b/pages/views/renliziyuan/renyuanxinxi/qttongji.vue
@@ -5,16 +5,14 @@
 				<uni-col :span="5"><uni-title :title="'选择单位'" align="left" type="h4"></uni-title></uni-col>
 
 				<uni-col :span="19">
-					<trq-depart-select v-model="selectedOrgCode" returnCodeOrID="orgCode"
-						@change="onOrgCodeChange"></trq-depart-select>
+					<trq-depart-select v-model="selectedOrgCode" returnCodeOrID="orgCode" @change="onOrgCodeChange"></trq-depart-select>
 				</uni-col>
 			</uni-row>
 
 			<uni-row style="margin-bottom: 20rpx; margin-left: 30rpx; margin-right: 30rpx">
 				<uni-col :span="5"><uni-title :title="'选择字段'" align="left" type="h4"></uni-title></uni-col>
 				<uni-col :span="19">
-					<uni-data-select v-model="selectedField" :localdata="fieldList"
-						@change="onFieldChange"></uni-data-select>
+					<uni-data-select v-model="selectedField" :localdata="fieldList" @change="onFieldChange"></uni-data-select>
 				</uni-col>
 			</uni-row>
 		</view>
@@ -24,9 +22,9 @@
 		</view>
 
 		<!-- 翻页按钮 -->
-		<view style="display: flex; justify-content: center; margin-top: 20px">
-			<button @click="prevPage" :disabled="currentPage === 1">上一页</button>
-			<button @click="nextPage" :disabled="currentPage * pageSize >= chartDataCount.value">下一页</button>
+		<view style="display: flex; justify-content: center; margin-top: 10px">
+			<button @click="prevPage" :disabled="currentPage === 1" size="mini">上一页</button>
+			<button @click="nextPage" :disabled="currentPage * pageSize >= chartDataCount.value" size="mini">下一页</button>
 		</view>
 
 		<!-- 数据表格 -->
@@ -39,7 +37,7 @@
 				<view class="titleStyle">姓名</view>
 			</uni-col>
 			<uni-col :span="5">
-				<view class="titleStyle">性别</view>
+				<view class="titleStyle">基层单位</view>
 			</uni-col>
 			<uni-col :span="5">
 				<view class="titleStyle">年龄</view>
@@ -64,7 +62,7 @@
 					</uni-col>
 					<uni-col :span="5">
 						<view class="dataStyle">
-							{{ item.xb_dictText }}
+							{{ item.jcxd }}
 						</view>
 					</uni-col>
 					<uni-col :span="5">
@@ -84,145 +82,139 @@
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive,
-		onMounted,
-		computed
-	} from 'vue';
-	import * as echarts from 'echarts';
-	import {
-		cxcRyDatAstatistics,
-		cxcRyDatAstatisticsDetails
-	} from '@/api/renyuan.js';
-	import {
-		initDictOption
-	} from '@/api/common.js';
+import { ref, reactive, onMounted, computed } from 'vue';
+import * as echarts from 'echarts';
+import { cxcRyDatAstatistics, cxcRyDatAstatisticsDetails } from '@/api/renyuan.js';
+import { initDictOption } from '@/api/common.js';
 
-	// 存储下方组件的高度  tableData
-	const bottomHeight = ref(0);
-	// 新增加载状态
-	const chart = ref(null);
-	const chartDataCount = ref(0);
-	const fieldList = ref([{
-			text: '性别',
-			value: 'xb',
-			isDict: true,
-			dictCode: 'sex'
-		},
-		{
-			text: '政治面貌',
-			value: 'zzmm',
-			isDict: false,
-			dictCode: ''
-		},
-		{
-			text: '民族',
-			value: 'mz',
-			isDict: true,
-			dictCode: 'mz'
-		}
-	]); // 字段列表
-
-	const dictCode = ref("")
-	const fieldisDict = ref(true);
-
-
-	const selectedOrgCode = ref(''); // 当前选择的单位   orgCode
-	const selectedOrgCodeLabel = ref('请选择单位'); // 当前选择的单位名称
-	const selectedField = ref(''); // 当前选择的字段
-	const selectedFieldLabel = ref('请选择字段'); // 当前选择的字段名称
-	const orgCodeGroupData = ref([]); //按照orgcode进行分组的数据 含劳动合同号
-	const chartData = ref({}); // 图表数据
-	const personnelList = ref([]); // 人员列表  initChart
-	const fieldValues = ref([]);
-	const chartOption = ref({});
-
-	const chartTitle = computed(() => {
-		return selectedOrgCodeLabel.value + '人员(' + selectedFieldLabel.value + ')分组统计';
-	});
-
-	//图标翻页
-	const pageSize = ref(3); // 每页显示的项目数量
-	const currentPage = ref(1); // 当前页码
-
-	function detail(record) {
-		// console.log(record)
-		uni.navigateTo({
-			url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
-		});
+// 存储下方组件的高度  tableData
+const bottomHeight = ref(0);
+// 新增加载状态
+const chart = ref(null);
+const chartDataCount = ref(0);
+const fieldList = ref([
+	{
+		text: '性别',
+		value: 'xb',
+		isDict: true,
+		dictCode: 'sex'
+	},
+	{
+		text: '政治面貌',
+		value: 'zzmm',
+		isDict: true,
+		dictCode: 'zzmm'
+	},
+	{
+		text: '民族',
+		value: 'mz',
+		isDict: true,
+		dictCode: 'mz'
 	}
+]); // 字段列表
 
-	onMounted(() => {
-		// #ifdef APP
-		getHeight();
-		// #endif
+const dictCode = ref('');
+const fieldisDict = ref(true);
 
+const selectedOrgCode = ref(''); // 当前选择的单位   orgCode
+const selectedOrgCodeLabel = ref('请选择单位'); // 当前选择的单位名称
+const selectedField = ref(''); // 当前选择的字段
+const selectedFieldLabel = ref('请选择字段'); // 当前选择的字段名称
+const orgCodeGroupData = ref([]); //按照orgcode进行分组的数据 含劳动合同号
+const chartData = ref({}); // 图表数据
+const personnelList = ref([]); // 人员列表  initChart
+const fieldValues = ref([]); //字段值
+const fieldTexts = ref([]); //字段值
+const chartOption = ref({});
 
+const chartTitle = computed(() => {
+	return selectedOrgCodeLabel.value + '人员(' + selectedFieldLabel.value + ')分组统计';
+});
+
+//图标翻页
+const pageSize = ref(3); // 每页显示的项目数量
+const currentPage = ref(1); // 当前页码
+
+function detail(record) {
+	// console.log(record)
+	uni.navigateTo({
+		url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
 	});
+}
+
+onMounted(() => {
 	// #ifdef APP
-
-	const getHeight = () => {
-		// 获取屏幕高度
-		const systemInfo = uni.getSystemInfoSync();
-		const screenHeight = systemInfo.screenHeight;
-		// 创建选择器查询对象
-		const query = uni.createSelectorQuery();
-		// 获取上方组件的高度
-		query
-			.select('#top1')
-			.boundingClientRect((rect1) => {
-				// 计算上方组件高度总和
-				const topComponentsHeight = rect1.height;
-				// 计算下方组件的高度
-				bottomHeight.value = screenHeight - topComponentsHeight - 415;
-			})
-			.exec();
-	};
-
+	getHeight();
 	// #endif
-	// 初始化 ECharts length   departChange
-	// 初始化图表
-	const initChart = () => {
-		setTimeout(async () => {
-			if (!chart.value) return;
-			const myChart = await chart.value.init(echarts);
-			myChart.setOption(chartOption.value);
-		}, 300);
-	};
+});
+// #ifdef APP
 
-	const prevPage = () => {
-		if (currentPage.value > 1) {
-			currentPage.value--;
+const getHeight = () => {
+	// 获取屏幕高度
+	const systemInfo = uni.getSystemInfoSync();
+	const screenHeight = systemInfo.screenHeight;
+	// 创建选择器查询对象
+	const query = uni.createSelectorQuery();
+	// 获取上方组件的高度
+	query
+		.select('#top1')
+		.boundingClientRect((rect1) => {
+			// 计算上方组件高度总和
+			const topComponentsHeight = rect1.height;
+			// 计算下方组件的高度
+			bottomHeight.value = screenHeight - topComponentsHeight - 415;
+		})
+		.exec();
+};
 
-		}
+// #endif
+// 初始化 ECharts length   departChange
+// 初始化图表
+const initChart = () => {
+	setTimeout(async () => {
+		if (!chart.value) return;
+		const myChart = await chart.value.init(echarts);
+		myChart.setOption(chartOption.value);
+	}, 300);
+};
+
+const prevPage = () => {
+	if (currentPage.value > 1) {
+		currentPage.value--;
 	}
+	updateChart(chartData.value);
+};
 
-	const nextPage = () => {
-		if (currentPage.value * pageSize.value < chartDataCount.value) {
-			currentPage.value++;
-			// 计算当前页数据的起始和结束索引
-			const startIndex = (currentPage.value - 1) * pageSize.value;
-			const endIndex = startIndex + pageSize.value;
-
-			// const tempChartData = temp.slice(startIndex, endIndex);
-
-		}
-	}
-	// 更具数据生成图标的option
-	const getChartOption = (tempChartData) => {
-		// let temp = JSON.parse(JSON.stringify(tempchartData[0].children));
-		// chartDataCount.value = temp.length;
-		// // 计算当前页数据的起始和结束索引
-		// const startIndex = (currentPage.value - 1) * pageSize.value;
-		// const endIndex = startIndex + pageSize.value;
-		// // 截取当前页的数据
+const nextPage = () => {
+	if (currentPage.value * pageSize.value < chartDataCount.value) {
+		currentPage.value++;
+		// 计算当前页数据的起始和结束索引
+		const startIndex = (currentPage.value - 1) * pageSize.value;
+		const endIndex = startIndex + pageSize.value;
+		updateChart(chartData.value);
 		// const tempChartData = temp.slice(startIndex, endIndex);
+	}
+};
+// 更具数据生成图标的option
+const getChartOption = (ChartData) => {
+	// let temp = JSON.parse(JSON.stringify(tempchartData[0].children));
+	// chartDataCount.value = temp.length;
+	// 计算当前页数据的起始和结束索引
+	const startIndex = (currentPage.value - 1) * pageSize.value;
+	const endIndex = startIndex + pageSize.value;
+	// 截取当前页的数据
+	const tempChartData = ChartData.slice(startIndex, endIndex);
+	try {
 		let xData = [];
 		let seriesData = [];
-		// console.log(1, temp);
+		console.log(1, tempChartData);
 		//当前机构下的数据 transformDataForEcharts
 
+		let legendData = [];
+		for (let i = 0; i < fieldValues.value.length; i++) {
+			legendData.push(fieldValues.value[i].filedText);
+		}
+
 		tempChartData.forEach((item) => {
 			xData.push(item.name);
 		});
@@ -230,6 +222,7 @@
 		for (let i = 0; i < fieldValues.value.length; i++) {
 			let tempData = [];
 			tempChartData.forEach((item) => {
+				console.log(item);
 				if (item.data[i]) {
 					tempData.push(item.data[i]);
 				} else {
@@ -237,11 +230,16 @@
 				}
 			});
 			seriesData.push({
-				name: fieldValues.value[i],
+				name: fieldValues.value[i].filedText,
 				type: 'bar',
+				label: {
+					show: true, // 显示数值标签
+					position: 'top' // 数值标签位置
+				},
 				data: tempData
 			});
 		}
+		console.log(2, legendData, xData, seriesData);
 		let tempOption = {
 			title: {
 				text: chartTitle.value,
@@ -278,35 +276,37 @@
 					show: false //不显示坐标轴线
 				}
 			},
-			yAxis: [{
-				show: true,
-				boundaryGap: false, //解决数据与线不对应问题
-				type: 'value',
-				// name: 'Budget (million USD)',
-				// data: this.yList,
-				minInterval: 1,
-				axisLabel: {
-					interval: 0
-				},
-				splitLine: {
+			yAxis: [
+				{
 					show: true,
-					lineStyle: {
-						//背景网格线
-						type: 'dashed'
-					}
-				},
+					boundaryGap: false, //解决数据与线不对应问题
+					type: 'value',
+					// name: 'Budget (million USD)',
+					// data: this.yList,
+					minInterval: 1,
+					axisLabel: {
+						interval: 0
+					},
+					splitLine: {
+						show: true,
+						lineStyle: {
+							//背景网格线
+							type: 'dashed'
+						}
+					},
 
-				axisTick: {
-					show: true //刻度线
-				},
-				axisLine: {
-					show: false //不显示坐标轴线
+					axisTick: {
+						show: true //刻度线
+					},
+					axisLine: {
+						show: false //不显示坐标轴线
+					}
 				}
-			}],
+			],
 			series: seriesData,
 
 			legend: {
-				data: fieldValues.value,
+				data: legendData,
 				itemGap: 5,
 				padding: [0, 15, 0, 15],
 				y: 'bottom',
@@ -315,525 +315,557 @@
 				type: 'scroll'
 			}
 		};
-		return tempOption
+		return tempOption;
+	} catch (error) {
+		console.log(error);
 	}
+};
 
-	// 更新图表
-	const updateChart = (tempchartData) => {
-		// 初始化图表
-		setTimeout(async () => {
-			if (!chart.value) return;
-			const myChart = await chart.value.init(echarts);
-			console.log(tempchartData);
+// 更新图表
+const updateChart = (tempchartData) => {
+	// 初始化图表
+	setTimeout(async () => {
+		if (!chart.value) return;
+		const myChart = await chart.value.init(echarts);
+		console.log(tempchartData);
+		let tempOption = getChartOption(tempchartData);
 
+		myChart.setOption(tempOption);
+		// 点击钻取事件
+		myChart.on('click', (params) => {
+			console.log(params.name, params.seriesIndex, params.dataIndex);
+			console.log(orgCodeGroupData.value);
 
-			myChart.setOption(getChartOption(tempchartData));
-			// 点击钻取事件
-			myChart.on('click', (params) => {
-				console.log(params.name, params.seriesIndex, params.dataIndex);
-				console.log(orgCodeGroupData.value);
-				let updateData = findRyByOrgCode(orgCodeGroupData.value.children, params.name);
-				// console.log(updateData);
+			let updateData = findRyByOrgCode(orgCodeGroupData.value.children, params.name);
+			console.log(updateData);
 
-				const ldhth = updateData.fieldValues[params.dataIndex].ldhth;
+			const ldhth = updateData.fieldValues[params.seriesIndex].ldhth;
 
-				console.log(ldhth);
+			console.log(ldhth);
 
-				if (ldhth && ldhth.length > 0) {
-					fetchPersonnelList(ldhth);
-				}
-				// updateChart(updateData);
+			if (ldhth && ldhth.length > 0) {
+				fetchPersonnelList(ldhth);
+			}
+			// updateChart(updateData);
+		});
+	}, 300);
+};
+//根据一个键值查找数据
+//查找人员劳动合同号
+function findRyByOrgCode(treeData, targetOrgCode) {
+	// console.log(treeData, targetOrgCode);
+	for (const node of treeData) {
+		// 如果当前节点匹配，直接返回该节点及其子节点
+		if (node.orgText === targetOrgCode) {
+			return node;
+		}
+		// 递归检查子节点
+		if (node.children && node.children.length > 0) {
+			const found = findNodeByOrgCode(node.children, targetOrgCode);
+			if (found) return found;
+		}
+	}
+	return null;
+}
+
+/**
+ * 从echart图标的树状数据中根据 orgCode 获取节点及其子节点数据
+ * @param {Array} treeData 树状数据
+ * @param {string} targetOrgCode 目标 orgCode
+ * @returns {Object|null} 匹配的节点及其子节点数据，未找到返回 null
+ */
+function findNodeByOrgCode(treeData, targetOrgCode) {
+	// console.log(treeData, targetOrgCode);
+	for (const node of treeData) {
+		// 如果当前节点匹配，直接返回该节点及其子节点
+		if (node.name === targetOrgCode) {
+			return node;
+		}
+		// 递归检查子节点
+		if (node.children && node.children.length > 0) {
+			const found = findNodeByOrgCode(node.children, targetOrgCode);
+			if (found) return found;
+		}
+	}
+	return null;
+}
+
+//获取所有的fieldValue
+function collectUniqueKeyFieldValues(tree) {
+	const uniqueMap = new Map();
+	tree.forEach((item) => {
+		const { fieldValue, filedText } = item;
+		const key = `${fieldValue}-${filedText}`;
+
+		if (!uniqueMap.has(key)) {
+			uniqueMap.set(key, {
+				fieldValue,
+				filedText
 			});
-		}, 300);
-	};
-	//根据一个键值查找数据
-	//查找人员劳动合同号
-	function findRyByOrgCode(treeData, targetOrgCode) {
-		// console.log(treeData, targetOrgCode);
-		for (const node of treeData) {
-			// 如果当前节点匹配，直接返回该节点及其子节点
-			if (node.orgCode === targetOrgCode) {
-				return node;
-			}
-			// 递归检查子节点
-			if (node.children && node.children.length > 0) {
-				const found = findNodeByOrgCode(node.children, targetOrgCode);
-				if (found) return found;
-			}
 		}
-		return null;
+	});
+
+	const result = Array.from(uniqueMap.values());
+	return result;
+}
+
+// 封装一个类来管理组织代码和组织名称的映射
+class OrgCodeMapper {
+	constructor(data) {
+		// 初始化一个空对象用于存储映射关系
+		this.orgCodeToOrgTextMap = {};
+		// 遍历传入的数据数组
+		for (let i = 0; i < data.length; i++) {
+			const item = data[i];
+			// 将 orgCode 作为键，orgText 作为值存入映射对象
+			this.orgCodeToOrgTextMap[item.orgCode] = item.orgText;
+		}
 	}
 
-	/**
-	 * 从echart图标的树状数据中根据 orgCode 获取节点及其子节点数据
-	 * @param {Array} treeData 树状数据
-	 * @param {string} targetOrgCode 目标 orgCode
-	 * @returns {Object|null} 匹配的节点及其子节点数据，未找到返回 null
-	 */
-	function findNodeByOrgCode(treeData, targetOrgCode) {
-		// console.log(treeData, targetOrgCode);
-		for (const node of treeData) {
-			// 如果当前节点匹配，直接返回该节点及其子节点
-			if (node.name === targetOrgCode) {
-				return node;
-			}
-			// 递归检查子节点
-			if (node.children && node.children.length > 0) {
-				const found = findNodeByOrgCode(node.children, targetOrgCode);
-				if (found) return found;
-			}
-		}
-		return null;
+	// 查找指定 orgCode 对应的 orgText 的方法
+	findOrgText(orgCode) {
+		return this.orgCodeToOrgTextMap[orgCode];
 	}
+}
 
-	//获取所有的fieldValue
-	function collectUniqueKeyValues(tree, key) {
-		const uniqueValues = new Set(); // 使用Set来自动处理唯一性
+// 示例用法
+// const result = findNodeByOrgCode(echartData, "A01A01A01A01");
+// console.log(result);
+/**
+ * 转换数据为支持钻取的ECharts格式
+ * @param {Array} data 原始数据
+ * @param {string} selectOrgCode 当前选择的组织编码
+ * @returns {Object} 包含当前层级数据和子节点信息的对象   符合echart的格式
+ */
 
-		function traverse(node) {
-			if (node[key] !== undefined) {
-				uniqueValues.add(node[key]);
-			}
-			if (node.children && Array.isArray(node.children)) {
-				node.children.forEach((child) => traverse(child));
-			}
+//-----------------------------------------------------------------------------------------
+function transformData(selectOrgCode, data) {
+	const nodes = new Map();
+	//获取所有的fieldValue   用于图例和钻取和data[]中的数据顺序保持一致 动态建立fieldValue的数据
+	fieldValues.value = collectUniqueKeyFieldValues(data);
+	// console.log(fieldValues.value);
+	const orgMapper = new OrgCodeMapper(data); //用于快速查找orgtext
+	// console.log(orgMapper.findOrgText('A01A01A01A01'));
+	// 获取orgCode的所有层级
+	function getHierarchy(orgCode) {
+		const hierarchy = [];
+		for (let i = selectOrgCode.length; i <= orgCode.length; i += 3) {
+			hierarchy.push(orgCode.substring(0, i));
 		}
-
-		tree.forEach((node) => traverse(node)); // 假设tree是一个数组
-
-		return Array.from(uniqueValues); // 将Set转换为数组
+		// console.log('hierarchy', hierarchy);
+		return hierarchy;
 	}
-
-	// 示例用法
-	// const result = findNodeByOrgCode(echartData, "A01A01A01A01");
-	// console.log(result);
-	/**
-	 * 转换数据为支持钻取的ECharts格式
-	 * @param {Array} data 原始数据
-	 * @param {string} selectOrgCode 当前选择的组织编码
-	 * @returns {Object} 包含当前层级数据和子节点信息的对象   符合echart的格式
-	 */
-
-	//-----------------------------------------------------------------------------------------
-	function transformData(selectOrgCode, data) {
-		const nodes = new Map();
-		//获取所有的fieldValue   用于图例和钻取和data[]中的数据顺序保持一致 动态建立fieldValue的数据
-		fieldValues.value = collectUniqueKeyValues(data, 'fieldValue');
-		// 获取orgCode的所有层级
-		function getHierarchy(orgCode) {
-			const hierarchy = [];
-			for (let i = selectOrgCode.length; i <= orgCode.length; i += 3) {
-				hierarchy.push(orgCode.substring(0, i));
+	// 获取父级orgCode
+	function getParentCode(code) {
+		if (code.length <= 3) return null;
+		return code.substring(0, code.length - 3);
+	}
+	// 动态赋值series的数据长度
+	let tempArrayValue = new Array(fieldValues.value.length).fill(0);
+	// 创建所有节点并建立父子关系
+	data.forEach((entry) => {
+		const hierarchy = getHierarchy(entry.orgCode);
+		// console.log(entry);
+		hierarchy.forEach((code) => {
+			// console.log(code);
+			let tempOrgText = orgMapper.findOrgText(code) === undefined ? '' : orgMapper.findOrgText(code);
+			// console.log(tempOrgText);
+			if (!nodes.has(code)) {
+				nodes.set(code, {
+					orgCode: code,
+					name: tempOrgText,
+					type: 'bar',
+					data: JSON.parse(JSON.stringify(tempArrayValue)), // 初始化data为[0, 0]  动态
+					children: []
+				});
+			}
+		});
+		// console.log(nodes);
+		// console.log('fieldValues', fieldValues.value, fieldValues.value.length, hierarchy);
+
+		// 更新当前节点的data
+		const node = nodes.get(entry.orgCode);
+		const fieldValue = entry.fieldValue;
+
+		for (let i = 0; i < fieldValues.value.length; i++) {
+			if (fieldValue === fieldValues.value[i].fieldValue) {
+				// console.log(555, i, fieldValue, fieldValues.value[i], entry.number);
+				node.data[i] += entry.number;
 			}
-			// console.log('hierarchy', hierarchy);
-			return hierarchy;
 		}
-		// 获取父级orgCode
-		function getParentCode(code) {
-			if (code.length <= 3) return null;
-			return code.substring(0, code.length - 3);
+
+		// console.log(11, node);
+
+		// 建立父子关系
+		for (let i = 0; i < hierarchy.length - 1; i++) {
+			const parentCode = hierarchy[i];
+			const childCode = hierarchy[i + 1];
+			const parentNode = nodes.get(parentCode);
+			const childNode = nodes.get(childCode);
+			if (!parentNode.children.some((c) => c.orgCode === childCode)) {
+				parentNode.children.push(childNode);
+			}
 		}
-		// 动态赋值series的数据长度
-		let tempArrayValue = new Array(fieldValues.value.length).fill(0);
-		// 创建所有节点并建立父子关系
-		data.forEach((entry) => {
-			const hierarchy = getHierarchy(entry.orgCode);
-			hierarchy.forEach((code) => {
-				if (!nodes.has(code)) {
-					nodes.set(code, {
-						orgCode: code,
-						type: 'bar',
-						data: JSON.parse(JSON.stringify(tempArrayValue)), // 初始化data为[0, 0]  动态
-						children: []
-					});
-				}
-			});
-
-			// console.log('fieldValues', fieldValues.value, fieldValues.value.length, hierarchy);
-
-			// 更新当前节点的data
-			const node = nodes.get(entry.orgCode);
-			const fieldValue = parseInt(entry.fieldValue, 10);
+	});
 
+	// 计算非叶子节点的data（子节点之和）
+	function computeData(node) {
+		if (node.children.length === 0) return;
+		node.data = JSON.parse(JSON.stringify(tempArrayValue));
+		node.children.forEach((child) => {
+			computeData(child);
 			for (let i = 0; i < fieldValues.value.length; i++) {
-				if (fieldValue === parseInt(fieldValues.value[i], 10)) {
-					// console.log(555, i, fieldValue, fieldValues.value[i], entry.number);
-					node.data[i] += entry.number;
-				}
-			}
-
-			// console.log(11, node);
-
-			// 建立父子关系
-			for (let i = 0; i < hierarchy.length - 1; i++) {
-				const parentCode = hierarchy[i];
-				const childCode = hierarchy[i + 1];
-				const parentNode = nodes.get(parentCode);
-				const childNode = nodes.get(childCode);
-				if (!parentNode.children.some((c) => c.orgCode === childCode)) {
-					parentNode.children.push(childNode);
-				}
+				// console.log(666, i, node.data[i], child.data[i]);
+				node.data[i] += child.data[i];
 			}
 		});
-
-		// 计算非叶子节点的data（子节点之和）
-		function computeData(node) {
-			if (node.children.length === 0) return;
-			node.data = JSON.parse(JSON.stringify(tempArrayValue));
-			node.children.forEach((child) => {
-				computeData(child);
-				for (let i = 0; i < fieldValues.value.length; i++) {
-					// console.log(666, i, node.data[i], child.data[i]);
-					node.data[i] += child.data[i];
-				}
-			});
-		}
-
-		// 获取所有根节点（没有父节点或父节点不存在）
-		const rootNodes = [];
-		nodes.forEach((node, code) => {
-			const parentCode = getParentCode(code);
-			// console.log(parentCode);
-			if (!parentCode || !nodes.has(parentCode)) {
-				rootNodes.push(node);
-			}
-		});
-
-		// 递归计算每个根节点的data
-		rootNodes.forEach((root) => computeData(root));
-		// console.log('rootNodes', rootNodes);
-		// 转换为目标格式
-		function formatTree(node) {
-			return {
-				name: node.orgCode,
-				type: 'bar',
-				data: node.data,
-				children: node.children.map((child) => formatTree(child))
-			};
-		}
-
-		return rootNodes.map((root) => formatTree(root));
 	}
 
-	//-----------------------------------------------------------------------------------------
-
-	//根据 orgCode 的分级格式，递归地汇总本级及其所有下级的数据，并将下级数据放在本级的 children 属性中。 deepseek
-
-	const groupByOrgCode = (orgCode, data) => {
-		// 过滤出本级和所有下级的数据
-		console.log(1, data)
-		const filteredData = data.filter((item) => item.orgCode.startsWith(orgCode));
-		console.log(2, filteredData)
-		// 如果过滤后的数据为空，返回 null
-		if (filteredData.length === 0) {
-			uni.showToast({
-				title: "过滤后数据为空",
-				duration: 1000
-			})
-			return null;
+	// 获取所有根节点（没有父节点或父节点不存在）
+	const rootNodes = [];
+	nodes.forEach((node, code) => {
+		const parentCode = getParentCode(code);
+		// console.log(parentCode);
+		if (!parentCode || !nodes.has(parentCode)) {
+			rootNodes.push(node);
 		}
+	});
 
-		// 按照 fieldValue 分组
-		const groupedByFieldValue = {};
-		try {
-			filteredData.forEach((item) => {
-				// console.log(item.orgCode, 11, groupedByFieldValue[item.fieldValue]);
-				if (!groupedByFieldValue[item.fieldValue]) {
-					groupedByFieldValue[item.fieldValue] = {
-						number: 0,
-						ldhth: []
-					};
-				}
-				// console.log(item.orgCode, 22, groupedByFieldValue[item.fieldValue]);
-				groupedByFieldValue[item.fieldValue].number += item.number;
-				groupedByFieldValue[item.fieldValue].ldhth.push(...item.ldhth.split(','));
-			});
-		} catch (error) {
-			console.log(error)
-		}
+	// 递归计算每个根节点的data
+	rootNodes.forEach((root) => computeData(root));
+	return rootNodes;
+	// console.log('rootNodes', rootNodes);
+	// // 转换为目标格式
+	// function formatTree(node) {
+	// 	// console.log(node);
+	// 	return {
+	// 		orgCode: node.orgCode,
+	// 		name: node.name,
+	// 		type: 'bar',
+	// 		data: node.data,
+	// 		children: node.children.map((child) => formatTree(child))
+	// 	};
+	// }
 
+	// return rootNodes.map((root) => {
+	// 	console.log(root);
+	// 	formatTree(root);
+	// });
+}
 
-		// 构建本级结果
-		const result = {
-			orgCode: orgCode,
-			fieldValues: Object.keys(groupedByFieldValue).map((fieldValue) => ({
+//-----------------------------------------------------------------------------------------
+
+//根据 orgCode 的分级格式，递归地汇总本级及其所有下级的数据，并将下级数据放在本级的 children 属性中。 deepseek
+
+const groupByOrgCode = (orgCode, data) => {
+	// 过滤出本级和所有下级的数据
+
+	const filteredData = data.filter((item) => item.orgCode.startsWith(orgCode));
+	const orgMapper = new OrgCodeMapper(data);
+	// 如果过滤后的数据为空，返回 null
+	if (filteredData.length === 0) {
+		uni.showToast({
+			title: '过滤后数据为空',
+			duration: 1000
+		});
+		return null;
+	}
+	// console.log(0, filteredData);
+	// 按照 fieldValue 分组
+	const groupedByFieldValue = {};
+	try {
+		filteredData.forEach((item) => {
+			// console.log(item);
+			if (!groupedByFieldValue[item.fieldValue]) {
+				groupedByFieldValue[item.fieldValue] = {
+					orgCode: item.orgCode,
+					orgText: item.orgText,
+					filedText: item.filedText,
+					number: 0,
+					ldhth: []
+				};
+			}
+			// console.log(item.orgCode, 22, groupedByFieldValue[item.fieldValue]);
+			groupedByFieldValue[item.fieldValue].number += item.number;
+			groupedByFieldValue[item.fieldValue].ldhth.push(...item.ldhth.split(','));
+		});
+	} catch (error) {
+		console.log(error);
+	}
+	console.log(1, orgMapper.findOrgText(orgCode));
+	// 构建本级结果
+
+	const result = {
+		orgCode: orgCode,
+		orgText: orgMapper.findOrgText(orgCode),
+		fieldValues: Object.keys(groupedByFieldValue).map((fieldValue) => {
+			const { filedText, orgCode, orgText } = groupedByFieldValue[fieldValue] || {};
+			return {
 				fieldValue: fieldValue,
+				filedText: filedText,
+				orgCode: orgCode,
+				orgText: orgText,
 				number: groupedByFieldValue[fieldValue].number,
 				ldhth: [...new Set(groupedByFieldValue[fieldValue].ldhth)] // 去重
-			})),
-			children: []
-		};
-
-		// console.log('本级', result);
-
-		// 获取所有下一级的 orgCode
-		const nextLevelOrgCodes = new Set();
-		try {
-			filteredData.forEach((item) => {
-				if (item.orgCode !== orgCode && item.orgCode.startsWith(orgCode)) {
-					const nextLevelOrgCode = item.orgCode.substring(0, orgCode.length + 3);
-					nextLevelOrgCodes.add(nextLevelOrgCode);
-				}
-			});
-		} catch (error) {
-			console.log(error)
-		}
-		// 递归处理下一级数据
-		try {
-
-			nextLevelOrgCodes.forEach((nextLevelOrgCode) => {
-				const child = groupByOrgCode(nextLevelOrgCode, data);
-				if (child) {
-					result.children.push(child);
-				}
-			});
-
-		} catch (error) {
-			console.log(error)
-		}
-
-		// console.log('全部', result);
-
-		return result;
+			};
+		}),
+		children: []
 	};
-	// 获取统计数据  then  filter
-	const fetchStatisticsData = async () => {
-		if (!selectedOrgCode.value || !selectedField.value) return;
-		let res = []
-		try {
-			res = await cxcRyDatAstatistics({
-				orgCode: selectedOrgCode.value,
-				field: selectedField.value,
-				dictCode: dictCode.value,
-				fieldisDict: fieldisDict.value
-			});
-			console.log(res); //deepseek
-			if (res.length === 0) {
+
+	// console.log('本级', result);
+
+	// 获取所有下一级的 orgCode
+	const nextLevelOrgCodes = new Set();
+	try {
+		filteredData.forEach((item) => {
+			if (item.orgCode !== orgCode && item.orgCode.startsWith(orgCode)) {
+				const nextLevelOrgCode = item.orgCode.substring(0, orgCode.length + 3);
+				nextLevelOrgCodes.add(nextLevelOrgCode);
+			}
+		});
+	} catch (error) {
+		console.log(error);
+	}
+	// 递归处理下一级数据
+	try {
+		nextLevelOrgCodes.forEach((nextLevelOrgCode) => {
+			const child = groupByOrgCode(nextLevelOrgCode, data);
+			if (child) {
+				result.children.push(child);
+			}
+		});
+	} catch (error) {
+		console.log(error);
+	}
+
+	// console.log('全部', result);
+
+	return result;
+};
+// 获取统计数据  then  filter
+const fetchStatisticsData = async () => {
+	if (!selectedOrgCode.value || !selectedField.value) return;
+	let res = [];
+	chartData.value = [];
+	try {
+		res = await cxcRyDatAstatistics({
+			orgCode: selectedOrgCode.value,
+			field: selectedField.value,
+			dictCode: dictCode.value,
+			fieldisDict: fieldisDict.value
+		});
+		// console.log(res); //deepseek
+		if (res.success) {
+			// console.log(selectedOrgCode.value, res);
+			if (res.result.length < 1) {
 				uni.showToast({
-					title: "查询数据为空"
-				})
-				return
+					title: '查询数据为空'
+				});
+				return;
+			}
+			//按单位进行分组
+			orgCodeGroupData.value = groupByOrgCode(selectedOrgCode.value, res.result);
+			// console.log(orgCodeGroupData.value);
+			//将数据转换成echart格式
+			const temp = transformData(selectedOrgCode.value, res.result);
+
+			if (temp[0].children.length > 0) {
+				chartData.value = JSON.parse(JSON.stringify(temp[0].children));
 			} else {
-				console.log(selectedOrgCode.value, res);
-				orgCodeGroupData.value = groupByOrgCode(selectedOrgCode.value, res);
-				console.log(orgCodeGroupData.value);
-				chartData.value = transformData(selectedOrgCode.value, res);
-
-				let temp = []
-				if (chartData.value[0].children.length > 0) {
-					temp = JSON.parse(JSON.stringify(chartData.value[0].children));
-				} else {
-					temp = chartData.value[0]
-				}
-				console.log(temp)
-				chartDataCount.value = temp.length;
-				// console.log(chartData.value);
-				updateChart(temp);
+				chartData.value = temp[0];
 			}
-		} catch (error) {
-			console.error('获取统计数据失败:', error);
+			chartDataCount.value = chartData.value.length;
+			// console.log(chartData.value);
+			updateChart(chartData.value);
 		}
-	};
+	} catch (error) {
+		console.error('获取统计数据失败:', error);
+	}
+};
 
-	// 获取人员列表 delimiter
-	const fetchPersonnelList = async (ldhthList) => {
-		try {
-			const res = await cxcRyDatAstatisticsDetails({
-				ldhth: ldhthList
-			});
-			console.log(res);
-			personnelList.value = res.data;
-		} catch (error) {
-			console.error('获取人员列表失败:', error);
+// 获取人员列表 delimiter
+const fetchPersonnelList = async (ldhthList) => {
+	personnelList.value = [];
+	try {
+		const res = await cxcRyDatAstatisticsDetails({
+			ldhth: ldhthList
+		});
+		console.log(res);
+		if (res.success) {
+			personnelList.value = res.result;
 		}
-	};
+	} catch (error) {
+		console.error('获取人员列表失败:', error);
+	}
+};
 
-	// 事件处理
-	const onOrgCodeChange = (e, data) => {
-		selectedOrgCode.value = e;
-		console.log(data.value.title);
-		selectedOrgCodeLabel.value = data.value.title;
+// 事件处理
+const onOrgCodeChange = (e, data) => {
+	selectedOrgCode.value = e;
+	// console.log(data.value.title);
+	selectedOrgCodeLabel.value = data.value.title;
+	fetchStatisticsData();
+};
+
+const onFieldChange = (e) => {
+	// console.log(e);
+	try {
+		selectedField.value = e;
+		for (var index = 0; index < fieldList.value.length; index++) {
+			var element = fieldList.value[index];
+			// console.log(element);
+			if (element.value === e) {
+				selectedFieldLabel.value = element.text;
+				dictCode.value = element.dictCode;
+				fieldisDict.value = element.isDict;
+			}
+		}
 		fetchStatisticsData();
-	};
+	} catch (error) {
+		//TODO handle the exception
+		console.log(error);
+	}
+};
 
-	const onFieldChange = (e) => {
-		console.log(e);
-		try {
-			selectedField.value = e;
-			for (var index = 0; index < fieldList.value.length; index++) {
-				var element = fieldList.value[index];
-				console.log(element);
-				if (element.value === e) {
-					selectedFieldLabel.value = element.text;
-					dictCode.value = element.dictCode
-					fieldisDict.value = element.isDict
-				}
-			}
-			fetchStatisticsData();
-		} catch (error) {
-			//TODO handle the exception
-			console.log(error);
-		}
-	};
-
-	const onChartClick = (e) => {
-		const {
-			ldhth
-		} = chartData.value;
-		if (ldhth && ldhth.length > 0) {
-			fetchPersonnelList(ldhth);
-		}
-	};
+const onChartClick = (e) => {
+	const { ldhth } = chartData.value;
+	if (ldhth && ldhth.length > 0) {
+		fetchPersonnelList(ldhth);
+	}
+};
 </script>
 <style scoped>
-	/* 颜色变量 */
-	:root {
-		--primary-blue: #409eff;
-		--deep-blue: #2c7be5;
-		--light-blue: #ecf5ff;
-		--gradient-start: #6b8cff;
-		--gradient-end: #4364f7;
-		--hover-blue: #66b1ff;
+/* 颜色变量 */
+:root {
+	--primary-blue: #409eff;
+	--deep-blue: #2c7be5;
+	--light-blue: #ecf5ff;
+	--gradient-start: #6b8cff;
+	--gradient-end: #4364f7;
+	--hover-blue: #66b1ff;
+}
+
+/* 全局容器 */
+.container {
+	margin: 10rpx 10rpx;
+	padding: 10rpx;
+	background: linear-gradient(145deg, #f5f9ff, var(--light-blue));
+	border-radius: 24rpx;
+	box-shadow: 0 8rpx 24rpx rgba(64, 158, 255, 0.15);
+	border: 2rpx solid rgba(64, 158, 255, 0.1);
+}
+
+/* 图表容器 */
+.chart-container {
+	height: 200px;
+	margin: 20rpx 0;
+	border-radius: 24rpx;
+	overflow: hidden;
+	background: #ffffff;
+	box-shadow: 0 8rpx 32rpx rgba(64, 158, 255, 0.12);
+	border: 2rpx solid rgba(64, 158, 255, 0.08);
+}
+
+/* 表格标题行 */
+
+.titleStyle {
+	font-size: 12px;
+	color: #747474;
+	line-height: 30px;
+	height: 30px;
+	background: #f2f9fc;
+	text-align: center;
+	vertical-align: middle;
+	border-left: 1px solid #919191;
+	border-bottom: 1px solid #919191;
+}
+
+/* 内容样式 */
+.dataStyle {
+	max-font-size: 14px;
+	/* 最大字体限制 */
+	min-font-size: 10px;
+	/* 最小字体限制 */
+	font-size: 12px;
+	color: #00007f;
+	line-height: 30px;
+	height: 30px;
+	font-weight: 500;
+	text-align: center;
+	vertical-align: middle;
+	border-bottom: 1px solid #919191;
+	border-left: 1px solid #919191;
+	text-overflow: ellipsis;
+}
+
+/* 滚动区域 */
+scroll-view {
+	background: #ffffff;
+	border-radius: 0 0 16rpx 16rpx;
+	box-shadow: 0 8rpx 24rpx rgba(0, 35, 111, 0.08);
+}
+
+/* 输入框聚焦效果 */
+.trq-depart-select:focus-within {
+	box-shadow: 0 0 0 4rpx rgba(64, 158, 255, 0.2);
+	border-color: var(--primary-blue);
+}
+
+/* 加载动画优化 */
+@keyframes fadeIn {
+	from {
+		opacity: 0;
+		transform: translateY(20rpx);
 	}
 
-	/* 全局容器 */
-	.container {
-		margin: 10rpx 10rpx;
-		padding: 10rpx;
-		background: linear-gradient(145deg, #f5f9ff, var(--light-blue));
-		border-radius: 24rpx;
-		box-shadow: 0 8rpx 24rpx rgba(64, 158, 255, 0.15);
-		border: 2rpx solid rgba(64, 158, 255, 0.1);
+	to {
+		opacity: 1;
+		transform: translateY(0);
 	}
+}
 
-	/* 图表容器 */
+.container > * {
+	animation: fadeIn 0.6s cubic-bezier(0.23, 1, 0.32, 1);
+}
+
+/* 自定义滚动条美化 */
+::-webkit-scrollbar {
+	width: 8rpx;
+	background: rgba(64, 158, 255, 0.05);
+}
+
+::-webkit-scrollbar-thumb {
+	background: linear-gradient(45deg, var(--primary-blue), var(--deep-blue));
+	border-radius: 12rpx;
+	border: 2rpx solid white;
+}
+
+/* 筛选行间距优化 */
+.filter-row {
+	margin: 30rpx 0;
+	padding: 20rpx 0;
+	border-radius: 16rpx;
+}
+
+/* 响应式调整优化 */
+@media (max-width: 768px) {
 	.chart-container {
-		height: 50vh;
-		margin: 20rpx 0;
-		border-radius: 24rpx;
-		overflow: hidden;
-		background: #ffffff;
-		box-shadow: 0 8rpx 32rpx rgba(64, 158, 255, 0.12);
-		border: 2rpx solid rgba(64, 158, 255, 0.08);
+		height: 200px;
+		border-radius: 20rpx;
 	}
 
-	/* 表格标题行 */
 	.titleStyle {
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #ffffff;
-		background: linear-gradient(135deg, var(--gradient-start), var(--gradient-end));
-		padding: 28rpx 0;
-		border-radius: 16rpx 16rpx 0 0;
-		box-shadow: 0 4rpx 12rpx rgba(67, 100, 247, 0.2);
-		letter-spacing: 1rpx;
-	}
-
-	/* 数据行 */
-	.dataStyle {
-		font-size: 28rpx;
-		color: #3a466b;
-		padding: 32rpx 0;
-		background: #ffffff;
-		border-bottom: 2rpx solid #f0f6ff;
-		transition: all 0.25s cubic-bezier(0.4, 0, 0.2, 1);
-	}
-
-	.dataStyle:hover {
-		background: #f8fbff;
-		transform: translateY(-2rpx);
-	}
-
-	/* 操作按钮 */
-	button[type='primary'] {
-		background: linear-gradient(135deg, var(--primary-blue), var(--deep-blue));
-		border: none;
-		border-radius: 12rpx;
-		padding: 12rpx 32rpx;
 		font-size: 26rpx;
-		box-shadow: 0 6rpx 16rpx rgba(64, 158, 255, 0.3);
-		transition: all 0.25s ease;
+		padding: 24rpx 0;
 	}
+}
 
-	button[type='primary']:active {
-		transform: scale(0.96);
-		box-shadow: 0 4rpx 8rpx rgba(64, 158, 255, 0.3);
-		background: linear-gradient(135deg, var(--deep-blue), var(--primary-blue));
-	}
+/* 数据行高亮效果 */
+.data-row:nth-child(even) {
+	background: rgba(236, 245, 255, 0.3);
+}
 
-	/* 滚动区域 */
-	scroll-view {
-		background: #ffffff;
-		border-radius: 0 0 16rpx 16rpx;
-		box-shadow: 0 8rpx 24rpx rgba(0, 35, 111, 0.08);
-	}
-
-	/* 输入框聚焦效果 */
-	.trq-depart-select:focus-within {
-		box-shadow: 0 0 0 4rpx rgba(64, 158, 255, 0.2);
-		border-color: var(--primary-blue);
-	}
-
-	/* 加载动画优化 */
-	@keyframes fadeIn {
-		from {
-			opacity: 0;
-			transform: translateY(20rpx);
-		}
-
-		to {
-			opacity: 1;
-			transform: translateY(0);
-		}
-	}
-
-	.container>* {
-		animation: fadeIn 0.6s cubic-bezier(0.23, 1, 0.32, 1);
-	}
-
-	/* 自定义滚动条美化 */
-	::-webkit-scrollbar {
-		width: 8rpx;
-		background: rgba(64, 158, 255, 0.05);
-	}
-
-	::-webkit-scrollbar-thumb {
-		background: linear-gradient(45deg, var(--primary-blue), var(--deep-blue));
-		border-radius: 12rpx;
-		border: 2rpx solid white;
-	}
-
-	/* 筛选行间距优化 */
-	.filter-row {
-		margin: 30rpx 0;
-		padding: 20rpx 0;
-		border-radius: 16rpx;
-	}
-
-	/* 响应式调整优化 */
-	@media (max-width: 768px) {
-		.chart-container {
-			height: 55vh;
-			border-radius: 20rpx;
-		}
-
-		.titleStyle {
-			font-size: 26rpx;
-			padding: 24rpx 0;
-		}
-
-		button[type='primary'] {
-			padding: 10rpx 24rpx;
-			font-size: 24rpx;
-		}
-	}
-
-	/* 数据行高亮效果 */
-	.data-row:nth-child(even) {
-		background: rgba(236, 245, 255, 0.3);
-	}
-
-	.data-row:hover {
-		box-shadow: 0 4rpx 12rpx rgba(64, 158, 255, 0.1);
-	}
-</style>
\ No newline at end of file
+.data-row:hover {
+	box-shadow: 0 4rpx 12rpx rgba(64, 158, 255, 0.1);
+}
+</style>