From ab5cec64704369a5e0306497bfb6b463f306cb17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Wed, 28 Aug 2019 13:56:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/Index.js | 16 +- .../comtopicdetails/CompletetopicdePage.js | 0 .../comtopicdetails/Completetopicdeswer.js | 0 .../comtopicdetails/Completetopicdetails.js | 0 .../comtopicdetails/completetopicde.css | 0 .../courses/groupjobbank/GroupPackage.js | 74 +++++++++ .../courses/groupjobbank/GroupPackage2.js | 73 +++++++++ .../groupjobbank/Groupjobbandetails.js | 84 ++++++++++ .../courses/groupjobbank/GroupjobbankPage.js | 146 ++++++++++++++++++ .../groupjobbank/Groupjobquesanswer.js | 82 ++++++++++ .../courses/groupjobbank/questionbanks.css | 38 +++++ .../courses/questionbank/Generaljobanswer.js | 13 +- .../questionbank/Generaljobbankdetails.js | 9 +- .../courses/questionbank/Generaljobdetails.js | 13 +- .../courses/questionbank/questionbank.css | 4 + 15 files changed, 523 insertions(+), 29 deletions(-) create mode 100644 public/react/src/modules/courses/comtopicdetails/CompletetopicdePage.js create mode 100644 public/react/src/modules/courses/comtopicdetails/Completetopicdeswer.js create mode 100644 public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js create mode 100644 public/react/src/modules/courses/comtopicdetails/completetopicde.css create mode 100644 public/react/src/modules/courses/groupjobbank/GroupPackage.js create mode 100644 public/react/src/modules/courses/groupjobbank/GroupPackage2.js create mode 100644 public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js create mode 100644 public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js create mode 100644 public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js create mode 100644 public/react/src/modules/courses/groupjobbank/questionbanks.css diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js index 48f07cc8c..9fd0c0ae4 100644 --- a/public/react/src/modules/courses/Index.js +++ b/public/react/src/modules/courses/Index.js @@ -263,11 +263,16 @@ const GraduationTasksSubmiteditApp=Loadable({ loader: () => import('./graduation/tasks/GraduationTasksSubmitedit'), loading: Loading, }) - +//普通作业题库详情 const Generaljobbankdetails =Loadable({ loader: () => import('../../modules/courses/questionbank/Generaljobbankdetails'), loading: Loading, -}) +}); +//分组作业题库详情 +const GroupjobbankPage =Loadable({ + loader: () => import('../../modules/courses/groupjobbank/GroupjobbankPage'), + loading: Loading, +}); class CoursesIndex extends Component{ constructor(props) { @@ -447,6 +452,13 @@ class CoursesIndex extends Component{ // console.log(commons) return ( + {/*GroupjobbankPage*/} + {/*分组作业题库详情*/} + () + } + > {/*Generaljobbankdetails*/} {/* 普通作业题库详情*/} { + var homeworkid = this.props.match.params.homeworkid; + } + + //跳转道描点的地方 + scrollToAnchor = (anchorName) => { + if (anchorName) { + // 找到锚点 + let anchorElement = document.getElementById(anchorName); + // 如果对应id的锚点存在，就跳转到锚点 + if(anchorElement) { anchorElement.scrollIntoView(); } + } + }; + + + + render() { + + return ( +
+ + + + + 清除浏览器缓存或换个浏览器操作指南更新版本.zip + + {2} + +
+ ) + } +} + +export default GroupPackage; \ No newline at end of file diff --git a/public/react/src/modules/courses/groupjobbank/GroupPackage2.js b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js new file mode 100644 index 000000000..6a48a51c8 --- /dev/null +++ b/public/react/src/modules/courses/groupjobbank/GroupPackage2.js @@ -0,0 +1,73 @@ +import React, {Component} from "react"; +import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder'; +import { + Button, + Checkbox, + message, + InputNumber, + DatePicker, + Radio, + Tooltip, + notification, +} from "antd"; +import './questionbanks.css'; + +class GroupPackage extends Component { + + constructor(props) { + super(props); + + this.state = { + + } + } + + componentDidMount() { + console.log("Groupjobquesanswer"); + console.log("componentDidMount"); + // let query = this.props.location.pathname; + // const type = query.split('/'); + // this.setState({ + // shixuntypes:type[3] + // }) + // this.props.triggerRef(this); + + + + + } + // 获取数据地方 + getTrainingjobsetting = () => { + var homeworkid = this.props.match.params.homeworkid; + } + + //跳转道描点的地方 + scrollToAnchor = (anchorName) => { + if (anchorName) { + // 找到锚点 + let anchorElement = document.getElementById(anchorName); + // 如果对应id的锚点存在，就跳转到锚点 + if(anchorElement) { anchorElement.scrollIntoView(); } + } + }; + + + + render() { + + return ( +
+

+ 分组要求： + 2~ 5（学生提交作品时需要关联同组成员，组内成员作品共享） +

+

+ 基于项目实施 + （学生必须在本平台创建项目，项目管理员可以提交作品） +

+
+ ) + } +} + +export default GroupPackage; \ No newline at end of file diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js new file mode 100644 index 000000000..772752def --- /dev/null +++ b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js @@ -0,0 +1,84 @@ +import React, {Component} from "react"; +import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder'; +import { + Button, + Checkbox, + message, + InputNumber, + DatePicker, + Radio, + Tooltip, + notification, +} from "antd"; +import './questionbanks.css'; +import GroupPackage from "./GroupPackage"; +import GroupPackage2 from "./GroupPackage2"; + + +class Groupjobbandetails extends Component { + + constructor(props) { + super(props); + + this.state = { + + } + } + + componentDidMount() { + console.log("Groupjobbandetails"); + console.log("componentDidMount"); + // let query = this.props.location.pathname; + // const type = query.split('/'); + // this.setState({ + // shixuntypes:type[3] + // }) + // this.props.triggerRef(this); + + + + + } + // 获取数据地方 + getTrainingjobsetting = () => { + var homeworkid = this.props.match.params.homeworkid; + } + + //跳转道描点的地方 + scrollToAnchor = (anchorName) => { + if (anchorName) { + // 找到锚点 + let anchorElement = document.getElementById(anchorName); + // 如果对应id的锚点存在，就跳转到锚点 + if(anchorElement) { anchorElement.scrollIntoView(); } + } + }; + + + + render() { + + return ( +
+
+ +
+ + + + +
+ + +
+ + + ) + } +} + +export default Groupjobbandetails; \ No newline at end of file diff --git a/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js new file mode 100644 index 000000000..837e06a80 --- /dev/null +++ b/public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js @@ -0,0 +1,146 @@ +import React, {Component} from "react"; +import {Link, NavLink} from 'react-router-dom'; +import {WordsBtn, ActionBtn} from 'educoder'; +import axios from 'axios'; +import { + notification +} from "antd"; +import CoursesListType from '../coursesPublic/CoursesListType'; +import Groupjobbandetails from './Groupjobbandetails'; +import Groupjobquesanswer from './Groupjobquesanswer'; +import '../css/members.css'; +import "../common/formCommon.css"; +import '../css/Courses.css'; +import '../css/busyWork.css'; +import '../poll/pollStyle.css'; + +class GroupjobbankPage extends Component { + //分组作业的题库详情 + constructor(props) { + super(props); + // this.answerMdRef = React.createRef(); + this.state = { + tab: ["0"], + } + + } + + //切换tab + ChangeTab = (e) => { + // console.log(e); + this.setState({ + tab: e + }) + try { + var currenturl = window.location.href; + var newUrl = (currenturl.split("?"))[0]; + window.history.pushState('','',newUrl+'?tab='+e); + }catch (e) { + console.log(e); + console.log("44"); + } + + } + + + componentDidMount() { + // console.log("父组件加载框"); + const query = this.props.location.search; + const type = query.split('?tab='); + // let sum = [] + // sum.push(type[1]) + // console.log("componentDidMountcomponentDidMount"); + // console.log(type); + this.setState({ + tab: type[1], + }) + let querys = this.props.location.pathname; + const types = querys.split('/'); + // console.log(types); + this.setState({ + shixuntypes: types[3] + }) + } + + + confirmysl(child,i) { + if(i===1){ + child.daochushixunbaogao(); + } + if(i===2){ + child.daochuzuoye(); + } + } + + homeworkendss(child){ + // child.homeworkends(); + } + + homeworkstarts(child){ + // child.homeworkstart(); + + } + workshowmodels(child){ + // child.workshowmodel(); + } + /// 确认是否下载 + + + bindRef = ref => { this.child = ref } +///////////////教师截止 + + render() { + let {tab, teacherdatapage, jobsettingsdatapage} = this.state; + + const isAdmin = this.props.isAdmin(); + // console.log(119) + console.log(jobsettingsdatapage); + + + return ( +
+ + +
+ +
+

+ 题库 + > + 详情 +

+
+
+

+ MySQL数据库编程开发实训（基础篇） +

+ +
+ + + + {parseInt(tab) === 0 ? :""} + {parseInt(tab) === 1 ? :""} + +
+
+ ) + } +} + +export default GroupjobbankPage; + diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js new file mode 100644 index 000000000..c6a0f787f --- /dev/null +++ b/public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js @@ -0,0 +1,82 @@ +import React, {Component} from "react"; +import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder'; +import { + Button, + Checkbox, + message, + InputNumber, + DatePicker, + Radio, + Tooltip, + notification, +} from "antd"; +import GroupPackage from './GroupPackage'; +import GroupPackage2 from './GroupPackage2'; +import './questionbanks.css'; + +class Groupjobquesanswer extends Component { + + constructor(props) { + super(props); + + this.state = { + + } + } + + componentDidMount() { + console.log("Groupjobquesanswer"); + console.log("componentDidMount"); + // let query = this.props.location.pathname; + // const type = query.split('/'); + // this.setState({ + // shixuntypes:type[3] + // }) + // this.props.triggerRef(this); + + + + + } + // 获取数据地方 + getTrainingjobsetting = () => { + var homeworkid = this.props.match.params.homeworkid; + } + + //跳转道描点的地方 + scrollToAnchor = (anchorName) => { + if (anchorName) { + // 找到锚点 + let anchorElement = document.getElementById(anchorName); + // 如果对应id的锚点存在，就跳转到锚点 + if(anchorElement) { anchorElement.scrollIntoView(); } + } + }; + + + + render() { + + return ( +
+
+ +
+ + + + +
+ + +
+ + ) + } +} + +export default Groupjobquesanswer; \ No newline at end of file diff --git a/public/react/src/modules/courses/groupjobbank/questionbanks.css b/public/react/src/modules/courses/groupjobbank/questionbanks.css new file mode 100644 index 000000000..f7dbe6331 --- /dev/null +++ b/public/react/src/modules/courses/groupjobbank/questionbanks.css @@ -0,0 +1,38 @@ +.yslquestionbank1{ + padding-top: 30px !important; + padding-right: 30px !important; + padding-left: 30px !important; +} +.yslquesHeigth{ + min-height: 500px !important; + +} +.yslquesmarkdowntext{ + font-size: 16px; + color: #707070; + +} +.yslquesmat26{ + margin-top: 26px; + padding-bottom: 33px !important; +} +.ysltextcolor9999{ + color: #999999; + font-size: 14px; +} +.ysltextcolor66{ + color: #666666; + font-size: 14px; +} +.ysltextcolor05{ + color: #05101A; + font-size: 14px; +} +.ml47text{ + margin-left: 17px; + padding-bottom: 37px; +} +.ysltextcolor99999{ + color: #999999; + font-size: 16px; +} \ No newline at end of file diff --git a/public/react/src/modules/courses/questionbank/Generaljobanswer.js b/public/react/src/modules/courses/questionbank/Generaljobanswer.js index 2f2816662..3bfc6cd36 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobanswer.js +++ b/public/react/src/modules/courses/questionbank/Generaljobanswer.js @@ -10,6 +10,7 @@ import { Tooltip, notification, } from "antd"; +import GroupPackage from '../groupjobbank/GroupPackage' import './questionbank.css'; class Generaljobanswer extends Component { @@ -65,17 +66,7 @@ class Generaljobanswer extends Component { "\n" + "本实训项目的主要目标是学习和掌握C++程序的基本结构和基本输入输出，主要内容包括标准C语言自有的单个字符的输入输出、格式化的输入输出，以及C++扩展的使用流对象的输入输出").replace(/▁/g, "▁▁▁")}}/> -
- - - - - 清除浏览器缓存或换个浏览器操作指南更新版本.zip - - {0} - -
+
diff --git a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js index 74deb7a60..39adf8246 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js +++ b/public/react/src/modules/courses/questionbank/Generaljobbankdetails.js @@ -15,6 +15,7 @@ import '../css/busyWork.css'; import '../poll/pollStyle.css'; class Generaljobbankdetails extends Component { + //普通作业的题库详情 constructor(props) { super(props); // this.answerMdRef = React.createRef(); @@ -109,8 +110,6 @@ class Generaljobbankdetails extends Component { 详情 - > - 作业详情

@@ -127,9 +126,9 @@ class Generaljobbankdetails extends Component {
this.ChangeTab(0)}>内容详情 this.ChangeTab(1)}>参考答案 - 发送 - 编辑 - 删除 + 发送 + 编辑 + 删除
diff --git a/public/react/src/modules/courses/questionbank/Generaljobdetails.js b/public/react/src/modules/courses/questionbank/Generaljobdetails.js index d33792c43..9de444123 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobdetails.js +++ b/public/react/src/modules/courses/questionbank/Generaljobdetails.js @@ -10,6 +10,7 @@ import { Tooltip, notification, } from "antd"; +import GroupPackage from '../groupjobbank/GroupPackage' import './questionbank.css'; @@ -66,17 +67,7 @@ class Generaljobdetails extends Component { "\n" + "本实训项目的主要目标是学习和掌握C++程序的基本结构和基本输入输出，主要内容包括标准C语言自有的单个字符的输入输出、格式化的输入输出，以及C++扩展的使用流对象的输入输出").replace(/▁/g, "▁▁▁")}}/> -
- - - - - 清除浏览器缓存或换个浏览器操作指南更新版本.zip - - {0} - -
+ diff --git a/public/react/src/modules/courses/questionbank/questionbank.css b/public/react/src/modules/courses/questionbank/questionbank.css index 9c9405347..43dcfa9c6 100644 --- a/public/react/src/modules/courses/questionbank/questionbank.css +++ b/public/react/src/modules/courses/questionbank/questionbank.css @@ -19,4 +19,8 @@ .ysltextcolor9999{ color: #999999; font-size: 14px; +} +.ysltextcolor99999{ + color: #999999; + font-size: 16px; } \ No newline at end of file