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 0000000..5e47ba0 Binary files /dev/null and b/src/assets/imgs/icon/icon_drafting_group.png differ 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 0000000..b67bff8 Binary files /dev/null and b/src/assets/imgs/icon/icon_drafting_group_act.png differ diff --git a/src/components/menu/SideMenu.vue b/src/components/menu/SideMenu.vue index eb32cb5..c26c7e4 100644 --- a/src/components/menu/SideMenu.vue +++ b/src/components/menu/SideMenu.vue @@ -172,5 +172,11 @@ } } } + // icon图片默认是选中的图片，如果没被选中，就设置灰掉 + .ant-menu-item:not(.ant-menu-item-selected) { + .icon-img { + filter: grayscale(100%); + } + } 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 @@