From d5894106a09ea9bc900bad176c177763a1df0568 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期五, 27 十二月 2024 14:29:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
index b8a67d3..07d2c1a 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/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>
@@ -94,9 +94,8 @@
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 +191,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 +250,7 @@
id: item.id,
name: item.name,
leaf: !item.hasChildren,
- icon: item.source || 'el-icon-s-home'
+ icon: item.source || 'iconoir:home'
}
}))
})
@@ -556,5 +553,4 @@
justify-content: left;
margin-bottom: 15px;
}
-
</style>
--
Gitblit v1.10.0