diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 392b1ea..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "name": "cxc-szcx-uniapp-master",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "dependencies": {
-        "@dcloudio/uni-ui": "^1.5.6",
-        "base-64": "^1.0.0",
-        "dayjs": "^1.11.13",
-        "echarts": "^5.6.0"
-      }
-    },
-    "node_modules/@dcloudio/uni-ui": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.5.6.tgz",
-      "integrity": "sha512-jmb98PasFvZkrIDXGh94GbdWg2/jyhgs1HUG+bU8eyL7Ltias/5XBz4q8w9RXyWUfqepJRqapPA2IIQpLCuTIg==",
-      "license": "Apache-2.0"
-    },
-    "node_modules/base-64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
-      "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
-    },
-    "node_modules/dayjs": {
-      "version": "1.11.13",
-      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
-      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
-    },
-    "node_modules/echarts": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz",
-      "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "2.3.0",
-        "zrender": "5.6.1"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
-      "license": "0BSD"
-    },
-    "node_modules/zrender": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz",
-      "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "tslib": "2.3.0"
-      }
-    }
-  },
-  "dependencies": {
-    "@dcloudio/uni-ui": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.5.6.tgz",
-      "integrity": "sha512-jmb98PasFvZkrIDXGh94GbdWg2/jyhgs1HUG+bU8eyL7Ltias/5XBz4q8w9RXyWUfqepJRqapPA2IIQpLCuTIg=="
-    },
-    "base-64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
-      "integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
-    },
-    "dayjs": {
-      "version": "1.11.13",
-      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
-      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
-    },
-    "echarts": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz",
-      "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==",
-      "requires": {
-        "tslib": "2.3.0",
-        "zrender": "5.6.1"
-      }
-    },
-    "tslib": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
-      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
-    },
-    "zrender": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz",
-      "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==",
-      "requires": {
-        "tslib": "2.3.0"
-      }
-    }
-  }
-}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index a67ea93..dc9a355 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -98,17 +98,17 @@
 		});
 
 		/*生产环境 begin */
-		// loginApi({
-		// 	username: un,
-		// 	password: pw,
-		// 	ip: getDeviceIp()
+		loginApi({
+			username: un,
+			password: pw,
+			ip: getDeviceIp()
 		/*生产环境 end */
 
 		/*开发环境 begin */
-		localLoginApi({
-			username: username.value,
-			password: password.value,
-			captcha: 'app'
+		// localLoginApi({
+		// 	username: username.value,
+		// 	password: password.value,
+		// 	captcha: 'app'
 			/*开发环境 end */
 		}).then((loginres) => {
 			if (loginres.success) {
diff --git a/pages/views/renliziyuan/renyuanxinxi/detail.vue b/pages/views/renliziyuan/renyuanxinxi/detail.vue
index d223072..0e65eeb 100644
--- a/pages/views/renliziyuan/renyuanxinxi/detail.vue
+++ b/pages/views/renliziyuan/renyuanxinxi/detail.vue
@@ -1,44 +1,46 @@
 <template>
 	<view>
 		<scroll-view :scroll-x="true" :scroll-y="true">
-			<view style="padding: 10px 10px 10px 10px;">
+			<view style="padding: 10px 10px 10px 10px">
 				<uni-title title="基本信息" type="h1" color="blue"></uni-title>
-				<yjly-row-cell :cellData="cellData" :rowDataCount="3"></yjly-row-cell>
+				<uni-row>
+					<uni-col :span="18"><yjly-row-cell :cellData="cellData" :rowDataCount="2"></yjly-row-cell></uni-col>
+					<uni-col :span="6">
+						<view class="img">
+							<image :src="'https://10.75.166.6/jeecg-boot/sys/common/static/'+imgUrl"></image>
+						</view>
+					</uni-col>
+				</uni-row>
+
+				<yjly-row-cell :cellData="cellData1" :rowDataCount="3"></yjly-row-cell>
 
 				<uni-title title="年度绩效考核" type="h1" color="blue"></uni-title>
 				<uni-row>
 					<uni-col :span="4">
-						<view class="titleStyle">
-							序号
-						</view>
+						<view class="titleStyle">序号</view>
 					</uni-col>
 					<uni-col :span="10">
-						<view class="titleStyle">
-							绩效考核年份
-						</view>
+						<view class="titleStyle">绩效考核年份</view>
 					</uni-col>
 					<uni-col :span="10">
-						<view class="titleStyle">
-							绩效考核成绩
-						</view>
+						<view class="titleStyle">绩效考核成绩</view>
 					</uni-col>
-
-
 				</uni-row>
 				<uni-row>
-					<view v-for="(item,index) in jxkhxxList">
+					<view v-for="(item, index) in jxkhxxList">
 						<uni-col :span="4">
 							<view class="dataStyle1">
-								{{index+1}}
+								{{ index + 1 }}
 							</view>
 						</uni-col>
 						<uni-col :span="10">
 							<view class="dataStyle1">
-								{{item.nf}}
+								{{ item.nf }}
 							</view>
-						</uni-col><uni-col :span="10">
+						</uni-col>
+						<uni-col :span="10">
 							<view class="dataStyle1">
-								{{item.khcj+"---"+item.khcj_dictText}}
+								{{ item.khcj + '---' + item.khcj_dictText }}
 							</view>
 						</uni-col>
 					</view>
@@ -46,44 +48,38 @@
 				<uni-title title="工作简历" type="h1" color="blue"></uni-title>
 				<uni-row>
 					<uni-col :span="4">
-						<view class="titleStyle">
-							起始时间
-						</view>
+						<view class="titleStyle">起始时间</view>
 					</uni-col>
 					<uni-col :span="4">
-						<view class="titleStyle">
-							终止时间
-						</view>
+						<view class="titleStyle">终止时间</view>
 					</uni-col>
 					<uni-col :span="11">
-						<view class="titleStyle">
-							工作职务
-						</view>
+						<view class="titleStyle">工作职务</view>
 					</uni-col>
 					<uni-col :span="5">
-						<view class="titleStyle">
-							岗位职务
-						</view>
+						<view class="titleStyle">岗位职务</view>
 					</uni-col>
 				</uni-row>
 				<uni-row>
-					<view v-for="(item,index) in gzjlList">
+					<view v-for="(item, index) in gzjlList">
 						<uni-col :span="4">
 							<view class="dataStyle1">
-								{{item.kssj}}
+								{{ item.kssj }}
 							</view>
 						</uni-col>
 						<uni-col :span="4">
 							<view class="dataStyle1">
-								{{item.jssj}}
+								{{ item.jssj }}
 							</view>
-						</uni-col><uni-col :span="11">
+						</uni-col>
+						<uni-col :span="11">
 							<view class="dataStyle2" ref="dataView">
-								{{item.jlms}}
+								{{ item.jlms }}
 							</view>
-						</uni-col><uni-col :span="5">
+						</uni-col>
+						<uni-col :span="5">
 							<view class="dataStyle1">
-								{{item.jlms2}}
+								{{ item.jlms2 }}
 							</view>
 						</uni-col>
 					</view>
@@ -92,64 +88,54 @@
 				<uni-title title="学历信息" type="h1" color="blue"></uni-title>
 				<uni-row>
 					<uni-col :span="4">
-						<view class="titleStyle">
-							类别
-						</view>
+						<view class="titleStyle">类别</view>
 					</uni-col>
 					<uni-col :span="4">
-						<view class="titleStyle">
-							毕业院校
-						</view>
+						<view class="titleStyle">毕业院校</view>
 					</uni-col>
 					<uni-col :span="4">
-						<view class="titleStyle">
-							所学专业
-						</view>
+						<view class="titleStyle">所学专业</view>
 					</uni-col>
 					<uni-col :span="4">
-						<view class="titleStyle">
-							学历
-						</view>
+						<view class="titleStyle">学历</view>
 					</uni-col>
 					<uni-col :span="4">
-						<view class="titleStyle">
-							学位
-						</view>
+						<view class="titleStyle">学位</view>
 					</uni-col>
 					<uni-col :span="4">
-						<view class="titleStyle">
-							毕业时间
-						</view>
+						<view class="titleStyle">毕业时间</view>
 					</uni-col>
 				</uni-row>
 				<uni-row>
-					<view v-for="(item,index) in xlxxList">
+					<view v-for="(item, index) in xlxxList">
 						<uni-col :span="4">
 							<view class="dataStyle1">
-								{{item.xllb}}
+								{{ item.xllb }}
 							</view>
 						</uni-col>
 						<uni-col :span="4">
 							<view class="dataStyle1">
-								{{item.byyx}}
+								{{ item.byyx }}
 							</view>
-						</uni-col><uni-col :span="4">
+						</uni-col>
+						<uni-col :span="4">
 							<view class="dataStyle2" ref="dataView">
-								{{item.sxzy}}
-							</view>
-						</uni-col><uni-col :span="4">
-							<view class="dataStyle1">
-								{{item.qdxl}}
+								{{ item.sxzy }}
 							</view>
 						</uni-col>
 						<uni-col :span="4">
 							<view class="dataStyle1">
-								{{item.qdxw}}
+								{{ item.qdxl }}
 							</view>
 						</uni-col>
 						<uni-col :span="4">
 							<view class="dataStyle1">
-								{{item.bytime}}
+								{{ item.qdxw }}
+							</view>
+						</uni-col>
+						<uni-col :span="4">
+							<view class="dataStyle1">
+								{{ item.bytime }}
 							</view>
 						</uni-col>
 					</view>
@@ -157,54 +143,46 @@
 				<uni-title title="取证信息" type="h1" color="blue"></uni-title>
 				<uni-row>
 					<uni-col :span="6">
-						<view class="titleStyle">
-							证书名称
-						</view>
+						<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>
+						<view class="titleStyle">取证时间</view>
 					</uni-col>
 					<uni-col :span="5">
-						<view class="titleStyle">
-							复审时间
-						</view>
+						<view class="titleStyle">复审时间</view>
 					</uni-col>
 					<uni-col :span="3">
-						<view class="titleStyle">
-							备注
-						</view>
+						<view class="titleStyle">备注</view>
 					</uni-col>
 				</uni-row>
 				<uni-row>
-					<view v-for="(item,index) in zjtzList">
+					<view v-for="(item, index) in zjtzList">
 						<uni-col :span="6">
 							<view class="dataStyle2" ref="dataView">
-								{{item.zjmc}}
+								{{ item.zjmc }}
 							</view>
 						</uni-col>
 						<uni-col :span="5">
 							<view class="dataStyle1">
-								{{item.zsdj}}
+								{{ item.zsdj }}
 							</view>
-						</uni-col><uni-col :span="5">
+						</uni-col>
+						<uni-col :span="5">
 							<view class="dataStyle1">
-								{{item.fzrq}}
+								{{ item.fzrq }}
 							</view>
-						</uni-col><uni-col :span="5">
+						</uni-col>
+						<uni-col :span="5">
 							<view class="dataStyle1">
-								{{item.fssj}}
+								{{ item.fssj }}
 							</view>
 						</uni-col>
 						<uni-col :span="3">
 							<view class="dataStyle1">
-								{{item.bz}}
+								{{ item.bz }}
 							</view>
 						</uni-col>
 					</view>
@@ -213,54 +191,46 @@
 				<uni-title title="家庭信息" type="h1" color="blue"></uni-title>
 				<uni-row>
 					<uni-col :span="4">
-						<view class="titleStyle">
-							称谓
-						</view>
+						<view class="titleStyle">称谓</view>
 					</uni-col>
 					<uni-col :span="3">
-						<view class="titleStyle">
-							姓名
-						</view>
+						<view class="titleStyle">姓名</view>
 					</uni-col>
 					<uni-col :span="6">
-						<view class="titleStyle">
-							出生年月
-						</view>
+						<view class="titleStyle">出生年月</view>
 					</uni-col>
 					<uni-col :span="4">
-						<view class="titleStyle">
-							政治面貌
-						</view>
+						<view class="titleStyle">政治面貌</view>
 					</uni-col>
 					<uni-col :span="7">
-						<view class="titleStyle">
-							工作单位及职务
-						</view>
+						<view class="titleStyle">工作单位及职务</view>
 					</uni-col>
 				</uni-row>
 				<uni-row>
-					<view v-for="(item,index) in zyjtcyList">
+					<view v-for="(item, index) in zyjtcyList">
 						<uni-col :span="4">
 							<view class="dataStyle1">
-								{{item.ybrgx}}
+								{{ item.ybrgx }}
 							</view>
 						</uni-col>
 						<uni-col :span="3">
 							<view class="dataStyle1">
-								{{item.gxname}}
+								{{ item.gxname }}
 							</view>
-						</uni-col><uni-col :span="6">
+						</uni-col>
+						<uni-col :span="6">
 							<view class="dataStyle1">
-								{{item.cstime}}
+								{{ item.cstime }}
 							</view>
-						</uni-col><uni-col :span="4">
+						</uni-col>
+						<uni-col :span="4">
 							<view class="dataStyle1">
-								{{item.cyzzmm}}
+								{{ item.cyzzmm }}
 							</view>
 						</uni-col>
 						<uni-col :span="7">
 							<view class="dataStyle2" ref="dataView">
-								{{item.cygzdw}}
+								{{ item.cygzdw }}
 							</view>
 						</uni-col>
 					</view>
@@ -268,378 +238,367 @@
 			</view>
 		</scroll-view>
 	</view>
-
 </template>
 
 <script setup>
-	import {
-		onReady,
-		onLoad
-	} from '@dcloudio/uni-app';
-	import {
-		reactive,
-		ref,
-		onMounted
-	} from 'vue';
-	import {
-		queryGzjlByRyLdhth,
-		queryQzqkByRyLdhth,
-		queryJtzycyByRyLdhth,
-		queryXlxxByRyLdhth,
-		queryGbxxByRyLdhth,
-		queryZyzgdjByRyLdhth,
-		queryJxkhByRyLdhth
-	} from '@/api/renyuan.js'
-	import {
-		useStore
-	} from '@/store';
-	const tempCellData = ref({
-		"title": "",
-		"value": "",
-		"titleSpan": 4,
-		"valueSpan": 4
+import { onReady, onLoad } from '@dcloudio/uni-app';
+import { reactive, ref, onMounted } from 'vue';
+import { queryGzjlByRyLdhth, queryQzqkByRyLdhth, queryJtzycyByRyLdhth, queryXlxxByRyLdhth, queryGbxxByRyLdhth, queryZyzgdjByRyLdhth, queryJxkhByRyLdhth } from '@/api/renyuan.js';
+import { useStore } from '@/store';
+const tempCellData = ref({
+	title: '',
+	value: '',
+	titleSpan: 4,
+	valueSpan: 4
+});
+const ldhth = ref('');
+const imgUrl = ref('');
+const renyuanData = ref({});
+const cellData = ref([]);
+const cellData1 = ref([]);
+
+const gzjlList = ref([]); // 人员其他子表信息-工作经历
+const zjtzList = ref([]); // 人员其他子表信息-证件台账
+const zyjtcyList = ref([]); // 人员其他子表信息-主要家庭成员
+const xlxxList = ref([]); // 人员其他子表信息-学历证书
+const gbxxList = ref([]); // 人员其他子表信息-干部信息
+const zyzgdjList = ref([]); // 人员其他子表信息-职业资格等级
+const jxkhxxList = ref([]); // 人员其他子表信息-绩效考核信息
+
+function getChildTable() {
+	console.log(ldhth.value);
+
+	queryJxkhByRyLdhth({
+		ldhth: ldhth.value
 	})
-	const ldhth = ref("")
-	const renyuanData = ref({})
-	const cellData = ref([])
-	const gzjlList = ref([]) // 人员其他子表信息-工作经历
-	const zjtzList = ref([]) // 人员其他子表信息-证件台账
-	const zyjtcyList = ref([]) // 人员其他子表信息-主要家庭成员
-	const xlxxList = ref([]) // 人员其他子表信息-学历证书
-	const gbxxList = ref([]) // 人员其他子表信息-干部信息
-	const zyzgdjList = ref([]) // 人员其他子表信息-职业资格等级
-	const jxkhxxList = ref([]) // 人员其他子表信息-绩效考核信息
-
-
-	function getChildTable() {
-		console.log(ldhth.value)
-
-		queryJxkhByRyLdhth({
-			"ldhth": ldhth.value
-		}).then((res) => {
+		.then((res) => {
 			// console.log(res);
-			jxkhxxList.value = res.result.records
+			jxkhxxList.value = res.result.records;
 			// console.log(jxkhxxList.value)
-		}).catch((err) => {
-			console.log(err);
 		})
+		.catch((err) => {
+			console.log(err);
+		});
 
-		queryGbxxByRyLdhth({
-			"ldhth": ldhth.value
-		}).then((res) => {
+	queryGbxxByRyLdhth({
+		ldhth: ldhth.value
+	})
+		.then((res) => {
 			// console.log(res);
-			gbxxList.value = res
+			gbxxList.value = res;
 			// console.log(gbxxList.value)
-		}).catch((err) => {
-			console.log(err);
 		})
-		queryZyzgdjByRyLdhth({
-			"ldhth": ldhth.value
-		}).then((res) => {
+		.catch((err) => {
+			console.log(err);
+		});
+	queryZyzgdjByRyLdhth({
+		ldhth: ldhth.value
+	})
+		.then((res) => {
 			// console.log(res);
-			zyzgdjList.value = res
+			zyzgdjList.value = res;
 			// console.log(zyzgdjList.value)
-		}).catch((err) => {
-			console.log(err);
 		})
-		queryGzjlByRyLdhth({
-			"ldhth": ldhth.value
-		}).then((res) => {
+		.catch((err) => {
+			console.log(err);
+		});
+	queryGzjlByRyLdhth({
+		ldhth: ldhth.value
+	})
+		.then((res) => {
 			// console.log(res);
 			if (res.length > 0) {
-				gzjlList.value = res
+				gzjlList.value = res;
 			}
-		}).catch((err) => {
-			console.log(err);
 		})
-		queryQzqkByRyLdhth({
-			"ldhth": ldhth.value
-		}).then((res) => {
+		.catch((err) => {
+			console.log(err);
+		});
+	queryQzqkByRyLdhth({
+		ldhth: ldhth.value
+	})
+		.then((res) => {
 			// console.log(res);
 			if (res.length > 0) {
-				zjtzList.value = res
+				zjtzList.value = res;
 			}
-		}).catch((err) => {
-			console.log(err);
 		})
-		queryJtzycyByRyLdhth({
-			"ldhth": ldhth.value
-		}).then((res) => {
+		.catch((err) => {
+			console.log(err);
+		});
+	queryJtzycyByRyLdhth({
+		ldhth: ldhth.value
+	})
+		.then((res) => {
 			// console.log(res);
 			if (res.length > 0) {
-				zyjtcyList.value = res
+				zyjtcyList.value = res;
 			}
-		}).catch((err) => {
-			console.log(err);
 		})
-		queryXlxxByRyLdhth({
-			"ldhth": ldhth.value
-		}).then((res) => {
+		.catch((err) => {
+			console.log(err);
+		});
+	queryXlxxByRyLdhth({
+		ldhth: ldhth.value
+	})
+		.then((res) => {
 			if (res.success) {
-				xlxxList.value = []
+				xlxxList.value = [];
 				if (res.result.records.length > 0) {
-					var rress = res.result.records
+					var rress = res.result.records;
 					// console.log(rress);
 					for (let i = 0; i < rress.length; i++) {
-						if (rress[i].onexl == 1 & rress[i].zgxl == 1) {
-							rress[i].xllb = "第一学历"
-							xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])))
+						if ((rress[i].onexl == 1) & (rress[i].zgxl == 1)) {
+							rress[i].xllb = '第一学历';
+							xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])));
 							// console.log(xlxxList.value)
-							rress[i].xllb = "最高学历"
-							xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])))
+							rress[i].xllb = '最高学历';
+							xlxxList.value.push(JSON.parse(JSON.stringify(rress[i])));
 							// console.log(xlxxList.value)
 						}
-						if (rress[i].onexl == 1 & rress[i].zgxl != 1) {
-							rress[i].xllb = "第一学历"
-							xlxxList.value.push(rress[i])
-
+						if ((rress[i].onexl == 1) & (rress[i].zgxl != 1)) {
+							rress[i].xllb = '第一学历';
+							xlxxList.value.push(rress[i]);
 						}
-						if (rress[i].onexl != 1 & rress[i].zgxl == 1) {
-							rress[i].xllb = "最高学历"
-							xlxxList.value.push(rress[i])
+						if ((rress[i].onexl != 1) & (rress[i].zgxl == 1)) {
+							rress[i].xllb = '最高学历';
+							xlxxList.value.push(rress[i]);
 						}
 					}
-
-
 				}
 			}
 
 			// adjustFontSize()
-		}).catch((err) => {
+		})
+		.catch((err) => {
 			console.log(err);
-		})
-	}
+		});
+}
 
+function getJbxx() {
+	cellData.value.push({
+		title: '姓名',
+		value: renyuanData.value.xm,
+		titleSpan: 6,
+		valueSpan: 6,
+		class: 'dataStyle'
+	});
+	cellData.value.push({
+		title: '性别',
+		value: renyuanData.value.xb_dictText,
+		titleSpan: 6,
+		valueSpan: 6,
+		class: 'dataStyle'
+	});
 
+	cellData.value.push({
+		title: '出生年月',
+		value: renyuanData.value.cssj,
+		titleSpan: 6,
+		valueSpan: 6,
+		class: 'dataStyle'
+	});
+	cellData.value.push({
+		title: '民族',
+		value: renyuanData.value.mz,
+		titleSpan: 6,
+		valueSpan: 6,
+		class: 'dataStyle'
+	});
+	cellData.value.push({
+		title: '籍贯',
+		value: renyuanData.value.jg,
+		titleSpan: 6,
+		valueSpan: 6,
+		class: 'dataStyle'
+	});
+	cellData.value.push({
+		title: '出生地',
+		value: renyuanData.value.csd,
+		titleSpan: 6,
+		valueSpan: 6,
+		class: 'dataStyle'
+	});
+	cellData.value.push({
+		title: '工作时间',
+		value: renyuanData.value.cjgzsj,
+		titleSpan: 6,
+		valueSpan: 6,
+		class: 'dataStyle'
+	});
 
-	function getJbxx() {
-		cellData.value.push({
-			"title": "姓名",
-			"value": renyuanData.value.xm,
-			"titleSpan": 3,
-			"valueSpan": 3,
-			"class": "dataStyle"
-		})
-		cellData.value.push({
-			"title": "性别",
-			"value": renyuanData.value.xb_dictText,
-			"titleSpan": 3,
-			"valueSpan": 4,
-			"class": "dataStyle"
-		})
+	cellData.value.push({
+		title: '现专业',
+		value: '',
+		titleSpan: 6,
+		valueSpan: 6,
+		class: 'dataStyle1'
+	});
+	cellData.value.push({
+		title: '政治面貌',
+		value: renyuanData.value.zzmm === '群众' ? renyuanData.value.zzmm : renyuanData.value.zzmm + renyuanData.value.jrsj,
+		titleSpan: 4,
+		valueSpan: 8,
+		class: 'dataStyle1'
+	});
+	cellData.value.push({
+		title: '用工形式',
+		value: renyuanData.value.rylb1_dictText,
+		titleSpan: 4,
+		valueSpan: 8,
+		class: 'dataStyle'
+	});
 
-		cellData.value.push({
-			"title": "出生年月",
-			"value": renyuanData.value.cssj,
-			"titleSpan": 4,
-			"valueSpan": 4,
-			"class": "dataStyle"
-		})
-		cellData.value.push({
-			"title": "民族",
-			"value": renyuanData.value.mz,
-			"titleSpan": 3,
-			"valueSpan": 3,
-			"class": "dataStyle"
-		})
-		cellData.value.push({
-			"title": "籍贯",
-			"value": renyuanData.value.jg,
-			"titleSpan": 3,
-			"valueSpan": 5,
-			"class": "dataStyle"
-		})
-		cellData.value.push({
-			"title": "出生地",
-			"value": renyuanData.value.csd,
-			"titleSpan": 3,
-			"valueSpan": 4,
-			"class": "dataStyle"
-		})
-		cellData.value.push({
-			"title": "工作时间",
-			"value": renyuanData.value.cjgzsj,
-			"titleSpan": 4,
-			"valueSpan": 5,
-			"class": "dataStyle"
-		})
+	cellData1.value.push({
+		title: '所在单位',
+		value: renyuanData.value.orgCode_dictText,
+		titleSpan: 4,
+		valueSpan: 8,
+		class: 'dataStyle'
+	});
+	cellData1.value.push({
+		title: '专业技术资格',
+		value: gbxxList.value.zc === 0 ? '/' : gbxxList.value.zc + gbxxList.value.zcsj,
+		titleSpan: 4,
+		valueSpan: 8,
+		class: 'dataStyle'
+	});
+	cellData1.value.push({
+		title: '',
+		value: '',
+		titleSpan: 0,
+		valueSpan: 0,
+		class: 'dataStyle'
+	});
 
-		cellData.value.push({
-			"title": "政治面貌",
-			"value": renyuanData.value.zzmm === "群众" ? renyuanData.value.zzmm : renyuanData.value.zzmm +
-				renyuanData.value.jrsj,
-			"titleSpan": 4,
-			"valueSpan": 4,
-			"class": "dataStyle1"
-		})
-		cellData.value.push({
-			"title": "现专业",
-			"value": "",
-			"titleSpan": 3,
-			"valueSpan": 8,
-			"class": "dataStyle"
-		})
-		cellData.value.push({
-			"title": "用工形式",
-			"value": renyuanData.value.rylb1_dictText,
-			"titleSpan": 4,
-			"valueSpan": 5,
-			"class": "dataStyle"
-		})
-		cellData.value.push({
-			"title": "健康状况",
-			"value": "",
-			"titleSpan": 4,
-			"valueSpan": 4,
-			"class": "dataStyle"
-		})
-		cellData.value.push({
-			"title": "所在单位",
-			"value": renyuanData.value.orgCode_dictText,
-			"titleSpan": 4,
-			"valueSpan": 6,
-			"class": "dataStyle"
-		})
-		cellData.value.push({
-			"title": "专业技术资格",
-			"value": gbxxList.value.zc === 0 ? "/" : gbxxList.value.zc + gbxxList.value.zcsj,
-			"titleSpan": 5,
-			"valueSpan": 7,
-			"class": "dataStyle1"
-		})
-		cellData.value.push({
-			"title": "职业资格等级",
-			"value": zyzgdjList.value.ztgz === "0" ? "/" : zyzgdjList.value.ztgz + zyzgdjList.value.ztgzdj,
-			"titleSpan": 5,
-			"valueSpan": 7,
-			"class": "dataStyle"
-		})
-		cellData.value.push({
-			"title": "",
-			"value": "",
-			"titleSpan": 0,
-			"valueSpan": 0,
-			"class": "dataStyle"
-		})
+	cellData1.value.push({
+		title: '职业资格等级',
+		value: zyzgdjList.value.ztgz === '0' ? '/' : zyzgdjList.value.ztgz + zyzgdjList.value.ztgzdj,
+		titleSpan: 4,
+		valueSpan: 4,
+		class: 'dataStyle1'
+	});
+	cellData1.value.push({
+		title: '职务(岗位)',
+		value: gbxxList.value.zw,
+		titleSpan: 4,
+		valueSpan: 4,
+		class: 'dataStyle1'
+	});
 
-		cellData.value.push({
-			"title": "职务(岗位)",
-			"value": gbxxList.value.zw,
-			"titleSpan": 5,
-			"valueSpan": 7,
-			"class": "dataStyle"
-		})
+	cellData1.value.push({
+		title: '职位级别',
+		value: gbxxList.value.zwcj,
+		titleSpan: 4,
+		valueSpan: 4,
+		class: 'dataStyle'
+	});
+}
 
-		cellData.value.push({
-			"title": "职位级别",
-			"value": gbxxList.value.zwcj,
-			"titleSpan": 5,
-			"valueSpan": 7,
-			"class": "dataStyle"
-		})
-		cellData.value.push({
-			"title": "",
-			"value": "",
-			"titleSpan": 0,
-			"valueSpan": 0,
-			"class": "dataStyle"
-		})
-	}
-
-	onLoad((e) => {
-		renyuanData.value = JSON.parse(decodeURIComponent(e.data));
-		ldhth.value = renyuanData.value.ldhth
-		getChildTable()
-		setTimeout(function() {
-			getJbxx()
-		}, 500);
-
-	})
+onLoad((e) => {
+	renyuanData.value = JSON.parse(decodeURIComponent(e.data));
+	imgUrl.value = renyuanData.value.zplj;
+	console.log(imgUrl.value, renyuanData.value);
+	ldhth.value = renyuanData.value.ldhth;
+	getChildTable();
+	setTimeout(function () {
+		getJbxx();
+	}, 500);
+});
 </script>
 
 <style scoped>
-	.renyuanInfo {
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		top: 0;
-		height: 98vh;
-		width: 900px;
-		background-color: rgba($color: #000000, $alpha: 0.4);
-		display: flex;
-		flex-direction: row;
-		font-size: 18px;
-		color: #fff;
-	}
+.renyuanInfo {
+	position: absolute;
+	bottom: 0;
+	left: 0;8  vb
+	right: 0;0      
+	top: 0;
+	height: 98vh;
+	width: 900px;
+	background-color: rgba($color: #000000, $alpha: 0.4);
+	display: flex;
+	flex-direction: row;
+	font-size: 18px;
+	color: #fff;
+}
 
-	.titleStyle {
-		font-size: 12px;
-		color: #747474;
-		line-height: 35px;
-		height: 35px;
-		background: #F2F9FC;
-		text-align: center;
-		vertical-align: middle;
-		border-left: 1px solid #919191;
-		border-bottom: 1px solid #919191;
-		;
-		;
-	}
+.titleStyle {
+	font-size: 12px;
+	color: #747474;
+	line-height: 35px;
+	height: 35px;
+	background: #f2f9fc;
+	text-align: center;
+	vertical-align: middle;
+	border-left: 1px solid #919191;
+	border-bottom: 1px solid #919191;
+}
 
-	/* 内容样式 */
-	.dataStyle {
+/* 内容样式 */
+.dataStyle {
+	font-size: 14px;
+	color: #00007f;
+	line-height: 25px;
+	height: 50px;
+	font-weight: 500;
+	text-align: center;
+	vertical-align: middle;
+	border-bottom: 1px solid #919191;
+	border-left: 1px solid #919191;
+	text-align: center;
+	word-wrap: break-word;
+	overflow-wrap: break-word;
+}
 
-		font-size: 14px;
-		color: #00007f;
-		line-height: 25px;
-		height: 50px;
-		font-weight: 500;
-		text-align: center;
-		vertical-align: middle;
-		border-bottom: 1px solid #919191;
-		border-left: 1px solid #919191;
-		text-align: center;
-		word-wrap: break-word;
-		overflow-wrap: break-word;
+/* 内容样式 */
+.dataStyle1 {
+	max-font-size: 14px;
+	/* 最大字体限制 */
+	min-font-size: 10px;
+	/* 最小字体限制 */
+	font-size: 14px;
+	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-align: center;
+	word-wrap: break-word;
+	overflow-wrap: break-word;
+}
 
-	}
-
-
-	/* 内容样式 */
-	.dataStyle1 {
-		max-font-size: 14px;
-		/* 最大字体限制 */
-		min-font-size: 10px;
-		/* 最小字体限制 */
-		font-size: 14px;
-		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-align: center;
-		word-wrap: break-word;
-		overflow-wrap: break-word;
-
-	}
-
-	/* 内容样式 */
-	.dataStyle2 {
-		font-size: 12px;
-		color: #00007f;
-		line-height: 15px;
-		height: 30px;
-		font-weight: 500;
-		text-align: center;
-		vertical-align: middle;
-		border-bottom: 1px solid #919191;
-		border-left: 1px solid #919191;
-		text-align: center;
-		word-wrap: break-word;
-		overflow-wrap: break-word;
-	}
-</style>
\ No newline at end of file
+/* 内容样式 */
+.dataStyle2 {
+	font-size: 12px;
+	color: #00007f;
+	line-height: 15px;
+	height: 30px;
+	font-weight: 500;
+	text-align: center;
+	vertical-align: middle;
+	border-bottom: 1px solid #919191;
+	border-left: 1px solid #919191;
+	text-align: center;
+	word-wrap: break-word;
+	overflow-wrap: break-word;
+}
+.img {
+	font-size: 12px;
+	color: #00007f;
+	line-height: 150px;
+	height: 154px;
+	font-weight: 500;
+	text-align: center;
+	vertical-align: middle;
+	border-bottom: 1px solid #919191;
+	border-right: 1px solid #919191;
+	border-left: 1px solid #919191;
+	text-align: center;
+	word-wrap: break-word;
+	overflow-wrap: break-word;
+}
+</style>
diff --git a/pages/views/renliziyuan/renyuanxinxi/qttongji.vue b/pages/views/renliziyuan/renyuanxinxi/qttongji.vue
index b07f190..213adbf 100644
--- a/pages/views/renliziyuan/renyuanxinxi/qttongji.vue
+++ b/pages/views/renliziyuan/renyuanxinxi/qttongji.vue
@@ -1,22 +1,23 @@
 <template>
 	<view>
 		<view class="container" id="top1">
-			<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx">
-				<uni-col :span="5"><uni-title :title="'选择单位'" align="left" type="h4"></uni-title></uni-col>
+			<uni-row style="margin-bottom: 10px">
+				<uni-col><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>
+				<uni-col>
+					<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-row style="margin-bottom: 10px">
+				<uni-col><uni-title :title="'选择字段'" align="left" type="h4"></uni-title></uni-col>
+				<uni-col :span="12">
+					<uni-data-select v-model="selectedField" :localdata="fieldList" @change="onFieldChange"></uni-data-select>
 				</uni-col>
 			</uni-row>
+			<uni-row style="margin-bottom: 20px">
+				<uni-col v-if="dictCode === 'gzrlzy'"><uni-title :title="'字典项'" align="left" type="h4"></uni-title></uni-col>
+				<uni-col v-if="dictCode === 'gzrlzy'"><cxc-szcx-dictSelect :dictCode="dictCode" v-model="dictData"></cxc-szcx-dictSelect></uni-col>
+			</uni-row>
 		</view>
 		<!-- ECharts图表 -->
 		<view class="chart-container">
@@ -26,56 +27,74 @@
 		<!-- 翻页按钮 -->
 		<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>
+			<button @click="nextPage" :disabled="currentPage * pageSize >= chartDataCount.value" size="mini">下一页</button>
 		</view>
 
 		<!-- 数据表格 -->
 
-		<uni-row style="margin-top: 10px; margin-left: 30rpx; margin-right: 30rpx" v-if="personnelList.length > 0">
-			<uni-col :span="3">
+		<uni-row style="margin-top: 10px; margin-left: 20px; margin-right: 20px" v-if="personnelList.length > 0">
+			<uni-col :span="2">
 				<view class="titleStyle">序号</view>
 			</uni-col>
-			<uni-col :span="5">
+			<uni-col :span="4">
 				<view class="titleStyle">姓名</view>
 			</uni-col>
 			<uni-col :span="5">
 				<view class="titleStyle">基层单位</view>
 			</uni-col>
-			<uni-col :span="5">
+			<uni-col :span="5" v-if="selectedField.value !== 'zjmc'">
+				<view class="titleStyle">基层班组</view>
+			</uni-col>
+			<uni-col :span="5" v-else>
+				<view class="titleStyle">岗位</view>
+			</uni-col>
+			<uni-col :span="4">
 				<view class="titleStyle">年龄</view>
 			</uni-col>
-			<uni-col :span="6">
+			<uni-col :span="4">
 				<view class="titleStyle">操作</view>
 			</uni-col>
 		</uni-row>
 
 		<scroll-view scroll-y :style="{ height: bottomHeight + 'px' }">
-			<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx">
+			<uni-row style="margin-bottom: 10px; margin-left: 20px; margin-right: 20px; font-size: 12px">
 				<view v-for="(item, index) in personnelList">
-					<uni-col :span="3">
+					<uni-col :span="2">
 						<view class="dataStyle">
 							{{ index + 1 }}
 						</view>
 					</uni-col>
-					<uni-col :span="5">
+					<uni-col :span="4">
 						<view class="dataStyle">
 							{{ item.xm }}
 						</view>
 					</uni-col>
+
 					<uni-col :span="5">
-						<view class="dataStyle">
+						<view class="dataStyle1">
+							{{ item.jcdw }}
+						</view>
+					</uni-col>
+					<uni-col :span="5" v-if="selectedField.value != 'zjmc'">
+						<view class="dataStyle1">
 							{{ item.jcxd }}
 						</view>
 					</uni-col>
-					<uni-col :span="5">
+					<uni-col :span="4" v-else>
+						<view class="dataStyle">
+							{{ item.sdgw }}
+						</view>
+					</uni-col>
+					<uni-col :span="4">
 						<view class="dataStyle">
 							{{ item.nl }}
 						</view>
 					</uni-col>
-					<uni-col :span="6">
+
+					<uni-col :span="4">
 						<view class="dataStyle">
-							<button size="mini" type="primary" @click="detail(item)">详情</button>
+							<span @click="detail(item)">详情</span>
+							<!-- <button size="mini" type="primary" @click="detail(item)">详情</button> -->
 						</view>
 					</uni-col>
 				</view>
@@ -85,219 +104,215 @@
 </template>
 
 <script setup>
-	import {
-		ref,
-		reactive,
-		onMounted,
-		computed
-	} from 'vue';
-	import * as echarts from 'echarts';
-	import {
-		cxcRyDatAstatistics,
-		cxcRyDatAstatisticsCertificate,
-		cxcRyDatAstatisticsDetails
-	} from '@/api/renyuan.js';
+import { ref, reactive, onMounted, computed } from 'vue';
+import * as echarts from 'echarts/dist/echarts.min'; // 引入ECharts的H5版本
+import { cxcRyDatAstatistics, cxcRyDatAstatisticsCertificate, cxcRyDatAstatisticsDetails } from '@/api/renyuan.js';
 
-	// 存储下方组件的高度  tableData
-	const bottomHeight = ref(0);
-	// 新增加载状态
-	const chart = ref(null);
-	const chartDataCount = ref(0);
-	const fieldList = ref([{
-			text: '取证情况',
-			value: 'zjmc',
-			isDict: false,
-			dictCode: 'gzrlzy'
-		},
-		{
-			text: '岗位类别',
-			value: 'gwlb',
-			isDict: false,
-			dictCode: ''
-		}, {
-			text: '性别',
-			value: 'xb',
-			isDict: true,
-			dictCode: 'sex'
-		},
-		{
-			text: '政治面貌',
-			value: 'zzmm',
-			isDict: true,
-			dictCode: 'zzmm'
-		},
-		{
-			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 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))
-		});
+// 存储下方组件的高度  tableData
+const bottomHeight = ref(0);
+// 新增加载状态
+const chart = ref(null);
+const chartDataCount = ref(0);
+const fieldList = ref([
+	{
+		text: '取证情况',
+		value: 'zjmc',
+		isDict: false,
+		dictCode: 'gzrlzy',
+		dictData: ['输气工', '采气工']
+	},
+	{
+		text: '岗位类别',
+		value: 'gwlb',
+		isDict: false,
+		dictCode: ''
+	},
+	{
+		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 dictData = 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))
 	});
-	// #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();
-	};
+onMounted(() => {
+	 
+	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);
-	};
+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();
+};
 
-	const prevPage = () => {
-		if (currentPage.value > 1) {
-			currentPage.value--;
-		}
-		updateChart(chartData.value);
-	};
+ 
+// 初始化 ECharts length   departChange
+// 初始化图表
+const initChart = () => {
+	setTimeout(async () => {
+		if (!chart.value) return;
+		const myChart = await chart.value.init(echarts);
+		myChart.setOption(chartOption.value);
+	}, 300);
+};
 
-	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 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 = ChartData.slice(startIndex, endIndex);
-		try {
-			let xData = [];
-			let seriesData = [];
-			console.log(1, tempChartData);
-			//当前机构下的数据 transformDataForEcharts
+		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, tempChartData);
+		//当前机构下的数据 transformDataForEcharts
 
-			let legendData = [];
-			for (let i = 0; i < fieldValues.value.length; i++) {
-				legendData.push(fieldValues.value[i].fieldText);
-			}
+		let legendData = [];
+		for (let i = 0; i < fieldValues.value.length; i++) {
+			legendData.push(fieldValues.value[i].fieldText);
+		}
 
+		tempChartData.forEach((item) => {
+			xData.push(item.name);
+		});
+
+		for (let i = 0; i < fieldValues.value.length; i++) {
+			let tempData = [];
 			tempChartData.forEach((item) => {
-				xData.push(item.name);
+				// console.log(item);
+				if (item.data[i]) {
+					tempData.push(item.data[i]);
+				} else {
+					tempData.push(0);
+				}
 			});
+			seriesData.push({
+				name: fieldValues.value[i].fieldText,
+				type: 'bar',
+				label: {
+					show: true, // 显示数值标签
+					position: 'top' // 数值标签位置
+				},
+				data: tempData
+			});
+		}
+		console.log(2, legendData, xData, seriesData);
+		let tempOption = {
+			title: {
+				text: chartTitle.value,
+				padding: [0, 0, 0, 30]
+			},
+			toolbox: {
+				padding: [0, 30, 0, 0],
+				show: true,
+				feature: {
+					//工具配置项
 
-			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 {
-						tempData.push(0);
-					}
-				});
-				seriesData.push({
-					name: fieldValues.value[i].fieldText,
-					type: 'bar',
-					label: {
-						show: true, // 显示数值标签
-						position: 'top' // 数值标签位置
+					restore: {
+						show: true //是否显示该工具
 					},
-					data: tempData
-				});
-			}
-			console.log(2, legendData, xData, seriesData);
-			let tempOption = {
-				title: {
-					text: chartTitle.value,
-					padding: [0, 0, 0, 30]
-				},
-				toolbox: {
-					padding: [0, 30, 0, 0],
-					show: true,
-					feature: {
-						//工具配置项
-
-						restore: {
-							show: true //是否显示该工具
-						},
-						saveAsImage: {
-							show: true //是否显示该工具
-						}
+					saveAsImage: {
+						show: true //是否显示该工具
 					}
+				}
+			},
+			xAxis: {
+				type: 'category',
+				data: xData,
+				axisLabel: {
+					color: '#7F84B5',
+					fontWeight: 300,
+					interval: 0,
+					rotate: 0
 				},
-				xAxis: {
-					type: 'category',
-					data: xData,
-					axisLabel: {
-						color: '#7F84B5',
-						fontWeight: 300,
-						interval: 0,
-						rotate: 0
-					},
-					padding: [0, 10, 0, 10],
-					axisTick: {
-						show: false //刻度线
-					},
-					axisLine: {
-						show: false //不显示坐标轴线
-					}
+				padding: [0, 10, 0, 10],
+				axisTick: {
+					show: false //刻度线
 				},
-				yAxis: [{
+				axisLine: {
+					show: false //不显示坐标轴线
+				}
+			},
+			yAxis: [
+				{
 					show: true,
 					boundaryGap: false, //解决数据与线不对应问题
 					type: 'value',
@@ -321,590 +336,589 @@
 					axisLine: {
 						show: false //不显示坐标轴线
 					}
-				}],
-				series: seriesData,
-
-				legend: {
-					data: legendData,
-					itemGap: 5,
-					padding: [0, 15, 0, 15],
-					y: 'bottom',
-					itemHeight: 8, //高
-					itemWidth: 18, //宽
-					type: 'scroll'
 				}
-			};
-			return tempOption;
-		} catch (error) {
-			console.log(error);
-		}
-	};
+			],
+			series: seriesData,
 
-	// 更新图表
-	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);
-
-				let updateData = findRyByOrgCode(orgCodeGroupData.value.children, params.name);
-				console.log(updateData);
-
-				const ldhth = updateData.fieldValues[params.seriesIndex].ldhth;
-
-				console.log(ldhth);
-
-				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;
+			legend: {
+				data: legendData,
+				itemGap: 5,
+				padding: [0, 15, 0, 15],
+				y: 'bottom',
+				itemHeight: 8, //高
+				itemWidth: 18, //宽
+				type: 'scroll'
 			}
-			// 递归检查子节点
-			if (node.children && node.children.length > 0) {
-				const found = findNodeByOrgCode(node.children, targetOrgCode);
-				if (found) return found;
-			}
-		}
-		return null;
+		};
+		return tempOption;
+	} catch (error) {
+		console.log(error);
 	}
+};
 
-	/**
-	 * 从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;
+// 更新图表
+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);
+
+			let updateData = findRyByOrgCode(orgCodeGroupData.value.children, params.name);
+			console.log(updateData);
+
+			const ldhth = updateData.fieldValues[params.seriesIndex].ldhth;
+
+			console.log(ldhth);
+
+			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;
 	}
+	return null;
+}
 
-	//获取所有的fieldValue
-	function collectUniqueKeyFieldValues(tree) {
-		const uniqueMap = new Map();
-		tree.forEach((item) => {
-			const {
+/**
+ * 从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, fieldText } = item;
+		const key = `${fieldValue}-${fieldText}`;
+
+		if (!uniqueMap.has(key)) {
+			uniqueMap.set(key, {
 				fieldValue,
 				fieldText
-			} = item;
-			const key = `${fieldValue}-${fieldText}`;
+			});
+		}
+	});
 
-			if (!uniqueMap.has(key)) {
-				uniqueMap.set(key, {
-					fieldValue,
-					fieldText
+	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;
+		}
+	}
+
+	// 查找指定 orgCode 对应的 orgText 的方法
+	findOrgText(orgCode) {
+		return this.orgCodeToOrgTextMap[orgCode];
+	}
+}
+
+// 示例用法
+// 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 = 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));
+		}
+		// console.log('hierarchy', hierarchy);
+		return hierarchy;
+	}
+	// 获取父级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);
 
-		const result = Array.from(uniqueMap.values());
-		return result;
-	}
+		// 更新当前节点的data
+		const node = nodes.get(entry.orgCode);
+		const fieldValue = entry.fieldValue;
 
-	// 封装一个类来管理组织代码和组织名称的映射
-	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;
+		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;
 			}
 		}
 
-		// 查找指定 orgCode 对应的 orgText 的方法
-		findOrgText(orgCode) {
-			return this.orgCodeToOrgTextMap[orgCode];
-		}
-	}
+		// console.log(11, node);
 
-	// 示例用法
-	// 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 = 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));
+		// 建立父子关系
+		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('hierarchy', hierarchy);
-			return hierarchy;
 		}
-		// 获取父级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;
+	});
 
+	// 计算非叶子节点的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 === fieldValues.value[i].fieldValue) {
-					// 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));
-		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);
-		// });
 	}
 
-	//-----------------------------------------------------------------------------------------
-
-	//根据 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;
+	// 获取所有根节点（没有父节点或父节点不存在）
+	const rootNodes = [];
+	nodes.forEach((node, code) => {
+		const parentCode = getParentCode(code);
+		// console.log(parentCode);
+		if (!parentCode || !nodes.has(parentCode)) {
+			rootNodes.push(node);
 		}
-		// 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,
-						fieldText: item.fieldText,
-						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 {
-					fieldText,
-					orgCode,
-					orgText
-				} = groupedByFieldValue[fieldValue] || {};
-				return {
-					fieldValue: fieldValue,
-					fieldText: fieldText,
-					orgCode: orgCode,
-					orgText: orgText,
-					number: groupedByFieldValue[fieldValue].number,
-					ldhth: [...new Set(groupedByFieldValue[fieldValue].ldhth)] // 去重
+	// 递归计算每个根节点的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);
+	// });
+}
+
+//-----------------------------------------------------------------------------------------
+
+//根据 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,
+					fieldText: item.fieldText,
+					number: 0,
+					ldhth: []
 				};
-			}),
-			children: []
-		};
+			}
+			// 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));
+	// 构建本级结果
 
-		// 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;
+	const result = {
+		orgCode: orgCode,
+		orgText: orgMapper.findOrgText(orgCode),
+		fieldValues: Object.keys(groupedByFieldValue).map((fieldValue) => {
+			const { fieldText, orgCode, orgText } = groupedByFieldValue[fieldValue] || {};
+			return {
+				fieldValue: fieldValue,
+				fieldText: fieldText,
+				orgCode: orgCode,
+				orgText: orgText,
+				number: groupedByFieldValue[fieldValue].number,
+				ldhth: [...new Set(groupedByFieldValue[fieldValue].ldhth)] // 去重
+			};
+		}),
+		children: []
 	};
-	// 获取统计数据  then  filter
-	const fetchStatisticsData = async () => {
-		if (!selectedOrgCode.value || !selectedField.value) return;
-		let res = [];
-		chartData.value = [];
-		try {
 
-			if (selectedField.value === "zjmc") {
-				console.log(dictCode.value)
-				res = await cxcRyDatAstatisticsCertificate({
-					orgCode: selectedOrgCode.value,
-					field: selectedField.value,
-					dictCode: dictCode.value,
-					fieldisDict: fieldisDict.value
+	// 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 {
+		if (selectedField.value === 'zjmc') {
+			console.log(dictCode.value);
+			res = await cxcRyDatAstatisticsCertificate({
+				orgCode: selectedOrgCode.value,
+				field: selectedField.value,
+				dictCode: dictCode.value,
+				fieldisDict: fieldisDict.value,
+				typeOfWorkList: dictData.value
+			});
+		} else {
+			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;
+			}
+			//按单位进行分组
+			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 {
-				res = await cxcRyDatAstatistics({
-					orgCode: selectedOrgCode.value,
-					field: selectedField.value,
-					dictCode: dictCode.value,
-					fieldisDict: fieldisDict.value
-				});
+				chartData.value = temp[0];
 			}
-
-			// console.log(res); //deepseek
-			if (res.success) {
-				console.log(selectedOrgCode.value, res);
-				if (res.result.length < 1) {
-					uni.showToast({
-						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 {
-					chartData.value = temp[0];
-				}
-				chartDataCount.value = chartData.value.length;
-				// console.log(chartData.value);
-				updateChart(chartData.value);
-			}
-		} 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) => {
-		personnelList.value = [];
-		try {
-			const res = await cxcRyDatAstatisticsDetails({
-				ldhth: ldhthList
-			});
-			console.log(res);
-			if (res.success) {
-				personnelList.value = res.result;
-			}
-		} 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) => {
-		personnelList.value = []
-		selectedOrgCode.value = e;
-		// console.log(data.value.title);
-		selectedOrgCodeLabel.value = data.value.title;
+// 事件处理
+const onOrgCodeChange = (e, data) => {
+	personnelList.value = [];
+	selectedOrgCode.value = e;
+	// console.log(data.value.title);
+	selectedOrgCodeLabel.value = data.value.title;
+	fetchStatisticsData();
+};
+
+const onFieldChange = (e) => {
+	personnelList.value = [];
+	// 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) => {
-		personnelList.value = []
-		// 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) => {
-		personnelList.value = []
-		const {
-			ldhth
-		} = chartData.value;
-		if (ldhth && ldhth.length > 0) {
-			fetchPersonnelList(ldhth);
-		}
-	};
+const onChartClick = (e) => {
+	personnelList.value = [];
+	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: 10px 10px;
+	padding: 10px;
+	background: linear-gradient(145deg, #f5f9ff, var(--light-blue));
+	border-radius: 12px;
+	box-shadow: 0 4px 12px rgba(64, 158, 255, 0.15);
+	border: 1px solid rgba(64, 158, 255, 0.1);
+}
+
+/* 图表容器 */
+.chart-container {
+	height: 250px;
+	margin: 10px 0;
+	border-radius: 12px;
+	overflow: hidden;
+	background: #ffffff;
+	box-shadow: 0 4px 16px rgba(64, 158, 255, 0.12);
+	border: 1px solid rgba(64, 158, 255, 0.08);
+}
+
+/* 表格标题行 */
+
+.titleStyle {
+	font-size: 10px;
+	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 {
+	font-size: 10px;
+	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;
+}
+/* 内容样式 */
+.dataStyle1 {
+	font-size: 8px;
+	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 8px 8px;
+	box-shadow: 0 4px 12px rgba(0, 35, 111, 0.08);
+}
+
+/* 输入框聚焦效果 */
+.trq-depart-select:focus-within {
+	box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
+	border-color: var(--primary-blue);
+}
+
+/* 加载动画优化 */
+@keyframes fadeIn {
+	from {
+		opacity: 0;
+		transform: translateY(10px);
 	}
 
-	/* 全局容器 */
-	.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: 4px;
+	background: rgba(64, 158, 255, 0.05);
+}
+
+::-webkit-scrollbar-thumb {
+	background: linear-gradient(45deg, var(--primary-blue), var(--deep-blue));
+	border-radius: 6px;
+	border: 1px solid white;
+}
+
+/* 筛选行间距优化 */
+.filter-row {
+	margin: 15px 0;
+	padding: 10px 0;
+	border-radius: 8px;
+}
+
+/* 响应式调整优化 */
+@media (max-width: 768px) {
 	.chart-container {
 		height: 250px;
-		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);
+		border-radius: 10px;
 	}
+}
 
-	/* 表格标题行 */
+/* 数据行高亮效果 */
+.data-row:nth-child(even) {
+	background: rgba(236, 245, 255, 0.3);
+}
 
-	.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);
-		}
-
-		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: 250px;
-			border-radius: 20rpx;
-		}
-	}
-
-	/* 数据行高亮效果 */
-	.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);
-	}
+.data-row:hover {
+	box-shadow: 0 4rpx 12rpx rgba(64, 158, 255, 0.1);
+}
 </style>
\ No newline at end of file
diff --git a/pages/views/renliziyuan/renyuanxinxi/taizhang.vue b/pages/views/renliziyuan/renyuanxinxi/taizhang.vue
index 94914d7..a483030 100644
--- a/pages/views/renliziyuan/renyuanxinxi/taizhang.vue
+++ b/pages/views/renliziyuan/renyuanxinxi/taizhang.vue
@@ -1,228 +1,297 @@
 <template>
-	<view>
-		<scroll-view :scroll-y="true" style="height: 100vh;">
-			<uni-card>
-				<view>
-					<uni-row>
-						<uni-col :span="11"><uni-title title="姓名 " align="left" type="h5"></uni-title></uni-col>
-						<uni-col :span="11" :push="2"><uni-title title="劳动合同号" align="left"
-								type="h5"></uni-title></uni-col>
-					</uni-row>
-					<uni-row>
-						<uni-col :span="11"><uni-easyinput v-model="xm" suffixIcon="search" clearable
-								placeholder="姓名模糊查询" @change="Search" @iconClick="Search" /></uni-col>
-						<uni-col :span="11" :push="2">
-							<uni-easyinput v-model="ldhth" suffixIcon="search" clearable placeholder="劳动合同号模糊查询"
-								@change="Search" @iconClick="Search" />
-						</uni-col>
-					</uni-row>
-				</view>
-				<view style="margin-bottom: 10rpx;">
-					<uni-row>
-						<uni-col :span="24"><uni-title title="所属单位" align="left" type="h5"></uni-title></uni-col>
-					</uni-row>
-					<uni-row>
-						<uni-col :span="24">
-							<trq-depart-select v-model="departID" returnCodeOrID="orgCode"
-								@change="departChange"></trq-depart-select>
-						</uni-col>
-					</uni-row>
-				</view>
-			</uni-card>
-			<uni-card>
-				<zb-table :show-header="true" :highlight="true" :columns="column" :stripe="true" :fit="false"
-					:border="true" :data="ryDataList" @detail="detail"></zb-table>
-				<uni-pagination :current="current" :pagerCount="pages" :total="total" prev-text="前一页" next-text="后一页"
-					:show-icon="false" @change="pagechange" />
-				<view>
-					<text class="example-info">当前页：{{ current }}，数据总量：{{ total }}条，每页数据：{{ pageSize }}</text>
-				</view>
-			</uni-card>
-		</scroll-view>
-
-
+	<view class="container" id="top1">
+		<uni-card>
+			<view>
+				<uni-row>
+					<uni-col :span="11"><uni-title title="姓名 " align="left" type="h5"></uni-title></uni-col>
+					<uni-col :span="11" :push="2"><uni-title title="劳动合同号" align="left" type="h5"></uni-title></uni-col>
+				</uni-row>
+				<uni-row>
+					<uni-col :span="11"><uni-easyinput v-model="xm" suffixIcon="search" clearable placeholder="姓名模糊查询" @change="Search" @iconClick="Search" /></uni-col>
+					<uni-col :span="11" :push="2">
+						<uni-easyinput v-model="ldhth" suffixIcon="search" clearable placeholder="劳动合同号模糊查询" @change="Search" @iconClick="Search" />
+					</uni-col>
+				</uni-row>
+			</view>
+			<view style="margin-bottom: 10rpx">
+				<uni-row>
+					<uni-col :span="24"><uni-title title="所属单位" align="left" type="h5"></uni-title></uni-col>
+				</uni-row>
+				<uni-row>
+					<uni-col :span="24">
+						<trq-depart-select v-model="departID" returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
+					</uni-col>
+				</uni-row>
+			</view>
+		</uni-card>
 	</view>
+	<uni-card>
+		<!-- 数据表格 -->
+
+		<uni-row v-if="ryDataList.length > 0">
+			<uni-col :span="3">
+				<view class="titleStyle">序号</view>
+			</uni-col>
+			<uni-col :span="5">
+				<view class="titleStyle">姓名</view>
+			</uni-col>
+			<uni-col :span="5">
+				<view class="titleStyle">性别</view>
+			</uni-col>
+			<uni-col :span="5">
+				<view class="titleStyle">年龄</view>
+			</uni-col>
+			<uni-col :span="6">
+				<view class="titleStyle">操作</view>
+			</uni-col>
+		</uni-row>
+
+		<scroll-view scroll-y :style="{ height: bottomHeight + 'px' }">
+			<uni-row>
+				<view v-for="(item, index) in ryDataList">
+					<uni-col :span="3">
+						<view class="dataStyle">
+							{{ index + 1 }}
+						</view>
+					</uni-col>
+					<uni-col :span="5">
+						<view class="dataStyle">
+							{{ item.xm }}
+						</view>
+					</uni-col>
+					<uni-col :span="5">
+						<view class="dataStyle">
+							{{ item.xb_dictText }}
+						</view>
+					</uni-col>
+					<uni-col :span="5">
+						<view class="dataStyle">
+							{{ item.nl }}
+						</view>
+					</uni-col>
+					<uni-col :span="6">
+						<view class="dataStyle">
+							<button size="mini" type="primary" @click="detail(item)">详情</button>
+						</view>
+					</uni-col>
+				</view>
+			</uni-row>
+
+			<view class="pagination">
+				<uni-pagination :current="current" :pagerCount="5" :total="total" prev-text="前一页" next-text="后一页" :show-icon="false" @change="pagechange" />
+			</view>
+		</scroll-view>
+	</uni-card>
 </template>
 
 <script setup>
-	import {
-		onReady,
-		onLoad
+import { onReady, onLoad } from '@dcloudio/uni-app';
+import { reactive, ref, onMounted } from 'vue';
+import { useStore } from '@/store';
+import { queryDepByCode, queryZbDepByLdhth } from '@/api/depart.js';
+import { queryRenyuanByDepartID } from '@/api/renyuan.js';
+let xm = ref('');
+let ldhth = ref('');
+let departID = ref(''); //部门树选中的ID
+const ryDataList = ref([]);
 
-	} from '@dcloudio/uni-app';
-	import {
-		reactive,
-		ref,
-		onMounted
-	} from 'vue';
-	import {
-		useStore
-	} from '@/store';
-	import {
-		queryDepByCode,
-		queryZbDepByLdhth
-	} from '@/api/depart.js'
-	import {
-		queryRenyuanByDepartID
-	} from '@/api/renyuan.js'
-	let xm = ref("")
-	let ldhth = ref("")
-	let departID = ref("") //部门树选中的ID
-	const ryDataList = ref([])
+const bottomHeight = ref(0);
+let status = ref('');
+let contentText = reactive({
+	contentdown: '点击查看更多',
+	contentrefresh: '加载中',
+	contentnomore: '没有更多'
+});
 
-	let status = ref("")
-	let contentText = reactive({
-		contentdown: '点击查看更多',
-		contentrefresh: '加载中',
-		contentnomore: '没有更多'
-	})
+let pageNo = ref(1);
+let pageSize = ref(10);
+let total = ref(0);
+let pages = ref(0);
+let current = ref(0);
+let params = reactive({
+	pageNo: pageNo,
+	pageSize: pageSize
+});
 
-	let pageNo = ref(1)
-	let pageSize = ref(10)
-	let total = ref(0)
-	let pages = ref(0)
-	let current = ref(0)
-	let params = reactive({
-		pageNo: pageNo,
-		pageSize: pageSize
-	})
-	let column = ref([{
-			label: '序号',
-			width: 60,
-			type: 'index',
-			color: 'blue',
-			align: 'center'
-		},
+onLoad((e) => {});
+onMounted((e) => {
+	// #ifdef APP
+	getHeight();
+	// #endif
+	departID.value = '';
+	getRenyuanByDepID();
+});
 
-		{
-			name: 'xm',
-			label: '姓名',
-			width: 70,
-			align: 'center'
-		},
-		{
-			name: 'xb_dictText',
-			label: '性别',
-			align: 'center',
-			width: 60
-		},
-		{
-			name: 'nl',
-			label: '年龄',
-			align: 'center',
-			width: 60
-		},
-		{
-			name: 'operation',
-			type: 'operation',
-			width: 60,
-			fixed: true,
-			label: '操作',
-			align: 'center',
-			renders: [{
-				name: '详情',
-				func: 'detail',
-				size: 'mini'
-			}]
-		}
-	])
+// #ifdef APP
 
-	onLoad((e) => {
-
-	})
-	onMounted((e) => {
-		departID.value = ""
-		getRenyuanByDepID()
-	})
-
-	function detail(record) {
-		// console.log(record)
-		uni.navigateTo({
-			url: "/pages/views/renliziyuan/renyuanxinxi/detail?data=" + encodeURIComponent(JSON.stringify(record))
+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
+
+function detail(record) {
+	// console.log(record)
+	uni.navigateTo({
+		url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
+	});
+}
+
+function pagechange(e) {
+	current.value = e.current;
+	pageNo.value = e.current;
+	let params = {
+		pageNo: pageNo.value,
+		pageSize: pageSize.value,
+		current: current.value
+	};
+	if (departID.value.length <= 9) {
+		params.orgCode = departID.value;
+	} else {
+		params.jcxd_code = departID.value;
 	}
 
-	function pagechange(e) {
-		current.value = e.current
-		pageNo.value = e.current
-		let params = {
-			pageNo: pageNo.value,
-			pageSize: pageSize.value,
-			current: current.value
-		};
-		if (departID.value.length <= 9) {
-			params.orgCode = departID.value
-		} else {
-			params.jcxd_code = departID.value
-		}
+	getRenyuanByDepID(params);
+}
 
-		getRenyuanByDepID(params)
+function departChange(e, data) {
+	departID.value = e;
+	let params = {
+		pageNo: pageNo.value,
+		pageSize: pageSize.value,
+		current: current.value
+	};
+	console.log(e);
+	if (e.length <= 9) {
+		params.orgCode = departID.value;
+	} else {
+		params.jcxd_code = departID.value;
 	}
 
-	function departChange(e, data) {
-		departID.value = e
-		let params = {
-			pageNo: pageNo.value,
-			pageSize: pageSize.value,
-			current: current.value
-		};
-		console.log(e)
-		if (e.length <= 9) {
-			params.orgCode = departID.value
-		} else {
-			params.jcxd_code = departID.value
-		}
+	getRenyuanByDepID(params);
+}
 
-		getRenyuanByDepID(params)
+function getRenyuanByDepID(queryParm) {
+	// ryDataList.value = [];
+	console.log(queryParm);
+	if (departID.value.length <= 6) {
+		console.log(123242353);
+		uni.showToast({
+			title: '全厂数据较多，请选 下一层级...',
+			icon: 'none',
+			duration: 1000
+		});
+
+		return;
 	}
+	if (queryParm) {
+		queryRenyuanByDepartID(queryParm)
+			.then((res) => {
+				console.log(res);
+				if (res.success) {
+					ryDataList.value = res.result.records;
+					total.value = res.result.total;
+					pages.value = res.result.pages;
+					current.value = res.result.current;
+				}
+			})
+			.catch((err) => {
+				console.log(err);
+			});
+	}
+}
 
-	function getRenyuanByDepID(queryParm) {
-		ryDataList.value = []
-		console.log(queryParm)
-		queryRenyuanByDepartID(queryParm).then((res) => {
-			console.log(res)
+function Search() {
+	ryDataList.value = [];
+	let queryParm = {
+		pageNo: pageNo.value,
+		pageSize: pageSize.value
+	};
+	if ((ldhth.value == '') & (xm.value == '')) {
+		return;
+	}
+	if (xm.value !== '') {
+		queryParm.xm = '*' + xm.value + '*';
+	}
+	if (ldhth.value !== '') {
+		queryParm.ldhth = '*' + ldhth.value + '*';
+	}
+	console.log(queryParm);
+	queryRenyuanByDepartID(queryParm)
+		.then((res) => {
 			if (res.success) {
-				ryDataList.value = res.result.records
-				total.value = res.result.total
-				pages.value = res.result.pages
-				current.value = res.result.current
+				ryDataList.value = res.result.records;
+				total.value = res.result.total;
+				pages.value = res.result.pages;
 			}
-		}).catch((err) => {
-			console.log(err);
 		})
-	}
-
-	function Search() {
-		ryDataList.value = [];
-		let queryParm = {
-			pageNo: pageNo.value,
-			pageSize: pageSize.value
-		};
-		if ((ldhth.value == '') & (xm.value == '')) {
-			return;
-		}
-		if (xm.value !== '') {
-			queryParm.xm = '*' + xm.value + '*';
-		}
-		if (ldhth.value !== '') {
-			queryParm.ldhth = '*' + ldhth.value + '*';
-		}
-		console.log(queryParm)
-		queryRenyuanByDepartID(queryParm).then((res) => {
-			if (res.success) {
-				ryDataList.value = res.result.records
-				total.value = res.result.total
-				pages.value = res.result.pages
-			}
-		}).catch((err) => {
+		.catch((err) => {
 			console.log(err);
-		})
-	}
+		});
+}
 </script>
 
 <style scoped>
-	.uni-group {
-		display: flex;
-		align-items: center;
-	}
-</style>
\ No newline at end of file
+/* 全局容器 */
+.container {
+	margin: 10rpx 10rpx;
+	padding: 10rpx;
+	background: linear-gradient(145deg, #ffaaff, 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);
+}
+.uni-group {
+	display: flex;
+	align-items: center;
+}
+.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 {
+	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;
+}
+/* 内容样式 */
+.pagination {
+	font-size: 16px;
+	color: #00007f;
+	line-height: 30px;
+	height: 30px;
+	font-weight: 500;
+	text-align: center;
+	vertical-align: middle;
+	text-overflow: ellipsis;
+}
+</style>
diff --git a/uni_modules/yjly-row-cell/components/yjly-row-cell/yjly-row-cell.vue b/uni_modules/yjly-row-cell/components/yjly-row-cell/yjly-row-cell.vue
index 61652c2..200d60a 100644
--- a/uni_modules/yjly-row-cell/components/yjly-row-cell/yjly-row-cell.vue
+++ b/uni_modules/yjly-row-cell/components/yjly-row-cell/yjly-row-cell.vue
@@ -1,9 +1,9 @@
 <template>
 	<uni-row>
-		<view v-for="(item,index) in data">
+		<view v-for="(item, index) in data">
 			<uni-col :span="item.titleSpan">
 				<view class="titleStyle">
-					{{item.title}}
+					{{ item.title }}
 				</view>
 			</uni-col>
 			<uni-col :span="item.valueSpan">
@@ -11,110 +11,107 @@
 					{{ doEmptyString(item.value) }}
 				</view>
 			</uni-col>
-
 		</view>
 	</uni-row>
 </template>
 <script>
-	export default {
-		props: {
-			// 表格数据
-			cellData: {
-				type: Object,
-				default: () => [{
-					title: "",
-					value: "",
+export default {
+	props: {
+		// 表格数据
+		cellData: {
+			type: Object,
+			default: () => [
+				{
+					title: '',
+					value: '',
 					titleSpan: 4,
 					valueSpan: 4
-				}]
-			},
-			//每行数据组数  title  value
-			rowDataCount: {
-				type: Number,
-				default: 3
-			}
-
+				}
+			]
 		},
-		data() {
-			return {
-				data: []
-			}
-		},
-		watch: {
-			cellData: {
-				deep: true,
-				immediate: true,
-				handler(val) {
-					let totalSpan = 0;
-					for (var i = 0; i < val.length; i++) { //根据每行数据组数 补齐栅格 24
-						if ((i + 1) % this.rowDataCount != 0) {
-							totalSpan = totalSpan + val[i].titleSpan + val[i].valueSpan
-						} else {
-							val[i].valueSpan = 24 - totalSpan - val[i].titleSpan;
-							totalSpan = 0;
-						}
+		//每行数据组数  title  value
+		rowDataCount: {
+			type: Number,
+			default: 3
+		}
+	},
+	data() {
+		return {
+			data: []
+		};
+	},
+	watch: {
+		cellData: {
+			deep: true,
+			immediate: true,
+			handler(val) {
+				let totalSpan = 0;
+				for (var i = 0; i < val.length; i++) {
+					//根据每行数据组数 补齐栅格 24
+					if ((i + 1) % this.rowDataCount != 0) {
+						totalSpan = totalSpan + val[i].titleSpan + val[i].valueSpan;
+					} else {
+						val[i].valueSpan = 24 - totalSpan - val[i].titleSpan;
+						totalSpan = 0;
 					}
-					this.data = val;
-					// console.log(this.data)
 				}
+				this.data = val;
+				// console.log(this.data)
 			}
-		},
-		methods: {
-			//数据如果为空，自动替换成/
-			doEmptyString(obj) {
-				let str = '/';
-				if (typeof(obj) == "undefined" || (obj) === null || (obj) === '') {
-					return str;
-				}
-				return obj + '';
+		}
+	},
+	methods: {
+		//数据如果为空，自动替换成/
+		doEmptyString(obj) {
+			let str = '/';
+			if (typeof obj == 'undefined' || obj === null || obj === '' || obj === 'Na' || obj === 'N' || obj === '0') {
+				return str;
 			}
-
+			return obj + '';
 		}
 	}
+};
 </script>
 <style scoped>
-	/* 标签样式 */
-	.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-right: 1px solid #919191;
-		border-bottom: 1px solid #919191;
-		;
-	}
+/* 标签样式 */
+.titleStyle {
+	font-size: 12px;
+	color: #747474;
+	line-height: 30px;
+	height: 30px;
+	background: #f2f9fc;
+	text-align: center;
+	vertical-align: middle;
+	border-left: 1px solid #919191;
+	border-right: 1px solid #919191;
+	border-bottom: 1px solid #919191;
+}
 
-	/* 内容样式 */
-	.dataStyle {
+/* 内容样式 */
+.dataStyle {
+	font-size: 14px;
+	color: #00007f;
+	line-height: 35px;
+	height: 30px;
+	font-weight: 500;
+	text-align: center;
+	vertical-align: middle;
+	border-bottom: 1px solid #919191;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
 
-		font-size: 14px;
-		color: #00007f;
-		line-height: 35px;
-		height: 30px;
-		font-weight: 500;
-		text-align: center;
-		vertical-align: middle;
-		border-bottom: 1px solid #919191;
-		text-overflow: ellipsis;
-		overflow: hidden;
-	}
-
-	/* 内容样式 */
-	.dataStyle1 {
-
-		font-size: 12px;
-		color: #00007f;
-		line-height: 15px;
-		height: 30px;
-		font-weight: 500;
-		text-align: center;
-		vertical-align: middle;
-		border-bottom: 1px solid #919191;
-		text-overflow: ellipsis;
-		overflow: hidden;
-	}
-</style>
\ No newline at end of file
+/* 内容样式 */
+.dataStyle1 {
+	font-size: 12px;
+	color: #00007f;
+	line-height: 15px;
+	height: 30px;
+	font-weight: 500;
+	text-align: center;
+	vertical-align: middle;
+	border-bottom: 1px solid #919191;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+</style>