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/modelingMenu/modeling/linkType/index.vue | 186 ++++++++++++++++++++--------------------------
1 files changed, 82 insertions(+), 104 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
index aa5e091..122f429 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue
@@ -2,30 +2,9 @@
<el-container v-loading="createViewLoading">
<el-aside>
<basic-container>
- <div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
- <div class="headerCon">
- <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓
- </el-button>
- <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editClickHandler">淇敼
- </el-button>
- <el-button icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">鍒犻櫎
- </el-button>
- <el-button icon="el-icon-view" plain size="small" type="primary">鏌ョ湅
- </el-button>
- <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭
- </el-button>
- <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆
- </el-button>
- <el-button class="smallBtn" icon="el-icon-circle-plus-outline" plain size="small"
- style="padding-left: 7px !important;"
- type="primary" @click="createViewClickHandler">鍒涘缓瑙嗗浘
- </el-button>
- <el-button class="smallBtn" icon="el-icon-menu" plain size="small" style="padding-left: 1px"
- type="primary" @click="checkClickHandler">涓�鑷存�ф鏌�
- </el-button>
- </div>
+ <div ref="TreeBox" style="height: calc(100vh - 154px);!important;">
<!-- 宸︿晶鏍� -->
- <div style="height: calc(100vh - 300px);">
+ <div style="height: calc(100vh - 190px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
@@ -41,7 +20,16 @@
<el-main>
<basic-container>
- <div style="height: 380px">
+ <div>
+ <el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓</el-button>
+ <el-button icon="el-icon-edit" plain size="small" type="primary" @click="editClickHandler">淇敼</el-button>
+ <el-button icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">鍒犻櫎</el-button>
+ <el-button icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
+ <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆</el-button>
+ <el-button icon="el-icon-circle-plus-outline" plain size="small" type="primary" @click="createViewClickHandler">鍒涘缓瑙嗗浘</el-button>
+ <el-button icon="el-icon-menu" plain size="small" type="primary" @click="checkClickHandler">涓�鑷存�ф鏌�</el-button>
+ </div>
+ <div style="height: 380px;margin-top: 10px">
<el-descriptions :column="2" border class="margin-top" size="medium">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -714,12 +702,24 @@
this.$message.error('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�');
return;
}
- deleteLink(this.nodeRow).then(res => {
- if (res.data.code === 200) {
- this.$message.success('鍒犻櫎鎴愬姛');
- this.getTreeList();
- }
- })
+ ;
+ this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎鎵�閫夋嫨鐨勬暟鎹悧锛�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ deleteLink(this.nodeRow).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success('鍒犻櫎鎴愬姛');
+ this.getTreeList();
+ }
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
},
// 鍒涘缓鎸夐挳
@@ -762,58 +762,62 @@
// 涓�鑷存�ф鏌�
checkClickHandler() {
- this.conCheckVisible = true;
- this.conCheckLoading = true;
checkLinkType().then(res => {
- if (res.data.code === 200) {
- const data = res.data.data;
- this.conDefaultCheckData = data; // 淇濈暀涓�浠藉師濮嬫暟鎹�
- this.conCheckLoading = false;
+ if (res && res.data && res.data.data) {
+ this.conCheckVisible = true;
+ this.conCheckLoading = true;
+ if (res.data.code === 200) {
+ const data = res.data.data;
+ this.conDefaultCheckData = data; // 淇濈暀涓�浠藉師濮嬫暟鎹�
+ this.conCheckLoading = false;
- const outputData = [];
+ const outputData = [];
- data.forEach(item => {
- Object.entries(item.btmCheckMap).forEach(([id, methodsArray]) => {
- methodsArray.forEach(methods => {
- // 鍒ゆ柇鍓嶇紑
- const action = methods.startsWith('F_') ? '绉婚櫎form绔笟鍔＄被鍨�' : '绉婚櫎to绔笟鍔＄被鍨�';
- const detail = methods.split('_')[1]; // 鑾峰彇 _ 鍚庨潰鐨勫唴瀹�
- outputData.push({
- id: id,
- methods: `${action}:${detail}`,
- status: '鏈慨澶�'
+ data.forEach(item => {
+ Object.entries(item.btmCheckMap).forEach(([id, methodsArray]) => {
+ methodsArray.forEach(methods => {
+ // 鍒ゆ柇鍓嶇紑
+ const action = methods.startsWith('F_') ? '绉婚櫎form绔笟鍔＄被鍨�' : '绉婚櫎to绔笟鍔＄被鍨�';
+ const detail = methods.split('_')[1]; // 鑾峰彇 _ 鍚庨潰鐨勫唴瀹�
+ outputData.push({
+ id: id,
+ methods: `${action}:${detail}`,
+ status: '鏈慨澶�'
+ });
});
});
- });
- // 澶勭悊 dbCheckMap
- Object.entries(item.dbCheckMap).forEach(([id, methods]) => {
- const splitMethods = methods.split('(');
- // 鍒ゆ柇绗竴涓鍙峰墠闈㈢殑鍊�
- if (splitMethods[0].startsWith('_ADD')) {
- outputData.push({
- id: id,
- methods: '澧炲姞鍒�(' + splitMethods[1].slice(0, -1) + ')', // 缁撴潫浣嶇疆鍑忓幓)鐨勫瓧绗�
- status: '鏈慨澶�'
- });
- } else if (splitMethods[0].startsWith('_CREATE')) {
- outputData.push({
- id: id,
- methods: '鍒涘缓琛�(' + splitMethods[1].slice(0, -1) + ')',
- status: '鏈慨澶�'
- });
- } else if (splitMethods[0].startsWith('_DROP')) {
- outputData.push({
- id: id,
- methods: '绉婚櫎鍒�(' + splitMethods[1].slice(0, -1) + ')',
- status: '鏈慨澶�'
- });
- } else {
- this.$message.error("涓嶆敮鎸佺殑 dbCheckMap 绫诲瀷锛� " + methods)
- }
+ // 澶勭悊 dbCheckMap
+ Object.entries(item.dbCheckMap).forEach(([id, methods]) => {
+ const splitMethods = methods.split('(');
+ // 鍒ゆ柇绗竴涓鍙峰墠闈㈢殑鍊�
+ if (splitMethods[0].startsWith('_ADD')) {
+ outputData.push({
+ id: id,
+ methods: '澧炲姞鍒�(' + splitMethods[0].slice(0, -1) + ')', // 缁撴潫浣嶇疆鍑忓幓)鐨勫瓧绗�
+ status: '鏈慨澶�'
+ });
+ } else if (splitMethods[0].startsWith('_CREATE')) {
+ outputData.push({
+ id: id,
+ methods: '鍒涘缓琛�(' + splitMethods[0].slice(0, -1) + ')',
+ status: '鏈慨澶�'
+ });
+ } else if (splitMethods[0].startsWith('_DROP')) {
+ outputData.push({
+ id: id,
+ methods: '绉婚櫎鍒�(' + splitMethods[0].slice(0, -1) + ')',
+ status: '鏈慨澶�'
+ });
+ } else {
+ this.$message.error("涓嶆敮鎸佺殑 dbCheckMap 绫诲瀷锛� " + methods)
+ }
+ });
});
- });
- this.conCheckData = outputData;
+ this.conCheckData = outputData;
+ }
+ } else {
+ this.$message.success(res.data.msg);
}
}).catch(err => {
this.$message.error(err);
@@ -822,11 +826,11 @@
// 淇涓�鑷存�ф鏌�
repairClickHandler() {
- console.log(this.conDefaultCheckData)
const params = this.conDefaultCheckData[0];
repairTable(params).then(res => {
if (func.isEmptyObject(res.data.obj[0])) {
this.$message.success('淇鎴愬姛');
+ this.conCheckData = [];
} else {
this.$message.error('淇澶辫触锛岃閲嶆柊灏濊瘯锛�');
}
@@ -842,6 +846,8 @@
this.createViewLoading = false;
this.$message.success(res.data.obj);
}
+ }).catch(err => {
+ this.createViewLoading = false;
})
},
@@ -1148,34 +1154,6 @@
.el-form-item .el-select {
width: 100%;
}
-
- .headerCon {
- .el-button {
- width: 82px;
- }
- }
-}
-
-.headerCon {
- display: flex;
- flex-wrap: wrap;
- margin-bottom: 5px;
-
- .el-button + .el-button {
- margin-left: 5px;
- }
-
- .el-button {
- margin-top: 5px;
- }
-}
-
-.headerCon > .el-button:nth-child(4) {
- margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
- margin-left: 0;
}
.dialogForm {
--
Gitblit v1.9.3