Merge pull request '修改管理路由代码' (#346) from tongChong/forgeplus-react:dev_military_competition into pre_dev_military

src/military/components/adminRouter/index.jsx

@@ -10,7 +10,7 @@ export default props => {
 
   const main_web_site_url =localStorage.chromesetting&& JSON.parse(localStorage.chromesetting).main_web_site_url;
   const current_main_site_url =localStorage.chromesetting&& JSON.parse(localStorage.chromesetting).current_main_site_url;
-
+  const noticeUrl =localStorage.chromesetting&& JSON.parse(localStorage.chromesetting).api_urls.notice;
   
   const [current,setCurrent]=useState(JSON.parse(sessionStorage.adminRouter||'[]'));
   function  handleClick (e){
@@ -47,7 +47,8 @@ export default props => {
   const competitionMenu = useMemo(() => {
     return <Menu>
       <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/competitions/list`}>竞赛列表</a></Menu.Item>
-      <Menu.Item><Link to="/expert/admin/competition">评审任务列表</Link></Menu.Item>
+      <Menu.Item><a rel="noopener noreferrer" href={`${main_web_site_url}/admin/competitions/region_zone_edit`}>赛区配置</a></Menu.Item>
+      <Menu.Item><Link to="/expert/admin/competition">竞赛评审列表</Link></Menu.Item>
     </Menu>
   });
 
@@ -75,8 +76,6 @@ export default props => {
       <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/apply_destroy_memos`}>申请删帖</a></Menu.Item>
       <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/managements/memo_reply_list`}>回复</a></Menu.Item>
       <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/forum_sections`}>版块配置</a></Menu.Item>
-      <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/banned_users`}>禁言列表</a></Menu.Item>
-      <Menu.Item><a target="_blank" rel="noopener noreferrer" href={`${main_web_site_url}/admin/forum_applies`}>版主审批</a></Menu.Item>
     </Menu>
   });
 
@@ -113,6 +112,11 @@ export default props => {
     </Menu>
   });
 
+  const noticeMenu = useMemo(() => {
+    return <Menu>
+      <Menu.Item><a rel="noopener noreferrer" href={`${noticeUrl}/admin/index#/`}>招标公告</a></Menu.Item>
+    </Menu>
+  });
 
   return (
     <div className="centerbox managements_menus clearfix">
@@ -152,8 +156,8 @@ export default props => {
         <div className="drop-div">权限管理</div>
       </Dropdown>
 
-      <Dropdown key={'configMenu'} overlay={configMenu} placement="bottomLeft">
+      <Dropdown key={'notice'} overlay={noticeMenu} placement="bottomLeft">
-        <div className="drop-div">网站配置</div>
+        <div className="drop-div">招标公告</div>
       </Dropdown>
     </div>
   )

src/military/expert/expertList/index.jsx

@@ -393,7 +393,7 @@ function RegisterList({ showNotification }) {
         >
           <button className="but41_fill">导入</button>
         </Upload>
-        <p className="link" onClick={() => { window.open(`${httpUrl}/busiAttachments/download/${window.location.host.indexOf('osredm') === -1 ? '883' : '136'}`) }}>专家注册表模板.xlsx</p>
+        <p className="link" onClick={() => { window.open(`${httpUrl}/busiAttachments/download/${window.location.host.indexOf('osredm') === -1 ? '171' : '137'}`) }}>专家注册表模板.xlsx</p>
         <p className='hint'>提示：只能在导入模版上增减数据，才能导入成功！</p>
       </Modal>
     </div>)

src/military/expert/fetch.js

@@ -3,8 +3,7 @@ import javaFetch from '../javaFetch';
 
 
 let settings = localStorage.chromesetting && JSON.parse(localStorage.chromesetting);
-let actionUrl = settings && settings.api_urls && settings.api_urls.expert ? settings.api_urls.expert : 'http://117.50.100.12:8066';
+let actionUrl = settings && settings.api_urls && settings.api_urls.task ? settings.api_urls.task : 'https://task.osredm.com';
-// http://117.50.100.12:8067/
 const service = javaFetch(actionUrl);
 export const httpUrl = actionUrl;
 export const main_web_site_url = settings && settings.main_web_site_url;