Skip to content

X
xiaomai-cloud-class-web
Commit 799e15a4 by yuananting
Options

fix:样式调整

parent 0b9cb284
Showing with 26 additions and 16 deletions
src/modules/teach-tool/paper-manage/OperatePaper.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: yuananting * @Author: yuananting
* @Date: 2021-03-27 16:15:13 * @Date: 2021-03-27 16:15:13
* @LastEditors: yuananting * @LastEditors: yuananting
* @LastEditTime: 2021-04-15 12:07:20 * @LastEditTime: 2021-04-15 14:50:02
* @Description: 助学工具-新建/复制/编辑试卷 * @Description: 助学工具-新建/复制/编辑试卷
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -223,7 +223,9 @@ class OperatePaper extends Component { ...@@ -223,7 +223,9 @@ class OperatePaper extends Component {
currentQuestionList = sortedTableData.reverse(); currentQuestionList = sortedTableData.reverse();
break; break;
case "default": case "default":
currentQuestionList = _selectQuestionList.sort((a, b) => b.updateTime - a.updateTime); currentQuestionList = _selectQuestionList.sort(
(a, b) => b.updateTime - a.updateTime
);
break; break;
default: default:
currentQuestionList = _selectQuestionList; currentQuestionList = _selectQuestionList;
...@@ -545,8 +547,9 @@ class OperatePaper extends Component { ...@@ -545,8 +547,9 @@ class OperatePaper extends Component {
}, },
{ {
title: ( title: (
<Tooltip title="多选题和填空题的漏选/半对得分不能高于题目本身分值"> <span>
分值{" "} 分值{" "}
<Tooltip title="多选题和填空题的漏选/半对得分不能高于题目本身分值">
<span <span
className="icon iconfont" className="icon iconfont"
style={{ color: "#BFBFBF", fontSize: 14 }} style={{ color: "#BFBFBF", fontSize: 14 }}
...@@ -554,6 +557,7 @@ class OperatePaper extends Component { ...@@ -554,6 +557,7 @@ class OperatePaper extends Component {
&#xe7c4; &#xe7c4;
</span> </span>
</Tooltip> </Tooltip>
</span>
), ),
dataIndex: "score", dataIndex: "score",
key: "score", key: "score",
...@@ -708,9 +712,7 @@ class OperatePaper extends Component { ...@@ -708,9 +712,7 @@ class OperatePaper extends Component {
name="paperName" name="paperName"
label="试卷名称：" label="试卷名称："
required required
validateStatus={ validateStatus={this.validatePaperName(paperName) ? "error" : ""}
this.validatePaperName(paperName) ? "error" : ""
}
help={this.validatePaperName(paperName)} help={this.validatePaperName(paperName)}
> >
<Input <Input
...@@ -773,10 +775,7 @@ class OperatePaper extends Component { ...@@ -773,10 +775,7 @@ class OperatePaper extends Component {
自选题目 自选题目
</Button> </Button>
{questionCnt > 0 && ( {questionCnt > 0 && (
<div <div className="paper-info-tip" style={{ margin: "0 auto 12px" }}>
className="paper-info-tip"
style={{ margin: "0 auto 12px" }}
>
总计<span>{totalScore}</span>分，共<span>{questionCnt}</span> 总计<span>{totalScore}</span>分，共<span>{questionCnt}</span>
题。{" "} 题。{" "}
{singleChoiceCnt > 0 && {singleChoiceCnt > 0 &&
...@@ -793,10 +792,10 @@ class OperatePaper extends Component { ...@@ -793,10 +792,10 @@ class OperatePaper extends Component {
<ConfigProvider renderEmpty={this.customizeRenderEmpty}> <ConfigProvider renderEmpty={this.customizeRenderEmpty}>
<Table <Table
className="table-style"
scroll={{ y: 350 }} scroll={{ y: 350 }}
columns={this.parseColumns()} columns={this.parseColumns()}
dataSource={selectQuestionList} dataSource={selectQuestionList}
bordered
pagination={false} pagination={false}
onChange={this.sortByQuestionType} onChange={this.sortByQuestionType}
/> />
......
src/modules/teach-tool/paper-manage/OperatePaper.less
.operate-paper-page { .operate-paper-page {
.box { .box {
margin-bottom: 66px !important; margin-bottom: 66px !important;
.table-style {
border: 1px solid #f0f0f0 !important;
}
.ant-tabs { .ant-tabs {
color: #666666; color: #666666;
} }
...@@ -17,7 +20,7 @@ ...@@ -17,7 +20,7 @@
color: #999999; color: #999999;
line-height: 20px; line-height: 20px;
span { span {
color: #FFB714; color: #ffb714;
} }
} }
.record-operate { .record-operate {
...@@ -33,7 +36,7 @@ ...@@ -33,7 +36,7 @@
} }
} }
&__ban { &__ban {
color: #CCCCCC; color: #cccccc;
pointer-events: none; pointer-events: none;
} }
} }
...@@ -62,3 +65,7 @@ ...@@ -62,3 +65,7 @@
max-width: 700px !important; max-width: 700px !important;
} }
} }
.ant-dropdown-menu-item-selected > span {
color: #333333;
}
\ No newline at end of file
src/modules/teach-tool/paper-manage/modal/PreviewPaperModal.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: yuananting * @Author: yuananting
* @Date: 2021-03-27 11:15:03 * @Date: 2021-03-27 11:15:03
* @LastEditors: yuananting * @LastEditors: yuananting
* @LastEditTime: 2021-04-09 16:55:39 * @LastEditTime: 2021-04-15 13:22:10
* @Description: 助学工具-试卷-预览试卷 * @Description: 助学工具-试卷-预览试卷
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -284,7 +284,7 @@ class PreviewPaperModal extends Component { ...@@ -284,7 +284,7 @@ class PreviewPaperModal extends Component {
footer={null} footer={null}
onCancel={this.props.close} onCancel={this.props.close}
> >
<div className="paper-title">{paperName}</div> {paperName && <div className="paper-title">{paperName}</div>}
{questionList && questionList.length > 0 ? ( {questionList && questionList.length > 0 ? (
<div className="question-list-box"> <div className="question-list-box">
{_.map(questionList, (questionItem, questionIndex) => { {_.map(questionList, (questionItem, questionIndex) => {
......
src/modules/teach-tool/paper-manage/modal/PreviewPaperModal.less
...@@ -42,13 +42,16 @@ ...@@ -42,13 +42,16 @@
} }
} }
} }
.question-info-item:last-child {
border-bottom: none;
}
.text { .text {
margin-bottom: 8px; margin-bottom: 8px;
color: #666666;
.question-tip { .question-tip {
margin-bottom: 8px; margin-bottom: 8px;
} }
.input-box { .input-box {
color: #333333;
line-height: 20px; line-height: 20px;
* { * {
display: inline; display: inline;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment