diff --git a/src/assets/icon/iconfont.css b/src/assets/icon/iconfont.css
index 796ee406..4767809d 100644
--- a/src/assets/icon/iconfont.css
+++ b/src/assets/icon/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4236293 */
- src: url('iconfont.woff2?t=1693807596400') format('woff2'),
- url('iconfont.woff?t=1693807596400') format('woff'),
- url('iconfont.ttf?t=1693807596400') format('truetype');
+ src: url('iconfont.woff2?t=1694155470105') format('woff2'),
+ url('iconfont.woff?t=1694155470105') format('woff'),
+ url('iconfont.ttf?t=1694155470105') format('truetype');
}
.iconfont {
@@ -13,6 +13,54 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-yingyong:before {
+ content: "\e679";
+}
+
+.icon-file-set:before {
+ content: "\e607";
+}
+
+.icon-file-qb:before {
+ content: "\e604";
+}
+
+.icon-file-bzfg:before {
+ content: "\e601";
+}
+
+.icon-file-star:before {
+ content: "\e603";
+}
+
+.icon-shouye:before {
+ content: "\e6a5";
+}
+
+.icon-shezhi:before {
+ content: "\e608";
+}
+
+.icon-yujing:before {
+ content: "\e663";
+}
+
+.icon-qicheweixiu:before {
+ content: "\e681";
+}
+
+.icon-24gf-folderOpen:before {
+ content: "\eac5";
+}
+
+.icon-kucun_crm:before {
+ content: "\e606";
+}
+
+.icon-share-internal:before {
+ content: "\e618";
+}
+
.icon-chexiao:before {
content: "\e619";
}
diff --git a/src/assets/icon/iconfont.js b/src/assets/icon/iconfont.js
index acc56ee4..2a746987 100644
--- a/src/assets/icon/iconfont.js
+++ b/src/assets/icon/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4236293='',function(e){var t=(t=document.getElementsByTagName("script"))[t.length-1],c=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var a,o,i,l,n,h=function(t,c){c.parentNode.insertBefore(t,c)};if(c&&!e.__iconfont__svg__cssinject__){e.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}a=function(){var t,c=document.createElement("div");c.innerHTML=e._iconfont_svg_string_4236293,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(t=document.body).firstChild?h(c,t.firstChild):t.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),a()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=a,l=e.document,n=!1,v(),l.onreadystatechange=function(){"complete"==l.readyState&&(l.onreadystatechange=null,s())})}function s(){n||(n=!0,i())}function v(){try{l.documentElement.doScroll("left")}catch(t){return void setTimeout(v,50)}s()}}(window);
+window._iconfont_svg_string_4236293='',function(c){var l=(l=document.getElementsByTagName("script"))[l.length-1],a=l.getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,t,i,o,e,v=function(l,a){a.parentNode.insertBefore(l,a)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}h=function(){var l,a=document.createElement("div");a.innerHTML=c._iconfont_svg_string_4236293,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(l=document.body).firstChild?v(a,l.firstChild):l.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),h()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(i=h,o=c.document,e=!1,n(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,s())})}function s(){e||(e=!0,i())}function n(){try{o.documentElement.doScroll("left")}catch(l){return void setTimeout(n,50)}s()}}(window);
\ No newline at end of file
diff --git a/src/assets/icon/iconfont.json b/src/assets/icon/iconfont.json
index 767610da..5cfa06f9 100644
--- a/src/assets/icon/iconfont.json
+++ b/src/assets/icon/iconfont.json
@@ -5,6 +5,90 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
+ {
+ "icon_id": "1126128",
+ "name": "应用",
+ "font_class": "yingyong",
+ "unicode": "e679",
+ "unicode_decimal": 59001
+ },
+ {
+ "icon_id": "37283266",
+ "name": "icon-set",
+ "font_class": "file-set",
+ "unicode": "e607",
+ "unicode_decimal": 58887
+ },
+ {
+ "icon_id": "37283311",
+ "name": "icon-qb",
+ "font_class": "file-qb",
+ "unicode": "e604",
+ "unicode_decimal": 58884
+ },
+ {
+ "icon_id": "37283158",
+ "name": "icon-file-bzfg",
+ "font_class": "file-bzfg",
+ "unicode": "e601",
+ "unicode_decimal": 58881
+ },
+ {
+ "icon_id": "37283193",
+ "name": "icon-file-star",
+ "font_class": "file-star",
+ "unicode": "e603",
+ "unicode_decimal": 58883
+ },
+ {
+ "icon_id": "905458",
+ "name": "首页",
+ "font_class": "shouye",
+ "unicode": "e6a5",
+ "unicode_decimal": 59045
+ },
+ {
+ "icon_id": "1391283",
+ "name": "设置",
+ "font_class": "shezhi",
+ "unicode": "e608",
+ "unicode_decimal": 58888
+ },
+ {
+ "icon_id": "4784148",
+ "name": "预警",
+ "font_class": "yujing",
+ "unicode": "e663",
+ "unicode_decimal": 58979
+ },
+ {
+ "icon_id": "5755508",
+ "name": "汽车维修",
+ "font_class": "qicheweixiu",
+ "unicode": "e681",
+ "unicode_decimal": 59009
+ },
+ {
+ "icon_id": "7594875",
+ "name": "24gf-folderOpen",
+ "font_class": "24gf-folderOpen",
+ "unicode": "eac5",
+ "unicode_decimal": 60101
+ },
+ {
+ "icon_id": "19490928",
+ "name": "库存_crm",
+ "font_class": "kucun_crm",
+ "unicode": "e606",
+ "unicode_decimal": 58886
+ },
+ {
+ "icon_id": "34122240",
+ "name": "share-internal",
+ "font_class": "share-internal",
+ "unicode": "e618",
+ "unicode_decimal": 58904
+ },
{
"icon_id": "755531",
"name": "撤销",
diff --git a/src/assets/icon/iconfont.ttf b/src/assets/icon/iconfont.ttf
index c3232fd7..355878a9 100644
Binary files a/src/assets/icon/iconfont.ttf and b/src/assets/icon/iconfont.ttf differ
diff --git a/src/assets/icon/iconfont.woff b/src/assets/icon/iconfont.woff
index af2f25fb..a55723d3 100644
Binary files a/src/assets/icon/iconfont.woff and b/src/assets/icon/iconfont.woff differ
diff --git a/src/assets/icon/iconfont.woff2 b/src/assets/icon/iconfont.woff2
index a17e6086..82a6a579 100644
Binary files a/src/assets/icon/iconfont.woff2 and b/src/assets/icon/iconfont.woff2 differ
diff --git a/src/components/menu/SideMenu.vue b/src/components/menu/SideMenu.vue
index 48e0f4f2..ab8ad09c 100644
--- a/src/components/menu/SideMenu.vue
+++ b/src/components/menu/SideMenu.vue
@@ -144,6 +144,11 @@ export default {
}
+ /deep/ .icon-style {
+ max-width: 14px;
+ margin-right: 10px;
+ }
+
/* update_end author:sunjianlei date:20190509 for: 修改侧边导航栏滚动条的样式 */
diff --git a/src/components/menu/index.js b/src/components/menu/index.js
index d654ce35..6a42d0d8 100644
--- a/src/components/menu/index.js
+++ b/src/components/menu/index.js
@@ -179,11 +179,18 @@ export default {
if (icon === 'none' || icon === undefined) {
return null
}
- const props = {}
- typeof (icon) === 'object' ? props.component = icon : props.type = icon
- return (
-
- )
+ if (icon && icon.split('-')[0] === 'icon') {
+ console.log(icon.split('-')[0])
+ return (
+
+ )
+ } else {
+ const props = {}
+ typeof (icon) === 'object' ? props.component = icon : props.type = icon
+ return (
+
+ )
+ }
}
},
diff --git a/src/views/system/modules/icon/Icons.vue b/src/views/system/modules/icon/Icons.vue
index 4b18ced5..28ceaf28 100644
--- a/src/views/system/modules/icon/Icons.vue
+++ b/src/views/system/modules/icon/Icons.vue
@@ -54,6 +54,13 @@
+
+
+
@@ -64,6 +71,7 @@ const editIcons = ['edit', 'form', 'copy', 'scissor', 'delete', 'snippets', 'dif
const dataIcons = ['area-chart', 'pie-chart', 'bar-chart', 'dot-chart', 'line-chart', 'radar-chart', 'heat-map', 'fall', 'rise', 'stock', 'box-plot', 'fund', 'sliders']
const webIcons = ['lock', 'unlock', 'bars', 'book', 'calendar', 'cloud', 'cloud-download', 'code', 'copy', 'credit-card', 'delete', 'desktop', 'download', 'ellipsis', 'file', 'file-text', 'file-unknown', 'file-pdf', 'file-word', 'file-excel', 'file-jpg', 'file-ppt', 'file-markdown', 'file-add', 'folder', 'folder-open', 'folder-add', 'hdd', 'frown', 'meh', 'smile', 'inbox', 'laptop', 'appstore', 'link', 'mail', 'mobile', 'notification', 'paper-clip', 'picture', 'poweroff', 'reload', 'search', 'setting', 'share-alt', 'shopping-cart', 'tablet', 'tag', 'tags', 'to-top', 'upload', 'user', 'video-camera', 'home', 'loading', 'loading-3-quarters', 'cloud-upload', 'star', 'heart', 'environment', 'eye', 'camera', 'save', 'team', 'solution', 'phone', 'filter', 'exception', 'export', 'customer-service', 'qrcode', 'scan', 'like', 'dislike', 'message', 'pay-circle', 'calculator', 'pushpin', 'bulb', 'select', 'switcher', 'rocket', 'bell', 'disconnect', 'database', 'compass', 'barcode', 'hourglass', 'key', 'flag', 'layout', 'printer', 'sound', 'usb', 'skin', 'tool', 'sync', 'wifi', 'car', 'schedule', 'user-add', 'user-delete', 'usergroup-add', 'usergroup-delete', 'man', 'woman', 'shop', 'gift', 'idcard', 'medicine-box', 'red-envelope', 'coffee', 'copyright', 'trademark', 'safety', 'wallet', 'bank', 'trophy', 'contacts', 'global', 'shake', 'api', 'fork', 'dashboard', 'table', 'profile', 'alert', 'audit', 'branches', 'build', 'border', 'crown', 'experiment', 'fire', 'money-collect', 'property-safety', 'read', 'reconciliation', 'rest', 'security-scan', 'insurance', 'interation', 'safety-certificate', 'project', 'thunderbolt', 'block', 'cluster', 'deployment-unit', 'dollar', 'euro', 'pound', 'file-done', 'file-exclamation', 'file-protect', 'file-search', 'file-sync', 'gateway', 'gold', 'robot', 'shopping']
const logoIcons = ['android', 'apple', 'windows', 'ie', 'chrome', 'github', 'aliwangwang', 'dingding', 'weibo-square', 'weibo-circle', 'taobao-circle', 'html5', 'weibo', 'twitter', 'wechat', 'youtube', 'alipay-circle', 'taobao', 'skype', 'qq', 'medium-workmark', 'gitlab', 'medium', 'linkedin', 'google-plus', 'dropbox', 'facebook', 'codepen', 'amazon', 'google', 'codepen-circle', 'alipay', 'ant-design', 'aliyun', 'zhihu', 'slack', 'slack-square', 'behance', 'behance-square', 'dribbble', 'dribbble-square', 'instagram', 'yuque', 'alibaba', 'yahoo']
+const selfIcons = ['icon-kucun_crm', 'icon-24gf-folderOpen', 'icon-qicheweixiu', 'icon-yujing', 'icon-shezhi', 'icon-shouye', 'icon-file-star', 'icon-file-set']
export default {
name: 'Icons',
props: {
@@ -79,7 +87,8 @@ export default {
editIcons,
dataIcons,
webIcons,
- logoIcons
+ logoIcons,
+ selfIcons
},
choosedIcon: '',
activeIndex: ''