diff --git a/src/assets/iconfonts/iconfont.css b/src/assets/iconfonts/iconfont.css new file mode 100644 index 0000000..b3c5423 --- /dev/null +++ b/src/assets/iconfonts/iconfont.css @@ -0,0 +1,76 @@ +@font-face { + font-family: "iconfont"; /* Project id 3409379 */ + src: url('iconfont.woff2?t=1653383362524') format('woff2'), + url('iconfont.woff?t=1653383362524') format('woff'), + url('iconfont.ttf?t=1653383362524') format('truetype'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 14px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + line-height: 32px; +} + +.icon-yonghuyouxiang-fanbai:before { + content: "\e616"; +} + +.icon-shoujihaoma-fanbai:before { + content: "\e615"; +} + +.icon-yonghunicheng-fanbai:before { + content: "\e614"; +} + +.icon-anquanshezhi-fanbai:before { + content: "\e613"; +} + +.icon-dengluzhanghao-fanbai:before { + content: "\e612"; +} + +.icon-suoshubumen-fanbai:before { + content: "\e611"; +} + +.icon-zhuangtai-fanbai:before { + content: "\e610"; +} + +.icon-a-zu33:before { + content: "\e60d"; +} + +.icon-a-lujing259:before { + content: "\e60c"; +} + +.icon-shouye5:before { + content: "\e60b"; +} + +.icon-shouye4:before { + content: "\e60a"; +} + +.icon-shouye3:before { + content: "\e609"; +} + +.icon-shouye2:before { + content: "\e608"; +} + +.icon-shouye1:before { + content: "\e607"; +} + +.icon-shouye:before { + content: "\e605"; +} + diff --git a/src/assets/iconfonts/iconfont.js b/src/assets/iconfonts/iconfont.js new file mode 100644 index 0000000..1124241 --- /dev/null +++ b/src/assets/iconfonts/iconfont.js @@ -0,0 +1 @@ +!function(c){var l,a,t,h,i,o='',e=(e=document.getElementsByTagName("script"))[e.length-1].getAttribute("data-injectcss"),n=function(c,l){l.parentNode.insertBefore(c,l)};if(e&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function s(){i||(i=!0,t())}function m(){try{h.documentElement.doScroll("left")}catch(c){return void setTimeout(m,50)}s()}l=function(){var c,l=document.createElement("div");l.innerHTML=o,o=null,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?n(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(t=l,h=c.document,i=!1,m(),h.onreadystatechange=function(){"complete"==h.readyState&&(h.onreadystatechange=null,s())})}(window); \ No newline at end of file diff --git a/src/assets/iconfonts/iconfont.json b/src/assets/iconfonts/iconfont.json new file mode 100644 index 0000000..068bf18 --- /dev/null +++ b/src/assets/iconfonts/iconfont.json @@ -0,0 +1,114 @@ +{ + "id": "3409379", + "name": "库房综合管理系统", + "font_family": "iconfont", + "css_prefix_text": "icon-", + "description": "", + "glyphs": [ + { + "icon_id": "29943155", + "name": "用户邮箱-反白", + "font_class": "yonghuyouxiang-fanbai", + "unicode": "e616", + "unicode_decimal": 58902 + }, + { + "icon_id": "29943067", + "name": "手机号码-反白", + "font_class": "shoujihaoma-fanbai", + "unicode": "e615", + "unicode_decimal": 58901 + }, + { + "icon_id": "29943063", + "name": "用户昵称-反白", + "font_class": "yonghunicheng-fanbai", + "unicode": "e614", + "unicode_decimal": 58900 + }, + { + "icon_id": "29943055", + "name": "安全设置-反白", + "font_class": "anquanshezhi-fanbai", + "unicode": "e613", + "unicode_decimal": 58899 + }, + { + "icon_id": "29942791", + "name": "登录账号-反白", + "font_class": "dengluzhanghao-fanbai", + "unicode": "e612", + "unicode_decimal": 58898 + }, + { + "icon_id": "29942549", + "name": "所属部门-反白", + "font_class": "suoshubumen-fanbai", + "unicode": "e611", + "unicode_decimal": 58897 + }, + { + "icon_id": "29932079", + "name": "状态-反白", + "font_class": "zhuangtai-fanbai", + "unicode": "e610", + "unicode_decimal": 58896 + }, + { + "icon_id": "29795508", + "name": "定位", + "font_class": "a-zu33", + "unicode": "e60d", + "unicode_decimal": 58893 + }, + { + "icon_id": "29794660", + "name": "关闭", + "font_class": "a-lujing259", + "unicode": "e60c", + "unicode_decimal": 58892 + }, + { + "icon_id": "29794633", + "name": "系统管理", + "font_class": "shouye5", + "unicode": "e60b", + "unicode_decimal": 58891 + }, + { + "icon_id": "29794580", + "name": "档案配置", + "font_class": "shouye4", + "unicode": "e60a", + "unicode_decimal": 58890 + }, + { + "icon_id": "29794435", + "name": "库房管理", + "font_class": "shouye3", + "unicode": "e609", + "unicode_decimal": 58889 + }, + { + "icon_id": "29794316", + "name": "门类管理", + "font_class": "shouye2", + "unicode": "e608", + "unicode_decimal": 58888 + }, + { + "icon_id": "29794182", + "name": "档案管理", + "font_class": "shouye1", + "unicode": "e607", + "unicode_decimal": 58887 + }, + { + "icon_id": "29793951", + "name": "首页", + "font_class": "shouye", + "unicode": "e605", + "unicode_decimal": 58885 + } + ] +} diff --git a/src/assets/iconfonts/iconfont.ttf b/src/assets/iconfonts/iconfont.ttf new file mode 100644 index 0000000..8c93414 Binary files /dev/null and b/src/assets/iconfonts/iconfont.ttf differ diff --git a/src/assets/iconfonts/iconfont.woff b/src/assets/iconfonts/iconfont.woff new file mode 100644 index 0000000..a1d77d4 Binary files /dev/null and b/src/assets/iconfonts/iconfont.woff differ diff --git a/src/assets/iconfonts/iconfont.woff2 b/src/assets/iconfonts/iconfont.woff2 new file mode 100644 index 0000000..3b32516 Binary files /dev/null and b/src/assets/iconfonts/iconfont.woff2 differ diff --git a/src/assets/images/tab_img.png b/src/assets/images/tab_img.png new file mode 100644 index 0000000..27d26bb Binary files /dev/null and b/src/assets/images/tab_img.png differ diff --git a/src/assets/images/tab_left.png b/src/assets/images/tab_left.png new file mode 100644 index 0000000..d181934 Binary files /dev/null and b/src/assets/images/tab_left.png differ diff --git a/src/assets/images/tab_right.png b/src/assets/images/tab_right.png new file mode 100644 index 0000000..f1f72b7 Binary files /dev/null and b/src/assets/images/tab_right.png differ diff --git a/src/assets/styles/iconfont.css b/src/assets/styles/iconfont.css deleted file mode 100644 index 0d3d758..0000000 --- a/src/assets/styles/iconfont.css +++ /dev/null @@ -1,23 +0,0 @@ -@font-face { - font-family: 'iconfont'; /* project id 3409379 */ - src: url('?#iefix') format('embedded-opentype'), - url('//at.alicdn.com/t/font_3409379_8kgavncra7e.woff2') format('woff2'), - url('//at.alicdn.com/t/font_3409379_8kgavncra7e.woff') format('woff'), - url('//at.alicdn.com/t/font_3409379_8kgavncra7e.ttf') format('truetype'), - url('#iconfont') format('svg'); -} - -.iconfont { - font-family: "iconfont" !important; - font-size: .16rem; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} -.font-icon { - width: 2em; - height: 2em; - fill: currentColor; - overflow: hidden; -} - diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 23e52db..93ab1eb 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -4,7 +4,7 @@ @import 'element-ui'; @import 'sidebar'; @import 'btn'; -@import 'iconfont.css'; +@import '~@/assets/iconfonts/iconfont.css'; @import 'yxk-admin'; body { diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 11ccf5a..c058ccb 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -465,6 +465,7 @@ .el-dialog{ position: relative; width: 620px; + margin-top: 16vh !important; padding: 2px; background: linear-gradient(135deg, transparent 10px, #339CFF 0) top left, linear-gradient(-135deg, transparent 10px, #339CFF 0) top right, @@ -633,4 +634,8 @@ // el-tree 最终节点不显示箭头 .is-leaf::before { color: transparent; +} + +.el-input__prefix{ + left: 8px; } \ No newline at end of file diff --git a/src/main.js b/src/main.js index ef25df4..06f031b 100644 --- a/src/main.js +++ b/src/main.js @@ -18,7 +18,7 @@ import permission from './components/Permission' import './assets/styles/element-variables.scss' // global css import './assets/styles/index.scss' -import './assets/icons/iconfont.js' +import './assets/iconfonts/iconfont.js' // 代码高亮 import VueHighlightJS from 'vue-highlightjs' diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index d54de55..1271c44 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -6,9 +6,10 @@
- + - + + diff --git a/src/views/system/job/module/header.vue b/src/views/system/job/module/header.vue index 60d3fd8..313eb6f 100644 --- a/src/views/system/job/module/header.vue +++ b/src/views/system/job/module/header.vue @@ -3,9 +3,10 @@ v-if="crud.props.searchToggle" class="head-search" > - + - + + diff --git a/src/views/system/log/search.vue b/src/views/system/log/search.vue index f72e06d..1b63319 100644 --- a/src/views/system/log/search.vue +++ b/src/views/system/log/search.vue @@ -4,6 +4,7 @@ v-model="query.blurry" clearable size="small" + prefix-icon="el-icon-search" placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 22fe8d5..3455753 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -6,7 +6,7 @@
- +
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 14d94d6..3ecd5d8 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -4,7 +4,7 @@
- +
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue index b6f8a79..d9c11c0 100644 --- a/src/views/system/user/center.vue +++ b/src/views/system/user/center.vue @@ -1,106 +1,97 @@