From 0c7005a79b6dfccc2d25d98defb350de99c672d2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 十一月 2024 16:22:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 5 ++---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue | 2 +-
Source/plt-web/plt-web-ui/src/page/login/userlogin.vue | 9 +++++++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue b/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
index ccb8660..be0f7a6 100644
--- a/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
+++ b/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
@@ -227,6 +227,11 @@
this.$store.dispatch("LoginByUsername", this.loginForm).then((data) => {
if (data.obj.failCode !== 'loginSuccess') {
// console.log('data', data);
+ if (data.obj.failCode === 'userIsLocked') {
+ this.$message.error(`鐧诲綍閿欒娆℃暟杩囧锛岃处鍙疯閿佸畾銆�${data.obj.failMsgArray[0]}銆戝垎閽焋);
+ loading.close();
+ return;
+ }
this.$message.error(data.msg);
if (data.obj.mustChangePassword) {
this.passwordVisible = true;
@@ -245,8 +250,8 @@
});
return false;
}
- }
- ;
+ };
+
this.$router.push({path: this.tagWel.value});
loading.close();
}).catch((err) => {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
index 71d89b0..745726b 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
@@ -82,7 +82,7 @@
lastIndex: null,
selectList: [],
data: [],
- option: {
+ option: {
...basicOption,
addBtn: false,
height: 420,
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
index 87fbb81..e78aadb 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
@@ -8,10 +8,8 @@
:data="data"
:option="option"
:table-loading="tableLoading"
- @row-del="rowDelHandler"
@row-save="rowSaveHandler"
@row-update="rowUpdateHandler"
- @refresh-change="handleRefresh"
@selection-change="selectChangeHandler"
@row-click="rowClickHandler">
<template slot="menuLeft" slot-scope="scope">
@@ -1061,7 +1059,7 @@
// 鎸夐挳璁捐淇℃伅鍙傛暟淇℃伅淇敼
paramsRowEditHandler(row) {
- this.$refs.paramsCrud.rowEdit(row);
+ this.$refs.paramsCrud.rowEdit(row,row.$index);
},
// 鎸夐挳璁捐鍙傛暟淇℃伅娣诲姞鎸夐挳
@@ -1071,6 +1069,7 @@
// 鎸夐挳璁捐鍙傛暟淇℃伅淇敼淇濆瓨
paramsRowUpdate(row, index, done, loading) {
+ console.log(row,index);
this.paramsData.splice(index, 1, row);
done();
},
--
Gitblit v1.9.3