diff --git a/src/assets/imgs/icon/icon_committee.png b/src/assets/imgs/icon/icon_committee.png index da0a418..db18915 100644 Binary files a/src/assets/imgs/icon/icon_committee.png and b/src/assets/imgs/icon/icon_committee.png differ diff --git a/src/assets/imgs/icon/icon_data_members.png b/src/assets/imgs/icon/icon_data_members.png new file mode 100644 index 0000000..e6a0a11 Binary files /dev/null and b/src/assets/imgs/icon/icon_data_members.png differ diff --git a/src/assets/imgs/icon/icon_international_meeting.png b/src/assets/imgs/icon/icon_international_meeting.png new file mode 100644 index 0000000..b33551e Binary files /dev/null and b/src/assets/imgs/icon/icon_international_meeting.png differ diff --git a/src/assets/imgs/icon/icon_other_meeting.png b/src/assets/imgs/icon/icon_other_meeting.png new file mode 100644 index 0000000..c3ea48d Binary files /dev/null and b/src/assets/imgs/icon/icon_other_meeting.png differ diff --git a/src/assets/imgs/icon/icon_stander_member.png b/src/assets/imgs/icon/icon_stander_member.png new file mode 100644 index 0000000..e6a0a11 Binary files /dev/null and b/src/assets/imgs/icon/icon_stander_member.png differ diff --git a/src/assets/imgs/icon/icon_working_group.png b/src/assets/imgs/icon/icon_working_group.png index c87bd51..1eb1c91 100644 Binary files a/src/assets/imgs/icon/icon_working_group.png and b/src/assets/imgs/icon/icon_working_group.png differ diff --git a/src/components/iconfont/iconfont.css b/src/components/iconfont/iconfont.css index cbb2d5b..614eeaa 100644 --- a/src/components/iconfont/iconfont.css +++ b/src/components/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "anticon-jeecg"; /* Project id 2798517 */ - src: url('iconfont.woff2?t=1631613073967') format('woff2'), - url('iconfont.woff?t=1631613073967') format('woff'), - url('iconfont.ttf?t=1631613073967') format('truetype'); + src: url('iconfont.woff2?t=1639559463058') format('woff2'), + url('iconfont.woff?t=1639559463058') format('woff'), + url('iconfont.ttf?t=1639559463058') format('truetype'); } .anticon-jeecg { @@ -13,7 +13,27 @@ -moz-osx-font-smoothing: grayscale; } -.anticonmeeting:before { +.anticonothermeeting:before { + content: "\e621"; +} + +.anticonworking:before { + content: "\e61f"; +} + +.anticoninternational:before { + content: "\e61e"; +} + +.anticondatamembers:before { + content: "\e61d"; +} + +.anticoncommittee:before { + content: "\e613"; +} + +.anticonmeeting1:before { content: "\e60f"; } diff --git a/src/components/iconfont/iconfont.js b/src/components/iconfont/iconfont.js index 1eb2297..ff46c92 100644 --- a/src/components/iconfont/iconfont.js +++ b/src/components/iconfont/iconfont.js @@ -1 +1 @@ -!function(c){var t,e,a,n,o,i='',h=(h=document.getElementsByTagName("script"))[h.length-1].getAttribute("data-injectcss"),l=function(c,t){t.parentNode.insertBefore(c,t)};if(h&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function m(){o||(o=!0,a())}function d(){try{n.documentElement.doScroll("left")}catch(c){return void setTimeout(d,50)}m()}t=function(){var c,t;(t=document.createElement("div")).innerHTML=i,i=null,(c=t.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",t=c,(c=document.body).firstChild?l(t,c.firstChild):c.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(e=function(){document.removeEventListener("DOMContentLoaded",e,!1),t()},document.addEventListener("DOMContentLoaded",e,!1)):document.attachEvent&&(a=t,n=c.document,o=!1,d(),n.onreadystatechange=function(){"complete"==n.readyState&&(n.onreadystatechange=null,m())})}(window); \ No newline at end of file +!function(c){var t,a,e,o,l,n='',m=(m=document.getElementsByTagName("script"))[m.length-1].getAttribute("data-injectcss"),i=function(c,t){t.parentNode.insertBefore(c,t)};if(m&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function h(){l||(l=!0,e())}function d(){try{o.documentElement.doScroll("left")}catch(c){return void setTimeout(d,50)}h()}t=function(){var c,t;(t=document.createElement("div")).innerHTML=n,n=null,(c=t.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",t=c,(c=document.body).firstChild?i(t,c.firstChild):c.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),t()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(e=t,o=c.document,l=!1,d(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,h())})}(window); \ No newline at end of file diff --git a/src/components/iconfont/iconfont.json b/src/components/iconfont/iconfont.json index 0ebc5f0..530c808 100644 --- a/src/components/iconfont/iconfont.json +++ b/src/components/iconfont/iconfont.json @@ -5,6 +5,41 @@ "css_prefix_text": "anticon", "description": "", "glyphs": [ + { + "icon_id": "26512409", + "name": "cus_othermeeting", + "font_class": "othermeeting", + "unicode": "e621", + "unicode_decimal": 58913 + }, + { + "icon_id": "26512248", + "name": "cus_working", + "font_class": "working", + "unicode": "e61f", + "unicode_decimal": 58911 + }, + { + "icon_id": "26512241", + "name": "cus_international", + "font_class": "international", + "unicode": "e61e", + "unicode_decimal": 58910 + }, + { + "icon_id": "26512231", + "name": "cus_datamembers", + "font_class": "datamembers", + "unicode": "e61d", + "unicode_decimal": 58909 + }, + { + "icon_id": "26511116", + "name": "cus_committee", + "font_class": "committee", + "unicode": "e613", + "unicode_decimal": 58899 + }, { "icon_id": "24340808", "name": "cus_meeting", diff --git a/src/components/iconfont/iconfont.ttf b/src/components/iconfont/iconfont.ttf index 39f153e..ff11092 100644 Binary files a/src/components/iconfont/iconfont.ttf and b/src/components/iconfont/iconfont.ttf differ diff --git a/src/components/iconfont/iconfont.woff b/src/components/iconfont/iconfont.woff index b394c4d..7a84d10 100644 Binary files a/src/components/iconfont/iconfont.woff and b/src/components/iconfont/iconfont.woff differ diff --git a/src/components/iconfont/iconfont.woff2 b/src/components/iconfont/iconfont.woff2 index 4d3a5eb..1aa78c0 100644 Binary files a/src/components/iconfont/iconfont.woff2 and b/src/components/iconfont/iconfont.woff2 differ diff --git a/src/views/incomePayments/memberManage/MemberProjectList.vue b/src/views/incomePayments/memberManage/MemberProjectList.vue index 0709ca7..3f0ead5 100644 --- a/src/views/incomePayments/memberManage/MemberProjectList.vue +++ b/src/views/incomePayments/memberManage/MemberProjectList.vue @@ -83,7 +83,7 @@ import {JeroListMixin} from '@/mixins/JeroListMixin' import JYearDate from '@comp/jero/JYearDate' import MemberProjectModal from '@views/incomePayments/memberManage/modules/MemberProjectModal' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' -import IconImg from '@/assets/imgs/icon/icon_company_management.png' +import IconImg from '@/assets/imgs/icon/icon_data_members.png' import '@/assets/less/TableExpand.less' export default { diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue index 451ac78..84b6195 100644 --- a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue +++ b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue @@ -72,7 +72,7 @@ import {mixinDevice} from '@/utils/mixin' import {JeroListMixin} from '@/mixins/JeroListMixin' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' -import IconImg from '@/assets/imgs/icon/icon_company_management.png' +import IconImg from '@/assets/imgs/icon/icon_stander_member.png' export default { name: 'StardsMemberProject', diff --git a/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue b/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue index e664fd2..2185091 100644 --- a/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue +++ b/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue @@ -100,7 +100,7 @@