From bc0978a4be4c6284c496dc30c3a59db91fa773fb Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 01 十一月 2024 16:07:40 +0800
Subject: [PATCH] 调整页面
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue | 283 ++++++++++++++++++++++++++++----------------------------
1 files changed, 143 insertions(+), 140 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 706fd41..f4a8835 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">
@@ -42,6 +21,15 @@
<el-main>
<basic-container>
<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">
@@ -94,11 +82,13 @@
<i :class="icons.from"></i>
From绔被鍨�
</template>
- <span v-for="item in nodeRow.btmItemsFrom" style="margin-left:2px;">
- <el-tag effect="plain" style="margin-top: 2px;">
+ <div style="height: 60px;overflow-y: auto;display: flex;flex-wrap: wrap">
+ <span v-for="item in nodeRow.btmItemsFrom" style="margin-left:3px;">
+ <el-tag effect="plain" style="margin-top: 3px;">
{{ item }}
</el-tag>
- </span>
+ </span>
+ </div>
</el-descriptions-item>
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -128,11 +118,13 @@
<i :class="icons.to"></i>
To绔被鍨�
</template>
- <span v-for="item in nodeRow.btmItemsTo" style="margin-left:2px;">
- <el-tag effect="plain" style="margin-top: 2px;">
+ <div style="height: 60px;overflow-y: auto;display: flex;flex-wrap: wrap">
+ <span v-for="item in nodeRow.btmItemsTo" style="margin-left:2px;">
+ <el-tag effect="plain" style="margin-top: 2px;">
{{ item }}
- </el-tag>
- </span>
+ </el-tag>
+ </span>
+ </div>
</el-descriptions-item>
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -155,8 +147,8 @@
</el-descriptions>
</div>
- <div style="margin-top: 20px">
- <h3>灞炴�ф睜鍒楄〃</h3>
+ <div style="margin-top: 30px;position: relative">
+ <h3 style="margin: 0;position: absolute;top:0;z-index: 1000;">灞炴�у垪琛�</h3>
<avue-crud
:data="tableData"
:option="tableOption"
@@ -175,7 +167,7 @@
width="70%"
@close="addDialogClose"
>
- <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px" size="small">
<div class="dialogForm">
<div class="leftForm">
<el-form-item label="鍚嶇О锛�" prop="name">
@@ -197,10 +189,6 @@
<div class="centerForm">
<el-form-item label="Form绔被鍨嬶細" label-width="110px">
- <!-- <el-button v-if="!form.btmItemsFrom" plain size="mini" type="success"-->
- <!-- @click="FormItemReferChange('form')">娣诲姞-->
- <!-- </el-button>-->
- <!-- <el-input v-if="form.btmItemsFrom" v-model="form.btmItemsFrom"></el-input>-->
<div style="display: flex; align-items: center">
<div style="height: 200px; width: 280px; border: 1px solid #bdbbbb;overflow-y: auto">
<!-- 鍐呭 -->
@@ -300,7 +288,7 @@
</el-form>
<div class="bottomForm">
- <h3>灞炴�ф睜鍒楄〃</h3>
+ <h3 style="margin-bottom: 10px;">灞炴�ф睜鍒楄〃</h3>
<avue-crud
:data="dialogBottomData"
:option="dialogBottomOption"
@@ -313,8 +301,8 @@
</avue-crud>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="addDialogClose">鍙� 娑�</el-button>
<el-button type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
+ <el-button @click="addDialogClose">鍙� 娑�</el-button>
</span>
<!-- 灞炴�ф睜鍒楄〃 -->
@@ -343,8 +331,8 @@
>
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button @click="dialogAttrClose">鍙� 娑�</el-button>
<el-button type="primary" @click="dialogAttrAddClickHandler">纭� 瀹�</el-button>
+ <el-button @click="dialogAttrClose">鍙� 娑�</el-button>
</span>
</el-dialog>
</el-dialog>
@@ -445,6 +433,7 @@
highlightCurrentRow: true,
searchMenuSpan: 8,
searchLabelWidth: 100,
+ calcHeight: 30,
column: [
{
label: '涓氬姟绫诲瀷鍚�',
@@ -523,6 +512,7 @@
highlightCurrentRow: true,
height: 450,
searchMenuSpan: 8,
+ header:false,
column: [
{
label: '灞炴�у悕',
@@ -575,7 +565,7 @@
editBtn: false,
refreshBtn: false,
selection: false,
- height: 300,
+ height: 200,
addBtn: false,
// index:false,
column: [
@@ -597,6 +587,7 @@
{
label: '璇存槑',
prop: 'description',
+ overHidden: true
}
]
},
@@ -623,6 +614,7 @@
// index:false,
addBtn: false,
menu: false,
+ calcHeight: -55,
column: [
{
label: '灞炴�у悕',
@@ -642,6 +634,7 @@
{
label: '璇存槑',
prop: 'description',
+ overHidden: true
}
]
},
@@ -661,7 +654,7 @@
desc: 'el-icon-chat-line-square'
},
bizLastIndex: null,
- attrLastIndex:null
+ attrLastIndex: null
}
},
created() {
@@ -710,12 +703,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: '宸插彇娑堝垹闄�'
+ });
+ });
},
// 鍒涘缓鎸夐挳
@@ -758,58 +763,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);
@@ -818,11 +827,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('淇澶辫触锛岃閲嶆柊灏濊瘯锛�');
}
@@ -838,6 +847,8 @@
this.createViewLoading = false;
this.$message.success(res.data.obj);
}
+ }).catch(err => {
+ this.createViewLoading = false;
})
},
@@ -873,8 +884,12 @@
row,
this.$refs.dialogAttrCrud,
this.attrLastIndex,
- (newIndex) => { this.attrLastIndex = newIndex; },
- () => { this.selectList = []; }
+ (newIndex) => {
+ this.attrLastIndex = newIndex;
+ },
+ () => {
+ this.selectList = [];
+ }
);
},
@@ -904,8 +919,6 @@
this.bizFormData = [];
this.bizToData = [];
this.dialogBottomData = [];
- console.log(this.form);
- console.log('--', this.nodeRow)
},
// 娣诲姞灞炴�ф睜 淇濆瓨
@@ -955,9 +968,13 @@
//娣诲姞灞炴�ф睜 鎼滅储
attrHandleSearch(params, done) {
- this.searchAttrParams = {
- "conditionMap[id]": "*" + params.id + "*"
- };
+ if (func.isEmptyObject(params)) {
+ this.searchAttrParams = {};
+ } else {
+ this.searchAttrParams = {
+ "conditionMap[id]": "*" + params.id + "*"
+ };
+ }
this.getAttrDialogDta();
done();
},
@@ -1011,8 +1028,12 @@
row,
this.$refs.bizTypeCrud,
this.bizLastIndex,
- (newIndex) => { this.bizLastIndex = newIndex; },
- () => { this.selectList = []; }
+ (newIndex) => {
+ this.bizLastIndex = newIndex;
+ },
+ () => {
+ this.selectList = [];
+ }
);
},
@@ -1087,16 +1108,22 @@
this.$message.error('form绔笟鍔＄被鍨嬪拰to绔被鍨嬪潎涓嶈兘涓虹┖锛�')
return;
}
- this.form.btmItemsFrom = this.bizFormData.map(item => item.name);
- this.form.btmItemsTo = this.bizToData.map(item => item.name);
- this.form.attributes = this.dialogBottomData.map(item => item.id);
- let flag = this.title === 'add' ? true : false;
- addAndEditLink(flag, this.form).then(res => {
- if (res.data.code === 200) {
- this.visible = false;
- this.$message.success(res.data.msg);
- this.resetForm();
- this.getTreeList();
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ this.form.btmItemsFrom = this.bizFormData.map(item => item.name);
+ this.form.btmItemsTo = this.bizToData.map(item => item.name);
+ this.form.attributes = this.dialogBottomData.map(item => item.id);
+ let flag = this.title === 'add' ? true : false;
+ addAndEditLink(flag, this.form).then(res => {
+ if (res.data.code === 200) {
+ this.visible = false;
+ this.$message.success(res.data.msg);
+ this.resetForm();
+ this.getTreeList();
+ }
+ });
+ } else {
+ return false;
}
});
},
@@ -1128,34 +1155,10 @@
.el-form-item .el-select {
width: 100%;
}
-
- .headerCon {
- .el-button {
- width: 82px;
- }
+ .el-tag{
+ line-height:22px;
+ height: 24px;
}
-}
-
-.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