From 3defe8e0363bc3511169cc2432bcfe1a02b820db Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 02 一月 2025 17:33:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 63 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
index 6f487d3..ac1d0e7 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
@@ -6,8 +6,8 @@
<avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" node-key="id"
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
- <span>
- <i :class="data.icon"></i>
+ <span style="display: flex">
+ <icon-show :name="data.icon"></icon-show>
{{ (node || {}).label }}
</span>
</span>
@@ -69,15 +69,37 @@
<el-button icon="el-icon-close" plain size="small" type="danger" @click="deleteOperationClickHandler">鍒犻櫎
</el-button>
</div>
- <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 200px);overflow: auto;">
+ <el-form ref="form" :model="form" label-width="100px" size="small"
+ style="max-height: calc(100vh - 200px);overflow: auto;">
<span v-if="form.category !== 1">
- <el-form-item label="妯″潡鍚嶏細">
+ <el-form-item>
+ <span slot="label" style="display:inline-block;">
+ 鑿滃崟鏍囪瘑锛�
+ <el-tooltip class="item" content="璇疯緭鍏ヨ嫳鏂囧瓧绗︼紝骞朵繚璇佸敮涓�鎬э紒" effect="dark" placement="top-start">
+ <i class='el-icon-star-on' style="color: #F56C6C"/>
+ </el-tooltip>
+ </span>
+ <el-input v-model="form.alias" :disabled="!editStatus && !addStatus"
+ placeholder="璇疯緭鍏ヨ嫳鏂囧瓧绗︼紝骞朵繚璇佸敮涓�鎬э紒"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <span slot="label" style="display:inline-block;">
+ 妯″潡鍚嶏細
+ <i class='el-icon-star-on' style="color: #F56C6C"/>
+ </span>
<el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
- </el-form-item>
- <el-form-item label="妯″潡鍒悕锛�">
- <el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="妯″潡鍒悕鐢ㄦ潵璁板綍鏃ュ織浣跨敤"></el-input>
- </el-form-item>
- <el-form-item v-if="form.functionType === 0" label="C/S锛�">
+ </el-form-item>
+ <el-form-item>
+ <span slot="label" style="display:inline-block;">
+ 搴忓彿锛�
+ <el-tooltip class="item" content="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�" effect="dark" placement="top-start">
+ <i class='el-icon-star-on' style="color: #F56C6C"/>
+ </el-tooltip>
+ </span>
+ <el-input v-model="form.sort" :disabled="!editStatus && !addStatus"
+ placeholder="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�"></el-input>
+ </el-form-item>
+ <el-form-item v-if="form.functionType === 0" label="C/S锛�">
<el-input v-model="form.pathC" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏/S璺緞"
type="textarea"></el-input>
</el-form-item>
@@ -89,14 +111,9 @@
<el-input v-model="form.resourceDotNet" :disabled="!editStatus && !addStatus" :rows="2"
placeholder="璇疯緭鍏�.NET" type="textarea"></el-input>
</el-form-item>
- <el-form-item label="搴忓彿锛�">
- <el-input v-model="form.sort" :disabled="!editStatus && !addStatus"
- placeholder="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�"></el-input>
- </el-form-item>
<el-form-item label="鍥炬爣锛�">
- <avue-input-icon v-model="form.source" :disabled="!editStatus && !addStatus" :icon-list="iconList"
- placeholder="璇烽�夋嫨鍥炬爣">
- </avue-input-icon>
+ <input-icon v-model="form.source" :disabled="!editStatus && !addStatus" placeholder="璇烽�夋嫨鍥炬爣">
+ </input-icon>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
<el-input v-model="form.remark" :disabled="!editStatus && !addStatus" :rows="3" placeholder="璇疯緭鍏ユ弿杩�"
@@ -192,13 +209,11 @@
} from "@/api/systemModel/mangeModel/api"
import func from "@/util/func";
import basicOption from "@/util/basic-option";
-import iconList from "@/config/iconList";
export default {
name: "index",
data() {
return {
- iconList: iconList,
tipList: [],
upFileType: ['xls', 'xlsx'],
fileUrl: 'api/hmSysModConfigController/importModule',
@@ -253,7 +268,7 @@
id: item.id,
name: item.name,
leaf: !item.hasChildren,
- icon: item.source || 'el-icon-s-home'
+ icon: item.source || 'iconoir:home'
}
}))
})
@@ -314,6 +329,10 @@
this.$message.error('妯″潡鍚嶄笉鑳戒负绌�');
return
}
+ if (!this.form.alias) {
+ this.$message.error('鑿滃崟鏍囪瘑涓嶈兘涓虹┖');
+ return
+ }
if (this.form.name.length > 128) {
this.$message.error('妯″潡鍚嶉暱搴︿笉鑳借秴杩�128锛�');
return
@@ -356,6 +375,10 @@
editSaveClickHandler() {
if (!this.form.name) {
this.$message.error('妯″潡鍚嶄笉鑳戒负绌�');
+ return
+ }
+ if (!this.form.alias) {
+ this.$message.error('鑿滃崟鏍囪瘑涓嶈兘涓虹┖');
return
}
if (this.form.name.length > 128) {
@@ -472,7 +495,7 @@
this.lastIndex = newIndex;
},
() => {
- this.methodsList = [];
+ this.methodsList = [row];
}
);
},
--
Gitblit v1.9.3