From b16c2f3fc117d8949b35c74b260e65d8816f711d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 17 十一月 2025 09:18:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 6 +++---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 6 ++++--
admin/src/components/common/CommonHeader.vue | 14 ++++++++++----
admin/.env.development | 4 ++--
4 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 49eed4e..c574b58 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -5,9 +5,9 @@
# VUE_APP_API_URL = 'http://192.168.1.45:10010'
-# VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
+VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
-VUE_APP_API_URL = 'http://localhost:10010'
+# VUE_APP_API_URL = 'http://localhost:10010'
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index ad3345e..0c5afee 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -166,19 +166,25 @@
getHeaderNav (item,index) {
this.setCurrentIndex(index)
if(item.linkType === 0){
- console.log('setTopMenuCurrent')
this.setTopMenuCurrent(item)
}else{
if (item.url && item.url === 'goHKAF' && item.params != null) {
- this.getHKAFHeaderNav(item.params)
+ this.getHKAFHeaderNav(item.params, item.label)
} else if (item.url && item.url.indexOf('http') === 0) {
window.open(item.url, '_blank')
}
}
},
- getHKAFHeaderNav (type) {
+ getHKAFHeaderNav (type, label) {
getAppHeaderNav(type).then(res => {
- window.open(res, '_blank')
+ if (label === '瀹夐槻涓績') {
+ let openWindow = window.open(res, '_blank')
+ setTimeout(() => {
+ openWindow.close()
+ }, 7 * 1000)
+ } else {
+ window.open(res, '_blank')
+ }
})
},
handleTest () {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index d955006..cb7c175 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -288,9 +288,9 @@
* 3銆佽兘绠′腑蹇冿細ngzx
*/
public interface MenuPageId{
- String[] componentIds = new String[]{"Infovision iPark Platform","dfe","cems"};
- String afzx = "afzx";//瀹夐槻涓績
- String xkzx = "xkzx";//娑堟帶涓績
+ String[] componentIds = new String[]{"vms","fem","cems"};
+ String afzx = "010100";//瀹夐槻涓績
+ String xkzx = "000101";//娑堟帶涓績
String ngzx = "ngzx";//鑳界涓績
String jsc = "jsc";//鐗╀笟鍚庡嫟
String kqgzt = "attendance_workstand";//鑰冨嫟绠＄悊
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 5cb7b07..ebb020f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -1211,8 +1211,9 @@
String componentId = HKConstants.MenuPageId.componentIds[0];
String menuId = HKConstants.MenuPageId.afzx;
if(Constants.equalsInteger(type,Constants.ONE)){
+ componentId = HKConstants.MenuPageId.componentIds[1];
menuId = HKConstants.MenuPageId.xkzx;
- }else if(Constants.equalsInteger(type,Constants.TWO)){
+ }/*else if(Constants.equalsInteger(type,Constants.TWO)){
menuId = HKConstants.MenuPageId.ngzx;
}else if(Constants.equalsInteger(type,Constants.THREE)){
menuId = HKConstants.MenuPageId.jsc;
@@ -1227,10 +1228,11 @@
// return "https://10.50.250.253:443/xauthplus-plugin/thirdLogin?type=third&service=https://10.50.250.253:443/cems/config/generalCard&token="+token;
}else if(Constants.equalsInteger(type,7)){
menuId = HKConstants.MenuPageId.hqzx;
- }
+ }*/
log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token);
try {
///xauthplus-plugin/thirdLogin?type=third&componentId=${componentId}&componentMenuId=${menuId}&token=${token}
+ ///xauthplus-plugin/thirdLogin?type=third&componentld=vms&componentMenuld=010100
String res = HKTools.getMenuUrl(componentId,menuId,token);
return res;
}catch (Exception e){
--
Gitblit v1.9.3