+
题数：{questions}
总分：{totalscore}
-
+
+
+
拖动试题可调整排序
+
共{total}个试题
+
+
+ {/*单选题*/}
+
+
+
+
+
+
+
+
diff --git a/public/react/src/modules/question/Paperreview_judgment.js b/public/react/src/modules/question/Paperreview_judgment.js
new file mode 100644
index 000000000..6a8155f2a
--- /dev/null
+++ b/public/react/src/modules/question/Paperreview_judgment.js
@@ -0,0 +1,110 @@
+import React, {Component} from "react";
+import {Link, NavLink} from 'react-router-dom';
+import {WordsBtn, ActionBtn, getImageUrl,markdownToHTML} from 'educoder';
+import axios from 'axios';
+import {
+ notification,
+ Spin,
+ Table,
+ Pagination,
+ Drawer,
+ Input,
+ Button,
+ Breadcrumb
+} from "antd";
+import Itembankstop from "./component/Itembankstop";
+import NoneData from './component/NoneData';
+import './questioncss/questioncom.css';
+import '../tpm/newshixuns/css/Newshixuns.css';
+
+//判断题
+class Paperreview_judgment extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ questions:0,
+ totalscore:0,
+ total:0,
+
+ }
+
+ }
+
+ //初始化
+ componentDidMount() {
+
+
+
+
+ }
+
+
+ getdata = (data) => {
+
+ }
+
+ preservation = () => {
+
+
+
+
+ }
+
+
+ setitem_type = (item_type) => {
+
+
+ }
+
+ render() {
+ let {questions,totalscore,total,items} = this.state;
+ // //console.log(params);
+ return (
+
+
+
+ {/*顶部*/}
+
+ {/*内容*/}
+ {/*
*/}
+
+ {/*
*/}
+ {/* {*/}
+ {/* items.item_type==="JUDGMENT"?*/}
+ {/* items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
+ {/* return (*/}
+ {/*
*/}
+ {/* */}
+ {/* {object.choice_text}*/}
+ {/* */}
+ {/*
*/}
+ {/* )*/}
+ {/* })*/}
+ {/* :*/}
+ {/* items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
+ {/* return (*/}
+ {/*
*/}
+ {/* {tagArray[index]}*/}
+ {/*
*/}
+ {/* */}
+ {/* )*/}
+ {/* })*/}
+ {/* }*/}
+
+ {/* */}
+ {/*
*/}
+
+ )
+
+ }
+
+
+}
+
+export default Paperreview_judgment
+
+
diff --git a/public/react/src/modules/question/Paperreview_multlple.js b/public/react/src/modules/question/Paperreview_multlple.js
new file mode 100644
index 000000000..74f100f71
--- /dev/null
+++ b/public/react/src/modules/question/Paperreview_multlple.js
@@ -0,0 +1,110 @@
+import React, {Component} from "react";
+import {Link, NavLink} from 'react-router-dom';
+import {WordsBtn, ActionBtn, getImageUrl,markdownToHTML} from 'educoder';
+import axios from 'axios';
+import {
+ notification,
+ Spin,
+ Table,
+ Pagination,
+ Drawer,
+ Input,
+ Button,
+ Breadcrumb
+} from "antd";
+import Itembankstop from "./component/Itembankstop";
+import NoneData from './component/NoneData';
+import './questioncss/questioncom.css';
+import '../tpm/newshixuns/css/Newshixuns.css';
+
+//多选题
+class Paperreview_multlple extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ questions:0,
+ totalscore:0,
+ total:0,
+
+ }
+
+ }
+
+ //初始化
+ componentDidMount() {
+
+
+
+
+ }
+
+
+ getdata = (data) => {
+
+ }
+
+ preservation = () => {
+
+
+
+
+ }
+
+
+ setitem_type = (item_type) => {
+
+
+ }
+
+ render() {
+ let {questions,totalscore,total,items} = this.state;
+ // //console.log(params);
+ return (
+
+
+
+ {/*顶部*/}
+
+ {/*内容*/}
+ {/*
*/}
+
+ {/*
*/}
+ {/* {*/}
+ {/* items.item_type==="JUDGMENT"?*/}
+ {/* items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
+ {/* return (*/}
+ {/*
*/}
+ {/* */}
+ {/* {object.choice_text}*/}
+ {/* */}
+ {/*
*/}
+ {/* )*/}
+ {/* })*/}
+ {/* :*/}
+ {/* items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
+ {/* return (*/}
+ {/*
*/}
+ {/* {tagArray[index]}*/}
+ {/*
*/}
+ {/* */}
+ {/* )*/}
+ {/* })*/}
+ {/* }*/}
+
+ {/* */}
+ {/*
*/}
+
+ )
+
+ }
+
+
+}
+
+export default Paperreview_multlple
+
+
diff --git a/public/react/src/modules/question/Paperreview_program.js b/public/react/src/modules/question/Paperreview_program.js
new file mode 100644
index 000000000..c8f847dbe
--- /dev/null
+++ b/public/react/src/modules/question/Paperreview_program.js
@@ -0,0 +1,110 @@
+import React, {Component} from "react";
+import {Link, NavLink} from 'react-router-dom';
+import {WordsBtn, ActionBtn, getImageUrl,markdownToHTML} from 'educoder';
+import axios from 'axios';
+import {
+ notification,
+ Spin,
+ Table,
+ Pagination,
+ Drawer,
+ Input,
+ Button,
+ Breadcrumb
+} from "antd";
+import Itembankstop from "./component/Itembankstop";
+import NoneData from './component/NoneData';
+import './questioncss/questioncom.css';
+import '../tpm/newshixuns/css/Newshixuns.css';
+
+//编程题
+class Paperreview_program extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ questions:0,
+ totalscore:0,
+ total:0,
+
+ }
+
+ }
+
+ //初始化
+ componentDidMount() {
+
+
+
+
+ }
+
+
+ getdata = (data) => {
+
+ }
+
+ preservation = () => {
+
+
+
+
+ }
+
+
+ setitem_type = (item_type) => {
+
+
+ }
+
+ render() {
+ let {questions,totalscore,total,items} = this.state;
+ // //console.log(params);
+ return (
+
+
+
+ {/*顶部*/}
+
+ {/*内容*/}
+ {/*
*/}
+
+ {/*
*/}
+ {/* {*/}
+ {/* items.item_type==="JUDGMENT"?*/}
+ {/* items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
+ {/* return (*/}
+ {/*
*/}
+ {/* */}
+ {/* {object.choice_text}*/}
+ {/* */}
+ {/*
*/}
+ {/* )*/}
+ {/* })*/}
+ {/* :*/}
+ {/* items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
+ {/* return (*/}
+ {/*
*/}
+ {/* {tagArray[index]}*/}
+ {/*
*/}
+ {/* */}
+ {/* )*/}
+ {/* })*/}
+ {/* }*/}
+
+ {/* */}
+ {/*
*/}
+
+ )
+
+ }
+
+
+}
+
+export default Paperreview_program
+
+
diff --git a/public/react/src/modules/question/Paperreview_single.js b/public/react/src/modules/question/Paperreview_single.js
new file mode 100644
index 000000000..95eee0163
--- /dev/null
+++ b/public/react/src/modules/question/Paperreview_single.js
@@ -0,0 +1,110 @@
+import React, {Component} from "react";
+import {Link, NavLink} from 'react-router-dom';
+import {WordsBtn, ActionBtn, getImageUrl,markdownToHTML} from 'educoder';
+import axios from 'axios';
+import {
+ notification,
+ Spin,
+ Table,
+ Pagination,
+ Drawer,
+ Input,
+ Button,
+ Breadcrumb
+} from "antd";
+import Itembankstop from "./component/Itembankstop";
+import NoneData from './component/NoneData';
+import './questioncss/questioncom.css';
+import '../tpm/newshixuns/css/Newshixuns.css';
+
+//单选题
+class Paperreview_single extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ questions:0,
+ totalscore:0,
+ total:0,
+
+ }
+
+ }
+
+ //初始化
+ componentDidMount() {
+
+
+
+
+ }
+
+
+ getdata = (data) => {
+
+ }
+
+ preservation = () => {
+
+
+
+
+ }
+
+
+ setitem_type = (item_type) => {
+
+
+ }
+
+ render() {
+ let {questions,totalscore,total,items} = this.state;
+ // //console.log(params);
+ return (
+
+
+
+ {/*顶部*/}
+
+ {/*内容*/}
+ {/*
*/}
+
+ {/*
*/}
+ {/* {*/}
+ {/* items.item_type==="JUDGMENT"?*/}
+ {/* items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
+ {/* return (*/}
+ {/*
*/}
+ {/* */}
+ {/* {object.choice_text}*/}
+ {/* */}
+ {/*
*/}
+ {/* )*/}
+ {/* })*/}
+ {/* :*/}
+ {/* items === undefined ||items === null? "" : items.choices.map((object, index) => {*/}
+ {/* return (*/}
+ {/*
*/}
+ {/* {tagArray[index]}*/}
+ {/*
*/}
+ {/* */}
+ {/* )*/}
+ {/* })*/}
+ {/* }*/}
+
+ {/* */}
+ {/*
*/}
+
+ )
+
+ }
+
+
+}
+
+export default Paperreview_single
+
+
diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css
index 530078a95..cecb24763 100644
--- a/public/react/src/modules/question/questioncss/questioncom.css
+++ b/public/react/src/modules/question/questioncss/questioncom.css
@@ -5,7 +5,12 @@
box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03);
border-radius:2px;
}
-
+.w1200wuh{
+ width:1062px;
+ background:rgba(255,255,255,1);
+ box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03);
+ border-radius:2px;
+}
.w1200dbl{
width:1062px;
min-height:60px;
@@ -134,6 +139,12 @@
margin-left: 20px;
min-height:150px;
}
+.borderwdswuh{
+ width: 1020px !important;
+ background: #FFFFFF;
+ border: 1px solid #DDDDDD;
+ min-height:150px;
+}
.borderwds283{
width: 1020px !important;
min-height:283px;
@@ -628,3 +639,55 @@
font-size: 14px;
}
+.pagertdstcolor{
+ color: #888888;
+ font-size: 12px;
+}
+
+.mb19{
+ margin-bottom: 19px;
+}
+
+.yldxtit{
+ color: #333333;
+ font-size: 14px;
+
+}
+.yldxtits{
+ color: #888888;
+ font-size: 14px;
+}
+.mt25{
+ margin-top: 25px;
+}
+
+.postitonrelati{
+ position: relative;
+}
+.postitonrelatis{
+ position: absolute;
+ right: 2px;
+ top: 11px;
+}
+
+.szdfd{
+ width:88px;
+ height:34px;
+ background:rgba(51,189,140,1);
+ border-radius:4px 4px 0px 0px;
+ text-align: center;
+ color: #ffffff;
+ line-height: 32px;
+ margin-right: 27px;
+}
+.scd{
+ width:88px;
+ height:34px;
+ background:#4CACFF;
+ border-radius:4px 4px 0px 0px;
+ text-align: center;
+ color: #ffffff;
+ line-height: 32px;
+
+
+}
From 1d43efcdd1607897e76e199fcbb58f8b568aa6fb Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 30 Dec 2019 16:49:18 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=90=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/application_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3d1fd642e..4daa3b45c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -27,7 +27,7 @@ class ApplicationController < ActionController::Base
if params[:client_key].present?
Rails.logger.info("111111 #{params[:client_key]}")
Rails.logger.info("00000 #{params[:timestamp]}")
- tip_exception(501, "请求超时") if Time.now - params[:timestamp].to_i > 5
+ tip_exception(501, "请求超时") if (Time.now - params[:timestamp].to_i).between(0,5)
timestamp = params[:timestamp]
sign = Digest::MD5.hexdigest("#{OPENKEY}#{timestamp}")
Rails.logger.info("2222 #{sign}")
From d81387c8e7858831e296d21b64c88365c82d43ed Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 30 Dec 2019 16:49:53 +0800
Subject: [PATCH 3/9] 1
---
app/controllers/application_controller.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4daa3b45c..63c32f7e6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -27,7 +27,8 @@ class ApplicationController < ActionController::Base
if params[:client_key].present?
Rails.logger.info("111111 #{params[:client_key]}")
Rails.logger.info("00000 #{params[:timestamp]}")
- tip_exception(501, "请求超时") if (Time.now - params[:timestamp].to_i).between(0,5)
+ Rails.logger.info("Time.now - params[:timestamp].to_i: #{Time.now - params[:timestamp].to_i}")
+ tip_exception(501, "请求超时") unless (Time.now - params[:timestamp].to_i).between(0,5)
timestamp = params[:timestamp]
sign = Digest::MD5.hexdigest("#{OPENKEY}#{timestamp}")
Rails.logger.info("2222 #{sign}")
From 9f02077d434cc1da84ae338e5272b70f8a72de99 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 30 Dec 2019 16:51:02 +0800
Subject: [PATCH 4/9] 1
---
app/controllers/application_controller.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 63c32f7e6..3bad1718c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -27,8 +27,8 @@ class ApplicationController < ActionController::Base
if params[:client_key].present?
Rails.logger.info("111111 #{params[:client_key]}")
Rails.logger.info("00000 #{params[:timestamp]}")
- Rails.logger.info("Time.now - params[:timestamp].to_i: #{Time.now - params[:timestamp].to_i}")
- tip_exception(501, "请求超时") unless (Time.now - params[:timestamp].to_i).between(0,5)
+ Rails.logger.info("Time.now - params[:timestamp].to_i: #{Time.now.to_i - params[:timestamp].to_i}")
+ tip_exception(501, "请求超时") unless (Time.now.to_i - params[:timestamp].to_i).between(0,5)
timestamp = params[:timestamp]
sign = Digest::MD5.hexdigest("#{OPENKEY}#{timestamp}")
Rails.logger.info("2222 #{sign}")
From 7742f99aeb7d45faa85ab1d565df5d6c4155a8bf Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 30 Dec 2019 16:53:49 +0800
Subject: [PATCH 5/9] 1
---
app/controllers/application_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3bad1718c..65c05ef2a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base
Rails.logger.info("111111 #{params[:client_key]}")
Rails.logger.info("00000 #{params[:timestamp]}")
Rails.logger.info("Time.now - params[:timestamp].to_i: #{Time.now.to_i - params[:timestamp].to_i}")
- tip_exception(501, "请求超时") unless (Time.now.to_i - params[:timestamp].to_i).between(0,5)
+ tip_exception(501, "请求超时") unless (Time.now.to_i - params[:timestamp].to_i).between?(0,5)
timestamp = params[:timestamp]
sign = Digest::MD5.hexdigest("#{OPENKEY}#{timestamp}")
Rails.logger.info("2222 #{sign}")
From 8f0db2f4738843ccd184d705ab59e630374b55b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 30 Dec 2019 16:59:11 +0800
Subject: [PATCH 6/9] =?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/AppConfig.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 29e7461ec..9350001e4 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -7,8 +7,6 @@ import { broadcastChannelOnmessage ,SetAppModel, isDev, queryString } from 'educ
import { notification } from 'antd';
import './index.css';
const opens ="79e33abd4b6588941ab7622aed1e67e8";
-let timestamp = Date.parse(new Date());
-const newopens=md5(opens+timestamp)
broadcastChannelOnmessage('refreshPage', () => {
window.location.reload()
})
@@ -94,6 +92,8 @@ export function initAxiosInterceptors(props) {
}
}
if(`${config[0]}`!=`true`){
+ let timestamp = Date.parse(new Date())/1000;
+ let newopens=md5(opens+timestamp)
if (window.location.port === "3007") {
config.url = `${proxy}${url}`;
if (config.url.indexOf('?') == -1) {
From 4a653af7d1a89dcd05c42d8f18a782dce22c8ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 30 Dec 2019 17:03:59 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E9=A2=98=E5=BA=93=E8=AF=95=E5=8D=B7?=
=?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/question/Paperreview.js | 36 +++-
.../src/modules/question/Paperreview_item.js | 156 ++++++++++++------
.../modules/question/Paperreview_single.js | 69 ++++----
public/react/src/modules/question/Question.js | 2 +-
.../modules/question/component/Contentpart.js | 6 +-
.../question/questioncss/questioncom.css | 4 +
6 files changed, 180 insertions(+), 93 deletions(-)
diff --git a/public/react/src/modules/question/Paperreview.js b/public/react/src/modules/question/Paperreview.js
index c51cf6b93..5bce21e91 100644
--- a/public/react/src/modules/question/Paperreview.js
+++ b/public/react/src/modules/question/Paperreview.js
@@ -24,6 +24,7 @@ import JudquestionEditor from "./component/JudquestionEditor";
import Paperreview_item from "./Paperreview_item"
import Bottomsubmit from "../../modules/modals/Bottomsubmit";
+//人工组卷预览
class Paperreview extends Component {
constructor(props) {
super(props);
@@ -37,8 +38,20 @@ class Paperreview extends Component {
myquestion_choicesco: [],
disciplinesdata: [],
knowledgepoints: [],
- disciplmy: []
+ disciplmy: [],
+ single_questions:null,
+ multiple_questions:null,
+ judgement_questions:null,
+ program_questions:null,
+ all_score:0,
+ all_questions_count:0,
}
+ // single_questions:null, 单选题
+ // multiple_questions:null, 多选题
+ // judgement_questions:null, 判断题
+ // program_questions:null, 编程题
+ // all_score:0, 所有分数
+ // all_questions_count:0 所有问题数
}
@@ -72,11 +85,20 @@ class Paperreview extends Component {
} else {
}
- ////console.log("item_banks");
- ////console.log(response);
- this.setState({
- Contentdata: response.data,
- })
+ try {
+ this.setState({
+ Contentdata: response.data,
+ single_questions:response.data.single_questions.questions_count===0? null:response.data.single_questions,
+ multiple_questions:response.data.multiple_questions.questions_count===0? null:response.data.multiple_questions,
+ judgement_questions:response.data.judgement_questions.questions_count===0? null:response.data.judgement_questions,
+ program_questions:response.data.program_questions.questions_count===0? null:response.data.program_questions,
+ all_score:response.data.all_score,
+ all_questions_count:response.data.all_questions_count,
+ })
+ }catch (e) {
+
+ }
+
}).catch((error) => {
////console.log(error)
this.setState({
@@ -155,7 +177,7 @@ class Paperreview extends Component {