调整

public/react/src/modules/tpm/TPMDataset.js

@@ -16,7 +16,6 @@ class TPMDataset extends Component {
 	constructor(props) {
 		super(props)
 		this.state = {
-			datas: [0, 1, 2, 3, 4, 5],
 			value: undefined,
 			columns: [
 				{
@@ -80,10 +79,15 @@ class TPMDataset extends Component {
 			datalist:[],
 			data_sets_count:0,
 			selectedRowKeysdata:[],
+			loadingstate:false,
+			checked: false,
 		}
 	}
 
 	componentDidMount() {
+		this.setState({
+			loadingstate:true,
+		})
 		this.getdatas()
 
 	}
@@ -98,18 +102,20 @@ class TPMDataset extends Component {
 				datas.push(i);
 
 			}
-
 			this.setState({
 				selectedRowKeysdata:mydata,
 				selectedRowKeys: datas,
+				checked:true,
 			})
 		  // console.log(mydata);
 			// console.log(datas);
-
-
 		} else {
 			this.setState({
+				selectedRowKeysdata:[],
 				selectedRowKeys: [],
+				checked:false,
+
+
 			})
 		}
 	}
@@ -143,11 +149,26 @@ class TPMDataset extends Component {
 						collaboratorList: response.data,
 						data_sets_count:response.data.data_sets_count,
 						datalist:datalists,
+						selectedRowKeysdata:[],
+						selectedRowKeys: [],
+						checked:false,
 					});
+
 				}
 
 			}
+			setTimeout(() => {
+				this.setState({
+					loadingstate:false,
+				})
+			}, 500)
+
 		}).catch((error)=>{
+			setTimeout(() => {
+				this.setState({
+					loadingstate:false,
+				})
+			}, 500)
 			console.log(error)
 		});
 
@@ -181,11 +202,24 @@ class TPMDataset extends Component {
 						collaboratorList: response.data,
 						data_sets_count:response.data.data_sets_count,
 						datalist:datalists,
+						selectedRowKeysdata:[],
+						selectedRowKeys: [],
+						checked:false,
 					});
 				}
 
 			}
+			setTimeout(() => {
+				this.setState({
+					loadingstate:false,
+				})
+			}, 500)
 		}).catch((error)=>{
+			setTimeout(() => {
+				this.setState({
+					loadingstate:false,
+				})
+			}, 500)
 			console.log(error)
 		});
 
@@ -206,7 +240,9 @@ class TPMDataset extends Component {
 		// //console.log('Page: ');
 		this.setState({
 			page: pageNumber,
+			loadingstate:true,
 		})
+
 		this.getdatastwo(pageNumber,10);
 	}
 	onSelectChange = (selectedRowKeys, selectedRows) => {
@@ -267,7 +303,7 @@ class TPMDataset extends Component {
 	}
 
 	onAttachmentRemove = (file) => {
-		debugger
+		// debugger
 		if(!file.percent || file.percent == 100){
 			confirm({
 				title: '确定要删除这个附件吗?',
@@ -288,18 +324,26 @@ class TPMDataset extends Component {
 	}
 
   deleteRemovedata(){
-		debugger
+		// console.log("删除");
-		console.log("删除");
+		// console.log(this.state.selectedRowKeysdata);
-		console.log(this.state.selectedRowKeysdata);
+		confirm({
+			title: '确定要删除附件吗?',
+			okText: '确定',
+			cancelText: '取消',
+			// content: 'Some descriptions',
+			onOk: () => {
 				const url = `/attachments/destroy_files.json`;
-		axios.delete(url, {
+				axios.delete(url,
+					{ params: {
 							id:this.state.selectedRowKeysdata,
-			})
+						}}
+					)
 					.then((response) => {
 						if (response.data) {
 							const { status } = response.data;
 							if (status == 0) {
 								this.props.showNotification(`删除成功`);
+
 								this.getdatas()
 							}
 						}
@@ -307,6 +351,12 @@ class TPMDataset extends Component {
 					.catch(function (error) {
 						console.log(error);
 					});
+			},
+			onCancel() {
+				console.log('Cancel');
+			},
+		});
+
 	}
 	deleteAttachment = (file) => {
 		console.log(file);
@@ -343,7 +393,7 @@ class TPMDataset extends Component {
 
 	render() {
 		const {tpmLoading, shixun, user, match} = this.props;
-		const {columns, datas, page, limit, selectedRowKeys,mylistansum,fileList,datalist,data_sets_count} = this.state;
+		const {columns, page, limit, selectedRowKeys,mylistansum,fileList,datalist,data_sets_count,loadingstate} = this.state;
 		const rowSelection = {
 			selectedRowKeys,
 			onChange: this.onSelectChange,
@@ -382,7 +432,6 @@ class TPMDataset extends Component {
 							message: '提示',
 							description:
 								'文件大小必须小于50MB',
-
 						}
 					)
 				}
@@ -396,8 +445,6 @@ class TPMDataset extends Component {
 						file:file
 					})
 				}
-
-				console.log("handleChange2");
 				return isLt150M;
 			},
 		}
@@ -418,7 +465,7 @@ class TPMDataset extends Component {
 						<div className="padding20 edu-back-white mt20 " style={{minHeight: '463px'}}>
 							<div className="sortinxdirection">
 								<div className="tpmwidth">
-									<Checkbox onChange={this.mysonChange}>全选</Checkbox>
+									<Checkbox checked={this.state.checked} onChange={this.mysonChange}>全选</Checkbox>
 								</div>
 								<div className="tpmwidth xaxisreverseorder">
 									<style>
@@ -517,6 +564,8 @@ class TPMDataset extends Component {
 											className="mysjysltable4"
 											rowSelection={rowSelection}
 											rowClassName={this.rowClassName}
+											loading={loadingstate}
+
 										/>
 									</div>
 								}

public/react/src/modules/tpm/shixuns/ShixunSearchBar.js

@@ -275,10 +275,10 @@ render() {
 													}
 													<div className="fl pr shaiAllItem mt1">
 														<li className={this.state.diff===0?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(0)}>全部难度</li>
-														<li className={this.state.diff===1?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(1)}>初级学员</li>
+														<li className={this.state.diff===1?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(1)}>初级</li>
-														<li className={this.state.diff===2?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(2)}>中级学员</li>
+														<li className={this.state.diff===2?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(2)}>中级</li>
-														<li className={this.state.diff===3?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(3)}>高级学员</li>
+														<li className={this.state.diff===3?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(3)}>中高级</li>
-														<li className={this.state.diff===4?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(4)}>顶级学员</li>
+														<li className={this.state.diff===4?"shaiItems shixun_repertoire active":"shaiItems shixun_repertoire"}  onClick={()=>this.diff_search(4)}>高级</li>
 													</div>
 
                     </div>