From 2bea732496b4f5051233ed94e206160992351596 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 15 一月 2025 11:02:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 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 ac1d0e7..70157fc 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
@@ -7,7 +7,8 @@
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="display: flex">
- <icon-show :name="data.icon"></icon-show>
+ <icon-show v-if="data.iconType=='svg'" :name="data.icon"></icon-show>
+ <i v-else :class="data.icon"></i>
{{ (node || {}).label }}
</span>
</span>
@@ -72,32 +73,18 @@
<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>
- <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 class="is-required">
+ <span slot="label">妯″潡鍚嶏細</span>
+ <el-input v-model="form.name" :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 class="is-required">
+ <span slot="label">妯″潡鍒悕锛�</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;">
- 搴忓彿锛�
- <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 class="is-required">
+ <span slot="label">搴忓彿锛�</span>
+ <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus"></el-input-number>
+ <el-link :underline="false" style="margin-left: 20px" type="danger">鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�</el-link>
</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璺緞"
@@ -140,28 +127,31 @@
</el-form-item>
</span>
<span v-if="form.category === 1">
- <el-form-item label="鍚嶇О锛�">
- <el-input v-model="form.name" :disabled="form.category === 1" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
+ <el-form-item label="鍚嶇О锛�" class="is-required">
+ <el-input v-model="form.name" :disabled="form.category === 1" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
</el-form-item>
- <el-form-item label="鏍囪瘑锛�">
- <el-input v-model="form.code" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
+ <el-form-item label="鏍囪瘑锛�" class="is-required">
+ <el-input v-model="form.code" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
</el-form-item>
- <el-form-item label="鍒悕锛�">
- <el-input v-model="form.alias" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
+ <el-form-item label="鍒悕锛�" class="is-required">
+ <el-input v-model="form.alias" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
</el-form-item>
- <el-form-item label="缂栧彿锛�">
- <el-input v-model="form.sort" :disabled="form.category === 1" placeholder="璇疯緭鍏ョ紪鍙�"></el-input>
+ <el-form-item label="鍥炬爣锛�">
+ <input-icon v-model="form.source" placeholder="璇烽�夋嫨鍥炬爣">
+ </input-icon>
+ </el-form-item>
+ <el-form-item label="缂栧彿锛�" class="is-required">
+ <el-input-number v-model="form.sort" :disabled="form.category === 1" :max="63" :min="1"></el-input-number>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
- <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
+ <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
</el-form-item>
<el-form-item label="鏄惁鏈夋晥锛�">
- <el-switch
- v-model="form.isValid"
- active-color="#13ce66"
- inactive-color="#ff4949">
- </el-switch>
-
+ <el-switch
+ v-model="form.isValid"
+ active-color="#13ce66"
+ inactive-color="#ff4949">
+ </el-switch>
</el-form-item>
</span>
</el-form>
@@ -173,7 +163,7 @@
append-to-body="true"
class="avue-dialog"
title="鎿嶄綔鍒嗙被"
- width="500px"
+ width="900px"
>
<avue-crud
ref="methodsCrud"
@@ -227,13 +217,19 @@
menu: false,
height: 500,
header: false,
- column: [
- {
- label: '鎿嶄綔鍒嗙被',
- prop: 'name',
- sortable: true,
- }
- ]
+ column: [{
+ label: '鍚嶇О',
+ prop: 'name',
+ width:180,
+ sortable: true,
+ }, {
+ label: '鏍囪瘑',
+ prop: 'code',
+ width:180,
+ }, {
+ label: '鎻忚堪',
+ prop: 'remark'
+ }]
},
methodsLoading: false,
methodsVisble: false,
@@ -250,8 +246,9 @@
menu: false,
addBtn: false,
defaultExpandAll: false,
+ defaultExpandedKeys:['business'],
props: {
- label: 'name',
+ label: 'label',
value: 'id',
children: 'children',
},
@@ -265,10 +262,10 @@
resolve(res.data.data.map(item => {
return {
...item,
- id: item.id,
- name: item.name,
+ label: item.category!=1?item.name:item.alias,
leaf: !item.hasChildren,
- icon: item.source || 'iconoir:home'
+ icon: item.source || (node.level === 0?'el-icon-s-home':'el-icon-s-tools'),
+ iconType:item.source?'svg':'iconfont'
}
}))
})
@@ -505,6 +502,7 @@
const params = {
id: this.form.id,
isValid: this.form.isValid,
+ source:this.form.source,
alias: this.form.alias
}
updateAlias(params).then(res => {
@@ -566,7 +564,9 @@
let node = this.currentClickNode.parent;
node.loaded = false;
node.expand();
- this.$refs.tree.setCurrentNode(this.currentClickNode);
+ this.$nextTick(()=>{
+ this.$refs.tree.setCurrentKey(this.currentClickNode.data.id);
+ });
} else {
this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
}
--
Gitblit v1.9.3