+ style={{ textAlign: 'center', 'margin-bottom': '14px'}}>
知道啦
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 3dd3f8d7d..67da6c549 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -58,8 +58,9 @@ function buildColumns(that, student_works) {
const isAdminOrStudent = that.props.isAdminOrStudent()
const isStudent = that.props.isStudent()
const isNiPing = homework_status && homework_status.indexOf('匿评中') != -1
+ const isAppeal = homework_status && homework_status.indexOf('申诉中') != -1
// https://www.trustie.net/issues/21450 分组作业作品列表 学时视角，匿评阶段的列表显示信息不正确
- const niPingAndIsStudent = isStudent && isNiPing
+ const niPingAndIsStudent = isStudent && (isNiPing || isAppeal)
let columns = [{
width: 60,
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
index 56eabb375..056f58574 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -1149,7 +1149,8 @@ class CommonWorkSetting extends Component{
结束时间：
-
+ {/*
+ */}
// {
// const end_time = this.state.end_time
@@ -1172,7 +1174,7 @@ class CommonWorkSetting extends Component{
// }
/>
-
+
（学生“延时”提交作品的时间截点）
{
{latetimetype}
}
diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js
index 462bebaa1..3bb77dfb5 100644
--- a/public/react/src/modules/courses/busyWork/NewWork.js
+++ b/public/react/src/modules/courses/busyWork/NewWork.js
@@ -38,7 +38,8 @@ class NewWork extends Component{
}
}
fetchCourseData = (courseId) => {
- const url = `/courses/${courseId}/homework_commons/new.json?type=1`
+ const isGroup = this.props.isGroup()
+ const url = `/courses/${courseId}/homework_commons/new.json?type=${isGroup ? 3 : 1}`
axios.get(url, {
})
.then((response) => {
@@ -369,7 +370,8 @@ class NewWork extends Component{
*/}
diff --git a/public/react/src/modules/courses/shixunHomework/Httpdownloads.js b/public/react/src/modules/courses/shixunHomework/Httpdownloads.js
new file mode 100644
index 000000000..11bd91f6b
--- /dev/null
+++ b/public/react/src/modules/courses/shixunHomework/Httpdownloads.js
@@ -0,0 +1,21 @@
+import {Base64} from 'js-base64';
+import axios from 'axios';
+
+
+// 导出实习报告批量zip 、xlsx 类型
+export function Internshipreportsy (url,struy,types,stingtype){
+ axios.get((url),{responseType: 'blob'}).then((response) => {
+ const blob = new Blob([response.data], { type: stingtype });
+ const downloadElement = document.createElement('a');
+ const href = window.URL.createObjectURL(blob);
+ const string = Base64.decode(response.headers['content-disposition'].split('=')[1]);
+ downloadElement.href = href;
+ downloadElement.download = string+struy+types;
+ document.body.appendChild(downloadElement);
+ downloadElement.click();
+ document.body.removeChild(downloadElement) ;// 下载完成移除元素
+ window.URL.revokeObjectURL(href) // 释放掉blob对象
+ }).catch((error) => {
+ console.log(error)
+ });
+}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index a9c783994..f09256230 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -5,6 +5,7 @@ import TraineetraininginformationModal from './TraineetraininginformationModal';
import ModulationModal from "../coursesPublic/ModulationModal";
import HomeworkModal from "../coursesPublic/HomeworkModal";
import {Base64} from 'js-base64';
+import {Internshipreportsy} from './Httpdownloads'
import {
Form,
Select,
@@ -1336,7 +1337,7 @@ class Listofworks extends Component {
});
}
- /// 确认是否下砸
+ /// 确认是否下载
confirmysl(url,type){
var struy="";
try {
@@ -1348,69 +1349,71 @@ class Listofworks extends Component {
}
axios.get(url).then((response) => {
- if(response.data.status&&response.data.status===-1){
- console.log("1352");
- console.log(response);
-
- }else if(response.data.status&&response.data.status===-2){
- console.log("1356");
- console.log(response);
- }else {
- if(type === 1){
- this.internshipreport(url,struy)
- }else{
- this.Classstudentachievement(url,struy);
- }
- }
- }).catch((error) => {
- console.log(error)
- });
- }
- // 导出实习报告批量
- internshipreport = (url,struy)=>{
- console.log("internshipreport");
-
- axios.get((url),{responseType: 'blob'}).then((response) => {
- console.log("1350");
- console.log(response);
- const type='application/zip'//ZIP文件
- const blob = new Blob([response.data], { type: type });
- const downloadElement = document.createElement('a');
- const href = window.URL.createObjectURL(blob);
- const string = Base64.decode(response.headers['content-disposition'].split('=')[1]);
- console.log(response.headers['content-disposition'].split('=')[1]);
- downloadElement.href = href;
- downloadElement.download = string+struy+".zip";
- document.body.appendChild(downloadElement);
- downloadElement.click();
- document.body.removeChild(downloadElement) ;// 下载完成移除元素
- window.URL.revokeObjectURL(href) // 释放掉blob对象
- }).catch((error) => {
- console.log(error)
- });
- }
- // 课堂学生成绩的导出下载
- Classstudentachievement=(url,struy)=>{
- console.log("Classstudentachievement");
- axios.get((url),{responseType: 'blob'}).then((response) => {
- console.log("1374");
- console.log(response);
- const type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' //excel文件
- const blob = new Blob([response.data], { type: type });
- const downloadElement = document.createElement('a');
- const href = window.URL.createObjectURL(blob);
- const string = Base64.decode(response.headers['content-disposition'].split('=')[1]);
- console.log(response.headers['content-disposition'].split('=')[1]);
- downloadElement.href = href;
- downloadElement.download =string+struy+".xlsx";
- document.body.appendChild(downloadElement);
- downloadElement.click();
- document.body.removeChild(downloadElement); // 下载完成移除元素
- window.URL.revokeObjectURL(href) // 释放掉blob对象
- }).catch((error) => {
+ if(response !== undefined){
+ if(response.data.status&&response.data.status===-1){
+ console.log("1352");
+ console.log(response);
+
+ }else if(response.data.status&&response.data.status===-2){
+ console.log("1356");
+ console.log(response);
+ }else {
+ if(type === 1){
+ Internshipreportsy(url,struy,".zip",'application/zip');
+ }else{
+ Internshipreportsy(url,struy,".xlsx",'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+ }
+ }
+ }
+ }).catch((error) => {
console.log(error)
- });
+ });
}
+ // 导出实习报告批量
+ // internshipreport = (url,struy,types,stingtype)=>{
+ // console.log("internshipreport");
+ //
+ // axios.get((url),{responseType: 'blob'}).then((response) => {
+ // console.log("1350");
+ // console.log(response);
+ // const type='application/zip'//ZIP文件
+ // const blob = new Blob([response.data], { type: stingtype });
+ // const downloadElement = document.createElement('a');
+ // const href = window.URL.createObjectURL(blob);
+ // const string = Base64.decode(response.headers['content-disposition'].split('=')[1]);
+ // console.log(response.headers['content-disposition'].split('=')[1]);
+ // downloadElement.href = href;
+ // downloadElement.download = string+struy+types;
+ // document.body.appendChild(downloadElement);
+ // downloadElement.click();
+ // document.body.removeChild(downloadElement) ;// 下载完成移除元素
+ // window.URL.revokeObjectURL(href) // 释放掉blob对象
+ // }).catch((error) => {
+ // console.log(error)
+ // });
+ // }
+ // // 课堂学生成绩的导出下载
+ // Classstudentachievement=(url,struy)=>{
+ // console.log("Classstudentachievement");
+ // axios.get((url),{responseType: 'blob'}).then((response) => {
+ // console.log("1374");
+ // console.log(response);
+ // const type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' //excel文件
+ // const blob = new Blob([response.data], { type: type });
+ // const downloadElement = document.createElement('a');
+ // const href = window.URL.createObjectURL(blob);
+ // const string = Base64.decode(response.headers['content-disposition'].split('=')[1]);
+ // console.log(response.headers['content-disposition'].split('=')[1]);
+ // downloadElement.href = href;
+ // downloadElement.download =string+struy+".xlsx";
+ // document.body.appendChild(downloadElement);
+ // downloadElement.click();
+ // document.body.removeChild(downloadElement); // 下载完成移除元素
+ // window.URL.revokeObjectURL(href) // 释放掉blob对象
+ // }).catch((error) => {
+ // console.log(error)
+ // });
+ // }
render() {
// console.log("Listofworks.js000")
diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js
index c8ffa266d..d058d5881 100644
--- a/public/react/src/modules/user/Interestpage.js
+++ b/public/react/src/modules/user/Interestpage.js
@@ -79,7 +79,6 @@ class InterestpageComponent extends Component {
if (response.data.status === 402) {
window.location.href = response.data.url;
} else {
- broadcastChannelPostMessage('refreshPage')
this.setState({
isRender: false
})
+ {orignal_picture[0] && 
}
+ {user_picture[0] && 
+ { answer_picture[0] &&