From 16b89ea2f3f4e3e6af39fc89ed1b868b03b85aa7 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Jan 2022 16:55:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/expert/api.js | 9 +++++++++ src/military/expert/expertList/index.jsx | 4 ++-- src/military/expert/expertList/index.scss | 16 ++++++++++++---- .../expert/expertUser/reviewTasks/index.jsx | 2 +- .../expert/expertUser/taskDetail/index.jsx | 3 +-- src/military/expert/reviewResult/index.jsx | 17 ++++++++--------- src/military/expert/reviewRules/index.jsx | 14 ++++++++------ src/military/expert/selectExpert/index.jsx | 2 +- src/military/task/taskAdmin/index.jsx | 4 ++-- 9 files changed, 44 insertions(+), 27 deletions(-) diff --git a/src/military/expert/api.js b/src/military/expert/api.js index d9a1951b..1e698614 100644 --- a/src/military/expert/api.js +++ b/src/military/expert/api.js @@ -91,6 +91,15 @@ export function getScoringDetails(params) { }); } +// 查看最终得分排行 +export function getFinalScoreRankingList(params) { + return fetch({ + url: `/api/expertScoringDetails/getFinalScoreRankingList`, + method: 'get', + params, + }); +} + // 查看单个竞赛/任务的所有评分细则 export function getOpsScoringDetails(params) { return fetch({ diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx index c8c2fc32..d6a0efc1 100644 --- a/src/military/expert/expertList/index.jsx +++ b/src/military/expert/expertList/index.jsx @@ -256,11 +256,11 @@ function RegisterList({ showNotification }) { content:
{resData.successMessage &&

导入成功：

-

+

} {resData.failMessage &&

导入失败：

-

+

}
, }); diff --git a/src/military/expert/expertList/index.scss b/src/military/expert/expertList/index.scss index 4345b679..27f09d7d 100644 --- a/src/military/expert/expertList/index.scss +++ b/src/military/expert/expertList/index.scss @@ -18,13 +18,21 @@ .btn-group{ display: flex; } - .import-important{ - span{ - color: #df0002; +} +.import-important{ + text-align: left; + .mess{ + padding-left: 20px; + &.fail{ + height: 300px; + overflow-y: auto; } } + span{ + color: #df0002; + margin-left: 5px; + } } - .upload-modal{ .ant-modal-body{ text-align: center; diff --git a/src/military/expert/expertUser/reviewTasks/index.jsx b/src/military/expert/expertUser/reviewTasks/index.jsx index 45c89ee3..372f2c82 100644 --- a/src/military/expert/expertUser/reviewTasks/index.jsx +++ b/src/military/expert/expertUser/reviewTasks/index.jsx @@ -61,7 +61,7 @@ function ReviewTasks({ form, showNotification, match, history }) { dataIndex: 'status', key: 'status', render: (text, record) => { - return text === -1 ? 未审核 : 已审核 + return text === -1 ? 未评审 : 已评审 } }, ]; diff --git a/src/military/expert/expertUser/taskDetail/index.jsx b/src/military/expert/expertUser/taskDetail/index.jsx index 939dc8f3..6ea3d478 100644 --- a/src/military/expert/expertUser/taskDetail/index.jsx +++ b/src/military/expert/expertUser/taskDetail/index.jsx @@ -144,7 +144,7 @@ function ReviewTasks({ showNotification, match, history, current_user }) { } useEffect(() => { - getRules({ containerId, containerType, statusString: -1 }).then(response => { + getRules({ containerId, containerType}).then(response => { if (response && response.message === "success") { setRules(response.data); } @@ -231,7 +231,6 @@ function ReviewTasks({ showNotification, match, history, current_user }) { let params = { containerId, containerType, - isDistinct: false, expertId: current_user.expertId, }; current_user.expertId && getScoringDetails(params).then(res => { diff --git a/src/military/expert/reviewResult/index.jsx b/src/military/expert/reviewResult/index.jsx index 8237ee5e..7d0ca324 100644 --- a/src/military/expert/reviewResult/index.jsx +++ b/src/military/expert/reviewResult/index.jsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"; import Link from "react-router-dom/Link"; import PaginationTable from "src/military/components/paginationTable"; import GradesModal from "./gradesModal"; -import { getScoringDetails, getWinnersAndPublicists, selectWinnersAndPublicists } from "../api"; +import { getFinalScoreRankingList, getWinnersAndPublicists, selectWinnersAndPublicists } from "../api"; import { Checkbox, Input, message, Modal } from "antd"; import sucess from './image/sucess.svg'; import './index.scss'; @@ -61,11 +61,9 @@ function ReviewResult({ history, match }) { const params = { containerId: taskId, containerType: 1, - isDistinct: true, - expertId: -1, orderBy: 'finalGradesDesc' } - getScoringDetails(params).then(response=>{ + getFinalScoreRankingList(params).then(response=>{ if(response && Array.isArray(response.data)){ //finalGrades 最终得分为null 未到评审时间 0 专家未评审任务 let index = 1; @@ -111,12 +109,12 @@ function ReviewResult({ history, match }) { function onOk(){ setErrorMessage("若未填写此排名，则公示所有名次"); if(!openRange){ - setErrorMessage('请输入公示范围!'); - }else if(isNaN(openRange)){ + setOpenRange(dataList.length+''); + }else if(openRange && isNaN(openRange)){ setErrorMessage('请输入数字!'); - }else if(openRange.indexOf('.')!==-1 || openRange.indexOf('-')!==-1){ + }else if(openRange && (openRange.indexOf('.')!==-1 || openRange.indexOf('-')!==-1)){ setErrorMessage('请输入正整数!'); - }else if(openRange > dataList.length){ + }else if(openRange && openRange > dataList.length){ setErrorMessage('公示范围超过应征者总数!'); }else{ const ids = []; @@ -131,6 +129,7 @@ function ReviewResult({ history, match }) { selectWinnersAndPublicists(params).then(response=>{ if(response && response.message === "success"){ message.success("操作成功"); + setOpenResultVisible(false); } }) } @@ -144,7 +143,7 @@ function ReviewResult({ history, match }) {

任务名称{decodeURI(name)}

-

任务链接{`${window.location.host}/task/taskDetail/${taskId}`}

+

任务链接{`${window.location.origin}/task/taskDetail/${taskId}`}

{status > 3 ?

应征者排名

diff --git a/src/military/expert/reviewRules/index.jsx b/src/military/expert/reviewRules/index.jsx index bac1fff4..52d0a59a 100644 --- a/src/military/expert/reviewRules/index.jsx +++ b/src/military/expert/reviewRules/index.jsx @@ -12,16 +12,18 @@ const {RangePicker} = DatePicker; function ReviewRules({form, history, match}) { const id = match.params.taskId; - const {name, status, createdAt, collectingEndTime, collectingDays} = queryString.parse(window.location.search.slice(1)); + const {name, status, createdAt, collectingEndTime, choosingDays} = queryString.parse(window.location.search.slice(1)); const { getFieldDecorator,setFieldsValue } = form; //是否有初始值 const [ initValue, setInitValue] = useState(false); const disabledDate = (current) =>{ if(status == 1){ - return current && current < moment(createdAt.replace("%20", " ")).endOf('day'); + const start = new Date((new Date(createdAt.replace("%20", " "))/1000 - 86400)*1000); + return current && current < moment(start).endOf('day'); }else if(status == 3){ - const endDate = new Date((new Date(collectingEndTime.replace("%20", " "))/1000 + 86400*collectingDays)*1000); - return current && current < moment(collectingEndTime.replace("%20", " ")).endOf('day') || current > moment(endDate).endOf('day'); + const start = new Date((new Date(collectingEndTime.replace("%20", " "))/1000 - 86400)*1000); + const endDate = new Date((new Date(collectingEndTime.replace("%20", " "))/1000 + 86400*(choosingDays))*1000); + return current && current < moment(start).endOf('day') || current > moment(endDate).endOf('day'); } } @@ -92,7 +94,7 @@ function ReviewRules({form, history, match}) {

任务名称{decodeURI(name)}

-

任务链接{`${window.location.host}/task/taskDetail/${id}`}

+

任务链接{`${window.location.origin}/task/taskDetail/${id}`}

-

评分标准注：管理员可设置1-5个评分项及对应评分标准，每个评分项固定设置为100分

+

评分标准注：管理员可设置1-5个评分项及对应评分标准，每个评分项固定设置为100分

diff --git a/src/military/expert/selectExpert/index.jsx b/src/military/expert/selectExpert/index.jsx index aa8eed41..8e9c2270 100644 --- a/src/military/expert/selectExpert/index.jsx +++ b/src/military/expert/selectExpert/index.jsx @@ -140,7 +140,7 @@ function SelectExpert(props) {

任务信息

任务名称{decodeURI(name)}

-

任务链接{`${window.location.host}/task/taskDetail/${taskId}`}

+

任务链接{`${window.location.origin}/task/taskDetail/${taskId}`}

} diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx index eb3613e0..9f912aaf 100644 --- a/src/military/task/taskAdmin/index.jsx +++ b/src/military/task/taskAdmin/index.jsx @@ -224,7 +224,7 @@ 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) ? 编辑 : 编辑 } }, { @@ -238,7 +238,7 @@ export default Form.create()(({ form, showNotification, match, history, state }) title: '评审任务', dataIndex: 'expertReview1', render: (text, record) => { - return record.expertReview && record.status < 4 && record.status !== 2 ? !record.assignRuleAndExperts ? : 已发布 :发布 + return record.assignRuleAndExperts ? 已发布 : record.expertReview && record.status < 4 && record.status !== 2 ? : 发布 } }, {