Merge branch 'master' into feature/yuananting/20210705/select-course-limit

961679f4 · yuananting · 9ae443c4 · 62b372e7 · 961679f4 · 961679f4
Commit 961679f4 authored Jul 08, 2021 by yuananting
7 changed files
--- a/src/modules/course-manage/components/LiveCourseList.jsx
+++ b/src/modules/course-manage/components/LiveCourseList.jsx
@@ -11,7 +11,7 @@ import college from '@/common/lottie/college';
 import { PageControl, XMTable } from '@/components';
 import DownloadLiveModal from '@/components/DownloadLiveModal';
 import BaseService from '@/domains/basic-domain/baseService';
-import { appId, LIVE_SHARE } from '@/domains/course-domain/constants';
+import { LIVE_SHARE } from '@/domains/course-domain/constants';
 import CourseService from '@/domains/course-domain/CourseService';
 import { QuestionCircleOutlined } from '@ant-design/icons';
 import { Dropdown, message, Modal, Switch, Tooltip } from 'antd';
@@ -66,7 +66,6 @@ class LiveCourseList extends React.Component {
  }
  // 显示分享弹窗
  handleShowShareModal = (item, needStr = false) => {
-    const _appId = appId;
    const { liveCourseId } = item;
    const htmlUrl = `${LIVE_SHARE}live_detail/${liveCourseId}?id=${User.getStoreId()}`;
@@ -93,13 +92,8 @@ class LiveCourseList extends React.Component {
  };
  //改变上架状态
-  changeShelfState = (index,item,checked) => {
+  changeShelfState = (index, item, checked) => {
-    let _shelfState = checked ? "YES" : "NO"
+    let _shelfState = checked ? 'YES' : 'NO';
-    // if (_shelfState === 'NO') {
-    //   _shelfState = 'YES';
-    // } else {
-    //   _shelfState = 'NO';
-    // }
    const params = {
      liveCourseId: item.liveCourseId,
      shelfState: _shelfState,
@@ -111,7 +105,7 @@ class LiveCourseList extends React.Component {
        } else {
          message.success('已取消展示');
        }
-        this.props.changeShelfState(index,_shelfState)
+        this.props.changeShelfState(index, _shelfState);
      }
    });
  };
@@ -125,25 +119,15 @@ class LiveCourseList extends React.Component {
    });
  };
  parseColumns = () => {
-    const menu = (item) => (
-      <div className='live-course-more-menu'>
-        <div>上课记录</div>
-        <div
-          onClick={() => {
-            this.handleShowRepeatModal(item);
-          }}>
-          回放记录
-        </div>
-      </div>
-    );
    let columns;
    const userRole = User.getUserRole();
    if (userRole !== 'CloudLecturer') {
      columns = [
        {
          title: '直播课',
-          width: '23%',
          key: 'course',
+          fixed: 'left',
          dataIndex: 'courseName',
          render: (val, record) => {
            let hasCover = false;
@@ -152,21 +136,28 @@ class LiveCourseList extends React.Component {
                {record.courseMediaVOS.map((item, index) => {
                  if (item.contentType === 'COVER') {
                    hasCover = true;
-                    return <img className='course-cover' src={item.mediaUrl} />;
+                    return <img key={item.mediaContent + index} className='course-cover' src={item.mediaUrl} alt='' />;
+                  } else {
+                    return null;
                  }
                })}
-                {!hasCover && <img className='course-cover' src={'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'} />}
+                {!hasCover && <img className='course-cover' src={'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'} alt='' />}
                <div>
-                  {record.courseName.length > 17 ? (
+                  <Choose>
+                    <When condition={record.courseName.length > 14}>
                      <Tooltip title={record.courseName}>
                        <div className='course-name'>{record.courseName}</div>
                      </Tooltip>
-                  ) : (
+                    </When>
+                    <Otherwise>
+                      {' '}
                      <div className='course-name'>{record.courseName}</div>
-                  )}
+                    </Otherwise>
+                  </Choose>
                  <div>
                    <span className='course-time'>
-                      {formatDate('YYYY-MM-DD H:i', parseInt(record.startTime))}~{formatDate('H:i', parseInt(record.endTime))}
+                      {window.formatDate('YYYY-MM-DD H:i', parseInt(record.startTime))}~{window.formatDate('H:i', parseInt(record.endTime))}
                    </span>
                    <span
                      className='course-status'
@@ -175,31 +166,35 @@ class LiveCourseList extends React.Component {
                    </span>
                  </div>
                  <div className='teacher-assistant'>
-                    {record.teacherName && record.teacherName.length > 4 ? (
+                    <Choose>
+                      <When condition={record.teacherName && record.teacherName.length > 4}>
                        <Tooltip title={record.teacherName}>
                          <span className='teacher'>讲师：{record.teacherName}</span>
                        </Tooltip>
-                    ) : (
+                      </When>
+                      <Otherwise>
                        <span className='teacher'>讲师：{record.teacherName}</span>
-                    )}
+                      </Otherwise>
+                    </Choose>
-                    {record.admins.length > 0 && (
+                    <If condition={record.admins.length > 0}>
-                      <>
                      <span className='split'> | </span>
-                        {this.handleAdminName(record.admins).length > 4 ? (
+                      <Choose>
+                        <When condition={this.handleAdminName(record.admins).length > 4}>
                          <Tooltip title={this.handleAdminName(record.admins)}>
                            <span className='assistant'>
                              助教：
                              {record.admins.map((item, index) => {
                                return (
-                                  <span>
+                                  <span key={item.adminId + index}>
                                    {item.adminName} {index < record.admins.length - 1 && <span> 、</span>}{' '}
                                  </span>
                                );
                              })}
                            </span>
                          </Tooltip>
-                        ) : (
+                        </When>
+                        <Otherwise>
                          <span className='assistant'>
                            助教：
                            {record.admins.map((item, index) => {
@@ -210,9 +205,9 @@ class LiveCourseList extends React.Component {
                              );
                            })}
                          </span>
-                        )}
+                        </Otherwise>
-                      </>
+                      </Choose>
-                    )}
+                    </If>
                  </div>
                </div>
              </div>
@@ -287,10 +282,13 @@ class LiveCourseList extends React.Component {
          key: 'shelfState',
          dataIndex: 'shelfState',
          render: (val, item, index) => {
-            return <Switch 
+            return (
-                    checked={item.shelfState === "YES"} 
+              <Switch
+                checked={item.shelfState === 'YES'}
                defaultChecked={item.shelfState === 'YES' ? true : false}
-                    onChange={(checked) => this.changeShelfState(index,item,checked)} />;
+                onChange={(checked) => this.changeShelfState(index, item, checked)}
+              />
+            );
          },
        },
        {
@@ -301,7 +299,7 @@ class LiveCourseList extends React.Component {
          sorter: true,
          render: (val, item) => {
            // -29000：与后端约定 在初始化学院时，创建时间（标志位-29000）默认展示为'-'
-            return <span>{val === -29000 ? '-' : formatDate('YYYY-MM-DD H:i', val)}</span>;
+            return <span style={{ whiteSpace: 'nowrap' }}>{val === -29000 ? '-' : window.formatDate('YYYY-MM-DD H:i', val)}</span>;
          },
        },
        {
@@ -312,7 +310,8 @@ class LiveCourseList extends React.Component {
          render: (val, record) => {
            return (
              <div className='related-task'>
-                {record.relatedPlanList ? (
+                <Choose>
+                  <When condition={record.relatedPlanLis}>
                    <Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter>
                      {record.relatedPlanList.map((item, index) => {
                        return (
@@ -322,17 +321,20 @@ class LiveCourseList extends React.Component {
                        );
                      })}
                    </Tooltip>
-                ) : (
+                  </When>
+                  <Otherwise>
                    <span></span>
-                )}
+                  </Otherwise>
+                </Choose>
              </div>
            );
          },
        },
        {
          title: '操作',
-          width: '15%',
+          width: 210,
          key: 'operate',
+          fixed: 'right',
          dataIndex: 'operate',
          render: (val, item) => {
            return (
@@ -424,21 +426,25 @@ class LiveCourseList extends React.Component {
                {record.courseMediaVOS.map((item, index) => {
                  if (item.contentType === 'COVER') {
                    hasCover = true;
-                    return <img className='course-cover' src={item.mediaUrl} />;
+                    return <img className='course-cover' src={item.mediaUrl} alt='' />;
                  }
                })}
-                {!hasCover && <img className='course-cover' src={'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'} />}
+                {!hasCover && <img className='course-cover' src={'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'} alt='' />}
                <div>
-                  {record.courseName.length > 17 ? (
+                  <Choose>
+                    <When condition={record.courseName.length > 17}>
                      <Tooltip title={record.courseName}>
                        <div className='course-name'>{record.courseName}</div>
                      </Tooltip>
-                  ) : (
+                    </When>
+                    <Otherwise>
                      <div className='course-name'>{record.courseName}</div>
-                  )}
+                    </Otherwise>
+                  </Choose>
                  <div>
                    <span className='course-time'>
-                      {formatDate('YYYY-MM-DD H:i', parseInt(record.startTime))}~{formatDate('H:i', parseInt(record.endTime))}
+                      {window.formatDate('YYYY-MM-DD H:i', parseInt(record.startTime))}~{window.formatDate('H:i', parseInt(record.endTime))}
                    </span>
                    <span
                      className='course-status'
@@ -447,18 +453,21 @@ class LiveCourseList extends React.Component {
                    </span>
                  </div>
                  <div className='teacher-assistant'>
-                    {record.teacherName && record.teacherName.length > 4 ? (
+                    <Choose>
+                      <When condition={record.teacherName && record.teacherName.length > 4}>
                        <Tooltip title={record.teacherName}>
                          <span className='teacher'>讲师：{record.teacherName}</span>
                        </Tooltip>
-                    ) : (
+                      </When>
+                      <Otherwise>
                        <span className='teacher'>讲师：{record.teacherName}</span>
-                    )}
+                      </Otherwise>
+                    </Choose>
-                    {record.admins.length > 0 && (
+                    <If condition={record.admins.length > 0}>
-                      <>
                      <span className='split'> | </span>
-                        {this.handleAdminName(record.admins).length > 4 ? (
+                      <Choose>
+                        <When condition={this.handleAdminName(record.admins).length > 4}>
                          <Tooltip title={this.handleAdminName(record.admins)}>
                            <span className='assistant'>
                              助教：
@@ -471,7 +480,8 @@ class LiveCourseList extends React.Component {
                              })}
                            </span>
                          </Tooltip>
-                        ) : (
+                        </When>
+                        <Otherwise>
                          <span className='assistant'>
                            助教：
                            {record.admins.map((item, index) => {
@@ -482,9 +492,9 @@ class LiveCourseList extends React.Component {
                              );
                            })}
                          </span>
-                        )}
+                        </Otherwise>
-                      </>
+                      </Choose>
-                    )}
+                    </If>
                  </div>
                </div>
              </div>
@@ -544,7 +554,7 @@ class LiveCourseList extends React.Component {
          dataIndex: 'created',
          sorter: true,
          render: (val, item) => {
-            return <span>{formatDate('YYYY-MM-DD H:i', val)}</span>;
+            return <span>{window.formatDate('YYYY-MM-DD H:i', val)}</span>;
          },
        },
        {
@@ -555,7 +565,8 @@ class LiveCourseList extends React.Component {
          render: (val, record) => {
            return (
              <div className='related-task'>
-                {record.relatedPlanList ? (
+                <Choose>
+                  <When condition={record.relatedPlanList}>
                    <Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter>
                      {record.relatedPlanList.map((item, index) => {
                        return (
@@ -565,9 +576,11 @@ class LiveCourseList extends React.Component {
                        );
                      })}
                    </Tooltip>
-                ) : (
+                  </When>
+                  <Otherwise>
                    <span></span>
-                )}
+                  </Otherwise>
+                </Choose>
              </div>
            );
          },
@@ -578,7 +591,7 @@ class LiveCourseList extends React.Component {
  };
  handleAdminName = (adminArray) => {
    let adminStr = '';
-    adminArray.map((item, index) => {
+    adminArray.forEach((item, index) => {
      if (index < adminArray.length - 1) {
        adminStr = adminStr + item.adminName + '、';
      } else {
@@ -590,7 +603,7 @@ class LiveCourseList extends React.Component {
  handlePlanName = (planArray) => {
    let planStr = '';
-    planArray.map((item, index) => {
+    planArray.forEach((item, index) => {
      if (index < planArray.length - 1) {
        planStr = planStr + item.planName + '、';
      } else {
@@ -687,7 +700,7 @@ class LiveCourseList extends React.Component {
    }
  };
  onShowSizeChange = (current, size) => {
-    if (current == size) {
+    if (current === size) {
      return;
    }
    let _query = this.props.query;
@@ -795,6 +808,7 @@ class LiveCourseList extends React.Component {
          size='middle'
          pagination={false}
          columns={columns}
+          scroll={{ x: 1300 }}
          loading={loading}
          dataSource={courseList}
          onChange={this.handleChangeTable}
@@ -818,7 +832,6 @@ class LiveCourseList extends React.Component {
        {openCoursewareModal && (
          <ManageCoursewareModal
            data={editData}
-            type={type}
            onCancel={() => {
              this.props.onChange();
              this.setState({ openCoursewareModal: false });
@@ -846,7 +859,7 @@ class LiveCourseList extends React.Component {
            onConfirm={this.onConfirmSelectPlanList}
          />
        )}
-        <iframe src={url} style={{ display: 'none' }} />
+        <iframe src={url} style={{ display: 'none' }} title='navigation' />
        <Route path={`${match.url}/live-course-data`} component={DataList} />
      </div>
    );

--- a/src/modules/course-manage/components/LiveCourseList.less
+++ b/src/modules/course-manage/components/LiveCourseList.less
 .live-course-list {
  margin-top: 12px;
  .record__item {
+    overflow: hidden;
    display: flex;
    align-items: center;
    .course-cover {
@@ -11,63 +11,61 @@
      border-radius: 2px;
      margin-right: 8px;
    }
-    .course-name{
+    .course-name {
      font-size: 14px;
      font-weight: 500;
      color: #333333;
      line-height: 20px;
      font-weight: bold;
-      max-width:244px;
+      max-width: 200px;
      overflow: hidden;
-      text-overflow:ellipsis;
+      text-overflow: ellipsis;
      white-space: nowrap;
    }
-    .course-time{
+    .course-time {
      font-size: 12px;
      font-weight: 400;
      color: #666666;
      line-height: 20px;
    }
    .course-status {
-       font-size:12px;
+      font-size: 12px;
-       line-height:18px;
+      line-height: 18px;
-       display:inline-block;
+      display: inline-block;
-       border-radius:2px;
+      border-radius: 2px;
-       padding:0 8px;
+      padding: 0 8px;
-       margin-left:4px;
+      margin-left: 4px;
    }
-    .teacher-assistant{
+    .teacher-assistant {
-      display:flex;
+      display: flex;
-      .teacher{
+      .teacher {
        font-size: 12px;
        color: #666666;
        max-width: 96px;
        overflow: hidden;
-        text-overflow:ellipsis;
+        text-overflow: ellipsis;
        white-space: nowrap;
-        display:inline-block;
+        display: inline-block;
-        padding-top:2px;
+        padding-top: 2px;
      }
-      .assistant{
+      .assistant {
        font-size: 12px;
        color: #666666;
        max-width: 96px;
        overflow: hidden;
-        text-overflow:ellipsis;
+        text-overflow: ellipsis;
        white-space: nowrap;
-        display:inline-block;
+        display: inline-block;
-        padding-top:2px;
+        padding-top: 2px;
      }
      .split {
        margin: 0 4px;
-        color: #BFBFBF;
+        color: #bfbfbf;
        display: inline-blcok;
      }
    }
  }
-  .related-task{
+  .related-task {
    text-overflow: -o-ellipsis-lastline;
    overflow: hidden;
    text-overflow: ellipsis;
@@ -76,37 +74,37 @@
    line-clamp: 2;
    -webkit-box-orient: vertical;
  }
-  .categoryName{
+  .categoryName {
    font-size: 14px;
    color: #666666;
    line-height: 20px;
  }
-  .courseware{
+  .courseware {
    font-size: 14px;
-    color: #2966FF;
+    color: #2966ff;
    line-height: 20px;
-    text-align:right;
+    text-align: right;
-    cursor:pointer;
+    cursor: pointer;
  }
-  .quota-icon{
+  .quota-icon {
-    color:#2966FF;
+    color: #2966ff;
-    cursor:pointer;
+    cursor: pointer;
  }
  .operate {
    display: flex;
    align-items: center;
    flex-wrap: wrap;
    .operate__item {
-      color: #2966FF;
+      color: #2966ff;
      cursor: pointer;
      &.split {
        margin: 0 8px;
-        color: #BFBFBF;
+        color: #bfbfbf;
      }
    }
  }
  .operate-text {
-    color: #2966FF;
+    color: #2966ff;
    cursor: pointer;
  }
  .course-start-end {
@@ -135,7 +133,27 @@
      font-size: 12px;
    }
  }
+  tbody {
+    tr {
+      &:nth-child(even) {
+        background: transparent !important;
+        td {
+          background: #fff !important;
+        }
+      }
+      &:nth-child(odd) {
+        background: #fafafa !important;
+        td {
+          background: #fafafa !important;
+        }
+      }
+      &:hover {
+        td {
+          background: #f3f6fa !important;
+        }
+      }
+    }
+  }
 }
 .live-course-more-menu {
  background: white;

--- a/src/modules/course-manage/components/LiveCourseOpt.jsx
+++ b/src/modules/course-manage/components/LiveCourseOpt.jsx
@@ -53,7 +53,7 @@ class LiveCourseOpt extends React.Component {
          { userRole !== "CloudLecturer" &&
            <Button type="primary" onClick={this.handleCreateLiveCouese}>新建直播课</Button>
          }
-          {!this.state.isMac && <Button onClick={this.handleDownloadClient}>下载直播客户端</Button>}
+         <Button onClick={this.handleDownloadClient}>下载直播客户端</Button>
        </div>
      </div>
    )

--- a/src/modules/course-manage/offline-course/components/OfflineCourseList.jsx
+++ b/src/modules/course-manage/offline-course/components/OfflineCourseList.jsx
@@ -10,7 +10,7 @@ import Service from '@/common/js/service';
 import User from '@/common/js/user';
 import college from '@/common/lottie/college';
 import { PageControl, XMTable } from '@/components';
-import { appId, LIVE_SHARE } from '@/domains/course-domain/constants';
+import { LIVE_SHARE } from '@/domains/course-domain/constants';
 import CourseService from '@/domains/course-domain/CourseService';
 import ShareLiveModal from '@/modules/course-manage/modal/ShareLiveModal';
 import OfflineCourseData from '@/modules/course-manage/offline-course/OfflineCourseData';
@@ -78,7 +78,7 @@ class OfflineCourseList extends React.Component {
          } ${moment(startTime).format('HH:mm')} ~ ${moment(endTime).format('HH:mm')}`;
          return (
            <div className='record__item'>
-              <img className='course-cover' src={coverUrl || defaultCoverUrl} />
+              <img className='course-cover' src={coverUrl || defaultCoverUrl} alt='' />
              <div style={{ width: 175 }}>
                <Tooltip title={courseName}>
                  <div className='course-name'>{courseName}</div>
@@ -152,14 +152,14 @@ class OfflineCourseList extends React.Component {
      },
      {
        title: '报名时间',
-        width: 181,
+        width: 200,
        key: 'apply',
        dataIndex: 'apply',
        sorter: true,
        render: (val, item) => {
          return (
-            <div>
+            <div style={{ whiteSpace: 'nowrap' }}>
-              {item.startTimeApply ? `${formatDate('MM-DD H:i', item.startTimeApply)} ~ ${formatDate('MM-DD H:i', item.endTimeApply)}` : '-'}
+              {item.startTimeApply ? `${window.formatDate('MM-DD H:i', item.startTimeApply)} ~ ${window.formatDate('MM-DD H:i', item.endTimeApply)}` : '-'}
              {item.whetherApplyFull === 'YES' && (
                <span
                  style={{
@@ -185,7 +185,7 @@ class OfflineCourseList extends React.Component {
        dataIndex: 'created',
        sorter: true,
        render: (val) => {
-          return formatDate('YYYY-MM-DD H:i', val);
+          return <span style={{ whiteSpace: 'nowrap' }}>{window.formatDate('YYYY-MM-DD H:i', val)}</span>;
        },
      },
      {
@@ -360,8 +360,6 @@ class OfflineCourseList extends React.Component {
  // 显示分享弹窗
  handleShowShareModal = (record, needStr = false) => {
    const { courseId } = record;
-    const _appId = appId;
    const htmlUrl = `${LIVE_SHARE}offline_detail/${courseId}?id=${User.getStoreId()}`;
    const longUrl = htmlUrl;
    const { courseName, courseMediaVOS } = record;
@@ -437,7 +435,7 @@ class OfflineCourseList extends React.Component {
          columns={this.parseColumns()}
          onChange={this.handleChangeTable}
          pagination={false}
-          scroll={{ x: 1500 }}
+          scroll={{ x: 1300 }}
          bordered
          className='offline-list-table'
        />

--- a/src/modules/course-manage/video-course/components/VideoCourseList.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseList.jsx
-import { Dropdown, message, Modal, Switch, Table, Tooltip } from 'antd';
+import { Dropdown, message, Modal, Switch, Tooltip } from 'antd';
 import User from '@/common/js/user';
 import { PageControl } from '@/components';
 import { LIVE_SHARE } from '@/domains/course-domain/constants';
@@ -147,7 +147,7 @@ class VideoCourseList extends React.Component {
                  关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。
                </div>
              }>
-              <i className='icon iconfont' style={{ marginLeft: '5px', cursor: 'pointer', color: '#bfbfbf', fontSize: '14px' }}>
+              <i className='icon iconfont' style={{ marginLeft: '5px', cursor: 'pointer', color: '#bfbfbf', fontSize: '14px', fontWeight: 'normal' }}>
                &#xe61d;
              </i>
            </Tooltip>
@@ -185,7 +185,7 @@ class VideoCourseList extends React.Component {
        dataIndex: 'created',
        sorter: true,
        render: (val) => {
-          return formatDate('YYYY-MM-DD H:i', val);
+          return window.formatDate('YYYY-MM-DD H:i', val);
        },
      },
      {
@@ -195,7 +195,7 @@ class VideoCourseList extends React.Component {
        dataIndex: 'updated',
        sorter: true,
        render: (val) => {
-          return formatDate('YYYY-MM-DD H:i', val);
+          return window.formatDate('YYYY-MM-DD H:i', val);
        },
      },
      {
@@ -211,7 +211,7 @@ class VideoCourseList extends React.Component {
                  <Tooltip title={this.handlePlanName(record.relatedPlanList)} placement='top' arrowPointAtCenter>
                    {record.relatedPlanList.map((item, index) => {
                      return (
-                        <span>
+                        <span key={item.planId}>
                          {item.planName} {index < record.relatedPlanList.length - 1 && <span> 、</span>}
                        </span>
                      );
@@ -296,7 +296,7 @@ class VideoCourseList extends React.Component {
  handlePlanName = (planArray) => {
    let planStr = '';
-    planArray.map((item, index) => {
+    planArray.forEach((item, index) => {
      if (index < planArray.length - 1) {
        planStr = planStr + item.planName + '、';
      } else {

--- a/src/modules/plan-manage/components/PlanList.jsx
+++ b/src/modules/plan-manage/components/PlanList.jsx
@@ -8,9 +8,9 @@
 */
 import React, { useState } from 'react';
-import { Table, Modal, message, Tooltip, Switch, Dropdown } from 'antd';
+import { Modal, message, Tooltip, Switch, Dropdown } from 'antd';
 import { withRouter } from 'react-router-dom';
-import { PageControl, XMTable } from "@/components";
+import { PageControl, XMTable } from '@/components';
 import PlanService from '@/domains/plan-domain/planService';
 import SharePlanModal from '../modal/SharePlanModal';
 import { LIVE_SHARE } from '@/domains/course-domain/constants';
@@ -29,6 +29,7 @@ function PlanList(props) {
        key: 'planName',
        dataIndex: 'planName',
        width: '18%',
+        fixed: 'left',
        render: (val, record) => {
          return (
            <div className='plan_name_item'>
@@ -86,7 +87,7 @@ function PlanList(props) {
        dataIndex: 'created',
        sorter: true,
        render: (val) => {
-          return window.formatDate('YYYY-MM-DD H:i', val);
+          return <span style={{ whiteSpace: 'nowrap' }}>{window.formatDate('YYYY-MM-DD H:i', val)}</span>;
        },
      },
      {
@@ -96,12 +97,12 @@ function PlanList(props) {
        dataIndex: 'updated',
        sorter: true,
        render: (val) => {
-          return window.formatDate('YYYY-MM-DD H:i', val);
+          return <span style={{ whiteSpace: 'nowrap' }}>{window.formatDate('YYYY-MM-DD H:i', val)}</span>;
        },
      },
      {
        title: '参培人数',
-        width: 76,
+        width: '10%',
        key: 'cultureCustomerNum',
        dataIndex: 'cultureCustomerNum',
        sorter: true,
@@ -114,7 +115,7 @@ function PlanList(props) {
        key: 'operate',
        dataIndex: 'operate',
        fixed: 'right',
-        width: 176,
+        width: '14.5%',
        render: (val, record) => {
          return (
            <div className='operate'>
@@ -317,7 +318,7 @@ function PlanList(props) {
        scroll={{ x: 1400 }}
        className='plan-list-table'
        renderEmpty={{
-          description: <span style={{ display: 'block', paddingBottom: 24 }}>暂无数据</span>
+          description: <span style={{ display: 'block', paddingBottom: 24 }}>暂无数据</span>,
        }}
      />
      <div className='box-footer'>

--- a/src/modules/teach-tool/examination-manager/Index.tsx
+++ b/src/modules/teach-tool/examination-manager/Index.tsx
@@ -134,11 +134,12 @@ function ExaminationManager(props: any) {
    },
    {
      title: '创建时间',
+      width: 150,
      dataIndex: 'examCreateTime',
      align: fixStr.right,
      sorter: true,
      sortOrder: field === 'examCreateTime' ? order : sortStatus.type,
-      render: (text: any, record: any) => <span>{moment(text).format('YYYY-MM-DD HH:mm')}</span>,
+      render: (text: any, record: any) => <span style={{ whiteSpace: 'nowrap' }}>{moment(text).format('YYYY-MM-DD HH:mm')}</span>,
    },
    {
      title: '操作',