diff --git a/public/react/scripts/build.js b/public/react/scripts/build.js index 8f2e93942..c18479299 100644 --- a/public/react/scripts/build.js +++ b/public/react/scripts/build.js @@ -193,10 +193,10 @@ function generateNewIndexJsp() { } const newVersion = '1.1.1' let cdnHost = 'https://shixun.educoder.net' - cdnHost = 'http://cdn.educoder.net' - cdnHost = '' + cdnHost = 'https://ali-cdn.educoder.net' + // cdnHost = '' var result = data.replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`) - .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`) + // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`) .replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`) .replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`) diff --git a/public/react/src/modules/courses/coursesPublic/ModulationModal.js b/public/react/src/modules/courses/coursesPublic/ModulationModal.js index 1c9a9a84d..46dc3becf 100644 --- a/public/react/src/modules/courses/coursesPublic/ModulationModal.js +++ b/public/react/src/modules/courses/coursesPublic/ModulationModal.js @@ -1,108 +1,108 @@ -import React,{ Component } from "react"; -import { Modal,Checkbox,Upload,Button,Icon,message,Input} from "antd"; - - -class ModulationModal extends Component{ - constructor(props){ - super(props); - this.state={ - group_ids:[], - fileList:[], - textareaval:undefined, - Inputsval:undefined - } - } - - - Saves=()=>{ - let {textareaval,Inputsval}=this.state; - if(textareaval===""||textareaval===undefined){ - this.setState({ - textareavaltype:true - }) - return - } - this.setState({ - textareavaltype: false - }) - - if(Inputsval===undefined||Inputsval===""){ - this.setState({ - Inputsvaltype:true - }) - return - } - this.props.Saves(textareaval,Inputsval) - - } - - settextarea=(e)=>{ - this.setState({ - textareaval:e.target.value - }) - } - - setInputs=(e)=>{ - var value=parseInt(e.target.value) - - if(isNaN(value)){ - value=0 - }else{ - if(value<0||value>100){ - value=0 - } - } - this.setState({ - Inputsval:value - }) - } - render(){ - let {textareaval,Inputsval,textareavaltype,Inputsvaltype}=this.state; - return( -
- -
-

- - 该学生的最终成绩将不会按照评分规则进行计算 - -

- - -
- -
  • 原因不能为空
  • -
    -
  • - -
  • -
  • 分数不能为空
  • -
    - {this.props.Cancelname || '取消'} - {this.props.Savesname || '保存'} -
    -
    -
    -
    - ) - } -} +import React,{ Component } from "react"; +import { Modal,Checkbox,Upload,Button,Icon,message,Input} from "antd"; + + +class ModulationModal extends Component{ + constructor(props){ + super(props); + this.state={ + group_ids:[], + fileList:[], + textareaval:undefined, + Inputsval:undefined + } + } + + + Saves=()=>{ + let {textareaval,Inputsval}=this.state; + if(textareaval===""||textareaval===undefined){ + this.setState({ + textareavaltype:true + }) + return + } + this.setState({ + textareavaltype: false + }) + + if(Inputsval===undefined||Inputsval===""){ + this.setState({ + Inputsvaltype:true + }) + return + } + this.props.Saves(textareaval,Inputsval) + + } + + settextarea=(e)=>{ + this.setState({ + textareaval:e.target.value + }) + } + + setInputs=(e)=>{ + var value=parseInt(e.target.value) + + if(isNaN(value)){ + value=0 + }else{ + if(value<0||value>100){ + value=0 + } + } + this.setState({ + Inputsval:value + }) + } + render(){ + let {textareaval,Inputsval,textareavaltype,Inputsvaltype}=this.state; + return( +
    + +
    +

    + + 该学生的最终成绩将不会按照评分规则进行计算 + +

    + + +
    + +
  • 原因不能为空
  • +
    +
  • + +
  • +
  • 分数不能为空
  • +
    + {this.props.Cancelname || '取消'} + {this.props.Savesname || '保存'} +
    +
    +
    +
    + ) + } +} export default ModulationModal; \ No newline at end of file diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js index f27d810fe..557cec972 100644 --- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js +++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js @@ -632,89 +632,89 @@ class Selectsetting extends Component{ {this.state.newfileListtypes===true?

    请先上传资源

    :""} -

    - - -

    - - 勾选后所有用户可见,否则仅课堂成员可见 - -
    - {/*{this.props.has_course_groups&&this.props.has_course_groups===true?:""}*/} - {/*{this.state.course_groupss&&this.state.course_groupss.length>0?*/} - {/*统一设置(选中则所有分班使用相同的发布设置,否则各个单独设置)*/} - {/*:""}*/} - - - - - {/*this.props.has_course_groups&&this.props.has_course_groups===true?:""*/} -
    - {unified_setting===false? - this.state.course_groups&&this.state.course_groups.map((item,key)=>{ - return( -
    - - - - - - this.onChangeTimepublishs(e,index,key)} - // onChange={ this.onChangeTimepublish } - disabledTime={disabledDateTime} - disabledDate={disabledDate} - /> - - {key!=0?this.deletegrouppublish(key)}>:""} - {key===course_groups.length-1?:""} -
    - ) - }):""} -
    - -

    + {/*

    */} + {/**/} + + {/*

    */} + {/**/} + {/*勾选后所有用户可见,否则仅课堂成员可见*/} + {/**/} + {/*
    */} + {/*/!*{this.props.has_course_groups&&this.props.has_course_groups===true?:""}*!/*/} + {/*/!*{this.state.course_groupss&&this.state.course_groupss.length>0?*!/*/} + {/*/!*统一设置(选中则所有分班使用相同的发布设置,否则各个单独设置)*!/*/} + {/*/!*:""}*!/*/} + + {/**/} + + + {/*/!*this.props.has_course_groups&&this.props.has_course_groups===true?:""*!/*/} + {/*
    */} + {/*{unified_setting===false?*/} + {/*this.state.course_groups&&this.state.course_groups.map((item,key)=>{*/} + {/*return(*/} + {/*
    */} + + + {/**/} + + + {/*this.onChangeTimepublishs(e,index,key)}*/} + {/*// onChange={ this.onChangeTimepublish }*/} + {/*disabledTime={disabledDateTime}*/} + {/*disabledDate={disabledDate}*/} + {/*/>*/} + + {/*{key!=0?this.deletegrouppublish(key)}>:""}*/} + {/*{key===course_groups.length-1?:""}*/} + {/*
    */} + {/*)*/} + {/*}):""}*/} + {/*
    */} + + {/*

    */} {unified_setting===true? -

    +

    请先上传资源

    :""} -

    - - -

    - 勾选后所有用户可见,否则仅课堂成员可见 - - - {/*{this.state.course_groups_count&&this.state.course_groups_count>0?*/} - {/*统一设置(选中则所有分班使用相同的发布设置,否则各个单独设置)*/} - {/*:""}*/} - -
    - {is_unified_setting===false? - course_group_publish_times.map((item,key)=>{ - return( -
    - - - - this.onChangeTimepublish(e,index,key,2)} - // onChange={ this.onChangeTimepublish } - disabledTime={disabledDateTime} - disabledDate={disabledDate} - /> - {key!=0?this.deletegrouppublish(key)}>:""} - {key===course_group_publish_times.length-1&&key:""} -
    - ) - }) - - :""} -
    - -

    - - {is_unified_setting===true?

    + {/*

    */} + {/**/} + + {/*

    */} + {/*勾选后所有用户可见,否则仅课堂成员可见*/} + {/**/} + + {/*/!*{this.state.course_groups_count&&this.state.course_groups_count>0?*!/*/} + {/*/!*统一设置(选中则所有分班使用相同的发布设置,否则各个单独设置)*!/*/} + {/*/!*:""}*!/*/} + {/**/} + {/*
    */} + {/*{is_unified_setting===false?*/} + {/*course_group_publish_times.map((item,key)=>{*/} + {/*return(*/} + {/*
    */} + + {/**/} + + {/*this.onChangeTimepublish(e,index,key,2)}*/} + {/*// onChange={ this.onChangeTimepublish }*/} + {/*disabledTime={disabledDateTime}*/} + {/*disabledDate={disabledDate}*/} + {/*/>*/} + {/*{key!=0?this.deletegrouppublish(key)}>:""}*/} + {/*{key===course_group_publish_times.length-1&&key:""}*/} + {/*
    */} + {/*)*/} + {/*})*/} + + {/*:""}*/} + {/*
    */} + + {/*

    */} + + {is_unified_setting===true?

    + + {/*{attachments&&attachments.map((item,key)=>{*/} - {attachments&&attachments.map((item,key)=>{ - - return( -

    - - - - - {item.title} - - - - {item.filesize} - - - {item.delete===true? - this.onAttachmentRemove(item.id)} - aria-hidden="true"> - :""} -
    - ) - })} + {/*return(*/} + {/*
    */} + {/**/} + {/**/} + {/**/} + {/**/} + {/*{item.title}*/} + + {/**/} + {/**/} + {/*{item.filesize}*/} + + {/**/} + {/*{item.delete===true?*/} + {/*this.onAttachmentRemove(item.id)}*/} + {/*aria-hidden="true">*/} + {/*:""}*/} + {/*
    */} + {/*)*/} + {/*})}*/}