Skip to content

X
xiaomai-cloud-class-web
Commit f530ebcf by guomingpang
Options

merge:merge master

parents ce7a5a1e 64f4b1f6
Showing with 5 additions and 86 deletions
src/modules/course-manage/components/LiveCourseList.jsx
...@@ -175,7 +175,7 @@ class LiveCourseList extends React.Component { ...@@ -175,7 +175,7 @@ class LiveCourseList extends React.Component {
</span> </span>
</div> </div>
<div className='teacher-assistant'> <div className='teacher-assistant'>
{record.teacherName?.length > 4 ? ( {record.teacherName && record.teacherName.length > 4 ? (
<Tooltip title={record.teacherName}> <Tooltip title={record.teacherName}>
<span className='teacher'>讲师：{record.teacherName}</span> <span className='teacher'>讲师：{record.teacherName}</span>
</Tooltip> </Tooltip>
...@@ -303,6 +303,7 @@ class LiveCourseList extends React.Component { ...@@ -303,6 +303,7 @@ class LiveCourseList extends React.Component {
dataIndex: 'created', dataIndex: 'created',
sorter: true, sorter: true,
render: (val, item) => { render: (val, item) => {
// -29000：与后端约定 在初始化学院时，创建时间（标志位-29000）默认展示为'-'
return <span>{val === -29000 ? '-' : formatDate('YYYY-MM-DD H:i', val)}</span>; return <span>{val === -29000 ? '-' : formatDate('YYYY-MM-DD H:i', val)}</span>;
}, },
}, },
...@@ -449,7 +450,7 @@ class LiveCourseList extends React.Component { ...@@ -449,7 +450,7 @@ class LiveCourseList extends React.Component {
</span> </span>
</div> </div>
<div className='teacher-assistant'> <div className='teacher-assistant'>
{record.teacherName.length > 4 ? ( {record.teacherName && record.teacherName.length > 4 ? (
<Tooltip title={record.teacherName}> <Tooltip title={record.teacherName}>
<span className='teacher'>讲师：{record.teacherName}</span> <span className='teacher'>讲师：{record.teacherName}</span>
</Tooltip> </Tooltip>
......
src/modules/course-manage/modal/ManageCoursewareModal.jsx
...@@ -171,8 +171,6 @@ class ManageCoursewareModal extends React.Component { ...@@ -171,8 +171,6 @@ class ManageCoursewareModal extends React.Component {
const that = this; const that = this;
switch (fileType) { switch (fileType) {
case 'PDF': case 'PDF':
// window.open(item.srcDocUrl, "_blank");
// break;
case 'Excel': case 'Excel':
case 'EXCEL': case 'EXCEL':
case 'PPT': case 'PPT':
...@@ -181,27 +179,6 @@ class ManageCoursewareModal extends React.Component { ...@@ -181,27 +179,6 @@ class ManageCoursewareModal extends React.Component {
case 'WORD': case 'WORD':
case 'DOCX': case 'DOCX':
case 'DOC': case 'DOC':
// let size = parseFloat(item.fileSize.replace(/M$|KB$/g, ''));
// if (item.fileSize.includes('KB')) {
// size = 0;
// }
// if (((fileType == 'word' || fileType == 'PPT') && size > 10) || ((fileType == 'Excel') && size > 5)) {
// Modal.confirm({
// title: '抱歉，不能在线预览',
// content: '由于文件较大，不支持在线预览，请下载后再查看',
// icon: <QuestionCircleOutlined />,
// okText:"下载",
// onOk:() => {
// const a = document.createElement('a');
// a.href = item.srcDocUrl;
// a.click();
// }
// });
// } else {
// const scanUrl = "https://view.officeapps.live.com/op/view.aspx?src=" + encodeURIComponent(item.srcDocUrl);
// window.open(scanUrl, "_blank");
// }
if (!item.fileVersionId) { if (!item.fileVersionId) {
this.setState( this.setState(
{ {
......
src/modules/course-manage/modal/ShareLiveModal.jsx
...@@ -109,13 +109,8 @@ class ShareLiveModal extends React.Component { ...@@ -109,13 +109,8 @@ class ShareLiveModal extends React.Component {
switch (type) { switch (type) {
case 'liveClass': // 直播课 case 'liveClass': // 直播课
if (courseMediaVOS && courseMediaVOS.length > 0) { if (courseMediaVOS && courseMediaVOS.length > 0) {
data.courseMediaVOS.map((item, index) => { const coverItem = courseMediaVOS.filter((item) => item.contentType === 'COVER');
if (item.contentType === 'COVER') { coverImgSrc = coverItem.length === 0 ? 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png' : coverItem[0].mediaUrl;
coverImgSrc = item.mediaUrl;
} else {
coverImgSrc = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png';
}
});
} else { } else {
coverImgSrc = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png'; coverImgSrc = 'https://image.xiaomaiketang.com/xm/Yip2YtFDwH.png';
} }
......
src/modules/resource-disk/components/FolderList.jsx
...@@ -121,40 +121,6 @@ class FolderList extends React.Component { ...@@ -121,40 +121,6 @@ class FolderList extends React.Component {
break; break;
} }
} }
// getYoZoSign = (data,type,folderName)=>{
// return new Promise((resolve) => {
// let uploadParams;
// if(type==="UPLOAD"){
// uploadParams ={
// fileUrl:data,
// instId:window.currentUserInstInfo.instId,
// yoZoTypeEnum:'UPLOAD'
// }
// }else{
// uploadParams ={
// fileVersionId:data,
// instId:window.currentUserInstInfo.instId,
// yoZoTypeEnum:'VIEW',
// htmlTitle:folderName
// }
// }
// Service.Apollo('public/apollo/getYoZoSign', uploadParams).then(res => {
// const { result = [] } = res;
// resolve(result)
// });
// })
// }
// saveYoZoFileVersionId = (fileVersionId,folderId)=>{
// const params ={
// fileVersionId,
// folderId,
// instId: window.currentUserInstInfo.instId,
// }
// Service.Apollo('public/apollo/saveYoZoFileVersionId', params).then(res => {
// });
// }
// 预览文件 // 预览文件
handleScanFile = async (folder) => { handleScanFile = async (folder) => {
const { folderFormat, folderSize, ossUrl,rights,fileVersionId,id,folderName} = folder; const { folderFormat, folderSize, ossUrl,rights,fileVersionId,id,folderName} = folder;
......
src/modules/root/Login.jsx
...@@ -32,26 +32,6 @@ function Login(props) { ...@@ -32,26 +32,6 @@ function Login(props) {
*/ */
useEffect(() => { useEffect(() => {
// const enterpriseId = getParameterByName('enterpriseId');
// const userId = getParameterByName('userId');
// const from = getParameterByName('from');
// const storeId = getParameterByName('storeId');
// if (storeId) {
// User.setCustomerStoreId(storeId);
// }
// if (from === 'customer' && enterpriseId && userId) {
// if (!user.getToken() || enterpriseId !== user.getEnterpriseId() || userId !== User.getUserId()) {
// getWXWorkLoginNoCheck(enterpriseId, userId);
// } else {
// window.RCHistory.push({
// pathname: `/switch-route`,
// });
// }
// } else {
// User.removeUserId();
// User.removeToken();
// User.removeEnterpriseId();
// }
User.removeUserId(); User.removeUserId();
User.removeToken(); User.removeToken();
User.removeEnterpriseId(); User.removeEnterpriseId();
......
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