From 514bdbc97289dbe0549b64ce151e87513d0381a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <1261960504@qq.com> Date: Thu, 13 Jan 2022 17:16:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BE=97=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/components/itemListPaper/index.jsx | 2 ++ .../task/components/itemListPaper/index.scss | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/military/task/components/itemListPaper/index.jsx b/src/military/task/components/itemListPaper/index.jsx index 70c1f949..20351d8c 100644 --- a/src/military/task/components/itemListPaper/index.jsx +++ b/src/military/task/components/itemListPaper/index.jsx @@ -157,6 +157,8 @@ export default Form.create()((props) => { {timeAgo(item.createdAt)} {item.status === 2 ? 胜出 : {item.checkStatus !== 1 ? paperCheckStatus[item.checkStatus] : applyStatusAllNameArr[item.status]}} + + {[5,6,7,8].includes(detailStatus) && item &&评审得分：{item.reviewFinalGrades}}
  • {((item.needComplain && detailStatus === 3) || (detailStatus === 5 && item.publicTaskComplain && item.checkStatus === 1 && item.status !== 2)) && (current_user.login === item.user.login) && diff --git a/src/military/task/components/itemListPaper/index.scss b/src/military/task/components/itemListPaper/index.scss index 4458d140..4e38d474 100644 --- a/src/military/task/components/itemListPaper/index.scss +++ b/src/military/task/components/itemListPaper/index.scss @@ -20,11 +20,11 @@ .fileCommentsList { background: #fafafa; - padding-top: .25rem; + padding-top: 0.25rem; } -.comments-item{ - margin-top:1rem; +.comments-item { + margin-top: 1rem; } .comments-content { text-align: left; @@ -36,11 +36,21 @@ background-color: #fff; } -.small-head{ +.small-head { max-width: 2rem; } -.clickable:hover{ +.clickable:hover { color: #4cacff; cursor: pointer; -} \ No newline at end of file +} + +.paper-grades { + margin-left:4rem; + font-size: 1rem; + color: #333333; + + .paper-grades-num{ + color: #FF0000; + } +} From e7f992385cf064b472c134e374afe9132cc9f78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <1261960504@qq.com> Date: Fri, 14 Jan 2022 10:45:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/expert/expertUser/reviewTasks/index.jsx | 2 -- src/military/expert/expertUser/taskDetail/index.jsx | 3 ++- src/military/expert/expertUser/taskDetail/index.scss | 11 +++++++++++ src/military/expert/fetch.js | 1 - src/military/expert/index.scss | 9 +-------- src/military/task/fetch.js | 4 ++-- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/military/expert/expertUser/reviewTasks/index.jsx b/src/military/expert/expertUser/reviewTasks/index.jsx index 372f2c82..c3027408 100644 --- a/src/military/expert/expertUser/reviewTasks/index.jsx +++ b/src/military/expert/expertUser/reviewTasks/index.jsx @@ -5,11 +5,9 @@ import { formatDuring } from 'educoder'; import Paginationtable from "../../../components/paginationTable"; import { getExpertTasks } from "../../api"; import { taskType, expertTaskStatus } from "../../static"; -import { httpUrl } from '../../fetch'; import './index.scss'; import '../../index.scss'; -const { Search } = Input; const Option = Select.Option; function ReviewTasks({ form, showNotification, match, history }) { diff --git a/src/military/expert/expertUser/taskDetail/index.jsx b/src/military/expert/expertUser/taskDetail/index.jsx index 6ea3d478..9202ea24 100644 --- a/src/military/expert/expertUser/taskDetail/index.jsx +++ b/src/military/expert/expertUser/taskDetail/index.jsx @@ -62,6 +62,7 @@ function ReviewTasks({ showNotification, match, history, current_user }) { title: '附件下载', dataIndex: 'opsFilesAttachments', key: 'opsFilesAttachments', + className:'text-tooltip', render: (text, record) => { return text && text.map(item => { return { downFile(item.id) }}>{item.fileName} @@ -336,6 +337,7 @@ function ReviewTasks({ showNotification, match, history, current_user }) { if (res.message.indexOf("成功")) { showNotification("保存成功"); setReload(Math.random()); + setVisible(false); } else { showNotification(res.message); } @@ -396,7 +398,6 @@ function ReviewTasks({ showNotification, match, history, current_user }) { - diff --git a/src/military/expert/expertUser/taskDetail/index.scss b/src/military/expert/expertUser/taskDetail/index.scss index 53d43210..e7b0a3f7 100644 --- a/src/military/expert/expertUser/taskDetail/index.scss +++ b/src/military/expert/expertUser/taskDetail/index.scss @@ -83,4 +83,15 @@ font-size: .7rem; margin: .75rem 1.75rem; } + + .text-tooltip{ + max-width: 200px; + overflow: hidden; + span{ + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } } diff --git a/src/military/expert/fetch.js b/src/military/expert/fetch.js index 083a285a..2797e2a6 100644 --- a/src/military/expert/fetch.js +++ b/src/military/expert/fetch.js @@ -4,7 +4,6 @@ import javaFetch from '../javaFetch'; let settings=JSON.parse(localStorage.chromesetting); let actionUrl = settings.api_urls && settings.api_urls.expert ? settings.api_urls.expert :'http://117.50.100.12:8066'; -// http://10.47.38.39:8088 // http://117.50.100.12:8067/ const service = javaFetch(actionUrl); export const httpUrl = actionUrl; diff --git a/src/military/expert/index.scss b/src/military/expert/index.scss index da433e6d..3a7ec304 100644 --- a/src/military/expert/index.scss +++ b/src/military/expert/index.scss @@ -178,11 +178,4 @@ } } -.text-tooltip{ - span{ - width: 100%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } -} + diff --git a/src/military/task/fetch.js b/src/military/task/fetch.js index a8380db6..f0915367 100644 --- a/src/military/task/fetch.js +++ b/src/military/task/fetch.js @@ -3,8 +3,8 @@ import javaFetch from '../javaFetch'; let settings=JSON.parse(localStorage.chromesetting); -// let actionUrl = settings.api_urls? settings.api_urls.task :'https://task.osredm.com'; -let actionUrl = 'http://117.50.100.12:8066' +let actionUrl = settings.api_urls? settings.api_urls.task :'https://task.osredm.com'; +// let actionUrl = 'http://117.50.100.12:8066' const service = javaFetch(actionUrl); export const httpUrl = actionUrl;