From 0d57ab3ae352b19e96b8f69063b432087d63aa12 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 15 三月 2024 16:13:04 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/App.jsx | 4 ++--
zy-asrs-flow/src/locales/en-US.ts | 1 +
zy-asrs-flow/src/pages/map/index.css | 7 ++++++-
zy-asrs-flow/src/pages/map/index.jsx | 4 +++-
zy-asrs-flow/src/config/setting.ts | 2 ++
zy-asrs-flow/src/pages/map/utils.js | 14 +++++++++++---
6 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-flow/src/App.jsx b/zy-asrs-flow/src/App.jsx
index 9283200..84866e2 100644
--- a/zy-asrs-flow/src/App.jsx
+++ b/zy-asrs-flow/src/App.jsx
@@ -8,7 +8,7 @@
import { getRemoteMenu, getRoutersInfo, getUserInfo, setRemoteMenu, patchRouteWithRemoteMenus } from './services/route';
import { getToken, setToken } from '@/utils/token-util'
import { TOKEN_HEADER_NAME, TOKEN_STORE_NAME } from '@/config/setting';
-import { API_BASE_URL } from '@/config/setting'
+import { API_BASE_URL, API_TIMEOUT } from '@/config/setting'
import { message } from 'antd';
import logo from '../public/img/logo.png'
@@ -231,7 +231,7 @@
export const request = {
baseURL: API_BASE_URL,
...errorConfig,
- timeout: 60000,
+ timeout: API_TIMEOUT * 1000,
// 鍓嶇疆瀹堝崼
requestInterceptors: [
(url, options) => {
diff --git a/zy-asrs-flow/src/config/setting.ts b/zy-asrs-flow/src/config/setting.ts
index 32a86f4..0d5a234 100644
--- a/zy-asrs-flow/src/config/setting.ts
+++ b/zy-asrs-flow/src/config/setting.ts
@@ -1,6 +1,8 @@
// 鎺ュ彛鍦板潃
export const API_BASE_URL: string = 'http://127.0.0.1:9090/wcs';
+export const API_TIMEOUT: number = 60;
+
// 椤圭洰鍚嶇О
export const PROJECT_NAME: string = 'admin';
diff --git a/zy-asrs-flow/src/locales/en-US.ts b/zy-asrs-flow/src/locales/en-US.ts
index 43ecd35..61f4e4e 100644
--- a/zy-asrs-flow/src/locales/en-US.ts
+++ b/zy-asrs-flow/src/locales/en-US.ts
@@ -23,6 +23,7 @@
'common.fail':'Fail',
'common.account.logout': 'Logout',
'common.search.placeholder': 'Please enter search content',
+ 'common.loading.api.message': 'Calling Server...',
'':'',
'':'',
'':'',
diff --git a/zy-asrs-flow/src/pages/map/index.css b/zy-asrs-flow/src/pages/map/index.css
index 1ed283a..e67eaad 100644
--- a/zy-asrs-flow/src/pages/map/index.css
+++ b/zy-asrs-flow/src/pages/map/index.css
@@ -24,10 +24,15 @@
border-radius: 0px !important;
}
+.map-header-button {
+ border-radius: 0px !important;
+ font-weight: bolder !important;
+}
+
.map-header-select.ant-select .ant-select-selector .ant-select-selection-item {
font-weight: bolder !important;
}
.map-header-select .ant-select-selector .ant-select-selection-search .ant-select-selection-search-input {
font-weight: bolder !important;
-}
+}
\ No newline at end of file
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 5995c7c..8972227 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -241,8 +241,10 @@
{model !== MapModel.OBSERVER_MODEL && (
<>
<Button
+ className='map-header-button'
+ size={'large'}
onClick={() => {
- Utils.saveMapData();
+ Utils.saveMapData(intl);
}}
>
<FormattedMessage id='map.save' defaultMessage='淇濆瓨鍦板浘' />
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index ae5567b..5efdc3b 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -1,6 +1,8 @@
import * as PIXI from 'pixi.js';
import * as TWEEDLE from 'tweedle.js';
import Http from '@/utils/http';
+import { message } from 'antd';
+import { API_TIMEOUT } from '@/config/setting'
let app = null;
let mapContainer = null;
@@ -317,7 +319,7 @@
}
-export const saveMapData = async () => {
+export const saveMapData = async (intl) => {
if (!mapContainer) {
return;
}
@@ -342,6 +344,12 @@
}
})
- const resp = await Http.doPost('api/map/save', { itemList: mapItemList })
- console.log(resp);
+ const closeLoading = message.loading({ content: intl.formatMessage({ id: 'common.loading.api.message', defaultMessage: '绛夊緟鏈嶅姟鍣�......' }), duration: API_TIMEOUT });
+ await Http.doPostPromise('api/map/save', { itemList: mapItemList }, (res) => {
+ closeLoading();
+ console.log(res);
+ }).catch((error) => {
+ closeLoading();
+ console.error(error);
+ })
}
\ No newline at end of file
--
Gitblit v1.9.1