From 1ab798385138eb77e284433408e84a95b0ecd523 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 11:22:49 +0800
Subject: [PATCH] 2025-04-21
---
src/api/index.js | 11 ++++++++---
src/tabviews/rolemanage/index.jsx | 14 ++++++++------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 853e193..3295b09 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -61,9 +61,14 @@
return Promise.reject(response.data)
} else {
- if (response.data.ErrCode === 'E' && /姝婚攣/.test(response.data.message)) {
- response.data.message = window.GLOB.dict['server_busy'] || '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
- response.data.ErrMesg = response.data.message
+ if (response.data.ErrCode === 'E') {
+ if (/姝婚攣/.test(response.data.message)) {
+ response.data.message = window.GLOB.dict['server_busy'] || '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庨噸璇曪紒'
+ 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
diff --git a/src/tabviews/rolemanage/index.jsx b/src/tabviews/rolemanage/index.jsx
index f7b8453..f0c82ba 100644
--- a/src/tabviews/rolemanage/index.jsx
+++ b/src/tabviews/rolemanage/index.jsx
@@ -106,7 +106,8 @@
*/
getMainMenuList = async () => {
let param = {
- func: 's_rolemenu_get_FstMenu'
+ func: 's_rolemenu_get_FstMenu',
+ version: 1
}
let result = await Api.getSystemConfig(param)
@@ -116,7 +117,7 @@
loading: false,
mainMenus: result.data.map(item => {
return {
- title: item.MenuName,
+ title: item.langname ? item.MenuName + '(' + item.langname + ')' : item.MenuName,
key: item.MenuID,
children: [],
selected: true
@@ -146,7 +147,8 @@
let param = {
func: 's_rolemenu_get_FunMenu',
RoleID: selectRoleId,
- SelectedType: ''
+ SelectedType: '',
+ version: 1
}
let result = await Api.getSystemConfig(param)
@@ -162,7 +164,7 @@
// })
let _tree = this.getTree(fromJS(mainMenus).toJS(), result.data)
if (_tree[0]) {
- if (_tree[0].key === 'PC' && _tree[0].children) {
+ if (_tree[0].key.indexOf('PC') > -1 && _tree[0].children) {
// _openKeys = _tree[0].children.map(cell => cell.key)
this.getOpenNode(_tree[0].children[0], _openKeys)
} else {
@@ -215,7 +217,7 @@
this.getCheckedKeys(fromJS(menuTrees).toJS(), _initKeys)
if (menuTrees[0]) {
- if (menuTrees[0].key === 'PC' && menuTrees[0].children) {
+ if (menuTrees[0].key.indexOf('PC') > -1 && menuTrees[0].children) {
this.getOpenNode(menuTrees[0].children[0], _openKeys)
} else {
this.getOpenNode(menuTrees[0], _openKeys)
@@ -227,7 +229,7 @@
let _tree = this.getSelectTree(fromJS(menuTrees).toJS(), Keys)
if (_tree[0]) {
- if (_tree[0].key === 'PC' && _tree[0].children) {
+ if (_tree[0].key.indexOf('PC') > -1 && _tree[0].children) {
this.getOpenNode(_tree[0].children[0], _openkeys)
} else {
this.getOpenNode(_tree[0], _openkeys)
--
Gitblit v1.8.0