From 9644ad8546c51776824ac046bac9f57e17ac5694 Mon Sep 17 00:00:00 2001 From: 田源 <tianyuan@vci-tech.com> Date: 星期四, 26 十二月 2024 16:41:40 +0800 Subject: [PATCH] 业务功能模块&&管理功能模块树结构修改为图标库图标以及图标选择修改为新图标库选择 系统菜单图标更改为图标库图标并且设置默认图标 --- Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue | 19 ++++++++++++++++--- Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 20 ++++++++++++-------- Source/plt-web/plt-web-ui/src/option/user/info.js | 6 +++--- Source/plt-web/plt-web-ui/src/config/website.js | 2 +- Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 13 +++++++++---- 5 files changed, 41 insertions(+), 19 deletions(-) diff --git a/Source/plt-web/plt-web-ui/src/config/website.js b/Source/plt-web/plt-web-ui/src/config/website.js index fd3874d..c67f150 100644 --- a/Source/plt-web/plt-web-ui/src/config/website.js +++ b/Source/plt-web/plt-web-ui/src/config/website.js @@ -33,7 +33,7 @@ }, //閰嶇疆鑿滃崟鐨勫睘鎬� menu: { - iconDefault: 'iconfont icon-caidan', + iconDefault: 'iconoir:home', props: { label: 'name', path: 'path', diff --git a/Source/plt-web/plt-web-ui/src/option/user/info.js b/Source/plt-web/plt-web-ui/src/option/user/info.js index 84c5dff..65bf4f6 100644 --- a/Source/plt-web/plt-web-ui/src/option/user/info.js +++ b/Source/plt-web/plt-web-ui/src/option/user/info.js @@ -17,7 +17,7 @@ span: 12, row: true, prop: 'userId', - readonly:true + disabled:true }, { label: '濮撳悕', @@ -30,14 +30,14 @@ span: 12, row: true, prop: 'personName', - readonly:true, + disabled:true }, { label: '褰撳墠瀵嗙骇', span: 12, row: true, prop: 'userSecretText', - readonly:true, + disabled:true }, { label: '閭', diff --git a/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue b/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue index 3762f5b..c9cddc3 100644 --- a/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue +++ b/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue @@ -14,9 +14,11 @@ :key="item[labelKey]" :index="item[pathKey]"> <template slot="title"> - <i :class="item[iconKey]" style="margin-right: 10px"></i> + <div style="display: flex"> + <icon-show :name="item[iconKey]" class="iconShowSpan"></icon-show> <span slot="title" :class="{'el-menu--display':collapse && first}">{{ generateTitle(item) }}</span> + </div> </template> <template v-for="(child,cindex) in item[childrenKey]"> <el-menu-item v-if="validatenull(child[childrenKey])" @@ -24,8 +26,10 @@ :class="{'is-active':vaildActive(child)}" :index="child[pathKey],cindex" @click="open(child)"> - <i :class="child[iconKey]" style="margin-right: 10px"></i> - <span slot="title">{{ generateTitle(child) }}</span> + <div style="display: flex"> + <icon-show :name="child[iconKey]" class="iconShowSpan"></icon-show> + <span slot="title">{{ generateTitle(child) }}</span> + </div> </el-menu-item> <sidebar-item v-else :key="cindex" @@ -152,6 +156,15 @@ outline: 0; background-color: #060708; } + +.iconShowSpan{ + display: inline-block; + margin-top: -2px; + width: 16px !important; + height: 16px !important; + margin-right: 10px; + color: #eeeeea; +} </style> 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..451f2a7 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" class="iconShowSpan"></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' } })) }) @@ -565,4 +562,11 @@ justify-content: left; margin-bottom: 15px; } + +.iconShowSpan{ + display: inline-block; + width: 14px !important; + height: 14px !important; + margin-right: 3px; +} </style> 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 ce496d7..443976c 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,9 +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>--> - <icon-show :name="data.icon"></icon-show> + <span style="display: flex"> + <icon-show :name="data.icon" class="iconShowSpan"></icon-show> {{ (node || {}).label }} </span> </span> @@ -251,7 +250,7 @@ id: item.id, name: item.name, leaf: !item.hasChildren, - icon: item.source || 'el-icon-s-home' + icon: item.source || 'iconoir:home' } })) }) @@ -555,4 +554,10 @@ margin-bottom: 15px; } +.iconShowSpan{ + display: inline-block; + width: 14px !important; + height: 14px !important; + margin-right: 3px; +} </style> -- Gitblit v1.9.3