dev_static
杨树明 5 years ago
parent 29f9c0d92c
commit 33bb561e38

@ -42,7 +42,7 @@ if (isDev) {
// 老师 // 老师
//debugType="teacher"; //debugType="teacher";
// 学生 // 学生
//debugType="student"; debugType="student";
function railsgettimes(proxy) { function railsgettimes(proxy) {

@ -68,6 +68,7 @@ class CommonWorkPost extends Component{
uid: item.id, uid: item.id,
name: appendFileSizeToUploadFile(item), name: appendFileSizeToUploadFile(item),
url: item.url, url: item.url,
delete: item.delete,
status: 'done' status: 'done'
} }
}) })
@ -320,19 +321,23 @@ class CommonWorkPost extends Component{
// ModalSave: ()=>this.deleteAttachment(file), // ModalSave: ()=>this.deleteAttachment(file),
// ModalCancel:this.cancelAttachment // ModalCancel:this.cancelAttachment
// }) // })
if (file.delete === false) {
if(!file.percent || file.percent == 100){ this.props.showNotification(`该作品已被评阅,不能删除该附件`);
this.props.confirm({ return false
content: '是否确认删除?', } else {
onOk: () => { if (!file.percent || file.percent == 100) {
this.deleteAttachment(file) this.props.confirm({
}, content: '是否确认删除?',
onCancel() { onOk: () => {
console.log('Cancel'); this.deleteAttachment(file)
}, },
}); onCancel() {
return false; console.log('Cancel');
} },
});
return false;
}
}
} }
cancelAttachment=()=>{ cancelAttachment=()=>{

@ -56,6 +56,7 @@ class GraduationTasksSubmitedit extends Component{
name: appendFileSizeToUploadFile(item), name: appendFileSizeToUploadFile(item),
url: item.url, url: item.url,
filesize: item.filesize, filesize: item.filesize,
delete:item.delete,
status: 'done' status: 'done'
} }
}) })
@ -133,15 +134,21 @@ class GraduationTasksSubmitedit extends Component{
} }
onAttachmentRemove = (file) => { onAttachmentRemove = (file) => {
if(!file.percent || file.percent == 100){ if(file.delete===false){
this.setState({ this.props.showNotification(`该作品已被评阅,不能删除该附件`);
Modalstype:true, return false
Modalstopval:'确定要删除这个附件吗?', }else{
ModalSave: ()=>this.deleteAttachment(file), if(!file.percent || file.percent == 100){
ModalCancel:this.cancelAttachment this.setState({
}) Modalstype:true,
return false; Modalstopval:'确定要删除这个附件吗?',
} ModalSave: ()=>this.deleteAttachment(file),
ModalCancel:this.cancelAttachment
})
return false;
}
}
} }

@ -12,6 +12,7 @@ import ModulationModal from "../../coursesPublic/ModulationModal";
import AllocationModal from "../../coursesPublic/AllocationModal"; import AllocationModal from "../../coursesPublic/AllocationModal";
import Associationmodel from '../../coursesPublic/Associationmodel'; import Associationmodel from '../../coursesPublic/Associationmodel';
import AccessoryModal from "../../coursesPublic/AccessoryModal"; import AccessoryModal from "../../coursesPublic/AccessoryModal";
import './Graduationclass.css';
const CheckboxGroup = Checkbox.Group; const CheckboxGroup = Checkbox.Group;
@ -826,7 +827,7 @@ class GraduationTaskssettinglist extends Component{
className:'edu-txt-center', className:'edu-txt-center',
render: (text, record) => ( render: (text, record) => (
<span> <span>
<a style={{color:'#9A9A9A'}}>{record.classroom==="未分班"?"--":record.classroom}</a> <a style={{color:'#9A9A9A'}} className={"classroomclass"} title={record.classroom==="未分班"?"":record.classroom}>{record.classroom==="未分班"?"--":record.classroom}</a>
</span> </span>
), ),
}, { }, {

@ -0,0 +1,7 @@
.classroomclass{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 110px;
display: inline-block;
}
Loading…
Cancel
Save