From 83aa382fd3b88ec7a564f14d41a9c8e5d43beeb3 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 09 十二月 2024 10:26:31 +0800
Subject: [PATCH] 修改表单定义样式&&修改ui上下文btmName&&添加登录密码即将过期进入首页并提醒
---
Source/plt-web/plt-web-ui/src/App.vue | 5 +
Source/plt-web/plt-web-ui/src/components/actions/handlers.js | 4 +
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue | 8 ++
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue | 13 +--
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 67 ++++++++++++++--------
Source/plt-web/plt-web-ui/src/page/login/userlogin.vue | 11 +++
Source/plt-web/plt-web-ui/src/components/actions/base/downloadFileAction.js | 5 +
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue | 8 --
Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 1
Source/plt-web/plt-web-ui/src/store/modules/user.js | 2
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue | 2
11 files changed, 78 insertions(+), 48 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/App.vue b/Source/plt-web/plt-web-ui/src/App.vue
index 69d8872..cc762d6 100644
--- a/Source/plt-web/plt-web-ui/src/App.vue
+++ b/Source/plt-web/plt-web-ui/src/App.vue
@@ -180,6 +180,11 @@
margin-bottom: 10px;
}
+.avue-group__header{
+ height: 20px;
+ line-height: 20px;
+}
+
.font14{font-size: 14px;width: 12px;height: 12px;display: inline-block;}
.font16{font-size: 16px;width: 14px;height: 14px;display: inline-block;}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/components/actions/base/downloadFileAction.js b/Source/plt-web/plt-web-ui/src/components/actions/base/downloadFileAction.js
index 6653a21..7f2a751 100644
--- a/Source/plt-web/plt-web-ui/src/components/actions/base/downloadFileAction.js
+++ b/Source/plt-web/plt-web-ui/src/components/actions/base/downloadFileAction.js
@@ -39,9 +39,12 @@
let data = new FormData();
data.append('fileOid',oids);
download(data).then(res => {
- if (res) {
+ console.log('res',res);
+ if (res.data.code == 200) {
func.downloadFileByBlobHandler(res);
Vue.prototype.$message.success("涓嬭浇鎴愬姛");
+ }else {
+ Vue.prototype.$message.error("涓嬭浇澶辫触锛岃妫�鏌ョ綉缁滆姹傦紒");
}
}).catch(err => {
console.log(err);
diff --git a/Source/plt-web/plt-web-ui/src/components/actions/handlers.js b/Source/plt-web/plt-web-ui/src/components/actions/handlers.js
index c2c1361..b07b742 100644
--- a/Source/plt-web/plt-web-ui/src/components/actions/handlers.js
+++ b/Source/plt-web/plt-web-ui/src/components/actions/handlers.js
@@ -43,6 +43,10 @@
downloadfile: () => {import("@/components/actions/base/downloadFileAction").then(module => {
module.doAction(options,callback);
})},
+ //涓嬭浇鏂囦欢
+ downloadfiles: () => {import("@/components/actions/base/downloadFileAction").then(module => {
+ module.doAction(options,callback);
+ })},
uprevision: () => {import("@/components/actions/base/upRevisionAction").then(module => {
module.doAction(options,callback);
})}
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
index 9b5b6fe..90313c3 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
@@ -242,7 +242,13 @@
if (parentOid != 0 && parentOid.indexOf('@vcitreesep@') > -1) {
parentOid = parentOid.split('@vcitreesep@')[1];
}
- const parentBtmName = (node.level === 0) ? '' : (node.data.attributes.part.btmName || node.data.attributes.btmName);
+
+ const parentBtmName = (node.level === 0)
+ ? ''
+ : (node.data.attributes.part && node.data.attributes.part.btmname)
+ || (node.data.attributes.folder && node.data.attributes.folder.btmname)
+ || (node.data.attributes && node.data.attributes.btmname)
+ || '';
const params = this.params;
let url='';debugger;
if(this.componentVO.bsCustQueryCLsOrUrl && this.componentVO.bsCustQueryCLsOrUrl.indexOf('/')!=-1){
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 9a672e3..00bf9eb 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
@@ -230,13 +230,20 @@
});
this.$store.dispatch("LoginByUsername", this.loginForm).then((data) => {
if (data.obj.failCode !== 'loginSuccess') {
- // console.log('data', data);
+ if (data.obj.failCode === 'passwordRemainDay') {
+ this.$message.warning(data.obj.passwordInfo);
+ this.$router.push({path: this.tagWel.value});
+ loading.close();
+ return;
+ }
+
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;
}
@@ -294,7 +301,7 @@
this.passwordVisible = false;
this.$refs.changeForm.resetFields();
this.$store.dispatch("LoginByUsername", {...this.loginForm, password: form.confirmPassword}).then(data => {
- if (data.obj.failCode !== 'loginSuccess') {
+ if (data.obj.failCode !== 'loginSuccess' && data.obj.failCode !== 'passwordRemainDay') {
this.$message.error(data.msg);
}
this.$router.push({path: this.tagWel.value});
diff --git a/Source/plt-web/plt-web-ui/src/store/modules/user.js b/Source/plt-web/plt-web-ui/src/store/modules/user.js
index e6e7fba..da2ef54 100644
--- a/Source/plt-web/plt-web-ui/src/store/modules/user.js
+++ b/Source/plt-web/plt-web-ui/src/store/modules/user.js
@@ -66,7 +66,7 @@
let passwordDes = func.encryptData(userInfo.password, 'daliantan0v0vcip')
loginByUsername(userInfo.deptId, userInfo.roleId, userInfo.username, passwordDes, userInfo.type, userInfo.key,).then(res => {
const data = res.data;
- if (data.obj.failCode === 'loginSuccess') {
+ if (data.obj.failCode === 'loginSuccess' || data.obj.failCode === 'passwordRemainDay') {
commit('SET_TOKEN', data.obj.tokenVO.accessToken);
commit('SET_REFRESH_TOKEN', data.obj.tokenVO.accessToken);
commit('DEL_ALL_TAG');
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
index a658870..f67bc3d 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
@@ -852,7 +852,6 @@
children: 'childNodes',
},
treeLoad: (node, resolve) => {
- // console.log(node);
const params = {
'conditionMap[dataType]': node.data.data,
'conditionMap[parentId]': node.data.data,
@@ -1244,7 +1243,6 @@
// 閫夐」琛ㄦ牸琛岀偣鍑�
optionTableClick(row) {
this.optionRow = row;
- console.log(row);
},
customOptionTableClick(row) {
@@ -1288,7 +1286,6 @@
// 閫夐」鍒犻櫎
optionDeleteClickHandler(val) {
- // console.log(this.optionRow);
if (val === 'dialog') {
this.customForm.itemKeyValueList.splice(this.customOptionRow.index,1);
} else {
@@ -1426,7 +1423,6 @@
this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹繘琛屼繚瀛�');
return;
}
- // console.log(this.customAttrRow)
this.customForm.text = this.customAttrRow.id;
this.customAttrVisible = false;
},
@@ -1438,11 +1434,9 @@
return;
}
-
this.formList = this.formList.map(item =>
item.text === this.form.text ? this.form : item
);
- console.log(this.formList);
this.$message.success('搴旂敤鎴愬姛');
},
@@ -1500,13 +1494,11 @@
return `${key}=${oids.join(',')}`; // 鐢� , 杩炴帴鍚屼竴绫诲瀷鐨� oid
}).join('&&'); // 鏈�鍚庣敤 && 杩炴帴涓嶅悓绫诲瀷
- // console.log(resultString);
if (this.authType === 'attr') {
this.customForm.itemRight = resultString;
} else {
this.form.itemRight = resultString;
}
- // this.form.itemRight = resultString;
this.authDialogClose();
}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue
index cf44428..ec0dabf 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue
@@ -438,7 +438,6 @@
// 琛ㄥ崟閫夋嫨change浜嬩欢
formSelectChange(val) {
- // console.log(val);
this.form.itemOutFieldList = [];
this.form.itemKeyFieldList = [];
this.form.itemFieldWidthList = [];
@@ -551,7 +550,6 @@
viTypeText: "琛ㄦ牸"
}
savePortalVI(params).then(res => {
- // console.log(params);
if (res.data.code === 200) {
this.$message.success(res.data.obj);
// this.closeDialog();
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
index e54efd7..83f30a9 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
@@ -66,7 +66,8 @@
</avue-crud>
</basic-container>
</el-main>
- <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :editRow="editRow" :treeRadio="treeRadio" @updataTable="getRightPortalVIDatas"></form-dialog>
+ <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :editRow="editRow" :treeRadio="treeRadio"
+ @updataTable="getRightPortalVIDatas"></form-dialog>
<table-dialog ref="tableDialog" :TreeNodeRow="this.nodeRow" :treeRadio="treeRadio"
@updataTable="getRightPortalVIDatas"></table-dialog>
<!-- 瀵煎叆 -->
@@ -311,7 +312,6 @@
// 缂栬緫鎸夐挳
editBtnClick(row) {
- console.log('row', row);
// 琛ㄦ牸
if (row.viType === 0) {
const params = {
@@ -330,14 +330,14 @@
// 鏇存柊琛ㄥ崟
this.$refs.tableDialog.form = {
...prmItem,
- itemFieldWidthList:prmItem.itemFieldWidthList.map(item => {
- return{
+ itemFieldWidthList: prmItem.itemFieldWidthList.map(item => {
+ return {
...item,
$cellEdit: true,
}
}),
viName: res.data.obj.viName,
- itemQtName:res.data.obj.prm.formQtName,
+ itemQtName: res.data.obj.prm.formQtName,
editNodeId: row.id,
itemOutFieldList: (prmItem.itemOutFieldList || []),
itemSearchFieldList: (prmItem.itemSearchFieldList || []).map(item => ({id: item})),
@@ -379,7 +379,6 @@
this.$refs.formDialog.topForm.itemQtName = res.data.obj.prm.formQtName;
this.$refs.formDialog.topForm.columnNumber = this.getValueBasedOnInput(res.data.obj.prm.showCols);
this.$refs.formDialog.topForm.showColumn = res.data.obj.prm.showCols;
-
this.$refs.formDialog.visible = true;
}
})
@@ -521,7 +520,6 @@
// 鍏嬮殕鏍戠偣鍑�
cloneTreeNodeClick(row) {
- console.log(row);
this.cloneTreeNode = row;
},
@@ -577,7 +575,6 @@
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
}).then(({value}) => {
- console.log(obj);
const params = {
clonePortalVIDTOList: [
{
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 b035270..c1df775 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
@@ -414,6 +414,7 @@
data: [],
option: {
...basicOption,
+ size:'mini',
height: this.height,
addBtn: false,
index: true,
@@ -424,6 +425,7 @@
{
label: '鍚嶇О',
prop: 'name',
+ labelWidth: 110,
rules: [
{
required: true,
@@ -435,6 +437,7 @@
{
label: '缂栧彿',
prop: 'seq',
+ labelWidth: 110,
hide: false,
rules: [
{
@@ -448,17 +451,25 @@
label: '',
prop: 'uiParser',
hide: true,
- labelWidth: 100,
+ labelWidth: 110,
},
{
label: '',
prop: 'extAttr',
hide: true,
+ labelWidth: 110,
+ },
+ {
+ label: '鎻忚堪',
+ prop: 'description',
+ labelWidth: 110,
+ hide: false,
},
{
label: '妯℃澘绫诲瀷',
prop: 'templateType',
type: 'radio',
+ labelWidth: 110,
span: 24,
value: '1',
dicData: [
@@ -517,6 +528,7 @@
label: '鏄剧ず绫诲瀷',
prop: 'navigatorType',
type: 'radio',
+ labelWidth: 110,
span: 24,
value: '1',
hide: true,
@@ -539,6 +551,7 @@
label: '鎼滅储绫诲瀷',
prop: 'searchTarger',
display: true,
+ labelWidth: 110,
type: 'radio',
value: '1',
span: 24,
@@ -573,22 +586,19 @@
}
}
},
- {
- label: '鎻忚堪',
- prop: 'description',
- display: false
- },
],
group: [
{
- label: '',
- arrow: false,
+ icon:'el-icon-info',
+ label:'',
+ arrow: true,
prop: 'group1',
column: [
{
label: '婧愬璞�',
prop: 'showType',
type: 'select',
+ labelWidth: 115,
cascader: ['linkType', 'SubUILayout', 'searchObjType'],
placeholder: "璇疯緭鍏ュ唴瀹�",
dicUrl: '/api/uiManagerController/getBtmDatasByPage?page=1&limit=-1',
@@ -638,6 +648,7 @@
prop: 'linkType',
type: 'select',
display: false,
+ labelWidth: 115,
filterable: true,
props: {
label: 'name',
@@ -670,6 +681,7 @@
{
label: '閫夋嫨妯℃澘',
prop: 'templateId',
+ labelWidth: 115,
display: false,
formslot: true,
rules: [
@@ -684,6 +696,7 @@
label: 'UI瀹氫箟',
prop: 'SubUILayout',
type: 'select',
+ labelWidth: 115,
filterable: true,
display: false,
props: {
@@ -698,6 +711,7 @@
display: false,
value: '1',
type: 'radio',
+ labelWidth: 115,
span: 24,
dicData: [
{
@@ -715,7 +729,7 @@
prop: 'searchObjType',
type: 'select',
display: false,
- labelWidth: 100,
+ labelWidth: 115,
props: {
label: 'qtName',
value: 'qtName',
@@ -726,6 +740,7 @@
{
label: '鏌ヨ妯℃澘',
prop: 'queryTemplateName',
+ labelWidth: 115,
type: 'select',
display: false,
formslot: true,
@@ -733,6 +748,7 @@
{
label: '鎺у埗璺緞',
prop: 'controlPath',
+ labelWidth: 115,
display: false,
type: 'textarea',
span: 24,
@@ -741,18 +757,20 @@
{
label: '鏍戠粨鏋勫睍寮�鍒�',
prop: 'expandCols',
- labelWidth: 110,
+ labelWidth: 115,
display: false,
span: 12
},
{
label: '鍙傜収鏍戣缃�',
prop: 'showLinkAbs',
+ labelWidth: 115,
display: false,
},
{
label: '鍒嗛殧绗�',
prop: 'separator',
+ labelWidth: 115,
display: false,
},
{
@@ -760,6 +778,7 @@
prop: 'expandMode',
display: false,
type: 'radio',
+ labelWidth: 115,
value: '1',
dicData: [
{
@@ -773,20 +792,6 @@
]
},
{
- label: '鏍硅妭鐐规樉绀鸿〃杈惧紡',
- prop: 'rootContent',
- display: false,
- labelWidth: 135,
- span: 12
- },
- {
- label: '鏍戣妭鐐规樉绀鸿〃杈惧紡',
- prop: 'showAbs',
- display: false,
- labelWidth: 135,
- span: 12
- },
- {
label: 'B/S鑷畾涔夋煡璇�',
prop: 'bsCustQueryCLsOrUrl',
display: false,
@@ -800,6 +805,20 @@
labelWidth: 115,
span: 12
},
+ {
+ label: '鏍硅妭鐐规樉绀鸿〃杈惧紡',
+ prop: 'rootContent',
+ display: false,
+ labelWidth: 135,
+ span: 12
+ },
+ {
+ label: '鏍戣妭鐐规樉绀鸿〃杈惧紡',
+ prop: 'showAbs',
+ display: false,
+ labelWidth: 135,
+ span: 12
+ },
]
},
{
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
index 73aa2b8..9d4f253 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
@@ -504,7 +504,6 @@
operId: this.form.operId
}
delFuncOperation(params).then(res => {
- console.log(res);
if (res.data.code === 200) {
this.$message.success(res.data.msg);
this.handleRefreshTree('del');
--
Gitblit v1.9.3