Skip to content

X
xiaomai-cloud-class-web
Commit 6f6f0307 by zhangleyuan
Options

feat:解决合并代码后的冲突

parents 8e262573 df8662e3
Showing with 92 additions and 86 deletions
src/core/antd.less
...@@ -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: 2021-06-04 15:56:16 * @Last Modified time: 2021-06-04 18:19:23
*/ */
@import './variables.less'; @import './variables.less';
...@@ -766,15 +766,12 @@ td.ant-table-column-sort { ...@@ -766,15 +766,12 @@ td.ant-table-column-sort {
} }
} }
.ant-table-column-sorters {
justify-content: start !important;
}
.ant-table-column-title { .ant-table-column-title {
flex: initial !important; flex: initial !important;
} }
.ant-table-column-sorter-full{ // 排序小三角
.ant-table-column-sorter {
margin-left: 8px !important; margin-left: 8px !important;
} }
src/modules/root/Menu.less
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
margin-right: 20px margin-right: 20px
} }
.icon-img{ .icon-img{
width:16px; width:18px;
height:16px; height:18px;
margin-right:16px; margin-right:16px;
} }
.listType { .listType {
......
src/modules/teach-tool/components/CourseCategoryManage.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: yuananting * @Author: yuananting
* @Date: 2021-02-23 18:28:50 * @Date: 2021-02-23 18:28:50
* @LastEditors: yuananting * @LastEditors: yuananting
* @LastEditTime: 2021-06-02 14:29:04 * @LastEditTime: 2021-06-02 14:25:06
* @Description: 助学工具-课程分类 * @Description: 助学工具-课程分类
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
......
src/modules/teach-tool/examination-manager/Index.tsx
...@@ -144,6 +144,7 @@ function ExaminationManager(props: any) { ...@@ -144,6 +144,7 @@ function ExaminationManager(props: any) {
title: "操作", title: "操作",
fixed:fixStr.right, fixed:fixStr.right,
dataIndex: "operate", dataIndex: "operate",
width: 150,
render: (text: any, record: any) => <div className="table_operate"> render: (text: any, record: any) => <div className="table_operate">
{ {
ctx.xmState?.userPermission?.SeeExamData() && [<div ctx.xmState?.userPermission?.SeeExamData() && [<div
......
src/modules/teach-tool/examination-manager/index.less
...@@ -13,4 +13,12 @@ ...@@ -13,4 +13,12 @@
.ant-table-column-sorter { .ant-table-column-sorter {
margin-top: 0px !important; margin-top: 0px !important;
} }
.ant-table tbody tr {
&:nth-child(even) {
background: #fff;
}
&:nth-child(odd) {
background: #fafafa;
}
}
} }
\ No newline at end of file
src/modules/teach-tool/paper-manage/OperatePaper.jsx
/* /*
* @Author: yuananting * @Author: yuananting
* @Date: 2021-03-27 16:15:13 * @Date: 2021-03-27 16:15:13
* @LastEditors: yuananting * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-06-04 10:58:31 * @LastEditTime: 2021-06-08 10:11:08
* @Description: 助学工具-新建/复制/编辑试卷 * @Description: 助学工具-新建/复制/编辑试卷
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -722,36 +722,36 @@ class OperatePaper extends Component { ...@@ -722,36 +722,36 @@ class OperatePaper extends Component {
<div className="page operate-paper-page"> <div className="page operate-paper-page">
<Breadcrumbs navList={currentNav} goBack={() => this.handleGoBack()} /> <Breadcrumbs navList={currentNav} goBack={() => this.handleGoBack()} />
<Spin spinning={loading}> <Spin spinning={loading}>
<div className="box"> <div className="box">
<div className="show-tips"> <div className="show-tips">
<ShowTips message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利" /> <ShowTips message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利" />
</div> </div>
<Form ref={this.formRef} style={{ marginTop: 24, marginBottom: '85px' }}> <Form ref={this.formRef} style={{ marginTop: 24 }}>
<Form.Item <Form.Item
name="paperName" name="paperName"
label="试卷名称：" label="试卷名称："
required required
validateStatus={this.validatePaperName(paperName) ? "error" : ""} validateStatus={
help={this.validatePaperName(paperName)} this.validatePaperName(paperName) ? "error" : ""
> }
<Input help={this.validatePaperName(paperName)}
value={paperName} >
autoComplete="off" <Input
maxLength={40} value={paperName}
style={{ width: 300 }} autoComplete="off"
placeholder="请输入试卷名称（40字以内）" maxLength={40}
onChange={(e) => { style={{ width: 300 }}
this.setState({ placeholder="请输入试卷名称（40字以内）"
formData: { onChange={(e) => {
...formData, this.setState({
paperName: e.target.value.trim(), formData: {
}, ...formData,
}); paperName: e.target.value.trim(),
}} },
/> });
</Form.Item> }}
/>
</Form.Item>
<Form.Item <Form.Item
name="passRate" name="passRate"
...@@ -787,34 +787,33 @@ class OperatePaper extends Component { ...@@ -787,34 +787,33 @@ class OperatePaper extends Component {
</div> </div>
</Form.Item> </Form.Item>
<Button <Button
className="choose-btn" className="choose-btn"
type="primary" type="primary"
icon={<PlusOutlined />} icon={<PlusOutlined />}
onClick={this.chooseQuestion} onClick={this.chooseQuestion}
>
自选题目
</Button>
{questionCnt > 0 && (
<div
className="paper-info-tip"
style={{ margin: "0 auto 12px" }}
> >
自选题目 总计<span>{totalScore}</span>分，共
</Button> <span>{questionCnt}</span>
{questionCnt > 0 && ( 题。{" "}
<div {singleChoiceCnt > 0 &&
className="paper-info-tip" `单选题${singleChoiceCnt}题，共${singleChoiceScore}分；`}
style={{ margin: "0 auto 12px" }} {multiChoiceCnt > 0 &&
> `多选题${multiChoiceCnt}题，共${multiChoiceScore}分；`}
总计<span>{totalScore}</span>分，共 {judgeCnt > 0 && `判断题${judgeCnt}题，共${judgeScore}分，`}
<span>{questionCnt}</span> {gapFillingCnt > 0 &&
题。{" "} `填空题${gapFillingCnt}题，共${gapFillingScore}分，`}
{singleChoiceCnt > 0 && {indefiniteChoiceCnt > 0 &&
`单选题${singleChoiceCnt}题，共${singleChoiceScore}分；`} `不定项选择题${indefiniteChoiceCnt}题，共${indefiniteChoiceScore}分`}
{multiChoiceCnt > 0 && </div>
`多选题${multiChoiceCnt}题，共${multiChoiceScore}分；`} )}
{judgeCnt > 0 && `判断题${judgeCnt}题，共${judgeScore}分，`}
{gapFillingCnt > 0 &&
`填空题${gapFillingCnt}题，共${gapFillingScore}分，`}
{indefiniteChoiceCnt > 0 &&
`不定项选择题${indefiniteChoiceCnt}题，共${indefiniteChoiceScore}分`}
</div>
)}
<XMTable <XMTable
className="table-style" className="table-style"
scroll={{ y: 350 }} scroll={{ y: 350 }}
......
src/routes/config/menuList.tsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: yuananting * @Author: yuananting
* @Date: 2021-02-21 15:53:31 * @Date: 2021-02-21 15:53:31
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-05-30 11:00:09 * @LastEditTime: 2021-06-08 10:01:13
* @Description: 描述一下咯 * @Description: 描述一下咯
* @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -44,22 +44,6 @@ export const menuList: any = [ ...@@ -44,22 +44,6 @@ export const menuList: any = [
] ]
}, },
{ {
groupName: "知识库",
groupCode: "CloudKnowledge",
icon: '&#xe8a8;',
link: '/knowledge-base',
img:'https://image.xiaomaiketang.com/xm/8sbP5rGQWh.png',
selectImg:'https://image.xiaomaiketang.com/xm/hJKCfibC22.png'
},
{
groupName: "资料云盘",
groupCode: "CloudDisk",
icon: '&#xe8aa;',
link: '/resource-disk',
img:'https://image.xiaomaiketang.com/xm/zGKbXJPzXx.png',
selectImg:'https://image.xiaomaiketang.com/xm/5sN4MzjxYc.png',
},
{
groupName: "培训管理", groupName: "培训管理",
groupCode: "TrainManage", groupCode: "TrainManage",
icon: '&#xe8a6;', icon: '&#xe8a6;',
...@@ -138,5 +122,20 @@ export const menuList: any = [ ...@@ -138,5 +122,20 @@ export const menuList: any = [
} }
] ]
}, },
{
groupName: "知识库",
groupCode: "CloudKnowledge",
icon: '&#xe8a8;',
link: '/knowledge-base',
img:'https://image.xiaomaiketang.com/xm/8sbP5rGQWh.png',
selectImg:'https://image.xiaomaiketang.com/xm/hJKCfibC22.png'
},
{
groupName: "资料云盘",
groupCode: "CloudDisk",
icon: '&#xe8aa;',
link: '/resource-disk',
img:'https://image.xiaomaiketang.com/xm/zGKbXJPzXx.png',
selectImg:'https://image.xiaomaiketang.com/xm/5sN4MzjxYc.png',
},
] ]
\ No newline at end of file
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