From 2c9aa69e9174ce2ab7ae0c890506437faca125c3 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:33:29 +0800
Subject: [PATCH] =?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) {
}