From 644a84c3aa37c7a702a6714418ab5296f79e027a Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 08 一月 2025 17:49:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 3 +--
Source/plt-web/plt-web-ui/src/views/system/user/index.vue | 4 ++--
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue | 14 ++++++--------
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue | 7 ++++++-
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
index a758ba7..2a3173e 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/queryDefine/index.vue
@@ -63,6 +63,7 @@
ref="dialogCrud"
:data="attrData"
:option="dialogAttrOption"
+ @select-all="selectAllHandler"
@select="selectHandler">
</avue-crud>
<span slot="footer" class="dialog-footer">
@@ -274,7 +275,10 @@
})
},
selectHandler(selection, row){
- this.dialogSelectionRow=selection
+ this.dialogSelectionRow = selection;
+ },
+ selectAllHandler(selection){
+ this.dialogSelectionRow = selection;
},
changeTemp(data) {
this.$refs.queryCrud.clearSelection();
@@ -328,6 +332,7 @@
let abNames=this.dialogSelectionRow.map(item => {
return item.id
})
+
if(abNames.length==0){
this.$message.error('璇烽�夋嫨鏌ヨ灞炴��');
return false;
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 0f567a7..4059ca0 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
@@ -9,11 +9,10 @@
width="100%"
@close="closeDialog"
>
- <el-container>
- <div style="height: 79vh;display: flex;width: 100%;">
+ <el-container style="height: 700px">
<el-aside width="17%">
<basic-container>
- <div style="height:650px;">
+ <div style="height:620px;">
<avue-tree
:data="treeData"
:loading="treeLoading"
@@ -26,7 +25,7 @@
<el-main>
<basic-container>
- <div style="height: 645px;overflow-y: auto;padding-right: 5px" @drop="drop" @dragover.prevent>
+ <div style="height: 610px;overflow-y: auto;padding-right: 5px" @drop="drop" @dragover.prevent>
<div style="display: flex;justify-content: center">
<span style="display: flex;align-items: center; margin-right: 5px;">
<p class="tableTopLabel">鍚嶇О锛�</p>
@@ -122,7 +121,7 @@
</el-row>
</el-form>
</div>
- <div style="display: flex;justify-content: center;margin-top: 15px">
+ <div style="display: flex;justify-content: center;margin-top: 15px;">
<el-button icon="el-icon-check" size="small" type="primary" @click="saveClickHandler">淇濆瓨</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="emptyClickHandler">娓呯┖
</el-button>
@@ -138,7 +137,7 @@
<el-aside width="25%">
<basic-container>
- <div style="height: 660px; overflow-y: auto;padding-right: 10px">
+ <div style="height: 600px; overflow-y: auto;padding-right: 10px">
<h3>璁剧疆</h3>
<h4 style="color: red">灞炴�ц缃俊鎭悗闇�鍗曞嚮鍙充笅瑙掑簲鐢ㄦ寜閽繘琛屽簲鐢�</h4>
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="85px">
@@ -401,12 +400,11 @@
</el-form>
</div>
<div style="display: flex;justify-content: right">
- <el-button plain size="mini" style="margin-top: 10px" type="success" @click="asideFormHandler">搴旂敤
+ <el-button plain size="mini" style="margin-top: 30px" type="success" @click="asideFormHandler">搴旂敤
</el-button>
</div>
</basic-container>
</el-aside>
- </div>
</el-container>
<!-- 娣诲姞鑷畾涔夌粍浠� -->
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 a2b6c9e..f666f83 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
@@ -1294,9 +1294,9 @@
this.$message.success(res.data.obj);
this.disabledBtn = true;
this.getTabBtnTree();
- this.basicForm = {};
this.paramsData = [];
this.dialogLoading = false;
+ this.$refs.form.resetFields();
}
}).catch(err => {
this.dialogLoading = false;
@@ -1305,7 +1305,6 @@
return false;
}
done();
- this.$refs.form.resetFields();
});
},
diff --git a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
index acf4e73..9a6a16c 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
@@ -245,8 +245,8 @@
downloadImportTemplateBtn: this.vaildData(this.permission[this.$route.query.id].DOWNLOADFILE, false),
importPersonnelBtn: this.vaildData(this.permission[this.$route.query.id].CLSRIGHT, false),
setPasswordPolicyBtn: this.vaildData(this.permission[this.$route.query.id].RIGHT, false),
- stopBtn: this.vaildData(this.permission[this.$route.query.id].UNFREZE, false),
- actionBtn: this.vaildData(this.permission[this.$route.query.id].RECYCLE, false),
+ stopBtn: this.vaildData(this.permission[this.$route.query.id].FREEZE, false),
+ actionBtn: this.vaildData(this.permission[this.$route.query.id].UNFREZE, false),
};
},
option() {
--
Gitblit v1.9.3