From 6012207a26a1ec841326d2ca7e3984855752d9c7 Mon Sep 17 00:00:00 2001
From: unknown <xiesi@csxjy.com>
Date: Thu, 3 Mar 2022 16:44:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E8=A1=A8=E6=A8=A1=E6=9D=BF=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/expert/expertList/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx
index e18ce7f99..436212e59 100644
--- a/src/military/expert/expertList/index.jsx
+++ b/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>)

From 75d789864a9c40f60a4eedd2243406503eccc13d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <hetongchong@csxjy.com>
Date: Thu, 3 Mar 2022 16:55:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/components/adminRouter/index.jsx | 16 ++++++++++------
 src/military/expert/fetch.js                  |  3 +--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/military/components/adminRouter/index.jsx b/src/military/components/adminRouter/index.jsx
index 5ec4397cc..8dbc40037 100644
--- a/src/military/components/adminRouter/index.jsx
+++ b/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">
-        <div className="drop-div">网站配置</div>
+      <Dropdown key={'notice'} overlay={noticeMenu} placement="bottomLeft">
+        <div className="drop-div">招标公告</div>
       </Dropdown>
     </div>
   )
diff --git a/src/military/expert/fetch.js b/src/military/expert/fetch.js
index e6d22ff3c..ca278fdef 100644
--- a/src/military/expert/fetch.js
+++ b/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';
-// http://117.50.100.12:8067/
+let actionUrl = settings && settings.api_urls && settings.api_urls.task ? settings.api_urls.task : 'https://task.osredm.com';
 const service = javaFetch(actionUrl);
 export const httpUrl = actionUrl;
 export const main_web_site_url = settings && settings.main_web_site_url;