diff --git a/src/military/expert/expertUser/reviewTasks/index.jsx b/src/military/expert/expertUser/reviewTasks/index.jsx index 949f1007..e1ac4352 100644 --- a/src/military/expert/expertUser/reviewTasks/index.jsx +++ b/src/military/expert/expertUser/reviewTasks/index.jsx @@ -41,7 +41,7 @@ function ReviewTasks({ form, showNotification, match, history }) { dataIndex: 'containerName', key: 'containerName', render: (text, record) => { - return {text} + return {text} } }, { @@ -59,9 +59,17 @@ function ReviewTasks({ form, showNotification, match, history }) { dataIndex: 'status', key: 'status', render: (text, record) => { - return text === -1 ? 未评审 : 已评审 + return text === -1 ? '未评审' : '已评审' } }, + { + title: '操作', + dataIndex: 'status', + key: 'action', + render: (text, record) => { + return {text === -1 ? '评审' : '查看结果'} + } + } ]; }, []); diff --git a/src/military/expert/expertUser/reviewTasks/index.scss b/src/military/expert/expertUser/reviewTasks/index.scss index c4f3ed71..056f24c6 100644 --- a/src/military/expert/expertUser/reviewTasks/index.scss +++ b/src/military/expert/expertUser/reviewTasks/index.scss @@ -10,11 +10,16 @@ .ant-form-item { width: 48%; margin-bottom:1rem; + label{ + font-weight: bold; + } } .ant-col{ display: inline-block; } - + } + .pagination-table .ant-table-thead tr th div { + font-weight: bold; } .task-head { border-bottom: 1px solid #eeeeee; @@ -30,9 +35,11 @@ } .pagination-table{ margin:0 2rem; - - .red{ - color: #DE0000; + .toReview{ + color: #4154f1; + &:hover{ + opacity: 0.8; + } } } } diff --git a/src/military/expert/expertUser/taskDetail/index.jsx b/src/military/expert/expertUser/taskDetail/index.jsx index 54f95560..cd4e2d4a 100644 --- a/src/military/expert/expertUser/taskDetail/index.jsx +++ b/src/military/expert/expertUser/taskDetail/index.jsx @@ -378,8 +378,8 @@ function ReviewTasks({ showNotification, match, history, current_user }) {

任务信息

-
任务名称{rules.containerName}
-
任务链接{`/task/taskDetail/${rules.containerId}`}
+
任务名称{rules.containerName}
+
任务链接{`${window.location.origin}/task/taskDetail/${rules.containerId}`}
diff --git a/src/military/expert/expertUser/taskDetail/index.scss b/src/military/expert/expertUser/taskDetail/index.scss index e7b0a3f7..2279abe6 100644 --- a/src/military/expert/expertUser/taskDetail/index.scss +++ b/src/military/expert/expertUser/taskDetail/index.scss @@ -26,9 +26,15 @@ } } - .ant-tabs-nav .ant-tabs-tab-active { + .ant-tabs-nav .ant-tabs-tab-active, .taskLink { color: #4154f1; } + .taskLink:hover{ + opacity: 0.8; + } + .rules-head, .task-head, .ant-tabs-nav .ant-tabs-tab-active, .font-w, .pagination-table .ant-table-thead tr th div{ + font-weight: bold; + } .task-head { position: relative; @@ -37,22 +43,25 @@ color: #181818; background: #fff; font-size: 0.8em; - font-weight: bold; .back-button{ position: absolute; z-index: 1; right: 1rem; bottom: -52px; + padding: 0 10px; } } - - - .button-div { line-height: 1.5; } .pagination-table { margin: .75rem 1.75rem 1.25rem; + a{ + color: #4154f1; + &:hover{ + opacity: 0.8; + } + } } .task-rules { diff --git a/src/military/expert/index.scss b/src/military/expert/index.scss index 3a7ec304..7770c92d 100644 --- a/src/military/expert/index.scss +++ b/src/military/expert/index.scss @@ -3,7 +3,7 @@ .but41_border, .butE3_border { padding: 0 1.3em; - height: 2.55em; + height: 36px; border-radius: 4px; cursor: pointer; } diff --git a/src/military/expert/static.js b/src/military/expert/static.js index 947e1f4d..818b4c08 100644 --- a/src/military/expert/static.js +++ b/src/military/expert/static.js @@ -59,6 +59,6 @@ export const taskType = [ ]; export const expertTaskStatus = [ - { value: -1, label: "待评审" }, + { value: -1, label: "未评审" }, { value: 1, label: "已评审" }, ]; \ No newline at end of file diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx index e0edc7df..0d3e6e78 100644 --- a/src/military/task/taskAdmin/index.jsx +++ b/src/military/task/taskAdmin/index.jsx @@ -127,7 +127,7 @@ export default Form.create()(({ form, showNotification, match, history, state }) showArrow defaultValue={text?1:-1} onChange={(key) => { changeExpertReviewStatus(key, record.id) }} - disabled={!(record.status < 4 && record.status !== 2) || record.assignRuleAndExperts} + disabled={!record.status == 1 || !record.status == 3 || record.assignRuleAndExperts} > { expertReviewArr.map(item => {