fix:解决合并培训计划空状态图的分支冲突

src/modules/plan-manage/modal/relatedCourseModal.jsx

 import React from 'react';
 import React from 'react';
 import _ from 'underscore';
 import _ from 'underscore';
-import { Table, Radio, Tabs, Modal, Input, message, Button, Tooltip } from 'antd';
+import { Radio, Tabs, Modal, Input, message, Button, Tooltip } from 'antd';
 
 
-import { PageControl } from '@/components';
+import { PageControl, XMTable } from '@/components';
+import college from '@/common/lottie/college';
 
 
 import CourseService from '@/domains/course-domain/CourseService';
 import CourseService from '@/domains/course-domain/CourseService';
 import User from '@/common/js/user';
 import User from '@/common/js/user';
@@ -312,7 +313,7 @@ class SelectOperatorModal extends React.Component {
                 return null;
                 return null;
               })}
               })}
               <If condition={!hasCover}>
               <If condition={!hasCover}>
-                <img className='course-cover' src={"https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png"} alt='' />
+                <img className='course-cover' src={'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'} alt='' />
               </If>
               </If>
 
 
               <div>
               <div>
@@ -384,19 +385,6 @@ class SelectOperatorModal extends React.Component {
         ),
         ),
         key: 'course',
         key: 'course',
         dataIndex: 'course',
         dataIndex: 'course',
-        width: '40%',
-        title: (
-          <span>
-            <span>课程信息</span>
-            <Tooltip title='仅显示未关联课程，已关联课程不支持重复选择'>
-              <i className='icon iconfont' style={{ marginLeft: '5px', cursor: 'pointer', color: '#bfbfbf', fontSize: '14px', fontWeight: '400' }}>
-                &#xe61d;
-              </i>
-            </Tooltip>
-          </span>
-        ),
-        key: 'course',
-        dataIndex: 'course',
         width: '60%',
         width: '60%',
         render: (val, record) => {
         render: (val, record) => {
           const { coverUrl, scheduleVideoUrl } = record;
           const { coverUrl, scheduleVideoUrl } = record;
@@ -471,7 +459,7 @@ class SelectOperatorModal extends React.Component {
           const { coverUrl } = record;
           const { coverUrl } = record;
           return (
           return (
             <div className='course-info'>
             <div className='course-info'>
-              <img className='course-cover' src={coverUrl || "https://image.xiaomaiketang.com/xm/wFnpZtp2yB.png"} alt='' />
+              <img className='course-cover' src={coverUrl || 'https://image.xiaomaiketang.com/xm/wFnpZtp2yB.png'} alt='' />
               <div className='course-name'>{record.courseName}</div>
               <div className='course-name'>{record.courseName}</div>
             </div>
             </div>
           );
           );
@@ -746,7 +734,11 @@ class SelectOperatorModal extends React.Component {
                 </div>
                 </div>
               </div>
               </div>
               <div>
               <div>
-                <Table
+                <XMTable
+                  renderEmpty={{
+                    image: college,
+                    description: '暂无数据',
+                  }}
                   rowKey={(record) => record.liveCourseId}
                   rowKey={(record) => record.liveCourseId}
                   dataSource={liveDataSource}
                   dataSource={liveDataSource}
                   columns={this.parseLiveColumns()}
                   columns={this.parseLiveColumns()}
@@ -837,7 +829,11 @@ class SelectOperatorModal extends React.Component {
                 </div>
                 </div>
               </div>
               </div>
               <div>
               <div>
-                <Table
+                <XMTable
+                  renderEmpty={{
+                    image: college,
+                    description: '暂无数据',
+                  }}
                   rowKey={(record) => record.id}
                   rowKey={(record) => record.id}
                   dataSource={videoDataSource[videoCourseDivision]}
                   dataSource={videoDataSource[videoCourseDivision]}
                   columns={this.parseVideoColumns()}
                   columns={this.parseVideoColumns()}
@@ -932,7 +928,11 @@ class SelectOperatorModal extends React.Component {
                 </div>
                 </div>
               </div>
               </div>
               <div>
               <div>
-                <Table
+                <XMTable
+                  renderEmpty={{
+                    image: college,
+                    description: '暂无数据',
+                  }}
                   rowKey={(record) => record.id}
                   rowKey={(record) => record.id}
                   dataSource={pictureDataSource}
                   dataSource={pictureDataSource}
                   columns={this.parsePictureColumns()}
                   columns={this.parsePictureColumns()}

src/modules/teach-tool/paper-manage/OperatePaper.less

@@ -6,6 +6,7 @@
     }
     }
     .table-style {
     .table-style {
       border: 1px solid #f0f0f0 !important;
       border: 1px solid #f0f0f0 !important;
+      margin-bottom: 70px;
     }
     }
     .ant-tabs {
     .ant-tabs {
       color: #666666;
       color: #666666;