From d6a884f942399c1ab708f6d4f18395bc323b46c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 12 五月 2025 11:18:36 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java | 3 ---
screen/src/api/index.js | 7 +++++--
screen/src/views/LogisticsCenter.vue | 5 +++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 1 -
admin/.env.development | 5 -----
5 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index fc24b85..577bf1c 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,12 +2,7 @@
NODE_ENV = 'development'
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
-<<<<<<< HEAD
-VUE_APP_API_URL = 'http://192.168.0.100:10010'
-# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
-=======
#VUE_APP_API_URL = 'http://192.168.0.104:10010'
VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
->>>>>>> f49ead8710e093ee1d2d3ed50870497f07dee9fa
# VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
diff --git a/screen/src/api/index.js b/screen/src/api/index.js
index 3b6cfa1..9aaea42 100644
--- a/screen/src/api/index.js
+++ b/screen/src/api/index.js
@@ -4,6 +4,9 @@
export const getStorecenterData = (data) => {
return request('visitsAdmin/cloudService/board/api/wholeProvince/centerData', data)
}
+export const getStorecenterDataNew = (data) => {
+ return request('visitsAdmin/cloudService/board/api/wholeProvince/centerDataNew', data)
+}
// 搴撳埗绠＄悊鐪嬫澘 搴撳瓨鍒╃敤鐜�
export const getStoreenergyDataList = (data) => {
return request('visitsAdmin/cloudService/board/api/wholeProvince/energyDataList', data)
@@ -24,7 +27,7 @@
export const kzorderInfo = (data) => {
return request('visitsAdmin/cloudService/board/api/wholeProvince/orderInfo', data, 'POST')
}
-//
+//
// 搴撳埗绠＄悊鐪嬫澘 绱鍑哄簱閲�
export const kztotalOutQtyNum = (data) => {
return request('visitsAdmin/cloudService/board/api/wholeProvince/totalOutQtyNum', data)
@@ -217,4 +220,4 @@
// 鑳借�楃湅鏉� 瀹炴椂璐熻嵎鏇茬嚎
export const regionDataRanking = (data) => {
return request('visitsAdmin/cloudService/board/api/energy/regionDataRanking', data)
-}
\ No newline at end of file
+}
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index ff1b012..54ad031 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -526,6 +526,7 @@
import {
getStoreOperationList,
getStorecenterData,
+ getStorecenterDataNew,
getStoreenergyDataList,
getStorelastMonthOil,
getStoreTaskList,
@@ -825,7 +826,7 @@
end: 40, // 缁撴潫浣嶇疆锛堢櫨鍒嗘瘮锛夛紝鎺у埗鍒濆鏄剧ず鑼冨洿
width: 1,
backgroundColor: '#04141d', // 婊戝姩鏉¤儗鏅壊
- // dataBackground: 'none',
+ // dataBackground: 'none',
dataBackground: {
areaStyle: { opacity: 0 }, // 璁剧疆鑳屾櫙閫忔槑
lineStyle: { opacity: 0 } // 璁剧疆鑳屾櫙閫忔槑
@@ -1262,7 +1263,7 @@
}
// footer
const getData3 = () => {
- getStorecenterData({
+ getStorecenterDataNew({
factoryCode: activeCity.value.code
}).then(res => {
const obj = res.data || {}
diff --git a/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
index 9c192ae..c4a95c9 100644
--- a/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
@@ -30,7 +30,6 @@
@Service
@Slf4j
public class TmsServiceImpl implements TmsService {
-
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
@@ -47,12 +46,10 @@
public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(TmsLockStatusQueryRequest param){
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ TMSContants.InterfacePath.getElecByContractNumberList[0];
-
TmsBaseResponse<List<TmsLockStatusQueryResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getElecByContractNumberList[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<List<TmsLockStatusQueryResponse>>>(){});
return response;
}
-
/**
* 杩愯緭鍗昰is杞ㄨ抗
* 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠斤紝闈為渶瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index eb2fe8c..fb603d3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -2696,7 +2696,6 @@
}
}
}
-
}
private boolean notInList(String transportCode, List<String> planCodes) {
--
Gitblit v1.9.3