From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 37f14a6..215737f 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -48,10 +48,12 @@
okText: '鐭ラ亾浜�',
onOk: () => {
window.GLOB.$error = false
- sessionStorage.clear()
- if (!!(window.history && window.history.pushState)) {
- window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
- window.location.reload()
+ if (!/#\/login/.test(window.location.href)) {
+ sessionStorage.clear()
+ if (!!(window.history && window.history.pushState)) {
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ }
}
}
})
@@ -59,6 +61,15 @@
return Promise.reject(response.data)
} else {
+ if (response.data.ErrCode === 'E') {
+ if (/姝婚攣|灏氭湭浠庢睜涓幏鍙栬繛鎺�/.test(response.data.message)) {
+ response.data.message = (window.GLOB.dict['server_busy'] || '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒') + (/姝婚攣/.test(response.data.message) ? '01' : '02')
+ response.data.ErrMesg = response.data.message
+ } else if (/鏃犳硶鎵撳紑鐧诲綍鎵�璇锋眰鐨勬暟鎹簱|鍦ㄤ笌\s*SQL\s+Server\s*寤虹珛杩炴帴鏃跺嚭鐜�/.test(response.data.message)) {
+ response.data.message = '鏈嶅姟鍣ㄩ摼鎺ヤ笉鍙敤锛岃鍏抽棴娴忚鍣ㄩ噸鏂版墦寮�锛�'
+ response.data.ErrMesg = response.data.message
+ }
+ }
if (response.config.requestId) {
response.data.$requestId = response.config.requestId
}
@@ -67,7 +78,15 @@
}, (error) => {
let response = error.response || ''
- if (response && response.status) {
+ if (!response) {
+ notification.error({
+ className: 'notification-custom-error',
+ bottom: 0,
+ message: error.message.includes('Network Error') && sessionStorage.getItem('lang') === 'zh-CN' ? '缃戠粶杩炴帴澶辫触锛�' : error.message,
+ placement: 'bottomRight',
+ duration: 15
+ })
+ } else if (response && response.status) {
notification.error({
className: 'notification-custom-error',
bottom: 0,
@@ -121,6 +140,17 @@
url: `/webapi/dostar${param.func ? '/' + param.func : ''}`,
method: 'post',
data: JSON.stringify(param)
+ })
+ }
+
+ /**
+ * @description 鑰佺郴缁熺櫥褰�
+ */
+ loginAndRedirect (param) {
+ return axios({
+ url: document.location.origin + '/zh-CN/Home/LoginAndRedirect',
+ method: 'post',
+ data: qs.stringify(param)
})
}
@@ -250,7 +280,8 @@
login_id_address: sessionStorage.getItem('ipAddress') || '',
kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
device_id: localStorage.getItem('SessionUid'),
- appkey: window.GLOB.appkey || ''
+ appkey: window.GLOB.appkey || '',
+ lang: sessionStorage.getItem('lang') || ''
}
let url = '/webapi/dologon'
@@ -288,7 +319,8 @@
kei_id: window.btoa(window.encodeURIComponent(window.GLOB.host)),
device_id: localStorage.getItem('SessionUid'),
timestamp: moment().add(shim, 'seconds').format('YYYY-MM-DD HH:mm:ss'),
- appkey: window.GLOB.appkey || ''
+ appkey: window.GLOB.appkey || '',
+ lang: sessionStorage.getItem('lang') || ''
}
// Type: 'S' 鏃�
@@ -1061,6 +1093,14 @@
param.data_md5 = param.data_md5 || ''
param.time_limit = param.time_limit || 0
+ param.data.forEach(item => {
+ item.exps.forEach(cell => {
+ if (typeof(cell.value) === 'number') {
+ cell.value = cell.value + ''
+ }
+ })
+ })
+
param = this.encryptParam(param)
return new Promise((resolve) => {
@@ -1085,8 +1125,9 @@
res.ErrCode = '-2'
MKEmitter.emit('reloadTabs')
} else if (res.message === 'permission deny') {
- res.message = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�'
- res.ErrMesg = window.GLOB.dict['permission_deny'] || '鏃犲綋鍓嶈彍鍗曟垨鎸夐挳鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛�'
+ let isBtn = url.indexOf('s_TableData_InUpDe') > -1
+ res.message = window.GLOB.dict['permission_deny'] || `鏃犲綋鍓�${isBtn ? '鎸夐挳' : '鑿滃崟'}鐨勮闂潈闄愶紝璇疯仈绯荤鐞嗗憳锛乣
+ res.ErrMesg = res.message
}
}
resolve(res)
--
Gitblit v1.8.0