Merge branch 'feature/yuananting/20210801/task-center' of…

Merge branch 'feature/yuananting/20210801/task-center' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into feature/yuananting/20210801/task-center

src/modules/course-manage/components/LiveCourseList.jsx

@@ -619,7 +619,7 @@ class LiveCourseList extends React.Component {
       <div className='live-course-more-menu'>
       <div className='live-course-more-menu'>
         {(User.getUserRole() === 'CloudManager' || User.getUserRole() === 'StoreManager') && (
         {(User.getUserRole() === 'CloudManager' || User.getUserRole() === 'StoreManager') && (
           <div className='operate__item' onClick={() => this.handleRelatedModalShow(item)}>
           <div className='operate__item' onClick={() => this.handleRelatedModalShow(item)}>
-            关联培训计划
+            关联培训任务
           </div>
           </div>
         )}
         )}
         <div className='operate__item' onClick={() => this.toEditCoursePage(item)}>
         <div className='operate__item' onClick={() => this.toEditCoursePage(item)}>

src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx

@@ -298,7 +298,7 @@ class GraphicsCourseList extends React.Component {
             onClick={() => {
             onClick={() => {
               this.handleRelatedModalShow(item);
               this.handleRelatedModalShow(item);
             }}>
             }}>
-            关联培训计划
+            关联培训任务
           </div>
           </div>
         )}
         )}
         <div
         <div

src/modules/course-manage/modal/RelatedPlanModal.jsx

@@ -69,7 +69,7 @@ class RelatedPlanModal extends React.Component {
   parsePlanColumns = () => {
   parsePlanColumns = () => {
     const columns = [
     const columns = [
       {
       {
-        title: '培训计划',
+        title: '培训任务',
         key: 'planName',
         key: 'planName',
         dataIndex: 'planName',
         dataIndex: 'planName',
         render: (val, record) => {
         render: (val, record) => {
@@ -159,7 +159,7 @@ class RelatedPlanModal extends React.Component {
     const { visible, selectPlanList } = this.props;
     const { visible, selectPlanList } = this.props;
     return (
     return (
       <Modal
       <Modal
-        title='关联培训计划'
+        title='关联培训任务'
         onCancel={this.props.onClose}
         onCancel={this.props.onClose}
         maskClosable={false}
         maskClosable={false}
         visible={visible}
         visible={visible}
@@ -170,7 +170,7 @@ class RelatedPlanModal extends React.Component {
         closeIcon={<span className='icon iconfont modal-close-icon'>&#xe6ef;</span>}>
         closeIcon={<span className='icon iconfont modal-close-icon'>&#xe6ef;</span>}>
         <div className='search-container'>
         <div className='search-container'>
           <Search
           <Search
-            placeholder='搜索培训计划名称'
+            placeholder='搜索培训任务名称'
             style={{ width: 207 }}
             style={{ width: 207 }}
             onChange={(e) => {
             onChange={(e) => {
               this.handleChangePlanName(e.target.value);
               this.handleChangePlanName(e.target.value);

src/modules/course-manage/video-course/components/VideoCourseList.jsx

@@ -283,7 +283,7 @@ class VideoCourseList extends React.Component {
         </If>
         </If>
         {(User.getUserRole() === 'CloudManager' || User.getUserRole() === 'StoreManager') && (
         {(User.getUserRole() === 'CloudManager' || User.getUserRole() === 'StoreManager') && (
           <div className='operate__item' onClick={() => this.handleRelatedModalShow(item)}>
           <div className='operate__item' onClick={() => this.handleRelatedModalShow(item)}>
-            关联培训计划
+            关联培训任务
           </div>
           </div>
         )}
         )}
         <If condition={type === 'internal'}>
         <If condition={type === 'internal'}>

src/modules/store-manage/EmployeeAddOrEditModal.tsx

 /*
 /*
  * @Author: wufan
  * @Author: wufan
  * @Date: 2020-11-27 16:21:49
  * @Date: 2020-11-27 16:21:49
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-03-09 14:21:35
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-07-29 14:51:26
  * @Description: Description
  * @Description: Description
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -44,7 +44,7 @@ interface AddEmployeeModalProps {
 function AddEmployeeModal(props: AddEmployeeModalProps) {
 function AddEmployeeModal(props: AddEmployeeModalProps) {
   const [nickName, setName] = useState("");
   const [nickName, setName] = useState("");
   const [phone, setPhone] = useState("");
   const [phone, setPhone] = useState("");
-  const [role, setRole] = useState("CloudOperator");
+  const [role, setRole] = useState("CloudLecturer");
   const [avatar, setAvatar] = useState(
   const [avatar, setAvatar] = useState(
     "https://image.xiaomaiketang.com/xm/rJeQaZxtc7.png"
     "https://image.xiaomaiketang.com/xm/rJeQaZxtc7.png"
   );
   );
@@ -295,12 +295,6 @@ function AddEmployeeModal(props: AddEmployeeModalProps) {
                   <span style={{ color: "#333" }}>管理员</span>
                   <span style={{ color: "#333" }}>管理员</span>
                   <p className="radio-tip">可执行学院中所有的操作</p>
                   <p className="radio-tip">可执行学院中所有的操作</p>
                 </Radio>
                 </Radio>
-                <Radio value={"CloudOperator"} className="mt-4">
-                  <span style={{ color: "#333" }}>运营师</span>
-                  <p className="radio-tip">
-                  仅可查看/转发培训计划内容，并查看其负责的学员学习进度
-                  </p>
-                </Radio>
               </RadioGroup>
               </RadioGroup>
             </Form.Item>
             </Form.Item>
           </Form>
           </Form>

src/modules/teach-tool/components/CourseCategoryManage.jsx

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Author: yuananting
  * @Date: 2021-02-23 18:28:50
  * @Date: 2021-02-23 18:28:50
  * @LastEditors: wufan
  * @LastEditors: wufan
- * @LastEditTime: 2021-06-24 13:39:30
+ * @LastEditTime: 2021-07-29 14:38:39
  * @Description: 助学工具-课程分类
  * @Description: 助学工具-课程分类
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -566,7 +566,7 @@ class CourseCategoryManage extends Component {
             新增一级分类
             新增一级分类
           </Button>
           </Button>
           <div className='show-tips' style={{ marginTop: '12px', width: '900px' }}>
           <div className='show-tips' style={{ marginTop: '12px', width: '900px' }}>
-            <ShowTips message='为方便管理，该分类用于课程、培训计划、题库、知识库等模块，改动将同步各模块更新' />
+            <ShowTips message='为方便管理，该分类用于课程、题库、知识库等模块，改动将同步各模块更新' />
           </div>
           </div>
           <div className='course-category-tree'>
           <div className='course-category-tree'>
           {
           {