From d75d507ab3cf1db86a99cf524b25d5b1d7f22478 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 6 Mar 2020 14:10:23 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=80=97=E6=97=B6?=
=?UTF-8?q?=E4=B8=8D=E5=87=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/tasks/shixuns.rake | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 lib/tasks/shixuns.rake
diff --git a/lib/tasks/shixuns.rake b/lib/tasks/shixuns.rake
new file mode 100644
index 000000000..f2cdddc52
--- /dev/null
+++ b/lib/tasks/shixuns.rake
@@ -0,0 +1,18 @@
+#coding=utf-8
+
+
+desc "纠正学生实训耗时不准的问题"
+
+namespace :shixuns do
+ task correct_the_shixun_cost_time: :environment do
+ puts "myshixun_id: #{ENV['myshixun_id']}"
+ if ENV['myshixun_id'].present?
+ myshixun = Myshixun.find(ENV['myshixun_id'])
+ myshixun.games.where(status: 2).each do |game|
+ cost_time = game.open_time.to_i - game.end_time.to_i
+ game.update_column(:cost_time, cost_time)
+ end
+ end
+
+ end
+end
\ No newline at end of file
From bdb9e7b1ad1349237f1e864799b432ea7d82a53f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 6 Mar 2020 14:18:53 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/tasks/shixuns.rake | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/tasks/shixuns.rake b/lib/tasks/shixuns.rake
index f2cdddc52..bca3d6db6 100644
--- a/lib/tasks/shixuns.rake
+++ b/lib/tasks/shixuns.rake
@@ -9,7 +9,11 @@ namespace :shixuns do
if ENV['myshixun_id'].present?
myshixun = Myshixun.find(ENV['myshixun_id'])
myshixun.games.where(status: 2).each do |game|
+ puts "open_time: #{game.open_time.to_i}"
+ puts "end_time: #{game.end_time.to_i}"
+ puts "game_id: #{game.id}"
cost_time = game.open_time.to_i - game.end_time.to_i
+ puts "cost_time: #{cost_time}"
game.update_column(:cost_time, cost_time)
end
end
From be87a6ec2f683315e9cac19c0bacff1d803744dd Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 6 Mar 2020 14:20:03 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3games=E7=9A=84=E8=80=97?=
=?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/tasks/shixuns.rake | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/lib/tasks/shixuns.rake b/lib/tasks/shixuns.rake
index bca3d6db6..0249c98f1 100644
--- a/lib/tasks/shixuns.rake
+++ b/lib/tasks/shixuns.rake
@@ -9,11 +9,7 @@ namespace :shixuns do
if ENV['myshixun_id'].present?
myshixun = Myshixun.find(ENV['myshixun_id'])
myshixun.games.where(status: 2).each do |game|
- puts "open_time: #{game.open_time.to_i}"
- puts "end_time: #{game.end_time.to_i}"
- puts "game_id: #{game.id}"
- cost_time = game.open_time.to_i - game.end_time.to_i
- puts "cost_time: #{cost_time}"
+ cost_time = game.end_time.to_i - game.open_time.to_i
game.update_column(:cost_time, cost_time)
end
end
From 90c030926ae9f0e5aa57d3ca00e09162f391a66d Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 6 Mar 2020 14:21:20 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E8=AF=84=E6=B5=8B=E8=80=97=E6=97=B6?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/tasks/shixuns.rake | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/tasks/shixuns.rake b/lib/tasks/shixuns.rake
index 0249c98f1..ce6d2b80d 100644
--- a/lib/tasks/shixuns.rake
+++ b/lib/tasks/shixuns.rake
@@ -9,7 +9,11 @@ namespace :shixuns do
if ENV['myshixun_id'].present?
myshixun = Myshixun.find(ENV['myshixun_id'])
myshixun.games.where(status: 2).each do |game|
+ puts "open_time: #{game.open_time.to_i}"
+ puts "end_time: #{game.end_time.to_i}"
+ puts "game_id: #{game.id}"
cost_time = game.end_time.to_i - game.open_time.to_i
+ puts "cost_time: #{cost_time}"
game.update_column(:cost_time, cost_time)
end
end
From 1e6381b256443c727ad480f984152fc94a98fc08 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 6 Mar 2020 14:24:09 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/tasks/shixuns.rake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/tasks/shixuns.rake b/lib/tasks/shixuns.rake
index ce6d2b80d..28795a099 100644
--- a/lib/tasks/shixuns.rake
+++ b/lib/tasks/shixuns.rake
@@ -14,7 +14,7 @@ namespace :shixuns do
puts "game_id: #{game.id}"
cost_time = game.end_time.to_i - game.open_time.to_i
puts "cost_time: #{cost_time}"
- game.update_column(:cost_time, cost_time)
+ game.update_column!(:cost_time, cost_time)
end
end
From 257aa29880ef37cf5526a449c7cf79f4404c0226 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 6 Mar 2020 14:25:11 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/tasks/shixuns.rake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/tasks/shixuns.rake b/lib/tasks/shixuns.rake
index 28795a099..84f8afd34 100644
--- a/lib/tasks/shixuns.rake
+++ b/lib/tasks/shixuns.rake
@@ -14,7 +14,7 @@ namespace :shixuns do
puts "game_id: #{game.id}"
cost_time = game.end_time.to_i - game.open_time.to_i
puts "cost_time: #{cost_time}"
- game.update_column!(:cost_time, cost_time)
+ game.update_attributes!(cost_time: cost_time)
end
end
From 4e325346985b11d89e5308e30508b0b0e5b3cae1 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 6 Mar 2020 17:28:54 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=A4=9A=E8=BF=9B=E7=A8=8B=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/tasks/static_all.rake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/tasks/static_all.rake b/lib/tasks/static_all.rake
index 6deec5da1..2290f0dc5 100644
--- a/lib/tasks/static_all.rake
+++ b/lib/tasks/static_all.rake
@@ -3,8 +3,9 @@ desc "统计每个学校使用数据"
namespace :static_all do
task :repo => :environment do
school_alls = School.includes(:courses, user_extensions: :user).all
+ proc_num = ENV['processes'].blank? ? 5 : ENV['processes'].to_i
school_alls.find_in_batches(batch_size: 50) do |schools|
- Parallel.each(schools, in_processes: 5) do |school|
+ Parallel.each(schools, in_processes: proc_num) do |school|
puts("school_id: #{school.id}")
data = Schools::SchoolStatisticService.new(school)
sta_all = StaAll.find_or_initialize_by(school_id: school.id)
From f614c99827291c79988081da2a76559b1edb46a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 6 Mar 2020 19:38:26 +0800
Subject: [PATCH 8/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
---
.../src/modules/testpaper/Intecomponents.js | 28 +++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/public/react/src/modules/testpaper/Intecomponents.js b/public/react/src/modules/testpaper/Intecomponents.js
index 8776b6a9e..ce5040821 100644
--- a/public/react/src/modules/testpaper/Intecomponents.js
+++ b/public/react/src/modules/testpaper/Intecomponents.js
@@ -282,6 +282,34 @@ class Intecomponents extends Component {
}
preservation = () => {
+
+ let mylistcour=1;
+ try {
+ mylistcour=this.state.single_question_count+this.state.multiple_question_count+this.state.judgement_question_count+this.state.program_question_count
+ }catch (e) {
+
+ }
+ if(mylistcour===0){
+ this.props.showNotification(`没有题不能组卷`);
+ return;
+ }
+
+ let arraycour=1;
+ try {
+ arraycour=this.Judquestio.Getdatas()[3].rbdxt+this.Judquestio.Getdatas()[4].rbdxtx+ this.Judquestio.Getdatas()[5].rbpdt+this.Judquestio.Getdatas()[6].rbbct
+
+ }catch (e) {
+
+ }
+
+ if(arraycour===0){
+ this.props.showNotification(`没有设置题型及数量不能组卷`);
+ return;
+ }
+
+
+
+
if (this.Judquestio.Getdatas().length === 0) {
this.scrollToAnchor("Itembankstopid");
return;
From 9daef0475ff10ed7033a056bca504123b4da7690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 6 Mar 2020 19:39:43 +0800
Subject: [PATCH 9/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/modules/tpm/NewHeader.js | 30 +++++++++++------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index dccdbc5a7..8d3c85378 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -1075,21 +1075,21 @@ submittojoinclass=(value)=>{
`
}
- {
- Periofters===true?
-
-
-
-
-
- :""
- }
+ {/*{*/}
+ {/* Periofters===true?*/}
+ {/* */}
+ {/* */}
+ {/* */}
+ {/*
*/}
+ {/* 题库*/}
+ {/*
*/}
+ {/*