dev_forum
杨树明 6 years ago
parent eaa67909da
commit 2c359d0328

@ -358,6 +358,7 @@ class Coursesleftnav extends Component{
navid:undefined, navid:undefined,
sandiantype:undefined, sandiantype:undefined,
twosandiantype:undefined, twosandiantype:undefined,
ModalsType:false
}) })
let url="/course_modules/"+id+"/hidden_module.json" let url="/course_modules/"+id+"/hidden_module.json"
@ -379,12 +380,25 @@ class Coursesleftnav extends Component{
edithidden=(e,id)=>{ edithidden=(e,id)=>{
e.stopPropagation();//阻止冒泡 e.stopPropagation();//阻止冒泡
this.setState({ let {course_modules}=this.props;
ModalsType:true,
Modalstopval:"隐藏后将不再显示此模块,", if(course_modules.length>1){
ModalsBottomval:"后续可通过添加模块恢复显示", this.setState({
ModalSave:()=>this.edithiddens(id), ModalsType:true,
}) Modalstopval:"隐藏后将不再显示此模块,",
ModalsBottomval:"后续可通过添加模块恢复显示",
ModalSave:()=>this.edithiddens(id),
})
}else{
this.setState({
ModalsType:true,
Modalstopval:"您不能隐藏所有课堂模块,请至少保留",
ModalsBottomval:"其中一个模块。",
loadtype:true,
ModalSave:()=>this.cannerNavmoda(),
})
}
} }
Navmodalnames=(e,id,type,setnavid,name)=>{ Navmodalnames=(e,id,type,setnavid,name)=>{

@ -135,7 +135,7 @@ class AccessoryModal2 extends Component{
description:description, description:description,
attachment_ids:newfileList attachment_ids:newfileList
}).then((result)=>{ }).then((result)=>{
console.log(result) // console.log(result)
if(result.data.status===0){ if(result.data.status===0){
this.props.setupdate() this.props.setupdate()
this.setState({ this.setState({

@ -42,7 +42,7 @@ class Exercisestatisticalresult extends Component {
limit:limit limit:limit
} }
}).then((result) => { }).then((result) => {
console.log(result) // console.log(result)
this.setState({ this.setState({
data:result.data data:result.data
@ -85,6 +85,10 @@ class Exercisestatisticalresult extends Component {
page:pageNumber page:pageNumber
}) })
debugger
$('html').animate({
scrollTop: 10
}, 1000);
this.updatefun(sort,exercise_group_id,pageNumber,limit) this.updatefun(sort,exercise_group_id,pageNumber,limit)
} }
@ -109,10 +113,10 @@ class Exercisestatisticalresult extends Component {
<ul className="clearfix" style={{padding:'20px'}}> <ul className="clearfix" style={{padding:'20px'}}>
<li className="clearfix mt10"> <li className="clearfix mt10">
<span className="fl mr10 color-grey-8">分班情况</span> <span className="fl mr10 color-grey-8">分班情况</span>
<span className="fl "><a id="graduation_comment_no_limit" <span className="fl ">
className={this.state.exercise_group_id.length===0?"pl10 pr10 mr20 check_on":"pl10 pr10 mr20" } <a id="graduation_comment_no_limit" className={this.state.exercise_group_id.length===0?"pl10 pr10 mr20 check_on":"pl10 pr10 mr20" }>不限</a>
>不限</a></span> </span>
<CheckboxGroup onChange={(e)=>this.funtaskstatustwo(e,data&&data.course_groups)} value={this.state.exercise_group_id} style={{paddingTop: '4px'}}> <CheckboxGroup onChange={(e)=>this.funtaskstatustwo(e,data&&data.course_groups)} value={this.state.exercise_group_id} style={{width:'87%',paddingTop: '4px'}}>
{ data&&data.course_groups.map((item, key) => { { data&&data.course_groups.map((item, key) => {
return ( return (
<span key={key}> <span key={key}>

@ -83,7 +83,7 @@ class GraduateTaskItem extends Component{
axios.post(url,{ axios.post(url,{
project_id:taskid project_id:taskid
}).then((result)=>{ }).then((result)=>{
console.log(result) // console.log(result)
if(result.data.status===0){ if(result.data.status===0){
this.setState({ this.setState({
Modalstype:true, Modalstype:true,

@ -651,7 +651,7 @@ debugger
</Link> </Link>
</WordsBtn> : ""} </WordsBtn> : ""}
{this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={()=>this.useBankSuccess()}></UseBank>:""} {this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={(checkBoxValues,object_ids)=>this.useBankSuccess=(checkBoxValues,object_ids)}></UseBank>:""}
</React.Fragment> </React.Fragment>
} }

@ -1,163 +1,163 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import { Input, Checkbox, Menu, Pagination,Table } from "antd"; import { Input, Checkbox, Menu, Pagination,Table } from "antd";
import '../../css/members.css' import '../../css/members.css'
import '../../css/busyWork.css' import '../../css/busyWork.css'
import '../style.css' import '../style.css'
import { WordsBtn } from 'educoder' import { WordsBtn } from 'educoder'
import NoneData from '../../coursesPublic/NoneData' import NoneData from '../../coursesPublic/NoneData'
import axios from 'axios' import axios from 'axios'
import DetailTable from './GraduateTopicDetailTable' import DetailTable from './GraduateTopicDetailTable'
import DetailInfo from './GraduateTopicDetailInfo' import DetailInfo from './GraduateTopicDetailInfo'
import CoursesListType from '../../coursesPublic/CoursesListType'; import CoursesListType from '../../coursesPublic/CoursesListType';
class GraduateTopicDetail extends Component{ class GraduateTopicDetail extends Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state={ this.state={
tableData:[], tableData:[],
tablePage:1, tablePage:1,
tablePageSize:15, tablePageSize:15,
tab:1 tab:1
} }
} }
componentDidMount(){ componentDidMount(){
let{tablePage}=this.state; let{tablePage}=this.state;
this.getDetailList(tablePage); this.getDetailList(tablePage);
} }
// 获取详情列表 // 获取详情列表
getDetailList=(page)=>{ getDetailList=(page)=>{
let course_id=this.props.match.params.course_id; let course_id=this.props.match.params.course_id;
let graduation_topic_id=this.props.match.params.graduation_topic_id; let graduation_topic_id=this.props.match.params.graduation_topic_id;
let{tablePageSize}=this.state; let{tablePageSize}=this.state;
let url=`/courses/${course_id}/graduation_topics/${graduation_topic_id}.json?page=`+page+`&limit=`+tablePageSize; let url=`/courses/${course_id}/graduation_topics/${graduation_topic_id}.json?page=`+page+`&limit=`+tablePageSize;
axios.get(url).then((result)=>{ axios.get(url).then((result)=>{
if(result.status==200){ if(result.status==200){
this.setState({ this.setState({
tableData:result.data tableData:result.data
}) })
} }
}).catch((error)=>{ }).catch((error)=>{
console.log(error); console.log(error);
}) })
} }
//详情列表翻页 //详情列表翻页
changeTablePag=(pageNumber)=>{ changeTablePag=(pageNumber)=>{
this.setState({ this.setState({
tablePage:pageNumber tablePage:pageNumber
}) })
this.getDetailList(pageNumber); this.getDetailList(pageNumber);
} }
// 切换tab // 切换tab
onChangeStatus=(e)=>{ onChangeStatus=(e)=>{
this.setState({ this.setState({
tab:e.key tab:e.key
}) })
} }
actionTopic=()=>{ actionTopic=()=>{
let graduation_topic_id=this.props.match.params.graduation_topic_id; let graduation_topic_id=this.props.match.params.graduation_topic_id;
let course_id=this.props.match.params.course_id; let course_id=this.props.match.params.course_id;
let {tableData}=this.state; let {tableData}=this.state;
this.props.confirm({ this.props.confirm({
content: tableData.user_selected_topic==0?`是否确认取消选题?`:"是否确认选题?", content: tableData.user_selected_topic==0?`是否确认取消选题?`:"是否确认选题?",
onOk: () => { onOk: () => {
let url="/courses/"+course_id+"/graduation_topics/"+graduation_topic_id+"/" let url="/courses/"+course_id+"/graduation_topics/"+graduation_topic_id+"/"
if(tableData.user_selected_topic==0){ if(tableData.user_selected_topic==0){
url+="student_cancel_topic.json" url+="student_cancel_topic.json"
}else if(tableData.user_selected_topic==null || tableData.user_selected_topic==2){ }else if(tableData.user_selected_topic==null || tableData.user_selected_topic==2){
url+="student_select_topic.json" url+="student_select_topic.json"
} }
axios.post((url)).then((result)=>{ axios.post((url)).then((result)=>{
console.log(result); // console.log(result);
if(result.data.status == 0){ if(result.data.status == 0){
this.getDetailList(); this.getDetailList();
this.props.showNotification(`${result.data.message}`); this.props.showNotification(`${result.data.message}`);
} }
}).catch((error)=>{ }).catch((error)=>{
console.log(error); console.log(error);
}) })
} }
}) })
} }
render(){ render(){
let { let {
tableData, tableData,
tablePage, tablePage,
tablePageSize, tablePageSize,
tab, tab,
}=this.state }=this.state
let {course_id,graduation_topic_id}=this.props.match.params; let {course_id,graduation_topic_id}=this.props.match.params;
const isStudent =this.props.isStudent(); const isStudent =this.props.isStudent();
const isAdmin =this.props.isAdmin(); const isAdmin =this.props.isAdmin();
return( return(
<div className="newMain"> <div className="newMain">
<div className="educontent mt10 mb50"> <div className="educontent mt10 mb50">
<p className="clearfix mb15 lineh-20"> <p className="clearfix mb15 lineh-20">
<WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}`}>{tableData && tableData.course_name}</WordsBtn> <WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}`}>{tableData && tableData.course_name}</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>{tableData.graduation_name}</WordsBtn> <WordsBtn style="grey" className="fl" to={`/courses/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>{tableData.graduation_name}</WordsBtn>
<span className="color-grey-9 fl ml3 mr3">&gt;</span> <span className="color-grey-9 fl ml3 mr3">&gt;</span>
<span>选题详情</span> <span>选题详情</span>
</p> </p>
<p className="clearfix mb20 lineh-25"> <p className="clearfix mb20 lineh-25">
<span className="color-grey-3 font-24 fl task-hide" style={{lineHeight:"25px",maxWidth:"900px"}}>{tableData && tableData.graduation_topic_name}</span> <span className="color-grey-3 font-24 fl task-hide" style={{lineHeight:"25px",maxWidth:"900px"}}>{tableData && tableData.graduation_topic_name}</span>
<span className="fl mt1" style={{height:"25px"}}><CoursesListType typelist={[`${tableData && tableData.status_name}`]} typesylename={""} /></span> <span className="fl mt1" style={{height:"25px"}}><CoursesListType typelist={[`${tableData && tableData.status_name}`]} typesylename={""} /></span>
<WordsBtn className="fr font-16 mt1" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn> <WordsBtn className="fr font-16 mt1" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
</p> </p>
<div> <div>
<div className="clearfix edu-back-white bor-bottom-greyE" > <div className="clearfix edu-back-white bor-bottom-greyE" >
<div className="fl mt6 task_menu_ul ml30"> <div className="fl mt6 task_menu_ul ml30">
<Menu mode="horizontal" defaultSelectedKeys="1" onClick={this.onChangeStatus}> <Menu mode="horizontal" defaultSelectedKeys="1" onClick={this.onChangeStatus}>
<Menu.Item key="1">选题列表</Menu.Item> <Menu.Item key="1">选题列表</Menu.Item>
<Menu.Item key="2">选题问答</Menu.Item> <Menu.Item key="2">选题问答</Menu.Item>
</Menu> </Menu>
</div> </div>
{/* null: 未选题 0待确认 1已同意 2已拒绝 */} {/* null: 未选题 0待确认 1已同意 2已拒绝 */}
{ {
isStudent && tableData.user_selected == false && (tableData.user_selected_topic==null || tableData.user_selected_topic==2) && isStudent && tableData.user_selected == false && (tableData.user_selected_topic==null || tableData.user_selected_topic==2) &&
<WordsBtn className="fr font-16 mt22 mr30" style="blue" onClick={this.actionTopic}>选题</WordsBtn> <WordsBtn className="fr font-16 mt22 mr30" style="blue" onClick={this.actionTopic}>选题</WordsBtn>
} }
{ {
isStudent && tableData.user_selected == true && tableData.user_selected_topic==0 && isStudent && tableData.user_selected == true && tableData.user_selected_topic==0 &&
<WordsBtn className="fr font-16 mt22 mr30" style="blue" onClick={this.actionTopic}>取消选题</WordsBtn> <WordsBtn className="fr font-16 mt22 mr30" style="blue" onClick={this.actionTopic}>取消选题</WordsBtn>
} }
{ {
isAdmin && <WordsBtn className="fr font-16 mt22 mr30" to={`/courses/${course_id}/graduation_topics/${graduation_topic_id}/edit`} style="blue">编辑</WordsBtn> isAdmin && <WordsBtn className="fr font-16 mt22 mr30" to={`/courses/${course_id}/graduation_topics/${graduation_topic_id}/edit`} style="blue">编辑</WordsBtn>
} }
</div> </div>
{ {
tab && tab==1&& tab && tab==1&&
<div> <div>
<div className="minH-560 edu-back-white"> <div className="minH-560 edu-back-white">
<DetailTable {...this.props} {...this.state} tableData={tableData} page={tablePage} getDetailList={this.getDetailList}></DetailTable> <DetailTable {...this.props} {...this.state} tableData={tableData} page={tablePage} getDetailList={this.getDetailList}></DetailTable>
</div> </div>
{ {
tableData && tableData.users_count>tablePageSize && tableData && tableData.users_count>tablePageSize &&
<div className="edu-txt-center mt30 mb50"> <div className="edu-txt-center mt30 mb50">
<Pagination showQuickJumper pageSize={tablePageSize} current={tablePage} total={tableData.users_count} onChange={this.changeTablePage}></Pagination> <Pagination showQuickJumper pageSize={tablePageSize} current={tablePage} total={tableData.users_count} onChange={this.changeTablePage}></Pagination>
</div> </div>
} }
</div> </div>
} }
{ {
tab && tab==2&& tab && tab==2&&
<DetailInfo {...this.props} {...this.state}></DetailInfo> <DetailInfo {...this.props} {...this.state}></DetailInfo>
} }
</div> </div>
</div> </div>
</div> </div>
) )
} }
} }
export default GraduateTopicDetail; export default GraduateTopicDetail;

@ -118,6 +118,8 @@ class CoursesNew extends Component {
window.scrollTo(0, anchorElement.offsetTop - window.innerHeight / 2); window.scrollTo(0, anchorElement.offsetTop - window.innerHeight / 2);
} }
} }
handleSubmit = (e) => { handleSubmit = (e) => {
e.preventDefault(); e.preventDefault();
@ -146,8 +148,22 @@ class CoursesNew extends Component {
} }
if(values.checkboxgroup.length===0){
this.setState({
Modalstype:true,
Modalstopval:"请您至少添加一个课堂模块,",
ModalsBottomval:"否则您将无法新建课堂。",
Loadtype:true,
ModalSave:()=>this.cancelmodel(),
})
return
}
if (!err) { if (!err) {
// console.log('Received values of form: ', values); // console.log('Received values of form: ', values);
let {datatime} = this.state; let {datatime} = this.state;
let url = "/courses/" + coursesId + ".json"; let url = "/courses/" + coursesId + ".json";

@ -47,7 +47,7 @@ class CommitSummary extends Component{
// console.log(worksid); // console.log(worksid);
var url = `/student_works/${worksid}/commit_des.json`; var url = `/student_works/${worksid}/commit_des.json`;
axios.get(url).then((result) => { axios.get(url).then((result) => {
console.log(result); // console.log(result);
if (result.status === 200) { if (result.status === 200) {
// console.log(url) // console.log(url)
// console.log("提交总结接口") // console.log("提交总结接口")

@ -149,8 +149,8 @@ class Trainingjobsetting extends Component {
// console.log(homeworkid) // console.log(homeworkid)
let url = `/homework_commons/${homeworkid}/settings.json`; let url = `/homework_commons/${homeworkid}/settings.json`;
axios.get(url).then((result) => { axios.get(url).then((result) => {
console.log(url); // console.log(url);
console.log(result); // console.log(result);
if (result!=undefined) { if (result!=undefined) {
this.props.Getdataback(result,result.data); this.props.Getdataback(result,result.data);
// console.log(result.data.code_review) // console.log(result.data.code_review)

@ -200,7 +200,7 @@ class Trialapplication extends Component {
} }
}).then((result) => { }).then((result) => {
//验证有问题{"status":1,"message":"success"} //验证有问题{"status":1,"message":"success"}
console.log(result); // console.log(result);
}).catch((error) => { }).catch((error) => {
@ -357,7 +357,7 @@ class Trialapplication extends Component {
} }
}).then((result) => { }).then((result) => {
//验证有问题{"status":1,"message":"success"} //验证有问题{"status":1,"message":"success"}
console.log(result); // console.log(result);
}).catch((error) => { }).catch((error) => {

@ -1,163 +1,163 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import {getImageUrl} from 'educoder'; import {getImageUrl} from 'educoder';
import '../../paths/ShixunPaths.css'; import '../../paths/ShixunPaths.css';
import DetailCardsEditAndAdd from './DetailCardsEditAndAdd'; import DetailCardsEditAndAdd from './DetailCardsEditAndAdd';
import axios from 'axios'; import axios from 'axios';
import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd"; import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
const reorder = (list, startIndex, endIndex) => { const reorder = (list, startIndex, endIndex) => {
const result = Array.from(list); const result = Array.from(list);
const [removed] = result.splice(startIndex, 1); const [removed] = result.splice(startIndex, 1);
result.splice(endIndex, 0, removed); result.splice(endIndex, 0, removed);
return result; return result;
}; };
const $ = window.$ const $ = window.$
class DetailCards extends Component{ class DetailCards extends Component{
constructor(props){ constructor(props){
super(props) super(props)
this.state={ this.state={
pathCardsList:undefined pathCardsList:undefined
} }
} }
getPathCardsList(){ getPathCardsList(){
let pathid = this.props.match.params.PathId let pathid = this.props.match.params.PathId
// let pathid= 28; // let pathid= 28;
let url=`/stages.json?subject_id=`+pathid; let url=`/stages.json?subject_id=`+pathid;
axios.get(url).then((result)=>{ axios.get(url).then((result)=>{
if(result.status===200){ if(result.status===200){
this.setState({ this.setState({
pathCardsList:result.data.stages pathCardsList:result.data.stages
}) })
} }
}).catch((error)=>{ }).catch((error)=>{
console.log(error); console.log(error);
}) })
} }
for_paragraph = (index) =>{ for_paragraph = (index) =>{
$("#detail_for_paragraph_"+index).slideToggle(500); $("#detail_for_paragraph_"+index).slideToggle(500);
} }
componentDidMount(){ componentDidMount(){
this.getPathCardsList(); this.getPathCardsList();
} }
onDragEnd = (result, shixunIndex) => { onDragEnd = (result, shixunIndex) => {
console.log(result) // console.log(result)
// dropped outside the list // dropped outside the list
if (!result.destination) { if (!result.destination) {
console.log('dropped outside the list') console.log('dropped outside the list')
return; return;
} }
if (result.destination.index === result.source.index) { if (result.destination.index === result.source.index) {
console.log('the same') console.log('the same')
return; return;
} }
// TODO exchange axios request // TODO exchange axios request
const shixuns_list = reorder( const shixuns_list = reorder(
this.state.pathCardsList[shixunIndex].shixuns_list, this.state.pathCardsList[shixunIndex].shixuns_list,
result.source.index, result.source.index,
result.destination.index result.destination.index
); );
const pathCardsList = this.state.pathCardsList const pathCardsList = this.state.pathCardsList
pathCardsList[shixunIndex].shixuns_list = shixuns_list; pathCardsList[shixunIndex].shixuns_list = shixuns_list;
this.setState({ this.setState({
pathCardsList pathCardsList
}); });
} }
render(){ render(){
let { pathCardsList }=this.state; let { pathCardsList }=this.state;
return( return(
<div> <div>
<div className="lesson-saved-list"> <div className="lesson-saved-list">
{ {
pathCardsList && pathCardsList.map((item,key)=>{ pathCardsList && pathCardsList.map((item,key)=>{
return( return(
<div className="lesson-saved-list-item" id={"stage_div_"+key}> <div className="lesson-saved-list-item" id={"stage_div_"+key}>
<p className="clearfix title-line"> <p className="clearfix title-line">
<a className="fl ring-blue mr10 mt2"> <a className="fl ring-blue mr10 mt2">
<img src={getImageUrl("images/educoder/icon/charpter-white.svg")} className="fl ml3 mt3"/> <img src={getImageUrl("images/educoder/icon/charpter-white.svg")} className="fl ml3 mt3"/>
</a> </a>
<span className="font-18 font-bd">{item.stage_name}</span> <span className="font-18 font-bd">{item.stage_name}</span>
<a className="fr mtf3"> <a className="fr mtf3">
<i className="iconfont icon-bianjidaibeijing font-22 color-green" data-tip-down="编辑"></i> <i className="iconfont icon-bianjidaibeijing font-22 color-green" data-tip-down="编辑"></i>
</a> </a>
<a href="" className="fr ring-op-green mr20"> <a href="" className="fr ring-op-green mr20">
<img src={getImageUrl("images/educoder/icon/movedown.svg")} data-tip-down="向下移动" className="fl mt2 ml4"/> <img src={getImageUrl("images/educoder/icon/movedown.svg")} data-tip-down="向下移动" className="fl mt2 ml4"/>
</a> </a>
<a href="" className="fr ring-op-green mr20"> <a href="" className="fr ring-op-green mr20">
<img src={getImageUrl("images/educoder/icon/moveup.svg")} data-tip-down="向上移动" className="fl mt2 ml4"/> <img src={getImageUrl("images/educoder/icon/moveup.svg")} data-tip-down="向上移动" className="fl mt2 ml4"/>
</a> </a>
</p> </p>
<div className="detail_for_paragraph clearfix" id={"detail_for_paragraph_"+key}> <div className="detail_for_paragraph clearfix" id={"detail_for_paragraph_"+key}>
<p className="color-dark-grey mt20 mb25 ml20 mr20 pl28 justify font-15">{item.stage_description}</p> <p className="color-dark-grey mt20 mb25 ml20 mr20 pl28 justify font-15">{item.stage_description}</p>
{/* {/*
两个 ref={provided.innerRef} 两个 ref={provided.innerRef}
item {...provided.draggableProps} item {...provided.draggableProps}
handler {...provided.dragHandleProps} handler {...provided.dragHandleProps}
*/} */}
<DragDropContext onDragEnd={(result) => this.onDragEnd(result, key)}> <DragDropContext onDragEnd={(result) => this.onDragEnd(result, key)}>
<Droppable droppableId="droppable"> <Droppable droppableId="droppable">
{(provided, snapshot) => ( {(provided, snapshot) => (
<div ref={provided.innerRef}> <div ref={provided.innerRef}>
{ {
item.shixuns_list && item.shixuns_list.map((line,index)=>{ item.shixuns_list && item.shixuns_list.map((line,index)=>{
return( return(
<Draggable key={line.identifier} draggableId={line.identifier} index={index}> <Draggable key={line.identifier} draggableId={line.identifier} index={index}>
{(provided, snapshot) => ( {(provided, snapshot) => (
<div className="clearfix paragraph lineh-30" ref={provided.innerRef} {...provided.draggableProps}> <div className="clearfix paragraph lineh-30" ref={provided.innerRef} {...provided.draggableProps}>
<li className="fl li-width63"> <li className="fl li-width63">
<span className="progressRing mr10"> <span className="progressRing mr10">
{ {
line.complete_status === 1 ?<i className="iconfont icon-wancheng progressRing-over font-18 mt10"></i> line.complete_status === 1 ?<i className="iconfont icon-wancheng progressRing-over font-18 mt10"></i>
:<i className="iconfont icon-bofang progressRing-part font-18 mt10"></i> :<i className="iconfont icon-bofang progressRing-part font-18 mt10"></i>
} }
</span> </span>
<span className="paragraph_name color-grey3"><span className="subject_stage_shixun_index">{key+1}</span>-{index+1}&nbsp;&nbsp;{line.shixun_name}</span> <span className="paragraph_name color-grey3"><span className="subject_stage_shixun_index">{key+1}</span>-{index+1}&nbsp;&nbsp;{line.shixun_name}</span>
</li> </li>
{ {
line.shixun_status==="暂未公开"? line.shixun_status==="暂未公开"?
<li className="fr status_li"><span className="fr color-grey-9">暂未公开</span></li> <li className="fr status_li"><span className="fr color-grey-9">暂未公开</span></li>
: :
<li className="fr status_li" > <li className="fr status_li" >
<a href={"javascript:void(0)"} {...provided.dragHandleProps} <a href={"javascript:void(0)"} {...provided.dragHandleProps}
className="mr30 color-blue_4C shixun_detail pointer fl none" target="_blank">drag</a> className="mr30 color-blue_4C shixun_detail pointer fl none" target="_blank">drag</a>
<a href={line.shixun_path} className="mr30 color-blue_4C shixun_detail pointer fl none" target="_blank">查看详情</a> <a href={line.shixun_path} className="mr30 color-blue_4C shixun_detail pointer fl none" target="_blank">查看详情</a>
<a href={line.tpi_path} className="btn_auto user_bluebg_btn fl none" id="shixun_operation" target="_blank">开始实战</a> <a href={line.tpi_path} className="btn_auto user_bluebg_btn fl none" id="shixun_operation" target="_blank">开始实战</a>
</li> </li>
} }
</div> </div>
)} )}
</Draggable> </Draggable>
) )
}) })
} }
</div> </div>
)} )}
</Droppable> </Droppable>
</DragDropContext> </DragDropContext>
</div> </div>
</div> </div>
) )
}) })
} }
</div> </div>
<DetailCardsEditAndAdd></DetailCardsEditAndAdd> <DetailCardsEditAndAdd></DetailCardsEditAndAdd>
</div> </div>
) )
} }
} }
export default DetailCards; export default DetailCards;

@ -926,8 +926,8 @@ class TPMBanner extends Component {
className="task-popup-text-center font-16 pb20">{can_fork}<br/>请问是否前往进行认证</p> className="task-popup-text-center font-16 pb20">{can_fork}<br/>请问是否前往进行认证</p>
</div> </div>
<div className="task-popup-submit clearfix"> <div className="task-popup-submit clearfix">
<a onClick={this.hideForkvisible} className="task-btn fl"></a> <a onClick={this.hideForkvisible} className="task-btn fl">取消</a>
<a className="task-btn task-btn-orange fr" onClick={this.tocertification}></a> <a className="task-btn task-btn-orange fr" onClick={this.tocertification}>确定</a>
</div> </div>
</Modal> </Modal>
{!!shixunsDetails.fork_num && {!!shixunsDetails.fork_num &&

@ -518,13 +518,6 @@ debugger
> >
<span className="fl mr30 color-orange pt10">*</span> <span className="fl mr30 color-orange pt10">*</span>
<style>
{`
.ant-select-dropdown{
top:1796px !important;
}
`}
</style>
<Select style={{width: 120}} className="winput-240-40 fl" <Select style={{width: 120}} className="winput-240-40 fl"
id="challenge_score" id="challenge_score"
onChange={this.props.status===2?"":this.onshixunsmark} onChange={this.props.status===2?"":this.onshixunsmark}

@ -24,10 +24,7 @@ export default class TpmQuestionEdit extends Component {
render() { render() {
console.log( this.props.neweditanswerRef)
console.log( this.props.neweditanswerRefval)
console.log( this.props.editanswersRef)
console.log( this.props.editanswersRefval)
return ( return (
<div> <div>
@ -133,17 +130,11 @@ export default class TpmQuestionEdit extends Component {
<p className="color-grey-6 font-16 mb30">奖励经验值</p> <p className="color-grey-6 font-16 mb30">奖励经验值</p>
<div className="clearfix" <div className="clearfix"
// onMouseLeave={this.onshixunsmarkss} // onMouseLeave={this.onshixunsmarkss}
id="challenge_score"
> >
<span className="fl mr30 color-orange pt10">*</span> <span className="fl mr30 color-orange pt10">*</span>
<style>
{`
.ant-select-dropdown{
top:2295px !important;
}
`}
</style>
<Select style={{width: 120}} className="winput-240-40 fl" <Select style={{width: 120}} className="winput-240-40 fl"
id="challenge_score"
disabled={this.props.status===2?true:false} disabled={this.props.status===2?true:false}
onChange={this.props.status===2?"":(e)=>this.props.onshixunsansweSelect(e)} onChange={this.props.status===2?"":(e)=>this.props.onshixunsansweSelect(e)}
// onMouseEnter={this.onshixunsmarks} // onMouseEnter={this.onshixunsmarks}

@ -138,13 +138,7 @@ export default class TpmQuestionNew extends Component {
// onMouseLeave={this.onshixunsmarkss} // onMouseLeave={this.onshixunsmarkss}
> >
<span className="fl mr30 color-orange pt10">*</span> <span className="fl mr30 color-orange pt10">*</span>
<style>
{`
.ant-select-dropdown{
top:2295px !important;
}
`}
</style>
<Select style={{width: 120}} className="winput-240-40 fl" <Select style={{width: 120}} className="winput-240-40 fl"
id="challenge_score" id="challenge_score"
onChange={(e)=>this.props.onshixunsansweSelect(e)} onChange={(e)=>this.props.onshixunsansweSelect(e)}

@ -321,7 +321,7 @@ class LoginRegisterComponent extends Component {
type: 2, type: 2,
} }
}).then((result) => { }).then((result) => {
console.log(result); // console.log(result);
if(result){ if(result){
if(result.data.status===-2){ if(result.data.status===-2){
console.log(value.length); console.log(value.length);

Loading…
Cancel
Save