From 1a2d35292a891f940bd86027718c393bab565f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=B5=20=E5=B9=B4=E6=B3=BD?= <627844378@qq.com>
Date: Thu, 6 Mar 2025 14:07:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                |  4 ++--
 pages/login/login.vue                           | 16 ++++++++--------
 .../views/renliziyuan/renyuanxinxi/qttongji.vue | 17 ++++++++++++-----
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.env.development b/.env.development
index e96d5b3..23a4ddb 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
 # 开发环境
 # 请求接口地址
- #VITE_REQUEST_BASE_URL = https://36.112.48.190
-VITE_REQUEST_BASE_URL = http://10.75.15.249:8080
+#VITE_REQUEST_BASE_URL = https://36.112.48.190
+VITE_REQUEST_BASE_URL = http://10.75.15.246:8085
diff --git a/pages/login/login.vue b/pages/login/login.vue
index fd2b532..976a718 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/qttongji.vue b/pages/views/renliziyuan/renyuanxinxi/qttongji.vue
index 339a860..0f31a08 100644
--- a/pages/views/renliziyuan/renyuanxinxi/qttongji.vue
+++ b/pages/views/renliziyuan/renyuanxinxi/qttongji.vue
@@ -179,6 +179,8 @@
 	const fieldTexts = ref([]); //字段值
 	const chartOption = ref({});
 	const orgType = ref(''); //记录单位层级 by 闵
+    var tempOrgType = '';  //单位层级 by 闵
+
 
 	const chartTitle = computed(() => {
 		return selectedOrgCodeLabel.value + '人员(' + selectedFieldLabel.value + ')分组统计';
@@ -393,8 +395,13 @@
 			myChart.on('click', (params) => {
 				console.log(params.name, params.seriesIndex, params.dataIndex);
 				console.log(orgCodeGroupData.value);
-
-				let updateData = findRyByOrgCode(orgCodeGroupData.value.children, params.name);
+				let updateData = []
+				//这里需要判断是否为第三级
+				if(tempOrgType=='1'){
+					updateData = findRyByOrgCode(orgCodeGroupData.value.children, params.name);
+				}else{
+					updateData = orgCodeGroupData.value
+				}
 				console.log(updateData);
 
 				const ldhth = updateData.fieldValues[params.seriesIndex].ldhth;
@@ -411,7 +418,7 @@
 	//根据一个键值查找数据
 	//查找人员劳动合同号
 	function findRyByOrgCode(treeData, targetOrgCode) {
-		// console.log(treeData, targetOrgCode);
+		console.log(treeData, targetOrgCode);
 		for (const node of treeData) {
 			// 如果当前节点匹配，直接返回该节点及其子节点
 			if (node.orgText === targetOrgCode) {
@@ -718,7 +725,7 @@
 		chartData.value = [];
 		try {
 			//这里添加一个层级字段，并避免 厂机关A01A01A01 orgType by 闵
-			var tempOrgType = '1';
+			tempOrgType = '1';
 			if(selectedOrgCode.value.includes('A01A01A01')){
 				tempOrgType = '1';
 			}else{
@@ -745,7 +752,7 @@
 				});
 			}
 
-			// console.log(res); //deepseek
+			console.log(res); //deepseek
 			if (res.success) {
 				console.log(selectedOrgCode.value, res);
 				if (res.result.length < 1) {

From 318801231b4b567660e07694e08f345c89e0ffa7 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Thu, 6 Mar 2025 14:57:38 +0800
Subject: [PATCH 2/2] 1.1.11

---
 manifest.json         |  4 ++--
 pages/login/login.vue | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifest.json b/manifest.json
index 761aade..b83ec0d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "数智产销",
     "appid" : "__UNI__9F097F0",
     "description" : "",
-    "versionName" : "1.1.10",
-    "versionCode" : 20250303,
+    "versionName" : "1.1.11",
+    "versionCode" : 20250306,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 976a718..fd2b532 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) {