From 0e643287f9c8438eea8f7f07f17fab38670cdc5a Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 21 Jan 2022 15:29:14 +0800 Subject: [PATCH 01/25] =?UTF-8?q?issue=E5=88=97=E8=A1=A8=EF=BC=9A=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=B8=85=E9=99=A4=E6=8C=89=E9=92=AE=E3=80=81=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=97=B6=E6=B8=85=E9=99=A4=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Order/order.js | 65 ++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 19babaab..5728872b 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -220,9 +220,6 @@ class order extends Component { const { status_type } = this.state; this.getIssueList(status_type); }) - // this.state.select_params.order_name = key_name[0]; - // this.state.select_params.order_type = e.item.props.value; - // this.state.select_params.page = 1; }; getOption = (e, id, name, toGet) => { @@ -283,15 +280,15 @@ class order extends Component { // 翻页 ChangePage = (page) => { window.scrollTo(0,0); + const { status_type } = this.state; this.setState({ isSpin: true, checkedValue: [], - all: false + all: false, + },()=>{ + this.state.select_params.page=page; + this.getIssueList(status_type); }); - - const { status_type } = this.state; - this.state.select_params.page = page; - this.getIssueList(status_type); }; // 搜索 @@ -346,12 +343,12 @@ class order extends Component { ChangeAssign = (type) => { const { current_user } = this.props; this.setState({ - isSpin: true, + isSpin: true }); if (type) { if (!current_user) { this.setState({ - isSpin: false, + isSpin: false }); return; } @@ -385,7 +382,7 @@ class order extends Component { this.state.select_params.author_id = undefined; } const { status_type } = this.state; - + this.state.select_params.page = 1; this.getIssueList(status_type); }; @@ -563,6 +560,49 @@ class order extends Component { } }) } + + clearSelectParams=()=>{ + this.setState({ + status_type: "1", // 默认显示开启中的 + issue_tag_ids: "标记", + tracker_ids: "类型", + author_ids: "发布人", + assigned_to_ids: "负责人", + fixed_version_ids: "里程碑", + status_ids: "状态", + done_ratios: "完成度", + paix: "排序", + update_author_ids: "更换负责人", + update_fixed_version_ids: '更换里程碑', + update_status_ids: "修改状态", + begin: '', + end: '', + checkedValue: [], + allValue: [], + all: false, + search:undefined, + select_params: { + assigned_to_id: undefined, // 负责人 + author_id: undefined, // 发布人 + issue_tag_id: undefined, // 标记 + tracker_id: undefined, //类型 + done_ratio: undefined, // 完成度 + status_id: undefined, // 优先级 + fixed_version_id: undefined,//里程碑 + order_name: undefined, + order_type: undefined, + search: undefined, + update_author_id: undefined, + update_fixed_version_id: undefined, + update_status_id: undefined, + page: 1, + limit: 15, + } + },()=>{ + this.getIssueList("1"); + }) + } + menu =()=> ( this.getMenu(e)}> @@ -634,6 +674,7 @@ class order extends Component { />
+ 清除筛选条件 Date: Mon, 24 Jan 2022 15:57:11 +0800 Subject: [PATCH 02/25] cursor --- src/forge/Main/CoderDepot.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 004c46f2..949f031c 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -533,7 +533,7 @@ function CoderDepot(props){ 关于 { projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner" || projectDetail.permission==="Manager") && - setOpenModal(true)} className="iconfont icon-a-shezhi color-grey-9 font-15"> + setOpenModal(true)} className="iconfont icon-a-shezhi color-grey-9 font-15 pointer"> } {desc &&

{desc}

} From 5e337cb94f701bc2ccac524fa642e53f7f1902b9 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 26 Jan 2022 11:35:36 +0800 Subject: [PATCH 03/25] =?UTF-8?q?issue=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E6=97=B6=E5=85=B6=E5=AE=83=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E8=B5=B7=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Order/order.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 5728872b..f698f3be 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -210,8 +210,10 @@ class order extends Component { }); } } + const { select_params } = this.state; this.setState({ select_params:{ + ...select_params, order_name:key_name[0], order_type:e.item.props.value, page:1 From d8384ab4bdcec926f54cfda906b8b7d57e6aa44c Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 10 Feb 2022 16:00:54 +0800 Subject: [PATCH 04/25] =?UTF-8?q?=E5=BC=95=E6=93=8E-=E6=9D=83=E9=99=90-?= =?UTF-8?q?=E9=9D=9E=E6=8A=A5=E5=91=8A=E8=80=85=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/DevOps/About.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx index ec0a7f6d..4831f73b 100644 --- a/src/forge/DevOps/About.jsx +++ b/src/forge/DevOps/About.jsx @@ -36,15 +36,15 @@ function About(props, ref) { const [ disabled, setDisabled ] = useState(false); const [ typeFlag, setTypeFlag] = useState(false); - const AuthorLogin = props.projectDetail && props.projectDetail.author && props.projectDetail.author.login; + const isPermission = props.projectDetail && props.projectDetail.permission && props.projectDetail.permission!=="Reporter"; const CurrentLogin = props.current_user && props.current_user.login; useEffect(()=>{ - if(CurrentLogin === AuthorLogin){ + if(isPermission){ auth('get'); }else{ setIsSpining(false); } - },[AuthorLogin,CurrentLogin]) + },[isPermission,CurrentLogin]) function auth(type){ const url = `/${owner}/${projectsId}/ci_authorize.json`; @@ -167,7 +167,7 @@ function About(props, ref) {

定义DevOps工作流，帮助您检测bug、发布代码…

{ - CurrentLogin !== AuthorLogin ? + !isPermission ?
DevOps开启功能暂未对项目创建者以外的角色开放，可以联系项目创建者进行开启，开启后便可查看构建信息。
:"" } @@ -177,7 +177,7 @@ function About(props, ref) { 如何使用引擎（Engine）功能？ { - AuthorLogin === CurrentLogin ? + isPermission ? { step === 0 && !typeFlag ? From c13c7025dd2c10b12724a6c9f9735b8d258d4f89 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 11 Feb 2022 09:56:06 +0800 Subject: [PATCH 05/25] =?UTF-8?q?webhook-=E6=96=B0=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Settings/Webhooks/New.jsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index d05a261e..d6068490 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -180,9 +180,11 @@ function New({ form , match , showNotification , history }) { subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`} /> - Webhooks - - {id ? "更新" : "添加"}Webhook + + + Webhooks + + {/* {id ? "更新" : "添加"}Webhook */}

当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。更多信息可查阅webhooks指南。

From 9db4f1b18c2a920afbe3da0d5e0647dc840dbcb4 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 16 Feb 2022 10:37:24 +0800 Subject: [PATCH 06/25] 0216-issue --- src/forge/Component/DeleteModal/Index.jsx | 2 +- src/forge/Settings/Webhooks/New.jsx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/forge/Component/DeleteModal/Index.jsx b/src/forge/Component/DeleteModal/Index.jsx index c3c13689..f12b8ea8 100644 --- a/src/forge/Component/DeleteModal/Index.jsx +++ b/src/forge/Component/DeleteModal/Index.jsx @@ -25,7 +25,7 @@ function DeleteBox({ >
{content} -

{subTitle}

+

删除后未来事件将不会推送至此Webhook地址：{subTitle}

) diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index d6068490..fbc6e8c4 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -177,14 +177,14 @@ function New({ form , match , showNotification , history }) { onSuccess={onSuccess} title="删除Webhook" content="您确定要删除此Webhook吗？" - subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`} + subTitle={`${data && data.url}`} /> - Webhooks + + {id ? "更新" : "添加"}Webhook - {/* {id ? "更新" : "添加"}Webhook */}

当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。更多信息可查阅webhooks指南。

@@ -199,7 +199,7 @@ function New({ form , match , showNotification , history }) { } ] })( - + )} From b82e7d9d691ef074cf2f7e9b779e43734e2c3697 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 22 Feb 2022 11:39:53 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98-?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0page=E3=80=81limit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/TeamMember.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/Team/TeamMember.jsx b/src/forge/Team/TeamMember.jsx index d21d514f..b76d8eeb 100644 --- a/src/forge/Team/TeamMember.jsx +++ b/src/forge/Team/TeamMember.jsx @@ -24,7 +24,7 @@ function TeamMember({organizeDetail,current_user,history,match}){ setIsSpin(true); const url = `/organizations/${organizeDetail.id}/organization_users.json`; axios.get(url,{ - page,limit + params:{page,limit} }).then(result=>{ if(result && result.data){ setList(result.data.organization_users); @@ -76,7 +76,7 @@ function TeamMember({organizeDetail,current_user,history,match}){ { total >limit &&
- setPage(page)}/> + setPage(p)}/>
} From 9527f6948637c37eb120d238aa1840a1e61521f6 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 24 Feb 2022 14:22:09 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98-?= =?UTF-8?q?=E6=AF=8F=E9=A1=B5=E6=9D=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/TeamMember.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Team/TeamMember.jsx b/src/forge/Team/TeamMember.jsx index b76d8eeb..7bffb65d 100644 --- a/src/forge/Team/TeamMember.jsx +++ b/src/forge/Team/TeamMember.jsx @@ -6,7 +6,7 @@ import Nodata from '../Nodata'; import { Pagination , Spin } from 'antd'; import AddMemberBox from './Component/AddMemberBox'; -const limit = 15; +const limit = 16; function TeamMember({organizeDetail,current_user,history,match}){ const OIdentifier = match.params.OIdentifier; const [ page , setPage ] = useState(1); From 27f7eafa03973422cc5624b58312c054be9b5754 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 28 Feb 2022 10:45:58 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dissue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/users/Statistics/Index.jsx | 4 ++-- src/military/task/index.scss | 10 ++++++++++ src/military/task/taskList/index.jsx | 7 ++++--- src/modules/login/LoginDialog.css | 4 ++++ src/modules/login/LoginDialog.js | 2 ++ 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/forge/users/Statistics/Index.jsx b/src/forge/users/Statistics/Index.jsx index 64986c52..a536ae63 100644 --- a/src/forge/users/Statistics/Index.jsx +++ b/src/forge/users/Statistics/Index.jsx @@ -121,7 +121,7 @@ function Index(props) { } }).then(result=>{ if(result && result.data){ - setCloudData({categories:[]}); + setCloudData(result.data || []); } }).catch(error=>{}) } @@ -202,7 +202,7 @@ function Index(props) {

展示你擅长、关注、感兴趣的专业范围，通过你参与项目、收藏项目、关注项目、复刻项目等数据来统计。

{ - cloudData && cloudData.length >0? + cloudData && cloudData.categories ? : diff --git a/src/military/task/index.scss b/src/military/task/index.scss index fe484d80..36be5da3 100644 --- a/src/military/task/index.scss +++ b/src/military/task/index.scss @@ -128,4 +128,14 @@ span.list-gray { } .failByPression .ant-modal-body .anticon, .center-right-but .ant-input-search-icon:hover, .center-content .ant-pagination-item-active a{ color: #4154f1; +} +.go_profiles .ant-modal-body{ + text-align: center; + .anticon{ + color: #4154f1; + margin-left: 30px; + } + .ant-modal-confirm-btns{ + float: none; + } } \ No newline at end of file diff --git a/src/military/task/taskList/index.jsx b/src/military/task/taskList/index.jsx index 5e5dc6d9..f67fc088 100644 --- a/src/military/task/taskList/index.jsx +++ b/src/military/task/taskList/index.jsx @@ -11,7 +11,7 @@ import '../index.scss'; const Search = Input.Search; -export default ({ history, current_user, showLoginDialog, location }) => { +export default ({ history, current_user, showLoginDialog, location, mygetHelmetapi }) => { // console.log(current_user); let initType = getUrlToken('type', location.search) || ''; @@ -147,7 +147,7 @@ export default ({ history, current_user, showLoginDialog, location }) => { if (res) { if (res.message === 'success') { history.push("/task/taskAdd"); - } else if (res.message === '主体信息未认证') { + } else if (res.message === '未进行实体认证') { Modal.info({ title: '因为以下原因，您暂时不能进行本操作', content:
@@ -157,9 +157,10 @@ export default ({ history, current_user, showLoginDialog, location }) => {
, onOk: () => { - window.location.href = `/users/${current_user.login}/profiles`; + window.location.href = mygetHelmetapi && mygetHelmetapi.main_web_site_url + `/users/${current_user.login}/profiles`; }, okText: '立即完善', + className: 'go_profiles' }); } else { Modal.info({ diff --git a/src/modules/login/LoginDialog.css b/src/modules/login/LoginDialog.css index 409832b6..e729a826 100644 --- a/src/modules/login/LoginDialog.css +++ b/src/modules/login/LoginDialog.css @@ -159,3 +159,7 @@ .MuiModal-root-15 { z-index: 10001 !important; } + +.loginNotifion{ + z-index: 1000001; +} \ No newline at end of file diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index 06a0efbf..f636025a 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -388,6 +388,7 @@ class LoginDialog extends Component { message: '提示', description: response.data.message, duration: 5, + className: "loginNotifion" }); } } else { @@ -432,6 +433,7 @@ class LoginDialog extends Component { onClick: () => { }, + className: "loginNotifion" }); } openqqlogin = () => { From 7295349d336d8957d02c7dee866cb9de0a42cf38 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 28 Feb 2022 11:32:11 +0800 Subject: [PATCH 10/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=99=BB=E5=BD=95=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/SpecialModal.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/forge/Main/SpecialModal.jsx b/src/forge/Main/SpecialModal.jsx index 1454be67..2c9a21f8 100644 --- a/src/forge/Main/SpecialModal.jsx +++ b/src/forge/Main/SpecialModal.jsx @@ -16,7 +16,8 @@ function SpecialModal({ visible , hideModal , sureModal , showNotification , use function sure(){ if(!user_apply_signatures || (user_apply_signatures && user_apply_signatures.status !== "waiting")){ if(!id || (id && id.length === 0)){ - showNotification("请先提交文件进行审核！"); + // showNotification("请先提交文件进行审核！"); + getUrl(`/api/apply_signatures/template_file`) return; } const url = `/apply_signatures.json`; From 66e68f1626e8b9b12578c665065085473784f46d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 28 Feb 2022 15:45:17 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E4=B8=93=E4=B8=9A=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=EF=BC=8C=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=A4=B1=E8=B4=A5=E5=BC=B9=E6=A1=86=E8=A2=AB=E9=81=AE?= =?UTF-8?q?=E6=8C=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/users/Statistics/Index.jsx | 2 +- src/home/index.scss | 2 +- src/modules/login/LoginDialog.css | 4 ---- src/modules/login/LoginDialog.js | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/forge/users/Statistics/Index.jsx b/src/forge/users/Statistics/Index.jsx index a536ae63..3e91cedb 100644 --- a/src/forge/users/Statistics/Index.jsx +++ b/src/forge/users/Statistics/Index.jsx @@ -202,7 +202,7 @@ function Index(props) {

展示你擅长、关注、感兴趣的专业范围，通过你参与项目、收藏项目、关注项目、复刻项目等数据来统计。

{ - cloudData && cloudData.categories ? + cloudData && cloudData.categories && cloudData.categories.length >0 ? : diff --git a/src/home/index.scss b/src/home/index.scss index ea40b71f..2a1b113c 100644 --- a/src/home/index.scss +++ b/src/home/index.scss @@ -112,7 +112,7 @@ &.newHeaders { // background-color: #1a2358; background-color: #0037af; - z-index: 1000000; + z-index: 1000; } .newFooter{ background: inherit; diff --git a/src/modules/login/LoginDialog.css b/src/modules/login/LoginDialog.css index e729a826..409832b6 100644 --- a/src/modules/login/LoginDialog.css +++ b/src/modules/login/LoginDialog.css @@ -159,7 +159,3 @@ .MuiModal-root-15 { z-index: 10001 !important; } - -.loginNotifion{ - z-index: 1000001; -} \ No newline at end of file diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index f636025a..06a0efbf 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -388,7 +388,6 @@ class LoginDialog extends Component { message: '提示', description: response.data.message, duration: 5, - className: "loginNotifion" }); } } else { @@ -433,7 +432,6 @@ class LoginDialog extends Component { onClick: () => { }, - className: "loginNotifion" }); } openqqlogin = () => { From 22b3fe4a25ce47346cd075a2ca42273abc87d8cf Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 28 Feb 2022 16:29:17 +0800 Subject: [PATCH 12/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 10 + src/military/components/adminRouter/index.jsx | 79 +++--- src/military/expert.js | 12 +- src/military/managements.js | 227 ++++++++++++++++++ src/military/task.js | 12 +- 5 files changed, 285 insertions(+), 55 deletions(-) create mode 100644 src/military/managements.js diff --git a/src/App.js b/src/App.js index 9e71ffe3..c1f85fe2 100644 --- a/src/App.js +++ b/src/App.js @@ -90,9 +90,16 @@ const EducoderLogin = Loadable({ loading: Loading, }) +// 首页 const HomePage = Loadable({ loader: () => import('./home'), loading: Loading, +}); + +// 管理页面 +const Managements = Loadable({ + loader: () => import('./military/managements'), + loading: Loading, }) class App extends Component { @@ -277,6 +284,9 @@ class App extends Component { {/*专家评审*/} + {/*管理页面*/} + + {/*403*/} diff --git a/src/military/components/adminRouter/index.jsx b/src/military/components/adminRouter/index.jsx index 5ec4397c..4fabda35 100644 --- a/src/military/components/adminRouter/index.jsx +++ b/src/military/components/adminRouter/index.jsx @@ -20,7 +20,7 @@ export default props => { const projectMenu = useMemo(() => { return - 项目管理后台 + 项目管理后台 }); @@ -35,81 +35,74 @@ export default props => { 应征投稿协议内容 - 延期任务处理 - {/* 协议签订凭证上传 */} - 支付报酬凭证上传 + 延期任务处理 + 支付报酬凭证上传 - 创客任务列表 + 创客任务列表
}); const competitionMenu = useMemo(() => { - return - 竞赛列表 - 评审任务列表 + return + 竞赛列表 + 赛区配置 + 竞赛评审任务列表 }); - // const expertMenu = useMemo(() => { - // return - // 专家注册审核 - // 专家库 - // - // }); - const userMenu = useMemo(() => { return - 用户列表 - 主体信息列表 - 试用授权列表 - 自动授权列表 - 专家注册列表 - 专家库列表 + 用户列表 + 主体信息列表 + 试用授权列表 + 自动授权列表 + 专家注册列表 + 专家库列表 }); const forumMenu = useMemo(() => { return - 帖子 - 申请删帖 - 回复 - 版块配置 - 禁言列表 - 版主审批 + 帖子 + 申请删帖 + 回复 + 版块配置 + 禁言列表 + 版主审批 }); const checkMenu = useMemo(() => { return - 企业认证 - 开源项目 - 统筹任务发布审批 - 自主任务发布审批 - 成果/评论审批 - 成果上传申诉审批 - 公示期成果申诉审批 - 协议审批 - 成果举报申诉 - 评选佐证材料 + 企业认证 + 开源项目 + 统筹任务发布审批 + 自主任务发布审批 + 成果/评论审批 + 成果上传申诉审批 + 公示期成果申诉审批 + 协议审批 + 成果举报申诉 + 评选佐证材料 }); const limitsMenu = useMemo(() => { return - 权限组配置 - 权限操作配置 + 权限组配置 + 权限操作配置 }); const configMenu = useMemo(() => { return - 关于我们 - 首页版块 - 合作伙伴 + 关于我们 + 首页版块 + 合作伙伴 }); @@ -123,7 +116,7 @@ export default props => { -
+
创客
diff --git a/src/military/expert.js b/src/military/expert.js index c338755d..c626c860 100644 --- a/src/military/expert.js +++ b/src/military/expert.js @@ -16,10 +16,10 @@ const Review = Loadable({ loading: Loading, }); -const AdminRouter = Loadable({ - loader: () => import("./expert/adminRouter"), - loading: Loading, -}); +// const AdminRouter = Loadable({ +// loader: () => import("./expert/adminRouter"), +// loading: Loading, +// }); // const ReviewTasks = Loadable({ // loader: () => import("./expert/reviewTasks"), @@ -56,12 +56,12 @@ const Expert = (propsTransmit) => { > {/* 管理员管理 */} - ( )} - > + > */} ( diff --git a/src/military/managements.js b/src/military/managements.js new file mode 100644 index 00000000..905ea7bf --- /dev/null +++ b/src/military/managements.js @@ -0,0 +1,227 @@ +import React, { useEffect, useState } from "react"; + +import { Route, Switch } from "react-router-dom"; +import { withRouter } from "react-router"; +import { SnackbarHOC } from "educoder"; +import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC"; +import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC"; +import Loadable from "react-loadable"; +import Loading from "../Loading"; +import AdminRouter from "./components/adminRouter"; +import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC"; +import './index.scss'; + +{/* 任务管理审核 */} +const TaskManage = Loadable({ + loader: () => import("./task/taskManage"), + loading: Loading, +}); + +{/* 成果管理审核 */} +const PaperManage = Loadable({ + loader: () => import("./task/paperManage"), + loading: Loading, +}); + +{/* 成果申诉管理审核 */} +const PaperComplain = Loadable({ + loader: () => import("./task/paperComplain"), + loading: Loading, +}); + +const ProofManage = Loadable({ + loader: () => import("./task/proofManage"), + loading: Loading, +}); + +const PublicityComplain = Loadable({ + loader: () => import("./task/publicityComplain"), + loading: Loading, +}); + +const AgreementManage = Loadable({ + loader: () => import("./task/agreementManage"), + loading: Loading, +}); + +const PayProof = Loadable({ + loader: () => import("./task/payProof"), + loading: Loading, +}); + +const TaskAdmin = Loadable({ + loader: () => import("./task/taskAdmin"), + loading: Loading, +}); + +const DelayManage = Loadable({ + loader: () => import("./task/delayManage"), + loading: Loading, +}); + + + +// 专家库 +const ExpertList = Loadable({ + loader: () => import("./expert/expertList"), + loading: Loading, +}); +// 专家审核 +const RegisterList = Loadable({ + loader: () => import("./expert/registerList"), + loading: Loading, +}); +//创客任务评审规则 +const ReviewRules = Loadable({ + loader : () => import("./expert/reviewRules"), + loading: Loading, +}); +//创客任务选择评审专家 +const SelectExpert = Loadable({ + loader: () => import("./expert/selectExpert"), + loading: Loading, +}); +//创客任务评审结果查看 +const ReviewResult = Loadable({ + loader: () => import("./expert/reviewResult"), + loading: Loading, +}); +//竞赛评审任务列表 +const CompetitionList = Loadable({ + loader: () => import("./expert/competionList"), + loading: Loading, +}) + +const Managements = (propsF) => { + + return ( +
+ + + {/* 任务管理审核 */} + ( + + )} + > + + {/* 成果管理审核 */} + ( + + )} + > + + {/* 成果申诉管理审核 */} + ( + + )} + > + + {/* 公示期成果申诉管理审核 */} + ( + + )} + > + + {/* 佐证管理审核 */} + ( + + )} + > + + {/* 管理员协议审核 */} + ( + + )} + > + + {/* 管理员上传支付凭证 */} + ( + + )} + > + + {/* 管理员任务列表 */} + ( + + )} + > + + {/* 延期管理 */} + ( + + )} + > + + + + {/* 专家审核 */} + ( + + )} + > + {/* 专家库列表 */} + ( + + )} + > + {/* 创客任务评审规则 */} + ( + + )} + > + {/* 创客任务选择评审专家 */} + ( + + )} + > + {/* 创客任务评审结果查看 */} + ( + + )} + > + {/* 竞赛评审任务列表 */} + ( + + )} + > + +
+ ); +} + +export default withRouter( + ImageLayerOfCommentHOC({ + imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget", + parentSelector: ".newMain", + })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Managements)))) +); diff --git a/src/military/task.js b/src/military/task.js index 2cd35a11..39bdce8f 100644 --- a/src/military/task.js +++ b/src/military/task.js @@ -32,10 +32,10 @@ const MyTask = Loadable({ }); -const TaskAdminRouter = Loadable({ - loader: () => import("./task/taskAdminRouter"), - loading: Loading, -}); +// const TaskAdminRouter = Loadable({ +// loader: () => import("./task/taskAdminRouter"), +// loading: Loading, +// }); @@ -90,12 +90,12 @@ const Index = (propsTransmit) => { > {/* 管理员管理 */} - ( )} - > + > */} {/* 任务列表 */} Date: Tue, 1 Mar 2022 10:21:41 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/components/adminRouter/index.jsx | 48 +++++++++---------- .../components/adminRouter/index.scss | 3 ++ 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/military/components/adminRouter/index.jsx b/src/military/components/adminRouter/index.jsx index 4fabda35..8019dcee 100644 --- a/src/military/components/adminRouter/index.jsx +++ b/src/military/components/adminRouter/index.jsx @@ -13,8 +13,12 @@ export default props => { const [current,setCurrent]=useState(JSON.parse(sessionStorage.adminRouter||'[]')); + const [title,setTitle]=useState(''); + function handleClick (e){ + console.log(e) setCurrent([e.key]); + setTitle(e.item.props.title); sessionStorage.setItem( 'adminRouter',JSON.stringify([e.key])); }; @@ -35,19 +39,19 @@ export default props => { 应征投稿协议内容 - 延期任务处理 - 支付报酬凭证上传 + 延期任务处理 + 支付报酬凭证上传 - 创客任务列表 + 创客任务列表
}); const competitionMenu = useMemo(() => { - return + return 竞赛列表 赛区配置 - 竞赛评审任务列表 + 竞赛评审列表 }); @@ -57,8 +61,8 @@ export default props => { 主体信息列表 试用授权列表 自动授权列表 - 专家注册列表 - 专家库列表 + 专家注册列表 + 专家库列表 }); @@ -78,14 +82,14 @@ export default props => { return 企业认证 开源项目 - 统筹任务发布审批 - 自主任务发布审批 - 成果/评论审批 - 成果上传申诉审批 - 公示期成果申诉审批 - 协议审批 + 统筹任务发布审批 + 自主任务发布审批 + 成果/评论审批 + 成果上传申诉审批 + 公示期成果申诉审批 + 协议审批 成果举报申诉 - 评选佐证材料 + 评选佐证材料 }); @@ -106,31 +110,27 @@ export default props => { }); - + console.log(title); return (
-
+
项目
-
+
创客
-
竞赛
+
竞赛
 - {/* -
专家
- */} - -
用户
+
用户
 @@ -138,7 +138,7 @@ export default props => { -
审批
+
审批
 diff --git a/src/military/components/adminRouter/index.scss b/src/military/components/adminRouter/index.scss index 954e3e35..05cd3c52 100644 --- a/src/military/components/adminRouter/index.scss +++ b/src/military/components/adminRouter/index.scss @@ -11,6 +11,9 @@ box-sizing: border-box; position: relative; cursor: pointer; + &.active{ + color: #4154f1; + } &::after { content: ""; position: absolute; From 9b7eb2ab85604f4a120e2814046a8261b5cd4aa6 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Mar 2022 10:35:33 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=A8=A1=E6=9D=BF=E6=96=87=E4=BB=B6=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/expert/expertList/index.jsx | 4 ++-- src/military/expert/reviewResult/index.jsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx index 21666b5f..e18ce7f9 100644 --- a/src/military/expert/expertList/index.jsx +++ b/src/military/expert/expertList/index.jsx @@ -313,7 +313,7 @@ function RegisterList({ showNotification }) { Authorization: cookie.load('autologin_forge_military') || sessionStorage.osredmToken, }, }; - + return (
@@ -393,7 +393,7 @@ function RegisterList({ showNotification }) { > -

{ window.open(httpUrl + '/busiAttachments/download/883') }}>专家注册表模板.xlsx

+

{ window.open(`${httpUrl}/busiAttachments/download/${window.location.host.indexOf('osredm') === -1 ? '883' : '136'}`) }}>专家注册表模板.xlsx

提示：只能在导入模版上增减数据，才能导入成功！

) diff --git a/src/military/expert/reviewResult/index.jsx b/src/military/expert/reviewResult/index.jsx index 80f76c68..501ee07a 100644 --- a/src/military/expert/reviewResult/index.jsx +++ b/src/military/expert/reviewResult/index.jsx @@ -42,7 +42,7 @@ function ReviewResult({ history, match, mygetHelmetapi}) { } }, { - title: '平均得分', + title: '最终得分', dataIndex: 'finalGrades', key: 'phone', }, From d20314661a3f7b156c9e41940a972e41cab53bea Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Mar 2022 10:48:10 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/login/LoginDialog.js | 4 ++-- src/modules/user/LoginRegisterComponent.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index 3afe65a2..ab0a2a76 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Redirect } from 'react-router'; +import { Base64 } from 'js-base64'; import Dialog, { DialogActions, @@ -372,7 +372,7 @@ class LoginDialog extends Component { let url = '/accounts/login.json' axios.post(url, { login: newloginValue, - password: newpassValue, + password: Base64.encode(newpassValue), autologin: isGoingValue } ).then((response) => { diff --git a/src/modules/user/LoginRegisterComponent.js b/src/modules/user/LoginRegisterComponent.js index db369458..8a677e6c 100644 --- a/src/modules/user/LoginRegisterComponent.js +++ b/src/modules/user/LoginRegisterComponent.js @@ -1,6 +1,7 @@ import React, {Component} from 'react'; import {setmiyah,broadcastChannelPostMessage} from 'educoder'; import {Tabs, Input, Checkbox, Button, notification,Menu} from 'antd'; +import { Base64 } from 'js-base64'; import passopen from '../../../src/images/login/passopen.png'; import passoff from '../../../src/images/login/passoff.png'; import axios from 'axios'; @@ -350,7 +351,7 @@ class LoginRegisterComponent extends Component { var url = "/accounts/login.json"; axios.post(url, { login: this.state.login, - password: this.state.password, + password: Base64.encode(this.state.password), }).then((response) => { if (response === undefined) { From 768a44f8b3a4ae56e2c1906a6f9daa841e025092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Tue, 1 Mar 2022 15:52:02 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B4=E4=B8=AA?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=AF=BC=E8=88=AA=E6=9D=A1=E5=92=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=B7=AF=E7=94=B1=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 9 +++++-- src/forge/Main/IndexItem.js | 2 +- src/military/components/adminRouter/index.jsx | 2 -- src/modules/tpm/NewHeader.js | 26 ++++++++++++++++--- src/modules/tpm/css/headerExcess.css | 5 ++-- 5 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/App.js b/src/App.js index e93931c9..408abdbe 100644 --- a/src/App.js +++ b/src/App.js @@ -22,6 +22,7 @@ import { SnackbarHOC } from 'educoder'; import { initAxiosInterceptors } from './AppConfig' import { Provider } from 'react-redux'; import configureStore from './redux/stores/configureStore'; +import { indexOf } from 'lodash'; const store = configureStore(); window.marked = marked; const theme = createMuiTheme({ @@ -145,7 +146,7 @@ const Managements = Loadable({ // }) // 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。 -const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder","task","notice"]; +const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder","task","notice","managements","expert",]; class App extends Component { constructor(props) { @@ -196,7 +197,11 @@ class App extends Component { this.setState({ pathType: response.data.type || '404', pathName: pathname, - }) + }); + // 如果属于组织或者个人，那么存储该用户到sessionStorage中，作为判断是否为开源项目导航菜单的依据 + if(['User','Organization'].includes(response.data.type)){ + sessionStorage.setItem("pathname",pathname); + } } }); }else{ diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 632f5556..fecadb13 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -83,7 +83,7 @@ class IndexItem extends Component {
- + {item.author.name}/{item.name} { !item.is_public && 私有 } diff --git a/src/military/components/adminRouter/index.jsx b/src/military/components/adminRouter/index.jsx index 8019dcee..767b6169 100644 --- a/src/military/components/adminRouter/index.jsx +++ b/src/military/components/adminRouter/index.jsx @@ -11,12 +11,10 @@ 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 [current,setCurrent]=useState(JSON.parse(sessionStorage.adminRouter||'[]')); const [title,setTitle]=useState(''); function handleClick (e){ - console.log(e) setCurrent([e.key]); setTitle(e.item.props.title); sessionStorage.setItem( 'adminRouter',JSON.stringify([e.key])); diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index b635dfb5..1c2d10da 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -581,11 +581,28 @@ class NewHeader extends Component { matchpaths = (url) => { const { match } = this.props; - + let pathname=sessionStorage.pathname; if(url){ - if (match.path.indexOf(url) > -1) { + if (url.indexOf('forums') > -1 && match.path.indexOf('forums') > -1) { return true - }else { + // 开源项目，路由改版后，比较麻烦，因此使用多个进行判断 + } else if (url.indexOf('explore') > -1 && match.path.indexOf('explore') > -1) { + return true + // 开源项目，路由改版后，比较麻烦，因此使用多个进行判断 + } else if (url.indexOf('explore') > -1 && match.url.indexOf(pathname) > -1) { + return true + // 公告 + } else if (url.indexOf('/notice') > -1 && match.path.indexOf('/notice') > -1) { + return true + // 创客 + } else if (url.indexOf('/task') > -1 && match.path.indexOf('/task') > -1) { + return true + // 管理 + } else if (url.indexOf('/managements') > -1 && match.path.indexOf('/managements') > -1) { + return true + } else if (['http://117.50.100.12:8080','https://osredm.com','http://111.8.36.180:8000','http://localhost:3007'].includes(url) && match.path === '/') { + return true + } else { return false } } @@ -727,7 +744,8 @@ class NewHeader extends Component { var wl = waiLian && waiLian.length>0; return (
  • this.headtypesonClick(item.link, true)} className={`${this.matchpaths(item.link) === true ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}> - {item.name} + {item.name} + {/* target={wl ? "_self":"_blank"} */}
    • ) }) diff --git a/src/modules/tpm/css/headerExcess.css b/src/modules/tpm/css/headerExcess.css index 1dd4b0de..6c8c90ce 100644 --- a/src/modules/tpm/css/headerExcess.css +++ b/src/modules/tpm/css/headerExcess.css @@ -1,14 +1,15 @@ .head-nav ul#header-nav li:hover a, .head-nav ul#header-nav li.active a{ - color: #1484EF; + color: #466AFF; } .head-nav ul#header-nav li.active a::after{ content: ""; width: 100%; height:2px; - background-color: #1484EF; + background-color: #466AFF; left:0px; bottom: 12px; position: absolute; + margin-left: 0; } .login-box{ font-size: 15px; From e3f859b1315ff21cd63637b6581bba00a5b8dbc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Tue, 1 Mar 2022 16:13:21 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dwebhooks=20issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Settings/Webhooks/New.jsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index df331d3a..ed92c4ed 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -180,12 +180,11 @@ function New({ form , match , showNotification , history }) { subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`} /> - - - Webhooks - - - {/* */} + + Webhooks + + {id ? "更新" : "添加"}Webhook +

    当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。更多信息可查阅webhooks指南。

    From 6fc87e2ae3b2b326e9852c35fad24fd92878249a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Mar 2022 16:42:28 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F=E3=80=81=E5=BC=80=E6=BA=90=E9=A1=B9=E7=9B=AE=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=94=A8=E6=88=B7=E4=BB=A5=E5=8F=8A=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E3=80=81=E5=A4=B4=E5=83=8F=E6=82=AC=E5=81=9C=E6=A1=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=82=B9=E5=87=BB=E6=9C=AC=E9=A1=B5=E9=9D=A2=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=EF=BC=8C=E4=B8=8D=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=96=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/IndexItem.js | 2 +- src/modules/tpm/NewHeader.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 632f5556..fecadb13 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -83,7 +83,7 @@ class IndexItem extends Component {
    - + {item.author.name}/{item.name} { !item.is_public && 私有 } diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 13115740..28caac8a 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -727,7 +727,7 @@ class NewHeader extends Component { var wl = waiLian && waiLian.length>0; return (
  • this.headtypesonClick(item.link, true)} className={`${this.matchpaths(item.link) === true ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}> - {item.name} + {item.name}
    • ) }) @@ -835,7 +835,7 @@ class NewHeader extends Component { { settings && settings.personal && settings.personal.length > 0 && settings.personal.map((item,key)=>{ return( -
  • {item.name}
    • +
  • {item.name}
    • ) }) } From fb633779968554086d56a6e05e410feeacf190fd Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 2 Mar 2022 10:27:22 +0800 Subject: [PATCH 19/25] =?UTF-8?q?login=E9=A1=B5=E9=9D=A2logo=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/loginRegister/LoginRegisterPage.jsx | 2 +- src/modules/loginRegister/img/logo.svg | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/modules/loginRegister/img/logo.svg diff --git a/src/modules/loginRegister/LoginRegisterPage.jsx b/src/modules/loginRegister/LoginRegisterPage.jsx index 200aba0b..788bbf40 100644 --- a/src/modules/loginRegister/LoginRegisterPage.jsx +++ b/src/modules/loginRegister/LoginRegisterPage.jsx @@ -2,7 +2,7 @@ import React from "react"; import Login from "./Login"; import Register from "./Register"; import ResetPassword from "./ResetPassword"; -import logo from './img/logo.png'; +import logo from './img/logo.svg'; import banner from './img/banner.png'; import ball from './img/ball.png'; import img1 from './img/img1.png'; diff --git a/src/modules/loginRegister/img/logo.svg b/src/modules/loginRegister/img/logo.svg new file mode 100644 index 00000000..35501c2b --- /dev/null +++ b/src/modules/loginRegister/img/logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + From 3ae928449457ee168084622695bb2c5abca6fdc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Wed, 2 Mar 2022 14:10:23 +0800 Subject: [PATCH 20/25] 0304-issue --- src/forge/Main/Index.js | 2 +- src/forge/Settings/Webhooks/New.jsx | 4 ++-- src/forge/Team/Setting/TeamSettingCommon.jsx | 2 +- src/forge/users/InfosUser.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index c3268739..48d113d6 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -244,7 +244,7 @@ class Index extends Component { 更新时间排序 创建时间排序 - fork数据排序 + fork数量排序 点赞数量排序 ) diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index fbc6e8c4..2fee3bf0 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -260,11 +260,11 @@ function New({ form , match , showNotification , history }) { */} 创建 - 创建分支或标记 + 创建分支或标签 删除 - 删除分支或标记 + 删除分支或标签

    合并请求事件

    diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx index 6e98183f..72f01504 100644 --- a/src/forge/Team/Setting/TeamSettingCommon.jsx +++ b/src/forge/Team/Setting/TeamSettingCommon.jsx @@ -176,7 +176,7 @@ export default Form.create()( '最大仓库数：', "max_repo_creation", [], - ,false,false, + ,false,false, "当输入栏为空时，默认数量无限制" )}

    选择头像:

    diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js index fff3685e..4a5c7d9b 100644 --- a/src/forge/users/InfosUser.js +++ b/src/forge/users/InfosUser.js @@ -108,7 +108,7 @@ class InfosUser extends Component { 更新时间排序 创建时间排序 - fork数据排序 + fork数量排序 点赞数量排序 ); From 15b2ce6ea96740d2edced74bd6d7c30ff246c8ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <1261960504@qq.com> Date: Wed, 2 Mar 2022 15:10:18 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=9B=BE=E7=89=87issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/Setting/TeamSettingCommon.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx index 72f01504..3e0389e3 100644 --- a/src/forge/Team/Setting/TeamSettingCommon.jsx +++ b/src/forge/Team/Setting/TeamSettingCommon.jsx @@ -74,6 +74,7 @@ export default Form.create()( function getImage(image){ setImageFlag(true); setImage(image); + console.log(image); } // 删除组织 @@ -107,6 +108,7 @@ export default Form.create()( } callback(); } + return(
    @@ -180,7 +182,7 @@ export default Form.create()( "当输入栏为空时，默认数量无限制" )}

    选择头像:

    - +
    From b5fbde51af876f1c2ca17aada31bc723c8b5b4d7 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Mar 2022 16:02:25 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E4=B8=93=E5=AE=B6=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/expert/competionList/index.jsx | 13 +++++-------- src/military/expert/expertList/index.jsx | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/military/expert/competionList/index.jsx b/src/military/expert/competionList/index.jsx index c9ff51b5..e09efba1 100644 --- a/src/military/expert/competionList/index.jsx +++ b/src/military/expert/competionList/index.jsx @@ -95,16 +95,13 @@ function Competition(props){ } }, { - title: "开始时间", + title: "比赛时间", dataIndex: "start_time", - key: "startTime", - align: "center", - }, - { - title: "截止时间", - dataIndex: "end_time", - key: "endTime", + key: "time", align: "center", + render:(text, record)=>{ + return text +' ~ '+ record.end_time; + } }, { title: "报名人数", diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx index 895adcc5..bade655f 100644 --- a/src/military/expert/expertList/index.jsx +++ b/src/military/expert/expertList/index.jsx @@ -393,7 +393,7 @@ function RegisterList({ showNotification }) { > -

    { window.open(httpUrl + '/busiAttachments/download/134') }}>专家注册表模板.xlsx

    +

    { window.open(`${httpUrl}/busiAttachments/download/${window.location.host.indexOf('osredm') === -1 ? '171' : '137'}`) }}>专家注册表模板.xlsx

    提示：只能在导入模版上增减数据，才能导入成功！

    ) From 4264c127d9782d374c666c62930851a352fc597b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Mar 2022 09:53:27 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1->?= =?UTF-8?q?=E4=B8=93=E4=B8=9A=E5=AE=9A=E4=BD=8D=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/users/Statistics/Index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/users/Statistics/Index.jsx b/src/forge/users/Statistics/Index.jsx index 64986c52..21d6d0bd 100644 --- a/src/forge/users/Statistics/Index.jsx +++ b/src/forge/users/Statistics/Index.jsx @@ -121,7 +121,7 @@ function Index(props) { } }).then(result=>{ if(result && result.data){ - setCloudData({categories:[]}); + setCloudData(result.data || []); } }).catch(error=>{}) } @@ -202,7 +202,7 @@ function Index(props) {

    展示你擅长、关注、感兴趣的专业范围，通过你参与项目、收藏项目、关注项目、复刻项目等数据来统计。

    { - cloudData && cloudData.length >0? + cloudData && cloudData.categories && cloudData.categories.length > 0? : From 01a3566c1bee22c4d64f299a6ab6224aeb726897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Thu, 3 Mar 2022 11:25:30 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8E=E7=9A=84issue=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=AE=A1=E7=90=86=E7=9A=84=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/RouterUtil.js | 6 +- src/military/components/adminRouter/index.jsx | 9 +- src/military/expert.js | 18 +-- src/military/expert/adminRouter.js | 92 ------------ src/military/expert/competionList/index.jsx | 6 +- src/military/expert/expertList/index.jsx | 2 +- src/military/managements.js | 2 +- src/military/task.js | 7 - .../task/components/adminRouter/index.jsx | 138 ------------------ .../task/components/adminRouter/index.scss | 24 --- .../components/itemAgreementManage/index.jsx | 2 +- .../task/components/itemDelayManage/index.jsx | 2 +- .../task/components/itemPayProof/index.jsx | 2 +- .../task/components/itemProofManage/index.jsx | 2 +- .../itemPublicityComplain/index.jsx | 2 +- .../task/components/itemTaskManage/index.jsx | 2 +- src/military/task/taskAdmin/index.jsx | 6 +- src/military/task/taskAdminRouter.js | 136 ----------------- 18 files changed, 24 insertions(+), 434 deletions(-) delete mode 100644 src/military/expert/adminRouter.js delete mode 100644 src/military/task/components/adminRouter/index.jsx delete mode 100644 src/military/task/components/adminRouter/index.scss delete mode 100644 src/military/task/taskAdminRouter.js diff --git a/src/common/RouterUtil.js b/src/common/RouterUtil.js index 39cf0696..9adedfad 100644 --- a/src/common/RouterUtil.js +++ b/src/common/RouterUtil.js @@ -19,12 +19,12 @@ export function goUser(login) { localStorage.chromesetting && JSON.parse(localStorage.chromesetting).main_web_site_url; window.location.href = `${main_web_site_url}/accounts/${login}`; -// window.location.href = `/${login}`; } -export function goUserMes(login) { +export function goUserMes(user_id) { const main_web_site_url = localStorage.chromesetting && JSON.parse(localStorage.chromesetting).main_web_site_url; - window.location.href = `${main_web_site_url}/accounts/${login}`; + const login =sessionStorage.current_user &&JSON.parse(sessionStorage.current_user).login; + window.location.href = `${main_web_site_url}/users/${login}/message_detail?user_id=${user_id}`; } diff --git a/src/military/components/adminRouter/index.jsx b/src/military/components/adminRouter/index.jsx index 54e2bf43..2328006a 100644 --- a/src/military/components/adminRouter/index.jsx +++ b/src/military/components/adminRouter/index.jsx @@ -1,4 +1,4 @@ -import React, { useMemo,useState } from 'react'; +import React, { useEffect, useMemo,useState } from 'react'; import { Link } from "react-router-dom"; import { Menu, Dropdown, } from 'antd'; @@ -7,11 +7,14 @@ import './index.scss'; const { SubMenu } = Menu; export default props => { - + const {current_user}=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; - + useEffect(()=>{ + sessionStorage.setItem('current_user',JSON.stringify(current_user)); + },[current_user.login]); + const [current,setCurrent]=useState(JSON.parse(sessionStorage.adminRouter||'[]')); const [title,setTitle]=useState(''); diff --git a/src/military/expert.js b/src/military/expert.js index c626c860..5bad4b7c 100644 --- a/src/military/expert.js +++ b/src/military/expert.js @@ -16,15 +16,6 @@ const Review = Loadable({ loading: Loading, }); -// const AdminRouter = Loadable({ -// loader: () => import("./expert/adminRouter"), -// loading: Loading, -// }); - -// const ReviewTasks = Loadable({ -// loader: () => import("./expert/reviewTasks"), -// loading: Loading, -// }) const ExpertUser = Loadable({ loader: () => import("./expert/expertUser"), loading: Loading, @@ -54,14 +45,7 @@ const Expert = (propsTransmit) => { )} > - - {/* 管理员管理 */} - {/* ( - - )} - > */} + ( diff --git a/src/military/expert/adminRouter.js b/src/military/expert/adminRouter.js deleted file mode 100644 index 61d467f9..00000000 --- a/src/military/expert/adminRouter.js +++ /dev/null @@ -1,92 +0,0 @@ -import React from "react"; - -import { Route, Switch } from "react-router-dom"; -import Loadable from "react-loadable"; -import Loading from "../../Loading"; -import AdminRouter from "../components/adminRouter"; - -// 专家库 -const ExpertList = Loadable({ - loader: () => import("./expertList"), - loading: Loading, -}); -// 专家审核 -const RegisterList = Loadable({ - loader: () => import("./registerList"), - loading: Loading, -}); -//创客任务评审规则 -const ReviewRules = Loadable({ - loader : () => import("./reviewRules"), - loading: Loading, -}); -//创客任务选择评审专家 -const SelectExpert = Loadable({ - loader: () => import("./selectExpert"), - loading: Loading, -}); -//创客任务评审结果查看 -const ReviewResult = Loadable({ - loader: () => import("./reviewResult"), - loading: Loading, -}); -//竞赛评审任务列表 -const CompetitionList = Loadable({ - loader: () => import("./competionList"), - loading: Loading, -}) - -const AdminPage = (propsF) => { - - return ( - - - - {/* 专家审核 */} - ( - - )} - > - {/* 专家库列表 */} - ( - - )} - > - {/* 创客任务评审规则 */} - ( - - )} - > - {/* 创客任务选择评审专家 */} - ( - - )} - > - {/* 创客任务评审结果查看 */} - ( - - )} - > - {/* 竞赛评审任务列表 */} - ( - - )} - > - - - ); -} -// } -export default AdminPage; diff --git a/src/military/expert/competionList/index.jsx b/src/military/expert/competionList/index.jsx index e09efba1..b723f7d2 100644 --- a/src/military/expert/competionList/index.jsx +++ b/src/military/expert/competionList/index.jsx @@ -114,7 +114,7 @@ function Competition(props){ dataIndex: 'current_status', key: "rules", render: (text, record) => { - return record.assignRuleAndExperts ? : record.is_expert_audit && text<4 ? 编辑 : 编辑 + return record.assignRuleAndExperts ? : record.is_expert_audit && text<4 ? 编辑 : 编辑 } }, { @@ -122,7 +122,7 @@ function Competition(props){ dataIndex: 'current_status', key: "experts", render: (text, record) => { - return record.assignRuleAndExperts ? : record.is_expert_audit && text<4 ? 选择 : 选择 + return record.assignRuleAndExperts ? : record.is_expert_audit && text<4 ? 选择 : 选择 } }, { @@ -138,7 +138,7 @@ function Competition(props){ dataIndex: 'assignRuleAndExperts', key: "results", render: (text, record) => { - return text ? 查看:查看 + return text ? 查看:查看 } } ]; diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx index 89c86e8f..bf5e163a 100644 --- a/src/military/expert/expertList/index.jsx +++ b/src/military/expert/expertList/index.jsx @@ -373,7 +373,7 @@ function RegisterList({ showNotification }) { row.id} diff --git a/src/military/managements.js b/src/military/managements.js index 905ea7bf..098b8f02 100644 --- a/src/military/managements.js +++ b/src/military/managements.js @@ -174,7 +174,7 @@ const Managements = (propsF) => { {/* 专家审核 */} ( )} diff --git a/src/military/task.js b/src/military/task.js index 39bdce8f..84f58a2f 100644 --- a/src/military/task.js +++ b/src/military/task.js @@ -32,13 +32,6 @@ const MyTask = Loadable({ }); -// const TaskAdminRouter = Loadable({ -// loader: () => import("./task/taskAdminRouter"), -// loading: Loading, -// }); - - - const Index = (propsTransmit) => { // 开发时，从代理的位置获取用户信息 const [currentUser, setCurrentUser] = useState(propsTransmit.current_user); diff --git a/src/military/task/components/adminRouter/index.jsx b/src/military/task/components/adminRouter/index.jsx deleted file mode 100644 index 944de375..00000000 --- a/src/military/task/components/adminRouter/index.jsx +++ /dev/null @@ -1,138 +0,0 @@ -import React, { useMemo } from 'react'; -import { Menu, Dropdown, } from 'antd'; -import { current_main_site_url, main_web_site_url } from '../../static'; - -import './index.scss'; - -const { SubMenu } = Menu; - -export default props => { - - const projectMenu = useMemo(() => { - return - 项目管理后台 - - }); - - const taskMenu = useMemo(() => { - return - - 任务领域 - 行业信息 - 职位信息 - 需求导入模板 - 签订协议内容 - 应征投稿协议内容 - - - 延期任务处理 - {/* 协议签订凭证上传 */} - 支付报酬凭证上传 - - - 任务列表 - 创意征集评论 - - }); - - const competitionMenu = useMemo(() => { - return - 竞赛列表 - - }); - - const userMenu = useMemo(() => { - return - 用户列表 - 主体信息列表 - 试用授权列表 - 自动授权列表 - - }); - - const forumMenu = useMemo(() => { - return - 帖子 - 申请删帖 - 回复 - 版块配置 - 禁言列表 - 版主审批 - - }); - - - const checkMenu = useMemo(() => { - return - 企业认证 - 开源项目 - 统筹任务发布审批 - 自主任务发布审批 - 成果上传申诉审批 - 公示期成果申诉审批 - 协议审批 - 成果举报申诉 - 评选佐证材料 - - }); - - - const limitsMenu = useMemo(() => { - return - 权限组配置 - 权限操作配置 - - }); - - - const configMenu = useMemo(() => { - return - 关于我们 - 首页版块 - 合作伙伴 - - }); - - - return ( -
    - -
    - 项目 -
    -     - - -
    - 创客 -
    -     - - -
    竞赛
    -     - - -
    用户
    -     - - -
    论坛交流
    -     - - -
    审批
    -     - - -
    权限管理
    -     - - -
    网站配置
    -     - - -
    - ) -} \ No newline at end of file diff --git a/src/military/task/components/adminRouter/index.scss b/src/military/task/components/adminRouter/index.scss deleted file mode 100644 index 954e3e35..00000000 --- a/src/military/task/components/adminRouter/index.scss +++ /dev/null @@ -1,24 +0,0 @@ -.managements_menus { - background: #fff; - border: 1px solid #eee; - - .drop-div { - position: relative; - float: left; - width: 108px; - text-align: center; - padding: 15px 0px; - box-sizing: border-box; - position: relative; - cursor: pointer; - &::after { - content: ""; - position: absolute; - right: 1px; - top: 20px; - width: 1px; - height: 20px; - background-color: #ddd; - } - } -} diff --git a/src/military/task/components/itemAgreementManage/index.jsx b/src/military/task/components/itemAgreementManage/index.jsx index 9219d4a5..56f1ca80 100644 --- a/src/military/task/components/itemAgreementManage/index.jsx +++ b/src/military/task/components/itemAgreementManage/index.jsx @@ -100,7 +100,7 @@ export default Form.create()((props) => { { item.status === 2 && - { goUserMes(item.user.login) }}>私信 + { goUserMes(item.user.id) }}>私信 { agreeClick(item) }}>同意 { refuseClick(item) }}>驳回 diff --git a/src/military/task/components/itemDelayManage/index.jsx b/src/military/task/components/itemDelayManage/index.jsx index 92088f8d..3bd9aacb 100644 --- a/src/military/task/components/itemDelayManage/index.jsx +++ b/src/military/task/components/itemDelayManage/index.jsx @@ -152,7 +152,7 @@ export default Form.create()((props) => { { item.cancelStatus === 0 && - { goUserMes(item.user.login) }}>私信 + { goUserMes(item.user.id) }}>私信 { delayClick(item) }}>延期 { closeClick(item) }}>关闭 diff --git a/src/military/task/components/itemPayProof/index.jsx b/src/military/task/components/itemPayProof/index.jsx index 4e71b816..8cdabebc 100644 --- a/src/military/task/components/itemPayProof/index.jsx +++ b/src/military/task/components/itemPayProof/index.jsx @@ -62,7 +62,7 @@ export default Form.create()((props) => { {timeAgo(item.createdAt)} 发布方式: {item.task && item.task.publishMode === 1 ? '统筹任务' : '自主提交'} - { item.user && goUserMes(item.user.login) }}>私信 + { item.user && goUserMes(item.user.id) }}>私信
    diff --git a/src/military/task/components/itemProofManage/index.jsx b/src/military/task/components/itemProofManage/index.jsx index 74255d81..4de3b845 100644 --- a/src/military/task/components/itemProofManage/index.jsx +++ b/src/military/task/components/itemProofManage/index.jsx @@ -91,7 +91,7 @@ export default (props) => { { item.taskResultProof.status === 2 && - { goUserMes(item.user.login) }}>私信 + { goUserMes(item.user.id) }}>私信 { agreeClick(item) }}>同意 { refuseClick(item) }}>拒绝 diff --git a/src/military/task/components/itemPublicityComplain/index.jsx b/src/military/task/components/itemPublicityComplain/index.jsx index 08ad81bd..4a176b57 100644 --- a/src/military/task/components/itemPublicityComplain/index.jsx +++ b/src/military/task/components/itemPublicityComplain/index.jsx @@ -78,7 +78,7 @@ export default Form.create()((props) => { { goUser(item.user.login) }}>{item.user && (item.user.nickname || item.user.login)} {timeAgo(item.createdAt)} - { goUserMes(item.user.login) }}>私信 + { goUserMes(item.user.id) }}>私信 {item.status === 2 && { deal(item) }}>处理} diff --git a/src/military/task/components/itemTaskManage/index.jsx b/src/military/task/components/itemTaskManage/index.jsx index fc5601d6..74df438e 100644 --- a/src/military/task/components/itemTaskManage/index.jsx +++ b/src/military/task/components/itemTaskManage/index.jsx @@ -95,7 +95,7 @@ export default (props) => { { item.status === 1 && - { goUserMes(item.user.login) }}>私信 + { goUserMes(item.user.id) }}>私信 { agreeClick(item.id) }}>同意 { refuseClick(item.id) }}>拒绝 diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx index 8241c23a..4829b606 100644 --- a/src/military/task/taskAdmin/index.jsx +++ b/src/military/task/taskAdmin/index.jsx @@ -232,14 +232,14 @@ export default Form.create()(({ form, showNotification, match, history, state }) title: '评审规则', dataIndex: 'ruleEditedCount', render: (text, record) => { - return record.assignRuleAndExperts ? : record.expertReview && (record.status === 1 || record.status === 3) ? 编辑 : 编辑 + return record.assignRuleAndExperts ? : record.expertReview && (record.status === 1 || record.status === 3) ? 编辑 : 编辑 } }, { title: '专家选取', dataIndex: 'expertSelectedCount', render: (text, record) => { - return record.assignRuleAndExperts ? : record.expertReview && (record.status === 1 || record.status === 3) ? 选择 : 选择 + return record.assignRuleAndExperts ? : record.expertReview && (record.status === 1 || record.status === 3) ? 选择 : 选择 } }, { @@ -253,7 +253,7 @@ export default Form.create()(({ form, showNotification, match, history, state }) title: '评审结果', dataIndex: 'expertReview2', render: (text, record) => { - return record.assignRuleAndExperts ? 查看:查看 + return record.assignRuleAndExperts ? 查看:查看 } }, { diff --git a/src/military/task/taskAdminRouter.js b/src/military/task/taskAdminRouter.js deleted file mode 100644 index e6badd65..00000000 --- a/src/military/task/taskAdminRouter.js +++ /dev/null @@ -1,136 +0,0 @@ -import React from "react"; - -import { Route, Switch } from "react-router-dom"; -import Loadable from "react-loadable"; -import Loading from "../../Loading"; -import AdminRouter from "../components/adminRouter"; - - -const TaskManage = Loadable({ - loader: () => import("./taskManage"), - loading: Loading, -}); - -const PaperManage = Loadable({ - loader: () => import("./paperManage"), - loading: Loading, -}); - -const PaperComplain = Loadable({ - loader: () => import("./paperComplain"), - loading: Loading, -}); - -const ProofManage = Loadable({ - loader: () => import("./proofManage"), - loading: Loading, -}); - -const PublicityComplain = Loadable({ - loader: () => import("./publicityComplain"), - loading: Loading, -}); - -const AgreementManage = Loadable({ - loader: () => import("./agreementManage"), - loading: Loading, -}); - -const PayProof = Loadable({ - loader: () => import("./payProof"), - loading: Loading, -}); - -const TaskAdmin = Loadable({ - loader: () => import("./taskAdmin"), - loading: Loading, -}); - -const DelayManage = Loadable({ - loader: () => import("./delayManage"), - loading: Loading, -}); - -const AdminPage = (propsF) => { - - return ( - - - - {/* 任务管理审核 */} - ( - - )} - > - - {/* 成果管理审核 */} - ( - - )} - > - - {/* 成果申诉管理审核 */} - ( - - )} - > - - {/* 公示期成果申诉管理审核 */} - ( - - )} - > - - {/* 佐证管理审核 */} - ( - - )} - > - - {/* 管理员协议审核 */} - ( - - )} - > - - {/* 管理员上传支付凭证 */} - ( - - )} - > - - {/* 管理员任务列表 */} - ( - - )} - > - - {/* 延期管理 */} - ( - - )} - > - - - ); -} -// } -export default AdminPage; From 38b1a3704bdb16863f5de8fe1632822621ccbad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Thu, 3 Mar 2022 11:37:56 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E5=B8=A6=E6=9D=A5=E7=9A=84=E5=B0=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/expert/competionList/index.jsx | 2 +- src/military/task/taskAdmin/index.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/military/expert/competionList/index.jsx b/src/military/expert/competionList/index.jsx index b723f7d2..ac9a70b8 100644 --- a/src/military/expert/competionList/index.jsx +++ b/src/military/expert/competionList/index.jsx @@ -260,7 +260,7 @@ function Competition(props){ // 修改路由,跳转到第几页 function updateUrl(page){ setCurPage(page); - window.location.href=`/expert/admin/competition/#page=${page}`; + window.location.href=`/managements/expert/competition/#page=${page}`; } function hashDate(hash) { diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx index 4829b606..7b6a6c81 100644 --- a/src/military/task/taskAdmin/index.jsx +++ b/src/military/task/taskAdmin/index.jsx @@ -514,7 +514,7 @@ export default Form.create()(({ form, showNotification, match, history, state }) function setCurPage1(page){ setCurPage(page); - window.location.href=`/task/taskAdmin#page=${page}`; + window.location.href=`/managements/task/taskAdmin#page=${page}`; } // 改变排序字段