Merge branch 'dev_military_osredm' of http://106.75.45.236:3000/tongChong/forgeplus-react into expert_review

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 }) {

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 <a key={item.id} className="link" onClick={() => { downFile(item.id) }}>{item.fileName}</a>
@@ -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 }) {
               <Button className="mr10" type="primary" disabled={disabled} onClick={commitGrades}>提交评审结果</Button>
               <Button className="mr10" disabled={disabled} onClick={draft}>保存评审结果</Button>
               <Button className="butE3_border" onClick={cancel}>取消</Button>
-
             </div>
           </div>
         </TabPane>

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;
+    }
+  }
 }

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;

src/military/expert/index.scss

@@ -178,11 +178,4 @@
   }
 }
 
-.text-tooltip{
-  span{
-    width: 100%;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-}
+

src/military/task/components/itemListPaper/index.jsx

@@ -157,6 +157,8 @@ export default Form.create()((props) => {
                         </span>
                         <span className="color-grey9">{timeAgo(item.createdAt)}</span>
                         {item.status === 2 ? <img alt="胜出" className="mr5" src={winpng} /> : <span className="color-blue ml10">{item.checkStatus !== 1 ? paperCheckStatus[item.checkStatus] : applyStatusAllNameArr[item.status]}</span>}
+
+                        {[5,6,7,8].includes(detailStatus) && item &&<span className='paper-grades'>评审得分：<span className='paper-grades-num'>{item.reviewFinalGrades}</span></span>}
                       </li>
                       <li className="fr">
                         {((item.needComplain && detailStatus === 3) || (detailStatus === 5 && item.publicTaskComplain && item.checkStatus === 1 && item.status !== 2)) && (current_user.login === item.user.login) &&

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;
-}
+}
+
+.paper-grades {
+  margin-left:4rem;
+  font-size: 1rem;
+  color: #333333;
+
+  .paper-grades-num{
+    color: #FF0000;
+  }
+}

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;