From 62541dd3e9ea18836bec9ab6f35d2a7b9dd1e741 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 07 六月 2024 20:17:49 +0800
Subject: [PATCH] 登录更改
---
src/views/sys/login/LoginForm.vue | 6 +-
src/views/tigerprojects/system/lowcode/normal/data.ts | 19 ++++--
src/views/sys/login/loginDept.data.ts | 2
.env.production | 9 ++-
src/store/modules/user.ts | 8 +-
src/layouts/default/header/components/appFormDept.data.ts | 8 +-
src/layouts/default/header/components/AppDept.vue | 99 +++++++++++++++++++-------------
src/views/sys/login/Login.vue | 2
8 files changed, 89 insertions(+), 64 deletions(-)
diff --git a/.env.production b/.env.production
index 489146e..6294b5d 100644
--- a/.env.production
+++ b/.env.production
@@ -13,13 +13,15 @@
# Basic interface address SPA
# VITE_GLOB_API_URL=/basic-api
# VITE_GLOB_API_URL=http://172.18.8.55:9533/api
+#VITE_GLOB_API_URL=http://172.16.80.40:9527/api
+#VITE_GLOB_SYS_API_URL=http://172.16.80.40:9527
VITE_GLOB_API_URL=http://47.115.28.255:9520/api
VITE_GLOB_SYS_API_URL=http://47.115.28.255:9520
# VITE_GLOB_API_URL=http://localhost:9527/api
#Tsk Interface address
# VITE_GLOB_TSK_API_URL=http://172.18.8.55:9533/api
-VITE_GLOB_TSK_API_URL=http://47.115.28.255:9520/api
-# VITE_GLOB_TSK_API_URL=http://localhost:9527/api
+# VITE_GLOB_TSK_API_URL=http://172.16.80.40:9527/api
+VITE_GLOB_TSK_API_URL=http://localhost:9527/api
# File upload address锛� optional
# It can be forwarded by nginx or write the actual address directly
@@ -28,6 +30,7 @@
# nginx鐢�
VITE_GLOB_UPLOAD_URL=/upload
# 涓嬭浇鍦板潃
+# VITE_GLOB_DOWNLOAD_URL=http://172.16.80.40/files
VITE_GLOB_DOWNLOAD_URL=http://47.115.28.255:8800/files
# Interface prefix
@@ -35,4 +38,4 @@
# mapKey
VITE_GLOB_MAP_KEY = 4I4BZ-HLFC4-WRLUP-XXYTX-FFHY2-DQFH4
-VITE_USE_ORG = false
+VITE_USE_ORG = 'N'
diff --git a/src/layouts/default/header/components/AppDept.vue b/src/layouts/default/header/components/AppDept.vue
index b42dfc2..6351b27 100644
--- a/src/layouts/default/header/components/AppDept.vue
+++ b/src/layouts/default/header/components/AppDept.vue
@@ -24,47 +24,64 @@
const ARow = Row;
const ACol = Col;
onMounted(async () => {
- const temp = globSetting.useOrg == 'true' ? await getTreeList() : await getProdTreeList();
+ const temp = await getProdTreeList(); //globSetting.useOrg == 'Y' ? await getTreeList() : await getProdTreeList();
const treeData = [];
const treeOption =
- globSetting.useOrg == 'true'
- ? await optionsListApi(useUserStore().getUserInfo.userId)
- : await prodListApi(useUserStore().getUserInfo.userId);
- if (globSetting.useOrg == 'true') {
- let newArr = [];
- //newArr.push(treeOption.Data.Items[0])
- for (let i = 0; i < treeOption.Data.Items.length; i++) {
- // 璁剧疆涓�涓紑鍏筹紝濡傛灉鏄痶rue锛屽氨瀛樿繘鍘伙紝涓嶆槸灏变笉瀛�
- let flag = true;
- for (let j = 0; j < newArr.length; j++) {
- // 鍘熸暟缁勫拰鏂版暟缁勪綔姣旇緝锛屽鏋滀竴鑷达紝寮�鍏冲彉涓� false
- treeOption.Data.Items[i].ORG_CODE === newArr[j].ORG_CODE ? (flag = false) : flag;
- }
- flag ? newArr.push(treeOption.Data.Items[i]) : newArr;
+ // globSetting.useOrg == 'Y'
+ // ? await optionsListApi(useUserStore().getUserInfo.userId)
+ // : await prodListApi(useUserStore().getUserInfo.userId);
+ await prodListApi(useUserStore().getUserInfo.userId);
+ let newArr = [];
+ //newArr.push(treeOption.Data.Items[0])
+ for (let i = 0; i < treeOption.Data.Items.length; i++) {
+ // 璁剧疆涓�涓紑鍏筹紝濡傛灉鏄痶rue锛屽氨瀛樿繘鍘伙紝涓嶆槸灏变笉瀛�
+ let flag = true;
+ for (let j = 0; j < newArr.length; j++) {
+ // 鍘熸暟缁勫拰鏂版暟缁勪綔姣旇緝锛屽鏋滀竴鑷达紝寮�鍏冲彉涓� false
+ treeOption.Data.Items[i].PROD_CODE === newArr[j].PROD_CODE ? (flag = false) : flag;
}
-
- newArr.map((item) => {
- let options = temp.find((obj) => obj.id == item.ORG_ID);
- treeData.push(options);
- });
- } else {
- let newArr = [];
- //newArr.push(treeOption.Data.Items[0])
- for (let i = 0; i < treeOption.Data.Items.length; i++) {
- // 璁剧疆涓�涓紑鍏筹紝濡傛灉鏄痶rue锛屽氨瀛樿繘鍘伙紝涓嶆槸灏变笉瀛�
- let flag = true;
- for (let j = 0; j < newArr.length; j++) {
- // 鍘熸暟缁勫拰鏂版暟缁勪綔姣旇緝锛屽鏋滀竴鑷达紝寮�鍏冲彉涓� false
- treeOption.Data.Items[i].PROD_CODE === newArr[j].PROD_CODE ? (flag = false) : flag;
- }
- flag ? newArr.push(treeOption.Data.Items[i]) : newArr;
- }
-
- newArr.map((item) => {
- let options = temp.find((obj) => obj.id == item.PROD_ID);
- treeData.push(options);
- });
+ flag ? newArr.push(treeOption.Data.Items[i]) : newArr;
}
+
+ newArr.map((item) => {
+ let options = temp.find((obj) => obj.id == item.PROD_ID);
+ treeData.push(options);
+ });
+ // if (globSetting.useOrg == 'Y') {
+ // let newArr = [];
+ // //newArr.push(treeOption.Data.Items[0])
+ // for (let i = 0; i < treeOption.Data.Items.length; i++) {
+ // // 璁剧疆涓�涓紑鍏筹紝濡傛灉鏄痶rue锛屽氨瀛樿繘鍘伙紝涓嶆槸灏变笉瀛�
+ // let flag = true;
+ // for (let j = 0; j < newArr.length; j++) {
+ // // 鍘熸暟缁勫拰鏂版暟缁勪綔姣旇緝锛屽鏋滀竴鑷达紝寮�鍏冲彉涓� false
+ // treeOption.Data.Items[i].ORG_CODE === newArr[j].ORG_CODE ? (flag = false) : flag;
+ // }
+ // flag ? newArr.push(treeOption.Data.Items[i]) : newArr;
+ // }
+
+ // newArr.map((item) => {
+ // let options = temp.find((obj) => obj.id == item.ORG_ID);
+ // treeData.push(options);
+ // });
+ // } else {
+ // let newArr = [];
+ // //newArr.push(treeOption.Data.Items[0])
+ // for (let i = 0; i < treeOption.Data.Items.length; i++) {
+ // // 璁剧疆涓�涓紑鍏筹紝濡傛灉鏄痶rue锛屽氨瀛樿繘鍘伙紝涓嶆槸灏变笉瀛�
+ // let flag = true;
+ // for (let j = 0; j < newArr.length; j++) {
+ // // 鍘熸暟缁勫拰鏂版暟缁勪綔姣旇緝锛屽鏋滀竴鑷达紝寮�鍏冲彉涓� false
+ // treeOption.Data.Items[i].PROD_CODE === newArr[j].PROD_CODE ? (flag = false) : flag;
+ // }
+ // flag ? newArr.push(treeOption.Data.Items[i]) : newArr;
+ // }
+
+ // newArr.map((item) => {
+ // let options = temp.find((obj) => obj.id == item.PROD_ID);
+ // treeData.push(options);
+ // });
+ // }
updateSchema([
{
@@ -73,10 +90,10 @@
},
]);
setFieldsValue({
- dept:
- globSetting.useOrg == 'true'
- ? useUserStore().getUserInfo.orgCode
- : useUserStore().getUserInfo.prodCode,
+ dept: useUserStore().getUserInfo.prodCode,
+ // globSetting.useOrg == 'Y'
+ // ? useUserStore().getUserInfo.orgCode
+ // : useUserStore().getUserInfo.prodCode,
});
});
diff --git a/src/layouts/default/header/components/appFormDept.data.ts b/src/layouts/default/header/components/appFormDept.data.ts
index 845005b..64cd2ac 100644
--- a/src/layouts/default/header/components/appFormDept.data.ts
+++ b/src/layouts/default/header/components/appFormDept.data.ts
@@ -20,10 +20,10 @@
getPopupContainer: () => document.body,
onChange: async (e) => {
const userInfo = useUserStore().getToken;
- const org =
- globSetting.useOrg == 'true'
- ? useUserStore().getUserInfo.orgCode
- : useUserStore().getUserInfo.prodCode;
+ const org = useUserStore().getUserInfo.prodCode;
+ // globSetting.useOrg == 'Y'
+ // ? useUserStore().getUserInfo.orgCode
+ // : useUserStore().getUserInfo.prodCode;
const res = await SwitchOrgCode(userInfo, e);
if (org != e) {
location.reload();
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index c68d796..69b06f4 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -143,8 +143,8 @@
changepwd: changepwd,
username: data.USER_NAME,
realName: data.USER_NAME,
- orgCode: globSetting.useOrg == 'true' ? data.ORG_CODE : '',
- prodCode: globSetting.useOrg == 'false' ? data.ORG_CODE : '',
+ orgCode: '', //globSetting.useOrg == 'Y' ? data.ORG_CODE : '',
+ prodCode: data.ORG_CODE, //globSetting.useOrg == 'N' ? data.ORG_CODE : '',
avatar: '',
roles: vUserMenu.Data.Items as unknown as iV_USER_MENU[],
};
@@ -168,8 +168,8 @@
username: data.USER_NAME,
changepwd: changepwd,
realName: data.USER_NAME,
- orgCode: globSetting.useOrg == 'true' ? data.ORG_CODE : '',
- prodCode: globSetting.useOrg == 'false' ? data.FTY_CODE : '',
+ orgCode: '', //globSetting.useOrg == 'Y' ? data.ORG_CODE : '',
+ prodCode: data.FTY_CODE, //globSetting.useOrg == 'N' ? data.FTY_CODE : '',
avatar: '',
roles: vUserMenu.Data.Items as unknown as iV_USER_MENU[],
};
diff --git a/src/views/sys/login/Login.vue b/src/views/sys/login/Login.vue
index ca6e832..27d82f4 100644
--- a/src/views/sys/login/Login.vue
+++ b/src/views/sys/login/Login.vue
@@ -22,7 +22,7 @@
class="w-1/2 -mt-16 -enter-x"
/> -->
<div class="mt-10 font-medium text-white -enter-x">
- <span class="inline-block mt-4 text-3xl"> {{ t('楦块箘浠撳偍绠＄悊WMS绯荤粺') }}</span>
+ <span class="inline-block mt-4 text-3xl"> {{ t('楦块箘MES绯荤粺') }}</span>
</div>
<div class="mt-5 font-normal text-white text-md dark:text-gray-500 -enter-x">
{{ t('鏈潵鍙 鏁板瓧鍖栨櫤閫犲钩鍙�') }}
diff --git a/src/views/sys/login/LoginForm.vue b/src/views/sys/login/LoginForm.vue
index 7136f1c..698843f 100644
--- a/src/views/sys/login/LoginForm.vue
+++ b/src/views/sys/login/LoginForm.vue
@@ -101,7 +101,7 @@
onMounted(async () => {
// getOption();
- const treeData = globSetting.useOrg == 'true' ? await getTreeList() : await getProdTreeList();
+ const treeData = await getProdTreeList(); //globSetting.useOrg == 'Y' ? await getTreeList() : await getProdTreeList();
updateSchema([
{
field: 'dept',
@@ -139,10 +139,10 @@
const accountInfo: AccountInfo = {
useR_CODE: data.account,
password: data.password,
- ORG_CODE: globSetting.useOrg == 'true' ? orgData.dept : '',
+ ORG_CODE: '', //globSetting.useOrg == 'Y' ? orgData.dept : '',
ad_info: Info.ad_info,
ip: Info.ip,
- PROD_CODE: globSetting.useOrg == 'false' ? orgData.dept : '',
+ PROD_CODE: orgData.dept, //globSetting.useOrg == 'N' ? orgData.dept : '',
};
const userInfo = await userStore.login({
diff --git a/src/views/sys/login/loginDept.data.ts b/src/views/sys/login/loginDept.data.ts
index 8e8db80..49ae8d7 100644
--- a/src/views/sys/login/loginDept.data.ts
+++ b/src/views/sys/login/loginDept.data.ts
@@ -13,7 +13,7 @@
key: 'id',
value: 'deptCode',
},
- placeholder: globSetting.useOrg == 'true' ? '璇烽�夋嫨鎹偣' : '璇烽�夋嫨宸ュ巶',
+ placeholder: '璇烽�夋嫨宸ュ巶', //globSetting.useOrg == 'Y' ? '璇烽�夋嫨鎹偣' : '璇烽�夋嫨宸ュ巶',
getPopupContainer: () => document.body,
},
rules: [
diff --git a/src/views/tigerprojects/system/lowcode/normal/data.ts b/src/views/tigerprojects/system/lowcode/normal/data.ts
index cb5b132..ee45e1a 100644
--- a/src/views/tigerprojects/system/lowcode/normal/data.ts
+++ b/src/views/tigerprojects/system/lowcode/normal/data.ts
@@ -9,6 +9,7 @@
import { DeleteEntity } from '/@/api/tigerapi/system';
import { ActionItem, BasicColumn } from '/@/components/Table';
import { useI18n } from '/@/hooks/web/useI18n';
+import { isNullOrEmpty } from '/@/utils/is';
const { t } = useI18n();
@@ -138,12 +139,16 @@
/* Select 鑷畾涔塷nChange鏂规硶 */
export function custOnChange(e: any, fnName: string, entityName: string) {
- switch (entityName) {
- case 'BAS_REASON':
- onChangeFns[fnName](e);
- break;
- default:
- break;
- (e) => {};
+ if (!isNullOrEmpty(fnName)) {
+ switch (entityName) {
+ case 'BAS_REASON':
+ onChangeFns[fnName](e);
+ break;
+ default:
+ break;
+ (e) => {};
+ }
+ } else {
+ (e) => {};
}
}
--
Gitblit v1.9.3