From 2a225d84f5a14caddb853d3c07b26907d1cb1428 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 15 十一月 2024 10:11:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
index 8ef3a18..35b0974 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
@@ -16,7 +16,7 @@
>
<template slot="menuLeft" slot-scope="scope">
- <el-button icon="el-icon-plus" size="small" type="primary" @click="rowSaveHandlerClick">鍒涘缓</el-button>
+ <el-button icon="el-icon-plus" plain size="small" type="primary" @click="rowSaveHandlerClick">鍒涘缓</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="allDelHandler">鍒犻櫎</el-button>
<el-button icon="el-icon-view" plain size="small" type="primary" @click="chekView">鏌ョ湅浣跨敤鑼冨洿</el-button>
<el-button icon="el-icon-download" plain size="small" type="primary" @click="downloadTemplateHandler">涓嬭浇瀵煎叆妯℃澘
@@ -41,13 +41,13 @@
:visible.sync="dialogVisible"
append-to-body="true"
class="avue-dialog"
- width="70%"
+ width="1000px"
@close="dialogClose"
>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
<el-row>
<el-col :span="12">
- <el-form-item label="鍚嶇О锛�" prop="id">
+ <el-form-item label="鏋氫妇鍚嶇О锛�" prop="id">
<el-input v-model="form.id"></el-input>
</el-form-item>
</el-col>
@@ -58,7 +58,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="绫诲瀷锛�">
- <el-select v-model="form.enumValueDataType" placeholder="璇烽�夋嫨绫诲瀷">
+ <el-select v-model="form.enumValueDataType" placeholder="璇烽�夋嫨绫诲瀷" style="width: 376px;">
<el-option label="String" value="String"></el-option>
<el-option label="Integer" value="Integer"></el-option>
</el-select>
@@ -66,7 +66,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="闀垮害锛�">
- <el-input-number v-model="form.length" :max="999" :min="1" label="鎻忚堪鏂囧瓧"></el-input-number>
+ <el-input-number v-model="form.length" :max="999" :min="1" label="鎻忚堪鏂囧瓧" style="width: 376px;"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -82,10 +82,9 @@
</el-col>
</el-row>
</el-form>
-
<span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="rowSaveHandler">纭� 瀹�</el-button>
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -116,9 +115,9 @@
</basic-container>
</el-main>
- <el-aside width="30%">
+ <el-aside width="35%">
<basic-container>
- <el-descriptions :column="1" border size="medium" style="margin-bottom: 20px" title="鏋氫妇淇℃伅">
+ <el-descriptions :column="1" border size="medium" style="margin-bottom: 20px" title="鏋氫妇淇℃伅" :labelStyle="{width:'150px'}">
<el-descriptions-item>
<template slot="label">
鍚嶇О
@@ -183,6 +182,8 @@
refreshBtn: false,
selection: false,
index: false,
+ header:false,
+ calcHeight: -40,
column: [
{
label: '鏋氫妇椤瑰悕绉�',
@@ -246,11 +247,13 @@
calcHeight: 50,
refreshBtn: false,
selection: false,
+ dialogWidth:500,
column: [
{
label: '鏋氫妇椤瑰悕',
prop: 'name',
sortable: true,
+ span:24,
rules: [
{
required: true,
@@ -263,6 +266,7 @@
label: '鏋氫妇鍊�',
prop: 'value',
sortable: true,
+ span:24,
rules: [
{
required: true,
@@ -274,13 +278,13 @@
{
label: '鎻忚堪',
prop: 'description',
- sortable: true,
+ span:24
},
]
},
rules: {
id: [
- {required: true, message: '璇疯緭鍏ユ灇涓鹃」鍚�', trigger: 'blur'},
+ {required: true, message: '璇疯緭鍏ユ灇涓惧悕绉�', trigger: 'blur'},
{validator: this.validateEnglishOnly, trigger: 'blur'}
],
},
@@ -295,11 +299,12 @@
tableData: [],
option: {
...basicOption,
- calcHeight: -60,
+ calcHeight: -40,
searchMenuSpan: 8,
addBtn: false,
editBtn: false,
delBtn: false,
+ menuWidth:160,
column: [
{
label: '鏋氫妇鍚嶇О',
@@ -316,6 +321,7 @@
label: '杩斿洖绫诲瀷',
prop: 'enumValueDataTypeText',
sortable: true,
+ width:130
}
]
},
--
Gitblit v1.9.3