From e8ab478f3702809426c2dd308d4d1990f5668d7c Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 5 Jul 2019 10:32:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/busyWork/commonWork.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js index 85fd2ff66..d1f6a8e0b 100644 --- a/public/react/src/modules/courses/busyWork/commonWork.js +++ b/public/react/src/modules/courses/busyWork/commonWork.js @@ -410,7 +410,9 @@ class commonWork extends Component{ searchPlaceholder={"请输入名称进行搜索"} showSearchInput={true} > - + { mainList && mainList.course_identity < 5 && mainList.homeworks.length>0 &&
@@ -422,8 +424,7 @@ class commonWork extends Component{ onClick={this.onWorkDelete}>删除
  • - + this.refs['publishModalRef'].homeworkstart()}>{ "立即发布" }
  • Date: Fri, 5 Jul 2019 10:33:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Listofworks.js | 47 +++++++++++++++++-- .../shixunHomework/Trainingjobsetting.js | 2 +- .../shixunHomework/Workquestionandanswer.js | 2 +- .../modules/user/LoginRegisterComponent.js | 5 +- 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 9ea5bc78a..447155ce9 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1346,7 +1346,7 @@ class Listofworks extends Component { // } // let url = "/zip/shixun_report"; // let homeworkid = this.props.match.params.homeworkid; - axios.get(url).then((response) => { + axios.get((url),{headers:{'filename':'utf-8'}}).then((response) => { console.log("1350"); console.log(response); if(response.data.status&&response.data.status===-1){ @@ -1355,13 +1355,50 @@ class Listofworks extends Component { }else if(response.data.status&&response.data.status===-2){ }else{ - window.open("/api"+url, '_blank'); + window.location.href("/api"+url); + // response.blob().then(blob => { + // //关闭loading 按钮恢复正常 + // let blobUrl = window.URL.createObjectURL(blob); + // const filename = times.formatNowDate() + '.zip'; + // const aElement = document.createElement('a'); + // document.body.appendChild(aElement); + // aElement.style.display = 'none'; + // aElement.href = blobUrl; + // aElement.download = filename; + // aElement.click(); + // document.body.removeChild(aElement); + // }); + } }).catch((error) => { console.log(error) }); } - + //字节装为字符串 + utf8ByteArrayToString(bytes) { + var out = [], pos =0, c =0; + while (pos < bytes.length) { + var c1 = bytes[pos++]; + if (c1 <128) { + out[c++] = String.fromCharCode(c1); + }else if (c1 >191 && c1 <224) { + var c2 = bytes[pos++]; + out[c++] = String.fromCharCode((c1 &31) <<6 | c2 &63); + }else if (c1 >239 && c1 <365) { + var c2 = bytes[pos++]; + var c3 = bytes[pos++]; + var c4 = bytes[pos++]; + var u = ((c1 &7) <<18 | (c2 &63) <<12 | (c3 &63) <<6 | c4 &63) -0x10000; + out[c++] = String.fromCharCode(0xD800 + (u >>10)); + out[c++] = String.fromCharCode(0xDC00 + (u &1023)); + }else { + var c2 = bytes[pos++]; + var c3 = bytes[pos++]; + out[c++] =String.fromCharCode((c1 &15) <<12 | (c2 &63) <<6 | c3 &63); + } + } + return out.join(''); + } // 课堂学生成绩的导出下载 Classstudentachievement=(url)=>{ console.log("Classstudentachievement"); @@ -1373,7 +1410,7 @@ class Listofworks extends Component { // search: this.state.searchtext, // } // },{responseType: 'blob'}) - axios.get(url).then((response) => { + axios.get((url),{headers:{'filename':'utf-8'}}).then((response) => { console.log("1374"); console.log(response); if(response.data.status&&response.data.status===-1){ @@ -1539,7 +1576,7 @@ class Listofworks extends Component { 导出
    • :""} {this.props.isAdmin() ? diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 0afd9ff4d..8e857199b 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -1793,7 +1793,7 @@ class Trainingjobsetting extends Component { : ""} diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js index c582dfb32..8d88e9fb5 100644 --- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js +++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js @@ -489,7 +489,7 @@ class Workquestionandanswer extends Component { : ""} diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index c909eb8c1..54185c9ed 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -344,9 +344,8 @@ class LoginRegisterComponent extends Component { passwords: "", Agreetotheterms: "", }) - // this.props.history.push(result.data.redirect_uri) - this.props.Setshowbool(2); - + this.props.history.push(result.data.redirect_uri); + //this.props.Setshowbool(2); } catch (e) { } From cbf9b33600c26aa5ef181b8bfde34b85e1955a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 5 Jul 2019 10:34:46 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/shixunHomework/Listofworks.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 447155ce9..d6950d43a 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1419,7 +1419,9 @@ class Listofworks extends Component { }else if(response.data.status&&response.data.status===-2){ }else{ - window.open("/api"+url, '_blank'); + window.location.href("/api"+url); + + // window.open("/api"+url, '_blank'); } }).catch((error) => { From 29b6f6d2cda3f854484923c1e34a7ab65cbb9035 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 5 Jul 2019 10:51:20 +0800 Subject: [PATCH 4/6] toCreateProject --- public/react/src/modules/courses/busyWork/common.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/common.js b/public/react/src/modules/courses/busyWork/common.js index 9eb901d9d..8c37e78d2 100644 --- a/public/react/src/modules/courses/busyWork/common.js +++ b/public/react/src/modules/courses/busyWork/common.js @@ -18,11 +18,15 @@ export function RouteHOC(options = {}) { } } toCreateProject = () => { + let url = '/projects/new' if (window.location.port == 3007) { - window.location.href = '/testbdweb.educoder.net/projects/new' - } else { - window.location.href = '/projects/new' + // window.location.href + url = '/testbdweb.educoder.net/projects/new' } + window.open( + url, + '_blank' // <- This is what makes it open in a new window. + ); } // common_homework group_homework // 是否是分组作业 From 877cb5a2ea3576c02dfeb03813f411ea1fbfa751 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 5 Jul 2019 11:00:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=94=B3=E8=AF=89=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/busyWork/CommonWorkItem.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js index f30e43d21..6c3e7997a 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js @@ -178,6 +178,7 @@ class CommonWorkItem extends Component{ item.status_time!="" && {item.status_time} From 19a85a054ae70f0a8869d11c641109cddd779ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 5 Jul 2019 11:00:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Listofworks.js | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index d6950d43a..e58d2bb0e 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1346,7 +1346,7 @@ class Listofworks extends Component { // } // let url = "/zip/shixun_report"; // let homeworkid = this.props.match.params.homeworkid; - axios.get((url),{headers:{'filename':'utf-8'}}).then((response) => { + axios.get((url),{headers:{'filename':'utf-8'},responseType: 'blob',}).then((response) => { console.log("1350"); console.log(response); if(response.data.status&&response.data.status===-1){ @@ -1355,20 +1355,20 @@ class Listofworks extends Component { }else if(response.data.status&&response.data.status===-2){ }else{ - window.location.href("/api"+url); - // response.blob().then(blob => { - // //关闭loading 按钮恢复正常 - // let blobUrl = window.URL.createObjectURL(blob); - // const filename = times.formatNowDate() + '.zip'; - // const aElement = document.createElement('a'); - // document.body.appendChild(aElement); - // aElement.style.display = 'none'; - // aElement.href = blobUrl; - // aElement.download = filename; - // aElement.click(); - // document.body.removeChild(aElement); - // }); - + // window.location.href("/api"+url); + console.log("开始下载zip文件") + const type='application/zip'//ZIP文件 + const blob = new Blob([response.data], { type: type }) + const downloadElement = document.createElement('a') + const href = window.URL.createObjectURL(blob) + //后台再header中传文件名 + const name = decodeURI(response.headers['content-disposition'].split('=')[1]) + downloadElement.href = href + downloadElement.download = name + document.body.appendChild(downloadElement) + downloadElement.click() + document.body.removeChild(downloadElement) // 下载完成移除元素 + window.URL.revokeObjectURL(href) // 释放掉blob对象 } }).catch((error) => { console.log(error)