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

6f6f0307 · zhangleyuan · 8e262573 · df8662e3 · 6f6f0307 · 6f6f0307
Commit 6f6f0307 authored Jun 08, 2021 by zhangleyuan
7 changed files
--- a/src/core/antd.less
+++ b/src/core/antd.less
@@ -2,7 +2,7 @@
 * @Author: Michael 
 * @Date: 2017-09-08 17:38:18 
 * @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';
@@ -766,15 +766,12 @@ td.ant-table-column-sort {
  }
 }
-.ant-table-column-sorters {
-  justify-content: start !important;
-}
 .ant-table-column-title {
  flex: initial !important;
 }
-.ant-table-column-sorter-full{
+// 排序小三角
+.ant-table-column-sorter {
  margin-left: 8px !important;
 }
--- a/src/modules/root/Menu.less
+++ b/src/modules/root/Menu.less
@@ -48,8 +48,8 @@
        margin-right: 20px
      }
      .icon-img{
-        width:16px;
+        width:18px;
-        height:16px;
+        height:18px;
        margin-right:16px;
      }
      .listType {

--- a/src/modules/teach-tool/components/CourseCategoryManage.jsx
+++ b/src/modules/teach-tool/components/CourseCategoryManage.jsx
@@ -2,7 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-02-23 18:28:50
 * @LastEditors: yuananting
- * @LastEditTime: 2021-06-02 14:29:04
+ * @LastEditTime: 2021-06-02 14:25:06
 * @Description: 助学工具-课程分类
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */

--- a/src/modules/teach-tool/examination-manager/Index.tsx
+++ b/src/modules/teach-tool/examination-manager/Index.tsx
@@ -144,6 +144,7 @@ function ExaminationManager(props: any) {
            title: "操作",
            fixed:fixStr.right,
            dataIndex: "operate",
+            width: 150,
            render: (text: any, record: any) => <div className="table_operate">
                {
                    ctx.xmState?.userPermission?.SeeExamData() && [<div

--- a/src/modules/teach-tool/examination-manager/index.less
+++ b/src/modules/teach-tool/examination-manager/index.less
@@ -13,4 +13,12 @@
    .ant-table-column-sorter {
        margin-top: 0px !important;
    }
+    .ant-table tbody tr {
+        &:nth-child(even) {
+            background: #fff;
+        }
+        &:nth-child(odd) {
+            background: #fafafa;
+        }
+    }
 }
\ No newline at end of file
--- a/src/modules/teach-tool/paper-manage/OperatePaper.jsx
+++ b/src/modules/teach-tool/paper-manage/OperatePaper.jsx
 /*
 * @Author: yuananting
 * @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: 助学工具-新建/复制/编辑试卷
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -726,12 +726,14 @@ class OperatePaper extends Component {
              <div className="show-tips">
                <ShowTips message="请遵守国家相关规定，切勿上传低俗色情、暴力恐怖、谣言诈骗、侵权盗版等相关内容，小麦企学院保有依据国家规定及平台规则进行处理的权利" />
              </div>
-            <Form ref={this.formRef} style={{ marginTop: 24, marginBottom: '85px' }}>
+              <Form ref={this.formRef} style={{ marginTop: 24 }}>
                <Form.Item
                  name="paperName"
                  label="试卷名称："
                  required
-                validateStatus={this.validatePaperName(paperName) ? "error" : ""}
+                  validateStatus={
+                    this.validatePaperName(paperName) ? "error" : ""
+                  }
                  help={this.validatePaperName(paperName)}
                >
                  <Input
@@ -751,8 +753,6 @@ class OperatePaper extends Component {
                  />
                </Form.Item>
                  <Form.Item
                    name="passRate"
                    label="及格线："
@@ -814,7 +814,6 @@ class OperatePaper extends Component {
                      `不定项选择题${indefiniteChoiceCnt}题，共${indefiniteChoiceScore}分`}
                  </div>
                )}
                <XMTable
                  className="table-style"
                  scroll={{ y: 350 }}

--- a/src/routes/config/menuList.tsx
+++ b/src/routes/config/menuList.tsx
@@ -2,7 +2,7 @@
 * @Author: yuananting
 * @Date: 2021-02-21 15:53:31
 * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-05-30 11:00:09
+ * @LastEditTime: 2021-06-08 10:01:13
 * @Description: 描述一下咯
 * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -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: "培训管理",
    groupCode: "TrainManage",
    icon: '&#xe8a6;',
@@ -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