From 222139f2216b459d080bd214019ddd9d1f8135bb Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 6 Aug 2019 13:52:29 +0800 Subject: [PATCH 1/7] padding 60 --- public/react/src/modules/ShCommunity/CommunityHome.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/ShCommunity/CommunityHome.js b/public/react/src/modules/ShCommunity/CommunityHome.js index d1f51fad..dc86f23a 100644 --- a/public/react/src/modules/ShCommunity/CommunityHome.js +++ b/public/react/src/modules/ShCommunity/CommunityHome.js @@ -66,7 +66,12 @@ class CommunityHome extends Component { } let xhslist=["路由交换","H3CNA","H3CNE","H3CSE-Routing&Switching","H3CTE","","","H3CNE-SDN","","H3CIE-Routing&SWitching"] return ( -
+
+
{ BannersUrl===""?"": From 9b40bbd85d3c93a057216c12afc8fa7e96900fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 15 Aug 2019 11:31:29 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/ec/ecCourseSupports/ecCourseSupports.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js b/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js index 26f9a167..ef0d4625 100644 --- a/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js +++ b/public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js @@ -470,7 +470,7 @@ class ecCourseSupports extends Component { -
+
Date: Fri, 16 Aug 2019 15:56:14 +0800 Subject: [PATCH 3/7] b --- public/react/src/modules/ec/css/ecCourseEvaluations.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/react/src/modules/ec/css/ecCourseEvaluations.css b/public/react/src/modules/ec/css/ecCourseEvaluations.css index 11ee74bb..5319092b 100644 --- a/public/react/src/modules/ec/css/ecCourseEvaluations.css +++ b/public/react/src/modules/ec/css/ecCourseEvaluations.css @@ -558,4 +558,8 @@ a.TrainingLecturer:hover{ .mt60{ margin-top:60px; +} + +.SystemParameters{ + height:auto; } \ No newline at end of file From 7da945e398563d48f87289bb6ed4963ca9764992 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, 16 Aug 2019 16:02:14 +0800 Subject: [PATCH 4/7] b --- public/react/src/modules/ec/ecCourseSupportSetting/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/ec/ecCourseSupportSetting/style.css b/public/react/src/modules/ec/ecCourseSupportSetting/style.css index f961452a..85646a47 100644 --- a/public/react/src/modules/ec/ecCourseSupportSetting/style.css +++ b/public/react/src/modules/ec/ecCourseSupportSetting/style.css @@ -28,7 +28,7 @@ } .SystemParameters { - height: 60px; + min-height: 60px; } p { From 037d191cb736e21fceae0b61fffc2b7b6986dc21 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 16 Aug 2019 12:20:23 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20190803022733_add_exec_time_to_evaluate_records.rb | 5 ----- lib/tasks/users.rake | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 db/migrate/20190803022733_add_exec_time_to_evaluate_records.rb diff --git a/db/migrate/20190803022733_add_exec_time_to_evaluate_records.rb b/db/migrate/20190803022733_add_exec_time_to_evaluate_records.rb deleted file mode 100644 index 0b054e3c..00000000 --- a/db/migrate/20190803022733_add_exec_time_to_evaluate_records.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddExecTimeToEvaluateRecords < ActiveRecord::Migration - def change - add_column :evaluate_records, :exec_time, :integer - end -end diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake index bfa0678c..38535011 100644 --- a/lib/tasks/users.rake +++ b/lib/tasks/users.rake @@ -86,10 +86,10 @@ task :add_test_users => :environment do - (1..1000).each do |i| + (1..2000).find_each do |i| no = sprintf("%04d", i) - phone = "5160731#{no}" + phone = "6160731#{no}" us = UsersService.new user = us.register phone: phone, password: 'edu12345678' @@ -100,7 +100,7 @@ task :add_test_users => :environment do 平夏,凌旋,孤丝,怜寒,向萍,凡松,青丝,翠安,如天,凌雪,绮菱,代云,南莲,寻南,春文,香薇,冬灵,凌珍,采绿,天春,沛文, 紫槐,幻柏,采文,春梅,雪旋,盼海,映梦,安雁,映容,凝阳,访风,天亦,平绿,盼香,觅风,小霜,雪萍,半雪,山柳,谷雪,靖易, 白薇,梦菡,飞绿,如波,又晴,友易,香菱,冬亦,问雁,妙春,海冬,半安,平春,幼柏,秋灵,凝芙,念烟,白山,从灵,尔芙,迎蓉, - 念寒,翠绿,翠芙,靖儿,妙柏,千凝,小珍,天巧。妙旋,雪枫,夏菡,元绿,痴灵,绮琴,雨双,听枫,觅荷,凡之,晓凡,雅彤,香薇, + 念寒,翠绿,翠芙,靖儿,妙柏,千凝,小珍,天巧,妙旋,雪枫,夏菡,元绿,痴灵,绮琴,雨双,听枫,觅荷,凡之,晓凡,雅彤,香薇, 孤风,从安,绮彤,之玉,雨珍,幻丝,代梅,香波,青亦,元菱,海瑶,飞槐,听露,梦岚,幻竹,新冬,盼翠,谷云".split(",") lastname = l[rand(l.length)] + f[rand(f.length)] @@ -109,7 +109,7 @@ task :add_test_users => :environment do lastname: lastname, nickname: '', sex: 0, - mail: "00educoder#{no}@qq.com", + mail: "stueducoder#{no}@qq.com", identity: 1, te_technical_title: 0, pro_technical_title: 0, From ef6858b936ebb5b5d56121a308e1922e4c5bdc3a Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 16 Aug 2019 12:29:18 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/users.rake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake index 38535011..c1a9da91 100644 --- a/lib/tasks/users.rake +++ b/lib/tasks/users.rake @@ -86,7 +86,8 @@ task :add_test_users => :environment do - (1..2000).find_each do |i| + (1..2000).each do |i| + puts i no = sprintf("%04d", i) phone = "6160731#{no}" From 06cb2ff823e91c5f2fb679fc2f4497329ada5856 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 16 Aug 2019 18:31:29 +0800 Subject: [PATCH 7/7] ecloud --- app/controllers/ecloud_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/ecloud_controller.rb b/app/controllers/ecloud_controller.rb index 3e02c579..ac303ce3 100644 --- a/app/controllers/ecloud_controller.rb +++ b/app/controllers/ecloud_controller.rb @@ -18,7 +18,7 @@ class EcloudController < ApplicationController skip_before_filter :verify_authenticity_token before_filter :save_para - before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update] + # before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update] before_filter :user_setup # before_filter :require_login, only: [:authorize]