diff --git a/src/config/iconList.js b/src/config/iconList.js
new file mode 100644
index 0000000..338bdd4
--- /dev/null
+++ b/src/config/iconList.js
@@ -0,0 +1,49 @@
+export default [
+ {
+ label: "阿里云图标",
+ list: [
+ "iconfont icon-zhongyingwen",
+ "iconfont icon-caidan",
+ "iconfont icon-rizhi1",
+ "iconfont icon-zhuti",
+ "iconfont icon-suoping",
+ "iconfont icon-bug",
+ "iconfont icon-qq1",
+ "iconfont icon-weixin1",
+ "iconfont icon-shouji",
+ "iconfont icon-mima",
+ "iconfont icon-yonghu",
+ "iconfont icon-yanzhengma",
+ "iconfont icon-canshu",
+ "iconfont icon-dongtai",
+ "iconfont icon-iconset0265",
+ "iconfont icon-shujuzhanshi2",
+ "iconfont icon-tuichuquanping",
+ "iconfont icon-rizhi",
+ "iconfont icon-cuowutishitubiao",
+ "iconfont icon-debug",
+ "iconfont icon-iconset0216",
+ "iconfont icon-quanxian",
+ "iconfont icon-quanxian",
+ "iconfont icon-shuaxin",
+ "iconfont icon-bofangqi-suoping",
+ "iconfont icon-quanping",
+ "iconfont icon-navicon",
+ "iconfont icon-biaodan",
+ "iconfont icon-liuliangyunpingtaitubiao08",
+ "iconfont icon-caidanguanli",
+ "iconfont icon-cuowu",
+ "iconfont icon-wxbgongju",
+ "iconfont icon-tuichu",
+ "iconfont icon-daohanglanmoshi02",
+ "iconfont icon-changyonglogo27",
+ "iconfont icon-biaoge",
+ "iconfont icon-baidu1",
+ "iconfont icon-tubiao",
+ "iconfont icon-souhu",
+ "iconfont icon-msnui-360",
+ "iconfont icon-iframe",
+ "iconfont icon-huanyingye",
+ ]
+ }
+]
\ No newline at end of file
diff --git a/src/config/website.js b/src/config/website.js
index 848a762..4fd8523 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -25,10 +25,11 @@ export default {
},
//配置菜单的属性
menu: {
+ iconDefault: 'iconfont icon-caidan',
props: {
label: 'name',
path: 'path',
- icon: 'icon',
+ icon: 'source',
children: 'children'
}
}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d3769e5..a493442 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,20 +1,22 @@
import { setToken, removeToken } from '@/util/auth'
import { setStore, getStore } from '@/util/store'
-import { isURL } from '@/util/validate'
+import { isURL, validatenull } from '@/util/validate'
import { deepClone } from '@/util/util'
import webiste from '@/config/website'
import { loginByUsername, getUserInfo, getMenu, getTopMenu, logout, refeshToken, getButtons } from '@/api/user'
function addPath(ele, first) {
- const propsConfig = webiste.menu.props;
+ const menu = webiste.menu;
+ const propsConfig = menu.props;
const propsDefault = {
label: propsConfig.label || 'name',
path: propsConfig.path || 'path',
icon: propsConfig.icon || 'icon',
children: propsConfig.children || 'children'
}
- ele.icon = 'icon-caidan';
+ const icon = ele[propsDefault.icon];
+ ele[propsDefault.icon] = validatenull(icon) ? menu.iconDefault : icon;
const isChild = ele[propsDefault.children] && ele[propsDefault.children].length !== 0;
if (!isChild) ele[propsDefault.children] = [];
if (!isChild && first && !isURL(ele[propsDefault.path])) {
diff --git a/src/styles/avue.scss b/src/styles/avue.scss
new file mode 100644
index 0000000..de8c026
--- /dev/null
+++ b/src/styles/avue.scss
@@ -0,0 +1,15 @@
+//修改阿里巴巴图表库样式
+.iconfont{
+ margin-right: 5px;
+ font-size: 20px !important;
+}
+.avue-icon-select__item{
+ margin-bottom: 20px;
+}
+.avue-icon-select__list .iconfont{
+ padding: 20px;
+ font-size: 24px;
+}
+.avue-icon-select__list .iconfont:hover{
+ transform: scale(1.4);
+}
\ No newline at end of file
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 82a1d0b..d92bdc6 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -18,6 +18,8 @@
@import './media.scss';
//通用配置
@import './normalize.scss';
+//通用配置
+@import './avue.scss';
a{
text-decoration: none;
@@ -25,4 +27,4 @@ a{
}
*{
outline: none;
-}
\ No newline at end of file
+}
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 5dda3a4..8704eb4 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -26,6 +26,13 @@
slot="roleId">
{{row.roleName}}
+
+
+
+
+
+
{{row.deptName}}
@@ -35,256 +42,286 @@