From 8e84d2d1ef07e870506f5631c2628a8715394c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=BA=9A=E7=94=B7?= Date: Sat, 18 Sep 2021 14:46:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 4 +- src/components/iconfont/common.less | 12 ++ src/components/iconfont/iconfont.css | 47 +++++++ src/components/iconfont/iconfont.js | 1 + src/components/iconfont/iconfont.json | 65 +++++++++ src/components/iconfont/iconfont.ttf | Bin 0 -> 3864 bytes src/components/iconfont/iconfont.woff | Bin 0 -> 2628 bytes src/components/iconfont/iconfont.woff2 | Bin 0 -> 2156 bytes src/components/menu/index.js | 5 + src/components/tools/HeaderNotice.vue | 2 +- src/config/router.config.js | 127 +++++++++++++++++- src/main.js | 4 + src/store/modules/user.js | 77 +++-------- src/views/dashboard/Analysis.vue | 1 + src/views/dataDownload/DataDownload.vue | 13 ++ src/views/dataMember/DataMember.vue | 13 ++ src/views/meetingActivity/MeetingActivity.vue | 13 ++ src/views/mineContract/MineContract.vue | 13 ++ src/views/mineProject/MineProject.vue | 13 ++ src/views/subBidCommittee/SubBidCommittee.vue | 13 ++ src/views/workTeam/WorkTeam.vue | 13 ++ 21 files changed, 376 insertions(+), 60 deletions(-) create mode 100644 src/components/iconfont/common.less create mode 100644 src/components/iconfont/iconfont.css create mode 100644 src/components/iconfont/iconfont.js create mode 100644 src/components/iconfont/iconfont.json create mode 100644 src/components/iconfont/iconfont.ttf create mode 100644 src/components/iconfont/iconfont.woff create mode 100644 src/components/iconfont/iconfont.woff2 create mode 100644 src/views/dataDownload/DataDownload.vue create mode 100644 src/views/dataMember/DataMember.vue create mode 100644 src/views/meetingActivity/MeetingActivity.vue create mode 100644 src/views/mineContract/MineContract.vue create mode 100644 src/views/mineProject/MineProject.vue create mode 100644 src/views/subBidCommittee/SubBidCommittee.vue create mode 100644 src/views/workTeam/WorkTeam.vue diff --git a/src/api/api.js b/src/api/api.js index 7762312..ff3c2f6 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -31,7 +31,7 @@ const queryTreeListForRole = (params)=>getAction('/sys/role/queryTreeList',param const queryListAsync = (params)=>getAction('/sys/permission/queryListAsync',params) const queryRolePermission = (params)=>getAction('/sys/permission/queryRolePermission',params) const saveRolePermission = (params)=>postAction('/sys/permission/saveRolePermission',params) -const queryPermissionsByUser = ()=>getAction('/sys/permission/getUserPermissionByToken') +// const queryPermissionsByUser = ()=>getAction('/sys/permission/getUserPermissionByToken') const loadAllRoleIds = (params)=>getAction('/sys/permission/loadAllRoleIds',params) const getPermissionRuleList = (params)=>getAction('/sys/permission/getPermRuleListByPermId',params) const queryPermissionRule = (params)=>getAction('/sys/permission/queryPermissionRule',params) @@ -118,7 +118,7 @@ export { queryListAsync, queryRolePermission, saveRolePermission, - queryPermissionsByUser, + // queryPermissionsByUser, loadAllRoleIds, getPermissionRuleList, queryPermissionRule, diff --git a/src/components/iconfont/common.less b/src/components/iconfont/common.less new file mode 100644 index 0000000..b74d329 --- /dev/null +++ b/src/components/iconfont/common.less @@ -0,0 +1,12 @@ +/* 引入 icon class 文件 */ +@import "./iconfont.css"; + +/* 设置使用字体的优先级 anticon 高 */ +:global(.anticon) { /* :global() 是为了覆盖全局class .anticon 的样式 */ + &:before { + font-family: "anticon", "anticon-jeecg" !important; + /* 默认样式是这样 + font-family: "anticon" !important; + */ + } +} \ No newline at end of file diff --git a/src/components/iconfont/iconfont.css b/src/components/iconfont/iconfont.css new file mode 100644 index 0000000..cbb2d5b --- /dev/null +++ b/src/components/iconfont/iconfont.css @@ -0,0 +1,47 @@ +@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'); +} + +.anticon-jeecg { + font-family: "anticon-jeecg" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.anticonmeeting:before { + content: "\e60f"; +} + +.anticonproject:before { + content: "\e609"; +} + +.anticonpack:before { + content: "\e60a"; +} + +.anticonmember:before { + content: "\e60b"; +} + +.anticondata-network-disk:before { + content: "\e60c"; +} + +.anticonfinancial:before { + content: "\e60e"; +} + +.anticoncontract:before { + content: "\e608"; +} + +.anticoncompany:before { + content: "\e607"; +} + diff --git a/src/components/iconfont/iconfont.js b/src/components/iconfont/iconfont.js new file mode 100644 index 0000000..1eb2297 --- /dev/null +++ b/src/components/iconfont/iconfont.js @@ -0,0 +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 diff --git a/src/components/iconfont/iconfont.json b/src/components/iconfont/iconfont.json new file mode 100644 index 0000000..0ebc5f0 --- /dev/null +++ b/src/components/iconfont/iconfont.json @@ -0,0 +1,65 @@ +{ + "id": "2798517", + "name": "zx-project", + "font_family": "anticon-jeecg", + "css_prefix_text": "anticon", + "description": "", + "glyphs": [ + { + "icon_id": "24340808", + "name": "cus_meeting", + "font_class": "meeting1", + "unicode": "e60f", + "unicode_decimal": 58895 + }, + { + "icon_id": "24340604", + "name": "cus_project", + "font_class": "project", + "unicode": "e609", + "unicode_decimal": 58889 + }, + { + "icon_id": "24340605", + "name": "cus_pack", + "font_class": "pack", + "unicode": "e60a", + "unicode_decimal": 58890 + }, + { + "icon_id": "24340606", + "name": "cus_member", + "font_class": "member", + "unicode": "e60b", + "unicode_decimal": 58891 + }, + { + "icon_id": "24340607", + "name": "cus_data-network-disk", + "font_class": "data-network-disk", + "unicode": "e60c", + "unicode_decimal": 58892 + }, + { + "icon_id": "24340609", + "name": "cus_financial", + "font_class": "financial", + "unicode": "e60e", + "unicode_decimal": 58894 + }, + { + "icon_id": "24337509", + "name": "cus_contract", + "font_class": "contract", + "unicode": "e608", + "unicode_decimal": 58888 + }, + { + "icon_id": "24337464", + "name": "cus_company", + "font_class": "company", + "unicode": "e607", + "unicode_decimal": 58887 + } + ] +} diff --git a/src/components/iconfont/iconfont.ttf b/src/components/iconfont/iconfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..39f153ec993e8ab001665f56a7d249e9fb2259b8 GIT binary patch literal 3864 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 literal 0 HcmV?d00001 diff --git a/src/components/iconfont/iconfont.woff b/src/components/iconfont/iconfont.woff new file mode 100644 index 0000000000000000000000000000000000000000..b394c4d1bfbe31a4d75513b80bb8cc7a2b76ec00 GIT binary patch literal 2628 zcmY*ac{tQ-8~zQ3QF9VT!qJQxWM`&Hc0KgC+M}a`YBG?q1NnSpnrUY_< zBTZD1dFblyaO5)v`H>d^gL8J12tHt682BcD1c8DG0q@)hq&uJ%3eI5;_Rm$?w;a3g z?&$>poKv6&oCye?%Ss^lq&wgp@%TA=d3=Qf{(;99Ct0?t02O6{gnKX-YB2M1>(brhSNUHvf$Y`BrrC0L?&d%&bOPc#ARO6SR8K!Zq zNRjtx0AF93LYrh@RY1VHTXdi3?*Lt&PkO5D$!MNU3m%EbMrYOSc-I7Hc~&{>BLv<7 z;QZbFIGKDuWaXZJ?s7sc6LaQQ0&%wtx;Mh zIR6`@gKm-CpEWNW@W zMW*s{b3cpF=b+F`U|{+>|Coc zJAK-VgLpCO;B&^K(r#lH;{J4t>C>`ZQe&WfsjZ#rU^x@Dfa>YkL>u4-)oGLbJ5RJ|ML_MzrFDs>Nk!>+y5 zV85s<=YGpHKqPLJMHq3Q+ZF*8riwi?(^=p#TIHpqJ>-*&?xEX#GVQLkiyJR^61CmFnrVuHaxIgz$YIXIhiopPVv%^iM|`2-F9a(yr+)vY@+A>x0efH#Ez}zLfhU` zmF1Blu5B^4yGm!62J_*TLtEWXiuN+&M(49s0vTi0AIkrH|HZw$`3>>yUKmIFmyzQ8 zwAlr19az2h&oAo^FWki8JIC@s;;WZJ zR;1_*c~VflWGMm5m&D_3Gj&|9C5k^+D5m$vf@k6>r>Zn;)i}#YJO5s;Sk>?orAvkP zQYCFi>3O-r@$@h*WDtKNo*Lkv^iJy-XH2e+(l+ijty$3#;_TyRrO_G?pYpvkya&%ulraV?HRv0!GV9Q<4RZ2d z%c$Rk-`wGuSg6Y@(xxS3)?F?_wQM?QhAXsY3M@a4Q`706(imRFrgZ6#dkAfHNqGBl zBU1dT7JAZ?A2NWu4(uwVn;1gLt+3}S?YQMhetOhk!2=?cKk5bJc9+15-Cj6RAs>Cl z|N2|$wfFEEu?Pi!KdHp|u6g;CnmB9C#Psjwmr7eJNau3is8{^qJMfOAxK~dYUQAqy z9E)P(Z+MB`i#L^2-e}5mXGptcB+K?MW)qi6OVKrP%l)D<_g~C8jUA86Wt<+rm!zNlv6w%Q&&Z! z9K*Ifu3wLr2{kjbe-qsmYMk+^@P|}9`Id%bw_OXYTR@qA#1c2n8w7_^z1QS)l0NpkDPd(uHgLJPwB5s>LD$4&JkR+zo4{NH7N}Oy zNwkBDb^^6lr?uwXQgcw`Lnbqjwa4(AJ}UWXFemyLfY>`$3kKr(17JV@nELB1+K6!Gd=7U`n3$N!wXiS(|1-V} zk>I~AaWR&%J*%xw?kU0s-~Bm^vf7s`-fk&x69tYLIAT5fA02w8ygfcAID2wT9jm5# zs@Cz{;<0`a8H>VM>#|s+%;;cy{F34ixg;SUYVneoc#}s+fsOpV#pz0|<5@{kwXMlZ zk~_$r3!CLjDsCMaON#G8UET*5`czNpS^L4OHp!_y>{B>yFK*J!B`$fp zBU5AGL`dOK2gc~mr&71GUAKv`n=jtViy>>>@ZKLj z@xZgQ=UN8(f4LCH24v^Y=|;YK7yhesx>#7R#GI^i^}BA#$+!Ah1^b$cuSd`SJ?Vt@ zy+5Fi(|mKICv&m%cuC5->4mA=o6Zl#^J0IW=umg4)U*AT^We?=i>OMe4}k3KT)~V4 z!{89`v-0OU`bScW!iiRSIMkSFlA0&Pu|kc#J^Je8f?f;H0v%q`aGCda$+lfKKWa4&zXxaOV!A#=!?yVCH!*V=UGz1+Q;%ZxA8IbmZG5|Qu<8ZNIzX< Mj|IanWDfxU0j{#VqW}N^ literal 0 HcmV?d00001 diff --git a/src/components/iconfont/iconfont.woff2 b/src/components/iconfont/iconfont.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..4d3a5eb81537774be8332080ca1d6b71622ea0a2 GIT binary patch literal 2156 zcmV-y2$T1BPew8T0RR9100?XV3jhEB01p@d004BL{&28{`a8ly6dr>?>@_a4!-7P#^&S zKn=oCSy%v5A-yyhDExo|!2`Wp_9hd7_?kLZap*amh|Aagb(=re-ckTmDZ%b90jf4X z`*u0m$-W{BSzqBg{y?d7$M)uI2j6>3Hz$LXPH5lYOHb;N8l~c-PvLXdfC^)aKe+K_ zhh`BaI3`5O3M9d)wO04;(Z~>rF4C-*6Wg;F-8(iX|xyaENOBpI<CXmZGG0L zVNzLEj+2z8YZ>0duu#$>(F>y(WxkfL4O!Tqvv5%+RD9ht?`=#0O z3C53ffavr)-FkB2DY71u<)BEfh?j_azpq^h(| z+%R`Dzlk@V5XplJeY=PfbCi`UlvgQR;wBrPC7LdZ%PZ|`bBq@}jW=5VWY?PQt8_NR zP1Zh3E2=SGusW`;AjN3)llm!BiDEFe0!Yj0RcGr{0E2e?86{$IXhXCay75-JtPNQg zzmPkCoWxMoJ85DiTEKFv6iC#X$BcVy<){5y!|f&j=(&e0{D5B+%I1rl0fYlZQTtD@qzKt)^m z;D8V0+ZbI)tLUUzAC_qfL$zzFOz+lw8l(^x3y-O`(IDYYq6HkVwVKdZdeGL|OU?LY zKAWk_hun1G3%izK*0HAWzx3~BMl~kH4S%WDH*+JjDLm=la7L%wmg|`47wci)S4DF$ z3i30p)~XGgj+rcik7`@rSs&DQ<-2_C&V01A>e0I4l`M85{~~#d&&)xAz>>`imIwH% zpXf$BJM+=(Z^~`D@+YkS(xxr(z|1;&wg(%ta`t+5J)?Fw5V&^e(KYiDl45eQ>G-iH zP7qG9o?+G>0_%$R(p=F(JmyTqJAeaZiz`dksqQ_^eKiX+x}rJKc0z04AW$gxfA(E_ zf5KoQo40tcQFdU%XZfc`eh?wJvT%AiYny(EXF%`Dn`IxKm|a}3r>S-h_4O6>NY^GR9!>^roJvmLb0%3XBH`Dfc&6VAVV8(^uU zAEn+5-c-p?oTC-7dluTIi|CsIamk0s^)J$1#5;M$x|ER=pJKyHeV+bh%d0)@dzs!@vGrA|l*=H&^YUrgd7Bzlkuf_epJz>{s&~j^yPVw^x^k%NAg}lTkaZNQ z{$_1a0pp|5chnO?LD&LzFnF+)n7dP613= z4FRGgnQzHDQ`S%{aBhS*s9;bCB@Pvo8ruprEQX+t!(?bu!~RYdDLf((YItonUI7K! ze1ZxtpFv4B-zhcr18Ss;EU1$$8lcHsG2wC+<>I=Loxl(b8b6~Bm%>yD$hfcHYc2q{ zHo!XanR*=go3aBca@N!K`bMgG76hnxkBE+~4n&ihN(OW$`CQ=pl7>p|#Zk8r!+}`C zT6ToaWk4oT01Py88c^b#6?EW81ZFbAq@Ows7my^!Vgq22J;H~ff{c?ScK{U8JBP?p z+RB*MZZv}FyTBdqqcF8I3S?JKyKx@Aoe2UTD&WSRgx ik;>ByC-O4ZZV*gxhxzH + } if (icon === 'none' || icon === undefined) { return null } diff --git a/src/components/tools/HeaderNotice.vue b/src/components/tools/HeaderNotice.vue index c791ad7..e98c679 100644 --- a/src/components/tools/HeaderNotice.vue +++ b/src/components/tools/HeaderNotice.vue @@ -187,7 +187,7 @@ }, toMyAnnouncement(){ this.$router.push({ - path: '/isps/userAnnouncement' + path: '/system/userAnnouncementList' }) }, modalFormOk(){ diff --git a/src/config/router.config.js b/src/config/router.config.js index 61b12d8..f56fb76 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -34,7 +34,7 @@ export const constantRouterMap = [ { path: "login", name: "login", - component: () => import( /* webpackChunkName: "user" */ "@/views/user/Login") + component: () => import(/* webpackChunkName: "user" */ "@/views/user/Login") }, { path: "register", @@ -54,3 +54,128 @@ export const constantRouterMap = [ ] } ]; + +/** + * 页面路由 + * @type { *[] } + */ +export const routerData = [ + { + redirect: null, + path: '/dashboard/analysis', + component: 'dashboard/Analysis', + route: '1', + meta: { + icon: 'home', // 菜单前图标 + componentName: 'Analysis', + title: '首页' // 菜单名称 + }, + name: 'dashboard-analysis', + id: '1' + }, + { + redirect: null, + path: '/mineProject/MineProject', + component: 'mineProject/MineProject', + route: '2', + meta: { + icon: 'cus_project', // 菜单前图标 + componentName: 'MineProject', + title: '我的项目' // 菜单名称 + }, + name: 'mine-project', + id: '2' + }, + { + redirect: null, + path: '/subBidComittee/SubBidComittee', + component: 'subBidComittee/SubBidComittee', + route: '3', + meta: { + icon: 'team', // 菜单前图标 + componentName: 'SubBidComittee', + title: '分标委' // 菜单名称 + }, + name: 'sub-bid-comittee', + id: '3' + }, + { + redirect: null, + path: '/workTeam/WorkTeam', + component: 'workTeam/WorkTeam', + route: '4', + meta: { + icon: 'cus_member', // 菜单前图标 + componentName: 'WorkTeam', + title: '工作组' // 菜单名称 + }, + name: 'work-team', + id: '4' + }, + { + redirect: null, + path: '/dataMember/DataMember', + component: 'dataMember/DataMember', + route: '5', + meta: { + icon: 'cus_pack', // 菜单前图标 + componentName: 'DataMember', + title: '资料网员' // 菜单名称 + }, + name: 'data-member', + id: '5' + }, + { + redirect: null, + path: '/meetingActivity/MeetingActivity', + component: 'meetingActivity/MeetingActivity', + route: '6', + meta: { + icon: 'cus_meeting', // 菜单前图标 + componentName: 'MeetingActivity', + title: '会议活动' // 菜单名称 + }, + name: 'meeting-activity', + id: '6' + }, + { + redirect: null, + path: '/dataDownload/DataDownload', + component: 'dataDownload/DataDownload', + route: '7', + meta: { + icon: 'cus_data-network-disk', // 菜单前图标 + componentName: 'DataDownload', + title: '资料下载' // 菜单名称 + }, + name: 'data-download', + id: '7' + }, + { + redirect: null, + path: '/mineContract/MineContract', + component: 'mineContract/MineContract', + route: '8', + meta: { + icon: 'cus_contract', // 菜单前图标 + componentName: 'MineContract', + title: '我的合同' // 菜单名称 + }, + name: 'mine-contract', + id: '8' + }, + { + path: "/system/UserAnnouncementList", + component: 'system/UserAnnouncementList', + redirect: null, + hidden: true, + route: '9', + meta: { + icon: '', // 菜单前图标 + componentName: 'UserAnnouncementList', + title: '我的消息' // 菜单名称 + }, + name: 'user-announcement-list', + id: '9' + } +] \ No newline at end of file diff --git a/src/main.js b/src/main.js index a7c3e99..3870c01 100644 --- a/src/main.js +++ b/src/main.js @@ -26,6 +26,10 @@ import JeroComponents from '@/components/jero/index' import JDictSelectTag from './components/dict/index.js' import '@/utils/filter' // base filtermybatis-plus import vTrim from '@/utils/vTrim' +// Fontclass模式 +import '@/components/iconfont/common.less' +// 使用 symbol模式 支持多色 +import '@/components/iconfont/iconfont.js' Vue.config.productionTip = false Vue.use(Storage, config.storageOptions) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index bf11cfd..9107369 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -2,8 +2,8 @@ import Vue from 'vue' import { login, logout, phoneLogin, thirdLogin } from '@/api/login' import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA,TENANT_ID,CACHE_INCLUDED_ROUTES } from '@/store/mutation-types' import { welcome } from '@/utils/util' -import { queryPermissionsByUser } from '@/api/api' import { getAction } from '@/api/manage' +import { routerData } from "@/config/router.config"; const user = { state: { @@ -116,62 +116,27 @@ const user = { // 获取用户信息 GetPermissionList({ commit }) { return new Promise((resolve, reject) => { - queryPermissionsByUser().then(response => { - const menuData = [ - { - 'redirect': null, - 'path': '/dashboard/analysis', - 'component': 'dashboard/Analysis', - 'route': '1', - 'meta': { - 'icon': 'home', // 菜单前图标 - 'componentName': 'Analysis', - 'title': '首页' // 菜单名称 - }, - 'name': 'dashboard-analysis', - 'id': '1' - }, - { - 'redirect': null, - 'path': '', - 'component': '', - 'route': '1', - 'meta': { - 'icon': 'home', // 菜单前图标 - 'componentName': 'Analysis', - 'title': '菜单2' // 菜单名称 - }, - 'name': 'dashboard-analysis', - 'id': '2' - } - ] - const authData = [] - const allAuthData = [] - //Vue.ls.set(USER_AUTH,authData); - sessionStorage.setItem(USER_AUTH,JSON.stringify(authData)) - sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData)) - if (menuData && menuData.length > 0) { - //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------ - menuData.forEach((item) => { - if (item['children']) { - let hasChildrenMenu = item['children'].filter((i) => { - return !i.hidden || i.hidden == false - }) - if (hasChildrenMenu == null || hasChildrenMenu.length == 0) { - item['hidden'] = true - } + const menuData = routerData + const authData = [] + const allAuthData = [] + sessionStorage.setItem(USER_AUTH,JSON.stringify(authData)) + sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData)) + if (menuData && menuData.length > 0) { + menuData.forEach((item) => { + if (item['children']) { + let hasChildrenMenu = item['children'].filter((i) => { + return !i.hidden || i.hidden == false + }) + if (hasChildrenMenu == null || hasChildrenMenu.length == 0) { + item['hidden'] = true } - }) - //console.log(" menu show json ", menuData) - //update--end--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------ - commit('SET_PERMISSIONLIST', menuData) - } else { - reject('getPermissionList: permissions must be a non-null array !') - } - resolve(response) - }).catch(error => { - reject(error) - }) + } + }) + commit('SET_PERMISSIONLIST', menuData) + resolve({result: {menu:menuData}}) + } else { + reject('getPermissionList: permissions must be a non-null array !') + } }) }, diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index ed47028..7fdd571 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -1,5 +1,6 @@ diff --git a/src/views/dataDownload/DataDownload.vue b/src/views/dataDownload/DataDownload.vue new file mode 100644 index 0000000..865f832 --- /dev/null +++ b/src/views/dataDownload/DataDownload.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/src/views/dataMember/DataMember.vue b/src/views/dataMember/DataMember.vue new file mode 100644 index 0000000..fa06663 --- /dev/null +++ b/src/views/dataMember/DataMember.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue new file mode 100644 index 0000000..7fb9e12 --- /dev/null +++ b/src/views/meetingActivity/MeetingActivity.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/src/views/mineContract/MineContract.vue b/src/views/mineContract/MineContract.vue new file mode 100644 index 0000000..f5bdbee --- /dev/null +++ b/src/views/mineContract/MineContract.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/src/views/mineProject/MineProject.vue b/src/views/mineProject/MineProject.vue new file mode 100644 index 0000000..d215660 --- /dev/null +++ b/src/views/mineProject/MineProject.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/src/views/subBidCommittee/SubBidCommittee.vue b/src/views/subBidCommittee/SubBidCommittee.vue new file mode 100644 index 0000000..de50e0c --- /dev/null +++ b/src/views/subBidCommittee/SubBidCommittee.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue new file mode 100644 index 0000000..68eeecc --- /dev/null +++ b/src/views/workTeam/WorkTeam.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file