diff --git a/src/config/env.js b/src/config/env.js index 71a1b17..6a9fcc1 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -1,7 +1,7 @@ // 配置编译环境和线上环境之间的切换 let baseUrl = ''; -let iconfontVersion = ['567566_pwc3oottzol']; +let iconfontVersion = ['567566_pwc3oottzol', '1066523_fl1r6w21kv']; let iconfontUrl = `//at.alicdn.com/t/font_$key.css`; let codeUrl = `${baseUrl}/code` const env = process.env @@ -18,4 +18,4 @@ export { iconfontVersion, codeUrl, env -} \ No newline at end of file +} diff --git a/src/config/iconList.js b/src/config/iconList.js index 338bdd4..5867a73 100644 --- a/src/config/iconList.js +++ b/src/config/iconList.js @@ -1,6 +1,72 @@ export default [ { - label: "阿里云图标", + label: "通用图标", + list: [ + "iconfont iconicon_roundadd", + "iconfont iconicon_compile", + "iconfont iconicon_glass", + "iconfont iconicon_roundclose", + "iconfont iconicon_roundreduce", + "iconfont iconicon_delete", + "iconfont iconicon_shakehands", + "iconfont iconicon_task_done", + "iconfont iconicon_shakehands", + "iconfont iconicon_voipphone", + "iconfont iconicon_safety", + "iconfont iconicon_work", + "iconfont iconicon_study", + "iconfont iconicon_task", + "iconfont iconicon_subordinate", + "iconfont iconicon_star", + "iconfont iconicon_setting", + "iconfont iconicon_sms", + "iconfont iconicon_share", + "iconfont iconicon_secret", + "iconfont iconicon_scan_namecard", + "iconfont iconicon_principal", + "iconfont iconicon_send", + "iconfont iconicon_scan", + "iconfont iconicon_search", + "iconfont iconicon_refresh", + "iconfont iconicon_savememo", + "iconfont iconicon_QRcode", + "iconfont iconicon_im_keyboard", + "iconfont iconicon_redpacket", + "iconfont iconicon_photo", + "iconfont iconicon_qq", + "iconfont iconicon_phone", + "iconfont iconicon_namecard", + "iconfont iconicon_notice", + "iconfont iconicon_next_arrow", + "iconfont iconicon_left", + "iconfont iconicon_more", + "iconfont iconicon_details", + "iconfont iconicon_message", + "iconfont iconicon_mobilephone", + "iconfont iconicon_im_voice", + "iconfont iconicon_GPS", + "iconfont iconicon_ding", + "iconfont iconicon_exchange", + "iconfont iconicon_cspace", + "iconfont iconicon_doc", + "iconfont iconicon_dispose", + "iconfont iconicon_discovery", + "iconfont iconicon_community_line", + "iconfont iconicon_cloud_history", + "iconfont iconicon_coinpurse_line", + "iconfont iconicon_airplay", + "iconfont iconicon_at", + "iconfont iconicon_addressbook", + "iconfont iconicon_boss", + "iconfont iconicon_addperson", + "iconfont iconicon_affiliations_li", + "iconfont iconicon_addmessage", + "iconfont iconicon_addresslist", + "iconfont iconicon_add", + ] + }, + { + label: "系统图标", list: [ "iconfont icon-zhongyingwen", "iconfont icon-caidan", @@ -46,4 +112,4 @@ export default [ "iconfont icon-huanyingye", ] } -] \ No newline at end of file +] diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue index c85d1d4..01abafb 100644 --- a/src/views/desk/notice.vue +++ b/src/views/desk/notice.vue @@ -82,7 +82,7 @@ }, { label: "通知日期", - type: "date", + type: "releaseTime", prop: "date", format: "yyyy-MM-dd hh:mm:ss", valueFormat: "yyyy-MM-dd hh:mm:ss", diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue index a65cdd7..807d2a5 100644 --- a/src/views/system/dept.vue +++ b/src/views/system/dept.vue @@ -95,7 +95,7 @@ rules: [{ required: false, message: "请选择上级部门", - trigger: "blur" + trigger: "click" }] }, diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue index e5bb645..2f4ce00 100644 --- a/src/views/system/dict.vue +++ b/src/views/system/dict.vue @@ -95,7 +95,7 @@ rules: [{ required: false, message: "请选择上级字典", - trigger: "blur" + trigger: "click" }] }, { diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue index 8704eb4..c9409db 100644 --- a/src/views/system/menu.vue +++ b/src/views/system/menu.vue @@ -42,286 +42,301 @@