From fdca717eeb03c60e7f445ec03bc8a51e6bb3905e Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 23 Apr 2021 14:14:06 +0800 Subject: [PATCH] imageUrl + / --- src/common/components/comment/CommentItem.js | 2 +- src/forge/Component/Contributors.jsx | 4 +-- src/forge/Source/Index.jsx | 2 +- src/modules/404/Shixunnopage.js | 2 +- .../Competitimain/CompetitionsIndex.js | 2 +- .../Competitioncommon/CompetitionCommon.js | 4 +-- .../CompetitionContentsChart.js | 4 +-- .../courses/coursesHome/CoursesHome.js | 2 +- .../shixunHomework/Listofworksstudentone.js | 34 +++++++++---------- .../shixunHomework/ShixunWorkReport.js | 2 +- .../Shixunworkdetails/ShixunWorkModal.js | 2 +- src/modules/message/js/Messagerouting.js | 2 +- src/modules/user/usersInfo/InfosProject.js | 2 +- src/modules/user/usersInfo/Projects.js | 2 +- src/search/SearchPage.js | 2 +- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/common/components/comment/CommentItem.js b/src/common/components/comment/CommentItem.js index 2d9f72c7..e577c3bc 100644 --- a/src/common/components/comment/CommentItem.js +++ b/src/common/components/comment/CommentItem.js @@ -64,7 +64,7 @@ function CommentItem({ const commentAvatar = (author) => ( ); diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx index 04cd393e..f3353645 100644 --- a/src/forge/Component/Contributors.jsx +++ b/src/forge/Component/Contributors.jsx @@ -52,7 +52,7 @@ function Contributors({contributors,owner,projectsId,id,showNotification}){ - + {data.name} { @@ -96,7 +96,7 @@ function Contributors({contributors,owner,projectsId,id,showNotification}){ axios({ method: flag ? 'post' : 'delete', url: `/watchers/${flag ? 'follow' : 'unfollow'}.json`, - params: {target_type: "project",id} + params: {target_type: "user",id:login} }).then(result => { if (result && (result.data.status === 0 || result.data.status === 2)) { let a = menuList && menuList.filter(i=>i.login === login); diff --git a/src/forge/Source/Index.jsx b/src/forge/Source/Index.jsx index a4284827..8ba92587 100644 --- a/src/forge/Source/Index.jsx +++ b/src/forge/Source/Index.jsx @@ -217,7 +217,7 @@ function Index(props){ data.map((item,key)=>{ return(
  • - +
    diff --git a/src/modules/404/Shixunnopage.js b/src/modules/404/Shixunnopage.js index 41893240..af1ad958 100644 --- a/src/modules/404/Shixunnopage.js +++ b/src/modules/404/Shixunnopage.js @@ -16,7 +16,7 @@ class http500 extends Component {
    {/*mt100 mb100*/} - +

    您可以稍后尝试 返回首页 diff --git a/src/modules/courses/competitions/Competitimain/CompetitionsIndex.js b/src/modules/courses/competitions/Competitimain/CompetitionsIndex.js index 5a341726..933824df 100644 --- a/src/modules/courses/competitions/Competitimain/CompetitionsIndex.js +++ b/src/modules/courses/competitions/Competitimain/CompetitionsIndex.js @@ -78,7 +78,7 @@ class CompetitionsIndex extends Component{ .courses-head{ width: 100%; height: 300px; - background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.competition_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.competition_banner_url)}); + background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.competition_banner_url === null ?`/images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.competition_banner_url)}); background-color: #081C4B; background-position: center; background-repeat: no-repeat; diff --git a/src/modules/courses/competitions/Competitioncommon/CompetitionCommon.js b/src/modules/courses/competitions/Competitioncommon/CompetitionCommon.js index b2ac34fe..b616dd2a 100755 --- a/src/modules/courses/competitions/Competitioncommon/CompetitionCommon.js +++ b/src/modules/courses/competitions/Competitioncommon/CompetitionCommon.js @@ -358,10 +358,10 @@ class CompetitionCommon extends Component{ data && data.permission.editable === true ? "" :

    即将发布 敬请期待
    : ""} + src={data.competition_status === "ended" ? getImageUrl(`/images/educoder/competitions/groups1.png`) : data.competition_status === "nearly_published" ? getImageUrl(`images/educoder/competitions/groups2.png`) : data.competition_status === "progressing" ? getImageUrl(`images/educoder/competitions/groups3.png`) : ""}/> + src={data === undefined ? getImageUrl(`/images/educoder/competitions/mainbanner.jpg`) : data.avatar_url === null ? getImageUrl(`/images/educoder/competitions/mainbanner.jpg`) : getImageUrl(data.avatar_url)}/> diff --git a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js index 594eb3c5..a9c75f44 100644 --- a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js +++ b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js @@ -249,11 +249,11 @@ class CompetitionContents extends Component{ cover={
  • - +
    - +

    {personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name}

    diff --git a/src/modules/courses/coursesHome/CoursesHome.js b/src/modules/courses/coursesHome/CoursesHome.js index 926b786a..a5bc4fdf 100644 --- a/src/modules/courses/coursesHome/CoursesHome.js +++ b/src/modules/courses/coursesHome/CoursesHome.js @@ -171,7 +171,7 @@ class CoursesHome extends Component { coursesHomelist={coursesHomelist}>} {coursesHomelist === undefined ? "" : coursesHomelist.courses.length === 0 ?
    - +

    暂时还没有相关数据哦！

    : ""} diff --git a/src/modules/courses/shixunHomework/Listofworksstudentone.js b/src/modules/courses/shixunHomework/Listofworksstudentone.js index 4285bdaa..db27bd29 100644 --- a/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -295,7 +295,7 @@ class Listofworksstudentone extends Component { 计算规则:
    学员离开实训学习界面停止计时；
    评测首次通过之后，停止计时
    - }>, + }>, dataIndex: 'cost_time', key: 'cost_time', align: 'center', @@ -381,7 +381,7 @@ class Listofworksstudentone extends Component { title:关卡得分 计算规则:
    截止前学员完成的关卡才有成绩
    - }>    , + }>, dataIndex: 'final_score', key: 'final_score', align: 'center', @@ -420,7 +420,7 @@ class Listofworksstudentone extends Component { 学生工作效率= log(实训总得分/实训总耗时)
    学生效率分 = 学生工作效率 / 课堂学生最高
    工作效率 * 分值
    - }>, + }>, dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', @@ -694,7 +694,7 @@ class Listofworksstudentone extends Component { 计算规则:
    学员离开实训学习界面停止计时；
    评测首次通过之后，停止计时
    - }>, + }>, dataIndex: 'cost_time', key: 'cost_time', align: 'center', @@ -780,7 +780,7 @@ class Listofworksstudentone extends Component { title:关卡得分 计算规则:
    截止前学员完成的关卡才有成绩
    - }>    , + }>, dataIndex: 'final_score', key: 'final_score', align: 'center', @@ -819,7 +819,7 @@ class Listofworksstudentone extends Component { 学生工作效率= log(实训总得分/实训总耗时)
    学生效率分 = 学生工作效率 / 课堂学生最高
    工作效率 * 分值
    - }>, + }>, dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', @@ -1050,7 +1050,7 @@ class Listofworksstudentone extends Component { 计算规则:
    学员离开实训学习界面停止计时；
    评测首次通过之后，停止计时
    - }>, + }>, dataIndex: 'cost_time', key: 'cost_time', align: 'center', @@ -1134,7 +1134,7 @@ class Listofworksstudentone extends Component { title:关卡得分 计算规则:
    截止前学员完成的关卡才有成绩
    - }>    , + }>, dataIndex: 'final_score', key: 'final_score', align: 'center', @@ -1167,7 +1167,7 @@ class Listofworksstudentone extends Component { 学生工作效率= log(实训总得分/实训总耗时)
    学生效率分 = 学生工作效率 / 课堂学生最高
    工作效率 * 分值
    - }>, + }>, dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', @@ -1210,7 +1210,7 @@ class Listofworksstudentone extends Component { title: 当前成绩 鼠标停留具体分值上可查
    看得分明细
    - }>    , + }>, dataIndex: 'work_score', key: 'work_score', align: 'center', @@ -1461,7 +1461,7 @@ class Listofworksstudentone extends Component { 计算规则:
    学员离开实训学习界面停止计时；
    评测首次通过之后，停止计时
    - }>, + }>, dataIndex: 'cost_time', key: 'cost_time', align: 'center', @@ -1524,7 +1524,7 @@ class Listofworksstudentone extends Component { title:关卡得分 计算规则:
    截止前学员完成的关卡才有成绩
    - }>    , + }>, dataIndex: 'final_score', key: 'final_score', align: 'center', @@ -1557,7 +1557,7 @@ class Listofworksstudentone extends Component { 学生工作效率= log(实训总得分/实训总耗时)
    学生效率分 = 学生工作效率 / 课堂学生最高
    工作效率 * 分值
    - }>, + }>, dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', @@ -1600,7 +1600,7 @@ class Listofworksstudentone extends Component { title: 当前成绩 鼠标停留具体分值上可查
    看得分明细
    - }>    , + }>, dataIndex: 'work_score', key: 'work_score', align: 'center', @@ -3898,7 +3898,7 @@ class Listofworksstudentone extends Component {
    - +

    {this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}

    @@ -4175,7 +4175,7 @@ class Listofworksstudentone extends Component {
    + src={getImageUrl("/images/educoder/nodata.png")}/>

    {this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}

    @@ -4409,7 +4409,7 @@ class Listofworksstudentone extends Component {
    + src={getImageUrl("/images/educoder/nodata.png")}/>

    {this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}

    diff --git a/src/modules/courses/shixunHomework/ShixunWorkReport.js b/src/modules/courses/shixunHomework/ShixunWorkReport.js index 89315973..37933013 100644 --- a/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -514,7 +514,7 @@ class ShixunWorkReport extends Component {
    diff --git a/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js index 7d3ec97e..634fa633 100644 --- a/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js +++ b/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js @@ -266,7 +266,7 @@ class ShixunWorkModal extends Component{