m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

Browse Source
dev_forum
hjm 5 years ago
parent 01ee77ab6f cb96cd2b42
commit ab40ef1905
6 changed files with 28 additions and 81 deletions
Show Stats Download Patch File Download Diff File

39
public/react/src/modules/courses/shixunHomework/Listofworks.js
Unescape View File

@ -1350,21 +1350,10 @@ class Listofworks extends Component {
},{responseType: 'blob'}).then((response) => { },{responseType: 'blob'}).then((response) => {
console.log("1342"); console.log("1342");
console.log(response); console.log(response);
if (response.status == 200) { if(response.status === 200){
window.open(url, '_blank');
var blob = new Blob([response.data]) }else{
var downloadElement = document.createElement('a');
var href = window.URL.createObjectURL(blob); //创建下载的链接
let filename = response.headers.get('Content-Disposition');
if (filename) {
filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
downloadElement.href = href;
downloadElement.download = filename; //下载后文件名
document.body.appendChild(downloadElement);
downloadElement.click(); //点击下载
document.body.removeChild(downloadElement); //下载完成移除元素
}
window.URL.revokeObjectURL(href); //释放掉blob对象
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -1384,21 +1373,11 @@ class Listofworks extends Component {
},{responseType: 'blob'}).then((response) => { },{responseType: 'blob'}).then((response) => {
console.log("1306"); console.log("1306");
console.log(response); console.log(response);
if (response.status == 200) { if(response.status === 200){
var blob = new Blob([response.data]) window.open(url, '_blank');
var downloadElement = document.createElement('a'); }else{
var href = window.URL.createObjectURL(blob); //创建下载的链接
let filename = response.headers.get('Content-Disposition'); }
if (filename) {
filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
downloadElement.href = href;
downloadElement.download = filename; //下载后文件名
document.body.appendChild(downloadElement);
downloadElement.click(); //点击下载
document.body.removeChild(downloadElement); //下载完成移除元素
}
window.URL.revokeObjectURL(href); //释放掉blob对象
}
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
}); });

32
public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
Unescape View File

@ -1619,19 +1619,11 @@ class Trainingjobsetting extends Component {
},{responseType: 'blob'}).then((response) => { },{responseType: 'blob'}).then((response) => {
console.log("326"); console.log("326");
console.log(response); console.log(response);
var blob = new Blob([response.data]) if(response.status === 200){
var downloadElement = document.createElement('a'); window.open(url, '_blank');
var href = window.URL.createObjectURL(blob); //创建下载的链接 }else{
let filename = response.headers.get('Content-Disposition');
if (filename) {
filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
downloadElement.href = href;
downloadElement.download = filename; //下载后文件名
document.body.appendChild(downloadElement);
downloadElement.click(); //点击下载
document.body.removeChild(downloadElement); //下载完成移除元素
} }
window.URL.revokeObjectURL(href); //释放掉blob对象
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -1646,19 +1638,11 @@ class Trainingjobsetting extends Component {
axios.get((url),{responseType: 'blob'}).then((response) => { axios.get((url),{responseType: 'blob'}).then((response) => {
console.log("339"); console.log("339");
console.log(response); console.log(response);
var blob = new Blob([response.data]) if(response.status === 200){
var downloadElement = document.createElement('a'); window.open(url, '_blank');
var href = window.URL.createObjectURL(blob); //创建下载的链接 }else{
let filename = response.headers.get('Content-Disposition');
if (filename) {
filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
downloadElement.href = href;
downloadElement.download = filename; //下载后文件名
document.body.appendChild(downloadElement);
downloadElement.click(); //点击下载
document.body.removeChild(downloadElement); //下载完成移除元素
} }
window.URL.revokeObjectURL(href); //释放掉blob对象
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)

32
public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
Unescape View File

@ -330,19 +330,11 @@ class Workquestionandanswer extends Component {
},{responseType: 'blob'}).then((response) => { },{responseType: 'blob'}).then((response) => {
console.log("326"); console.log("326");
console.log(response); console.log(response);
var blob = new Blob([response.data]) if(response.status === 200){
var downloadElement = document.createElement('a'); window.open(url, '_blank');
var href = window.URL.createObjectURL(blob); //创建下载的链接 }else{
let filename = response.headers.get('Content-Disposition');
if (filename) {
filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
downloadElement.href = href;
downloadElement.download = filename; //下载后文件名
document.body.appendChild(downloadElement);
downloadElement.click(); //点击下载
document.body.removeChild(downloadElement); //下载完成移除元素
} }
window.URL.revokeObjectURL(href); //释放掉blob对象
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -357,19 +349,11 @@ class Workquestionandanswer extends Component {
axios.get((url),{responseType: 'blob'}).then((response) => { axios.get((url),{responseType: 'blob'}).then((response) => {
console.log("339"); console.log("339");
console.log(response); console.log(response);
var blob = new Blob([response.data]) if(response.status === 200){
var downloadElement = document.createElement('a'); window.open(url, '_blank');
var href = window.URL.createObjectURL(blob); //创建下载的链接 }else{
let filename = response.headers.get('Content-Disposition');
if (filename) {
filename = filename.match(/\"(.*)\"/)[1]; //提取文件名
downloadElement.href = href;
downloadElement.download = filename; //下载后文件名
document.body.appendChild(downloadElement);
downloadElement.click(); //点击下载
document.body.removeChild(downloadElement); //下载完成移除元素
} }
window.URL.revokeObjectURL(href); //释放掉blob对象
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)

2
public/react/src/modules/tpm/challengesnew/css/TPMchallengesnew.css
Unescape View File

@ -60,7 +60,7 @@ a{
#exercisememoMD .CodeMirror { #exercisememoMD .CodeMirror {
margin-top: 31px !important; margin-top: 31px !important;
height: 374px !important; height: 658px !important;
/*width: 579px !important;*/ /*width: 579px !important;*/
} }

2
public/react/src/modules/user/FindPasswordComponent.js
Unescape View File

@ -402,7 +402,7 @@ class LoginRegisterComponent extends Component {
: <div style={{height: "25px"}}></div> : <div style={{height: "25px"}}></div>
} }
<DragValidator <DragValidator
height={38} successGreenColor="#b0e811" height={38} successGreenColor="#29bd8b"
style={{height: "38px", width: "100%"}} style={{height: "38px", width: "100%"}}
dragOkCallback={this.dragOkCallback} dragOkCallback={this.dragOkCallback}
></DragValidator> ></DragValidator>

2
public/react/src/modules/user/LoginRegisterComponent.js
Unescape View File

@ -713,7 +713,7 @@ class LoginRegisterComponent extends Component {
} }
<DragValidator <DragValidator
height={38} className="loginInput" successGreenColor="#b0e811" height={38} className="loginInput" successGreenColor="#29bd8b"
style={{ height: '38px'}} style={{ height: '38px'}}
dragOkCallback={this.dragOkCallback} dragOkCallback={this.dragOkCallback}
></DragValidator> ></DragValidator>

Write Preview
Loading…
Cancel
Save