dev_aliyun2
harry 5 years ago
parent 168994cfb3
commit 2388f4531f

@ -257,22 +257,21 @@ class Curriculum extends Component {
{/*Curriculumtwo 测试用*/}
{/*课程目标*/}
<Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms/subpage/:type/1'
render={ (props) => (<EcCourseSupportSetting {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)} />) }></Route>
render={(props) => (<EcCourseSupportSetting {...this.props} {...props} {...this.state} Ontitine={(i) => this.Ontitine(i)} />)}></Route>
{/*课程考核方式与数据来源*/}
<Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms/subpage/:type/2'
render={ (props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
render={(props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i) => this.Ontitine(i)} />)}></Route>
{/*成绩等级设置*/}
<Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms/subpage/:type/3'
render={ (props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
{/*4课程目标评价方法*/ }
render={(props) => (<Curriculumtwo {...this.props} {...props} {...this.state} Ontitine={(i) => this.Ontitine(i)} />)}></Route>
{/*4课程目标评价方法*/}
<Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms/subpage/:type/4'
render={ (props) => (<EcCourseEvaluationsbottom {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)}/>) }></Route>
render={(props) => (<EcCourseEvaluationsbottom {...this.props} {...props} {...this.state} Ontitine={(i) => this.Ontitine(i)} />)}></Route>
{/*5课程达成评价结果*/}
<Route extra path='/ecs/major_schools/:majorId/years/:yearId/classrooms/subpage/:type/5'
render={ (props) => (<EcCompletionCalculation {...this.props} {...props} {...this.state} Ontitine={(i)=>this.Ontitine(i)} triggerRef={this.bindRef}/>) }></Route>
render={(props) => (<EcCompletionCalculation {...this.props} {...props} {...this.state} Ontitine={(i) => this.Ontitine(i)} triggerRef={this.bindRef} />)}></Route>
</Switch>
</div>
</div>
)
}

@ -861,8 +861,6 @@ class MemoDetail extends Component {
</div>
</div>
</div>
</div >
</React.Fragment >
);

@ -109,23 +109,13 @@ class MemoDetailMDEditor extends Component {
}
showEditor() {
<<<<<<< HEAD
$("html, body").animate({ scrollTop: $('.commentInput:visible').offset().top - 100 }, 1000, () => {
if (this.commentMDEditor) {
this.commentMDEditor.cm.focus()
} else {
this.onMockInputClick()
}
});
=======
// $("html, body").animate({ scrollTop: $('.commentInput:visible').offset().top - 100 }, 1000, () => {
// $("html, body").animate({ scrollTop: $('.commentInput:visible').offset().top - 100 }, 1000, () => {
// if (this.commentMDEditor) {
// this.commentMDEditor.cm.focus()
// } else {
// this.onMockInputClick()
// }
// });
>>>>>>> f8dfb5f... 调整
// });
}
close = () => {
this.setState({ isInited: false })

Loading…
Cancel
Save