From c94eaa728f9d68a872d904823c964e5d5810f202 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 12 十二月 2024 18:02:49 +0800
Subject: [PATCH] 修改自定义url绑定值&&登录添加中文密码错误提示&&
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 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 6885a07..a808f97 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
@@ -35,8 +35,8 @@
</div>
<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"
+ <el-descriptions :column="2" border class="margin-top" size="medium" title="灞炴�т俊鎭�">
+ <el-descriptions-item :span="12" :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
<template slot="label">
鍚嶇О
@@ -50,7 +50,19 @@
</template>
<el-tag v-if="nodeRow.name">{{ nodeRow.name }}</el-tag>
</el-descriptions-item>
- <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
+ <el-descriptions-item :contentStyle="descriptionOption.contentStyle+';min-width: 100px;'"
+ :labelStyle="descriptionOption.labelStyle">
+ <template slot="label">
+ 鍥炬爣
+ </template>
+ <span class="avue-icon avue-icon--small" style="display: block">
+ <svg v-if="nodeRow.imageName && nodeRow.imageName.indexOf('#')==0" aria-hidden="true">
+ <use :xlink:href="nodeRow.imageName"></use>
+ </svg>
+ <i v-else :class="nodeRow.imageName"></i>
+ </span>
+ </el-descriptions-item>
+ <el-descriptions-item :span="12" :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
<template slot="label">
瀹炵幇绫�
@@ -60,7 +72,7 @@
<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"
+ <el-descriptions-item :span="12" :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
<template slot="label">
鎻忚堪
@@ -69,7 +81,7 @@
</el-descriptions-item>
</el-descriptions>
</div>
- <div class="descBox" style="width: 25%;">
+ <div class="descBox" style="width: 24%;">
<el-descriptions :column="1" border class="margin-top" size="medium" title="鐗堟湰瑙勫垯">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -121,7 +133,7 @@
</el-descriptions>
</div>
- <div class="descBox" style="width: calc(35% - 40px);margin-right: 0">
+ <div class="descBox" style="width: calc(36% - 40px);margin-right: 0">
<el-descriptions :column="1" border class="margin-top" size="medium" title="鐢熷懡鍛ㄦ湡">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -129,6 +141,16 @@
鐢熷懡鍛ㄦ湡
</template>
<el-tag v-if="nodeRow.lifeCycleId">{{ nodeRow.lifeCycleId }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
+ :labelStyle="descriptionOption.labelStyle">
+ <template slot="label">
+ 澶囬�夌敓鍛藉懆鏈�
+ </template>
+ <div v-if="nodeRow.lifeCycleIds">
+ <el-tag v-for="item in nodeRow.lifeCycleIds.split(',')" style="margin-right: 5px;">{{ item }}</el-tag>
+ </div>
+
</el-descriptions-item>
</el-descriptions>
</div>
@@ -158,20 +180,29 @@
<el-form-item label="绫诲瀷鍚嶇О锛�" prop="id">
<el-input v-model="form.id" :readOnly="title === 'edit'"></el-input>
</el-form-item>
- <el-form-item label="鏍囩锛�">
- <el-input v-model="form.name"></el-input>
- </el-form-item>
- <el-form-item label="缁ф壙鑷細">
+ <el-row :span="24">
+ <el-col :span="12">
+ <el-form-item label="鏍囩锛�" prop="name">
+ <el-input v-model="form.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍥炬爣锛�" prop="imageName">
+ <input-icon v-model="form.imageName" placeholder="璇烽�夋嫨鍥炬爣"></input-icon>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="缁ф壙鑷細" prop="fName">
<avue-input-tree :disabled="title === 'add'"
v-model="form.fName"
placeholder="璇烽�夋嫨涓氬姟绫诲瀷"
:props="{label: 'id', value: 'id',children: 'children'}"
:dic="inheritTreeData"></avue-input-tree>
</el-form-item>
- <el-form-item label="瀹炵幇绫伙細">
+ <el-form-item label="瀹炵幇绫伙細" prop="implClass">
<el-input v-model="form.implClass"></el-input>
</el-form-item>
- <el-form-item label="鎻忚堪">
+ <el-form-item label="鎻忚堪" prop="description">
<el-input v-model="form.description" :rows="2" type="textarea"></el-input>
</el-form-item>
</div>
@@ -215,7 +246,7 @@
:props="{label: 'id', value: 'id'}"
:dic="lifeData"></avue-select>
</el-form-item>
- <el-form-item label="澶囬�夌敓鍛藉懆鏈熷垪琛細" label-width="138px">
+ <el-form-item label="澶囬�夌敓鍛藉懆鏈熷垪琛細" label-width="138px" prop="subLifeCycleIdList">
<avue-select multiple
:filterable="true"
v-model="form.subLifeCycleIdList"
@@ -617,6 +648,9 @@
{required: true, message: '璇疯緭绫诲瀷鍚嶇О', trigger: 'blur'},
{validator: this.validateEnglishOnly, trigger: 'blur'}
],
+ imageName:[
+ {required: true, message: '璇烽�夋嫨鍥炬爣', trigger: 'submit'},
+ ],
revLevel: [
{required: true, message: '璇烽�夋嫨鐗堟湰瑙勫垯', trigger: 'blur'},
],
@@ -749,8 +783,8 @@
}
],
descriptionOption: {
- labelStyle: 'text-align:center;width:100px;',
- contentStyle: 'max-width:200px;text-align:center;word-break;break-all;'
+ labelStyle: 'text-align:center;width:110px;',
+ contentStyle: 'min-width:200px;text-align:center;word-break:break-all;'
},
icons: {
id: 'el-icon-finished',
@@ -895,7 +929,7 @@
this.form = {...this.nodeRow};
this.form.inputRevisionFlag = JSON.parse(this.form.inputRevisionFlag); // 瀛楃涓瞗alse杞崲涓哄竷灏斿��
// this.form.fName = this.nodeRow.id === 'topNode' ? "" : this.nodeRow.id;
- this.form.subLifeCycleIdList = this.nodeRow.lifeCycleIds.split(',');
+ this.form.subLifeCycleIdList = this.nodeRow.lifeCycleIds?this.nodeRow.lifeCycleIds.split(','):[];
this.dialogAttrData = this.nodeRow.attributes ? JSON.parse(this.nodeRow.attributes) : [];
function processChildren(item,fName) {
if (item.children && item.children.length > 0) {
@@ -1411,7 +1445,7 @@
.dialogForm > div {
border: 1px solid #EBEEF5;
border-radius: 2px;
- padding: 25px 20px 5px 10px; /* 涓� 鍙� 涓� 宸� */
+ padding: 15px 20px 0 10px; /* 涓� 鍙� 涓� 宸� */
box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1); /* 娣诲姞闃村奖鏁堟灉 */
}
--
Gitblit v1.9.3