diff --git a/public/react/src/modules/tpm/TPMDataset.js b/public/react/src/modules/tpm/TPMDataset.js
index 6e908df92..81803ff1d 100644
--- a/public/react/src/modules/tpm/TPMDataset.js
+++ b/public/react/src/modules/tpm/TPMDataset.js
@@ -8,6 +8,7 @@ import TPMNav from './component/TPMNav';
import axios from 'axios';
import './tpmmodel/tpmmodel.css'
import {getUploadActionUrl} from 'educoder';
+import moment from 'moment';
const confirm = Modal.confirm;
@@ -24,10 +25,10 @@ class TPMDataset extends Component {
key: 'number',
align: 'left',
className: " font-14 wenjiantit",
- width: '300px',
+ width: '200px',
render: (text, record) => (
- 文件名字
+ {record.title}
)
},
@@ -37,10 +38,10 @@ class TPMDataset extends Component {
key: 'number',
align: 'center',
className: "edu-txt-center font-14 zuihoushijian",
- width: '125px',
+ width: '150px',
render: (text, record) => (
- 2019-08-12 12:30
+ {record.timedata}
)
},
@@ -52,7 +53,7 @@ class TPMDataset extends Component {
className: "edu-txt-center font-14 ",
render: (text, record) => (
- 张大大
+ {record.author}
)
},
@@ -64,7 +65,7 @@ class TPMDataset extends Component {
className: "edu-txt-center font-14 ",
render: (text, record) => (
- 1.88kb
+ {record.filesize}
)
},
@@ -76,7 +77,9 @@ class TPMDataset extends Component {
collaboratorList:[],
fileList:[],
file:null,
-
+ datalist:[],
+ data_sets_count:0,
+ selectedRowKeysdata:[],
}
}
@@ -88,9 +91,22 @@ class TPMDataset extends Component {
mysonChange = (e) => {
console.log(`全选checked = ${e.target.checked}`);
if (e.target.checked === true) {
+ let mydata=[];
+ let datas=[];
+ for(let i=0;i {
@@ -191,6 +232,25 @@ class TPMDataset extends Component {
}
+ deleteRemovedata(){
+ console.log("删除");
+ const url = `/attachements/destroy_files.json`;
+ axios.delete(url, {
+ id:this.state.mydata,
+ })
+ .then((response) => {
+ if (response.data) {
+ const { status } = response.data;
+ if (status == 0) {
+ this.props.showNotification(`删除成功`);
+ this.getdatas()
+ }
+ }
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
deleteAttachment = (file) => {
console.log(file);
let id=file.response ==undefined ? file.id : file.response.id
@@ -226,7 +286,7 @@ class TPMDataset extends Component {
render() {
const {tpmLoading, shixun, user, match} = this.props;
- const {columns, datas, page, limit, selectedRowKeys,mylistansum,fileList} = this.state;
+ const {columns, datas, page, limit, selectedRowKeys,mylistansum,fileList,datalist,data_sets_count} = this.state;
const rowSelection = {
selectedRowKeys,
onChange: this.onSelectChange,
@@ -316,8 +376,8 @@ class TPMDataset extends Component {
{
mylistansum>0?
0 ? "deletebutomtextcode intermediatecenter mr21" : "deletebutom intermediatecenter mr21"}>
-
删除
+ className={selectedRowKeys.length > 0 ? "deletebutomtextcode intermediatecenter mr21" : "deletebutom intermediatecenter mr21"} onClick={()=>this.deleteRemovedata()}>
+ 删除
:""
}
@@ -381,7 +441,7 @@ class TPMDataset extends Component {
}
:""
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
index e43007cca..9b20e5157 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
@@ -143,12 +143,11 @@ class Challengesjupyter extends Component {
// console.log("domain",parentDomain); //localhost
// document.domain = data;
// document.domain = 'https://47519.test-jupyter.educoder.net';
- var ifr = document.getElementById("ifr1");
+ // window.parent.document.contents().find("#ifr1")[0].contentWindow.iframefunction();
+ const iframe = document.getElementById('iframe');
console.log("modifyjupyter");
- console.log(ifr);
- const iframe = document.getElementById('ifr1');
- console.log("modifyjupyter");
- const frameWindow = iframe.contentWindow;
+ // const frameWindow = iframe.contentWindow;
+ const frameWindow = iframe.contentWindow.postMessage('setLocation,' + null + "," + null, '*');
console.log(frameWindow);
const frameDocument = frameWindow.document;
console.log(frameDocument);
@@ -344,7 +343,7 @@ class Challengesjupyter extends Component {
{/*https://48888.jupyter.educoder.net/tree?*/}
-