From a6142f8cd1bdae52ceddbb472aab37bdc515ab8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 20 Jul 2019 13:17:23 +0800 Subject: [PATCH] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/Resource/index.js | 2 +- .../modules/courses/graduation/tasks/index.js | 2 +- .../TraineetraininginformationModal.js | 2 +- .../courses/shixunHomework/shixunHomework.js | 2 +- public/react/src/modules/login/LoginDialog.js | 2 +- public/react/src/modules/page/LeftNav.js | 2 +- .../src/modules/paths/PathDetail/sendPanel.js | 412 +++++++++--------- public/react/src/modules/tpm/NewHeader.js | 8 +- public/react/src/modules/tpm/SiderBar.js | 2 +- .../src/modules/tpm/newshixuns/Newshixuns.js | 2 +- .../tpm/shixunchild/Repository/Repository.js | 2 +- 11 files changed, 219 insertions(+), 219 deletions(-) diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index c755efabd..34fe53e4f 100644 --- a/public/react/src/modules/courses/Resource/index.js +++ b/public/react/src/modules/courses/Resource/index.js @@ -955,7 +955,7 @@ class Fileslists extends Component{ } >
- +

暂无数据哦~

diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js index 493fc1916..ac2a226bd 100644 --- a/public/react/src/modules/courses/graduation/tasks/index.js +++ b/public/react/src/modules/courses/graduation/tasks/index.js @@ -772,7 +772,7 @@ class GraduationTasks extends Component{ } >
- +

暂无数据哦~

diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js index 58a12eff1..2d97e6c08 100644 --- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js +++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js @@ -229,7 +229,7 @@ class TraineetraininginformationModal extends Component {
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js index 1913b0d2d..3a4efc17d 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js +++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js @@ -1202,7 +1202,7 @@ class ShixunHomework extends Component{ } >
+ src="/images/educoder/nodata.png" />

暂无数据哦~

diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index fcb467e12..3a401c7de 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -49,7 +49,7 @@ function get_login_verification_code(btn) { type = 7; } $.get( - 'https://www.educoder.net/account/get_verification_code', + '/account/get_verification_code', { value: $('#pass_name_input').val().trim(), type: type}, function (data) { diff --git a/public/react/src/modules/page/LeftNav.js b/public/react/src/modules/page/LeftNav.js index 1b14ce627..d1a7b1a11 100644 --- a/public/react/src/modules/page/LeftNav.js +++ b/public/react/src/modules/page/LeftNav.js @@ -38,7 +38,7 @@ class LeftNav extends Component {
- 0?1442652658 + 0?1442652658 Jimmy
diff --git a/public/react/src/modules/paths/PathDetail/sendPanel.js b/public/react/src/modules/paths/PathDetail/sendPanel.js index f2fa3da1b..edbe083b1 100644 --- a/public/react/src/modules/paths/PathDetail/sendPanel.js +++ b/public/react/src/modules/paths/PathDetail/sendPanel.js @@ -1,207 +1,207 @@ -import React,{ Component } from "react"; -import { Modal,Radio,Input,Tooltip,Checkbox,Select, Row,Col } from "antd"; -import axios from 'axios'; -import { SnackbarHOC } from 'educoder'; -import Modals from '../../modals/Modals'; -const Option = Select.Option; -const CheckboxGroup = Checkbox.Group; -class sendPanel extends Component{ - constructor(props){ - super(props); - this.state={ - sentShixunPath:false, - sendToCourseList:undefined, - openSearch:false, - sendToCourseId:undefined, - sendToShixunArray:[], - shixunNum:0, - Modalstype:false, - cardsModalcancel:this.cardsModalcancel, - cardsModalsave:this.cardsModalsave, - modalsTopval:'', - Modalsbottomval:'', - courseurl:'' - } - } - - - //发送至 - SentToLesson =() =>{ - this.setState({ - sentShixunPath:true - }) - } - //隐藏发送至弹框 - hideSenttothevalue =()=>{ - this.setState({ - sentShixunPath:false - }) - } - //打开课堂列表下拉框 - openList=()=>{ - this.setState({ - openSearch:true - }) - } - //关闭课堂列表下拉框 - closeList=()=>{ - this.setState({ - openSearch:false - }) - } - - // 选择课堂获取选中的Id - selectCloseList=(e)=>{ - this.setState({ - openSearch:false, - sendToCourseId:e - }) - } - - //选择checkbox - changeCheckBoxs=(list)=>{ - this.setState({ - sendToShixunArray:list, - shixunNum:list.length - }) - } - - //确认提交 - submitInfo=()=>{ - let {sendToCourseId,sendToShixunArray}=this.state; - if(sendToCourseId===undefined){ - this.props.showSnackbar("您还未选择发送的课堂"); - }else if(parseInt(sendToShixunArray.length)==0){ - this.props.showSnackbar("您还未选择实训"); - }else{ - let id=this.props.detailInfoList.id; - let url="/paths/"+id+"/send_to_course.json"; - axios.post(url,{ - shixun_ids:sendToShixunArray, - course_id:sendToCourseId - }).then((result)=>{ - if(result.data.status===1){ - this.setState({ - Modalstype:true, - sentShixunPath:false, - Modalstopval:result.data.message, - courseurl:result.data.url - }) - } - }).catch((error)=>{ - console.log(error); - }) - } - } - - componentDidMount(){ - let id=this.props.detailInfoList.id; - let url="/paths/"+id+"/choose_course.json"; - axios.get(url).then((result)=>{ - if(result.status==200){ - this.setState({ - sendToCourseList:result.data - }) - } - }).catch((error)=>{ - console.log(error); - }) - } - - cardsModalcancel=()=>{ - this.setState({ - Modalstype:false, - }) - } - cardsModalsave=()=>{ - let {courseurl}=this.state; - window.location.href = "https://www.educoder.net/"+courseurl; - } - render(){ - let{sentShixunPath,sendToCourseList,openSearch,shixunNum,Modalstype,Modalstopval,Modalsbottomval,cardsModalcancel,cardsModalsave}= this.state; - return( -
- - - - { - this.props.detailInfoList===undefined?"":this.props.detailInfoList.allow_statistics===true? - - - 发送至 - - :'' - } - - -
-
- -
-
- - - { - sendToCourseList && sendToCourseList.stages.map((item,key)=>{ - return( - item.shixuns.map((items,keys)=>{ - return( -
- {items.shixun_name} -
- ) - }) - - ) - }) - } - - -
-

已选择 {shixunNum} 个实训

-
- 取消 - 确定 -
-
- -
- ) - } - -} +import React,{ Component } from "react"; +import { Modal,Radio,Input,Tooltip,Checkbox,Select, Row,Col } from "antd"; +import axios from 'axios'; +import { SnackbarHOC } from 'educoder'; +import Modals from '../../modals/Modals'; +const Option = Select.Option; +const CheckboxGroup = Checkbox.Group; +class sendPanel extends Component{ + constructor(props){ + super(props); + this.state={ + sentShixunPath:false, + sendToCourseList:undefined, + openSearch:false, + sendToCourseId:undefined, + sendToShixunArray:[], + shixunNum:0, + Modalstype:false, + cardsModalcancel:this.cardsModalcancel, + cardsModalsave:this.cardsModalsave, + modalsTopval:'', + Modalsbottomval:'', + courseurl:'' + } + } + + + //发送至 + SentToLesson =() =>{ + this.setState({ + sentShixunPath:true + }) + } + //隐藏发送至弹框 + hideSenttothevalue =()=>{ + this.setState({ + sentShixunPath:false + }) + } + //打开课堂列表下拉框 + openList=()=>{ + this.setState({ + openSearch:true + }) + } + //关闭课堂列表下拉框 + closeList=()=>{ + this.setState({ + openSearch:false + }) + } + + // 选择课堂获取选中的Id + selectCloseList=(e)=>{ + this.setState({ + openSearch:false, + sendToCourseId:e + }) + } + + //选择checkbox + changeCheckBoxs=(list)=>{ + this.setState({ + sendToShixunArray:list, + shixunNum:list.length + }) + } + + //确认提交 + submitInfo=()=>{ + let {sendToCourseId,sendToShixunArray}=this.state; + if(sendToCourseId===undefined){ + this.props.showSnackbar("您还未选择发送的课堂"); + }else if(parseInt(sendToShixunArray.length)==0){ + this.props.showSnackbar("您还未选择实训"); + }else{ + let id=this.props.detailInfoList.id; + let url="/paths/"+id+"/send_to_course.json"; + axios.post(url,{ + shixun_ids:sendToShixunArray, + course_id:sendToCourseId + }).then((result)=>{ + if(result.data.status===1){ + this.setState({ + Modalstype:true, + sentShixunPath:false, + Modalstopval:result.data.message, + courseurl:result.data.url + }) + } + }).catch((error)=>{ + console.log(error); + }) + } + } + + componentDidMount(){ + let id=this.props.detailInfoList.id; + let url="/paths/"+id+"/choose_course.json"; + axios.get(url).then((result)=>{ + if(result.status==200){ + this.setState({ + sendToCourseList:result.data + }) + } + }).catch((error)=>{ + console.log(error); + }) + } + + cardsModalcancel=()=>{ + this.setState({ + Modalstype:false, + }) + } + cardsModalsave=()=>{ + let {courseurl}=this.state; + window.location.href =courseurl; + } + render(){ + let{sentShixunPath,sendToCourseList,openSearch,shixunNum,Modalstype,Modalstopval,Modalsbottomval,cardsModalcancel,cardsModalsave}= this.state; + return( +
+ + + + { + this.props.detailInfoList===undefined?"":this.props.detailInfoList.allow_statistics===true? + + + 发送至 + + :'' + } + + +
+
+ +
+
+ + + { + sendToCourseList && sendToCourseList.stages.map((item,key)=>{ + return( + item.shixuns.map((items,keys)=>{ + return( +
+ {items.shixun_name} +
+ ) + }) + + ) + }) + } + + +
+

已选择 {shixunNum} 个实训

+
+ 取消 + 确定 +
+
+ +
+ ) + } + +} export default SnackbarHOC()(sendPanel); \ No newline at end of file diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index f53159c7c..44a1ebbbd 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -317,11 +317,11 @@ class NewHeader extends Component { }) if(submitapplicationssum===0){ if(submitapplicationsvaluedata!=undefined){ - window.location.href = "https://www.educoder.net/courses/"+submitapplicationsvaluedata; + window.location.href = "/courses/"+submitapplicationsvaluedata; } }else if(submitapplicationssum===1){ if(submitapplicationsvaluedata!=undefined){ - window.location.href = "https://www.educoder.net/projects/"+submitapplicationsvaluedata; + window.location.href = "/projects/"+submitapplicationsvaluedata; } } } @@ -480,7 +480,7 @@ submittojoinclass=(value)=>{ } if(value===0){ - let url="https://www.educoder.net/courses/join_course_multi_role.json" + let url="/courses/join_course_multi_role.json" const form = new FormData(); form.append('invite_code', tojoinclasstitle); form.append('role', pamst); @@ -526,7 +526,7 @@ submittojoinclass=(value)=>{ } if(value===1){ - let url="https://www.educoder.net/applied_project/applied_project_info.json" + let url="/applied_project/applied_project_info.json" const form = new FormData(); form.append('invite_code', tojoinclasstitle); form.append('member', RadioGroupvalue); diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js index 14aeeb5ae..39d9df55b 100644 --- a/public/react/src/modules/tpm/SiderBar.js +++ b/public/react/src/modules/tpm/SiderBar.js @@ -45,7 +45,7 @@ function _initSider() { return; } var $tool = $(this).attr("tooltips"); - $descSide.html($tool+"
"); + $descSide.html($tool+"
"); $descSide.data('_dom', this) $descSide.show().css({ left:$(this).offset().left - $descSide.width()-30, diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js index b5054472c..39663e6be 100644 --- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js +++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js @@ -865,7 +865,7 @@ class Newshixuns extends Component {

创建实训 - 实训制作指南

diff --git a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js index 617681d5f..acdeb616b 100644 --- a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js +++ b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js @@ -80,7 +80,7 @@ class Repository extends Component { */} - Git使用指南