- {/*{*/}
- {/* isRender&& isRender === true?*/}
-
-
-
- );
- }
-}
-
-export default NewHeader;
-
-
-
-//
-
-
-
-{/*{*/}
-{/**/}
-{/**/}
-{/*/!*{this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count > 99 ? '99+'*!/*/}
-{/*/!*: this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count}*!/*/}
-{/**/}
-{/**/}
-{/*}*/}
-{/*{ this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count>0 &&*/}
-{/**/}
-{/**/}
-{/*/!*{this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count > 99 ? '99+'*!/*/}
-{/*/!*: this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count}*!/*/}
-{/**/}
-{/*}*/}
-{/*{ this.props.Headertop===undefined?"":user && this.props.Headertop.unread_message_count>0 &&*/}
-{/**/}
-{/**/}
-{/**/}
-{/*}*/}
-
-
-
-{/*
- 需求：消息数量
-
- {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
-
- ![高校智能化教学与实训平台]({getImageUrl("images/educoder/headNavLogo.png?1526520218")})
-
-
-
-
-
-
}
-
-
-
-
-
-
- {/*
- <%= link_to '登录', signin_path, :className => "mr5" %>
-
- <%= link_to '注册', user_join_path, :className => "ml5" %>
- */}
- { user===undefined?
-
- this.educoderlogin()} className="mr5 color-white">登录
-
- 注册
- :user.login===""?
- this.educoderlogin()} className="mr5 color-white">登录
-
- 注册
- :
- -
- {/*
- 首页 */} - - {/*
- 实训路径 */} -
- - 实训课程 - - {/*
- 课堂 */} -
- - {/*课堂*/} - 翻转课堂 - - -
-
- 开发社区
-
![]({getImageUrl("images/educoder/hot-h.png")})
-
-
-
- - 0 ? 'block' : 'none'}}>
- 职业路径
- 0 ? 'block' : 'none'}}> --
-
- {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
- return(
-
- {item.name} - ) - }) - } -
-
-
- - 竞赛 - -
- 问答 -
- 认证 -
-
- })
-
-
-
- }
- {/*href="https://www.educoder.net/login"*/}
- { user===undefined?"":user.login===""?"":-
- {user.username}
-
- 我的课堂 - {/* p 老师 l 学生 */} -
- 我的实训 -
- 我的实训课程 -
- 我的项目 -
- 账号管理 - {/*
- this.educoderlogin()} >登入测试接口 */} -
- this.trialapplications()} >试用申请 -
- - {/*退出*/} - {/*this.educoderlogin()}>退出*/} - this.educoderlogin()}>退出 - - -
- { loadHeader()}
-
- {/*"/images/educoder/icon/search.svg"
- })
*/}
-
-
-
-
- {/*
*/}
- */}
-
-
-
-
- {/*
-
-
-
-
-
-
-
-
-
-
- -
-
-
- - 加入课堂 - - - {Addcoursestypes===true?
- - 加入项目 - -
- - - - - -
-
-
-
-
- - -管理人员 -开发人员 -报告人员 -
-
- - - this.hidetojoinclass(1)}>取消 - this.submittojoinclass(1)}>确定 - - -
-
-
-
- -
-
请输入六位课堂邀请码
- -请至少选择一个身份
- -
- { user===undefined?"":user.login===""?"":
-
-
- {/*{this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count > 99 ? '99+'*/}
- {/*: this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count}*/}
-
-
- }
-
-
-
-
- 
-
-
-
-
- */}
+import React, { Component } from 'react';
+import { BrowserRouter as Router, Route, Link } from "react-router-dom";
+import { Redirect } from 'react-router';
+
+import PropTypes from 'prop-types';
+
+// import searchImg from '../../../../images/educoder/icon/search.svg'
+
+// /images/educoder/icon/search.svg
+
+import { getImageUrl, toPath } from 'educoder'
+
+import axios from 'axios';
+
+import { Modal,Checkbox ,Radio,Input,message } from 'antd';
+
+import Addcourses from '../courses/coursesPublic/Addcourses';
+
+import LoginDialog from '../login/LoginDialog';
+
+// import Trialapplication from '../login/Trialapplication'
+
+import 'antd/lib/modal/style/index.css';
+
+import 'antd/lib/checkbox/style/index.css';
+
+import 'antd/lib/radio/style/index.css';
+
+import 'antd/lib/input/style/index.css';
+
+import './TPMIndex.css'
+
+import { trigger, broadcastChannelPostMessage } from 'educoder';
+
+const $ = window.$
+// TODO 这部分脚本从公共脚本中直接调用
+
+const RadioGroup = Radio.Group;
+const Search = Input.Search;
+let old_url;
+function loadHeader(){
+ //头部导航条的----------显示搜索框
+ $("#search-open").on("click",function(e){
+ $(this).hide();
+ // $("#header-nav").animate({opacity:"0"},1000);
+ $(".posi-search").show() // animate({opacity:"1"},1000);
+ $("#header-nav").css("z-index","2");
+ $(".posi-search").css("z-index","3");
+ $(".HeaderSearch").show();
+ $(".HeaderSearch").val("");
+ $(".search-input").focus();
+ $(".search-all .search-content").hide();
+ e.stopPropagation();//阻止冒泡
+ });
+ $(".HeaderSearch").on("click",function(e){
+ e.stopPropagation();//阻止冒泡
+ });
+ //搜索框输入内容
+ $(".HeaderSearch").on("input",function(e){
+ if($(".HeaderSearch").val()==""){
+ $(".search-all .search-content").hide();
+ }else{
+ $(".search-all .search-content").show();
+ }
+ e.stopPropagation();//阻止冒泡
+ });
+ //搜索
+ // $("#header_keyword_search").on("click", header_search);
+ // $("input[name='search_keyword']").on("keydown", function(event){
+ // var code;
+ // if (!event) {
+ // event = window.event; //针对ie浏览器
+ // code = event.keyCode;
+ // }
+ // else {
+ // code = event.keyCode;
+ // }
+ // if(code == 13) {
+ // header_search();
+ // return false;
+ // }
+ // });
+ $(".search-clear").click(function(e){e.stopPropagation();});
+ //切换搜索条件
+ $("#searchkey li").click(function(e){
+ var key=$($(this).children("a")[0]).html();
+ switch (key){
+ case '实训':
+ $("#search_type").val('1');
+ break;
+ case '课堂':
+ $("#search_type").val('2');
+ break;
+ case '用户':
+ $("#search_type").val('3');
+ break;
+ }
+ $("#searchkey").siblings(".searchkey").html(key);
+ $("#searchkey").hide();
+ e.stopPropagation();//阻止冒泡
+ });
+ //切换选择导航条
+ $("#header-nav li").click(function(){
+ $("#header-nav li").removeClass("active");
+ $(this).addClass("active");
+ });
+ //点击页面其它（与搜索框无关的地方）都会将搜索框隐藏，所以与搜索框有关的地方需要阻止冒泡
+ $("body").on("click",function(){
+ closeSearch();
+ });
+
+ $(".search_history").on("click", function(){
+ $("input[name='search_keyword']").val($(this).html());
+ header_search();
+ });
+}
+
+function header_search(reactHeaderComponnet){
+ console.log(old_url)
+ var keyword = $("input[name='search_keyword']").val(); // 搜索关键字
+ if (!reactHeaderComponnet) {
+ reactHeaderComponnet = window._header_componentHandler
+ }
+ if (!reactHeaderComponnet) {
+ var index = $("#search_type").val(); // 搜索课程/项目
+ keyword = encodeURIComponent(keyword);
+ // $.get('/users/search_shixuns_or_course',
+ // { search: keyword,
+ // index: index});
+ window.location.href = old_url+"/users/search_shixuns_or_courses" + "?search=" + keyword + "&index=" + index;
+ //e.stopPropagation();//阻止冒泡
+ } else {
+ window.__headSearchKeyword = keyword
+ reactHeaderComponnet.props.history.push(`/shixuns`)
+ trigger('searchKeywordChange', keyword)
+ }
+}
+//头部导航条的隐藏
+function closeSearch(){
+ $('#posi-search').hide();
+ $("#search-open").show();
+ // $(".posi-search").animate({opacity:"0"},800);
+ $(".HeaderSearch").hide();
+ $("#header-nav").animate({opacity:"1"},1000);
+ $(".posi-search").css("z-index","2");
+ $("#header-nav").css("z-index","3");
+}
+
+/*
+ _logined_header.html.erb
+ _unlogin_header.html.erb
+*/
+window._header_componentHandler = null;
+class NewHeader extends Component {
+ constructor(props) {
+ super(props)
+ this.state={
+ Addcoursestypes:false,
+ tojoinitemtype:false,
+ tojoinclasstitle:undefined,
+ rolearr:["",""],
+ Checkboxteacherchecked:false,
+ Checkboxstudentchecked:false,
+ Checkboxteachingchecked:false,
+ Checkboxteachertype:false,
+ Checkboxteachingtype:false,
+ code_notice:false,
+ checked_notice:false,
+ RadioGroupvalue:undefined,
+ submitapplications:false,
+ isRender:false,
+ isRenders:false,
+ user:undefined,
+ }
+ }
+
+ componentDidMount() {
+ window._header_componentHandler = this;
+
+ loadHeader();
+
+ //下拉框的显示隐藏
+ var hoverTimeout;
+ var hoveredPanel;
+ $(".edu-menu-panel").hover(function(){
+ if (hoverTimeout) { // 一次只显示一个panel
+ if (hoveredPanel && hoveredPanel != this) {
+ $(hoveredPanel).find(".edu-menu-list").hide()
+ }
+ clearTimeout(hoverTimeout);
+ hoverTimeout = null;
+ }
+ hoveredPanel = this;
+ $(this).find(".edu-menu-list").show();
+ },function(){
+ var that =this;
+ // 延迟hide
+ hoverTimeout = setTimeout(function() {
+ $(that).find(".edu-menu-list").hide();
+ }, 800)
+
+ });
+
+
+
+ }
+
+
+ componentWillReceiveProps(newProps, oldProps) {
+ this.setState({
+ user:newProps.user
+ })
+ if(newProps.Headertop!=undefined){
+ old_url=newProps.Headertop.old_url
+ }
+
+ }
+ getCookie=(key)=>{
+ var arr,reg = RegExp('(^| )'+key+'=([^;]+)(;|$)');
+ if (arr = document.cookie.match(reg)) //["username=liuwei;", "", "liuwei", ";"]
+ return decodeURIComponent(arr[2]);
+ else
+ return null;
+ }
+
+ delCookie=(name)=>{
+ var exp = new Date();
+ exp.setTime(exp.getTime() - 1);
+ var cval=this.getCookie(name);
+ if(cval!=null){
+ document.cookie= name + "="+cval+";expires="+exp.toGMTString();
+ }
+ }
+ onLogout = () => {
+ const url = `/accounts/logout.json`
+ this.delCookie("autologin_trustie")
+ axios.get(url, {
+ })
+ .then((response) => {
+ if(response.data.status===1){
+ this.setState({
+ user:undefined
+ })
+ // let path="/";
+ // this.props.history.push(path);
+ broadcastChannelPostMessage('refreshPage')
+ window.location.href ="/login"
+ message.success('退出成功');
+ }
+ });
+ }
+
+ tojoinclass=()=>{
+ this.setState({
+ Addcoursestypes:true,
+ })
+ }
+
+ tojoinitem=()=>{
+ this.setState({
+ tojoinitemtype:true
+ })
+ }
+
+
+ submitstatevalue=(sum,value,data)=>{
+ this.setState({
+ Addcoursestypes:false,
+ tojoinitemtype:false,
+ tojoinclasstitle:undefined,
+ rolearr:["",""],
+ Checkboxteacherchecked:false,
+ Checkboxstudentchecked:false,
+ Checkboxteachingchecked:false,
+ Checkboxteachertype:false,
+ Checkboxteachingtype:false,
+ code_notice:false,
+ checked_notice:false,
+ submitapplicationssum:sum,
+ submitapplications:true,
+ submitapplicationsvalue:value,
+ submitapplicationsvaluedata:data,
+ RadioGroupvalue:undefined
+ })
+ }
+
+ onChangeRadioGroup = (e) => {
+ this.setState({
+ RadioGroupvalue: e.target.value,
+ });
+ }
+
+ submitsubmitapplications=()=>{
+ let {
+ submitapplicationssum,
+ submitapplicationsvaluedata
+ }=this.state;
+ this.setState({
+ submitapplications:false,
+ RadioGroupvalue:undefined
+ })
+ if(submitapplicationssum===0){
+ if(submitapplicationsvaluedata!=undefined){
+ window.location.href = "https://www.educoder.net/courses/"+submitapplicationsvaluedata;
+ }
+ }else if(submitapplicationssum===1){
+ if(submitapplicationsvaluedata!=undefined){
+ window.location.href = "https://www.educoder.net/projects/"+submitapplicationsvaluedata;
+ }
+ }
+ }
+
+ hidesubmitapplications=()=>{
+ this.setState({
+ Addcoursestypes:false,
+ tojoinitemtype:false,
+ tojoinclasstitle:undefined,
+ rolearr:["",""],
+ Checkboxteacherchecked:false,
+ Checkboxstudentchecked:false,
+ Checkboxteachingchecked:false,
+ Checkboxteachertype:false,
+ Checkboxteachingtype:false,
+ code_notice:false,
+ checked_notice:false,
+ submitapplications:false,
+ RadioGroupvalue:undefined
+ })
+ }
+ educoderlogin=()=>{
+ //登出账号
+ var url = `/accounts/logout.json`;
+
+ axios.get((url)).then((result) => {
+ if(result!==undefined){
+ this.setState({
+ isRender:true
+ })
+ }
+ }).catch((error) => {
+ console.log(error);
+ })
+ }
+
+ onKeywordSearch = () => {
+ header_search(this)
+ }
+ onKeywordSearchKeyDown = (e) => {
+ let code = e.keyCode;
+
+ if(code == 13) {
+ header_search(this);
+ return false;
+ }
+ }
+
+ hideAddcoursestypes=()=>{
+
+ this.setState({
+ Addcoursestypes:false
+ })
+
+ }
+
+
+ hidetojoinclass=()=>{
+ this.setState({
+ tojoinclasstype:false,
+ tojoinitemtype:false,
+ tojoinclasstitle:undefined,
+ rolearr:["",""],
+ Checkboxteacherchecked:false,
+ Checkboxstudentchecked:false,
+ Checkboxteachingchecked:false,
+ Checkboxteachertype:false,
+ Checkboxteachingtype:false,
+ code_notice:false,
+ checked_notice:false,
+ RadioGroupvalue:undefined
+ })
+ }
+
+submittojoinclass=(value)=>{
+ let {tojoinclasstitle,rolearr,RadioGroupvalue}=this.state;
+
+ if(tojoinclasstitle===undefined){
+ this.setState({
+ code_notice:true
+ })
+ return
+ }
+ let newrolearr=rolearr;
+ if(value===1){
+ if(tojoinclasstitle.length<6){
+ this.setState({
+ code_notice:true
+ })
+ return
+ }
+ }else if(value===0){
+ if(tojoinclasstitle.length<5){
+ this.setState({
+ code_notice:true
+ })
+ return
+ }
+ }
+ if(tojoinclasstitle===""||tojoinclasstitle===undefined){
+ this.setState({
+ code_notice:true
+ })
+ return
+ }else{
+ this.setState({
+ code_notice:false
+ })
+ }
+
+ let pamst=[];
+ let num=0;
+ for(var i = 0 ; i
-
-
-
-
+ {/*{*/}
+ {/* isRender&& isRender === true?*/}
+
+
+
+ );
+ }
+}
+
+export default NewHeader;
+
+
+
+//
+
+
+
+{/*{*/}
+{/**/}
+{/**/}
+{/*/!*{this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count > 99 ? '99+'*!/*/}
+{/*/!*: this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count}*!/*/}
+{/**/}
+{/**/}
+{/*}*/}
+{/*{ this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count>0 &&*/}
+{/**/}
+{/**/}
+{/*/!*{this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count > 99 ? '99+'*!/*/}
+{/*/!*: this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count}*!/*/}
+{/**/}
+{/*}*/}
+{/*{ this.props.Headertop===undefined?"":user && this.props.Headertop.unread_message_count>0 &&*/}
+{/**/}
+{/**/}
+{/**/}
+{/*}*/}
+
+
+
+{/*
+ 需求：消息数量
+
+ {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
+
+
+
+
+
+
+
+
}
+
+
+
+
+
+
+ {/*
+ <%= link_to '登录', signin_path, :className => "mr5" %>
+
+ <%= link_to '注册', user_join_path, :className => "ml5" %>
+ */}
+ { user===undefined?
+
+ this.educoderlogin()} className="mr5 color-white">登录
+
+ 注册
+ :user.login===""?
+ this.educoderlogin()} className="mr5 color-white">登录
+
+ 注册
+ :
+ -
+ {/*
- 首页 */} + + {/*
- 实训路径 */} +
- + 实训课程 + + {/*
- 课堂 */} +
- + {/*课堂*/} + 翻转课堂 + + +
-
+ 开发社区
+
+
+
+
+
- 0 ? 'block' : 'none'}}>
+ 职业路径
+ 0 ? 'block' : 'none'}}> ++
-
+ {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
+ return(
+
- {item.name} + ) + }) + } +
+
+
+ - 竞赛 + +
- 问答 +
- 认证 +
+
+
+
+
+
+ }
+ {/*href="https://www.educoder.net/login"*/}
+ { user===undefined?"":user.login===""?"":-
+ {user.username}
+
- 我的课堂 + {/* p 老师 l 学生 */} +
- 我的实训 +
- 我的实训课程 +
- 我的项目 +
- 账号管理 + {/*
- this.educoderlogin()} >登入测试接口 */} + {/*
- this.trialapplications()} >试用申请 */} +
- + {/*退出*/} + {/*this.educoderlogin()}>退出*/} + this.educoderlogin()}>退出 + + +
+ { loadHeader()}
+
+ {/*"/images/educoder/icon/search.svg"
+ */}
+
+
+
+
+ {/*
*/}
+ */}
+
+
+
+
+ {/*
+
+
+
+
+
+
+
+
+
+
+ -
+
+
- + 加入课堂 + + + {Addcoursestypes===true?
- + 加入项目 + +
- + + + + +
-
+
+
+
+ + +管理人员 +开发人员 +报告人员 +
+
+ - + this.hidetojoinclass(1)}>取消 + this.submittojoinclass(1)}>确定 + + +
+
+
+
+ -
+
请输入六位课堂邀请码
+ +请至少选择一个身份
+ +
+ { user===undefined?"":user.login===""?"":
+
+
+ {/*{this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count > 99 ? '99+'*/}
+ {/*: this.props.Headertop===undefined?"":this.props.Headertop.unread_message_count}*/}
+
+
+ }
+
+
+
+
+
+
+
+
+
+ */}
From 3c40720339f36cbc77e05db8018aba3d8338b391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 21 Jun 2019 10:09:33 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../graduation/tasks/GraduationTasksedit.js | 2 +-
.../tasks/GraduationTaskssettinglist.js | 27 +++++++++----------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 36c2f9d3f..9874b26fa 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -125,7 +125,7 @@ class GraduationTasksedit extends Component{
GraduationTasksedittype=false;
// window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions";
// this.goback()
- this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting");
+ window.location.href="/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting";
}
}).catch((error) => {
console.log(error)
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 39068e1e3..ecfd21257 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -730,7 +730,7 @@ class GraduationTaskssettinglist extends Component{
其它历史评分将全部失效:""}>
{tag.name==="评阅"?tag.status===0?"--":
- {tag.name}
+ tag.name
:
{
return(
+
+
+
+
- {tag.status===0?"":"查看"}
+ {tag.status===0?"--":查看}
)}
):""
@@ -863,7 +863,7 @@ class GraduationTaskssettinglist extends Component{
其它历史评分将全部失效:""}>
{tag.name==="评阅"?tag.status===0?"--":
- {tag.name}
+ tag.name
:
{
return(
-
- {tag.status===0?"":"查看"}
-
-
+ {tag.status===0?"--":
+ 查看
+ }
)}
):""
@@ -1013,7 +1012,7 @@ class GraduationTaskssettinglist extends Component{
其它历史评分将全部失效:""}> {tag.name==="评阅"?tag.status===0?"--": - {tag.name} + tag.name
-
- {tag.status===0?"":"查看"}
-
+ {tag.status===0?"--":
+ 查看
+ }
)}
):""
@@ -1146,7 +1145,7 @@ class GraduationTaskssettinglist extends Component{
其它历史评分将全部失效:""}> {tag.name==="评阅"?tag.status===0?"--": - {tag.name} + tag.name : { return(
-
- {tag.status===0?"":"查看"}
+ {tag.status===0?"--":
+ 查看}
)}
):""
From 86a20e86803fce6131d1ce664a78f395a3257341 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 21 Jun 2019 10:09:35 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../graduation/topics/GraduateTopicDetail.js | 46 +++++++++++++------
.../topics/GraduateTopicDetailInfo.js | 7 ++-
.../topics/GraduateTopicDetailTable.js | 2 +-
.../graduation/topics/GraduateTopicItem.js | 14 +++---
.../graduation/topics/GraduateTopicNew.js | 43 +++++++++++++++--
.../courses/graduation/topics/index.js | 18 +++++++-
.../courses/poll/PollDetailTabFirst.js | 2 +-
.../src/modules/courses/poll/PollListItem.js | 29 +++++-------
.../modules/tpm/challengesnew/TPMMDEditor.js | 2 +-
.../react/src/modules/user/usersInfo/Infos.js | 2 +-
.../src/modules/user/usersInfo/InfosCourse.js | 17 ++++---
.../src/modules/user/usersInfo/InfosPath.js | 8 ++--
.../modules/user/usersInfo/InfosProject.js | 17 ++++---
.../src/modules/user/usersInfo/InfosShixun.js | 8 ++--
14 files changed, 143 insertions(+), 72 deletions(-)
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
index e0eb07d56..27c27c64a 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
@@ -67,25 +67,35 @@ class GraduateTopicDetail extends Component{
let course_id=this.props.match.params.course_id;
let {tableData}=this.state;
- let url="/courses/"+course_id+"/graduation_topics/"+graduation_topic_id+"/"
- if(tableData.user_selected_topic){
- url+="student_cancel_topic.json"
- }else{
- 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}`);
+ 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);
+ })
}
- }).catch((error)=>{
- console.log(error);
})
}
render(){
- let {tableData,tablePage,tablePageSize,tab}=this.state
+ 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();
@@ -113,8 +123,14 @@ class GraduateTopicDetail extends Component{
+
- {parseInt(key)*parseInt(page*15)+1}
+ {parseInt(key+1)+(parseInt(page-1)*15)}
{item.student_name}
{item.student_id}
{item.class_group_name || "--"}
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
index 136280943..17a1b070e 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
@@ -96,26 +96,26 @@ class GraduateTopicItem extends Component{
-
{
topicInfo && topicInfo.description!="" &&
-
+
}
{
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
index 7dbbf21f7..963c7a4f9 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
@@ -254,7 +254,7 @@ class GraduateTopicDetailTable extends Component{
tableData.users_list && tableData.users_list.length > 0 && tableData.users_list.map((item,key)=>{
return(
-
+
{
item.polls_status !=1 &&
-
+
{item.poll_answer} 已答
{item.poll_unanswer} 未答
}
{
item.polls_status ==1 && item.publish_time ==null && item.created_at &&
- 创建于{moment(item.created_at).format(dataformat)}
+ 创建于{moment(item.created_at).format(dataformat)}
}
{
item.polls_status ==1 && item.publish_time !=null &&
- 将发布于{moment(item.publish_time).format(dataformat)}
+ 将发布于{moment(item.publish_time).format(dataformat)}
}
{
item.polls_status ==2 && item.publish_time !=null &&
+
)
diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
index 30fa1c803..4af26d698 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
@@ -300,7 +300,7 @@ export default class TPMMDEditor extends Component {
-
- }
+ }
+
-
-
-
+
-
+ 实训
实训课程
项目
- { isAdmin && 题库 }
+ { data && data.identity !="学生" && this.ToBank(`/`)}>题库 }
diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js
index 1a6b78542..b864dff63 100644
--- a/public/react/src/modules/user/usersInfo/InfosCourse.js
+++ b/public/react/src/modules/user/usersInfo/InfosCourse.js
@@ -41,7 +41,7 @@ class InfosCourse extends Component{
category,
status,
page,
- per_page:category && page ==1?17:16
+ per_page: this.props.is_current && category && page ==1?17:16
}}).then((result)=>{
if(result){
this.setState({
@@ -111,18 +111,21 @@ class InfosCourse extends Component{
{noStorage == true ? '' : }
{noStorage == true ? '' : }
diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js
index 0f608426c..8d77a1b29 100644
--- a/public/react/src/modules/user/usersInfo/Infos.js
+++ b/public/react/src/modules/user/usersInfo/Infos.js
@@ -268,7 +268,7 @@ class Infos extends Component{
共参与{totalCount}个{category?category=="manage"?"发布":"学习":"课堂"} 时间最新
{
- !isStudent && page == 1 && !category &&
+ !isStudent && page == 1 && !category && is_current &&
this.changeCategory("study")}>{is_current ? "我":"TA"}学习的
{
- category && category == "manage" &&
+ category && category == "manage" && is_current &&
{
- isStudent ==false && page == 1 && !category &&
+ !isStudent && page == 1 && !category && is_current &&
this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的
this.changeCategory("study")}>{is_current ? "我":"TA"}学习的
-
+ {
+ is_current &&
+
+ }
共参与{totalCount}个{category?category=="manage"?"发布":"学习":"项目"} 时间最新
{
- !isStudent && page == 1 && !category &&
+ !isStudent && page == 1 && !category && is_current &&
this.changeCategory("study")}>{is_current ? "我":"TA"}学习的
{
- category && category == "manage" &&
+ category && category == "manage" && is_current &&
{
- isStudent ==false && page == 1 && !category &&
+ !isStudent && page == 1 && !category && is_current &&
导出
:""}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index ecfd21257..29aa95385 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -1322,7 +1322,7 @@ class GraduationTaskssettinglist extends Component{
{this.props.isAdmin()?
导出
:""}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
index f373af827..5732c03f1 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
@@ -308,7 +308,7 @@ class GraduationTasksquestions extends Component{
{this.props.isAdmin()?
导出
:""}
diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js
index d7d6852f2..efe15eccd 100644
--- a/public/react/src/modules/courses/graduation/topics/index.js
+++ b/public/react/src/modules/courses/graduation/topics/index.js
@@ -337,7 +337,7 @@ onBoardsNew=()=>{
{/* 参考普通作业 - 题库选用 */}
{/* this.useFromBank()}>题库选用 正式版没有，先隐藏*/}
this.onBoardsNew()}>新建
):""
}
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index d346486d4..e38a0c453 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1116,7 +1116,7 @@ class Listofworks extends Component {
>设置
{this.props.isAdmin() ? 导出 : ""}
{this.props.isAdmin() ?
teacherdata && teacherdata.end_immediately === true ?
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 3fbdb2d3b..461c4d74d 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -590,7 +590,7 @@ class ShixunStudentWork extends Component {
>设置
{this.props.isAdmin() ? 导出 : ""}
{this.props.isAdmin()?
data.end_immediately===true?
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 70a92aae6..919a744cf 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1592,7 +1592,7 @@ class Trainingjobsetting extends Component {
{/**/}
{this.props.isAdmin() ? 导出 : ""}
{this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.end_immediately===true?
立即截止 : "": ""}
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index 419bca1b5..a06a5be32 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -411,7 +411,7 @@ class Workquestionandanswer extends Component {
{/*导出成绩*/}
{this.props.isAdmin() ? 导出 : ""}
{this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.end_immediately===true?
立即截止:"" : ""}
From 83937f4304e3ea505cdeb3561bc0603eb29b4d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 21 Jun 2019 10:38:37 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tasks/GraduationTaskssetting.js | 58 +++++++++++--------
.../tasks/GraduationTaskssettinglist.js | 2 +-
.../tasks/GraduationTaskssettingquestions.js | 2 +-
3 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index d19225743..c74f8a1d7 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -140,9 +140,11 @@ class GraduationTaskssettingapp extends Component{
componentDidMount(){
-
+ let query=this.props.location.search
+ const type = query.split('?tab=');
+ let id=parseInt(type[1])
this.getsettings();
- if(this.props.isAdmin()===true){
+ if(this.props.isAdmin()===true&&isNaN(id)){
this.editSetting()
}
}
@@ -484,6 +486,31 @@ class GraduationTaskssettingapp extends Component{
let {latepenalty,hascommit,minnums,max_nums,publish_time,end_time,crosscomment,latetime,starttimetype}=this.state;
+
+ if(isNaN(parseInt(this.state.minnum))){
+ this.setState({
+ numtype:true
+ })
+ this.scrollToAnchor("publishtimestart");
+ return
+ }else{
+ this.setState({
+ numtype:false
+ })
+ }
+ if(isNaN(parseInt(this.state.maxnum))){
+ this.setState({
+ numtype:true
+ })
+ this.scrollToAnchor("publishtimestart");
+ return
+ }else{
+ this.setState({
+ numtype:false
+ })
+ }
+
+
if(latepenalty===undefined){
this.setState({
latepenaltytype:true,
@@ -611,26 +638,7 @@ class GraduationTaskssettingapp extends Component{
return
}
- if(isNaN(parseInt(this.state.minnum))){
- this.setState({
- numtype:true
- })
- return
- }else{
- this.setState({
- numtype:false
- })
- }
- if(isNaN(parseInt(this.state.maxnum))){
- this.setState({
- numtype:true
- })
- return
- }else{
- this.setState({
- numtype:false
- })
- }
+
@@ -1036,7 +1044,7 @@ class GraduationTaskssettingapp extends Component{
任务问答
设置
+ to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting?tab=3"}>设置
{/*导出*/}
-
-
-
-
+
+
+
+
+
+
+
+ }
+
+
+
+ )
+
+
+ }
}
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 3ef02578a..25d290fac 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -18,7 +18,7 @@ import Addcourses from '../courses/coursesPublic/Addcourses';
import LoginDialog from '../login/LoginDialog';
-// import Trialapplication from '../login/Trialapplication'
+import Trialapplication from '../login/Trialapplication'
import 'antd/lib/modal/style/index.css';
@@ -170,6 +170,7 @@ class NewHeader extends Component {
submitapplications:false,
isRender:false,
isRenders:false,
+ showTrial:false,
user:undefined,
}
}
@@ -512,12 +513,17 @@ submittojoinclass=(value)=>{
}
// trialapplications =()=>{
+ // console.log("点击了")
// this.setState({
// isRenders: true,
+ // showTrial:true,
// })
// }
-
+ // 关闭
+ cancelModulationModels = () => {
+ this.setState({isRenders: false})
+ }
render() {
const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
@@ -538,6 +544,7 @@ submittojoinclass=(value)=>{
submitapplicationsvalue,
user,
isRender,
+ isRenders,
}=this.state;
/*
用户名称 用户头像url
@@ -574,11 +581,13 @@ submittojoinclass=(value)=>{
/>
{/* :""*/}
{/*}*/}
+
- {/*提示*/}
-
-
-
-
- )
- }
-}
+import React,{ Component } from "react";
+import { Modal,Checkbox,Upload,Button,Icon,message,Input,Radio} from "antd";
+import axios from 'axios';
+import Modals from '../../modals/Modals';
+const RadioGroup = Radio.Group;
+const Search = Input.Search;
+
+class Associationmodel extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ group_ids:[],
+ fileList:[],
+ Modalstype:false,
+ Modalstopval:"",
+ ModalCancel:"",
+ ModalSave:"",
+ loadtype:false,
+ search:undefined,
+ page:1,
+ limit:"",
+ projects:undefined,
+ projectvalue:undefined,
+ projectvaluetype:false,
+ }
+ }
+
+
+ componentDidMount() {
+ this.searchValue();
+ }
+
+ searchValue=()=>{
+ let {search}=this.state;
+ let url="/users/search_user_projects.json";
+ axios.get(url, {
+ params: {
+ search: search
+ }
+ }).then((result)=>{
+ console.log(result)
+ if(result.status===200){
+ this.setState({
+ projects:result.data.projects
+ })
+ }
+
+ }).catch((error)=>{
+ console.log(error)
+ })
+ }
+
+ inputSearchValue=(e)=>{
+ this.setState({
+ search:e.target.value
+ })
+ }
+
+
+ goback=()=>{
+ this.props.funlist()
+ this.props.Cancel()
+ console.log(this.props)
+ this.setState({
+ Modalstype:false,
+
+ })
+ }
+
+
+ setSaves=()=>{
+ let {projectvalue}=this.state;
+ let taskid=this.props.taskid;
+ let url="/graduation_tasks/"+taskid+"/graduation_works/relate_project.json";
+
+ axios.post(url, {
+ project_id: projectvalue
+ }).then((result)=>{
+
+ if(result.status===200){
+ if(result.data.status===0){
+
+ this.setState({
+ Modalstype:true,
+ Modalstopval:result.data.message,
+ ModalSave:this.goback,
+ loadtype:true
+ })
+ this.props.funlist()
+ }
+
+ }
+
+ }).catch((error)=>{
+ console.log(error)
+ })
+ }
+ Saves=()=>{
+ let {projectvalue}=this.state;
+ if(projectvalue===undefined||projectvalue===""){
+ this.setState({
+ projectvaluetype:true,
+ })
+ }else{
+ this.setState({
+ projectvaluetype:false,
+ })
+ }
+ let taskid=this.props.taskid;
+ console.log(this.props)
+ let url="/graduation_tasks/"+taskid+"/graduation_works/check_project.json";
+ axios.get(url, {
+ params: {
+ project_id: projectvalue
+ }
+ }).then((result)=>{
+
+ if(result.status===200){
+
+ if(result.data.is_relate===false){
+
+ this.setSaves()
+
+ }else{
+
+ this.setState({
+ Modalstype:true,
+ Modalstopval:"该项目已被"+result.data.relate_user+"关联",
+ ModalSave:this.ModalSave,
+ loadtype:true
+ })
+
+ }
+
+ }
+
+ }).catch((error)=>{
+ console.log(error)
+ })
+ }
+
+ onChange = (e) => {
+
+ this.setState({
+ projectvalue: e.target.value,
+ });
+
+ }
+
+ ModalSave=()=>{
+ this.setState({
+ Modalstype:false
+ })
+ }
+
+ render(){
+ let {
+ Modalstype,
+ Modalstopval,
+ ModalCancel,
+ ModalSave,
+ loadtype,
+ search,
+ projects,
+ projectvalue,
+ projectvaluetype
+ }=this.state;
+
+
+
+ return(
+
+ {/*提示*/}
+
+
+
+
+ )
+ }
+}
export default Associationmodel;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/exercise/Exercise.js b/public/react/src/modules/courses/exercise/Exercise.js
index 608bdf166..a6791fb54 100644
--- a/public/react/src/modules/courses/exercise/Exercise.js
+++ b/public/react/src/modules/courses/exercise/Exercise.js
@@ -213,7 +213,7 @@ class Exercise extends Component{
Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布",
- starttime:"发布时间："+this.props.getNowFormatDates(1),
+ starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:this.props.getNowFormatDates(1),
endtime:"截止时间："+this.props.getNowFormatDates(2),
Cancelname:"暂不发布",
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index 942fa96ca..4d6c6777b 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -65,6 +65,7 @@ class GraduateTaskItem extends Component{
cardsModalsavetype:this.cannerassocition,
loadtype:true
})
+ this.props.funlist()
}
}).catch((error)=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index c74f8a1d7..dfa6879f5 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -415,7 +415,7 @@ class GraduationTaskssettingapp extends Component{
Topval:"发布设置均可修改",
Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效",
- starttime:moment(moment(handleDateString(this.props.getNowFormatDates(1)))).format("YYYY-MM-DD HH:mm") ,
+ starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1),
typs:"start",
endtime:endtime,
@@ -1164,7 +1164,7 @@ class GraduationTaskssettingapp extends Component{
截止时间：
-
+
指导老师手动分配 （由指导老师在作品列表中，手动选择每个作品被分配的评阅老师）
- 答辩组间老师互评 （由系统按照设置在答辩组之间自动分配:
- 答辩组设置
+ 答辩组间老师互评 （由系统按照设置在答辩组之间自动分配:
+
+ 答辩组设置
+
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 7ef1f99c5..019b739c9 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -332,7 +332,7 @@ class GraduationTaskssettinglist extends Component{
Topval:"发布设置均可修改",
Botvalleft:"点击修改",
Botval:"此设置将对所有分班生效",
- starttime:moment(new Date()).format('YYYY-MM-DD 00:00'),
+ starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
starttimes:this.props.getNowFormatDates(1),
typs:"start",
endtime:endtime,
@@ -544,6 +544,7 @@ class GraduationTaskssettinglist extends Component{
axios.get(url).then((result)=>{
if(result.data.status===0){
+ this.searchValue()
this.setState({
Modalstype:true,
Modalstopval:result.data.message,
@@ -730,7 +731,7 @@ class GraduationTaskssettinglist extends Component{
其它历史评分将全部失效:""}>
{tag.name==="评阅"?tag.status===0?"--":
- tag.name
+ {tag.name}
:
:""}>
{tag.name==="评阅"?tag.status===0?"--":
- tag.name
+ {tag.name}
:
调整学生最终成绩
其它历史评分将全部失效:""}> {tag.name==="评阅"?tag.status===0?"--": - tag.name + {tag.name} + : this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""} @@ -1145,7 +1147,7 @@ class GraduationTaskssettinglist extends Component{调整学生最终成绩
其它历史评分将全部失效:""}> {tag.name==="评阅"?tag.status===0?"--": - tag.name + {tag.name} : :""} {taskslistdata&&taskslistdata? @@ -1551,7 +1554,7 @@ class GraduationTaskssettinglist extends Component{ to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting"}>设置 - {taskslistdata.work_status===undefined?"":taskslistdata.work_status.map((item,key)=>{ + {taskslistdata.work_status===undefined||taskslistdata.work_status===null||taskslistdata.work_status.length===0?"":taskslistdata.work_status.map((item,key)=>{ return( {item==="提交作品"?提交作品:""} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js index 80055f5d3..997085d13 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js @@ -81,7 +81,7 @@ class GraduationTasksquestions extends Component{ Topval:"发布设置均可修改", Botvalleft:"点击修改", Botval:"此设置将对所有分班生效", - starttime:moment(new Date()).format('YYYY-MM-DD 00:00'), + starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") , starttimes:this.props.getNowFormatDates(1), typs:"start", endtime:endtime, diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js index fa86da93d..f2fc3845e 100644 --- a/public/react/src/modules/courses/graduation/tasks/index.js +++ b/public/react/src/modules/courses/graduation/tasks/index.js @@ -413,7 +413,7 @@ class GraduationTasks extends Component{ Topval:"本操作只对“未发布”的对象生效", Botvalleft:"暂不发布", Botval:"则通过后续手动设置，定时发布", - starttime:"发布时间："+starttime, + starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttimes:this.props.getNowFormatDates(1), typs:"start", endtime:"截止时间："+endtime, diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js index 2d0aedd7a..aa01bcf47 100644 --- a/public/react/src/modules/courses/poll/Poll.js +++ b/public/react/src/modules/courses/poll/Poll.js @@ -1,621 +1,621 @@ -import React,{ Component } from "react"; -import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip ,Spin} from "antd"; -import CourseLayoutcomponent from '../common/CourseLayoutComponent'; -import HomeworkModal from "../coursesPublic/HomeworkModal"; -import ShixunModal from "../coursesPublic/ShixunModal"; -import PathModal from "../coursesPublic/PathModal"; -import AddcoursesNav from "../coursesPublic/AddcoursesNav"; -import ImmediatelyPublish from './pollPublicBtn/ImmediatelyPublish' -import ImmediatelyEnd from './pollPublicBtn/ImmediatelyEnd' -import PollListItem from './PollListItem' -import NoneData from '../coursesPublic/NoneData' -import UseBank from '../busyWork/UseBank' - -import _ from 'lodash'; - -import '../css/members.css' -import '../css/busyWork.css' - - -import { WordsBtn } from 'educoder' -import Modals from '../../modals/Modals' - -import axios from 'axios' - -const Search = Input.Search; - - -class Poll extends Component{ - constructor(props){ - super(props); - this.state={ - modalname:undefined, - modaltype:undefined, - visible:false, - Topval:undefined, - Topvalright:undefined, - Botvalleft:undefined, - Botval:undefined, - starttime:undefined, - endtime:undefined, - Cancelname:undefined, - Savesname:undefined, - Cancel:undefined, - Saves:undefined, - StudentList_value:undefined, - addname:undefined, - addnametype:false, - addnametab:undefined, - addcanner:undefined, - addsave:undefined, - course_groups:[], - chooseId:undefined, - // 列表相关 - checkBoxValues:[], - checkAllValue:false, - pollsList:undefined, - course_types:undefined, - page:1, - pageSize:15, - type:0, - polls_counts:undefined, - - //公用提示弹框相关 - modalsType:false, - modalsTopval:"", - modalsBottomval:"", - loadtype:false, - boxType:"delete", - isSpin:false - } - - } - - inputStudent=(e)=>{ - this.setState({ - StudentList_value:e.target.value - }) - } - - - // 题库选用 - selectBlank=(type)=>{ - if(type===2){ - this.setState({ - addname:"添加目录", - addnametype:true, - addnametab:type, - addcanner:this.homeworkhide, - addsave:undefined - }) - }else if(type===4){ - this.setState({ - addname:"移动到目录", - addnametype:true, - addnametab:type, - addcanner:this.homeworkhide, - addsave:undefined - }) - } - - } - // 切换菜单选项 - changeType=(e)=>{ - this.setState({ - type:e.key, - checkBoxValues:[], - checkAllValue:false - }) - let{StudentList_value,page}=this.state; - this.InitList(e.key,StudentList_value,page); - } - // 获取列表数据 - InitList=(type,search,page)=>{ - this.setState({ - isSpin:true - }) - let {pageSize}=this.state - let coursesId=this.props.match.params.coursesId; - let url='/courses/'+coursesId+'/polls.json?limit='+pageSize+'&page='+page - if(type!="0"){ - url+="&type="+type - } - if(search!=""&&search!=undefined){ - url+="&search="+search - } - axios.get(url).then((result)=>{ - if(result){ - this.setState({ - pollsList:result.data.polls, - course_types:result.data.course_types, - polls_counts:result.data.polls_counts, - isSpin:false, - checkBoxValues:[] - }) - } - }).catch((error)=>{ - console.log(error); - }) - } - // 加载列表 - componentDidMount(){ - this.setState({ - isSpin:true - }) - let{type,StudentList_value,page}=this.state - this.InitList(type,StudentList_value,page); - } - //切换分页 - changePage=(pageNumber)=>{ - - this.setState({ - page:pageNumber - }) - let{type,StudentList_value}=this.state - this.InitList(type,StudentList_value,pageNumber); - } - // 搜索 - searchInfo=()=>{ - this.setState({ - page:1 - }) - let{type,StudentList_value}=this.state; - this.InitList(type,StudentList_value,1) - } - // checkbox - onItemClick = (item) => { - const checkBoxValues = this.state.checkBoxValues.slice(0); - const index = checkBoxValues.indexOf(item.id); - if (index != -1) { - _.remove(checkBoxValues, (listItem)=> listItem === item.id) - } else { - checkBoxValues.push(item.id); - } - this.onCheckBoxChange(checkBoxValues) - } - // 全选or反选 - onCheckAll = (e) => { - this.setState({ - checkAllValue: e.target.checked - }) - const values = this.state.pollsList.map(item => { - return item.id - }) - if (e.target.checked) { - const concated = this.state.checkBoxValues.concat(values); - const uniq=_.uniq(concated) - this.setState({ - checkBoxValues: uniq - }) - } else { - this.setState({ - checkBoxValues: _.difference(this.state.checkBoxValues, values) - }) - } - } - - onCheckBoxChange = (checkedValues) => { - this.setState({ - checkBoxValues: checkedValues, - checkAllValue: checkedValues.length == this.state.pollsList.length - }) - } - - //删除或者设为公开 - ActionPoll=(value)=>{ - let CourseId=this.props.match.params.coursesId; - //判断是否有选中数据 - if(this.state.checkBoxValues.length==0){ - this.props.showNotification("请先在列表中选择数据"); - // this.setState({ - // modalsType:true, - // modalsTopval:"请先在列表中选择数据", - // modalsBottomval:'', - // loadtype:true - // }) - }else{ - if(value != "bank"){ - this.setState({ - modalsType:true, - modalsTopval:value=="delete"?"已提交作品将全部被删除，不可恢复":"公开后非课堂成员也可以访问查看", - modalsBottomval:value=="delete"?"您确定要删除吗？":"是否确认公开？", - loadtype:false, - boxType:value - }) - }else{ - //加入题库 - let url=`/courses/${CourseId}/polls/join_poll_banks.json`; - axios.post((url), { - check_ids: this.state.checkBoxValues - }) - .then((result)=>{ - if(result){ - this.props.showNotification(`${result.data.message}`); - this.setState({ - modalsType:false, - modalsTopval:"", - modalsBottomval:"", - loadtype:false, - checkBoxValues:[], - checkAllValue:false - }) - let{type,StudentList_value}=this.state - this.InitList(type,StudentList_value,1); - } - }).catch((error)=>{ - console.log(error); - }) - } - } - } - //取消删除或者设为公开 - modalCancel=()=>{ - this.setState({ - modalsType:false, - modalsTopval:"", - modalsBottomval:"", - loadtype:false - }) - } - //确定删除或者设为公开 - ModalAction=()=>{ - let CourseId=this.props.match.params.coursesId; - if(this.state.checkBoxValues.length==0){ - this.setState({ - modalsType:false, - modalsTopval:"", - loadtype:false, - checkBoxValues:[] - }) - }else{ - if(this.state.boxType=="delete"){ - //删除 - let url=`/courses/${CourseId}/polls/destroys.json`; - axios.post((url), { - check_ids: this.state.checkBoxValues - }) - .then((result)=>{ - if(result){ - this.props.showNotification(`${result.data.message}`); - this.setState({ - modalsType:false, - modalsTopval:"", - modalsBottomval:"", - loadtype:false, - checkBoxValues:[] - }) - let{type,StudentList_value}=this.state - this.InitList(type,StudentList_value,1); - } - }).catch((error)=>{ - console.log(error); - }) - }else if(this.state.boxType=="public"){ - //设为公开 - let url=`/courses/${CourseId}/polls/set_public.json`; - axios.post((url), { - check_ids: this.state.checkBoxValues - }) - .then((result)=>{ - if(result){ - this.props.showNotification(`${result.data.message}`); - this.setState({ - modalsType:false, - modalsTopval:"", - loadtype:false, - checkBoxValues:[] - }) - let{type,StudentList_value}=this.state - this.InitList(type,StudentList_value,1); - } - }).catch((error)=>{ - console.log(error); - }) - } - } - } - - successFun=()=>{ - let{type,StudentList_value,page}=this.state - this.InitList(type,StudentList_value,page) - - } - // 题库选用成功后,立即发布，刷新页面 - useBankSuccess=(checkValue,value)=>{ - // let{type,StudentList_value,page}=this.state - // this.InitList(type,StudentList_value,page); - this.setState({ - checkBoxValues:[] - }) - let coursesId=this.props.match.params.coursesId; - let url=`/courses/${coursesId}/polls/publish_modal.json`; - axios.get(url,{ - params:{ - check_ids:value - } - }).then((response) => { - if(response){ - let list=[]; - if(response.data.course_info){ - for(var i=0;i 0 ? 1 : 2,
- visible:true,
- Topval:"本操作只对“未发布”的对象生效",
- Botvalleft:"暂不发布",
- Botval:"则通过后续手动设置，定时发布",
- starttime:"发布时间："+this.props.getNowFormatDates(1),
- starttimes:this.props.getNowFormatDates(1),
- endtime:"截止时间："+this.props.getNowFormatDates(2),
- Cancelname:"暂不发布",
- Savesname:"立即发布",
- Cancel:this.homeworkhide,
- Saves:this.homeworkstartend,
- })
- }
- }).catch((error) => {
- console.log(error)
- });
- }
-
- getcourse_groupslist=(id)=>{
- this.setState({
- chooseId:id
- })
- }
-
- // 确定立即发布
- homeworkstartend=(value,endtime)=>{
-
- let {checkBoxValues}=this.state;
- let coursesId=this.props.match.params.coursesId;
-
- let url=`/courses/${coursesId}/polls/publish.json`
- axios.post(url,{
- check_ids:checkBoxValues,
- group_ids:value,
- end_time:endtime
- }).then((result)=>{
- if(result){
- let{type,StudentList_value,page}=this.state
- this.InitList(type,StudentList_value,page);
- this.props.showNotification(result.data.message);
- this.homeworkhide();
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
-
- //暂不发布
- homeworkhide=()=>{
- this.setState({
- modalname:undefined,
- modaltype:undefined,
- visible:false,
- Topval:undefined,
- Topvalright:undefined,
- Botvalleft:undefined,
- Botval:undefined,
- starttime:undefined,
- endtime:undefined,
- Cancelname:undefined,
- Savesname:undefined,
- Cancel:undefined,
- Saves:undefined,
- StudentList_value:undefined,
- addname:undefined,
- addnametype:false,
- addnametab:undefined,
- checkBoxValues:[]
- })
- }
-
- render(){
- let {
- modalname,
- modaltype,
- visible,
- Topval,
- Topvalright,
- Botvalleft,
- Botval,
- starttime,
- endtime,
- Cancelname,
- Savesname,
- Cancel,
- Saves,
- StudentList_value,
- addname,
- addnametype,
- addnametab,
- addcanner,
- addsave,
- course_groups,
-
- checkAllValue,
- checkBoxValues,
- course_types,
- pollsList,
- page,
- pageSize,
- polls_counts,
-
- modalsType,
- modalsTopval,
- modalsBottomval,
- loadtype
- }=this.state;
- console.log(this.props);
- let {child}=this.props;
- let {coursesId,Id}=this.props.match.params
- const isAdmin = this.props.isAdmin()
- const isStudent=this.props.isStudent();
- // console.log(child)
- return(
-
-
- {visible===true?this.getcourse_groupslist(id)}
- />:""}
-
- {/*添加目录/选择目录*/}
-
- {
- pollsList && pollsList.length > 0 && isAdmin &&
-
-
- }
-
- {
- pollsList && pollsList.length==0 &&
- )
- }
-}
+import React,{ Component } from "react";
+import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip ,Spin} from "antd";
+import CourseLayoutcomponent from '../common/CourseLayoutComponent';
+import HomeworkModal from "../coursesPublic/HomeworkModal";
+import ShixunModal from "../coursesPublic/ShixunModal";
+import PathModal from "../coursesPublic/PathModal";
+import AddcoursesNav from "../coursesPublic/AddcoursesNav";
+import ImmediatelyPublish from './pollPublicBtn/ImmediatelyPublish'
+import ImmediatelyEnd from './pollPublicBtn/ImmediatelyEnd'
+import PollListItem from './PollListItem'
+import NoneData from '../coursesPublic/NoneData'
+import UseBank from '../busyWork/UseBank'
+
+import _ from 'lodash';
+
+import '../css/members.css'
+import '../css/busyWork.css'
+
+
+import { WordsBtn } from 'educoder'
+import Modals from '../../modals/Modals'
+
+import axios from 'axios'
+
+const Search = Input.Search;
+
+
+class Poll extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ modalname:undefined,
+ modaltype:undefined,
+ visible:false,
+ Topval:undefined,
+ Topvalright:undefined,
+ Botvalleft:undefined,
+ Botval:undefined,
+ starttime:undefined,
+ endtime:undefined,
+ Cancelname:undefined,
+ Savesname:undefined,
+ Cancel:undefined,
+ Saves:undefined,
+ StudentList_value:undefined,
+ addname:undefined,
+ addnametype:false,
+ addnametab:undefined,
+ addcanner:undefined,
+ addsave:undefined,
+ course_groups:[],
+ chooseId:undefined,
+ // 列表相关
+ checkBoxValues:[],
+ checkAllValue:false,
+ pollsList:undefined,
+ course_types:undefined,
+ page:1,
+ pageSize:15,
+ type:0,
+ polls_counts:undefined,
+
+ //公用提示弹框相关
+ modalsType:false,
+ modalsTopval:"",
+ modalsBottomval:"",
+ loadtype:false,
+ boxType:"delete",
+ isSpin:false
+ }
+
+ }
+
+ inputStudent=(e)=>{
+ this.setState({
+ StudentList_value:e.target.value
+ })
+ }
+
+
+ // 题库选用
+ selectBlank=(type)=>{
+ if(type===2){
+ this.setState({
+ addname:"添加目录",
+ addnametype:true,
+ addnametab:type,
+ addcanner:this.homeworkhide,
+ addsave:undefined
+ })
+ }else if(type===4){
+ this.setState({
+ addname:"移动到目录",
+ addnametype:true,
+ addnametab:type,
+ addcanner:this.homeworkhide,
+ addsave:undefined
+ })
+ }
+
+ }
+ // 切换菜单选项
+ changeType=(e)=>{
+ this.setState({
+ type:e.key,
+ checkBoxValues:[],
+ checkAllValue:false
+ })
+ let{StudentList_value,page}=this.state;
+ this.InitList(e.key,StudentList_value,page);
+ }
+ // 获取列表数据
+ InitList=(type,search,page)=>{
+ this.setState({
+ isSpin:true
+ })
+ let {pageSize}=this.state
+ let coursesId=this.props.match.params.coursesId;
+ let url='/courses/'+coursesId+'/polls.json?limit='+pageSize+'&page='+page
+ if(type!="0"){
+ url+="&type="+type
+ }
+ if(search!=""&&search!=undefined){
+ url+="&search="+search
+ }
+ axios.get(url).then((result)=>{
+ if(result){
+ this.setState({
+ pollsList:result.data.polls,
+ course_types:result.data.course_types,
+ polls_counts:result.data.polls_counts,
+ isSpin:false,
+ checkBoxValues:[]
+ })
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+ // 加载列表
+ componentDidMount(){
+ this.setState({
+ isSpin:true
+ })
+ let{type,StudentList_value,page}=this.state
+ this.InitList(type,StudentList_value,page);
+ }
+ //切换分页
+ changePage=(pageNumber)=>{
+
+ this.setState({
+ page:pageNumber
+ })
+ let{type,StudentList_value}=this.state
+ this.InitList(type,StudentList_value,pageNumber);
+ }
+ // 搜索
+ searchInfo=()=>{
+ this.setState({
+ page:1
+ })
+ let{type,StudentList_value}=this.state;
+ this.InitList(type,StudentList_value,1)
+ }
+ // checkbox
+ onItemClick = (item) => {
+ const checkBoxValues = this.state.checkBoxValues.slice(0);
+ const index = checkBoxValues.indexOf(item.id);
+ if (index != -1) {
+ _.remove(checkBoxValues, (listItem)=> listItem === item.id)
+ } else {
+ checkBoxValues.push(item.id);
+ }
+ this.onCheckBoxChange(checkBoxValues)
+ }
+ // 全选or反选
+ onCheckAll = (e) => {
+ this.setState({
+ checkAllValue: e.target.checked
+ })
+ const values = this.state.pollsList.map(item => {
+ return item.id
+ })
+ if (e.target.checked) {
+ const concated = this.state.checkBoxValues.concat(values);
+ const uniq=_.uniq(concated)
+ this.setState({
+ checkBoxValues: uniq
+ })
+ } else {
+ this.setState({
+ checkBoxValues: _.difference(this.state.checkBoxValues, values)
+ })
+ }
+ }
+
+ onCheckBoxChange = (checkedValues) => {
+ this.setState({
+ checkBoxValues: checkedValues,
+ checkAllValue: checkedValues.length == this.state.pollsList.length
+ })
+ }
+
+ //删除或者设为公开
+ ActionPoll=(value)=>{
+ let CourseId=this.props.match.params.coursesId;
+ //判断是否有选中数据
+ if(this.state.checkBoxValues.length==0){
+ this.props.showNotification("请先在列表中选择数据");
+ // this.setState({
+ // modalsType:true,
+ // modalsTopval:"请先在列表中选择数据",
+ // modalsBottomval:'',
+ // loadtype:true
+ // })
+ }else{
+ if(value != "bank"){
+ this.setState({
+ modalsType:true,
+ modalsTopval:value=="delete"?"已提交作品将全部被删除，不可恢复":"公开后非课堂成员也可以访问查看",
+ modalsBottomval:value=="delete"?"您确定要删除吗？":"是否确认公开？",
+ loadtype:false,
+ boxType:value
+ })
+ }else{
+ //加入题库
+ let url=`/courses/${CourseId}/polls/join_poll_banks.json`;
+ axios.post((url), {
+ check_ids: this.state.checkBoxValues
+ })
+ .then((result)=>{
+ if(result){
+ this.props.showNotification(`${result.data.message}`);
+ this.setState({
+ modalsType:false,
+ modalsTopval:"",
+ modalsBottomval:"",
+ loadtype:false,
+ checkBoxValues:[],
+ checkAllValue:false
+ })
+ let{type,StudentList_value}=this.state
+ this.InitList(type,StudentList_value,1);
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+ }
+ }
+ //取消删除或者设为公开
+ modalCancel=()=>{
+ this.setState({
+ modalsType:false,
+ modalsTopval:"",
+ modalsBottomval:"",
+ loadtype:false
+ })
+ }
+ //确定删除或者设为公开
+ ModalAction=()=>{
+ let CourseId=this.props.match.params.coursesId;
+ if(this.state.checkBoxValues.length==0){
+ this.setState({
+ modalsType:false,
+ modalsTopval:"",
+ loadtype:false,
+ checkBoxValues:[]
+ })
+ }else{
+ if(this.state.boxType=="delete"){
+ //删除
+ let url=`/courses/${CourseId}/polls/destroys.json`;
+ axios.post((url), {
+ check_ids: this.state.checkBoxValues
+ })
+ .then((result)=>{
+ if(result){
+ this.props.showNotification(`${result.data.message}`);
+ this.setState({
+ modalsType:false,
+ modalsTopval:"",
+ modalsBottomval:"",
+ loadtype:false,
+ checkBoxValues:[]
+ })
+ let{type,StudentList_value}=this.state
+ this.InitList(type,StudentList_value,1);
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }else if(this.state.boxType=="public"){
+ //设为公开
+ let url=`/courses/${CourseId}/polls/set_public.json`;
+ axios.post((url), {
+ check_ids: this.state.checkBoxValues
+ })
+ .then((result)=>{
+ if(result){
+ this.props.showNotification(`${result.data.message}`);
+ this.setState({
+ modalsType:false,
+ modalsTopval:"",
+ loadtype:false,
+ checkBoxValues:[]
+ })
+ let{type,StudentList_value}=this.state
+ this.InitList(type,StudentList_value,1);
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+ }
+ }
+
+ successFun=()=>{
+ let{type,StudentList_value,page}=this.state
+ this.InitList(type,StudentList_value,page)
+
+ }
+ // 题库选用成功后,立即发布，刷新页面
+ useBankSuccess=(checkValue,value)=>{
+ // let{type,StudentList_value,page}=this.state
+ // this.InitList(type,StudentList_value,page);
+ this.setState({
+ checkBoxValues:[]
+ })
+ let coursesId=this.props.match.params.coursesId;
+ let url=`/courses/${coursesId}/polls/publish_modal.json`;
+ axios.get(url,{
+ params:{
+ check_ids:value
+ }
+ }).then((response) => {
+ if(response){
+ let list=[];
+ if(response.data.course_info){
+ for(var i=0;i 0 ? 1 : 2,
+ visible:true,
+ Topval:"本操作只对“未发布”的对象生效",
+ Botvalleft:"暂不发布",
+ Botval:"则通过后续手动设置，定时发布",
+ starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
+ starttimes:this.props.getNowFormatDates(1),
+ endtime:"截止时间："+this.props.getNowFormatDates(2),
+ Cancelname:"暂不发布",
+ Savesname:"立即发布",
+ Cancel:this.homeworkhide,
+ Saves:this.homeworkstartend,
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ });
+ }
+
+ getcourse_groupslist=(id)=>{
+ this.setState({
+ chooseId:id
+ })
+ }
+
+ // 确定立即发布
+ homeworkstartend=(value,endtime)=>{
+
+ let {checkBoxValues}=this.state;
+ let coursesId=this.props.match.params.coursesId;
+
+ let url=`/courses/${coursesId}/polls/publish.json`
+ axios.post(url,{
+ check_ids:checkBoxValues,
+ group_ids:value,
+ end_time:endtime
+ }).then((result)=>{
+ if(result){
+ let{type,StudentList_value,page}=this.state
+ this.InitList(type,StudentList_value,page);
+ this.props.showNotification(result.data.message);
+ this.homeworkhide();
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ //暂不发布
+ homeworkhide=()=>{
+ this.setState({
+ modalname:undefined,
+ modaltype:undefined,
+ visible:false,
+ Topval:undefined,
+ Topvalright:undefined,
+ Botvalleft:undefined,
+ Botval:undefined,
+ starttime:undefined,
+ endtime:undefined,
+ Cancelname:undefined,
+ Savesname:undefined,
+ Cancel:undefined,
+ Saves:undefined,
+ StudentList_value:undefined,
+ addname:undefined,
+ addnametype:false,
+ addnametab:undefined,
+ checkBoxValues:[]
+ })
+ }
+
+ render(){
+ let {
+ modalname,
+ modaltype,
+ visible,
+ Topval,
+ Topvalright,
+ Botvalleft,
+ Botval,
+ starttime,
+ endtime,
+ Cancelname,
+ Savesname,
+ Cancel,
+ Saves,
+ StudentList_value,
+ addname,
+ addnametype,
+ addnametab,
+ addcanner,
+ addsave,
+ course_groups,
+
+ checkAllValue,
+ checkBoxValues,
+ course_types,
+ pollsList,
+ page,
+ pageSize,
+ polls_counts,
+
+ modalsType,
+ modalsTopval,
+ modalsBottomval,
+ loadtype
+ }=this.state;
+ console.log(this.props);
+ let {child}=this.props;
+ let {coursesId,Id}=this.props.match.params
+ const isAdmin = this.props.isAdmin()
+ const isStudent=this.props.isStudent();
+ // console.log(child)
+ return(
+
+
+ {visible===true?this.getcourse_groupslist(id)}
+ />:""}
+
+ {/*添加目录/选择目录*/}
+
+ {
+ pollsList && pollsList.length > 0 && isAdmin &&
+
+
+ }
+
+ {
+ pollsList && pollsList.length==0 &&
+ )
+ }
+}
export default Poll;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
index e0424aa93..95e5ba2ad 100644
--- a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
+++ b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
@@ -1,282 +1,282 @@
-import React,{ Component } from "react";
-
-
-import Modals from '../../../modals/Modals'
-import { WordsBtn } from 'educoder'
-import HomeworkModal from "../../coursesPublic/HomeworkModal";
-
-import axios from 'axios'
-import moment from 'moment';
-
-
-
-
-class Immediatelypublish extends Component{
- constructor(props){
- super(props)
- this.state={
- modalname:undefined,
- modaltype:undefined,
- visible:false,
- Topval:undefined,
- Topvalright:undefined,
- Botvalleft:undefined,
- Botval:undefined,
- starttime:undefined,
- starttimes:undefined,
- endtime:undefined,
- Cancelname:undefined,
- Savesname:undefined,
- Cancel:undefined,
- Saves:undefined,
- course_groups:undefined,
-
- modalsType:false,
- modalsTopval:"",
- loadtype:false,
- chooseId:undefined
- }
- }
- //立即发布
- homeworkstart=()=>{
- let {checkBoxValues}=this.props
-
-
- // console.log(this.props.Exercisetype==="exercise")
-
-
- if(checkBoxValues.length==0){
- this.props.showNotification("请先在列表中选择数据");
- // this.setState({
- // modalsType:true,
- // modalsTopval:"请先在列表中选择数据",
- // loadtype:true
- // })
- }else{
- let coursesId=this.props.match.params.coursesId;
- if(this.props.Exercisetype==="exercise"){
- let url=`/courses/${coursesId}/exercises/publish_modal.json`;
- axios.get(url,{
- params:{
- check_ids:checkBoxValues
- }
- }).then((response) => {
- if(response.status===200){
- let list=[];
- if(response.data.course_info){
- for(var i=0;i 0 ? 1 : 2,
- visible:true,
- Topval:"本操作只对“未发布”的对象生效",
- Botvalleft:"暂不发布",
- Botval:"则通过后续手动设置，定时发布",
- starttime:"发布时间："+this.props.getNowFormatDates(1),
- starttimes:this.props.getNowFormatDates(1),
- endtime:"截止时间："+this.props.getNowFormatDates(2),
- Cancelname:"暂不发布",
- Savesname:"立即发布",
- Cancel:this.homeworkhide,
- Saves:this.homeworkstartend,
- })
- }
- }).catch((error) => {
- console.log(error)
- });
- }else{
- let url=`/courses/${coursesId}/polls/publish_modal.json`;
- axios.get(url,{
- params:{
- check_ids:checkBoxValues
- }
- }).then((response) => {
- if(response){
- let list=[];
- if(response.data.course_info){
- for(var i=0;i 0 ? 1 : 2,
- visible:true,
- Topval:"本操作只对“未发布”的对象生效",
- Botvalleft:"暂不发布",
- Botval:"则通过后续手动设置，定时发布",
- starttime:"发布时间："+this.props.getNowFormatDates(1),
- starttimes:this.props.getNowFormatDates(1),
- endtime:"截止时间："+this.props.getNowFormatDates(2),
- Cancelname:"暂不发布",
- Savesname:"立即发布",
- Cancel:this.homeworkhide,
- Saves:this.homeworkstartend,
- })
- }
- }).catch((error) => {
- console.log(error)
- });
-
- }
-
- }
- }
-
- //取消提示弹框
- modalCancel=()=>{
- this.setState({
- modalsType:false,
- modalsTopval:"",
- loadtype:false
- })
- }
- //暂不发布
- homeworkhide=()=>{
- this.setState({
- modalname:undefined,
- modaltype:undefined,
- visible:false,
- Topval:undefined,
- Topvalright:undefined,
- Botvalleft:undefined,
- Botval:undefined,
- starttime:undefined,
- starttimes:undefined,
- endtime:undefined,
- Cancelname:undefined,
- Savesname:undefined,
- Cancel:undefined,
- Saves:undefined,
- StudentList_value:undefined,
- addname:undefined,
- addnametype:false,
- addnametab:undefined
- })
- }
- // 确定立即发布
- homeworkstartend=(ids,endtime)=>{
-
- let {checkBoxValues}=this.props
- let {chooseId}=this.state;
- let coursesId=this.props.match.params.coursesId;
-
- if(this.props.Exercisetype==="exercise"){
-
- let url=`/courses/${coursesId}/exercises/publish.json`
- axios.post(url,{
- check_ids:checkBoxValues,
- group_ids:chooseId,
- end_time:endtime
- }).then((result)=>{
- if(result){
- this.props.showNotification(result.data.message);
- this.homeworkhide();
-
- // 调用父级公共头部的接口刷新
- this.props.action()
- }
- }).catch((error)=>{
- console.log(error);
- })
-
- }else{
- let url=`/courses/${coursesId}/polls/publish.json`
- axios.post(url,{
- check_ids:checkBoxValues,
- group_ids:chooseId,
- end_time:endtime
- }).then((result)=>{
- if(result){
- this.props.showNotification(result.data.message);
- this.homeworkhide();
-
- // 调用父级公共头部的接口刷新
- this.props.action()
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
-
- }
-
- getcourse_groupslist=(id)=>{
- this.setState({
- chooseId:id
- })
- }
-
- render(){
- let{
- modalname,
- modaltype,
- visible,
- Topval,
- Topvalright,
- Botvalleft,
- Botval,
- starttime,
- starttimes,
- endtime,
- Cancelname,
- Savesname,
- Cancel,
- Saves,
- course_groups,
-
- modalsType,
- modalsTopval,
- loadtype,
- }=this.state
- return(
-
- this.getcourse_groupslist(id)}
- />
- {/* 公用的提示弹框 */}
- 立即发布
-
- )
- }
-}
+import React,{ Component } from "react";
+
+
+import Modals from '../../../modals/Modals'
+import { WordsBtn } from 'educoder'
+import HomeworkModal from "../../coursesPublic/HomeworkModal";
+
+import axios from 'axios'
+import moment from 'moment';
+
+
+
+
+class Immediatelypublish extends Component{
+ constructor(props){
+ super(props)
+ this.state={
+ modalname:undefined,
+ modaltype:undefined,
+ visible:false,
+ Topval:undefined,
+ Topvalright:undefined,
+ Botvalleft:undefined,
+ Botval:undefined,
+ starttime:undefined,
+ starttimes:undefined,
+ endtime:undefined,
+ Cancelname:undefined,
+ Savesname:undefined,
+ Cancel:undefined,
+ Saves:undefined,
+ course_groups:undefined,
+
+ modalsType:false,
+ modalsTopval:"",
+ loadtype:false,
+ chooseId:undefined
+ }
+ }
+ //立即发布
+ homeworkstart=()=>{
+ let {checkBoxValues}=this.props
+
+
+ // console.log(this.props.Exercisetype==="exercise")
+
+
+ if(checkBoxValues.length==0){
+ this.props.showNotification("请先在列表中选择数据");
+ // this.setState({
+ // modalsType:true,
+ // modalsTopval:"请先在列表中选择数据",
+ // loadtype:true
+ // })
+ }else{
+ let coursesId=this.props.match.params.coursesId;
+ if(this.props.Exercisetype==="exercise"){
+ let url=`/courses/${coursesId}/exercises/publish_modal.json`;
+ axios.get(url,{
+ params:{
+ check_ids:checkBoxValues
+ }
+ }).then((response) => {
+ if(response.status===200){
+ let list=[];
+ if(response.data.course_info){
+ for(var i=0;i 0 ? 1 : 2,
+ visible:true,
+ Topval:"本操作只对“未发布”的对象生效",
+ Botvalleft:"暂不发布",
+ Botval:"则通过后续手动设置，定时发布",
+ starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
+ starttimes:this.props.getNowFormatDates(1),
+ endtime:"截止时间："+this.props.getNowFormatDates(2),
+ Cancelname:"暂不发布",
+ Savesname:"立即发布",
+ Cancel:this.homeworkhide,
+ Saves:this.homeworkstartend,
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ });
+ }else{
+ let url=`/courses/${coursesId}/polls/publish_modal.json`;
+ axios.get(url,{
+ params:{
+ check_ids:checkBoxValues
+ }
+ }).then((response) => {
+ if(response){
+ let list=[];
+ if(response.data.course_info){
+ for(var i=0;i 0 ? 1 : 2,
+ visible:true,
+ Topval:"本操作只对“未发布”的对象生效",
+ Botvalleft:"暂不发布",
+ Botval:"则通过后续手动设置，定时发布",
+ starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
+ starttimes:this.props.getNowFormatDates(1),
+ endtime:"截止时间："+this.props.getNowFormatDates(2),
+ Cancelname:"暂不发布",
+ Savesname:"立即发布",
+ Cancel:this.homeworkhide,
+ Saves:this.homeworkstartend,
+ })
+ }
+ }).catch((error) => {
+ console.log(error)
+ });
+
+ }
+
+ }
+ }
+
+ //取消提示弹框
+ modalCancel=()=>{
+ this.setState({
+ modalsType:false,
+ modalsTopval:"",
+ loadtype:false
+ })
+ }
+ //暂不发布
+ homeworkhide=()=>{
+ this.setState({
+ modalname:undefined,
+ modaltype:undefined,
+ visible:false,
+ Topval:undefined,
+ Topvalright:undefined,
+ Botvalleft:undefined,
+ Botval:undefined,
+ starttime:undefined,
+ starttimes:undefined,
+ endtime:undefined,
+ Cancelname:undefined,
+ Savesname:undefined,
+ Cancel:undefined,
+ Saves:undefined,
+ StudentList_value:undefined,
+ addname:undefined,
+ addnametype:false,
+ addnametab:undefined
+ })
+ }
+ // 确定立即发布
+ homeworkstartend=(ids,endtime)=>{
+
+ let {checkBoxValues}=this.props
+ let {chooseId}=this.state;
+ let coursesId=this.props.match.params.coursesId;
+
+ if(this.props.Exercisetype==="exercise"){
+
+ let url=`/courses/${coursesId}/exercises/publish.json`
+ axios.post(url,{
+ check_ids:checkBoxValues,
+ group_ids:chooseId,
+ end_time:endtime
+ }).then((result)=>{
+ if(result){
+ this.props.showNotification(result.data.message);
+ this.homeworkhide();
+
+ // 调用父级公共头部的接口刷新
+ this.props.action()
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+
+ }else{
+ let url=`/courses/${coursesId}/polls/publish.json`
+ axios.post(url,{
+ check_ids:checkBoxValues,
+ group_ids:chooseId,
+ end_time:endtime
+ }).then((result)=>{
+ if(result){
+ this.props.showNotification(result.data.message);
+ this.homeworkhide();
+
+ // 调用父级公共头部的接口刷新
+ this.props.action()
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ }
+
+ getcourse_groupslist=(id)=>{
+ this.setState({
+ chooseId:id
+ })
+ }
+
+ render(){
+ let{
+ modalname,
+ modaltype,
+ visible,
+ Topval,
+ Topvalright,
+ Botvalleft,
+ Botval,
+ starttime,
+ starttimes,
+ endtime,
+ Cancelname,
+ Savesname,
+ Cancel,
+ Saves,
+ course_groups,
+
+ modalsType,
+ modalsTopval,
+ loadtype,
+ }=this.state
+ return(
+
+ this.getcourse_groupslist(id)}
+ />
+ {/* 公用的提示弹框 */}
+ 立即发布
+
+ )
+ }
+}
export default Immediatelypublish
\ No newline at end of file
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index e38a0c453..ba3c34c51 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -821,7 +821,7 @@ class Listofworks extends Component {
Topval: "本操作只对“未发布”的对象生效",
Botvalleft: "暂不发布",
Botval: "则通过后续手动设置，定时发布",
- starttime: "发布时间：" + starttime,
+ starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间：" + endtime,
starttimes:starttime,
typs:"start",
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 461c4d74d..a62e815ef 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -304,7 +304,7 @@ class ShixunStudentWork extends Component {
Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布",
- starttime:"发布时间："+starttime,
+ starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime:"截止时间："+endtime,
Cancelname:"暂不发布",
Savesname:"立即发布",
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 919a744cf..108ab58f0 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1237,7 +1237,7 @@ class Trainingjobsetting extends Component {
Topval: "本操作只对“未发布”的对象生效",
Botvalleft: "暂不发布",
Botval: "则通过后续手动设置，定时发布",
- starttime: "发布时间：" + starttime,
+ starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime,
typs:"start",
endtime: "截止时间：" + endtime,
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index a06a5be32..7808355e8 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -148,7 +148,7 @@ class Workquestionandanswer extends Component {
Topval: "本操作只对“未发布”的对象生效",
Botvalleft: "暂不发布",
Botval: "则通过后续手动设置，定时发布",
- starttime: "发布时间：" + starttime,
+ starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间：" + endtime,
Cancelname: "暂不发布",
Savesname: "立即发布",
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 9589d4515..5970a8907 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -209,7 +209,7 @@ class ShixunHomework extends Component{
Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布",
- starttime:"发布时间："+starttime,
+ starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime,
endtime:"截止时间："+endtime,
Cancelname:"暂不发布",
@@ -403,7 +403,7 @@ class ShixunHomework extends Component{
Topval:"本操作只对“未发布”的对象生效",
Botvalleft:"暂不发布",
Botval:"则通过后续手动设置，定时发布",
- starttime:"发布时间："+ starttime,
+ starttime:"发布时间："+ moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
starttimes:starttime,
typs:"start",
endtime:"截止时间："+ endtime,
From a8a33ebd7d24e54c70d5e5da01373f9f1a5f8d5e Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 21 Jun 2019 13:50:17 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../courses/graduation/tasks/GraduationTaskssettinglist.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 7ef1f99c5..9e0573a1c 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -1357,7 +1357,7 @@ class GraduationTaskssettinglist extends Component{
不限
this.funteachercomment(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.length)} style={{ paddingTop: '4px'}}>
- {taskslistdata.search_assistants&&taskslistdata.search_assistants.teacher_comment.map((item,key)=>{
+ {taskslistdata.search_assistants && taskslistdata.search_assistants.teacher_comment && taskslistdata.search_assistants.teacher_comment.map((item,key)=>{
return(
{item.name}
@@ -1499,7 +1499,7 @@ class GraduationTaskssettinglist extends Component{
pagination={false}
loading={loadingstate}
onChange={this.TablePagination}
-
+ className="edu-txt-center"
/>}
@@ -1740,6 +1740,7 @@ class GraduationTaskssettinglist extends Component{
pagination={false}
loading={loadingstate}
onChange={this.TablePagination}
+ className="edu-txt-center"
/>}
From 0780f2027bff41bb9c5674e5f75d2a7b05befb50 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 21 Jun 2019 13:58:46 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5-?=
=?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/user/usersInfo/Infos.js | 21 ++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js
index e5f1e99dd..0ce102eb5 100644
--- a/public/react/src/modules/user/usersInfo/Infos.js
+++ b/public/react/src/modules/user/usersInfo/Infos.js
@@ -48,12 +48,6 @@ class Infos extends Component{
}
}
- // 试用申请
- trialapplications =()=>{
- this.setState({
- isRenders: true,
- })
- }
//获取个人主页信息
getInfo = (user_login) =>{
@@ -157,6 +151,19 @@ class Infos extends Component{
}
}
+ // 试用申请
+ trialapplications =()=>{
+ this.setState({
+ isRenders: true,
+ showTrial:true
+ })
+ }
+ cancelModulationModels=()=>{
+ this.setState({
+ isRenders: false
+ })
+ }
+
render(){
let {
data ,
@@ -174,7 +181,7 @@ class Infos extends Component{
return(
其它历史评分将全部失效:""}> {tag.name==="评阅"?tag.status===0?"--": - tag.name + {tag.name} + : this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""} @@ -1145,7 +1147,7 @@ class GraduationTaskssettinglist extends Component{
其它历史评分将全部失效:""}> {tag.name==="评阅"?tag.status===0?"--": - tag.name + {tag.name} : :""} {taskslistdata&&taskslistdata? @@ -1551,7 +1554,7 @@ class GraduationTaskssettinglist extends Component{ to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting"}>设置 - {taskslistdata.work_status===undefined?"":taskslistdata.work_status.map((item,key)=>{ + {taskslistdata.work_status===undefined||taskslistdata.work_status===null||taskslistdata.work_status.length===0?"":taskslistdata.work_status.map((item,key)=>{ return( {item==="提交作品"?提交作品:""} diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js index 80055f5d3..997085d13 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js @@ -81,7 +81,7 @@ class GraduationTasksquestions extends Component{ Topval:"发布设置均可修改", Botvalleft:"点击修改", Botval:"此设置将对所有分班生效", - starttime:moment(new Date()).format('YYYY-MM-DD 00:00'), + starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") , starttimes:this.props.getNowFormatDates(1), typs:"start", endtime:endtime, diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js index fa86da93d..f2fc3845e 100644 --- a/public/react/src/modules/courses/graduation/tasks/index.js +++ b/public/react/src/modules/courses/graduation/tasks/index.js @@ -413,7 +413,7 @@ class GraduationTasks extends Component{ Topval:"本操作只对“未发布”的对象生效", Botvalleft:"暂不发布", Botval:"则通过后续手动设置，定时发布", - starttime:"发布时间："+starttime, + starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttimes:this.props.getNowFormatDates(1), typs:"start", endtime:"截止时间："+endtime, diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js index 2d0aedd7a..aa01bcf47 100644 --- a/public/react/src/modules/courses/poll/Poll.js +++ b/public/react/src/modules/courses/poll/Poll.js @@ -1,621 +1,621 @@ -import React,{ Component } from "react"; -import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip ,Spin} from "antd"; -import CourseLayoutcomponent from '../common/CourseLayoutComponent'; -import HomeworkModal from "../coursesPublic/HomeworkModal"; -import ShixunModal from "../coursesPublic/ShixunModal"; -import PathModal from "../coursesPublic/PathModal"; -import AddcoursesNav from "../coursesPublic/AddcoursesNav"; -import ImmediatelyPublish from './pollPublicBtn/ImmediatelyPublish' -import ImmediatelyEnd from './pollPublicBtn/ImmediatelyEnd' -import PollListItem from './PollListItem' -import NoneData from '../coursesPublic/NoneData' -import UseBank from '../busyWork/UseBank' - -import _ from 'lodash'; - -import '../css/members.css' -import '../css/busyWork.css' - - -import { WordsBtn } from 'educoder' -import Modals from '../../modals/Modals' - -import axios from 'axios' - -const Search = Input.Search; - - -class Poll extends Component{ - constructor(props){ - super(props); - this.state={ - modalname:undefined, - modaltype:undefined, - visible:false, - Topval:undefined, - Topvalright:undefined, - Botvalleft:undefined, - Botval:undefined, - starttime:undefined, - endtime:undefined, - Cancelname:undefined, - Savesname:undefined, - Cancel:undefined, - Saves:undefined, - StudentList_value:undefined, - addname:undefined, - addnametype:false, - addnametab:undefined, - addcanner:undefined, - addsave:undefined, - course_groups:[], - chooseId:undefined, - // 列表相关 - checkBoxValues:[], - checkAllValue:false, - pollsList:undefined, - course_types:undefined, - page:1, - pageSize:15, - type:0, - polls_counts:undefined, - - //公用提示弹框相关 - modalsType:false, - modalsTopval:"", - modalsBottomval:"", - loadtype:false, - boxType:"delete", - isSpin:false - } - - } - - inputStudent=(e)=>{ - this.setState({ - StudentList_value:e.target.value - }) - } - - - // 题库选用 - selectBlank=(type)=>{ - if(type===2){ - this.setState({ - addname:"添加目录", - addnametype:true, - addnametab:type, - addcanner:this.homeworkhide, - addsave:undefined - }) - }else if(type===4){ - this.setState({ - addname:"移动到目录", - addnametype:true, - addnametab:type, - addcanner:this.homeworkhide, - addsave:undefined - }) - } - - } - // 切换菜单选项 - changeType=(e)=>{ - this.setState({ - type:e.key, - checkBoxValues:[], - checkAllValue:false - }) - let{StudentList_value,page}=this.state; - this.InitList(e.key,StudentList_value,page); - } - // 获取列表数据 - InitList=(type,search,page)=>{ - this.setState({ - isSpin:true - }) - let {pageSize}=this.state - let coursesId=this.props.match.params.coursesId; - let url='/courses/'+coursesId+'/polls.json?limit='+pageSize+'&page='+page - if(type!="0"){ - url+="&type="+type - } - if(search!=""&&search!=undefined){ - url+="&search="+search - } - axios.get(url).then((result)=>{ - if(result){ - this.setState({ - pollsList:result.data.polls, - course_types:result.data.course_types, - polls_counts:result.data.polls_counts, - isSpin:false, - checkBoxValues:[] - }) - } - }).catch((error)=>{ - console.log(error); - }) - } - // 加载列表 - componentDidMount(){ - this.setState({ - isSpin:true - }) - let{type,StudentList_value,page}=this.state - this.InitList(type,StudentList_value,page); - } - //切换分页 - changePage=(pageNumber)=>{ - - this.setState({ - page:pageNumber - }) - let{type,StudentList_value}=this.state - this.InitList(type,StudentList_value,pageNumber); - } - // 搜索 - searchInfo=()=>{ - this.setState({ - page:1 - }) - let{type,StudentList_value}=this.state; - this.InitList(type,StudentList_value,1) - } - // checkbox - onItemClick = (item) => { - const checkBoxValues = this.state.checkBoxValues.slice(0); - const index = checkBoxValues.indexOf(item.id); - if (index != -1) { - _.remove(checkBoxValues, (listItem)=> listItem === item.id) - } else { - checkBoxValues.push(item.id); - } - this.onCheckBoxChange(checkBoxValues) - } - // 全选or反选 - onCheckAll = (e) => { - this.setState({ - checkAllValue: e.target.checked - }) - const values = this.state.pollsList.map(item => { - return item.id - }) - if (e.target.checked) { - const concated = this.state.checkBoxValues.concat(values); - const uniq=_.uniq(concated) - this.setState({ - checkBoxValues: uniq - }) - } else { - this.setState({ - checkBoxValues: _.difference(this.state.checkBoxValues, values) - }) - } - } - - onCheckBoxChange = (checkedValues) => { - this.setState({ - checkBoxValues: checkedValues, - checkAllValue: checkedValues.length == this.state.pollsList.length - }) - } - - //删除或者设为公开 - ActionPoll=(value)=>{ - let CourseId=this.props.match.params.coursesId; - //判断是否有选中数据 - if(this.state.checkBoxValues.length==0){ - this.props.showNotification("请先在列表中选择数据"); - // this.setState({ - // modalsType:true, - // modalsTopval:"请先在列表中选择数据", - // modalsBottomval:'', - // loadtype:true - // }) - }else{ - if(value != "bank"){ - this.setState({ - modalsType:true, - modalsTopval:value=="delete"?"已提交作品将全部被删除，不可恢复":"公开后非课堂成员也可以访问查看", - modalsBottomval:value=="delete"?"您确定要删除吗？":"是否确认公开？", - loadtype:false, - boxType:value - }) - }else{ - //加入题库 - let url=`/courses/${CourseId}/polls/join_poll_banks.json`; - axios.post((url), { - check_ids: this.state.checkBoxValues - }) - .then((result)=>{ - if(result){ - this.props.showNotification(`${result.data.message}`); - this.setState({ - modalsType:false, - modalsTopval:"", - modalsBottomval:"", - loadtype:false, - checkBoxValues:[], - checkAllValue:false - }) - let{type,StudentList_value}=this.state - this.InitList(type,StudentList_value,1); - } - }).catch((error)=>{ - console.log(error); - }) - } - } - } - //取消删除或者设为公开 - modalCancel=()=>{ - this.setState({ - modalsType:false, - modalsTopval:"", - modalsBottomval:"", - loadtype:false - }) - } - //确定删除或者设为公开 - ModalAction=()=>{ - let CourseId=this.props.match.params.coursesId; - if(this.state.checkBoxValues.length==0){ - this.setState({ - modalsType:false, - modalsTopval:"", - loadtype:false, - checkBoxValues:[] - }) - }else{ - if(this.state.boxType=="delete"){ - //删除 - let url=`/courses/${CourseId}/polls/destroys.json`; - axios.post((url), { - check_ids: this.state.checkBoxValues - }) - .then((result)=>{ - if(result){ - this.props.showNotification(`${result.data.message}`); - this.setState({ - modalsType:false, - modalsTopval:"", - modalsBottomval:"", - loadtype:false, - checkBoxValues:[] - }) - let{type,StudentList_value}=this.state - this.InitList(type,StudentList_value,1); - } - }).catch((error)=>{ - console.log(error); - }) - }else if(this.state.boxType=="public"){ - //设为公开 - let url=`/courses/${CourseId}/polls/set_public.json`; - axios.post((url), { - check_ids: this.state.checkBoxValues - }) - .then((result)=>{ - if(result){ - this.props.showNotification(`${result.data.message}`); - this.setState({ - modalsType:false, - modalsTopval:"", - loadtype:false, - checkBoxValues:[] - }) - let{type,StudentList_value}=this.state - this.InitList(type,StudentList_value,1); - } - }).catch((error)=>{ - console.log(error); - }) - } - } - } - - successFun=()=>{ - let{type,StudentList_value,page}=this.state - this.InitList(type,StudentList_value,page) - - } - // 题库选用成功后,立即发布，刷新页面 - useBankSuccess=(checkValue,value)=>{ - // let{type,StudentList_value,page}=this.state - // this.InitList(type,StudentList_value,page); - this.setState({ - checkBoxValues:[] - }) - let coursesId=this.props.match.params.coursesId; - let url=`/courses/${coursesId}/polls/publish_modal.json`; - axios.get(url,{ - params:{ - check_ids:value - } - }).then((response) => { - if(response){ - let list=[]; - if(response.data.course_info){ - for(var i=0;i
-
- 新建
-
- }
-
-
- - {polls_counts&&polls_counts.left_banner_name} - { - isAdmin && -
-
- - 共{polls_counts && polls_counts.polls_total_counts}个问卷 - 已发布：{polls_counts && polls_counts.polls_published_counts}个 - { - isAdmin && 未发布：{polls_counts && polls_counts.polls_unpublish_counts}个 - } -
-
-
-
-
-
-
-
- }
-
- {
- pollsList && pollsList.length > 0 &&
-
-
- 已选 {checkBoxValues.length} 个
-
-
- this.ActionPoll("delete")}>删除
-
-
-
-
- {
- course_types && course_types.course_is_public == 1 && this.ActionPoll("public")}>设为公开
- }
- this.ActionPoll("bank")}>加入题库
-
-
- {
- pollsList && pollsList.map((item,key)=>{
- return(
- this.onItemClick(item)}>}
- >
- )
- })
- }
-
-
-
- :
- ""
- }
-
-
-
+
+ 新建
+
+ }
+
+
+ + {polls_counts&&polls_counts.left_banner_name} + { + isAdmin && +
+
+ + 共{polls_counts && polls_counts.polls_total_counts}个问卷 + 已发布：{polls_counts && polls_counts.polls_published_counts}个 + { + isAdmin && 未发布：{polls_counts && polls_counts.polls_unpublish_counts}个 + } +
+
+
+
+
+
+
+
+ }
+
+ {
+ pollsList && pollsList.length > 0 &&
+
+
+ 已选 {checkBoxValues.length} 个
+
+
+ this.ActionPoll("delete")}>删除
+
+
+
+
+ {
+ course_types && course_types.course_is_public == 1 && this.ActionPoll("public")}>设为公开
+ }
+ this.ActionPoll("bank")}>加入题库
+
+
+ {
+ pollsList && pollsList.map((item,key)=>{
+ return(
+ this.onItemClick(item)}>}
+ >
+ )
+ })
+ }
+
+
+
+ :
+ ""
+ }
+
+
+
{
- isRenders && this.cancelModulationModels()}/>
}
From d276fee00b15bd3b9ae4ee2c4cdc85fd906cfd5c Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 21 Jun 2019 14:07:35 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E9=A2=98=E5=BA=93=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/user/usersInfo/Infos.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js
index 0ce102eb5..3300423a1 100644
--- a/public/react/src/modules/user/usersInfo/Infos.js
+++ b/public/react/src/modules/user/usersInfo/Infos.js
@@ -163,6 +163,9 @@ class Infos extends Component{
isRenders: false
})
}
+ ToBank=(url)=>{
+ window.location.href=url;
+ }
render(){
let {
@@ -290,7 +293,7 @@ class Infos extends Component{
实训
实训课程
项目
- { data && data.identity !="学生" && this.ToBank(`/`)}>题库 }
+ { data && data.identity !="学生" && this.ToBank(`/users/${username}?type=a_project`)}>题库 }