Merge remote-tracking branch 'remotes/origin/ldeyun' into yzqUniapp

# Conflicts:
#	api/renyuan.js
#	manifest.json
#	pages/views/renliziyuan/renyuanxinxi/detail.vue
#	pages/views/renliziyuan/renyuanxinxi/tongji.vue

.hbuilderx/launch.json

@@ -0,0 +1,26 @@
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+        	"app-plus" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"default" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"mp-weixin" : 
+        	{
+        		"launchtype" : "local"
+        	},
+        	"type" : "uniCloud"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        }
+    ]
+}

.vite/deps/_metadata.json

@@ -0,0 +1,13 @@
+{
+  "hash": "5610b5a1",
+  "browserHash": "3deef0d9",
+  "optimized": {
+    "base-64": {
+      "src": "../../node_modules/base-64/base64.js",
+      "file": "base-64.js",
+      "fileHash": "768aae23",
+      "needsInterop": true
+    }
+  },
+  "chunks": {}
+}

.vite/deps/base-64.js

@@ -0,0 +1,117 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+
+// ../../../../Documents/HBuilderProjects/B404219-tianranqi/node_modules/base-64/base64.js
+var require_base64 = __commonJS({
+  "../../../../Documents/HBuilderProjects/B404219-tianranqi/node_modules/base-64/base64.js"(exports, module) {
+    (function(root) {
+      var freeExports = typeof exports == "object" && exports;
+      var freeModule = typeof module == "object" && module && module.exports == freeExports && module;
+      var freeGlobal = typeof global == "object" && global;
+      if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
+        root = freeGlobal;
+      }
+      var InvalidCharacterError = function(message) {
+        this.message = message;
+      };
+      InvalidCharacterError.prototype = new Error();
+      InvalidCharacterError.prototype.name = "InvalidCharacterError";
+      var error = function(message) {
+        throw new InvalidCharacterError(message);
+      };
+      var TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+      var REGEX_SPACE_CHARACTERS = /[\t\n\f\r ]/g;
+      var decode = function(input) {
+        input = String(input).replace(REGEX_SPACE_CHARACTERS, "");
+        var length = input.length;
+        if (length % 4 == 0) {
+          input = input.replace(/==?$/, "");
+          length = input.length;
+        }
+        if (length % 4 == 1 || // http://whatwg.org/C#alphanumeric-ascii-characters
+        /[^+a-zA-Z0-9/]/.test(input)) {
+          error(
+            "Invalid character: the string to be decoded is not correctly encoded."
+          );
+        }
+        var bitCounter = 0;
+        var bitStorage;
+        var buffer;
+        var output = "";
+        var position = -1;
+        while (++position < length) {
+          buffer = TABLE.indexOf(input.charAt(position));
+          bitStorage = bitCounter % 4 ? bitStorage * 64 + buffer : buffer;
+          if (bitCounter++ % 4) {
+            output += String.fromCharCode(
+              255 & bitStorage >> (-2 * bitCounter & 6)
+            );
+          }
+        }
+        return output;
+      };
+      var encode = function(input) {
+        input = String(input);
+        if (/[^\0-\xFF]/.test(input)) {
+          error(
+            "The string to be encoded contains characters outside of the Latin1 range."
+          );
+        }
+        var padding = input.length % 3;
+        var output = "";
+        var position = -1;
+        var a;
+        var b;
+        var c;
+        var buffer;
+        var length = input.length - padding;
+        while (++position < length) {
+          a = input.charCodeAt(position) << 16;
+          b = input.charCodeAt(++position) << 8;
+          c = input.charCodeAt(++position);
+          buffer = a + b + c;
+          output += TABLE.charAt(buffer >> 18 & 63) + TABLE.charAt(buffer >> 12 & 63) + TABLE.charAt(buffer >> 6 & 63) + TABLE.charAt(buffer & 63);
+        }
+        if (padding == 2) {
+          a = input.charCodeAt(position) << 8;
+          b = input.charCodeAt(++position);
+          buffer = a + b;
+          output += TABLE.charAt(buffer >> 10) + TABLE.charAt(buffer >> 4 & 63) + TABLE.charAt(buffer << 2 & 63) + "=";
+        } else if (padding == 1) {
+          buffer = input.charCodeAt(position);
+          output += TABLE.charAt(buffer >> 2) + TABLE.charAt(buffer << 4 & 63) + "==";
+        }
+        return output;
+      };
+      var base64 = {
+        "encode": encode,
+        "decode": decode,
+        "version": "1.0.0"
+      };
+      if (typeof define == "function" && typeof define.amd == "object" && define.amd) {
+        define(function() {
+          return base64;
+        });
+      } else if (freeExports && !freeExports.nodeType) {
+        if (freeModule) {
+          freeModule.exports = base64;
+        } else {
+          for (var key in base64) {
+            base64.hasOwnProperty(key) && (freeExports[key] = base64[key]);
+          }
+        }
+      } else {
+        root.base64 = base64;
+      }
+    })(exports);
+  }
+});
+export default require_base64();
+/*! Bundled license information:
+
+base-64/base64.js:
+  (*! https://mths.be/base64 v1.0.0 by @mathias | MIT license *)
+*/
+//# sourceMappingURL=base-64.js.map

.vite/deps/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

api/pages.js

@@ -27,3 +27,13 @@ export function qjQueryByIdApi(config) { // 通过id查询请假数据 流程用
 		data: config
 	})
 }
+
+export function queryHisDateApi(username) { // 根据username获取最新请假结束日期
+	return https({
+		url: '/CxcQxj/cxcQxj/queryHisDate',
+		method: 'get',
+		data: {
+			username
+		}
+	})
+}

manifest.json

@@ -2,8 +2,8 @@
     "name" : "数智产销",
     "appid" : "__UNI__9F097F0",
     "description" : "",
-	"versionName": "1.1.4.1",
-	"versionCode": 20250121,
+    "versionName" : "1.1.6",
+    "versionCode" : 20250207,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -120,3 +120,4 @@
     "vueVersion" : "3"
 }
 /* 模块配置 */
+

pages.json

@@ -233,14 +233,6 @@
 				"navigationBarTitleText": "人员年龄分组统计信息",
 				"navigationBarTextStyle": "white"
 
-			}
-		},
-		{
-			"path": "pages/views/renliziyuan/renyuanxinxi/xbtongji",
-			"style": {
-				"navigationBarTitleText": "人员性别分组统计信息",
-				"navigationBarTextStyle": "white"
-
 			}
 		}
 	],

pages/leave/application.vue

@@ -109,7 +109,8 @@
 	} from '@/api/api.js';
 	import {
 		qjAddApi,
-		queryZwmcAndExaApi
+		queryZwmcAndExaApi,
+		queryHisDateApi
 	} from '@/api/pages.js';
 	import {
 		queryDepByCode,
@@ -177,7 +178,7 @@
 	}
 	onLoad(() => {
 		loadData()
-		getTomorrowDate()
+		// getTomorrowDate()
 	})
 
 	const select = (e) => {
@@ -274,21 +275,39 @@
 				proxy.$toast(res.message);
 			}
 		})
+
+		queryHisDateApi(store.userinfo.username).then((res) => { // 最新请假结束日期
+			if (res) {
+				console.log('--0', res)
+				getTomorrowDate(res);
+			} else {
+				console.log('--1', res)
+				getTomorrowDate();
+			}
+		})
 	}
 
 	const bindType = (e) => {
 		typeIndex.value = e.detail.value
 	}
 
-	const getTomorrowDate = () => {
-		let today = new Date();
-		let tomorrow = new Date(today);
-		tomorrow.setDate(today.getDate() + 1);
-		// 格式化日期为 yyyy-mm-dd
-		let year = tomorrow.getFullYear();
-		let month = String(tomorrow.getMonth() + 1).padStart(2, '0'); // 月份从0开始，需要加1
-		let day = String(tomorrow.getDate()).padStart(2, '0');
-		beginTime.value = year + '-' + month + '-' + day;
+	const getTomorrowDate = (e) => {
+		let tomorrow;
+		if (e) {
+			// 将传入的日期字符串转换为Date对象
+			const dateParts = e.split('-').map(Number);
+			tomorrow = new Date(dateParts[0], dateParts[1] - 1, dateParts[2]);
+		} else {
+			// 如果没有提供日期，则使用当前日期
+			tomorrow = new Date();
+		}
+		// 设置为明天的日期
+		tomorrow.setDate(tomorrow.getDate() + 1);
+		// 格式化日期
+		const year = tomorrow.getFullYear();
+		const month = (tomorrow.getMonth() + 1).toString().padStart(2, '0');
+		const day = tomorrow.getDate().toString().padStart(2, '0');
+		beginTime.value = `${year}-${month}-${day}`;
 	}
 </script>
 

pages/task/handle.vue

@@ -20,7 +20,9 @@
 			</view>
 		</customNav>
 		<component :is="comp" :dataId="dataId"></component>
-		<view class="btn f-row aic jcb" v-if="type == 0">
+		<view v-if="ifShow" style="display: block; margin: 10px;">
+			温馨提示:目前APP暂不支持电子签章审批,请登录PC端厂综合管理平台(https://10.75.166.6),在个人办公-我的任务中审批。</view>
+		<view class="btn f-row aic jcb" v-if="type == 0 && !ifShow">
 			<view class="refuse" @click="openpop(1)">
 				拒绝
 			</view>
@@ -28,7 +30,6 @@
 				同意
 			</view>
 		</view>
-
 		<uni-popup ref="popup" type="center">
 			<view class="popup">
 				<view class="title">
@@ -110,6 +111,7 @@
 	}
 	const comp = ref(null)
 	const dataId = ref('')
+	const ifShow = ref(false) //20250122 判断是否是签章业务 提示文字
 	const getProcessNodeInfo = (taskId) => {
 		getProcessNodeInfoApi({
 			taskId
@@ -149,6 +151,7 @@
 			}
 		}
 	}
+	
 	/**流程办理接口*/
 	const processComplete = (params) => {
 		processCompleteApi({
@@ -165,7 +168,6 @@
 		})
 	}
 
-
 	/**审批流程节点*/
 	const stepNode = ref([])
 	/**当前选择的节点*/
@@ -185,6 +187,7 @@
 			}
 		})
 	}
+	
 	/**历史任务详情*/
 	const getHisProcessNodeInfo = (procInstId) => {
 		getHisProcessNodeInfoApi({
@@ -196,6 +199,18 @@
 			}
 		})
 	}
+	/**判断是否是电子签章节点任务，是则显示温馨提示并隐藏审批按钮*/
+	const getIfShow = () => {
+		if (taskInfo.value.taskId == 'task1705482211321' || taskInfo.value.taskId == 'task1705482639673' ||
+			taskInfo.value.taskId == 'task1714092890849' || taskInfo.value.taskId == 'task1714092955682' ||
+			taskInfo.value.taskId == 'task1689151174324' || taskInfo.value.taskId == 'task1677809773570' ||
+			taskInfo.value.taskId == 'task1689579219152') 
+		{ // 签章业务：非常规 承包商资质审查 招标采购 公务接待 房屋租赁
+			ifShow.value = true;
+		} else {
+			ifShow.value = false;
+		}
+	}
 	const taskInfo = ref(null)
 	let type = null
 	onLoad((options) => {
@@ -207,6 +222,8 @@
 		getProcessNodeInfo(taskInfo.value.id)
 		getProcessTaskTransInfo()
 
+		getIfShow()
+
 	})
 </script>
 <style>

pages/views/renliziyuan/renyuanxinxi/index.vue

@@ -8,31 +8,28 @@
 			</uni-section>
 			<uni-section title="统计信息" type="line">
 				<uni-card :is-shadow="false">
-					<button type="primary" @click="toTongji">年龄分组统计</button>
-					<button type="primary" @click="toXbTongji">性别分组统计</button>
+					<button type="primary" @click="toTongji">分类统计</button>
 				</uni-card>
 			</uni-section>
+
 		</uni-card>
+
 	</view>
 </template>
 
 <script setup>
 	function toTaizhang() {
 		uni.navigateTo({
-		url: '/pages/views/renliziyuan/renyuanxinxi/taizhang'
-	});
+			url: "/pages/views/renliziyuan/renyuanxinxi/taizhang"
+		})
 	}
 
 	function toTongji() {
 		uni.navigateTo({
-		url: '/pages/views/renliziyuan/renyuanxinxi/tongji'
-	});
-}
-function toXbTongji() {
-	uni.navigateTo({
-		url: '/pages/views/renliziyuan/renyuanxinxi/xbtongji'
-	});
+			url: "/pages/views/renliziyuan/renyuanxinxi/tongji"
+		})
 	}
 </script>
 
-<style></style>
+<style>
+</style>

pages/views/renliziyuan/renyuanxinxi/tongji.vue

@@ -1,12 +1,13 @@
 <template>
 	<view>
 		<view class="container" id="top1">
-			<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx">
+			<uni-row style="margin-bottom: 10rpx;margin-left: 30rpx;margin-right: 30rpx;">
 				<uni-col :span="24"><uni-title :title="'所选单位ID:'+orgCode" align="left" type="h4"></uni-title></uni-col>
 			</uni-row>
-			<uni-row style="margin-bottom: 20rpx; margin-left: 30rpx; margin-right: 30rpx">
+			<uni-row style="margin-bottom: 20rpx;margin-left: 30rpx;margin-right: 30rpx;">
 				<uni-col :span="24">
-					<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
+					<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode"
+						@change="departChange"></trq-depart-select>
 				</uni-col>
 			</uni-row>
 			<!-- 概览统计 -->
@@ -26,28 +27,39 @@
 			<l-echart ref="chart" @finished="initChart" />
 		</view>
 
+
 		<!-- 数据表格 -->
 
-		<uni-row style="margin-top: 10px; margin-left: 30rpx; margin-right: 30rpx" v-if="tableData.length > 0">
+		<uni-row style="margin-top: 10px; margin-left: 30rpx;margin-right: 30rpx;" v-if="tableData.length>0">
 			<uni-col :span="3">
-				<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="6">
-				<view class="titleStyle">操作</view>
+				<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: 10rpx;margin-left: 30rpx;margin-right: 30rpx;">
 				<view v-for="(item,index) in tableData">
 					<uni-col :span="3">
 						<view class="dataStyle">
@@ -58,13 +70,11 @@
 						<view class="dataStyle">
 							{{item.xm}}
 						</view>
-					</uni-col>
-					<uni-col :span="5">
+					</uni-col><uni-col :span="5">
 						<view class="dataStyle">
 							{{item.xb_dictText}}
 						</view>
-					</uni-col>
-					<uni-col :span="5">
+					</uni-col><uni-col :span="5">
 						<view class="dataStyle">
 							{{item.nl}}
 						</view>
@@ -74,17 +84,26 @@
 							<button size="mini" type="primary" @click="detail(item)">详情</button>
 						</view>
 					</uni-col>
+
 				</view>
+
 			</uni-row>
+
 		</scroll-view>
 	</view>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue';
-import * as echarts from 'echarts';
+	import {
+		ref,
+		reactive,
+		onMounted
+	} from 'vue';
+	import * as echarts from 'echarts'
 
-import { queryRenyuanByDepartID } from '@/api/renyuan.js';
+	import {
+		queryRenyuanByDepartID
+	} from '@/api/renyuan.js'
 
 	// 存储下方组件的高度
 	const bottomHeight = ref(0);
@@ -106,8 +125,8 @@ const drillTitle = ref('');
 	function detail(record) {
 		// console.log(record)
 		uni.navigateTo({
-		url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
-	});
+			url: "/pages/views/renliziyuan/renyuanxinxi/detail?data=" + encodeURIComponent(JSON.stringify(record))
+		})
 	}
 	// 计算年龄initChart
 	const calculateAge = (birthDate) => {
@@ -122,15 +141,17 @@ const calculateAge = (birthDate) => {
 	};
 	// 加载数据
 	const departChange = async (e, data) => {
-	tableData.value = [];
-	console.log(e);
+
+		tableData.value = []
+		console.log(e)
 		orgCode.value = e;
 		try {
 			// 显示加载状态
 
 			isLoading.value = true;
 			if (orgCode.value.length <= 6) {
-			console.log(123242353);
+
+				console.log(123242353)
 				uni.showLoading({
 					title: '全厂数据较多，耐心等待数据加载中...',
 					mask: true
@@ -147,28 +168,31 @@ const departChange = async (e, data) => {
 				fields: ['xm', 'nl', 'xb', 'xb_dictText', 'orgCode', 'jcdw', 'jcxd', 'jcxdCode']
 			};
 			if (orgCode.value.length <= 9) {
-			params.orgCode = orgCode.value;
+				params.orgCode = orgCode.value
 			} else {
-			params.jcxd_code = orgCode.value;
+				params.jcxd_code = orgCode.value
+
 			}
-		queryRenyuanByDepartID(params)
-			.then((res) => {
+			queryRenyuanByDepartID(params).then((res) => {
 				if (res.success) {
 					processData(res.result.records);
+
 					// 隐藏加载状态
 					isLoading.value = false;
 					uni.hideLoading();
+
 				}
-			})
-			.catch((err) => {
-				console.log(err);
+			}).catch((err) => {
+				console.log(err)
 				uni.showToast({
 					title: '数据加载失败',
 					icon: 'none'
 				});
-			});
+			})
+
+
 		} catch (error) {
-		console.log(error);
+			console.log(error)
 			uni.showToast({
 				title: '数据加载失败',
 				icon: 'none'
@@ -180,15 +204,15 @@ const departChange = async (e, data) => {
 		}
 	};
 
+
 	// 数据处理
 	const processData = (data) => {
+
 		// 添加年龄字段并过滤有效数据
-	const validData = data
-		.map((item) => ({
+		const validData = data.map(item => ({
 			...item,
 			nl: calculateAge(item.cssj)
-		}))
-		.filter((item) => item.nl >= 21 && item.nl <= 64);
+		})).filter(item => item.nl >= 21 && item.nl <= 64);
 		// 计算概览数据
 		summary.total = validData.length;
 		summary.avgAge = validData.reduce((sum, cur) => sum + cur.nl, 0) / summary.total || 0;
@@ -198,25 +222,27 @@ const processData = (data) => {
 		groupsData(validData);
 		// 生成图表数据
 		generateChartData(validData);
+
 	};
 
 	// 计算统计信息...
 	const subOrgStaffs = ref({}); // 按下级单位存储所有人员
 	const ageGroupStaffs = ref({}); // 按年龄段存储所有人员
 
+
 	const groupsData = (data) => {
 		// 清空旧数据
 		subOrgStaffs.value = {};
 		ageGroupStaffs.value = {};
 		data.reduce((acc, cur) => {
 			// console.log(cur)
-		let subOrg = '';
+			let subOrg = "";
 			let ageRange = getAgeRange(cur.nl);
 			// console.log(cur.orgCode, cur.jcxdCode)
 			if (cur.orgCode <= 6) {
-			subOrg = cur.orgCode;
+				subOrg = cur.orgCode
 			} else {
-			subOrg = cur.jcxdCode;
+				subOrg = cur.jcxdCode
 			}
 
 			// 存储到subOrgStaffs
@@ -230,8 +256,9 @@ const groupsData = (data) => {
 				ageGroupStaffs.value[ageRange] = [];
 			}
 			ageGroupStaffs.value[ageRange].push(cur);
-	});
-};
+		})
+	}
+
 
 	// 新增年龄范围计算方法
 	const getAgeRange = (age) => {
@@ -243,7 +270,9 @@ const getAgeRange = (age) => {
 	// 修改后的显示人员列表方法
 	const showStaffList = (subOrg, ageRange) => {
 		// 从结构化数据中直接获取
-	const targetStaffs = subOrgStaffs.value[subOrg].filter((staff) => getAgeRange(staff.nl) === ageRange);
+		const targetStaffs = subOrgStaffs.value[subOrg].filter(staff =>
+			getAgeRange(staff.nl) === ageRange
+		);
 
 		staffList.value = targetStaffs;
 		popupTitle.value = `${subOrg} ${ageRange}人员列表（共${targetStaffs.length}人）`;
@@ -278,13 +307,14 @@ const generateChartData = (data) => {
 			return acc;
 		}, {});
 
+
 		// 生成分组柱状图配置
 		const xData = Object.keys(jcdwGroups);
 
 		const seriesData = ageRanges.map((range, index) => ({
 			name: range,
 			type: 'bar',
-		data: xData.map((jcdw) => jcdwGroups[jcdw].ageGroups[index] || 0),
+			data: xData.map(jcdw => jcdwGroups[jcdw].ageGroups[index] || 0),
 			itemStyle: {
 				color: ['#5470C6', '#91CC75', '#FAC858', '#EE6666', '#73C0DE'][index]
 			},
@@ -292,14 +322,14 @@ const generateChartData = (data) => {
 			label: {
 				show: true,
 				position: 'top'
-		}
+			},
 			// 设置柱宽为 20 像素
 			// barWidth: 20
-	}));
+		}))
 		chartOption.value = {
 			title: {
 				text: '人员年龄分组统计',
-			padding: [0, 0, 0, 30]
+				padding: [0, 0, 0, 30],
 			},
 			toolbox: {
 				padding: [0, 30, 0, 0],
@@ -347,7 +377,7 @@ const generateChartData = (data) => {
 					color: '#7F84B5',
 					fontWeight: 300,
 					interval: 0,
-				rotate: 0
+					rotate: 0,
 				},
 				padding: [0, 10, 0, 10],
 				axisTick: {
@@ -357,8 +387,7 @@ const generateChartData = (data) => {
 					show: false //不显示坐标轴线
 				}
 			},
-		yAxis: [
-			{
+			yAxis: [{
 				show: true,
 				boundaryGap: false, //解决数据与线不对应问题
 				type: 'value',
@@ -382,33 +411,37 @@ const generateChartData = (data) => {
 				axisLine: {
 					show: false //不显示坐标轴线
 				}
-			}
-		],
+			}],
+
+			series: seriesData,
 
-		series: seriesData
 		};
 
 		// 初始化图表
 		setTimeout(async () => {
-		if (!chart.value) return;
-		const myChart = await chart.value.init(echarts);
-		myChart.setOption(chartOption.value);
+			if (!chart.value) return
+			const myChart = await chart.value.init(echarts)
+			myChart.setOption(chartOption.value)
 			myChart.on('click', (params) => {
-			console.log(params.seriesName);
-			tableData.value = getAgeGroupStaffs(params.seriesName);
-		});
-	}, 300);
+				console.log(params.seriesName)
+				tableData.value = getAgeGroupStaffs(params.seriesName)
+
+			})
+		}, 300)
+
 
 		// #ifdef APP
 		getHeight();
 		// #endif
+
 	};
 
 	onMounted(() => {
+
 		// #ifdef APP
 		getHeight();
 		// #endif
-});
+	})
 	// #ifdef APP
 
 	const getHeight = () => {
@@ -422,7 +455,7 @@ const getHeight = () => {
 			.select('#top1')
 			.boundingClientRect((rect1) => {
 				// 计算上方组件高度总和
-			const topComponentsHeight = rect1.height;
+				const topComponentsHeight = rect1.height
 				// 计算下方组件的高度
 				bottomHeight.value = screenHeight - topComponentsHeight - 415;
 			})
@@ -433,10 +466,10 @@ const getHeight = () => {
 	// 初始化图表
 	const initChart = () => {
 		setTimeout(async () => {
-		if (!chart.value) return;
-		const myChart = await chart.value.init(echarts);
-		myChart.setOption(chartOption.value);
-	}, 300);
+			if (!chart.value) return
+			const myChart = await chart.value.init(echarts)
+			myChart.setOption(chartOption.value)
+		}, 300)
 	};
 </script>
 
@@ -459,7 +492,7 @@ const initChart = () => {
 	}
 
 	.query-btn {
-	background: #007aff;
+		background: #007AFF;
 		color: white;
 		padding: 0 40rpx;
 		border-radius: 8rpx;
@@ -501,11 +534,12 @@ const initChart = () => {
 		color: #747474;
 		line-height: 30px;
 		height: 30px;
-	background: #f2f9fc;
+		background: #F2F9FC;
 		text-align: center;
 		vertical-align: middle;
 		border-left: 1px solid #919191;
 		border-bottom: 1px solid #919191;
+		;
 	}
 
 	/* 内容样式 */
@@ -524,5 +558,6 @@ const initChart = () => {
 		border-bottom: 1px solid #919191;
 		border-left: 1px solid #919191;
 		text-overflow: ellipsis;
+
 	}
 </style>

pages/views/renliziyuan/renyuanxinxi/xbtongji.vue

@@ -1,517 +0,0 @@
-<template>
-	<view>
-		<view class="container" id="top1">
-			<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx">
-				<uni-col :span="24"><uni-title :title="'所选单位ID:' + orgCode" align="left" type="h4"></uni-title></uni-col>
-			</uni-row>
-			<uni-row style="margin-bottom: 20rpx; margin-left: 30rpx; margin-right: 30rpx">
-				<uni-col :span="24">
-					<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
-				</uni-col>
-			</uni-row>
-			<!-- 概览统计 -->
-			<view class="stats-box" v-if="summary.total">
-				<view class="stat-item">
-					<text class="label">总人数</text>
-					<text class="value">{{ summary.total }}</text>
-				</view>
-				<view class="stat-item">
-					<text class="label">平均年龄</text>
-					<text class="value">{{ summary.avgAge.toFixed(1) }}</text>
-				</view>
-			</view>
-		</view>
-		<!-- ECharts图表 -->
-		<view class="chart-container">
-			<l-echart ref="chart" @finished="initChart" />
-		</view>
-
-		<!-- 数据表格 -->
-
-		<uni-row style="margin-top: 10px; margin-left: 30rpx; margin-right: 30rpx" v-if="tableData.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 style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx">
-				<view v-for="(item, index) in tableData">
-					<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>
-		</scroll-view>
-	</view>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted } from 'vue';
-import * as echarts from 'echarts';
-import { cxcRyDataTongji, queryRenyuanByDepartID } from '@/api/renyuan.js';
-// 存储下方组件的高度
-const bottomHeight = ref(0);
-// 新增加载状态
-const isLoading = ref(false);
-const orgCode = ref('');
-const rawData = ref([]);
-const tableData = ref([]);
-const summary = reactive({
-	total: 0,
-	avgAge: 0
-});
-const chart = ref(null);
-const chartOption = ref({});
-const drillPopup = ref(null);
-const drillList = ref([]);
-const drillTitle = ref('');
-
-function detail(record) {
-	// console.log(record)
-	uni.navigateTo({
-		url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
-	});
-}
-// 计算年龄initChart
-const calculateAge = (birthDate) => {
-	const today = new Date();
-	const birth = new Date(birthDate);
-	let age = today.getFullYear() - birth.getFullYear();
-	const monthDiff = today.getMonth() - birth.getMonth();
-	if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birth.getDate())) {
-		age--;
-	}
-	return age;
-};
-// 加载数据
-const departChange = async (e, data) => {
-	tableData.value = [];
-	console.log(e);
-	orgCode.value = e;
-	try {
-		// 显示加载状态
-		isLoading.value = true;
-		uni.showLoading({
-			title: '数据加载中...',
-			mask: true
-		});
-
-		let params = {
-			orgCode: orgCode.value
-		};
-		if (orgCode.value.length <= 9) {
-			params.orgCode = orgCode.value;
-		} else {
-			params.jcxd_code = orgCode.value;
-		}
-		cxcRyDataTongji(params)
-			.then((res) => {
-				console.log(res);
-				if (res.success) {
-					processData(res.result.records);
-					// 隐藏加载状态
-					isLoading.value = false;
-					uni.hideLoading();
-				}
-			})
-			.catch((err) => {
-				console.log(err);
-				uni.showToast({
-					title: '数据加载失败',
-					icon: 'none'
-				});
-			});
-	} catch (error) {
-		console.log(error);
-		uni.showToast({
-			title: '数据加载失败',
-			icon: 'none'
-		});
-	} finally {
-		// 隐藏加载状态
-		isLoading.value = false;
-		uni.hideLoading();
-	}
-};
-
-// 数据处理
-const processData = (data) => {
-	// 添加年龄字段并过滤有效数据
-	const validData = data
-		.map((item) => ({
-			...item,
-			nl: calculateAge(item.cssj)
-		}))
-		.filter((item) => item.nl >= 21 && item.nl <= 64);
-	// 计算概览数据
-	summary.total = validData.length;
-	summary.avgAge = validData.reduce((sum, cur) => sum + cur.nl, 0) / summary.total || 0;
-	// 生成表格数据
-	// tableData.value = validData;
-
-	groupsData(validData);
-	// 生成图表数据
-	generateChartData(validData);
-};
-
-// 计算统计信息...
-const subOrgStaffs = ref({}); // 按下级单位存储所有人员
-const ageGroupStaffs = ref({}); // 按年龄段存储所有人员
-
-const groupsData = (data) => {
-	// 清空旧数据
-	subOrgStaffs.value = {};
-	ageGroupStaffs.value = {};
-	data.reduce((acc, cur) => {
-		// console.log(cur)
-		let subOrg = '';
-		let ageRange = getAgeRange(cur.nl);
-		// console.log(cur.orgCode, cur.jcxdCode)
-		if (cur.orgCode <= 6) {
-			subOrg = cur.orgCode;
-		} else {
-			subOrg = cur.jcxdCode;
-		}
-
-		// 存储到subOrgStaffs
-		if (!subOrgStaffs.value[subOrg]) {
-			subOrgStaffs.value[subOrg] = [];
-		}
-		subOrgStaffs.value[subOrg].push(cur);
-
-		// 存储到ageGroupStaffs
-		if (!ageGroupStaffs.value[ageRange]) {
-			ageGroupStaffs.value[ageRange] = [];
-		}
-		ageGroupStaffs.value[ageRange].push(cur);
-	});
-};
-
-// 新增年龄范围计算方法
-const getAgeRange = (age) => {
-	const ranges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
-	const index = Math.floor((age - 21) / 10);
-	return ranges[index] || '其他';
-};
-
-// 修改后的显示人员列表方法
-const showStaffList = (subOrg, ageRange) => {
-	// 从结构化数据中直接获取
-	const targetStaffs = subOrgStaffs.value[subOrg].filter((staff) => getAgeRange(staff.nl) === ageRange);
-
-	staffList.value = targetStaffs;
-	popupTitle.value = `${subOrg} ${ageRange}人员列表（共${targetStaffs.length}人）`;
-	popup.value.open();
-};
-
-// 新增获取指定单位人员的方法
-const getSubOrgStaffs = (subOrgCode) => {
-	return subOrgStaffs.value[subOrgCode] || [];
-};
-
-// 新增获取指定年龄段人员的方法
-const getAgeGroupStaffs = (ageRange) => {
-	return ageGroupStaffs.value[ageRange] || [];
-};
-
-// 生成图表数据（修改部分）
-const generateChartData = (data) => {
-	// 按基层单位分组
-	const ageRanges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
-	const jcdwGroups = data.reduce((acc, cur) => {
-		if (!acc[cur.jcdw]) {
-			acc[cur.jcdw] = {
-				ageGroups: [0, 0, 0, 0, 0] // 21-30,31-40,41-50,51-60,61-64
-			};
-		}
-		const ageGroup = Math.floor((cur.nl - 21) / 10);
-		// console.log(ageGroup, cur.jcdw)
-		if (ageGroup >= 0 && ageGroup <= 4) {
-			acc[cur.jcdw].ageGroups[ageGroup]++;
-		}
-		return acc;
-	}, {});
-
-	// 生成分组柱状图配置
-	const xData = Object.keys(jcdwGroups);
-
-	const seriesData = ageRanges.map((range, index) => ({
-		name: range,
-		type: 'bar',
-		data: xData.map((jcdw) => jcdwGroups[jcdw].ageGroups[index] || 0),
-		itemStyle: {
-			color: ['#5470C6', '#91CC75', '#FAC858', '#EE6666', '#73C0DE'][index]
-		},
-		// 显示数值标签
-		label: {
-			show: true,
-			position: 'top'
-		}
-		// 设置柱宽为 20 像素
-		// barWidth: 20
-	}));
-	chartOption.value = {
-		title: {
-			text: '人员年龄分组统计',
-			padding: [0, 0, 0, 30]
-		},
-		toolbox: {
-			padding: [0, 30, 0, 0],
-			show: true,
-			feature: {
-				//工具配置项
-
-				restore: {
-					show: true //是否显示该工具
-				},
-				saveAsImage: {
-					show: true //是否显示该工具
-				}
-			}
-		},
-		// tooltip: {
-		// 	trigger: 'axis',
-		// 	axisPointer: {
-		// 		type: 'shadow',
-		// 		label: {
-		// 			show: false
-		// 		}
-		// 	}
-		// },
-		grid: {
-			top: '15%',
-			left: '4%',
-			right: '4%',
-			bottom: '10%',
-			containLabel: true
-		},
-		legend: {
-			data: ageRanges,
-			itemGap: 5,
-			padding: [0, 15, 0, 15],
-			y: 'bottom',
-			itemHeight: 8, //高
-			itemWidth: 8, //宽
-			type: 'scroll'
-		},
-		xAxis: {
-			type: 'category',
-			data: xData,
-			axisLabel: {
-				color: '#7F84B5',
-				fontWeight: 300,
-				interval: 0,
-				rotate: 0
-			},
-			padding: [0, 10, 0, 10],
-			axisTick: {
-				show: false //刻度线
-			},
-			axisLine: {
-				show: false //不显示坐标轴线
-			}
-		},
-		yAxis: [
-			{
-				show: true,
-				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 //不显示坐标轴线
-				}
-			}
-		],
-
-		series: seriesData
-	};
-
-	// 初始化图表
-	setTimeout(async () => {
-		if (!chart.value) return;
-		const myChart = await chart.value.init(echarts);
-		myChart.setOption(chartOption.value);
-		myChart.on('click', (params) => {
-			console.log(params.seriesName);
-			tableData.value = getAgeGroupStaffs(params.seriesName);
-		});
-	}, 300);
-
-	// #ifdef APP
-	getHeight();
-	// #endif
-};
-
-onMounted(() => {
-	// #ifdef APP
-	getHeight();
-	// #endif
-});
-// #ifdef APP
-
-const getHeight = () => {
-	// 获取屏幕高度
-	const systemInfo = uni.getSystemInfoSync();
-	const screenHeight = systemInfo.screenHeight;
-	// 创建选择器查询对象
-	const query = uni.createSelectorQuery();
-	// 获取上方组件的高度
-	query
-		.select('#top1')
-		.boundingClientRect((rect1) => {
-			// 计算上方组件高度总和
-			const topComponentsHeight = rect1.height;
-			// 计算下方组件的高度
-			bottomHeight.value = screenHeight - topComponentsHeight - 415;
-		})
-		.exec();
-};
-
-// #endif
-// 初始化图表
-const initChart = () => {
-	setTimeout(async () => {
-		if (!chart.value) return;
-		const myChart = await chart.value.init(echarts);
-		myChart.setOption(chartOption.value);
-	}, 300);
-};
-</script>
-
-<style scoped>
-.container {
-	margin: 20, 20, 20, 20rpx;
-}
-
-.input-group {
-	display: flex;
-	gap: 20rpx;
-	margin-bottom: 30rpx;
-}
-
-.input {
-	flex: 1;
-	border: 1rpx solid #ddd;
-	padding: 15rpx;
-	border-radius: 8rpx;
-}
-
-.query-btn {
-	background: #007aff;
-	color: white;
-	padding: 0 40rpx;
-	border-radius: 8rpx;
-}
-
-.stats-box {
-	display: flex;
-	justify-content: space-around;
-	margin: 30rpx 0;
-	padding: 20rpx;
-	background: #f8f8f8;
-	border-radius: 12rpx;
-}
-
-.stat-item {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-}
-
-.label {
-	font-size: 24rpx;
-	color: #666;
-}
-
-.value {
-	font-size: 36rpx;
-	font-weight: bold;
-	color: #0000ff;
-}
-
-.chart-container {
-	height: 400rpx;
-	margin-top: 20rpx;
-}
-
-.titleStyle {
-	font-size: 12px;
-	color: #747474;
-	line-height: 30px;
-	height: 30px;
-	background: #f2f9fc;
-	text-align: center;
-	vertical-align: middle;
-	border-left: 1px solid #919191;
-	border-bottom: 1px solid #919191;
-}
-
-/* 内容样式 */
-.dataStyle {
-	max-font-size: 14px;
-	/* 最大字体限制 */
-	min-font-size: 10px;
-	/* 最小字体限制 */
-	font-size: 12px;
-	color: #00007f;
-	line-height: 30px;
-	height: 30px;
-	font-weight: 500;
-	text-align: center;
-	vertical-align: middle;
-	border-bottom: 1px solid #919191;
-	border-left: 1px solid #919191;
-	text-overflow: ellipsis;
-}
-</style>

store/update.js

@@ -37,12 +37,6 @@ export const useUpdateApp = defineStore('updateApp', () => {
 				} = res
 				result.apkUrl = baseUrl + result.apkUrl;
 				result.wgtUrl = baseUrl + result.wgtUrl
-				// res = {
-				// 	"update": "wgt",
-				// 	"wgtUrl": "D:\\opt\\AppUpdate\\wgt\\2.2.34.wgt",
-				// 	"apkUrl": null,
-				// 	"versionCode": "1.0.0"
-				// }
 				// updateOptions.force = res.is_force === 1
 				// updateOptions.content = res.update_content
 				updateOptions.wgtUrl = result.wgtUrl