From d645a17e5bea547257b2f1db69ac50feaa120a7a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十二月 2024 09:53:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java | 4 +-
screen/src/views/LogisticsCenter.vue | 81 ++++++++++++++++++++--------------------
2 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index 1359e22..67df9d5 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -465,7 +465,7 @@
time.value = dayjs().format('HH:mm:ss')
}, 1000)
-//
+//
const mapList = ref([])
const mapEchart = ref()
const initMap = () => {
@@ -481,48 +481,48 @@
{ value: [103.9526, 30.7617, 1901], itemStyle: { color: '#fff' }, name: '鍥涘窛', total: 18, bj: 0, yj: 0, yx: 18, tj: 0, dw: 0 }
]
const mapData = [
- { name: '鍖椾含甯�', value: 0 },
- { name: '澶╂触甯�', value: 0 },
- { name: '涓婃捣甯�', value: 0 },
- { name: '閲嶅簡甯�', value: 0 },
- { name: '娌冲寳鐪�', value: 0 },
- { name: '娌冲崡鐪�', value: 0 },
- { name: '浜戝崡鐪�', value: 0 },
- { name: '杈藉畞鐪�', value: 0 },
- { name: '榛戦緳姹熺渷', value: 0 },
- { name: '婀栧崡鐪�', value: 0 },
- { name: '瀹夊窘鐪�', value: 0 },
- { name: '灞变笢鐪�', value: 0 },
- { name: '鏂扮枂缁村惥灏旇嚜娌诲尯', value: 0 },
- { name: '姹熻嫃鐪�', value: 0 },
- { name: '娴欐睙鐪�', value: 0 },
- { name: '姹熻タ鐪�', value: 0 },
- { name: '婀栧寳鐪�', value: 0 },
- { name: '骞胯タ澹棌鑷不鍖�', value: 0 },
- { name: '鐢樿們鐪�', value: 0 },
- { name: '灞辫タ鐪�', value: 0 },
- { name: '鍐呰挋鍙よ嚜娌诲尯', value: 0 },
- { name: '闄曡タ鐪�', value: 0 },
- { name: '鍚夋灄鐪�', value: 0 },
- { name: '绂忓缓鐪�', value: 0 },
- { name: '璐靛窞鐪�', value: 0 },
- { name: '骞夸笢鐪�', value: 0 },
- { name: '闈掓捣鐪�', value: 0 },
- { name: '瑗胯棌鑷不鍖�', value: 0 },
- { name: '瀹佸鍥炴棌鑷不鍖�', value: 0 },
- { name: '鍥涘窛鐪�', value: 0 },
- { name: '瀹佸鐪�', value: 0 },
- { name: '娴峰崡鐪�', value: 0 },
- { name: '鍙版咕鐪�', value: 0 },
- { name: '棣欐腐鐗瑰埆琛屾斂鍖�', value: 0 },
- { name: '婢抽棬鐗瑰埆琛屾斂鍖�', value: 0 },
- { name: '鍗楁捣璇稿矝', value: 0 },
+ { name: '鍖椾含甯�',code:'110000', value: 0 },
+ { name: '澶╂触甯�',code:'120000', value: 0 },
+ { name: '涓婃捣甯�', code:'310000',value: 0 },
+ { name: '閲嶅簡甯�', code:'500000',value: 0 },
+ { name: '娌冲寳鐪�',code:'130000', value: 0 },
+ { name: '娌冲崡鐪�',code:'410000', value: 0 },
+ { name: '浜戝崡鐪�',code:'530000', value: 0 },
+ { name: '杈藉畞鐪�',code:'210000', value: 0 },
+ { name: '榛戦緳姹熺渷', code:'230000',value: 0 },
+ { name: '婀栧崡鐪�',code:'430000', value: 0 },
+ { name: '瀹夊窘鐪�', code:'340000',value: 0 },
+ { name: '灞变笢鐪�',code:'370000', value: 0 },
+ { name: '鏂扮枂缁村惥灏旇嚜娌诲尯', code:'650000',value: 0 },
+ { name: '姹熻嫃鐪�',code:'320000', value: 0 },
+ { name: '娴欐睙鐪�', code:'330000', value: 0 },
+ { name: '姹熻タ鐪�', code:'360000', value: 0 },
+ { name: '婀栧寳鐪�', code:'420000', value: 0 },
+ { name: '骞胯タ澹棌鑷不鍖�',code:'450000', value: 0 },
+ { name: '鐢樿們鐪�', code:'620000', value: 0 },
+ { name: '灞辫タ鐪�', code:'140000', value: 0 },
+ { name: '鍐呰挋鍙よ嚜娌诲尯', code:'150000', value: 0 },
+ { name: '闄曡タ鐪�', code:'610000', value: 0 },
+ { name: '鍚夋灄鐪�',code:'220000', value: 0 },
+ { name: '绂忓缓鐪�', code:'350000', value: 0 },
+ { name: '璐靛窞鐪�', code:'520000', value: 0 },
+ { name: '骞夸笢鐪�', code:'440000', value: 0 },
+ { name: '闈掓捣鐪�', code:'630000', value: 0 },
+ { name: '瑗胯棌鑷不鍖�',code:'540000', value: 0 },
+ { name: '瀹佸鍥炴棌鑷不鍖�',code:'640000', value: 0 },
+ { name: '鍥涘窛鐪�',code:'510000', value: 0 },
+ { name: '瀹佸鐪�', code:'640000',value: 0 },
+ { name: '娴峰崡鐪�', code:'460000',value: 0 },
+ { name: '鍙版咕鐪�', code:'710000',value: 0 },
+ { name: '棣欐腐鐗瑰埆琛屾斂鍖�', code:'810000',value: 0 },
+ { name: '婢抽棬鐗瑰埆琛屾斂鍖�', code:'820003',value: 0 },
+ { name: '鍗楁捣璇稿矝', code:'',value: 0 },
]
mapData.forEach(item => {
item.monthNum = 0
item.yearNum = 0
mapList.value.forEach(ite => {
- if (item.name == ite.name) {
+ if (item.code == ite.code) {
item.value = ite.yearNum
item.monthNum = ite.monthNum
item.yearNum = ite.yearNum
@@ -639,7 +639,7 @@
return `<div class="map-tip-box">
<div class="item-state-con title">
<div class="icon"></div>
- <span>${params.data.name}</span>
+ <span>${params.data.name}</span>
</div>
<div class="item-state-con">
<span class="dot bj"></span>
@@ -682,6 +682,7 @@
mapList.value = temp.map(item => {
item.value = item.monthNum
item.name = item.provinceName
+ item.code=item.provinceCode
return item
})
initMap()
@@ -2854,4 +2855,4 @@
object-fit: cover;
z-index: -1;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
index 49e4f25..d9a6ada 100644
--- a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
@@ -85,11 +85,11 @@
}catch (Exception e){
}*/
} else {
- throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
+ throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),request.getRequestURI()+"鏈櫥褰�");
}
}
}else{
- throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
+ throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),request.getRequestURI()+"鏈櫥褰�");
}
return true;
--
Gitblit v1.9.3