From 2c359d03284d1b83c268fdaf7701525f051637da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 18 Jul 2019 16:14:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesDetail/CoursesLeftNav.js   |  26 +-
 .../courses/coursesPublic/AccessoryModal2.js  |   2 +-
 .../exercise/Exercisestatisticalresult.js     |  14 +-
 .../graduation/tasks/GraduateTaskItem.js      |   2 +-
 .../modules/courses/graduation/tasks/index.js |   2 +-
 .../graduation/topics/GraduateTopicDetail.js  | 324 +++++++++---------
 .../src/modules/courses/new/CoursesNew.js     |  16 +
 .../courses/shixunHomework/CommitSummary.js   |   2 +-
 .../shixunHomework/Trainingjobsetting.js      |   4 +-
 .../src/modules/login/Trialapplication.js     |   4 +-
 .../paths/PathDetail/DetailCardsTemp.js       | 324 +++++++++---------
 public/react/src/modules/tpm/TPMBanner.js     |   4 +-
 .../tpm/challengesnew/TPMchallengesnew.js     |   7 -
 .../tpm/challengesnew/TpmQuestionEdit.js      |  15 +-
 .../tpm/challengesnew/TpmQuestionNew.js       |   8 +-
 .../src/modules/user/FindPasswordComponent.js |   2 +-
 16 files changed, 384 insertions(+), 372 deletions(-)

diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
index 9d50426e8..2a395200c 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
@@ -358,6 +358,7 @@ class Coursesleftnav extends Component{
       navid:undefined,
       sandiantype:undefined,
       twosandiantype:undefined,
+			ModalsType:false
     })
 
     let url="/course_modules/"+id+"/hidden_module.json"
@@ -379,12 +380,25 @@ class Coursesleftnav extends Component{
 
   edithidden=(e,id)=>{
     e.stopPropagation();//阻止冒泡
-    this.setState({
-      ModalsType:true,
-      Modalstopval:"隐藏后将不再显示此模块，",
-      ModalsBottomval:"后续可通过添加模块恢复显示",
-      ModalSave:()=>this.edithiddens(id),
-    })
+		let {course_modules}=this.props;
+
+		if(course_modules.length>1){
+			this.setState({
+				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)=>{
diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js
index 14b1f71e1..9019fe7a1 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js
@@ -135,7 +135,7 @@ class AccessoryModal2 extends Component{
         description:description,
         attachment_ids:newfileList
       }).then((result)=>{
-        console.log(result)
+        // console.log(result)
         if(result.data.status===0){
           this.props.setupdate()
           this.setState({
diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
index 6a7f1c505..fb03835f6 100644
--- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
+++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
@@ -42,7 +42,7 @@ class Exercisestatisticalresult extends Component {
 				limit:limit
 			}
 		}).then((result) => {
-			console.log(result)
+			// console.log(result)
 
 				this.setState({
 					data:result.data
@@ -85,6 +85,10 @@ class Exercisestatisticalresult extends Component {
 			page:pageNumber
 		})
 
+		debugger
+		$('html').animate({
+			scrollTop: 10
+		}, 1000);
 		this.updatefun(sort,exercise_group_id,pageNumber,limit)
 
 	}
@@ -109,10 +113,10 @@ class Exercisestatisticalresult extends Component {
 							<ul className="clearfix" style={{padding:'20px'}}>
 							<li className="clearfix  mt10">
 								<span className="fl mr10 color-grey-8">分班情况：</span>
-								<span className="fl "><a id="graduation_comment_no_limit"
-								                         className={this.state.exercise_group_id.length===0?"pl10 pr10 mr20 check_on":"pl10 pr10 mr20" }
-								>不限</a></span>
-								<CheckboxGroup onChange={(e)=>this.funtaskstatustwo(e,data&&data.course_groups)} value={this.state.exercise_group_id} style={{paddingTop: '4px'}}>
+								<span className="fl ">
+									<a id="graduation_comment_no_limit" className={this.state.exercise_group_id.length===0?"pl10 pr10 mr20 check_on":"pl10 pr10 mr20" }>不限</a>
+								</span>
+								<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) => {
 										return (
 											<span key={key}>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index 892a8d599..cf66b918a 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -83,7 +83,7 @@ class GraduateTaskItem extends Component{
     axios.post(url,{
       project_id:taskid
     }).then((result)=>{
-      console.log(result)
+      // console.log(result)
       if(result.data.status===0){
         this.setState({
           Modalstype:true,
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index 5eaccfb5e..0a4bd47b4 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -651,7 +651,7 @@ debugger
                 </Link>
               </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>
 
           }
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
index 06bccde67..be3ff7a30 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
@@ -1,163 +1,163 @@
-import React,{ Component } from "react";
-import { Input, Checkbox, Menu, Pagination,Table } from "antd";
-
-import '../../css/members.css'
-import '../../css/busyWork.css'
-import '../style.css'
-
-import { WordsBtn } from 'educoder'
-import NoneData from '../../coursesPublic/NoneData'
-import axios from 'axios'
-import DetailTable from './GraduateTopicDetailTable'
-import DetailInfo from './GraduateTopicDetailInfo'
-import CoursesListType from '../../coursesPublic/CoursesListType';
-
-
-
-class GraduateTopicDetail extends Component{
-  constructor(props){
-    super(props);
-    this.state={
-      tableData:[],
-      tablePage:1,
-      tablePageSize:15,
-      tab:1
-    }
-  }
-
-  componentDidMount(){
-    let{tablePage}=this.state;
-    this.getDetailList(tablePage);
-  }
-  // 获取详情列表
-  getDetailList=(page)=>{
-    let course_id=this.props.match.params.course_id;
-    let graduation_topic_id=this.props.match.params.graduation_topic_id;
-
-    let{tablePageSize}=this.state;
-    let url=`/courses/${course_id}/graduation_topics/${graduation_topic_id}.json?page=`+page+`&limit=`+tablePageSize;
-
-    axios.get(url).then((result)=>{
-      if(result.status==200){
-        this.setState({
-          tableData:result.data
-        })
-      }
-    }).catch((error)=>{
-      console.log(error);
-    })
-  }
-  //详情列表翻页
-  changeTablePag=(pageNumber)=>{
-    this.setState({
-      tablePage:pageNumber
-    })
-    this.getDetailList(pageNumber);
-  }
-
-  // 切换tab
-  onChangeStatus=(e)=>{
-    this.setState({
-      tab:e.key
-    })
-  }
-
-  actionTopic=()=>{
-    let graduation_topic_id=this.props.match.params.graduation_topic_id;
-    let course_id=this.props.match.params.course_id;
-    let {tableData}=this.state;
-
-    this.props.confirm({
-      content: tableData.user_selected_topic==0?`是否确认取消选题?`:"是否确认选题?",
-      onOk: () => {
-        let url="/courses/"+course_id+"/graduation_topics/"+graduation_topic_id+"/"
-        if(tableData.user_selected_topic==0){
-          url+="student_cancel_topic.json"
-        }else if(tableData.user_selected_topic==null || tableData.user_selected_topic==2){
-          url+="student_select_topic.json"
-        }
-        axios.post((url)).then((result)=>{
-          console.log(result);
-          if(result.data.status == 0){
-            this.getDetailList();
-            this.props.showNotification(`${result.data.message}`);
-          }
-        }).catch((error)=>{
-          console.log(error);
-        })
-      }
-    })
-  }
-  
-  render(){
-    let {
-      tableData,
-      tablePage,
-      tablePageSize,
-      tab,
-    }=this.state
-    let {course_id,graduation_topic_id}=this.props.match.params;
-    const isStudent =this.props.isStudent();
-    const isAdmin =this.props.isAdmin();
-
-    return(
-      <div className="newMain">
-        <div className="educontent mt10 mb50">
-          <p className="clearfix mb15 lineh-20">
-            <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>
-            <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>选题详情</span>
-          </p>
-          <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="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>
-          </p>
-          <div>
-            <div className="clearfix edu-back-white bor-bottom-greyE" >
-              <div className="fl mt6 task_menu_ul ml30">
-                <Menu mode="horizontal" defaultSelectedKeys="1" onClick={this.onChangeStatus}>
-                  <Menu.Item key="1">选题列表</Menu.Item>
-                  <Menu.Item key="2">选题问答</Menu.Item>
-                </Menu>
-              </div>
-              {/* null: 未选题 0：待确认 1：已同意 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>
-              }
-              {
-                isStudent && tableData.user_selected == true && tableData.user_selected_topic==0 &&
-                <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>
-              }
-            </div>
-            {
-              tab && tab==1&&
-              <div>
-                <div className="minH-560 edu-back-white">
-                  <DetailTable {...this.props} {...this.state} tableData={tableData} page={tablePage} getDetailList={this.getDetailList}></DetailTable>  
-                </div>
-                {
-                  tableData && tableData.users_count>tablePageSize &&
-                  <div className="edu-txt-center mt30 mb50">
-                    <Pagination showQuickJumper pageSize={tablePageSize} current={tablePage} total={tableData.users_count} onChange={this.changeTablePage}></Pagination>
-                  </div>
-                }
-              </div>
-            }
-            {
-              tab && tab==2&&
-              <DetailInfo {...this.props} {...this.state}></DetailInfo>
-            }
-          </div>
-        </div>
-      </div>
-    )
-  }
-}
+import React,{ Component } from "react";
+import { Input, Checkbox, Menu, Pagination,Table } from "antd";
+
+import '../../css/members.css'
+import '../../css/busyWork.css'
+import '../style.css'
+
+import { WordsBtn } from 'educoder'
+import NoneData from '../../coursesPublic/NoneData'
+import axios from 'axios'
+import DetailTable from './GraduateTopicDetailTable'
+import DetailInfo from './GraduateTopicDetailInfo'
+import CoursesListType from '../../coursesPublic/CoursesListType';
+
+
+
+class GraduateTopicDetail extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      tableData:[],
+      tablePage:1,
+      tablePageSize:15,
+      tab:1
+    }
+  }
+
+  componentDidMount(){
+    let{tablePage}=this.state;
+    this.getDetailList(tablePage);
+  }
+  // 获取详情列表
+  getDetailList=(page)=>{
+    let course_id=this.props.match.params.course_id;
+    let graduation_topic_id=this.props.match.params.graduation_topic_id;
+
+    let{tablePageSize}=this.state;
+    let url=`/courses/${course_id}/graduation_topics/${graduation_topic_id}.json?page=`+page+`&limit=`+tablePageSize;
+
+    axios.get(url).then((result)=>{
+      if(result.status==200){
+        this.setState({
+          tableData:result.data
+        })
+      }
+    }).catch((error)=>{
+      console.log(error);
+    })
+  }
+  //详情列表翻页
+  changeTablePag=(pageNumber)=>{
+    this.setState({
+      tablePage:pageNumber
+    })
+    this.getDetailList(pageNumber);
+  }
+
+  // 切换tab
+  onChangeStatus=(e)=>{
+    this.setState({
+      tab:e.key
+    })
+  }
+
+  actionTopic=()=>{
+    let graduation_topic_id=this.props.match.params.graduation_topic_id;
+    let course_id=this.props.match.params.course_id;
+    let {tableData}=this.state;
+
+    this.props.confirm({
+      content: tableData.user_selected_topic==0?`是否确认取消选题?`:"是否确认选题?",
+      onOk: () => {
+        let url="/courses/"+course_id+"/graduation_topics/"+graduation_topic_id+"/"
+        if(tableData.user_selected_topic==0){
+          url+="student_cancel_topic.json"
+        }else if(tableData.user_selected_topic==null || tableData.user_selected_topic==2){
+          url+="student_select_topic.json"
+        }
+        axios.post((url)).then((result)=>{
+          // console.log(result);
+          if(result.data.status == 0){
+            this.getDetailList();
+            this.props.showNotification(`${result.data.message}`);
+          }
+        }).catch((error)=>{
+          console.log(error);
+        })
+      }
+    })
+  }
+  
+  render(){
+    let {
+      tableData,
+      tablePage,
+      tablePageSize,
+      tab,
+    }=this.state
+    let {course_id,graduation_topic_id}=this.props.match.params;
+    const isStudent =this.props.isStudent();
+    const isAdmin =this.props.isAdmin();
+
+    return(
+      <div className="newMain">
+        <div className="educontent mt10 mb50">
+          <p className="clearfix mb15 lineh-20">
+            <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>
+            <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>选题详情</span>
+          </p>
+          <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="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>
+          </p>
+          <div>
+            <div className="clearfix edu-back-white bor-bottom-greyE" >
+              <div className="fl mt6 task_menu_ul ml30">
+                <Menu mode="horizontal" defaultSelectedKeys="1" onClick={this.onChangeStatus}>
+                  <Menu.Item key="1">选题列表</Menu.Item>
+                  <Menu.Item key="2">选题问答</Menu.Item>
+                </Menu>
+              </div>
+              {/* null: 未选题 0：待确认 1：已同意 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>
+              }
+              {
+                isStudent && tableData.user_selected == true && tableData.user_selected_topic==0 &&
+                <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>
+              }
+            </div>
+            {
+              tab && tab==1&&
+              <div>
+                <div className="minH-560 edu-back-white">
+                  <DetailTable {...this.props} {...this.state} tableData={tableData} page={tablePage} getDetailList={this.getDetailList}></DetailTable>  
+                </div>
+                {
+                  tableData && tableData.users_count>tablePageSize &&
+                  <div className="edu-txt-center mt30 mb50">
+                    <Pagination showQuickJumper pageSize={tablePageSize} current={tablePage} total={tableData.users_count} onChange={this.changeTablePage}></Pagination>
+                  </div>
+                }
+              </div>
+            }
+            {
+              tab && tab==2&&
+              <DetailInfo {...this.props} {...this.state}></DetailInfo>
+            }
+          </div>
+        </div>
+      </div>
+    )
+  }
+}
 export default GraduateTopicDetail;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index 47170a722..f3442b8b7 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -118,6 +118,8 @@ class CoursesNew extends Component {
             window.scrollTo(0, anchorElement.offsetTop - window.innerHeight / 2);
         }
     }
+
+
     handleSubmit = (e) => {
 
         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) {
+
+
+
                     // console.log('Received values of form: ', values);
                     let {datatime} = this.state;
                     let url = "/courses/" + coursesId + ".json";
diff --git a/public/react/src/modules/courses/shixunHomework/CommitSummary.js b/public/react/src/modules/courses/shixunHomework/CommitSummary.js
index 702546191..0be2e3b34 100644
--- a/public/react/src/modules/courses/shixunHomework/CommitSummary.js
+++ b/public/react/src/modules/courses/shixunHomework/CommitSummary.js
@@ -47,7 +47,7 @@ class CommitSummary extends Component{
         // console.log(worksid);
         var  url = `/student_works/${worksid}/commit_des.json`;
         axios.get(url).then((result) => {
-            console.log(result);
+            // console.log(result);
             if (result.status === 200) {
                 // console.log(url)
                 // console.log("提交总结接口")
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index d10d4db22..bbd503e9e 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -149,8 +149,8 @@ class Trainingjobsetting extends Component {
         // console.log(homeworkid)
         let url = `/homework_commons/${homeworkid}/settings.json`;
         axios.get(url).then((result) => {
-            console.log(url);
-            console.log(result);
+            // console.log(url);
+            // console.log(result);
             if (result!=undefined) {
                 this.props.Getdataback(result,result.data);
                 // console.log(result.data.code_review)
diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index f93e102ad..fafd809fd 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -200,7 +200,7 @@ class Trialapplication extends Component {
 			}
 		}).then((result) => {
 			//验证有问题{"status":1,"message":"success"}
-			console.log(result);
+			// console.log(result);
 
 
 		}).catch((error) => {
@@ -357,7 +357,7 @@ class Trialapplication extends Component {
 			}
 		}).then((result) => {
 			//验证有问题{"status":1,"message":"success"}
-			console.log(result);
+			// console.log(result);
 
 
 		}).catch((error) => {
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsTemp.js b/public/react/src/modules/paths/PathDetail/DetailCardsTemp.js
index bd1630ae7..4acc28a48 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsTemp.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsTemp.js
@@ -1,163 +1,163 @@
-import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
-import '../../paths/ShixunPaths.css';
-import DetailCardsEditAndAdd from './DetailCardsEditAndAdd';
-import axios from 'axios';
-
-import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
-
-const reorder = (list, startIndex, endIndex) => {
-  const result = Array.from(list);
-  const [removed] = result.splice(startIndex, 1);
-  result.splice(endIndex, 0, removed);
-
-  return result;
-};
-
-const $ = window.$
-class DetailCards extends Component{
-  constructor(props){
-    super(props)
-    this.state={
-      pathCardsList:undefined
-    }
-  }
-
-  getPathCardsList(){
-    let pathid = this.props.match.params.PathId
-    // let pathid= 28;
-    let url=`/stages.json?subject_id=`+pathid;
-    axios.get(url).then((result)=>{
-      if(result.status===200){
-        this.setState({
-          pathCardsList:result.data.stages
-        })
-      }
-    }).catch((error)=>{
-      console.log(error);
-    })
-  }
-
-
-  for_paragraph = (index) =>{
-    $("#detail_for_paragraph_"+index).slideToggle(500);
-  }
-
-  componentDidMount(){
-    this.getPathCardsList();
-  }
-  onDragEnd = (result, shixunIndex) => {
-    console.log(result)
-
-    // dropped outside the list
-    if (!result.destination) {
-      console.log('dropped outside the list')
-
-      return;
-    }
-    if (result.destination.index === result.source.index) {
-      console.log('the same')
-      return;
-    }
-    // TODO exchange axios request
-
-    const shixuns_list = reorder(
-      this.state.pathCardsList[shixunIndex].shixuns_list,
-      result.source.index,
-      result.destination.index
-    );
-    const pathCardsList = this.state.pathCardsList
-    pathCardsList[shixunIndex].shixuns_list = shixuns_list;
-    this.setState({
-      pathCardsList
-    });
-  }
-  render(){
-    let { pathCardsList }=this.state;
-    return(
-      <div>
-        <div className="lesson-saved-list">
-          {
-            pathCardsList && pathCardsList.map((item,key)=>{
-              return(
-                <div className="lesson-saved-list-item" id={"stage_div_"+key}>
-                  <p className="clearfix title-line">
-                    <a className="fl ring-blue mr10 mt2">
-                      <img src={getImageUrl("images/educoder/icon/charpter-white.svg")} className="fl ml3 mt3"/>
-                    </a>
-                    <span className="font-18 font-bd">{item.stage_name}</span>
-                    <a className="fr mtf3">
-                      <i className="iconfont icon-bianjidaibeijing font-22 color-green" data-tip-down="编辑"></i>
-                    </a>
-                    <a href="" className="fr ring-op-green mr20">
-                      <img src={getImageUrl("images/educoder/icon/movedown.svg")} data-tip-down="向下移动" className="fl mt2 ml4"/>
-                    </a>
-                    <a href="" className="fr ring-op-green mr20">
-                      <img src={getImageUrl("images/educoder/icon/moveup.svg")} data-tip-down="向上移动" className="fl mt2 ml4"/>
-                    </a>
-                  </p>
-                  <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>
-
-                    {/*
-                      两个  ref={provided.innerRef}
-                      item 加 {...provided.draggableProps}
-                      handler 加 {...provided.dragHandleProps} 
-                   */}
-                    <DragDropContext onDragEnd={(result) => this.onDragEnd(result, key)}>
-                      <Droppable droppableId="droppable">
-                        {(provided, snapshot) => (
-                          <div ref={provided.innerRef}>
-                            {
-                              item.shixuns_list && item.shixuns_list.map((line,index)=>{
-                                return(
-                                  <Draggable key={line.identifier} draggableId={line.identifier} index={index}>
-                                    {(provided, snapshot) => (
-                                      <div className="clearfix paragraph lineh-30" ref={provided.innerRef} {...provided.draggableProps}>
-                                        <li className="fl li-width63">
-                                    <span className="progressRing mr10">
-                                      {
-                                        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>
-                                      }
-                                      
-                                    </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>
-                                        {
-                                          line.shixun_status==="暂未公开"?
-                                            <li className="fr status_li"><span className="fr color-grey-9">暂未公开</span></li>
-                                            :
-
-                                            <li className="fr status_li" >
-                                              <a href={"javascript:void(0)"} {...provided.dragHandleProps}
-                                                 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.tpi_path} className="btn_auto user_bluebg_btn fl none" id="shixun_operation" target="_blank">开始实战</a>
-                                            </li>
-
-                                        }
-                                      </div>
-                                    )}
-                                  </Draggable>
-                                )
-                              })
-                            }
-                          </div>
-                        )}
-
-                      </Droppable>
-                    </DragDropContext>
-                  </div>
-                </div>
-              )
-            })
-          }
-        </div>
-        <DetailCardsEditAndAdd></DetailCardsEditAndAdd>
-      </div>
-    )
-  }
-}
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import '../../paths/ShixunPaths.css';
+import DetailCardsEditAndAdd from './DetailCardsEditAndAdd';
+import axios from 'axios';
+
+import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
+
+const reorder = (list, startIndex, endIndex) => {
+  const result = Array.from(list);
+  const [removed] = result.splice(startIndex, 1);
+  result.splice(endIndex, 0, removed);
+
+  return result;
+};
+
+const $ = window.$
+class DetailCards extends Component{
+  constructor(props){
+    super(props)
+    this.state={
+      pathCardsList:undefined
+    }
+  }
+
+  getPathCardsList(){
+    let pathid = this.props.match.params.PathId
+    // let pathid= 28;
+    let url=`/stages.json?subject_id=`+pathid;
+    axios.get(url).then((result)=>{
+      if(result.status===200){
+        this.setState({
+          pathCardsList:result.data.stages
+        })
+      }
+    }).catch((error)=>{
+      console.log(error);
+    })
+  }
+
+
+  for_paragraph = (index) =>{
+    $("#detail_for_paragraph_"+index).slideToggle(500);
+  }
+
+  componentDidMount(){
+    this.getPathCardsList();
+  }
+  onDragEnd = (result, shixunIndex) => {
+    // console.log(result)
+
+    // dropped outside the list
+    if (!result.destination) {
+      console.log('dropped outside the list')
+
+      return;
+    }
+    if (result.destination.index === result.source.index) {
+      console.log('the same')
+      return;
+    }
+    // TODO exchange axios request
+
+    const shixuns_list = reorder(
+      this.state.pathCardsList[shixunIndex].shixuns_list,
+      result.source.index,
+      result.destination.index
+    );
+    const pathCardsList = this.state.pathCardsList
+    pathCardsList[shixunIndex].shixuns_list = shixuns_list;
+    this.setState({
+      pathCardsList
+    });
+  }
+  render(){
+    let { pathCardsList }=this.state;
+    return(
+      <div>
+        <div className="lesson-saved-list">
+          {
+            pathCardsList && pathCardsList.map((item,key)=>{
+              return(
+                <div className="lesson-saved-list-item" id={"stage_div_"+key}>
+                  <p className="clearfix title-line">
+                    <a className="fl ring-blue mr10 mt2">
+                      <img src={getImageUrl("images/educoder/icon/charpter-white.svg")} className="fl ml3 mt3"/>
+                    </a>
+                    <span className="font-18 font-bd">{item.stage_name}</span>
+                    <a className="fr mtf3">
+                      <i className="iconfont icon-bianjidaibeijing font-22 color-green" data-tip-down="编辑"></i>
+                    </a>
+                    <a href="" className="fr ring-op-green mr20">
+                      <img src={getImageUrl("images/educoder/icon/movedown.svg")} data-tip-down="向下移动" className="fl mt2 ml4"/>
+                    </a>
+                    <a href="" className="fr ring-op-green mr20">
+                      <img src={getImageUrl("images/educoder/icon/moveup.svg")} data-tip-down="向上移动" className="fl mt2 ml4"/>
+                    </a>
+                  </p>
+                  <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>
+
+                    {/*
+                      两个  ref={provided.innerRef}
+                      item 加 {...provided.draggableProps}
+                      handler 加 {...provided.dragHandleProps} 
+                   */}
+                    <DragDropContext onDragEnd={(result) => this.onDragEnd(result, key)}>
+                      <Droppable droppableId="droppable">
+                        {(provided, snapshot) => (
+                          <div ref={provided.innerRef}>
+                            {
+                              item.shixuns_list && item.shixuns_list.map((line,index)=>{
+                                return(
+                                  <Draggable key={line.identifier} draggableId={line.identifier} index={index}>
+                                    {(provided, snapshot) => (
+                                      <div className="clearfix paragraph lineh-30" ref={provided.innerRef} {...provided.draggableProps}>
+                                        <li className="fl li-width63">
+                                    <span className="progressRing mr10">
+                                      {
+                                        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>
+                                      }
+                                      
+                                    </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>
+                                        {
+                                          line.shixun_status==="暂未公开"?
+                                            <li className="fr status_li"><span className="fr color-grey-9">暂未公开</span></li>
+                                            :
+
+                                            <li className="fr status_li" >
+                                              <a href={"javascript:void(0)"} {...provided.dragHandleProps}
+                                                 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.tpi_path} className="btn_auto user_bluebg_btn fl none" id="shixun_operation" target="_blank">开始实战</a>
+                                            </li>
+
+                                        }
+                                      </div>
+                                    )}
+                                  </Draggable>
+                                )
+                              })
+                            }
+                          </div>
+                        )}
+
+                      </Droppable>
+                    </DragDropContext>
+                  </div>
+                </div>
+              )
+            })
+          }
+        </div>
+        <DetailCardsEditAndAdd></DetailCardsEditAndAdd>
+      </div>
+    )
+  }
+}
 export default DetailCards;
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index c82ca237e..c9404a792 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -926,8 +926,8 @@ class TPMBanner extends Component {
                             className="task-popup-text-center font-16 pb20">{can_fork}<br/>请问是否前往进行认证？</p>
                         </div>
                         <div className="task-popup-submit clearfix">
-                            <a onClick={this.hideForkvisible} className="task-btn fl">否</a>
-                            <a className="task-btn task-btn-orange fr" onClick={this.tocertification}>是</a>
+                            <a onClick={this.hideForkvisible} className="task-btn fl">取消</a>
+                            <a className="task-btn task-btn-orange fr" onClick={this.tocertification}>确定</a>
                         </div>
                     </Modal>
                     {!!shixunsDetails.fork_num &&
diff --git a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
index b498d441f..9ab807391 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
@@ -518,13 +518,6 @@ debugger
 												>
                             <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"
                                     id="challenge_score"
                                     onChange={this.props.status===2?"":this.onshixunsmark}
diff --git a/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js b/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
index 99abbfafa..32b56aae1 100644
--- a/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
+++ b/public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
@@ -24,10 +24,7 @@ export default class TpmQuestionEdit extends Component {
 
 
 	render() {
-	  console.log(	this.props.neweditanswerRef)
-		console.log(	this.props.neweditanswerRefval)
-		console.log(	this.props.editanswersRef)
-		console.log(	this.props.editanswersRefval)
+
 		return (
 			<div>
 
@@ -133,17 +130,11 @@ export default class TpmQuestionEdit extends Component {
 					<p className="color-grey-6 font-16 mb30">奖励经验值</p>
 					<div className="clearfix"
 						// onMouseLeave={this.onshixunsmarkss}
+			    id="challenge_score"
 					>
 						<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"
-										id="challenge_score"
+
 										disabled={this.props.status===2?true:false}
 										onChange={this.props.status===2?"":(e)=>this.props.onshixunsansweSelect(e)}
 							// onMouseEnter={this.onshixunsmarks}
diff --git a/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js b/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
index 58632b96b..855f6ce53 100644
--- a/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
+++ b/public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
@@ -138,13 +138,7 @@ export default class TpmQuestionNew extends Component {
 						// onMouseLeave={this.onshixunsmarkss}
 					>
 						<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"
 										id="challenge_score"
 										onChange={(e)=>this.props.onshixunsansweSelect(e)}
diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index 0526b0cb5..76375547f 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -321,7 +321,7 @@ class LoginRegisterComponent extends Component {
 				type: 2,
 			}
 		}).then((result) => {
-			console.log(result);
+			// console.log(result);
 			if(result){
 				if(result.data.status===-2){
 						console.log(value.length);