Commit 2f3428ee by chenshu

fix:修改样式

parent b6f1434c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: Michael * @Author: Michael
* @Date: 2017-09-08 17:38:18 * @Date: 2017-09-08 17:38:18
* @Last Modified by: chenshu * @Last Modified by: chenshu
* @Last Modified time: 2020-08-31 14:55:30 * @Last Modified time: 2021-06-04 15:53:11
*/ */
@import './variables.less'; @import './variables.less';
...@@ -602,7 +602,7 @@ td.ant-table-column-sort { ...@@ -602,7 +602,7 @@ td.ant-table-column-sort {
background: none; background: none;
} }
.ant-modal-content .ant-table-thead > tr > th { .ant-modal-content .ant-table-thead > tr > th {
padding: 9px 24px; padding: 9px 24px !important;
} }
.ant-modal-content tr > td { .ant-modal-content tr > td {
...@@ -766,11 +766,15 @@ td.ant-table-column-sort { ...@@ -766,11 +766,15 @@ td.ant-table-column-sort {
} }
} }
// 排序小三角 .ant-table-column-sorters {
.ant-table-column-sorter { justify-content: start !important;
margin-left: 2px !important;
} }
.ant-table-column-sorter-full {
margin-top: -0.32rem !important; .ant-table-column-title {
flex: initial !important;
}
.ant-table-column-sorter-full{
margin-left: 8px !important;
} }
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.select-container{ .select-container{
margin-right: 24px; margin-right: 24px;
.con{ .con{
background: #FFF4DD; background: #E9EFFF;
border-radius: 4px; border-radius: 4px;
padding: 3px 16px; padding: 3px 16px;
display: inline-flex; display: inline-flex;
......
...@@ -9,18 +9,31 @@ ...@@ -9,18 +9,31 @@
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
} }
.form{ .form{
margin-top: 24px; margin-top: 24px;
margin-bottom: 32px; margin-bottom: 32px;
width: 1000px; width: 1000px;
.title{ .title{
position: relative;
padding-left: 28px;
font-size: 16px; font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
line-height: 22px; line-height: 22px;
margin-bottom: 24px; margin-bottom: 24px;
&.first {
&::before{
width:4px;
height:12px;
content:'';
background-image: linear-gradient(#2966FF 83.5%, #0ACCA4 16.5%);
display:inline-block;
position: absolute;
left:16px;
top:6px;
}
}
} }
} }
......
...@@ -271,10 +271,9 @@ function AddExam(props: any) { ...@@ -271,10 +271,9 @@ function AddExam(props: any) {
<Breadcrumbs navList={title} goBack={handleGoBack} /> <Breadcrumbs navList={title} goBack={handleGoBack} />
<div className="box"> <div className="box">
<div className="show-tips">
<ShowTips message="请遵守国家相关规定,切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容,小麦企学院保有依据国家规定及平台规则进行处理的权利" /> <ShowTips message="请遵守国家相关规定,切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容,小麦企学院保有依据国家规定及平台规则进行处理的权利" />
</div> <div className="form"> <div className="form">
<div className="title">基本信息</div> <div className="title first">基本信息</div>
<Form <Form
labelCol={{ span: 3 }} labelCol={{ span: 3 }}
wrapperCol={{ span: 14 }} wrapperCol={{ span: 14 }}
......
...@@ -39,11 +39,10 @@ function DataAnalysic(props: any) { ...@@ -39,11 +39,10 @@ function DataAnalysic(props: any) {
<Breadcrumbs navList={"考试数据"} goBack={props.history.goBack} /> <Breadcrumbs navList={"考试数据"} goBack={props.history.goBack} />
<div className="box"> <div className="box">
<div className="titleBox "> <div className="titleBox ">
<span className='tips'></span>
考试名称:{examDetail.examName} 考试名称:{examDetail.examName}
</div> </div>
</div> </div>
<div className="box"> <div className="box" style={{ paddingTop: 0 }}>
<Tabs activeKey={selectKey} onChange={(key: any) => { <Tabs activeKey={selectKey} onChange={(key: any) => {
setSelectKey(key) setSelectKey(key)
}}> }}>
......
...@@ -123,6 +123,7 @@ ...@@ -123,6 +123,7 @@
border-radius: 4px; border-radius: 4px;
padding: 14px; padding: 14px;
padding-bottom: 8px; padding-bottom: 8px;
padding-right: 0;
.item{ .item{
margin-bottom: 8px; margin-bottom: 8px;
.name{ .name{
......
...@@ -40,11 +40,11 @@ function PreviewModal(props: any) { ...@@ -40,11 +40,11 @@ function PreviewModal(props: any) {
<div className="rule"> <div className="rule">
<div className="item"> <div className="item">
<div className="num">{props.info.totalScore || props.info.examPaper.totalScore || 0}</div> <div className="num">{props.info.totalScore || (props.info.examPaper || {}).totalScore || 0}</div>
<div className="text">总分 <span className="dw" style={{color:'#999'}}>(分)</span></div> <div className="text">总分 <span className="dw" style={{color:'#999'}}>(分)</span></div>
</div> </div>
<div className="item"> <div className="item">
<div className="num">{props.info.examTotal || props.info.examPaper.questionCnt || 0}</div> <div className="num">{props.info.examTotal || (props.info.examPaper || {}).questionCnt || 0}</div>
<div className="text">总题数<span className="dw" style={{color:'#999'}} >(道)</span></div> <div className="text">总题数<span className="dw" style={{color:'#999'}} >(道)</span></div>
</div> </div>
<div className="item"> <div className="item">
......
...@@ -216,7 +216,7 @@ function DataAnalysic(props: any) { ...@@ -216,7 +216,7 @@ function DataAnalysic(props: any) {
</div> </div>
</div> </div>
<div className="xm-search-filter" style={{ marginTop: 12 }}> <div className="xm-search-filter" style={{ marginTop: 16 }}>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<div className="search-condition"> <div className="search-condition">
<div className="search-condition__item"> <div className="search-condition__item">
......
.dataAnalysic{ .dataAnalysic{
.titleBox{ .titleBox{
position: relative;
padding-left: 28px;
font-size: 19px; font-size: 19px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
line-height: 26px; line-height: 26px;
background: #FFFFFF; background: #FFFFFF;
// padding: 20px 24px; &::before{
// margin-bottom: 8px; width:4px;
.tips{ height:12px;
width: 4px; content:'';
height: 16px; background-image: linear-gradient(#2966FF 83.5%, #0ACCA4 16.5%);
background: #336DFF; display:inline-block;
display: inline-block; position: absolute;
margin-right: 4px; left:16px;
top:7px;
} }
} }
.ant-tabs-content-holder {
margin-top: 8px;
}
} }
\ No newline at end of file
...@@ -42,11 +42,12 @@ class MoveModal extends React.Component { ...@@ -42,11 +42,12 @@ class MoveModal extends React.Component {
<span className="icon iconfont">&#xe6f2;</span> <span className="icon iconfont">&#xe6f2;</span>
<span className="text">已选择<span style={{ color: '#2966FF' }}>{length}</span>{title},移动后,原有分类将移除此{title}</span> <span className="text">已选择<span style={{ color: '#2966FF' }}>{length}</span>{title},移动后,原有分类将移除此{title}</span>
</div> </div>
<div className="move-item"> <div className="move-item" id="move-item">
<span className="label">选择分类:</span> <span className="label">选择分类:</span>
<TreeSelect <TreeSelect
showSearch showSearch
treeNodeFilterProp="title" treeNodeFilterProp="title"
getPopupContainer={() => document.querySelector('#move-item')}
style={{ width: 240 }} style={{ width: 240 }}
treeData={moveData} treeData={moveData}
placeholder="请选择分类" placeholder="请选择分类"
......
...@@ -18,4 +18,7 @@ ...@@ -18,4 +18,7 @@
color: #333; color: #333;
} }
} }
.ant-select-tree .ant-select-tree-node-content-wrapper.ant-select-tree-node-selected {
background: rgba(41, 102, 255, 0.06);
}
} }
\ No newline at end of file
...@@ -68,10 +68,8 @@ ...@@ -68,10 +68,8 @@
&:nth-child(odd) { &:nth-child(odd) {
background: #fafafa; background: #fafafa;
} }
&:last-child { td {
td { border-bottom: none!important;
border-bottom: none!important;
}
} }
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.select-container{ .select-container{
margin-right: 24px; margin-right: 24px;
.con{ .con{
background: #FFF4DD; background: #E9EFFF;
border-radius: 4px; border-radius: 4px;
padding: 3px 16px; padding: 3px 16px;
display: inline-flex; display: inline-flex;
......
...@@ -387,6 +387,17 @@ class SelectQuestionList extends Component { ...@@ -387,6 +387,17 @@ class SelectQuestionList extends Component {
})} })}
</Select> </Select>
</div> </div>
<div className="search-condition__item">
<span className="search-label">更新时间:</span>
<RangePicker
value={[
query.updateDateStart ? moment(Number(query.updateDateStart)) : null,
query.updateDateEnd ? moment(Number(query.updateDateEnd)) : null
]}
onChange={(value) => {
this.handleChangeQuery("updatedTime", value)
}} />
</div>
</div> </div>
<div className="reset-fold-area"> <div className="reset-fold-area">
...@@ -398,24 +409,8 @@ class SelectQuestionList extends Component { ...@@ -398,24 +409,8 @@ class SelectQuestionList extends Component {
&#xe61b;{" "} &#xe61b;{" "}
</span> </span>
</Tooltip> </Tooltip>
<span style={{ cursor: 'pointer' }} className="fold-btn" onClick={() => {
this.setState({expandFilter:!expandFilter})
}}>{expandFilter ? <span><span>收起</span><span className="iconfont icon fold-icon" >&#xe82d; </span> </span> : <span>展开<span className="iconfont icon fold-icon" >&#xe835; </span></span>}</span>
</div> </div>
</Row> </Row>
{expandFilter && <Row>
<div className="search-condition__item">
<span className="search-label">更新时间:</span>
<RangePicker
value={[
query.updateDateStart ? moment(Number(query.updateDateStart)) : null,
query.updateDateEnd ? moment(Number(query.updateDateEnd)) : null
]}
onChange={(value) => {
this.handleChangeQuery("updatedTime", value)
}} />
</div>
</Row>}
</div> </div>
<div className="select-tip-box"> <div className="select-tip-box">
<div> <div>
......
...@@ -2,19 +2,22 @@ ...@@ -2,19 +2,22 @@
.select-question-filter { .select-question-filter {
position: relative; position: relative;
.search-condition { .search-condition {
width: calc(100% - 80px); width: calc(100% - 20px);
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
&__item { &__item {
margin-right: 3%; margin-right: 3%;
width: 30%;
margin-bottom: 16px; margin-bottom: 16px;
display: flex;
.search-label { .search-label {
vertical-align: middle; vertical-align: middle;
display: inline-block; display: inline-block;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
flex-shrink: 0;
} }
} }
} }
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
.select-container{ .select-container{
.con { .con {
background: #FFF4DD; background: #E9EFFF;
border-radius: 4px; border-radius: 4px;
padding: 3px 16px; padding: 3px 16px;
display: inline-flex; display: inline-flex;
......
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