From 5c5ca99c447151764eb013d0aa72499673e7fbd0 Mon Sep 17 00:00:00 2001 From: danshihao Date: Tue, 16 Jan 2024 09:26:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=20=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=E5=9B=BE=E6=A0=87=E5=8F=8A=E5=9C=B0=E5=9D=80=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/development_address_config.js | 8 +++++++- public/local_production_address_config.js | 6 ++++++ public/production_address_config.js | 13 ++++++++----- src/assets/imgs/icon/icon_drafting_group.png | Bin 0 -> 562 bytes src/assets/imgs/icon/icon_drafting_group_act.png | Bin 0 -> 1689 bytes src/components/menu/SideMenu.vue | 6 ++++++ src/components/menu/index.js | 7 +++++++ .../draftingGroup/DraftingGroupManagement.vue | 6 +++--- .../DraftingGroupMemberUnitMaintenance.vue | 4 ++-- 9 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 src/assets/imgs/icon/icon_drafting_group.png create mode 100644 src/assets/imgs/icon/icon_drafting_group_act.png diff --git a/public/development_address_config.js b/public/development_address_config.js index e706057..e5bcfd3 100644 --- a/public/development_address_config.js +++ b/public/development_address_config.js @@ -13,7 +13,7 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; window._CONFIG["onlinePreviewDomainURL"] = "http://10.0.1.9:9012/onlinePreview"; // 会议管理报名二维码地址 小程序生成二维码用的 -window._CONFIG["singUpQRCodeURL"] = "http://10.0.1.9:21824/signupentrance" +window._CONFIG["singUpQRCodeURL"] = "http://bxxt.hzwlsoft.com/signupentrance" // 会议管理签到二维码地址 微信扫描二维码 跳转的 地址 要么全大写 要么全小写 window._CONFIG["singInQRCodeURL"] = "http://10.10.10.46:8055/signinurl" @@ -21,6 +21,12 @@ window._CONFIG["singInQRCodeURL"] = "http://10.10.10.46:8055/signinurl" // 页面显示用的会议报名二维码连接 // 报名页面迁移到企业端 地址需要修改为企业端的地址 window._CONFIG["singInQRCodHref"]= 'http://localhost:3001/signupentrance' +// 起草组报名页面-报名二维码网址 -生成小程序二维码使用 +window._CONFIG['singUpDraftTeamQRCodeURL'] = 'https://bxxt.hzwlsoft.com/signupdraftteamentrance' + +// 起草组成员维护-企业端报名入口 +window._CONFIG["singInDraftHref"]= 'http://localhost:3001/signupdraftteamentrance' + // 票据打印--寄件人单位名称 window._CONFIG["sendCompanyName"] = "中国汽车标准化研究院" // 票据打印--寄件人地址 diff --git a/public/local_production_address_config.js b/public/local_production_address_config.js index 5ba28db..a410c4e 100644 --- a/public/local_production_address_config.js +++ b/public/local_production_address_config.js @@ -22,6 +22,12 @@ window._CONFIG["singInQRCodeURL"] = "http://10.10.10.46:8066/signinurl" // window._CONFIG["singInQRCodHref"]= 'http://139.9.235.66/signupentrance' window._CONFIG["singInQRCodHref"]= 'http://10.10.10.46:8066/signupentrance' +// 起草组报名页面-报名二维码网址 -生成小程序二维码使用 +window._CONFIG['singUpDraftTeamQRCodeURL'] = 'https://bxxt.hzwlsoft.com/signupdraftteamentrance' + +// 起草组成员维护-企业端报名入口 +window._CONFIG["singInDraftHref"]= 'http://10.10.10.46:8066/signupdraftteamentrance' + // 票据打印--寄件人单位名称 window._CONFIG["sendCompanyName"] = "中国汽车标准化研究院" // 票据打印--寄件人地址 diff --git a/public/production_address_config.js b/public/production_address_config.js index cb49120..7bb11f7 100644 --- a/public/production_address_config.js +++ b/public/production_address_config.js @@ -9,7 +9,7 @@ window._CONFIG["staticDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/d window._CONFIG["pdfDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/pdf/pdfPreviewIframe"; window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; // 预览文件地址 -window._CONFIG["onlinePreviewDomainURL"] = "http://cwp.catarc.org.cn:8092/preview/onlinePreview"; +window._CONFIG["onlinePreviewDomainURL"] = "http://cwp.catarc.org.cn:8092/perview/onlinePreview"; // 会议管理报名二维码地址 window._CONFIG["singUpQRCodeURL"] = "https://cwp.catarc.org.cn/signupentrance" @@ -18,6 +18,12 @@ window._CONFIG["singInQRCodeURL"] = "https://cwp.catarc.org.cn/signinurl" // 页面显示用的会议报名二维码连接 window._CONFIG["singInQRCodHref"]= 'http://cwp.catarc.org.cn/signupentrance' +// 起草组报名页面-报名二维码网址 -生成小程序二维码使用 +window._CONFIG['singUpDraftTeamQRCodeURL'] = 'https://cwp.catarc.org.cn/signupdraftteamentrance' + +// 起草组成员维护-企业端报名入口 +window._CONFIG["singInDraftHref"]= 'http://cwp.catarc.org.cn/signupdraftteamentrance' + // 票据打印--寄件人单位名称 window._CONFIG["sendCompanyName"] = "中国汽车标准化研究院" // 票据打印--寄件人地址 @@ -26,7 +32,4 @@ window._CONFIG["sendAddress"] = "天津市东丽区先锋东路68号" window._CONFIG["sendPostCode"] = "300300" // 查看物流信息 -window._CONFIG["lookExpressDomainURL"] = "http://cwp.catarc.org.cn/lookExpressInfo" - -// 来款内部部署的ip -window._CONFIG["intranetUrl"] = "http://10.12.8.1/"; +window._CONFIG["lookExpressDomainURL"] = "http://cwp.catarc.org.cn/lookExpressInfo" \ No newline at end of file diff --git a/src/assets/imgs/icon/icon_drafting_group.png b/src/assets/imgs/icon/icon_drafting_group.png new file mode 100644 index 0000000000000000000000000000000000000000..5e47ba047f8c3ad68da5c7252b8383df5b9d2eb8 GIT binary patch literal 562 zcmV-20?qx2P)Px$>`6pHR5(w)ls$`6K@^71xz`Ix6R;5#L4~YEFmdioqhg^Jf{av! z2#Sb*Ko`W?VvE&At>#RUwaFHK6cTZZ6(j`7&Aje}1lADmjZvIxn0e20KIWWZDp=KO zwNj~6&IVbp*L%_FbiU`AaNeacCIQf9=3PMt;H!w#i75M>T`sWEXdF(GWUb%t?+Ji% zx!fHL2K9Ek{jLzGlsdr7`-3owqM^0+O`4|lD2kfH;c#a-kK=gLd#{{xYf7nO%)Db9 z`KM;H`7!KA5h|t5#c{kGY{s55@BI-XN@f9xXb?qFd!h&60bFp-Js$y$F)IMpMda%C zRBE-_?oz4rnVIj5Be~7Y`>eIy?K-XXLuNj-mDQOE@Fjp(A~G_Z5?>~w>v`}@wh z$1^m+(MfCVsX|~;TZMbAbw1D-Q_r&ON2}FZS4u50^WJGNGjEDWsN-C~E`Sdra$IZu zmYI)E0|9hJWaOwY!g|af=1N&>{S3et=iD`8 z%mX3{^ZUyJupuJn=K}t94Yk&*%>3F~d-G3W<4L;<;Dm^ro;3C?BDz6DZV_PU902#i zq)ooBC{5E#%zSVWAb|JIxhF*AbN|Cd;Qt)>6S2}XB(&%0E&u=k07*qoM6N<$f&;4x AwEzGB literal 0 HcmV?d00001 diff --git a/src/assets/imgs/icon/icon_drafting_group_act.png b/src/assets/imgs/icon/icon_drafting_group_act.png new file mode 100644 index 0000000000000000000000000000000000000000..b67bff80b84d0e6af2cc9b5446f6093f20161526 GIT binary patch literal 1689 zcmbVN4Qvxt9KSJwW20c)GKL9w9E8B|dLL`o-DMrlcI=Ceu~pW^nE875+MR3f&bu3J z$0EY~2+G&Sk~u|jVHguL6QT(QjoX}aA;yY{CPY-GfXpSp{9dAFzU$fs%#_F_@7{a& ze((4H{@?!kx=Ks-z1bLsS*okt4QS3YN7fSbKDd9i1x-uUs%9O-a&pa)fxURF0K*nv zm%Kj1=h?;!O4tfS#Sg8~u!_(aR=Ops0-+5WxE}^3*-6}ZcbLE>(MdGfJ+w!4!B(lN zLxYVSbzY&PP2fagOBr4ogJti9eRB;Uti% z^EQOlG_9;B{e(P5MS)5&R@$^F0ThKaPHoph3E`qZ!4M2X+0YS|Nn_Pk#ZdHC)x@|g9NO{Vv!+ATXf0~#$yQyYVaMTFQWx55SO}dFe8FelV zwW!9zwI5(u#*S)txwqut(C19;!#fH-`mv>FiKDW-@5_OWy?BZJWY-(_y_)^Q+sO0$QIA8He{Xp&0w$o$IZr3}%e_#CT-j&~6{pr|TEXI9R z)3g4y-^vQl*><}2Jk=5#z0ma1n!N7%iKT&k!&@`|dN1?RlR3T*Lo;7b4)xiTP7=)b?)uTIyccUdinX;d#>E&n*jFC^CQa(2c}ELAIduIvJCDn zwTvzM`NpYL+kKUk&{O;N3_nZ$u%_~hv7-gP!4(5Fn^v43A>%Uz`l|lpvpe&n2lUdh zvR4A)ndX&OGJ+@G?>~Ch+unKkVy^?_IHo2~8i!9zfBQ)Dtg diff --git a/src/components/menu/index.js b/src/components/menu/index.js index 4ef5846..4e76128 100644 --- a/src/components/menu/index.js +++ b/src/components/menu/index.js @@ -146,6 +146,13 @@ export default { ) }, renderIcon (icon) { + // 图片做菜单icon，cus_img_xxx.png, xxx_act.png放在assets/imgs/icon/ + // (act是激活后的图片，未激活时通过样式置灰) + if (icon !== 'none' && icon !== undefined && icon.indexOf('cus_img_') !== -1) { + const img = require('@/assets/imgs/icon/' + icon.substr(8) + '_act.png') + return () + } if (icon !== 'none' && icon !== undefined && icon.indexOf('cus_') !== -1) { let className = `anticon-jeecg anticon${icon.substr(4)}` return diff --git a/src/views/draftingGroup/DraftingGroupManagement.vue b/src/views/draftingGroup/DraftingGroupManagement.vue index 21a294c..7d58a9f 100644 --- a/src/views/draftingGroup/DraftingGroupManagement.vue +++ b/src/views/draftingGroup/DraftingGroupManagement.vue @@ -1,6 +1,6 @@