From 935cc9b06179eb7e90bdb320ce7491869c55837f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 01 十一月 2024 17:32:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue | 4 ++--
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 21 ++++++++++-----------
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue | 6 +++---
3 files changed, 15 insertions(+), 16 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 dddbe14..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
@@ -34,7 +34,7 @@
<el-button icon="el-icon-view" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿</el-button>
</div>
<div style="display: flex;justify-content:left;margin-top: 15px;">
- <div class="descBox">
+ <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">
@@ -69,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">
@@ -121,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">
@@ -154,7 +154,7 @@
@close="addDialogClose">
<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>
@@ -177,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>
@@ -215,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>
@@ -1669,20 +1669,19 @@
}
.descBox {
- width: 32%;
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); /* 娣诲姞闃村奖鏁堟灉 */
}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
index c8be906..797cd39 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
@@ -40,10 +40,10 @@
:visible.sync="visible"
append-to-body="true"
class="avue-dialog"
- width="40%"
+ width="500px"
@close="visibleCloseHandler"
>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="small">
<el-row>
<el-col :span="24">
<el-form-item label="鍚嶇О锛�" prop="id">
@@ -63,8 +63,8 @@
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="visibleCloseHandler">鍙� 娑�</el-button>
<el-button type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
+ <el-button @click="visibleCloseHandler">鍙� 娑�</el-button>
</span>
</el-dialog>
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 f73f10e..cdd91cf 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
@@ -32,7 +32,7 @@
:visible.sync="visible"
append-to-body="true"
class="avue-dialog"
- width="40%"
+ width="800px"
@close="visibleCloseHandler"
>
<el-form ref="form" size="small" :model="form" :rules="rules" label-width="95px">
@@ -80,8 +80,8 @@
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="visibleCloseHandler">鍙� 娑�</el-button>
<el-button type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
+ <el-button @click="visibleCloseHandler">鍙� 娑�</el-button>
</span>
</el-dialog>
--
Gitblit v1.9.3