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

调整

Browse Source
dev_aliyun_beta
杨树林 6 years ago
parent a5b86940b6
commit cfb7fc7280
3 changed files with 153 additions and 105 deletions
Show Stats Download Patch File Download Diff File

8
public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js
Unescape View File

@ -10,6 +10,7 @@ import {
Tooltip, Tooltip,
notification, notification,
} from "antd"; } from "antd";
import AttachmentsList from '../..'
import GroupPackage from './GroupPackage'; import GroupPackage from './GroupPackage';
import GroupPackage2 from './GroupPackage2'; import GroupPackage2 from './GroupPackage2';
import './questionbanks.css'; import './questionbanks.css';
@ -63,11 +64,8 @@ class Groupjobquesanswer extends Component {
<div id="MakedownHTML"className="markdown-body yslquesHeigth yslquesmarkdowntext" dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/> <div id="MakedownHTML"className="markdown-body yslquesHeigth yslquesmarkdowntext" dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>
{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => { {datas.attachments === undefined ? "" : <AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
return (
<GroupPackage key={key} attachments={item}></GroupPackage>
)
})}
<GroupPackage2 datas={datas} bool={true}></GroupPackage2> <GroupPackage2 datas={datas} bool={true}></GroupPackage2>
</div> </div>

30
public/react/src/modules/courses/poll/PollNew.js
Unescape View File

@ -280,9 +280,13 @@ class PollNew extends Component {
questionnair: true, questionnair: true,
left_banner_id:result.data.left_banner_id left_banner_id:result.data.left_banner_id
}) })
// console.log(this.state.polls_nametest) if( result.data.poll.polls_name){
// console.log(this.state.polls_descriptiontest) if( result.data.poll.polls_name.length>0){
// } this.setState({
addonAfter: result.data.poll.polls_name.length,
})
}
}
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
}) })
@ -326,7 +330,13 @@ class PollNew extends Component {
polls_descriptiontest: result.data.poll.polls_description, polls_descriptiontest: result.data.poll.polls_description,
questionnair: true, questionnair: true,
}) })
if( result.data.poll.polls_name){
if( result.data.poll.polls_name.length>0){
this.setState({
addonAfter: result.data.poll.polls_name.length,
})
}
}
// } // }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -2454,8 +2464,9 @@ class PollNew extends Component {
// console.log(this.state.projects===undefined?"":this.state.projects.poll_questions) // console.log(this.state.projects===undefined?"":this.state.projects.poll_questions)
var displaymysave = (mysave === true) ? "" : "display:none;"; var displaymysave = (mysave === true) ? "" : "display:none;";
return ( return (
<div className="newMain"> <div >
{/*提示*/} {/*提示*/}
{Modalstype && Modalstype === true ? <Modals {Modalstype && Modalstype === true ? <Modals
modalsType={this.state.Modalstype} modalsType={this.state.Modalstype}
@ -2465,7 +2476,14 @@ class PollNew extends Component {
modalsBottomval={this.state.ModalsBottomval} modalsBottomval={this.state.ModalsBottomval}
loadtype={this.state.Loadtype} loadtype={this.state.Loadtype}
/> : ""} /> : ""}
<div className="educontent mb50"> <style>
{
`
.newMains{ margin: 0 auto; padding-bottom: 235px !important; min-width:1200px; min-height: 800px !important;}
`
}
</style>
<div className="educontent newMains">
<p className="clearfix mb20 mt10"> <p className="clearfix mb20 mt10">
<a className=" btn colorgrey fl hovercolorblue" onClick={()=>this.gotohome()}>{this.props.coursedata.name}</a> <a className=" btn colorgrey fl hovercolorblue" onClick={()=>this.gotohome()}>{this.props.coursedata.name}</a>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>

220
public/react/src/modules/courses/poll/PollNewQuestbank.js
Unescape View File

@ -243,39 +243,51 @@ class PollNewQuestbank extends Component {
} else { } else {
const url = `/exercise_banks/${pollid}.json`; const url = `/exercise_banks/${pollid}.json`;
axios.get(url).then((result) => { axios.get(url).then((result) => {
if (result) if (result){
console.log("247"); console.log("247");
console.log(result); console.log(result);
// if(result.data){
// if(result.data.poll){ }
// if(result.data.poll.polls_name){
// let num = parseInt(result.data.poll.polls_name.length);
// this.setState({ if(result.data){
// addonAfter: num < 0 ? 0 : num if(result.data.poll){
// }) if(result.data.poll.polls_name){
// } let num = parseInt(result.data.poll.polls_name.length);
// } this.setState({
// addonAfter: num < 0 ? 0 : num
// } })
// }
// this.setState({ }
// projects: result.data,
// pollid: pollid, }
// polls_status: result.data.poll.polls_status,
// polls_name: result.data.poll.polls_name, this.setState({
// polls_description: result.data.poll.polls_description, projects: result.data,
// poll_questions: result.data.poll_questions, pollid: pollid,
// question_types: result.data.question_types, polls_status: 1,
// mysingles: result.data.question_types.q_singles, polls_name: result.data.poll.name,
// mydoubles: result.data.question_types.q_doubles, polls_description: result.data.poll.description,
// mymainsint: result.data.question_types.q_mains, poll_questions: result.data.questions,
// polls_nametest: result.data.poll.polls_name, question_types: result.data.question_types,
// polls_descriptiontest: result.data.poll.polls_description, mysingles: result.data.question_types.q_singles,
// questionnair: true, mydoubles: result.data.question_types.q_doubles,
// left_banner_id:result.data.left_banner_id mymainsint: result.data.question_types.q_mains,
// }) q_counts: result.data.question_types.q_counts,
polls_nametest: result.data.poll.name,
polls_descriptiontest: result.data.poll.description,
questionnair: true,
left_banner_id:result.data.left_banner_id
})
if(result.data.poll.name){
if(result.data.poll.name.length>0){
this.setState({
addonAfter:result.data.poll.name.length,
})
}
}
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
}) })
@ -300,26 +312,40 @@ class PollNewQuestbank extends Component {
const url = `/exercise_banks/${pollidsy}.json`; const url = `/exercise_banks/${pollidsy}.json`;
axios.get(url).then((result) => { axios.get(url).then((result) => {
if (result !== undefined){ if (result !== undefined){
this.setState({
projects: result.data,
pollid: pollid,
polls_status: 1,
polls_name: result.data.poll.name,
polls_description: result.data.poll.description,
poll_questions: result.data.questions,
question_types: result.data.question_types,
mysingles: result.data.question_types.q_singles,
mydoubles: result.data.question_types.q_doubles,
mymainsint: result.data.question_types.q_mains,
q_counts: result.data.question_types.q_counts,
polls_nametest: result.data.poll.name,
polls_descriptiontest: result.data.poll.description,
questionnair: true,
left_banner_id:result.data.left_banner_id
});
if(result.data.poll.name){
if(result.data.poll.name.length>0){
this.setState({
addonAfter:result.data.poll.name.length,
})
}
}
} }
// console.log("有问卷~~~") // console.log("有问卷~~~")
// this.setState({
// projects: result.data,
// pollid: pollidsy,
// polls_status: result.data.poll.polls_status,
// polls_name: result.data.poll.polls_name,
// polls_description: result.data.poll.polls_description,
// poll_questions: result.data.poll_questions,
// question_types: result.data.question_types,
// mysingles: result.data.question_types.q_singles,
// mydoubles: result.data.question_types.q_doubles,
// mymainsint: result.data.question_types.q_mains,
// polls_nametest: result.data.poll.polls_name,
// polls_descriptiontest: result.data.poll.polls_description,
// questionnair: true,
// })
// } // }
}).catch((error) => { }).catch((error) => {
@ -2326,41 +2352,41 @@ class PollNewQuestbank extends Component {
} }
// 创建问卷 // 创建问卷
onSaveExercise = () => { onSaveExercise = () => {
if (this.state.Newedit === true) { // if (this.state.Newedit === true) {
//
if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") { // if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") {
this.props.showNotification(`请输入标题`); // this.props.showNotification(`请输入标题`);
return // return
} // }
let coursesId = this.props.match.params.coursesId; // let coursesId = this.props.match.params.coursesId;
const urlls = `/courses/${coursesId}/polls.json` // const urlls = `/courses/${coursesId}/polls.json`
axios.post(urlls, { // axios.post(urlls, {
polls_name: this.state.polls_nametest, // polls_name: this.state.polls_nametest,
polls_description: this.state.polls_descriptiontest // polls_description: this.state.polls_descriptiontest
}).then((result) => { // }).then((result) => {
if (result === undefined) { // if (result === undefined) {
return; // return;
} // }
this.state.Newedit === false; // this.state.Newedit === false;
this.props.showNotification(`问卷创建成功!`); // this.props.showNotification(`问卷创建成功!`);
this.setState({ // this.setState({
pollid: result.data.data.id, // pollid: result.data.data.id,
Newedit: false, // Newedit: false,
mysave: false, // mysave: false,
readOnlys: "readOnly", // readOnlys: "readOnly",
cancellation: false, // cancellation: false,
}); // });
// var currenturl = window.location.href; // // var currenturl = window.location.href;
// var newUrl = (currenturl.split("?"))[0]; // // var newUrl = (currenturl.split("?"))[0];
// var newr=(newUrl.slice("new"))[0]; // // var newr=(newUrl.slice("new"))[0];
// console.log(newUrl); // // console.log(newUrl);
// console.log("2301"); // // console.log("2301");
// console.log(newr); // // console.log(newr);
// window.history.pushState('','',newUrl+'?tab='+e); // // window.history.pushState('','',newUrl+'?tab='+e);
window.location.href = `/courses/${coursesId}/polls/${result.data.data.id}/edit`; // // window.location.href = `/courses/${coursesId}/polls/${result.data.data.id}/edit`;
//
}) // })
} else { // } else {
if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") { if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") {
this.props.showNotification("请输入标题"); this.props.showNotification("请输入标题");
return return
@ -2374,10 +2400,10 @@ class PollNewQuestbank extends Component {
} }
var url = `/polls/${pollid}.json`; var url = `/exercise_banks/${pollid}.json`;
axios.put(url, { axios.put(url, {
polls_name: this.state.polls_nametest, exercise_name: this.state.polls_nametest,
polls_description: this.state.polls_descriptiontest exercise_description: this.state.polls_descriptiontest
}).then((result) => { }).then((result) => {
if (result !== undefined) { if (result !== undefined) {
this.props.showNotification(`问卷更新成功!`); this.props.showNotification(`问卷更新成功!`);
@ -2388,7 +2414,7 @@ class PollNewQuestbank extends Component {
} }
}) })
} // }
} }
gotohome=()=>{ gotohome=()=>{
@ -2449,7 +2475,7 @@ class PollNewQuestbank extends Component {
// console.log(this.state.projects===undefined?"":this.state.projects.poll_questions) // console.log(this.state.projects===undefined?"":this.state.projects.poll_questions)
var displaymysave = (mysave === true) ? "" : "display:none;"; var displaymysave = (mysave === true) ? "" : "display:none;";
return ( return (
<div className="newMain"> <div className=" clearfix">
{/*提示*/} {/*提示*/}
{Modalstype && Modalstype === true ? <Modals {Modalstype && Modalstype === true ? <Modals
modalsType={this.state.Modalstype} modalsType={this.state.Modalstype}
@ -2459,7 +2485,14 @@ class PollNewQuestbank extends Component {
modalsBottomval={this.state.ModalsBottomval} modalsBottomval={this.state.ModalsBottomval}
loadtype={this.state.Loadtype} loadtype={this.state.Loadtype}
/> : ""} /> : ""}
<div className="educontent mb50"> <style>
{
`
.newMains{ margin: 0 auto; padding-bottom: 235px !important; min-width:1200px; min-height: 800px !important;}
`
}
</style>
<div className="educontent newMains">
<p className="clearfix mb20 mt10"> <p className="clearfix mb20 mt10">
<a className=" btn colorgrey fl hovercolorblue" onClick={()=>this.gotohome()}>{this.props.coursedata.name}</a> <a className=" btn colorgrey fl hovercolorblue" onClick={()=>this.gotohome()}>{this.props.coursedata.name}</a>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@ -2479,21 +2512,21 @@ class PollNewQuestbank extends Component {
</p> </p>
<div className="clearfix mb30"> <div className="clearfix mb30">
{/*<p className="fl color-black summaryname mt5">{this.props.match.params.news === undefined ? "新建问卷" : this.props.match.params.news === "new" ? "新建问卷" : "编辑问卷"}</p>*/} {/*<p className="fl color-black summaryname mt5">{this.props.match.params.news === undefined ? "新建问卷" : this.props.match.params.news === "new" ? "新建问卷" : "编辑问卷"}</p>*/}
<p className="fl color-black summaryname mt5">编辑问卷</p> <p className="fl color-black summaryname mt5">编辑</p>
{/*{*/} {/*{*/}
{/* this.props.match.params.news === "new" ?*/} {/* this.props.match.params.news === "new" ?*/}
{/* <a href={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}*/} {/* <a href={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}*/}
{/* className=" fr font-16">返回</a>*/} {/* className=" fr font-16">返回</a>*/}
{/* :*/} {/* :*/}
<a href={`/courses/${this.props.match.params.coursesId}/polls/${left_banner_id}`} <a href={`/courses/${this.props.match.params.coursesId}/polls/${left_banner_id}`}
className=" fr font-16">返回</a> className=" fr font-16"></a>
{/*}*/} {/*}*/}
</div> </div>
{/*<Form {...formItemLayout} onSubmit={this.handleSubmit}>*/} {/*<Form {...formItemLayout} onSubmit={this.handleSubmit}>*/}
{ {
this.state.mysave === false ? this.state.mysave === false ?
<div className="padding20-30 " style={{ background: '#fff', minHeight: "75px"}}> <div style={{ background: '#fff', minHeight: "75px",padding: "30px"}}>
<div className="displayTitle font-16"> <div className="displayTitle font-16">
<span>{this.state.polls_nametest}</span> <span>{this.state.polls_nametest}</span>
@ -2558,7 +2591,7 @@ class PollNewQuestbank extends Component {
</div> </div>
<div style={{ <div style={{
"padding": "20px 30px 50px", "padding": "30px 30px 70px",
"position": "relative", "position": "relative",
"border-bottom": "1px solid #EDEDED", "border-bottom": "1px solid #EDEDED",
"margin-bottom": " 0px" "margin-bottom": " 0px"
@ -2632,7 +2665,7 @@ class PollNewQuestbank extends Component {
</span> </span>
<span className="fr">合计 <span <span className="fr">合计 <span
className="color-blue">{this.state.mysingles === undefined ? "" : this.state.mydoubles === undefined ? "" : this.state.mymainsint === undefined ? "" : this.state.mysingles + this.state.mydoubles + this.state.mymainsint}</span> 题</span> style={{color:"#FF6800"}}>{this.state.q_counts === undefined ? "" :this.state.q_counts}</span> 题</span>
</div> </div>
} }
@ -2641,7 +2674,6 @@ class PollNewQuestbank extends Component {
{polls_status === undefined || polls_status === 1 ? {polls_status === undefined || polls_status === 1 ?
<div className="edu-back-white bor-bottom-greyE"> <div className="edu-back-white bor-bottom-greyE">
<div className=" mb10"></div>
<div style={{"padding": "20px 30px 20px 30px"}}> <div style={{"padding": "20px 30px 20px 30px"}}>
<ActionBtn style="green" className="mr20" onClick={() => this.addmysingles()}><i <ActionBtn style="green" className="mr20" onClick={() => this.addmysingles()}><i
className="iconfont icon-tianjiafangda font-15 mr10"></i>单选题</ActionBtn> className="iconfont icon-tianjiafangda font-15 mr10"></i>单选题</ActionBtn>

Write Preview
Loading…
Cancel
Save