From 6c170b6b427f0882da35957e73f385d318970a06 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 25 十月 2024 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue | 95 ++++++++++++++++++++++++++++++-----------------
1 files changed, 60 insertions(+), 35 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
index 5a5c1e1..3971d0f 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
@@ -64,8 +64,8 @@
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button size="small" @click="addVisibleClose">鍙� 娑�</el-button>
<el-button size="small" type="primary" @click="addSaveClickHandler">纭� 瀹�</el-button>
+ <el-button size="small" @click="addVisibleClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -114,6 +114,7 @@
addBtn: false,
editBtn: false,
delBtn: false,
+ calcHeight: -50,
column: [
{
label: '鍚嶇О',
@@ -306,24 +307,35 @@
ids: row.id,
isConfCategorys: this.nodeRow.id === 'firstNode' ? true : false
}
- getAppConfigCategoryInfo(params).then(res => {
- console.log(res)
- if (res.data.code === 200) {
- this.$message.success('鍒犻櫎鎴愬姛');
- if (this.nodeRow.id === 'firstNode') {
- this.getTreeList('save');
- } else {
- this.configLoading = true;
- getAppConfigDetailsByID({clsId: this.nodeRow.id}).then(res => {
- if (res.data.code === 200) {
- const data = res.data.data;
- this.configData = data;
- this.configLoading = false;
- }
- })
+ this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎褰撳墠鏁版嵁鍚楋紵', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ getAppConfigCategoryInfo(params).then(res => {
+ console.log(res)
+ if (res.data.code === 200) {
+ this.$message.success('鍒犻櫎鎴愬姛');
+ if (this.nodeRow.id === 'firstNode') {
+ this.getTreeList('save');
+ } else {
+ this.configLoading = true;
+ getAppConfigDetailsByID({clsId: this.nodeRow.id}).then(res => {
+ if (res.data.code === 200) {
+ const data = res.data.data;
+ this.configData = data;
+ this.configLoading = false;
+ }
+ })
+ }
}
- }
- })
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
},
// 閫夋嫨妗�
@@ -352,30 +364,43 @@
this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
return;
}
+
const params = {
ids: this.selectList.map(item => {
return item.id
}).join(','),
isConfCategorys: this.nodeRow.id === 'firstNode' ? true : false
}
- getAppConfigCategoryInfo(params).then(res => {
- console.log(res)
- if (res.data.code === 200) {
- this.$message.success('鍒犻櫎鎴愬姛');
- if (this.nodeRow.id === 'firstNode') {
- this.getTreeList('save');
- } else {
- this.configLoading = true;
- getAppConfigDetailsByID({clsId: this.nodeRow.id}).then(res => {
- if (res.data.code === 200) {
- const data = res.data.data;
- this.configData = data;
- this.configLoading = false;
- }
- })
+
+ this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎褰撳墠鏁版嵁鍚楋紵', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ getAppConfigCategoryInfo(params).then(res => {
+ console.log(res)
+ if (res.data.code === 200) {
+ this.$message.success('鍒犻櫎鎴愬姛');
+ if (this.nodeRow.id === 'firstNode') {
+ this.getTreeList('save');
+ } else {
+ this.configLoading = true;
+ getAppConfigDetailsByID({clsId: this.nodeRow.id}).then(res => {
+ if (res.data.code === 200) {
+ const data = res.data.data;
+ this.configData = data;
+ this.configLoading = false;
+ }
+ })
+ }
}
- }
- })
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
},
// 瀵煎嚭鎸夐挳
--
Gitblit v1.9.3