diff --git a/public/react/src/common/components/attachment/AttachmentList.js b/public/react/src/common/components/attachment/AttachmentList.js
index 32c632aa1..1f22b6fcc 100644
--- a/public/react/src/common/components/attachment/AttachmentList.js
+++ b/public/react/src/common/components/attachment/AttachmentList.js
@@ -1,5 +1,5 @@
import React,{ Component } from "react";
-import { ConditionToolTip } from 'educoder'
+import { ConditionToolTip,getRandomNumber } from 'educoder'
class AttachmentsList extends Component{
constructor(props){
@@ -15,9 +15,9 @@ class AttachmentsList extends Component{
-
@@ -234,8 +234,8 @@ class CommonWorkDetailIndex extends Component{
modalCancel={this.Downloadcal}
modalsType={this.state.DownloadType}
/>
-
+
@@ -266,7 +266,7 @@ class CommonWorkDetailIndex extends Component{
typelist={homework_status}
typesylename={"mt12"}
/>
-
+
{category &&
返回}
@@ -293,24 +293,24 @@ class CommonWorkDetailIndex extends Component{
{ noTab !== true &&
-
this.setState({moduleName: '作品列表'})}
className={`${isListModule ? 'active' : '' } `}
to={`/courses/${courseId}/${moduleEngName}/${workId}/list`}>作品列表
-
this.setState({moduleName: '作业描述'})}
className={`${childModuleName == '作业描述' ? 'active' : '' } `}
to={`/courses/${courseId}/${moduleEngName}/${workId}/question`}>作业描述
- {view_answer == true &&
this.setState({moduleName: '参考答案'})}
- className={`${childModuleName == '参考答案' ? 'active' : '' } `}
+ className={`${childModuleName == '参考答案' ? 'active' : '' } `}
to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案}
this.setState({moduleName: '设置'})}
className={`${childModuleName == '设置' ? 'active' : '' } `}
style={{paddingLeft:this.props.isAdmin()?'38px':'20px'}}
to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>{this.props.isAdmin()?"设置":"得分规则"}
-
+
{/* { this.props.tabRightComponents } */}
@@ -365,16 +365,16 @@ class CommonWorkDetailIndex extends Component{
{isAdmin && this.props.toEditPage(this.props.match.params, workId)}>编辑作业}
{ //
- work_statuses && work_statuses.indexOf('关联项目') != -1 &&
+ work_statuses && work_statuses.indexOf('关联项目') != -1 &&
this.openConnectionProject({ homework_id: workId })}>关联项目
this.props.toCreateProject()}>创建项目
}
-
+
{ //
- work_statuses && work_statuses.indexOf('取消关联') != -1 &&
+ work_statuses && work_statuses.indexOf('取消关联') != -1 &&
this.cancelConnectionProject( {homework_id: workId} )}>取消关联
}
@@ -390,7 +390,7 @@ class CommonWorkDetailIndex extends Component{
{work_statuses && work_statuses.indexOf('修改作品') != -1 && { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}}
>修改作品}
- {work_statuses && work_statuses.indexOf('补交附件') != -1 &&
+ {work_statuses && work_statuses.indexOf('补交附件') != -1 &&
补交附件
-
+
}
@@ -415,7 +415,7 @@ class CommonWorkDetailIndex extends Component{
{/* 内容区 */}
-
+
{/* --------------------------------------------------------------------- */}
{/* 作业设置 */}
@@ -474,7 +474,7 @@ class CommonWorkDetailIndex extends Component{
-
+
)
}
}
diff --git a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
index 41e03d176..e8d89089e 100644
--- a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
+++ b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
@@ -1,7 +1,7 @@
import React,{Component} from "react";
import { Form, Select, Input, Button,Checkbox,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
import {Link} from 'react-router-dom';
-import { WordsBtn, MarkdownToHtml } from 'educoder';
+import { WordsBtn, getRandomNumber } from 'educoder';
import axios from 'axios';
import PublishRightnow from '../PublishRightnow'
import AccessoryModal from "../../coursesPublic/AccessoryModal";
@@ -44,7 +44,7 @@ class TabRightComponents extends Component{
}
/// 确认是否下载
confirmysl(url){
- axios.get(url + '?export=true' ).then((response) => {
+ axios.get(url + '&export=true' ).then((response) => {
if(response.data.status&&response.data.status===-1){
}else if(response.data.status&&response.data.status===-2){
@@ -108,8 +108,8 @@ class TabRightComponents extends Component{
const isAdmin = this.props.isAdmin()
const isSuperAdmin = this.props.isSuperAdmin()
- let exportUrl = `/api/homework_commons/${workId}/works_list.zip`
- const exportResultUrl = `/api/homework_commons/${workId}/works_list.xlsx`
+ let exportUrl = `/api/homework_commons/${workId}/works_list.zip${getRandomNumber()}`
+ const exportResultUrl = `/api/homework_commons/${workId}/works_list.xlsx${getRandomNumber()}`
return(
diff --git a/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js b/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
index 420f83ff1..594eb3c5c 100644
--- a/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
+++ b/public/react/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import {Button,Layout,Tabs,Icon, Card, Avatar, Row, Col ,Table,Badge} from 'antd';
-import {markdownToHTML,getImageUrl} from 'educoder';
+import {markdownToHTML,getImageUrl,getRandomNumber} from 'educoder';
import axios from 'axios';
const { Content } = Layout;
@@ -69,7 +69,7 @@ class CompetitionContents extends Component{
const operations =
const columns = [
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 63bdbd170..bd5c7867b 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -1,7 +1,7 @@
import React,{ Component } from "react";
import {Checkbox,Input,Table, Pagination,Menu,Spin} from "antd";
import {Link,NavLink} from 'react-router-dom';
-import { WordsBtn ,ActionBtn,queryString,getRandomcode} from 'educoder';
+import { WordsBtn ,getRandomNumber,queryString,getRandomcode} from 'educoder';
import CoursesListType from '../coursesPublic/CoursesListType';
import '../css/members.css';
import '../css/busyWork.css';
@@ -177,7 +177,7 @@ class Testpapersettinghomepage extends Component{
}
console.log("170");
console.log(params);
- const urll=url+`?${queryString.stringify(params)}`;
+ const urll=url+`?${queryString.stringify(params)}${params?"&"+getRandomNumber(true):getRandomNumber(true)}`;
axios.get(urll+ '&export=true').then((response) => {
if(response===undefined){
return
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
index 3a4890ece..460841037 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
-import {getRandomNumber,queryString} from 'educoder';
+import {getRandomNumber} from 'educoder';
import {Link} from 'react-router-dom';
import {Tooltip,Menu} from 'antd';
import Loadable from 'react-loadable';
@@ -519,8 +519,8 @@ class GraduationTaskDetail extends Component{
{this.props.isAdmin()?
导出
:""}
{questionslist.work_status===undefined||questionslist.work_status===null||questionslist.work_status.length===0?"":questionslist.work_status.map((item,key)=>{
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index f90ca57f1..476073a9d 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -873,7 +873,7 @@ class GraduationTaskssettingapp extends Component{
confirmysl(url){
debugger;
console.log(3);
- axios.get(url + '?export=true' ).then((response) => {
+ axios.get(url + '&export=true' ).then((response) => {
if(response === undefined){
return
}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index c9ef0ec0d..574f92cb2 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -735,7 +735,7 @@ class GraduationTaskssettinglist extends Component{
b_order:b_order,
search:search,
}
- axios.get(url + '?export=true',{
+ axios.get(url + '&export=true',{
params
}).then((response) => {
if(response === undefined){
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
index b15b6fb2f..5e96af4c8 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
@@ -217,7 +217,7 @@ class GraduationTasksquestions extends Component{
confirmysl(url){
debugger;
console.log(2);
- axios.get(url + '?export=true').then((response) => {
+ axios.get(url + '&export=true').then((response) => {
if(response === undefined){
return
}
diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js
index b77b4c096..0161e761a 100644
--- a/public/react/src/modules/courses/graduation/topics/index.js
+++ b/public/react/src/modules/courses/graduation/topics/index.js
@@ -4,7 +4,7 @@ import {Checkbox, Menu, Pagination,Spin} from "antd";
import Titlesearchsection from '../../common/titleSearch/TitleSearchSection'
import DownloadMessageysl from "../../../modals/DownloadMessageysl";
-import { WordsBtn ,getRandomcode} from 'educoder'
+import { WordsBtn ,getRandomcode,getRandomNumber} from 'educoder'
import NoneData from '../../coursesPublic/NoneData'
import Modals from "../../../modals/Modals"
import axios from 'axios'
@@ -55,7 +55,7 @@ class Boards extends Component{
let {pageSize}=this.state;
const cid = this.props.match.params.coursesId
-
+
let url = `/courses/${cid}/graduation_topics.json?limit=${pageSize}`
if(searchValue!=""){
url+="&search="+searchValue
@@ -142,8 +142,8 @@ class Boards extends Component{
checkBoxValues: _.difference(this.state.checkBoxValues, values)
})
}
- }
-
+ }
+
onItemClick = (item) => {
const checkBoxValues = this.state.checkBoxValues.slice(0);
const index = checkBoxValues.indexOf(item.id);
@@ -198,7 +198,7 @@ class Boards extends Component{
})
}
cancelOperateTopic=()=>{
- this.setState({
+ this.setState({
modalsType:false,
modalsTopval:"",
modalsBottomval:"",
@@ -257,7 +257,7 @@ onDelete=(index)=>{
console.log(error)
})
}
-
+
}else{
this.setState({
// delType:true,
@@ -319,7 +319,7 @@ sureDelTopic=()=>{
}).catch((error)=>{
console.log(error);
})
- }
+ }
}else{
this.setState({
delType:false,
@@ -335,7 +335,7 @@ onBoardsNew=()=>{
}
/// 确认是否下载
confirmysl(url){
- axios.get(url + '?export=true').then((response) => {
+ axios.get(url + '&export=true').then((response) => {
if(response.data.status&&response.data.status===-1){
}else if(response.data.status&&response.data.status===-2){
@@ -376,12 +376,12 @@ onBoardsNew=()=>{
this.fetchAll(searchValue,page,status);
}
render(){
- let {
- searchValue,
- topicList,
+ let {
+ searchValue,
+ topicList,
data,
course_public,
- checkBoxValues,
+ checkBoxValues,
checkAllValue,
page,
totalCount,
@@ -416,7 +416,7 @@ onBoardsNew=()=>{
(
{/* 参考普通作业 - 题库选用 */}
{/* this.useFromBank()}>题库选用 正式版没有,先隐藏*/}
- < a className={"fl color-blue mr30 font-16"} onClick={(url)=>this.confirmysl(`/courses/${this.props.match.params.coursesId}/graduation_topics/export.xlsx`)}>导出
+ < a className={"fl color-blue mr30 font-16"} onClick={(url)=>this.confirmysl(`/courses/${this.props.match.params.coursesId}/graduation_topics/export.xlsx?${getRandomNumber(true)}`)}>导出
{/*
题库选用*/}
this.onBoardsNew()}>新建
):""
@@ -507,9 +507,9 @@ onBoardsNew=()=>{
:
}
-
-
-
+
+
+
)
}
diff --git a/public/react/src/modules/courses/groupjobbank/GroupPackage.js b/public/react/src/modules/courses/groupjobbank/GroupPackage.js
index e0b220202..1cd0564a2 100644
--- a/public/react/src/modules/courses/groupjobbank/GroupPackage.js
+++ b/public/react/src/modules/courses/groupjobbank/GroupPackage.js
@@ -1,6 +1,6 @@
import React, {Component} from "react";
-import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import { WordsBtn,on, off, trigger,markdownToHTML,getRandomNumber} from 'educoder';
import {
Button,
Checkbox,
@@ -23,7 +23,8 @@ class GroupPackage extends Component {
}
}
DownloadOpenPdf=(type,url)=>{
- type===true?window.open(url):window.location.href=url;
+ let newurl=url+getRandomNumber();
+ type===true?window.open(newurl):window.location.href=newurl;
}
componentDidMount() {
console.log("Groupjobquesanswer");
diff --git a/public/react/src/modules/courses/members/CourseGroupList.js b/public/react/src/modules/courses/members/CourseGroupList.js
index 0db0ae37e..95dcca227 100644
--- a/public/react/src/modules/courses/members/CourseGroupList.js
+++ b/public/react/src/modules/courses/members/CourseGroupList.js
@@ -14,7 +14,7 @@ import CourseLayoutcomponent from '../common/CourseLayoutComponent'
import Titlesearchsection from '../common/titleSearch/TitleSearchSection'
import ColorCountText from '../common/titleSearch/ColorCountText'
-import { WordsBtn, trigger, on, off, getUrl, downloadFile , sortDirections, NoneData } from 'educoder'
+import { WordsBtn, trigger, on, off, getUrl, downloadFile , getRandomNumber, NoneData } from 'educoder'
import Modals from "../../modals/Modals";
import DownloadMessageysl from "../../modals/DownloadMessageysl";
@@ -23,7 +23,7 @@ import ChangeRolePop from './ChangeRolePop'
import CourseGroupListTable from './CourseGroupListTable'
import './studentsList.css'
-/**
+/**
角色数组, CREATOR: 创建者, PROFESSOR: 教师, ASSISTANT_PROFESSOR: 助教, STUDENT: 学生
*/
function CourseGroupList(props) {
@@ -36,7 +36,7 @@ function CourseGroupList(props) {
const [listRes, setListRes] = useState({})
const createGroupModalEl = useRef(null);
- const courseId = props.match.params.coursesId
+ const courseId = props.match.params.coursesId
useEffect(() => {
fetchAll()
@@ -63,7 +63,7 @@ function CourseGroupList(props) {
}
const onConfirm = async () => {
}
-
+
function createGroupImportSuccess() {
}
@@ -83,7 +83,7 @@ function CourseGroupList(props) {
}
const confirmysl = (url) => {
- axios.get(url + 'export=true').then((response) => {
+ axios.get(url + '&export=true').then((response) => {
if(response === undefined){
return
}
@@ -106,7 +106,7 @@ function CourseGroupList(props) {
console.log(error)
});
}
-
+
const isAdmin = props.isAdmin();
const isSuperAdmin = props.isSuperAdmin();
const isParent = true;
@@ -121,9 +121,9 @@ function CourseGroupList(props) {
const course_groups = listRes.course_groups
const current_group_id = listRes.current_group_id
- let exportUrl = `/courses/${courseId}/export_member_scores_excel.xlsx?`; //总成绩
- let exportUrltwo = `/courses/${courseId}/export_couser_info.xlsx?`; //课堂信息
- let exportUrlthree = `/courses/${courseId}/export_member_act_score.xlsx?`; //活跃度
+ let exportUrl = `/courses/${courseId}/export_member_scores_excel.xlsx?${getRandomNumber(true)}`; //总成绩
+ let exportUrltwo = `/courses/${courseId}/export_couser_info.xlsx?${getRandomNumber(true)}`; //课堂信息
+ let exportUrlthree = `/courses/${courseId}/export_member_act_score.xlsx?${getRandomNumber(true)}`; //活跃度
return (
= 10}
searchPlaceholder={ '请输入分班名称进行搜索' }
firstRowRight={
-
- { // pageType !== TYPE_STUDENTS &&
+
+ { // pageType !== TYPE_STUDENTS &&
isSuperAdmin &&
{/* ref="createGroupByImportModal" */}
{createGroupModalEl.current.setVisible(true)}}>导入创建分班
}
- {
- // pageType !== TYPE_STUDENTS &&
+ {
+ // pageType !== TYPE_STUDENTS &&
!isCourseEnd && isAdmin && addDir()}>新建分班 }
- {/* {
+ {/* {
isAdmin && !isParent && course_group_id != 0 && deleteDir()}>删除分班 } */}
- {/* {
+ {/* {
isAdmin && !isParent && course_group_id != 0 && this.renameDir()}>分班重命名 } */}