From 2ed2a4c4535b06cbfecad1b8b7b3b8af289ddc30 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 7 Jan 2020 14:33:49 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index cf30b15a1..4e26475fe 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -896,7 +896,8 @@ class ShixunsController < ApplicationController author_email = current_user.git_mail message = params[:message] || "upload file by browser" uid_logger("-----author_email: #{author_email}") - update_file_base64_content(content, @repo_path, @path, author_email, author_name, message) + path = @path.present? ? "#{@path}/#{upload_file.original_filename}" : "#{upload_file.original_filename}" + update_file_base64_content(content, @repo_path, path, author_email, author_name, message) render_ok end From 1aef38dfbdea53abe38e3ba9bd0d84b95db27f10 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 7 Jan 2020 15:34:15 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/git_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb index e72f1f5da..26e93d99b 100644 --- a/app/controllers/concerns/git_helper.rb +++ b/app/controllers/concerns/git_helper.rb @@ -60,7 +60,7 @@ module GitHelper # 删除文件 def git_delete_file(repo_path, file_path, author_name, author_email, message) - GitService.delete_file(repo_path, repo_path, file_path: file_path, message: message, author_name: author_name, + GitService.delete_file(repo_path: repo_path, file_path: file_path, message: message, author_name: author_name, author_email: author_email) end From 999579dcb584fee561f6ffc3da7ed18511fd0503 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 7 Jan 2020 15:50:24 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/git_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb index 26e93d99b..53571a09a 100644 --- a/app/controllers/concerns/git_helper.rb +++ b/app/controllers/concerns/git_helper.rb @@ -60,6 +60,7 @@ module GitHelper # 删除文件 def git_delete_file(repo_path, file_path, author_name, author_email, message) + Rails.logger.info("#####repo_path:#{repo_path}, file_path: #{file_path}") GitService.delete_file(repo_path: repo_path, file_path: file_path, message: message, author_name: author_name, author_email: author_email) end From c93ad145b2a5a6342da2888568431e7a8bf09799 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 7 Jan 2020 16:08:32 +0800 Subject: [PATCH 04/11] 1 --- app/services/git_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/git_service.rb b/app/services/git_service.rb index eedac2595..dbc4975ec 100644 --- a/app/services/git_service.rb +++ b/app/services/git_service.rb @@ -68,8 +68,8 @@ class GitService content = JSON.parse(body) if content["code"] != 0 - raise("版本库异常") logger.error("repository error: #{content['msg']}") + raise("版本库异常") end #raise content["msg"] if content["code"] != 0 From 2bb5df67a65526e452fd2d9f0067fdd1fe6765eb Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 7 Jan 2020 16:17:37 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/git_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb index 53571a09a..f9382de28 100644 --- a/app/controllers/concerns/git_helper.rb +++ b/app/controllers/concerns/git_helper.rb @@ -59,9 +59,9 @@ module GitHelper end # 删除文件 - def git_delete_file(repo_path, file_path, author_name, author_email, message) + def git_delete_file(repo_path, tree_path, author_name, author_email, message) Rails.logger.info("#####repo_path:#{repo_path}, file_path: #{file_path}") - GitService.delete_file(repo_path: repo_path, file_path: file_path, message: message, author_name: author_name, + GitService.delete_file(repo_path: repo_path, tree_path: tree_path, message: message, author_name: author_name, author_email: author_email) end From ea34116208d5f634c32be5430fd9fa19f8f8dda3 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 7 Jan 2020 16:20:00 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/git_helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb index f9382de28..43f401254 100644 --- a/app/controllers/concerns/git_helper.rb +++ b/app/controllers/concerns/git_helper.rb @@ -53,15 +53,15 @@ module GitHelper end # 添加目录 - def git_add_folder(repo_path, folder_path, author_name, author_email, message) - GitService.add_tree(repo_path: repo_path, file_path: folder_path, message: message, author_name: author_name, + def git_add_folder(repo_path, tree_path, author_name, author_email, message) + GitService.add_tree(repo_path: repo_path, tree_path: tree_path, message: message, author_name: author_name, author_email: author_email) end # 删除文件 - def git_delete_file(repo_path, tree_path, author_name, author_email, message) + def git_delete_file(repo_path, file_path, author_name, author_email, message) Rails.logger.info("#####repo_path:#{repo_path}, file_path: #{file_path}") - GitService.delete_file(repo_path: repo_path, tree_path: tree_path, message: message, author_name: author_name, + GitService.delete_file(repo_path: repo_path, file_path: file_path, message: message, author_name: author_name, author_email: author_email) end From 3c191f55a3500bd1c7d976861a0ed78676445080 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 7 Jan 2020 16:21:20 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/git_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb index 43f401254..d268e5522 100644 --- a/app/controllers/concerns/git_helper.rb +++ b/app/controllers/concerns/git_helper.rb @@ -54,6 +54,7 @@ module GitHelper # 添加目录 def git_add_folder(repo_path, tree_path, author_name, author_email, message) + Rails.logger.info("#####repo_path:#{repo_path}, tree_path: #{tree_path}") GitService.add_tree(repo_path: repo_path, tree_path: tree_path, message: message, author_name: author_name, author_email: author_email) end From 00e7cc07212358bade12a3ed1f1d32e9f7317600 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 7 Jan 2020 16:24:22 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=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 --- app/controllers/concerns/git_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb index d268e5522..f80434392 100644 --- a/app/controllers/concerns/git_helper.rb +++ b/app/controllers/concerns/git_helper.rb @@ -60,9 +60,9 @@ module GitHelper end # 删除文件 - def git_delete_file(repo_path, file_path, author_name, author_email, message) - Rails.logger.info("#####repo_path:#{repo_path}, file_path: #{file_path}") - GitService.delete_file(repo_path: repo_path, file_path: file_path, message: message, author_name: author_name, + def git_delete_file(repo_path, tree_path, author_name, author_email, message) + Rails.logger.info("#####repo_path:#{repo_path}, tree_path: #{tree_path}") + GitService.delete_file(repo_path: repo_path, tree_path: tree_path, message: message, author_name: author_name, author_email: author_email) end From 2dfa4ad632779bf499295f54901a7e68a0ad877d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 7 Jan 2020 16:53:35 +0800 Subject: [PATCH 09/11] ti --- public/react/src/AppConfig.js | 4 +-- .../src/modules/question/NewMyShixunModel.js | 34 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index a18e395dd..177328dfa 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -82,8 +82,8 @@ export function initAxiosInterceptors(props) { // proxy = "https://testeduplus2.educoder.net" //proxy="http://47.96.87.25:48080" proxy="https://pre-newweb.educoder.net" - // proxy="https://test-newweb.educoder.net" - proxy="https://test-jupyterweb.educoder.net" + proxy="https://test-newweb.educoder.net" + // proxy="https://test-jupyterweb.educoder.net" //proxy="http://192.168.2.63:3001" // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求； diff --git a/public/react/src/modules/question/NewMyShixunModel.js b/public/react/src/modules/question/NewMyShixunModel.js index e8acf2202..6c922b037 100644 --- a/public/react/src/modules/question/NewMyShixunModel.js +++ b/public/react/src/modules/question/NewMyShixunModel.js @@ -91,7 +91,7 @@ class NewMyShixunModel extends Component { page: this.state.page, per_page:10, oj_status:null, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); @@ -117,7 +117,7 @@ class NewMyShixunModel extends Component { page: 1, per_page:10, oj_status:null, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); } @@ -141,7 +141,7 @@ class NewMyShixunModel extends Component { page: 1, per_page:10, oj_status:null, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); } @@ -156,7 +156,7 @@ class NewMyShixunModel extends Component { public: defaultActiveKey, page:1, per_page:10, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); @@ -209,7 +209,7 @@ class NewMyShixunModel extends Component { page: 1, per_page:10, oj_status:null, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); @@ -342,7 +342,7 @@ class NewMyShixunModel extends Component { page: pageNumber, per_page:10, oj_status:this.state.oj_status, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); @@ -461,7 +461,7 @@ class NewMyShixunModel extends Component { page:1, per_page:10, oj_status:null, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); @@ -488,7 +488,7 @@ class NewMyShixunModel extends Component { per_page:10, keywords:null, oj_status:null, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); @@ -543,7 +543,7 @@ class NewMyShixunModel extends Component { page: this.state.page, per_page:10, oj_status:this.state.oj_status, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); @@ -567,7 +567,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page:10, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); } @@ -593,7 +593,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page:10, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); @@ -655,7 +655,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page:10, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdatasy(data); this.getbasket_listdata(); @@ -673,7 +673,7 @@ class NewMyShixunModel extends Component { let url=`/examination_banks/${id}/revoke_item.json`; axios.delete(url,{ data: { - item_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }}) .then((result) => { if (result.data.status == 0) { @@ -688,7 +688,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page:10, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdatasy(data); this.getbasket_listdata(); @@ -729,7 +729,7 @@ class NewMyShixunModel extends Component { } const data={ item_ids:item_idsdata, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), } this.getitem_baskets(data); this.setState({ @@ -758,7 +758,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page:10, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); this.getbasket_listdata(); @@ -796,7 +796,7 @@ class NewMyShixunModel extends Component { page: this.state.page, per_page:10, oj_status:oj_status, - exam_id:this.props.exam_id + item_id:parseInt(this.props.exam_id), }; this.getdata(data); } From 2ec66eb9450ed461cb30022881573fcf43413e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 7 Jan 2020 17:30:40 +0800 Subject: [PATCH 10/11] tiku --- .../src/modules/question/NewMyShixunModel.js | 50 +++++++++++-------- .../react/src/modules/question/Paperreview.js | 41 +++++++++++++-- .../src/modules/question/Paperreview_item.js | 2 +- .../modules/question/component/Listjihe.js | 2 +- .../modules/testpaper/Paperlibraryeditid.js | 16 +++++- 5 files changed, 84 insertions(+), 27 deletions(-) diff --git a/public/react/src/modules/question/NewMyShixunModel.js b/public/react/src/modules/question/NewMyShixunModel.js index 6c922b037..9db5d242f 100644 --- a/public/react/src/modules/question/NewMyShixunModel.js +++ b/public/react/src/modules/question/NewMyShixunModel.js @@ -91,7 +91,7 @@ class NewMyShixunModel extends Component { page: this.state.page, per_page:10, oj_status:null, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); @@ -117,7 +117,7 @@ class NewMyShixunModel extends Component { page: 1, per_page:10, oj_status:null, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); } @@ -141,7 +141,7 @@ class NewMyShixunModel extends Component { page: 1, per_page:10, oj_status:null, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); } @@ -156,7 +156,7 @@ class NewMyShixunModel extends Component { public: defaultActiveKey, page:1, per_page:10, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); @@ -209,7 +209,7 @@ class NewMyShixunModel extends Component { page: 1, per_page:10, oj_status:null, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); @@ -342,7 +342,7 @@ class NewMyShixunModel extends Component { page: pageNumber, per_page:10, oj_status:this.state.oj_status, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); @@ -461,7 +461,7 @@ class NewMyShixunModel extends Component { page:1, per_page:10, oj_status:null, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); @@ -488,7 +488,7 @@ class NewMyShixunModel extends Component { per_page:10, keywords:null, oj_status:null, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); @@ -543,7 +543,7 @@ class NewMyShixunModel extends Component { page: this.state.page, per_page:10, oj_status:this.state.oj_status, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); @@ -567,7 +567,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page:10, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); } @@ -593,7 +593,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page:10, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); @@ -639,7 +639,13 @@ class NewMyShixunModel extends Component { //选用 getitem_baskets=(data)=>{ //选用题型可以上传单个 或者多个题型 - let url="/examination_items.json"; + let url=""; + if(this.props.exam_id===undefined){ + url="/item_baskets.json"; + }else{ + url="/examination_items.json"; + } + axios.post(url, data) .then((result) => { @@ -655,7 +661,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page:10, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdatasy(data); this.getbasket_listdata(); @@ -669,11 +675,15 @@ class NewMyShixunModel extends Component { } // 撤销 getitem_basketss=(id)=>{ - //选用题型可以上传单个 或者多个题型 - let url=`/examination_banks/${id}/revoke_item.json`; + let url=""; + if(this.props.exam_id===undefined){ + url=`/item_baskets/${id}.json`; + }else{ + url=`/examination_banks/${id}/revoke_item.json`; + } axios.delete(url,{ data: { - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }}) .then((result) => { if (result.data.status == 0) { @@ -688,7 +698,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page:10, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdatasy(data); this.getbasket_listdata(); @@ -729,7 +739,7 @@ class NewMyShixunModel extends Component { } const data={ item_ids:item_idsdata, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), } this.getitem_baskets(data); this.setState({ @@ -758,7 +768,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page:10, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); this.getbasket_listdata(); @@ -796,7 +806,7 @@ class NewMyShixunModel extends Component { page: this.state.page, per_page:10, oj_status:oj_status, - item_id:parseInt(this.props.exam_id), + item_id:this.props.exam_id===undefined?"":parseInt(this.props.exam_id), }; this.getdata(data); } diff --git a/public/react/src/modules/question/Paperreview.js b/public/react/src/modules/question/Paperreview.js index 9014ba92b..67495dae3 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"; import Comthetestpaperst from "./comthetestpaper/Comthetestpaperst"; +import NewMyShixunModel from "../question/NewMyShixunModel"; //人工组卷预览 class Paperreview extends Component { constructor(props) { @@ -49,7 +50,7 @@ class Paperreview extends Component { difficulty:null, name:null, duration:null, - + newmyshixunmodelbool:false, } // single_questions:null, 单选题 @@ -245,14 +246,48 @@ class Paperreview extends Component { getcontentMdRef = (Ref) => { this.contentMdRef = Ref; } + + setnewmyshixunmodelbool=(bool)=>{ + if(bool===true){ + let scrollToTop = window.setInterval(function() { + let pos = window.pageYOffset; + if ( pos > 0 ) { + window.scrollTo( 0, pos - 20 ); // how far to scroll on each step + } else { + window.clearInterval( scrollToTop ); + } + }, 2); + } + this.setState({ + newmyshixunmodelbool:bool + }) + } render() { - let {page, limit, count, Headertop, visible, placement, modalsType, item_type,Cohetepaperbool} = this.state; + let {page, limit, count, Headertop, visible, placement, modalsType, item_type,Cohetepaperbool,newmyshixunmodelbool} = this.state; const params = this.props && this.props.match && this.props.match.params; // //console.log(params); return (
+ { + newmyshixunmodelbool===true? + + :"" + } + + { + newmyshixunmodelbool===true? +
+ this.setnewmyshixunmodelbool(e)}> +
+ : + "" + }