From 699249fb4085261104d1756150f403305716b472 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 01 十一月 2024 17:30:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 93 +++++++++++++++++-----------------------------
1 files changed, 35 insertions(+), 58 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index 49029ed..4f60ac9 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -30,11 +30,11 @@
<el-button icon="el-icon-circle-plus-outline" plain size="small" type="primary" @click="indexClickHandler">鍒涘缓绱㈠紩</el-button>
<el-button icon="el-icon-menu" plain size="small" type="primary" @click="checkClickHandler">涓�鑷存�ф鏌�</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="checkClickHandler">鍒犻櫎鏁版嵁</el-button>
- <el-button plain size="small" type="danger" @click="checkClickHandler">鍒犻櫎鍏ㄩ儴绫诲瀷</el-button>
- <el-button plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿</el-button>
+ <el-button icon="el-icon-delete" plain size="small" type="danger" @click="checkClickHandler">鍒犻櫎鍏ㄩ儴绫诲瀷</el-button>
+ <el-button icon="el-icon-view" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿</el-button>
</div>
- <div style="display: flex;justify-content: center; height: 230px;margin-top: 10px;">
- <div class="descBox" style="max-height: 100px">
+ <div style="display: flex;justify-content:left;margin-top: 15px;">
+ <div class="descBox" style="width: 40%">
<el-descriptions :column="1" border class="margin-top" size="medium" title="灞炴�т俊鎭�">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -57,8 +57,7 @@
</template>
<el-tooltip v-if="nodeRow.implClass" :content="nodeRow.implClass" class="item" effect="dark"
placement="top-start">
- <el-tag style="max-width: 250px;overflow: hidden">{{ nodeRow.implClass }}
- </el-tag>
+ <el-tag style="max-width: 100%;overflow: hidden;display: block">{{ nodeRow.implClass }}</el-tag>
</el-tooltip>
</el-descriptions-item>
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
@@ -70,7 +69,7 @@
</el-descriptions-item>
</el-descriptions>
</div>
- <div class="descBox">
+ <div class="descBox" style="width: 25%;">
<el-descriptions :column="1" border class="margin-top" size="medium" title="鐗堟湰瑙勫垯">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -122,7 +121,7 @@
</el-descriptions>
</div>
- <div class="descBox">
+ <div class="descBox" style="width: calc(35% - 40px);margin-right: 0">
<el-descriptions :column="1" border class="margin-top" size="medium" title="鐢熷懡鍛ㄦ湡">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -134,8 +133,8 @@
</el-descriptions>
</div>
</div>
- <div style="margin-top: 30px">
- <h3>灞炴�у垪琛�</h3>
+ <div style="margin-top: 25px;position: relative">
+ <h3 style="margin: 0;position: absolute;top:0;z-index: 1000;">灞炴�у垪琛�</h3>
<avue-crud
:data="attrData"
:option="attrOption">
@@ -153,9 +152,9 @@
class="avue-dialog"
width="75%"
@close="addDialogClose">
- <el-form ref="form" :model="form" :rules="rules" label-width="95px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="95px" size="small">
<div class="dialogForm">
- <div class="leftForm">
+ <div class="leftForm" style="width: 40%">
<el-form-item label="绫诲瀷鍚嶇О锛�" prop="id">
<el-input v-model="form.id" :readOnly="title === 'edit'"></el-input>
</el-form-item>
@@ -178,7 +177,7 @@
<el-input v-model="form.description" :rows="2" type="textarea"></el-input>
</el-form-item>
</div>
- <div class="centerForm">
+ <div class="centerForm" style="width: 24%">
<el-form-item label="鐗堟湰瑙勫垯锛�" label-width="110px" prop="revLevel">
<el-select v-model="form.revLevel" @change="revLevelChange">
<el-option label="涓嶅彲淇" value="0"></el-option>
@@ -216,7 +215,7 @@
</el-select>
</el-form-item>
</div>
- <div class="rightForm">
+ <div class="rightForm" style="width: 26%">
<el-form-item label="鐢熷懡鍛ㄦ湡锛�" label-width="138px" prop="lifeCycleId">
<div style="display: flex;gap: 5px;align-items: center">
<el-input v-model="form.lifeCycleId" :readOnly="true"></el-input>
@@ -264,7 +263,7 @@
</div>
</el-form>
<div class="bottomForm">
- <h3>灞炴�ф睜鍒楄〃</h3>
+ <h3 style="margin-bottom: 10px;">灞炴�ф睜鍒楄〃</h3>
<avue-crud
:data="dialogAttrData"
:option="dialogAttrOption"
@@ -274,9 +273,9 @@
</template>
</avue-crud>
</div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="addDialogClose">鍙� 娑�</el-button>
+ <span slot="footer" class="dialog-footer avue-dialog__footer">
<el-button type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
+ <el-button @click="addDialogClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -387,8 +386,8 @@
</span>
</avue-tree>
<span slot="footer" class="dialog-footer">
- <el-button @click="inheritClose">鍙� 娑�</el-button>
<el-button type="primary" @click="inheritSaveClickHandler">纭� 瀹�</el-button>
+ <el-button @click="inheritClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -431,8 +430,8 @@
:table-loading="conCheckLoading">
</avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button @click="conCheckVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="repairClickHandler">淇� 澶�</el-button>
+ <el-button @click="conCheckVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -491,13 +490,13 @@
:option="indexAttrOption"
@row-click="indexAttrRowClick"></avue-crud>
<span slot="footer" class="dialog-footer">
- <el-button @click="indexAttrVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="indexAttrClickAddHandler">纭� 瀹�</el-button>
+ <el-button @click="indexAttrVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
<span slot="footer" class="dialog-footer">
- <el-button @click="indexDialogClose">鍙� 娑�</el-button>
<el-button type="primary" @click="indexClickAddHandler">淇� 瀛�</el-button>
+ <el-button @click="indexDialogClose">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -640,6 +639,7 @@
searchMenuSpan: 8,
refreshBtn: false,
selection: false,
+ header:false,
column: [
{
label: '鍚嶇О',
@@ -753,6 +753,7 @@
highlightCurrentRow: true,
height: 450,
searchMenuSpan: 8,
+ header: false,
column: [
{
label: '灞炴�у悕',
@@ -764,6 +765,7 @@
label: '灞炴�х被鍨�',
prop: 'attributeDataType',
sortable: true,
+ width:150,
},
{
label: '鍒濆鍊�',
@@ -800,6 +802,7 @@
selection: false,
height: 210,
addBtn: false,
+ menuWidth:100,
// index:false,
column: [
{
@@ -817,11 +820,13 @@
label: '灞炴�х被鍨�',
prop: 'attributeDataType',
sortable: true,
+ width:150,
},
{
label: '鍒濆鍊�',
prop: 'defaultValue',
sortable: true,
+ width:150,
},
{
label: '璇存槑',
@@ -1287,7 +1292,7 @@
// 鏂板缂栬緫淇濆瓨
addDialogSavaHandler() {
- if (!this.form.inputRevisionFlag && (!this.form.revisionRuleId || this.form.revisionRuleId === "")) {
+ if (this.form.revLevel !== '0' &&!this.form.inputRevisionFlag && (!this.form.revisionRuleId || this.form.revisionRuleId === "")) {
this.$message.error('璇锋鏌ョ増鏈彿瑙勫垯涓嶈兘涓虹┖');
return;
}
@@ -1657,54 +1662,26 @@
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;
-}
-
-.headerCon > .el-button:nth-child(10) {
- margin-left: 0;
-}
-
.descBox {
- width: 32%;
- margin-left: 20px;
+ margin-right: 20px;
}
.dialogForm {
display: flex;
- justify-content: space-around;
+ justify-content: space-between;
}
.dialogForm > div {
- width: 29%;
- border: 1px solid #eee;
+ border: 1px solid #EBEEF5;
+ border-radius: 2px;
padding: 25px 20px 5px 10px; /* 涓� 鍙� 涓� 宸� */
- box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.2); /* 娣诲姞闃村奖鏁堟灉 */
+ box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1); /* 娣诲姞闃村奖鏁堟灉 */
}
--
Gitblit v1.10.0