调整数据

public/react/src/modules/question/Question.js

@@ -11,6 +11,7 @@ import {
 	Input
 } from "antd";
 import Headplugselection from  "./component/Headplugselection";
+import QuestionModal from  "./component/QuestionModal";
 import Contentpart from "./component/Contentpart";
 import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
 import NoneData from './component/NoneData';
@@ -27,8 +28,13 @@ class Question extends Component {
 			Headertop:"",
 			Footerdown:"",
 			visible: false,
-			placement: 'right'
+			placement: 'right',
+			modalsType:false,
+			titilesm:"设为公开后，所有成员均可使用试题",
+			titiless:"是否设置为公开？",
+			titbool:false
 		}
+
 	}
 	//初始化
 	componentDidMount(){
@@ -109,10 +115,40 @@ class Question extends Component {
 		this.container = container;
 	};
 
+	showmodels=()=>{
+	  this.setState({
+			modalsType:true,
+			titilesm:"设为公开后，所有成员均可使用试题",
+			titiless:"是否设置为公开？",
+			titbool:false
+		})
+	};
+	showmodelysl=()=>{
+		this.setState({
+			modalsType:true,
+			titilesm:"确认删除后，无法撤销",
+			titiless:"是否确认删除？",
+			titbool:false
+		})
+	};
+
+
+
+	modalCancel=()=>{
+   this.setState({
+		 modalsType:false
+	 })
+	}
+	setDownload=()=>{
+		this.setState({
+			modalsType:false
+		})
+	}
 	render() {
-		let {page,limit,count,Headertop,visible,placement}=this.state;
+		let {page,limit,count,Headertop,visible,placement,modalsType}=this.state;
 		return (
 			<div className="newMain clearfix" ref={this.saveContainer}>
+				<QuestionModal {...this.props}{...this.state} modalsType={modalsType} modalCancel={()=>this.modalCancel()} setDownload={()=>this.setDownload()}></QuestionModal>
 				<SiderBar
 					{...this.props}
 					{...this.state}
@@ -121,7 +157,7 @@ class Question extends Component {
 				{/*顶部*/}
 				<Headplugselection ></Headplugselection>
 				{/*头部*/}
-        <Contentpart {...this.state} {...this.props} callback={(e)=>this.callback(e)}></Contentpart>
+        <Contentpart {...this.state} {...this.props} showmodels={()=>this.showmodels()} showmodelysl={()=>this.showmodelysl()} callback={(e)=>this.callback(e)}></Contentpart>
 				{/*分页*/}
 				{/*<div className="clearfix mt5">*/}
 				{/*<div className="educontent mt10 pb20 w1200s">*/}

public/react/src/modules/question/component/Contentpart.js

@@ -71,6 +71,8 @@ class Contentpart extends Component {
 		);
 
 		const buttonWidth = 70;
+		console.log("Contentpart");
+		console.log(this.props);
 		return (
 			<div className=" clearfix mt5">
 				<div className="educontent mt10 pb20 w1200s">
@@ -127,7 +129,13 @@ class Contentpart extends Component {
 								}
 							</style>
 						 <div className="xaxisreverseorder">
-
+							 {
+								 defaultActiveKey===0||defaultActiveKey==="0"?
+									 <div className="newbutoon">
+										 <p className="newbutoontes">新增</p>
+									 </div>
+									 :""
+							 }
 							 <Popover  placement="bottom"  content={contents} trigger="click">
 							 <div className=" sortinxdirection mr10">
 
@@ -174,10 +182,10 @@ class Contentpart extends Component {
 					</div>
 					{/*列表集合*/}
 					<div className=" w100s">
-						<Listjihe>
+						<Listjihe {...this.state} {...this.props} showmodels={()=>this.props.showmodels()} showmodelysl={()=>this.props.showmodelysl()}>
 
 						</Listjihe>
-						<Listjihe>
+						<Listjihe {...this.state} {...this.props} showmodels={()=>this.props.showmodels()} showmodelysl={()=>this.props.showmodelysl()}>
 
 						</Listjihe>
 					</div>

public/react/src/modules/question/component/Listjihe.js

@@ -40,6 +40,10 @@ class Listjihe extends Component {
 
 	render() {
 		let {page,name,nd,chakanjiexibool}=this.state;
+		let {defaultActiveKey}=this.props;
+
+		console.log("Listjihe");
+		console.log(this.props);
 		return (
 			<div className={chakanjiexibool===true?"w100s borderwds283  pd20 mb20":"w100s borderwds  pd20 mb20"}>
 				{/*顶部*/}
@@ -66,12 +70,32 @@ class Listjihe extends Component {
 						<p className="updatetimes lh30">创建者：王老师</p>
 					</div>
 					<div className="w50s xaxisreverseorder">
-						<p className="selection ml30 xiaoshou">
+						<p className="selection  xiaoshou">
 							<i className="iconfont icon-tianjiadaohang font-12 lg ml7 lh30 icontianjiadaohangcolor mr10"></i>
 							<span>选用</span></p>
-           <p className="viewparsings  xiaoshou" onClick={()=>this.chakanjiexibool()}>
+						{
+							defaultActiveKey===0||defaultActiveKey==="0"?
+								<div className="xaxisreverseorder">
+									<p className="viewparsings  xiaoshou mr25" onClick={()=>this.props.showmodelysl()}>
+										<i className="iconfont icon-shanchu1 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+										<span>删除</span>
+									</p>
+									<p className="viewparsings  xiaoshou mr25">
+										<i className="iconfont icon-bianji2 font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+										<span>编辑</span>
+									</p>
+									<p className="viewparsings  xiaoshou mr25" onClick={()=>this.props.showmodels()}>
+										<i className="iconfont icon-gongkai font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
+										<span>公开</span>
+									</p>
+								</div>
+								:""
+						}
+           <p className="viewparsings  xiaoshou mr25" onClick={()=>this.chakanjiexibool()}>
 						 <i className="iconfont icon-jiexi font-17 lg ml7 lh30 icontianjiadaohangcolors mr5"></i>
 						 查看解析</p>
+
+
 					</div>
 				</div>
 				{

public/react/src/modules/question/component/QuestionModal.js

@@ -0,0 +1,43 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal} from 'antd';
+import axios from 'axios';
+import './../questioncss/questioncom.css'
+//立即申请试用
+class QuestionModal extends Component {
+
+	constructor(props) {
+		super(props);
+		this.state={
+
+		}
+	}
+
+
+	render() {
+
+		return(
+			<Modal
+				keyboard={false}
+				closable={false}
+				footer={null}
+				destroyOnClose={true}
+				title="提示"
+				centered={true}
+				visible={this.props.modalsType===undefined?false:this.props.modalsType}
+				width="442px"
+			>
+				<div className="educouddiv">
+					<div className={"tabeltext-alignleft mt10"}><p className="titiles">{this.props.titilesm}</p></div>
+					<div className={"tabeltext-alignleft mt10"}><p className="titiles">{this.props.titiless}</p></div>
+					<div className="clearfix mt30 edu-txt-center">
+						<a className="task-btn mr30 w80" onClick={()=>this.props.modalCancel()}>取消</a>
+						<a className="task-btn task-btn-orange w80" onClick={()=>this.props.setDownload()}>确定</a>
+					</div>
+				</div>
+			</Modal>
+		)
+	}
+}
+
+export default QuestionModal;

public/react/src/modules/question/questioncss/questioncom.css

@@ -342,3 +342,67 @@
 .font-17{
     font-size: 17px;
 }
+.ml30{
+    margin-right: 30px;
+}
+.mr25{
+    margin-right: 25px;
+}
+.newbutoon{
+    width:88px;
+    height:42px;
+    background:#33BD8C;
+    line-height: 42px;
+    border-radius:4px;
+
+}
+
+.newbutoontes{
+    width:100%;
+    height:42px;
+    font-size:14px;
+    color:#ffffff;
+    line-height:42px;
+    text-align: center;
+}
+.educouddiv {
+    display: flex;
+    flex-direction: column;
+}
+
+.tabeltext-alignleftysl{
+    font-size:14px;
+    color:#000000;
+    line-height:19px;
+
+}
+.tabeltext-alignleftysltwo{
+    font-size:14px;
+    color:#848282;
+    line-height:19px;
+
+}
+
+.publictask-btn{
+    width:80px;
+    height:34px;
+    background:#CCCCCC;
+    border-radius:4px;
+    color: #ffffff;
+
+}
+.publictask-btns{
+    width:80px;
+    height:34px;
+    background:#4CACFF;
+    border-radius:4px;
+    color: #ffffff;
+}
+.w80{
+    width: 80px;
+}
+
+.titiles{
+    color: #333333;
+    font-size: 16px;
+}