From deb9457cbf67185699de2cd6dbc1ec5690584da0 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 06 九月 2024 12:30:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
index cecfaa4..276a7f3 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
@@ -14,12 +14,12 @@
</el-button>
<el-button icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
</el-button>
- <el-button plain size="small" style="width: 100px;text-align: center" type="primary"
+ <el-button class="smallBtn" plain size="small" type="primary"
@click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
</el-button>
</div>
<!-- 宸︿晶鏍� -->
- <div style="height: calc(100vh - 300px);">
+ <div style="height: calc(100vh - 260px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
@@ -305,7 +305,6 @@
//宸︿晶鏍戞煡璇�
getTreeList() {
getVersionRuleAllList().then(res => {
- console.log(res);
const data = res.data.data;
this.treeData = data;
}).catch(err => {
@@ -355,17 +354,22 @@
// 鏂板 缂栬緫 淇濆瓨
addSaveHandler() {
const saveFunction = this.dialogTitle === 'add' ? addVersionRule : updateVersionRule;
-
- saveFunction(this.form).then(res => {
- if (res.data.code === 200) {
- this.$message.success(res.data.obj);
- this.getTreeList();
- this.visible = false;
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ saveFunction(this.form).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTreeList();
+ this.visible = false;
+ } else {
+ this.$message.error(res.data.obj);
+ }
+ }).catch(error => {
+ this.$message.error(error);
+ });
} else {
- this.$message.error(res.data.obj);
+ return false;
}
- }).catch(error => {
- this.$message.error(error);
});
},
@@ -442,7 +446,7 @@
}
;
- this.checkViewData = this.checkViewData.filter(item => {
+ this.checkViewData = this.checkViewDataSearch.filter(item => {
return item.source && item.source.includes(source);
});
@@ -463,6 +467,13 @@
.el-scrollbar__wrap {
overflow: auto !important;
}
+
+ .headerCon {
+ .el-button {
+ width: 82px;
+ }
+ }
+
}
.headerCon {
@@ -487,4 +498,10 @@
margin-left: 0;
}
+.smallBtn {
+ width: 82px;
+ text-align: center;
+ padding-left: 4.5px;
+}
+
</style>
--
Gitblit v1.9.3