From 0f4953e8fe7bf7be0a28beb3201ee2fe9d612cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 8 Jan 2020 09:27:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/AppConfig.js | 20 + .../src/modules/question/NewMyShixunModel.js | 478 ++--- .../react/src/modules/question/Paperreview.js | 82 +- .../src/modules/question/Paperreview_item.js | 196 +- public/react/src/modules/question/Question.js | 3 - .../modules/question/component/Contentpart.js | 332 ++-- .../question/component/Itembankstop.js | 16 + .../modules/question/component/Listjihe.js | 140 +- .../comthetestpaper/Comthetestpapers.js | 656 +++++++ .../comthetestpaper/Comthetestpaperst.js | 411 ++--- .../question/questioncss/questioncom.css | 1577 +++++++++-------- .../modules/testpaper/Paperlibraryeditid.js | 13 + 12 files changed, 2231 insertions(+), 1693 deletions(-) create mode 100644 public/react/src/modules/question/comthetestpaper/Comthetestpapers.js diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 24e232022..91701c2d0 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -132,6 +132,26 @@ export function initAxiosInterceptors(props) { export function initAxiosInterceptors(props) { initOnlineOfflineListener() // TODO 避免重复的请求 https://github.com/axios/axios#cancellation + // https://github.com/axios/axios/issues/1497 + + // TODO 读取到package.json中的配置? + var proxy = "http://localhost:3000" + // proxy = "http://testbdweb.trustie.net" + // proxy = "http://testbdweb.educoder.net" + // 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="http://192.168.2.63:3001" + + // 在这里使用requestMap控制,避免用户通过双击等操作发出重复的请求; + // 如果需要支持重复的请求,考虑config里面自定义一个allowRepeat参考来控制 + const requestMap = {}; + + window.setfalseInRequestMap = function (keyName) { + requestMap[keyName] = false; + } let proxy = "https://test-newweb.educoder.net" diff --git a/public/react/src/modules/question/NewMyShixunModel.js b/public/react/src/modules/question/NewMyShixunModel.js index 169a0d5d7..f525fcf0c 100644 --- a/public/react/src/modules/question/NewMyShixunModel.js +++ b/public/react/src/modules/question/NewMyShixunModel.js @@ -80,7 +80,7 @@ class NewMyShixunModel extends Component { page: this.state.page, per_page: 10, oj_status: null, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; this.getdata(data); @@ -106,7 +106,7 @@ class NewMyShixunModel extends Component { page: 1, per_page: 10, oj_status: null, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; this.getdata(data); } @@ -130,24 +130,25 @@ class NewMyShixunModel extends Component { page: 1, per_page: 10, oj_status: null, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; this.getdata(data); } //初始化 componentDidMount() { - const isysladmins = this.props && this.props.current_user && this.props.current_user.admin ? this.props.current_user.admin : false; - const is_teacher = this.props && this.props.current_user && this.props.current_user.is_teacher ? this.props.current_user.is_teacher : false; - const professional_certification = this.props && this.props.current_user && this.props.current_user.professional_certification ? this.props.current_user.professional_certification : false; - let { defaultActiveKey } = this.props; - var defaultActiveKeys = defaultActiveKey; - if (isysladmins === true || (is_teacher === true && professional_certification === true)) { - defaultActiveKeys = "0" - } else { - defaultActiveKeys = "1" - } - this.callback(defaultActiveKeys); + let { defaultActiveKey } = this.state; + var data = { + discipline_id: this.state.discipline_id, + sub_discipline_id: this.state.sub_discipline_id, + tag_discipline_id: this.state.tag_discipline_id, + public: defaultActiveKey, + page: 1, + per_page: 10, + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + }; + this.getdata(data); + let url = `/users/get_navigation_info.json`; axios.get(url, {}).then((response) => { // //////console.log("开始请求/get_navigation_info.json"); @@ -217,7 +218,7 @@ class NewMyShixunModel extends Component { page: 1, per_page: 10, oj_status: null, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; this.getdata(data); @@ -350,7 +351,7 @@ class NewMyShixunModel extends Component { page: pageNumber, per_page: 10, oj_status: this.state.oj_status, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; this.getdata(data); @@ -469,7 +470,7 @@ class NewMyShixunModel extends Component { page: 1, per_page: 10, oj_status: null, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; this.getdata(data); @@ -496,7 +497,7 @@ class NewMyShixunModel extends Component { per_page: 10, keywords: null, oj_status: null, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; this.getdata(data); @@ -551,7 +552,7 @@ class NewMyShixunModel extends Component { page: this.state.page, per_page: 10, oj_status: this.state.oj_status, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; this.getdata(data); @@ -575,7 +576,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page: 10, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; this.getdata(data); } @@ -601,7 +602,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page: 10, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; this.getdata(data); @@ -669,7 +670,7 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page: 10, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; this.getdatasy(data); this.getbasket_listdata(); @@ -686,113 +687,18 @@ class NewMyShixunModel extends Component { let url = ""; if (this.props.exam_id === undefined) { url = `/item_baskets/${id}.json`; - axios.delete(url) - .then((result) => { - if (result.data.status == 0) { - // this.props.showNotification(`撤销成功`); - var data = { - discipline_id: this.state.discipline_id, - sub_discipline_id: this.state.sub_discipline_id, - tag_discipline_id: this.state.tag_discipline_id, - public: this.state.defaultActiveKey, - difficulty: this.state.difficulty, - item_type: this.state.item_type, - keywords: this.state.keywords, - page: this.state.page, - per_page: 10, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), - }; - this.getdatasy(data); - this.getbasket_listdata(); - } - }).catch((error) => { - ////console.log(error); - }) } else { - url = `/examination_banks/${this.props.exam_id}/revoke_item.json`; - axios.delete(url, { - data: { - item_id: id === undefined ? "" : parseInt(id), - } - }) - .then((result) => { - if (result.data.status == 0) { - // this.props.showNotification(`撤销成功`); - var data = { - discipline_id: this.state.discipline_id, - sub_discipline_id: this.state.sub_discipline_id, - tag_discipline_id: this.state.tag_discipline_id, - public: this.state.defaultActiveKey, - difficulty: this.state.difficulty, - item_type: this.state.item_type, - keywords: this.state.keywords, - page: this.state.page, - per_page: 10, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), - }; - this.getdatasy(data); - this.getbasket_listdata(); - } - }).catch((error) => { - ////console.log(error); - }) + url = `/examination_banks/${id}/revoke_item.json`; } - - } - //全选试题库 - selectallquestionsonthispage = () => { - var item_idsdata = []; - - var arr = this.state.Contentdata.items; - for (let data of arr) { - if (data.item_type === "PROGRAM") { - //编程题 - if (data.choosed === true) { - - } else { - //未选用 - if (data.program_attr.status === 1) { - //已发布 - item_idsdata.push(data.id); - } - - } - - } else { - //不是编程题 - if (data.choosed === true) { - - } else { - //未选用 - item_idsdata.push(data.id); - } - } - - } - const data = { - item_ids: item_idsdata, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), - } - this.getitem_baskets(data); - this.setState({ - selectallquestionsonthispages: true, - }) - } - - //全选的状态 - - //删除大题型 - Deletebigquestiontype = (item_type) => { - const url = `/item_baskets/delete_item_type.json`; - axios.delete((url), { + axios.delete(url, { data: { - item_type: item_type + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), } }) - .then((response) => { - if (response.data.status == 0) { - // this.props.showNotification('删除成功'); + .then((result) => { + if (result.data.status == 0) { + // this.props.showNotification(`撤销成功`); var data = { discipline_id: this.state.discipline_id, sub_discipline_id: this.state.sub_discipline_id, @@ -803,72 +709,166 @@ class NewMyShixunModel extends Component { keywords: this.state.keywords, page: this.state.page, per_page: 10, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), }; - this.getdata(data); + this.getdatasy(data); this.getbasket_listdata(); } }) - .catch(function (error) { + .then((result) => { + if (result.data.status == 0) { + // this.props.showNotification(`撤销成功`); + var data = { + discipline_id: this.state.discipline_id, + sub_discipline_id: this.state.sub_discipline_id, + tag_discipline_id: this.state.tag_discipline_id, + public: this.state.defaultActiveKey, + difficulty: this.state.difficulty, + item_type: this.state.item_type, + keywords: this.state.keywords, + page: this.state.page, + per_page: 10, + exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + }; + this.getdatasy(data); + this.getbasket_listdata(); + } + }).catch((error) => { ////console.log(error); - }); - + }) } - //跳转 - gotopaperreview = () => { +} +//全选试题库 +selectallquestionsonthispage = () => { + var item_idsdata = []; - this.props.history.replace("/paperreview"); + var arr = this.state.Contentdata.items; + for (let data of arr) { + if (data.item_type === "PROGRAM") { + //编程题 + if (data.choosed === true) { + + } else { + //未选用 + if (data.program_attr.status === 1) { + //已发布 + item_idsdata.push(data.id); + } + } + + } else { + //不是编程题 + if (data.choosed === true) { + + } else { + //未选用 + item_idsdata.push(data.id); + } + } + + } + const data = { + item_ids: item_idsdata, + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), } + this.getitem_baskets(data); + this.setState({ + selectallquestionsonthispages: true, + }) +} - setoj_status = (oj_status) => { - //编程题发布未发布 - this.setState({ - selectallquestionsonthispages: false, - difficulty: null, - oj_status: oj_status +//全选的状态 + +//删除大题型 +Deletebigquestiontype = (item_type) => { + const url = `/item_baskets/delete_item_type.json`; + axios.delete((url), { + data: { + item_type: item_type + } + }) + .then((response) => { + if (response.data.status == 0) { + // this.props.showNotification('删除成功'); + var data = { + discipline_id: this.state.discipline_id, + sub_discipline_id: this.state.sub_discipline_id, + tag_discipline_id: this.state.tag_discipline_id, + public: this.state.defaultActiveKey, + difficulty: this.state.difficulty, + item_type: this.state.item_type, + keywords: this.state.keywords, + page: this.state.page, + per_page: 10, + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + }; + this.getdata(data); + this.getbasket_listdata(); + } }) - var data = { - discipline_id: this.state.discipline_id, - sub_discipline_id: this.state.sub_discipline_id, - tag_discipline_id: this.state.tag_discipline_id, - public: this.state.defaultActiveKey, - difficulty: this.state.difficulty, - item_type: this.state.item_type, - keywords: this.state.keywords, - page: this.state.page, - per_page: 10, - oj_status: oj_status, - exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), - }; - this.getdata(data); - } + .catch(function (error) { + ////console.log(error); + }); + +} + + +//跳转 +gotopaperreview = () => { + this.props.history.replace("/paperreview"); + +} + +setoj_status = (oj_status) => { + //编程题发布未发布 + this.setState({ + selectallquestionsonthispages: false, + difficulty: null, + oj_status: oj_status + }) + var data = { + discipline_id: this.state.discipline_id, + sub_discipline_id: this.state.sub_discipline_id, + tag_discipline_id: this.state.tag_discipline_id, + public: this.state.defaultActiveKey, + difficulty: this.state.difficulty, + item_type: this.state.item_type, + keywords: this.state.keywords, + page: this.state.page, + per_page: 10, + oj_status: oj_status, + item_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + }; + this.getdata(data); +} - render() { - let { - page, per_page, items_count, Headertop, visible, placement, modalsType, modalsTypes, basket_list, - completion_questions_count, judgement_questions_count, multiple_questions_count, practical_questions_count, - program_questions_count, single_questions_count, subjective_questions_count, selectionbools - } = this.state; - const Datacount = completion_questions_count + judgement_questions_count - + multiple_questions_count + practical_questions_count - + program_questions_count - + single_questions_count - + subjective_questions_count; +render() { + let { + page, per_page, items_count, Headertop, visible, placement, modalsType, modalsTypes, basket_list, + completion_questions_count, judgement_questions_count, multiple_questions_count, practical_questions_count, + program_questions_count, single_questions_count, subjective_questions_count, selectionbools + } = this.state; - return ( -
+ const Datacount = completion_questions_count + judgement_questions_count + + multiple_questions_count + practical_questions_count + + program_questions_count + + single_questions_count + + subjective_questions_count; + return ( +
- { - visible === true ? - - : "" - } - { - visible === true ? -
- : ""} - { - modalsTypes === true ? - this.modalCancels()} - setDownloads={(e) => this.setDownloads(e)}> - : "" - } - { - modalsType === true ? - this.modalCancel()} - setDownload={() => this.setDownload()}> - : "" - } + } + + : "" + } + { + visible === true ? +
+ : ""} + { + modalsTypes === true ? + this.modalCancels()} + setDownloads={(e) => this.setDownloads(e)}> + : "" + } + { + modalsType === true ? + this.modalCancel()} + setDownload={() => this.setDownload()}> + : "" + } - {/*顶部*/} - - this.setdifficulty(e)} - setitem_types={(e) => this.setitem_types(e)} - setdiscipline_id={(e) => this.setdiscipline_id(e)} - setsub_discipline_id={(e) => this.setsub_discipline_id(e)} - settag_discipline_id={(e) => this.settag_discipline_id(e)} - /> - {/*头部*/} - this.getitem_basketss(id)} - selectallquestionsonthispage={() => this.selectallquestionsonthispage()} - getitem_baskets={(e) => this.getitem_baskets(e)} - setdatafuns={(e) => this.setdatafuns(e)} - setdatafunsval={(e) => this.setdatafunsval(e)} - handleVisibleChanges={(e) => this.handleVisibleChanges(e)} - handleVisibleChange={(e) => this.handleVisibleChange(e)} - showmodels={(e) => this.showmodels(e)} - showmodelysl={(e) => this.showmodelysl(e)} - callback={(e) => this.callback(e)} - setoj_status={(e) => this.setoj_status(e)}> - - { - items_count && items_count > 10 ? -
- -
- :
- -
- } + {/*顶部*/} + + this.setdifficulty(e)} + setitem_types={(e) => this.setitem_types(e)} + setdiscipline_id={(e) => this.setdiscipline_id(e)} + setsub_discipline_id={(e) => this.setsub_discipline_id(e)} + settag_discipline_id={(e) => this.settag_discipline_id(e)} + /> + {/*头部*/} + this.getitem_basketss(id)} + selectallquestionsonthispage={() => this.selectallquestionsonthispage()} + getitem_baskets={(e) => this.getitem_baskets(e)} + setdatafuns={(e) => this.setdatafuns(e)} + setdatafunsval={(e) => this.setdatafunsval(e)} + handleVisibleChanges={(e) => this.handleVisibleChanges(e)} + handleVisibleChange={(e) => this.handleVisibleChange(e)} + showmodels={(e) => this.showmodels(e)} + showmodelysl={(e) => this.showmodelysl(e)} + callback={(e) => this.callback(e)} + setoj_status={(e) => this.setoj_status(e)}> + + { + items_count && items_count > 10 ? +
+ +
+ :
+ +
+ } - this.props.setnewmyshixunmodelbool(false)} - onSubmits={() => this.props.setnewmyshixunmodelbool(false)} url={'/paperlibrary'}> -
- ) + this.props.setnewmyshixunmodelbool(false)} + onSubmits={() => this.props.setnewmyshixunmodelbool(false)} url={'/paperlibrary'}> +
+ ) - } +} } diff --git a/public/react/src/modules/question/Paperreview.js b/public/react/src/modules/question/Paperreview.js index 071b1d60e..df4390c5c 100644 --- a/public/react/src/modules/question/Paperreview.js +++ b/public/react/src/modules/question/Paperreview.js @@ -9,7 +9,6 @@ import Paperreview_item from "./Paperreview_item" import Bottomsubmit from "../../modules/modals/Bottomsubmit"; import Comthetestpaperst from "./comthetestpaper/Comthetestpaperst"; import NewMyShixunModel from "../question/NewMyShixunModel"; -import IntelligentModel from "../question/component/IntelligentModel" //人工组卷预览 class Paperreview extends Component { constructor(props) { @@ -36,8 +35,6 @@ class Paperreview extends Component { name: null, duration: null, newmyshixunmodelbool: false, - artificialtype: "artificial", - Intelligentformation: false, } // single_questions:null, 单选题 @@ -258,7 +255,6 @@ class Paperreview extends Component { } setnewmyshixunmodelbool = (bool) => { - //人工组卷 if (bool === true) { let scrollToTop = window.setInterval(function () { let pos = window.pageYOffset; @@ -274,87 +270,15 @@ class Paperreview extends Component { }) var data = {} this.getdata(data); - - - - - } - - //换题型 - Replacementtype = (value) => { - var item_types = ""; - if (value === "单选题") { - item_types = "SINGLE"; - } - else if (value === "多选题") { - item_types = "MULTIPLE"; - - } - else if (value === "判断题") { - item_types = "JUDGMENT"; - - } - else if (value === "编程题") { - item_types = "PROGRAM"; - - } - const url = `/examination_intelligent_settings/${this.props.match.params.id}/exchange_items.json`; - let data = { - item_type: item_types, - } - axios.post(url, data) - .then((result) => { - if (result.data.status == 0) { - //console.log(result); - var data = {} - this.getdata(data); - } - }).catch((error) => { - //console.log(error); - }) - } - //换题 - Changingtopics = (id) => { - const url = `/examination_intelligent_settings/${this.props.match.params.id}/exchange_one_item.json`; - let data = { - item_id: id, - } - axios.post(url, data) - .then((result) => { - if (result.data.status == 0) { - //console.log(result); - var data = {} - this.getdata(data); - } - }).catch((error) => { - //console.log(error); - }) - } - - setIntelligentformation = (bool) => { - this.setState({ - Intelligentformation: bool - }) - } - Confirmationofvolumeformations = () => { - this.setState({ - Intelligentformation: false - }) - } render() { - let { page, limit, count, Headertop, visible, placement, modalsType, item_type, artificialtype, Cohetepaperbool, newmyshixunmodelbool, Intelligentformation } = 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 (
- { - Intelligentformation === true ? - this.getdata(data)} {...this.state} {...this.props} exam_id={this.props.match.params.id} Confirmationofvolumeformations={() => this.Confirmationofvolumeformations()}> - : "" - } { newmyshixunmodelbool === true ? -
- { - defaultActiveKey===0||defaultActiveKey==="0"? - isysladmins===true||(is_teacher===true&&professional_certification===true)? - this.props.Isitapopup&&this.props.Isitapopup==="true"? - "" - : - this.xinzenw(e)}> -
-

新增

-
-
- :"" - :"" - } - - {item_type==="PROGRAM"? - defaultActiveKey===0||defaultActiveKey==="0"? - trigger.parentNode} placement="bottom" trigger="hover" content={contents} onVisibleChange={()=>this.props.handleVisibleChange(true)}> -
- -
- 全部 +
+ { + defaultActiveKey === 0 || defaultActiveKey === "0" ? + isysladmins === true || (is_teacher === true && professional_certification === true) ? + this.props.Isitapopup && this.props.Isitapopup === "true" ? + "" + : + this.xinzenw(e)}> +
+

新增

+
+
+ : "" + : "" + } + + {item_type === "PROGRAM" ? + defaultActiveKey === 0 || defaultActiveKey === "0" ? + trigger.parentNode} placement="bottom" trigger="hover" content={contents} onVisibleChange={() => this.props.handleVisibleChange(true)}> +
+ +
+ 全部
- -
-
- : - "":"" - } - - - { - defaultActiveKey===0||defaultActiveKey==="0"? - this.props.Isitapopup&&this.props.Isitapopup==="true"? - this.props.setdatafunsval(e)} - onSearch={ (value)=>this.props.setdatafuns(value)} /> - : - this.props.setdatafunsval(e)} - onSearch={ (value)=>this.props.setdatafuns(value)} /> - : - this.props.setdatafunsval(e)} - onSearch={ (value)=>this.props.setdatafuns(value)} /> - } - -
+ +
+ + : + "" : "" + } + + + { + defaultActiveKey === 0 || defaultActiveKey === "0" ? + this.props.Isitapopup && this.props.Isitapopup === "true" ? + this.props.setdatafunsval(e)} + onSearch={(value) => this.props.setdatafuns(value)} /> + : + this.props.setdatafunsval(e)} + onSearch={(value) => this.props.setdatafuns(value)} /> + : + this.props.setdatafunsval(e)} + onSearch={(value) => this.props.setdatafuns(value)} /> + } + +
{/*内容*/} { - this.props.Contentdata.items === undefined ||this.props.Contentdata.items === null||this.props.Contentdata.items.length===0 ? + this.props.Contentdata.items === undefined || this.props.Contentdata.items === null || this.props.Contentdata.items.length === 0 ?
:
{ - defaultActiveKey===1||defaultActiveKey==="1"? - this.props.selectallquestionsonthispage()} > - :"" + defaultActiveKey === 1 || defaultActiveKey === "1" ? + this.props.selectallquestionsonthispage()} > + : "" } { - defaultActiveKey===0||defaultActiveKey==="0"? - this.props.selectallquestionsonthispage()}> - :"" + defaultActiveKey === 0 || defaultActiveKey === "0" ? + this.props.selectallquestionsonthispage()}> + : "" }
}
- {/*列表集合*/} -
- { - this.props.booljupyterurls===true? - - : - this.props.Contentdata.items === undefined ||this.props.Contentdata.items === null||this.props.Contentdata.items.length===0? - + {/*列表集合*/} +
+ { + this.props.booljupyterurls === true ? + + : + this.props.Contentdata.items === undefined || this.props.Contentdata.items === null || this.props.Contentdata.items.length === 0 ? + - : this.props.Contentdata.items.map((object, index) => { - return ( - { + return ( + this.chakanjiexibool(keindex)} - listjihe={index+1} + chakanjiexibool={(keindex) => this.chakanjiexibool(keindex)} + listjihe={index + 1} keindex={index} items={object} key={index} - getitem_basketss={(id)=>this.props.getitem_basketss(id)} - getitem_baskets={(e)=>this.props.getitem_baskets(e)} - showmodels={(e)=>this.props.showmodels(e)} - showmodelysl={(e)=>this.props.showmodelysl(e)}> + getitem_basketss={(id) => this.props.getitem_basketss(id)} + getitem_baskets={(e) => this.props.getitem_baskets(e)} + showmodels={(e) => this.props.showmodels(e)} + showmodelysl={(e) => this.props.showmodelysl(e)}> - - ) - })} + + ) + })} -
+
diff --git a/public/react/src/modules/question/component/Itembankstop.js b/public/react/src/modules/question/component/Itembankstop.js index 0729053cb..2a1893058 100644 --- a/public/react/src/modules/question/component/Itembankstop.js +++ b/public/react/src/modules/question/component/Itembankstop.js @@ -716,6 +716,7 @@ class Itembankstop extends Component { rules: [{required: true, message: '请选择课程'}], } )( +<<<<<<< HEAD <<<<<<< HEAD >>>>>> df308ab... 合并 +======= + + >>>>>> 1036126... 合并 placeholder="请选择..."/> )} @@ -736,9 +741,12 @@ class Itembankstop extends Component { )(
<<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> df308ab... 合并 +======= +>>>>>>> 1036126... 合并 >>>>>> 1036126... 合并 placeholder="请选择..."> +<<<<<<< HEAD +======= + +>>>>>>> 1036126... 合并 )} diff --git a/public/react/src/modules/question/component/Listjihe.js b/public/react/src/modules/question/component/Listjihe.js index 8026f2458..5c27d3acf 100644 --- a/public/react/src/modules/question/component/Listjihe.js +++ b/public/react/src/modules/question/component/Listjihe.js @@ -35,9 +35,18 @@ class Listjihe extends Component { //选用 Selectingpracticaltraining = (id) => { - let data = { - item_ids: [id] + let data = {} + if (this.props.exam_id === undefined) { + data = { + item_ids: [id] + } + } else { + data = { + item_ids: [id], + exam_id: this.props.exam_id === undefined ? "" : parseInt(this.props.exam_id), + } } + this.props.getitem_baskets(data); } //撤销 @@ -180,103 +189,6 @@ class Listjihe extends Component { this.props.listjihe }.
- { - items.item_type === "PROGRAM" ? - -
-
- : -
- {items === undefined || items === null || items === "" ? "" : - items.name === undefined || items.name === null || items.name === "" ? - "" - : - items.name.length > 0 ? - - : "" - } -
- } - -
- {/*内容*/} -
- {items.item_type === "JUDGMENT" ? -

- { - items === undefined || items === null ? "" : items.choices.map((object, index) => { - return ( -

- - {object.choice_text} - -

- ) - }) - } -

: - items.item_type === "PROGRAM" ? -

-

-

-

-

- : -

- { - items === undefined || items === null ? "" : items.choices.map((object, index) => { - return ( -

- {tagArray[index]} -

-

- ) - }) - } -

- } -
- - -
-

难度:{items.difficulty === 1 ? "简单" : items.difficulty === 2 ? "适中" : items.difficulty === 3 ? "困难" : ""} -

-

题型:{items.item_type === "SINGLE" ? "单选题" : items.item_type === "MULTIPLE" ? "多选题" : items.item_type === "JUDGMENT" ? "判断题" : items.item_type === "PROGRAM" ? "编程题" : ""} -

-
- {/*更新时间*/} -
-
-

更新时间:{items.update_time}

- { - this.props.defaultActiveKey === "0" || this.props.defaultActiveKey === 0 ? - "" - : -

创建者:{items.author.name}

- } - { - items.item_type === "PROGRAM" ? -

编程语言:{items.program_attr.language}

- : "" - } - { - items.item_type === "PROGRAM" ? -

编程语言:{items.program_attr.language}

- : "" - } - { - items.item_type === "PROGRAM" ? - items.program_attr.status === 0 ? -

未发布

- : "" - : "" - } -
{ items.choosed === true ? @@ -310,25 +222,19 @@ class Listjihe extends Component {

{ items.item_type === "PROGRAM" ? - this.props.Isitapopup && this.props.Isitapopup === "true" ? - "" - : - -

- - 编辑 -

-
+ +

+ + 编辑 +

+
: - this.props.Isitapopup && this.props.Isitapopup === "true" ? - "" - : - -

- - 编辑 -

-
+ +

+ + 编辑 +

+
} { items.public === false ? diff --git a/public/react/src/modules/question/comthetestpaper/Comthetestpapers.js b/public/react/src/modules/question/comthetestpaper/Comthetestpapers.js new file mode 100644 index 000000000..29f482471 --- /dev/null +++ b/public/react/src/modules/question/comthetestpaper/Comthetestpapers.js @@ -0,0 +1,656 @@ +import React, {Component} from "react"; +import {Link, NavLink} from 'react-router-dom'; +import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder'; +import axios from 'axios'; +import { + notification, + Spin, + Table, + Pagination, + Radio, + Checkbox, + Form, + Input, + Select, + Cascader, + AutoComplete, + Col, Row, InputNumber, DatePicker, Button, Tag +} from "antd"; +import './../questioncss/questioncom.css'; + +const InputGroup = Input.Group; +const {Option} = Select; + +class Comthetestpapers extends Component { + constructor(props) { + super(props); + this.contentMdRef = React.createRef() + this.state = { + page: 1, + Knowpoints: [], + rbtx: undefined, + rbkc: undefined, + knowledgepoints: [], + options: [], + } + } + + //初始化 + componentDidMount() { + try { + this.props.getcontentMdRef(this); + } catch (e) { + + } + + this.setState({ + options: this.props.disciplmy, + knowledgepoints: this.props.knowledgepoints, + }) + + + } + + + handdisciplinesChange =(name,title)=>{ + this.setState({ + rbkc:[name.id,title.id] + }) + this.props.form.setFieldsValue({ + rbkc: [name.id,title.id], + }); + + if(this.props.item_banksedit.tag_disciplines.length===0){ + const didata = this.props.disciplinesdata; + const knowledgepointsdata = []; + + for (var i = 0; i < didata.length; i++) { + //方向 + if (name.id === didata[i].id) { + const fxdidata = didata[i].sub_disciplines; + for (var j = 0; j < fxdidata.length; j++) { + //课程 + if (title.id === fxdidata[j].id) { + const zsddata = fxdidata[j].tag_disciplines; + for (var k = 0; k < zsddata.length; k++) { + //知识点 + knowledgepointsdata.push(zsddata[k]); + + + } + + } + + } + } + + + } + + this.setState({ + Knowpoints: [], + knowledgepoints: knowledgepointsdata, + }) + + } + + + + + + + + + + + } + handletag_disciplinesChange = (data) => { + try { + var sju=data[data.length-1].name; + this.setState({ + rbzsd:sju, + Knowpoints:data, + }) + this.props.form.setFieldsValue({ + rbzsd: sju, + }); + }catch (e) { + + } + } + onChange = (e) => { + + } + Getdatas = () => { + return this.handleSubmits(); + } + handleSubmits = () => { + var data = []; + this.props.form.validateFields((err, values) => { + data = []; + if (!err) { + data.push({ + rbnd: parseInt(values.rbnd) + }) + data.push({ + rbtx: values.rbtx + }) + data.push({ + rbzsd: this.state.Knowpoints + }) + data.push({ + rbkc: values.rbkc + }) + data.push({ + classroom:values.classroom + }) + data.push({ + kssc:values.kssc + }) + + } + }); + + return data; + + } + handleSubmit = (e) => { + e.preventDefault(); + this.props.form.validateFields((err, values) => { + if (!err) { + ////console.log("获取的form 数据"); + ////console.log(values); + + } + + + }); + } + + handleFormLayoutChange = (value) => { + //难度塞选 + ////console.log("难度塞选"); + ////console.log(value); + this.props.form.setFieldsValue({ + rbnd: value + "", + }); + this.setState({ + rbnd: value + "", + }) + + } + handleFormkechen = (value) => { + //课程 + ////console.log("课程"); + ////console.log(value); + var valuename = undefined; + this.props.form.setFieldsValue({ + rbzsd: value, + }); + + var arr = this.state.knowledgepoints; + for (let data of arr) { + if (data.id === value) { + this.state.Knowpoints.push(data); + valuename = data.name; + } + } + + var tmp = JSON.parse(JSON.stringify(this.state.knowledgepoints)); + for (var i = 0; i < tmp.length; i++) { + if (tmp[i].id === value) { + this.state.knowledgepoints.splice(i, 1); + } + } + + this.setState({ + rbzsd: valuename, + Knowpoints: this.state.Knowpoints, + knowledgepoints: this.state.knowledgepoints, + }) + + } + + handleFormzhishidian = (value) => { + console.log("handleFormzhishidian 课程"); + console.log(value); + + //课程 + this.props.form.setFieldsValue({ + rbkc: value, + }); + this.setState({ + rbkc:value, + }) + // console.log("handleFormzhishidian"); + // console.log(this.props.disciplinesdata); + + const didata = this.props.disciplinesdata; + const knowledgepointsdata = []; + + for (var i = 0; i < didata.length; i++) { + //方向 + if (value[0] === didata[i].id) { + const fxdidata = didata[i].sub_disciplines; + for (var j = 0; j < fxdidata.length; j++) { + //课程 + if (value[1] === fxdidata[j].id) { + const zsddata = fxdidata[j].tag_disciplines; + for (var k = 0; k < zsddata.length; k++) { + //知识点 + knowledgepointsdata.push(zsddata[k]); + + + } + + } + + } + } + + + } + + this.setState({ + Knowpoints: [], + knowledgepoints: knowledgepointsdata, + }) + + this.props.form.setFieldsValue({ + rbzsd: undefined, + }); + this.setState({ + rbzsd: undefined, + }) + } + + handleFormtixing = (value) => { + //题型 + //console.log("题型"); + //console.log(value); + this.setState({ + rbtx: value + "", + }) + this.props.form.setFieldsValue({ + rbtx: value + "", + }); + this.props.setitem_type(value); + } + preventDefault = (e) => { + e.preventDefault(); + ////console.log('Clicked! But prevent default.'); + } + deletesobject = (item, index) => { + var arr = this.state.Knowpoints; + for (let data of arr) { + if (data.id === item.id) { + this.state.knowledgepoints.push(data); + } + } + + + var tmp = JSON.parse(JSON.stringify(this.state.Knowpoints)); + for (var i = 0; i < tmp.length; i++) { + if (i >= index) { + var pos = this.state.Knowpoints.indexOf(tmp[i]); + this.state.Knowpoints.splice(pos, 1); + } + } + + this.props.form.setFieldsValue({ + rbzsd: this.state.Knowpoints, + }); + + + this.setState({ + Knowpoints: this.state.Knowpoints, + }) + + if (this.state.Knowpoints.length === 0) { + this.setState({ + rbzsd: undefined, + }) + } else if (this.state.Knowpoints.length > 0) { + try { + const myknowda = this.state.Knowpoints; + this.setState({ + rbzsd: myknowda[this.state.Knowpoints.length - 1].name, + }) + } catch (e) { + + } + + } + + } + handleSearch=(value)=>{ + + + if(value!=""){ + this.props.form.setFieldsValue({ + classroom:value, + // course:value + }); + // this.Searchvalue(value) + } + + }; + + handleChange=(e)=>{ + console.log(e); + this.props.form.setFieldsValue({ + // course:value, + classroom:e.target.value, + }) + if(e.target.value){ + if(e.target.value.length>60){ + this.setState({ + bordebool:true, + }) + }else if(e.target.value.length===0){ + this.setState({ + bordebool:true, + }) + }else{ + this.setState({ + bordebool:false, + }) + } + }else{ + this.setState({ + bordebool:true + }) + + } + + }; + + render() { + let {page,options} = this.state; + const {getFieldDecorator} = this.props.form; + const optionss = this.state.searchlist && this.state.searchlist.map(d => ); + var addonAfterthree=this.props.form&&this.props.form.getFieldValue('classroom'); + var addonAfteronelens3=0; + if(addonAfterthree){ + addonAfteronelens3=String(addonAfterthree).length; + } + + return ( + +
+ +
+
+
+ + {getFieldDecorator("rbkc", + { + rules: [{required: true, message: '请选择课程'}], + } + )( +
+ + + +
+ )} +
+
+ +
+ + {getFieldDecorator("rbzsd" + )( +
+ + + +
+ + {this.state.Knowpoints === undefined ? "" : this.state.Knowpoints.map((object, index) => { + return ( +
+

{object.name}

+ this.deletesobject(object, index)}> +
+ ) + })} + +
+
+ )} +
+
+ +
+ +
+ + {getFieldDecorator('classroom', { + rules: [{required: true, message: "不能为空"}], + })( + + + + + )} +
+
+
+ +
+ +
+ + + {getFieldDecorator('kssc')()} + 分钟 + +
+ {/*
*/} + {/**/} + {/* {getFieldDecorator("rbtx",*/} + {/* {*/} + {/* rules: [{required: true, message: '请选择题型'}],*/} + {/* }*/} + {/* )(*/} + {/* */} + {/* */} + {/* */} + {/* )}*/} + {/**/} + {/*
*/} + + +
+ + {getFieldDecorator('rbnd', + { + rules: [{required: true, message: '请选择难度'}], + } + )( + + 简单 + 适中 + 困难 + , + )} + +
+ +
+
+
+ ) + + } + + +} + +const Comthetestpaperss = Form.create({name: 'Itembankstops'})(Comthetestpapers); +export default Comthetestpaperss; diff --git a/public/react/src/modules/question/comthetestpaper/Comthetestpaperst.js b/public/react/src/modules/question/comthetestpaper/Comthetestpaperst.js index bc1e8cd00..d239b22f9 100644 --- a/public/react/src/modules/question/comthetestpaper/Comthetestpaperst.js +++ b/public/react/src/modules/question/comthetestpaper/Comthetestpaperst.js @@ -1,6 +1,6 @@ -import React, {Component} from "react"; -import {Link, NavLink} from 'react-router-dom'; -import {WordsBtn, ActionBtn, SnackbarHOC, getImageUrl} from 'educoder'; +import React, { Component } from "react"; +import { Link, NavLink } from 'react-router-dom'; +import { WordsBtn, ActionBtn, SnackbarHOC, getImageUrl } from 'educoder'; import axios from 'axios'; import { notification, @@ -18,7 +18,7 @@ import { import './../questioncss/questioncom.css'; import Newknledpots from '../component/Newknledpots' const InputGroup = Input.Group; -const {Option} = Select; +const { Option } = Select; const options = [ { value: '方向', @@ -52,15 +52,15 @@ class Comthetestpaperst extends Component { rbtx: undefined, rbkc: undefined, knowledgepoints: [], - knowledgepoints2:[], + knowledgepoints2: [], options: [], - NewknTypedel:false, - boolred:false, + NewknTypedel: false, + boolred: false, } } - setboolred=(bool)=>{ + setboolred = (bool) => { this.setState({ - boolred:bool + boolred: bool }) } @@ -87,9 +87,9 @@ class Comthetestpaperst extends Component { }) } // 把知识点放进塞选中 ,如果是编辑 已经选中就不放进去 - if(prevProps.disciplinesdata!== this.props.disciplinesdata){ + if (prevProps.disciplinesdata !== this.props.disciplinesdata) { try { - if(this.props.item_banksedit.discipline &&this.props.item_banksedit.sub_discipline){ + if (this.props.item_banksedit.discipline && this.props.item_banksedit.sub_discipline) { var didata = this.props.disciplinesdata; var knowledgepointsdata = []; for (var i = 0; i < didata.length; i++) { @@ -108,7 +108,7 @@ class Comthetestpaperst extends Component { } } } - var _result =[]; + var _result = []; knowledgepointsdata.filter(item => { if (this.props.item_banksedit.tag_disciplines.findIndex(t => t.id === item.id) === -1) { _result.push(item); @@ -117,12 +117,12 @@ class Comthetestpaperst extends Component { this.setState({ - knowledgepoints:knowledgepointsdata, + knowledgepoints: knowledgepointsdata, knowledgepoints2: _result, }) - }else{ + } else { } - }catch (e) { + } catch (e) { } } @@ -139,43 +139,43 @@ class Comthetestpaperst extends Component { this.handletag_disciplinesChange(this.props.item_banksedit.tag_disciplines); } try { - this.handdisciplinesChange(this.props.item_banksedit.discipline,this.props.item_banksedit.sub_discipline); - }catch (e) { + this.handdisciplinesChange(this.props.item_banksedit.discipline, this.props.item_banksedit.sub_discipline); + } catch (e) { } try { - if(this.props.item_banksedit.name){ + if (this.props.item_banksedit.name) { this.props.form.setFieldsValue({ // course:value, - classroom:this.props.item_banksedit.name, + classroom: this.props.item_banksedit.name, }) } - }catch (e) { + } catch (e) { } try { - if(this.props.item_banksedit.duration){ + if (this.props.item_banksedit.duration) { this.props.form.setFieldsValue({ // course:value, - kssc:this.props.item_banksedit.duration, + kssc: this.props.item_banksedit.duration, }) } - }catch (e) { + } catch (e) { } this.getdatasmys(); } } - getdatasmys=()=>{ - if(this.props.disciplinesdata){ + getdatasmys = () => { + if (this.props.disciplinesdata) { try { - if(this.props.item_banksedit.discipline &&this.props.item_banksedit.sub_discipline){ + if (this.props.item_banksedit.discipline && this.props.item_banksedit.sub_discipline) { var didata = this.props.disciplinesdata; var knowledgepointsdata = []; for (var i = 0; i < didata.length; i++) { @@ -194,7 +194,7 @@ class Comthetestpaperst extends Component { } } } - var _result =[]; + var _result = []; knowledgepointsdata.filter(item => { if (this.props.item_banksedit.tag_disciplines.findIndex(t => t.id === item.id) === -1) { _result.push(item); @@ -203,64 +203,64 @@ class Comthetestpaperst extends Component { this.setState({ - knowledgepoints:knowledgepointsdata, + knowledgepoints: knowledgepointsdata, knowledgepoints2: _result, }) - }else{ + } else { } - }catch (e) { + } catch (e) { } } } - handdisciplinesChange =(name,title)=>{ + handdisciplinesChange = (name, title) => { this.setState({ - rbkc:[name.id,title.id] + rbkc: [name.id, title.id] }) this.props.form.setFieldsValue({ - rbkc: [name.id,title.id], + rbkc: [name.id, title.id], }); } - handleSearch=(value)=>{ + handleSearch = (value) => { - if(value!=""){ + if (value != "") { this.props.form.setFieldsValue({ - classroom:value, + classroom: value, // course:value }); // this.Searchvalue(value) } }; - handleChange=(e)=>{ + handleChange = (e) => { //console.log(e); this.props.form.setFieldsValue({ // course:value, - classroom:e.target.value, + classroom: e.target.value, }) - if(e.target.value){ - if(e.target.value.length>60){ + if (e.target.value) { + if (e.target.value.length > 60) { this.setState({ - bordebool:true, + bordebool: true, }) - }else if(e.target.value.length===0){ + } else if (e.target.value.length === 0) { this.setState({ - bordebool:true, + bordebool: true, }) - }else{ + } else { this.setState({ - bordebool:false, + bordebool: false, }) } - }else{ + } else { this.setState({ - bordebool:true + bordebool: true }) } @@ -270,14 +270,14 @@ class Comthetestpaperst extends Component { handletag_disciplinesChange = (data) => { //是否选中的知识点 try { - var sju=data[data.length-1].name; + var sju = data[data.length - 1].name; this.setState({ - Knowpoints:data, + Knowpoints: data, }) this.props.form.setFieldsValue({ rbzsd: sju, }); - }catch (e) { + } catch (e) { } @@ -308,10 +308,10 @@ class Comthetestpaperst extends Component { rbkc: values.rbkc }) data.push({ - classroom:values.classroom + classroom: values.classroom }) data.push({ - kssc:values.kssc + kssc: values.kssc }) } @@ -362,7 +362,7 @@ class Comthetestpaperst extends Component { //课程 //////console.log("课程"); //////console.log(value); - if(this.state.Knowpoints.length>4){ + if (this.state.Knowpoints.length > 4) { this.props.showNotification(`知识点最多选择5个`); return } @@ -379,7 +379,7 @@ class Comthetestpaperst extends Component { } } - const _result =[]; + const _result = []; this.state.knowledgepoints.filter(item => { if (this.state.Knowpoints.findIndex(t => t.id === item.id) === -1) { //console.log("guonue"); @@ -406,7 +406,7 @@ class Comthetestpaperst extends Component { rbkc: value, }); this.setState({ - rbkc:value, + rbkc: value, }) // //console.log("handleFormzhishidian"); // //console.log(this.props.disciplinesdata); @@ -440,7 +440,7 @@ class Comthetestpaperst extends Component { this.setState({ Knowpoints: [], knowledgepoints: knowledgepointsdata, - knowledgepoints2:knowledgepointsdata, + knowledgepoints2: knowledgepointsdata, }) this.props.form.setFieldsValue({ @@ -468,11 +468,11 @@ class Comthetestpaperst extends Component { //////console.log('Clicked! But prevent default.'); } deletesobject = (item, index) => { - debugger + debugger var tmp = this.state.Knowpoints; for (var i = 0; i < tmp.length; i++) { - if (i ===index) { - tmp.splice(i,1); + if (i === index) { + tmp.splice(i, 1); } } @@ -480,7 +480,7 @@ class Comthetestpaperst extends Component { rbzsd: this.state.Knowpoints, }); - const _result =[]; + const _result = []; this.state.knowledgepoints.filter(item => { if (this.state.Knowpoints.findIndex(t => t.id === item.id) === -1) { _result.push(item); @@ -488,7 +488,7 @@ class Comthetestpaperst extends Component { }); this.setState({ Knowpoints: this.state.Knowpoints, - knowledgepoints2:_result, + knowledgepoints2: _result, }) if (this.state.Knowpoints.length === 0) { this.setState({ @@ -508,35 +508,35 @@ class Comthetestpaperst extends Component { } - NewknTypedeldel=(bool)=>{ - if(this.state.rbkc===undefined || this.state.rbkc===null || this.state.rbkc===""){ + NewknTypedeldel = (bool) => { + if (this.state.rbkc === undefined || this.state.rbkc === null || this.state.rbkc === "") { this.props.showNotification(`请选择课程方向`); return; } this.setState({ - NewknTypedel:bool + NewknTypedel: bool }) } - NewknTypedeltyoedel=(value)=>{ - var knowledgepointmys= this.state.knowledgepoints; - for(let myda of knowledgepointmys) { - if(myda.name===value){ + NewknTypedeltyoedel = (value) => { + var knowledgepointmys = this.state.knowledgepoints; + for (let myda of knowledgepointmys) { + if (myda.name === value) { this.props.showNotification(`重复的知识点`); this.setboolred(true); break; } } - if(value===null||value===""){ + if (value === null || value === "") { this.props.showNotification(`请输入知识点`); this.setboolred(true); return } - if(value.length===0){ + if (value.length === 0) { this.props.showNotification(`请输入知识点`); this.setboolred(true); @@ -544,23 +544,23 @@ class Comthetestpaperst extends Component { } - var data={ - name:value, - sub_discipline_id:this.state.rbkc[1] + var data = { + name: value, + sub_discipline_id: this.state.rbkc[1] } - const url="/tag_disciplines.json"; - axios.post(url,data) + const url = "/tag_disciplines.json"; + axios.post(url, data) .then((result) => { if (result.data.status === 0) { // this.props.showNotification(`新增知识点成功!`); - var leydata={ + var leydata = { id: result.data.tag_discipline_id, - name:value, + name: value, } - if(this.state.Knowpoints.length>=5){ + if (this.state.Knowpoints.length >= 5) { this.state.knowledgepoints.push(leydata); - const _result =[]; + const _result = []; this.state.knowledgepoints.filter(item => { if (this.state.Knowpoints.findIndex(t => t.id === item.id) === -1) { _result.push(item); @@ -569,13 +569,13 @@ class Comthetestpaperst extends Component { this.setState({ Knowpoints: this.state.Knowpoints, - knowledgepoints: this.state.knowledgepoints, + knowledgepoints: this.state.knowledgepoints, knowledgepoints2: _result, }) - }else{ + } else { this.state.Knowpoints.push(leydata); this.state.knowledgepoints.push(leydata); - const _result =[]; + const _result = []; this.state.knowledgepoints.filter(item => { if (this.state.Knowpoints.findIndex(t => t.id === item.id) === -1) { _result.push(item); @@ -583,29 +583,29 @@ class Comthetestpaperst extends Component { }); this.setState({ Knowpoints: this.state.Knowpoints, - knowledgepoints: this.state.knowledgepoints, + knowledgepoints: this.state.knowledgepoints, knowledgepoints2: _result, }) } } }).catch((error) => { - ////console.log(error); - }) + ////console.log(error); + }) this.setState({ - NewknTypedel:false + NewknTypedel: false }) } render() { - let {page, options,NewknTypedel,knowledgepoints,knowledgepoints2,Knowpoints} = this.state; - const {getFieldDecorator} = this.props.form; + let { page, options, NewknTypedel, knowledgepoints, knowledgepoints2, Knowpoints } = this.state; + const { getFieldDecorator } = this.props.form; const optionss = this.state.searchlist && this.state.searchlist.map(d => ); - var addonAfterthree=this.props.form&&this.props.form.getFieldValue('classroom'); - var addonAfteronelens3=0; - if(addonAfterthree){ - addonAfteronelens3=String(addonAfterthree).length; + var addonAfterthree = this.props.form && this.props.form.getFieldValue('classroom'); + var addonAfteronelens3 = 0; + if (addonAfterthree) { + addonAfteronelens3 = String(addonAfterthree).length; } return ( @@ -658,97 +658,99 @@ class Comthetestpaperst extends Component {
{ - NewknTypedel? + NewknTypedel ? this.setboolred(bool)} - NewknTypedeldel={(bool)=>this.NewknTypedeldel(bool)} - NewknTypedeltyoedel={(value)=>this.NewknTypedeltyoedel(value)} + boolred={this.state.boolred} + setboolred={(bool) => this.setboolred(bool)} + NewknTypedeldel={(bool) => this.NewknTypedeldel(bool)} + NewknTypedeltyoedel={(value) => this.NewknTypedeltyoedel(value)} > - :"" + : "" }
- - {getFieldDecorator("rbkc" - , - {initialValue: this.state.rbkc, - rules: [{required: true, message: '请选择课程'}], - } - )( - - )} - + + {getFieldDecorator("rbkc" + , + { + initialValue: this.state.rbkc, + rules: [{ required: true, message: '请选择课程' }], + } + )( + + )} +
-
+
- - {getFieldDecorator("rbzsd" - )( -
- - - + + {getFieldDecorator("rbzsd" + )( +
+ + + - this.NewknTypedeldel(true)}/> + this.NewknTypedeldel(true)} /> -
- )} -
+
+ )} +
{ - this.state.Knowpoints===undefined||this.state.Knowpoints===null?"": - this.state.Knowpoints.length>0? + this.state.Knowpoints === undefined || this.state.Knowpoints === null ? "" : + this.state.Knowpoints.length > 0 ?
{this.state.Knowpoints === undefined ? "" : this.state.Knowpoints.map((object, index) => { return ( -

{object.name}

- this.deletesobject(object, index)} src={getImageUrl("images/educoder/bzucha.png")}/> + this.deletesobject(object, index)} src={getImageUrl("images/educoder/bzucha.png")} />
) })}
- : - "" - } - -
- +
+ -
- - {getFieldDecorator('classroom', { - rules: [{required: true, message: "不能为空"}], - })( - - - - - )} -
-
-
+ } +
+ + {getFieldDecorator('classroom', { + rules: [{ required: true, message: "不能为空" }], + })( + + + + + )} +
+
+
-
- -
- - - {getFieldDecorator('kssc')()} - 分钟 - -
+ } + +
+ + + {getFieldDecorator('kssc')()} + 分钟 + +
- +
+ + {getFieldDecorator('rbnd' + , + { + initialValue: this.state.rbnd, + rules: [{ required: true, message: '请选择难度' }], } - -
- - {getFieldDecorator('rbnd' - , - {initialValue: this.state.rbnd, - rules: [{required: true, message: '请选择难度'}], - } - )( - - 简单 - 适中 - 困难 - , - )} - -
- -
+ )( + + 简单 + 适中 + 困难 + , + )} +
+ +
+
) } @@ -885,5 +888,5 @@ class Comthetestpaperst extends Component { } -const Comthetestpapersts = Form.create({name: 'Comthetestpaperst'})(Comthetestpaperst); +const Comthetestpapersts = Form.create({ name: 'Comthetestpaperst' })(Comthetestpaperst); export default Comthetestpapersts; diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css index dcfdff84d..ab86a16b9 100644 --- a/public/react/src/modules/question/questioncss/questioncom.css +++ b/public/react/src/modules/question/questioncss/questioncom.css @@ -1,86 +1,100 @@ -.w1200{ - width:1062px; - height:177px; - background:rgba(255,255,255,1); - 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; - background:rgba(255,255,255,1); - box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03); - border-radius:2px; -} -.w1200fpx{ - width:1200px; - background:rgba(255,255,255,1); - box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03); - border-radius:2px; -} -.w1200mss{ - width:1200px; -} -.w1200ms{ - width:1062px; -} -.w1200s{ - width:1062px; - background:rgba(255,255,255,1); - box-shadow:0px 6px 8px 0px rgba(0,0,0,0.03); - border-radius:2px; -} -.h177{ - height: 177px; +.w1200 { + width: 1062px; + height: 177px; + background: rgba(255, 255, 255, 1); + 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; + background: rgba(255, 255, 255, 1); + box-shadow: 0px 6px 8px 0px rgba(0, 0, 0, 0.03); + border-radius: 2px; +} + +.w1200fpx { + width: 1200px; + background: rgba(255, 255, 255, 1); + box-shadow: 0px 6px 8px 0px rgba(0, 0, 0, 0.03); + border-radius: 2px; +} + +.w1200mss { + width: 1200px; +} + +.w1200ms { + width: 1062px; +} + +.w1200s { + width: 1062px; + background: rgba(255, 255, 255, 1); + box-shadow: 0px 6px 8px 0px rgba(0, 0, 0, 0.03); + border-radius: 2px; +} + +.h177 { + height: 177px; +} + /* 中间居中 */ -.intermediatecenter{ - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; +.intermediatecenter { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; } + /* 简单居中 */ -.intermediatecenterysls{ - display: flex; - align-items: center; +.intermediatecenterysls { + display: flex; + align-items: center; } -.spacearound{ - display: flex; - justify-content: space-around; + +.spacearound { + display: flex; + justify-content: space-around; } -.spacebetween{ - display: flex; - justify-content: space-between; + +.spacebetween { + display: flex; + justify-content: space-between; } + /* 头顶部居中 */ -.topcenter{ - display: -webkit-flex; - flex-direction: column; - align-items: center; +.topcenter { + display: -webkit-flex; + flex-direction: column; + align-items: center; } /* x轴正方向排序 */ /* 一 二 三 四 五 六 七 八 */ -.sortinxdirection{ - display: flex; - flex-direction:row; +.sortinxdirection { + display: flex; + flex-direction: row; } + /* x轴反方向排序 */ /* 八 七 六 五 四 三 二 一 */ -.xaxisreverseorder{ - display: flex; - flex-direction:row-reverse; +.xaxisreverseorder { + display: flex; + flex-direction: row-reverse; } + /* 垂直布局 正方向*/ /* 一 二 @@ -90,979 +104,974 @@ 六 七 八 */ -.verticallayout{ - display: flex; - flex-direction:column; +.verticallayout { + display: flex; + flex-direction: column; } + /* 垂直布局 反方向*/ -.reversedirection{ - display: flex; - flex-direction:column-reverse; +.reversedirection { + display: flex; + flex-direction: column-reverse; } -.w100{ - width: 100px; + +.w100 { + width: 100px; } -.mt21{ - margin-top: 21px; + +.mt21 { + margin-top: 21px; } -.mt23{ - margin-top: 23px; + +.mt23 { + margin-top: 23px; } -.mt19{ - margin-top: 19px; + +.mt19 { + margin-top: 19px; } -.mt15{ - margin-top: 10px; + +.mt15 { + margin-top: 10px; } -.h40{ - height: 40px; + +.h40 { + height: 40px; } -.tophom{ - padding-top: 33px; - padding-bottom: 40px; - padding-left: 26px; - padding-right: 26px; +.tophom { + padding-top: 33px; + padding-bottom: 40px; + padding-left: 26px; + padding-right: 26px; } -.tophoms{ - padding-top: 15px; - padding-left: 26px; - padding-right: 26px; + +.tophoms { + padding-top: 15px; + padding-left: 26px; + padding-right: 26px; } -.tophomss{ - padding-top: 15px; - padding-left: 15px; - padding-right: 15px; + +.tophomss { + padding-top: 15px; + padding-left: 15px; + padding-right: 15px; } -.borderwd{ - border: 1px solid #000000; + +.borderwd { + border: 1px solid #000000; } -.borderwds{ - width: 1020px !important; - background: #FFFFFF; - border: 1px solid #DDDDDD; - margin-left: 20px; - min-height:150px; + +.borderwds { + width: 1020px !important; + background: #FFFFFF; + border: 1px solid #DDDDDD; + margin-left: 20px; + min-height: 150px; } -.borderwdswuh{ - width: 1020px !important; - background: #FFFFFF; - border: 1px solid #DDDDDD; - min-height:150px; + +.borderwdswuh { + width: 1020px !important; + background: #FFFFFF; + border: 1px solid #DDDDDD; + min-height: 150px; } -.borderwdswuh:hover{ - background: #F9F9F9; +.borderwdswuh:hover { + background: #F9F9F9; } -.borderwds283{ - width: 1020px !important; - min-height:283px; - background:#F9F9F9; - border:1px solid #DDDDDD; - margin-left: 20px; + +.borderwds283 { + width: 1020px !important; + min-height: 283px; + background: #F9F9F9; + border: 1px solid #DDDDDD; + margin-left: 20px; } -.w64{ - width: 64px; + +.w64 { + width: 64px; } -.w70{ - width: 70px !important; + +.w70 { + width: 70px !important; } -.tophomsembold{ - height:21px; - font-size:16px; - color:#333333; - line-height:21px; +.tophomsembold { + height: 21px; + font-size: 16px; + color: #333333; + line-height: 21px; } -.tophomsembolds{ - width:42px; - height:19px; - font-size:14px; - font-family:MicrosoftYaHeiSemibold; - color:rgba(51,51,51,1); - line-height:31px; +.tophomsembolds { + width: 42px; + height: 19px; + font-size: 14px; + font-family: MicrosoftYaHeiSemibold; + color: rgba(51, 51, 51, 1); + line-height: 31px; } + /*Contentpart*/ -.contentparttit{ - padding-top: 10px; - padding-left: 20px; - padding-right: 20px; +.contentparttit { + padding-top: 10px; + padding-left: 20px; + padding-right: 20px; } -.subjecttit{ - width:28px; - height:19px; - font-size:14px; - color:rgba(51,51,51,1); - line-height: 42px; - cursor:pointer; +.subjecttit { + width: 28px; + height: 19px; + font-size: 14px; + color: rgba(51, 51, 51, 1); + line-height: 42px; + cursor: pointer; } -.ml55{ - margin-right: 55px; + +.ml55 { + margin-right: 55px; } -.lg{ - line-height: 42px; +.lg { + line-height: 42px; } -.ml7{ - margin-left: 7px; + +.ml7 { + margin-left: 7px; } -.icondowncolor{ - color:#9E9E9E; +.icondowncolor { + color: #9E9E9E; } -.icondowncolorss{ - color: #9E9E9E; - position: absolute; - top: -20px; - right: -16px; + +.icondowncolorss { + color: #9E9E9E; + position: absolute; + top: -20px; + right: -16px; } -.icondowncolorssy{ - position: absolute; - top: -15px; - right: -11px; + +.icondowncolorssy { + position: absolute; + top: -15px; + right: -11px; } -.questiontype{ - width: 100%; - font-size: 12px; - color: #333333; - line-height: 17px; - text-align: center; - padding: 11px; - cursor:pointer; +.questiontype { + width: 100%; + font-size: 12px; + color: #333333; + line-height: 17px; + text-align: center; + padding: 11px; + cursor: pointer; } -.questiontypes{ - width:37px; - height:17px; - font-size:12px; - color:rgba(51,51,51,1); - line-height:17px; - cursor:pointer; + +.questiontypes { + width: 37px; + height: 17px; + font-size: 12px; + color: rgba(51, 51, 51, 1); + line-height: 17px; + cursor: pointer; } -.questiontypeheng{ - width:100%; - height:1px; - background: #EEEEEE; + +.questiontypeheng { + width: 100%; + height: 1px; + background: #EEEEEE; } -.questiontype:hover{ - color: #4CACFF; + +.questiontype:hover { + color: #4CACFF; } -.questiontype:active{ - color: #4CACFF; + +.questiontype:active { + color: #4CACFF; } -.w100s{ - width:100%; +.w100s { + width: 100%; } -.stestcen{ - text-align: center; + +.stestcen { + text-align: center; } -.w70s{ - width:70%; + +.w70s { + width: 70%; } -.w30s{ - width:30%; + +.w30s { + width: 30%; } -.w50s{ - width: 50%; +.w50s { + width: 50%; } -.testpaper{ - font-size:12px; - color:#888888; - line-height:28px; - text-align: center; + +.testpaper { + font-size: 12px; + color: #888888; + line-height: 28px; + text-align: center; } -.setequesbank{ - font-size:14px; - color:#333333; - line-height:28px; +.setequesbank { + font-size: 14px; + color: #333333; + line-height: 28px; } -.Contentquestionbankstyle{ - padding-left: 20px; - padding-right: 20px; +.Contentquestionbankstyle { + padding-left: 20px; + padding-right: 20px; } -.pd20{ - padding-top: 20px; - padding-bottom: 20px; - padding-left: 30px; - padding-right: 30px; +.pd20 { + padding-top: 20px; + padding-bottom: 20px; + padding-left: 30px; + padding-right: 30px; } /*listjihe*/ -.listjihetixing{ - height:17px; - font-size:12px; - color:#888888; - line-height:17px; +.listjihetixing { + height: 17px; + font-size: 12px; + color: #888888; + line-height: 17px; } -.listjihetixings{ - color: #333333; - font-size: 12px; - line-height: 17px; +.listjihetixings { + color: #333333; + font-size: 12px; + line-height: 17px; } -.listjihetixingstit{ - color: #333333; - font-size: 14px; - line-height: 17px; + +.listjihetixingstit { + color: #333333; + font-size: 14px; + line-height: 17px; } .listjihetixingstitsy { - color: #333333; - font-size: 14px; - line-height: 20px !important; - height: 25px !important; + color: #333333; + font-size: 14px; + line-height: 20px !important; + height: 25px !important; } -.listjihetixingstits{ - color: #333333; - font-size: 14px; - line-height:19px; - margin-top: 19px; +.listjihetixingstits { + color: #333333; + font-size: 14px; + line-height: 19px; + margin-top: 19px; } -.listjihetixingstitsp{ - color: #333333; - font-size: 14px; - line-height:19px; - margin-top: 10px; + +.listjihetixingstitsp { + color: #333333; + font-size: 14px; + line-height: 19px; + margin-top: 10px; } -.listjihetixingstitssy{ - color: #333333; - font-size: 14px; - line-height:19px; + +.listjihetixingstitssy { + color: #333333; + font-size: 14px; + line-height: 19px; } -.updatetimes{ - color: #BBBBBB; - font-size: 12px; +.updatetimes { + color: #BBBBBB; + font-size: 12px; } -.mt22{ - margin-top: 22px; + +.mt22 { + margin-top: 22px; } -.viewparsings{ - color:#4CACFF; - font-size:12px; - line-height: 30px; + +.viewparsings { + color: #4CACFF; + font-size: 12px; + line-height: 30px; } -.selection{ - width:88px; - height:30px; - background:#33BD8C; - border-radius:4px; - text-align: center; - line-height: 30px; - color: #FFFFFF; +.selection { + width: 88px; + height: 30px; + background: #33BD8C; + border-radius: 4px; + text-align: center; + line-height: 30px; + color: #FFFFFF; } -.selectionys{ - width:88px; - height:30px; - background:#CCCCCC; - border-radius:4px; - text-align: center; - line-height: 30px; - color: #FFFFFF; + +.selectionys { + width: 88px; + height: 30px; + background: #CCCCCC; + border-radius: 4px; + text-align: center; + line-height: 30px; + color: #FFFFFF; } -.selectionss{ - width:88px; - height:30px; - background:#CCCCCC; - border-radius:4px; - text-align: center; - line-height: 30px; - color: #FFFFFF; + +.selectionss { + width: 88px; + height: 30px; + background: #CCCCCC; + border-radius: 4px; + text-align: center; + line-height: 30px; + color: #FFFFFF; } -.lh30{ - line-height: 30px; + +.lh30 { + line-height: 30px; } -.analysis{ - height:19px; - font-size:14px; - color:#333333; - line-height:19px; +.analysis { + height: 19px; + font-size: 14px; + color: #333333; + line-height: 19px; } -.testfondex{ - color: #808080; - font-size: 14px; +.testfondex { + color: #808080; + font-size: 14px; } -.pb20{ - padding-bottom: 20px; + +.pb20 { + padding-bottom: 20px; } -.icontianjiadaohangcolor{ - color: #ffffff; + +.icontianjiadaohangcolor { + color: #ffffff; } -.icontianjiadaohangcolors{ - color: #4CACFF; +.icontianjiadaohangcolors { + color: #4CACFF; } -.xiaoshou{ - cursor:pointer; + +.xiaoshou { + cursor: pointer; } -.xiaoshout{ - cursor:default; + +.xiaoshout { + cursor: default; } -.mt40{ - margin-top: 40px; + +.mt40 { + margin-top: 40px; } -.mt42{ - margin-top: 42px; + +.mt42 { + margin-top: 42px; } -.drawerbutton{ - width:88px; - height:30px; - background:#4CACFF; - border-radius:4px; - font-size:14px; - color:#ffffff; - line-height:30px; - text-align: center; + +.drawerbutton { + width: 88px; + height: 30px; + background: #4CACFF; + border-radius: 4px; + font-size: 14px; + color: #ffffff; + line-height: 30px; + text-align: center; } -.icondrawercolor{ - color: #979797; + +.icondrawercolor { + color: #979797; } -.mt25{ - margin-top: 25px; +.mt25 { + margin-top: 25px; } -.mb26{ - margin-bottom: 26px; + +.mb26 { + margin-bottom: 26px; } -.drawernonedatadiv{ - height: 100%; + +.drawernonedatadiv { + height: 100%; } -.font-17{ - font-size: 17px; +.font-17 { + font-size: 17px; } -.ml30{ - margin-right: 30px; + +.ml30 { + margin-right: 30px; } -.mr25{ - margin-right: 25px; + +.mr25 { + margin-right: 25px; } -.newbutoon{ - width:88px; - height:42px; - background:#33BD8C; - line-height: 42px; - border-radius:4px; + +.newbutoon { + width: 88px; + height: 42px; + background: #33BD8C; + line-height: 42px; + border-radius: 4px; } -.newbutoontes{ - width:100%; - height:42px; - font-size:14px; - color:#ffffff; - line-height:42px; - text-align: center; +.newbutoontes { + width: 100%; + height: 42px; + font-size: 14px; + color: #ffffff; + line-height: 42px; + text-align: center; } + .educouddiv { - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; } -.tabeltext-alignleftysl{ - font-size:14px; - color:#000000; - line-height:19px; +.tabeltext-alignleftysl { + font-size: 14px; + color: #000000; + line-height: 19px; } -.tabeltext-alignleftysltwo{ - font-size:14px; - color:#848282; - line-height:19px; + +.tabeltext-alignleftysltwo { + font-size: 14px; + color: #848282; + line-height: 19px; } -.publictask-btn{ - width:80px; - height:34px; - background:#CCCCCC; - border-radius:4px; - color: #ffffff; +.publictask-btn { + width: 80px; + height: 34px; + background: #CCCCCC; + border-radius: 4px; + color: #ffffff; } -.publictask-btns{ - width:80px; - height:34px; - background:#4CACFF; - border-radius:4px; - color: #ffffff; + +.publictask-btns { + width: 80px; + height: 34px; + background: #4CACFF; + border-radius: 4px; + color: #ffffff; } -.w80{ - width: 80px; + +.w80 { + width: 80px; } -.titiles{ - color: #333333; - font-size: 16px; +.titiles { + color: #333333; + font-size: 16px; } -.h12{ - height: 12px; - min-height: 12px; +.h12 { + height: 12px; + min-height: 12px; } -.mt19{ - margin-top: 19px; +.mt19 { + margin-top: 19px; } -.mytags{ - min-width:106px !important; - height:32px; - border-radius:2px; - border:1px solid #DDDDDD; - margin-right: 20px; + +.mytags { + min-width: 106px !important; + height: 32px; + border-radius: 2px; + border: 1px solid #DDDDDD; + margin-right: 20px; } -.mytagss{ - min-width:106px !important; - height:32px; - border-radius:2px; - border:1px solid #DDDDDD; - margin-right: 20px; + +.mytagss { + min-width: 106px !important; + height: 32px; + border-radius: 2px; + border: 1px solid #DDDDDD; + margin-right: 20px; } -.lh32{ - line-height: 32px; + +.lh32 { + line-height: 32px; } -.h20{ - height: 20px; - min-height: 20px; - line-height: 20px; +.h20 { + height: 20px; + min-height: 20px; + line-height: 20px; } -.xingcolor{ - color: rgba(224, 64, 64, 1); + +.xingcolor { + color: rgba(224, 64, 64, 1); } -.xingtigan{ - font-size:14px; - color:rgba(51, 51, 51, 1); + +.xingtigan { + font-size: 14px; + color: rgba(51, 51, 51, 1); } -.mr4{ - margin-right: 4px; + +.mr4 { + margin-right: 4px; } -.xingtigans{ - width:100%; - font-size:14px; - color:rgba(136,136,136,1); +.xingtigans { + width: 100%; + font-size: 14px; + color: rgba(136, 136, 136, 1); } -.bottomdivs{ - width:100%; - height:55px; - background:rgba(255,255,255,1); - box-shadow:0px -2px 7px 0px rgba(1,6,22,0.04); +.bottomdivs { + width: 100%; + height: 55px; + background: rgba(255, 255, 255, 1); + box-shadow: 0px -2px 7px 0px rgba(1, 6, 22, 0.04); } -.mt50{ - margin-top: 50px; + +.mt50 { + margin-top: 50px; } -.divquxiao{ - width:88px; - height:32px; - background:rgba(255,255,255,1); - border-radius:4px; - border:1px solid rgba(204,204,204,1); +.divquxiao { + width: 88px; + height: 32px; + background: rgba(255, 255, 255, 1); + border-radius: 4px; + border: 1px solid rgba(204, 204, 204, 1); } -.divquxiaotest{ - width:100%; - height:32px; - font-size:12px; - color:rgba(136,136,136,1); - line-height:32px; - text-align: center; + +.divquxiaotest { + width: 100%; + height: 32px; + font-size: 12px; + color: rgba(136, 136, 136, 1); + line-height: 32px; + text-align: center; } -.divbaocuntests{ - width:100%; - height:32px; - font-size:12px; - color:#ffffff; - line-height:32px; - text-align: center; + +.divbaocuntests { + width: 100%; + height: 32px; + font-size: 12px; + color: #ffffff; + line-height: 32px; + text-align: center; } -.divbaocun{ - width:88px; - height:32px; - background:rgba(76,172,255,1); - border-radius:4px; + +.divbaocun { + width: 88px; + height: 32px; + background: rgba(76, 172, 255, 1); + border-radius: 4px; } -.sortzhenque{ - width:49px; - height:33px; - border-radius:2px; - border:1px solid rgba(221,221,221,1); + +.sortzhenque { + width: 49px; + height: 33px; + border-radius: 2px; + border: 1px solid rgba(221, 221, 221, 1); } -.sortzhenquetest{ - width:100%; - height:33px; - font-size:14px; - color:rgba(51,51,51,1); - line-height:33px; +.sortzhenquetest { + width: 100%; + height: 33px; + font-size: 14px; + color: rgba(51, 51, 51, 1); + line-height: 33px; } -.sortquxiao{ +.sortquxiao { - width:49px; - height:33px; - border-radius:2px; - border:1px solid rgba(221,221,221,1); + width: 49px; + height: 33px; + border-radius: 2px; + border: 1px solid rgba(221, 221, 221, 1); } -.sortquxiaotest{ - width:100%; - height:33px; - font-size:14px; - color:rgba(51,51,51,1); - line-height:33px; + +.sortquxiaotest { + width: 100%; + height: 33px; + font-size: 14px; + color: rgba(51, 51, 51, 1); + line-height: 33px; } -.ml45{ - margin-left: 45px; +.ml45 { + margin-left: 45px; } -.programcss{ - height: 251px; - min-height: 100%; +.programcss { + height: 251px; + min-height: 100%; } -.titlesttingcss{ - min-width: 100px; - height:32px; - line-height: 32px; - background:rgba(76,172,255,1); - border-radius:16px; - text-align: center; - color: #fff; +.titlesttingcss { + min-width: 100px; + height: 32px; + line-height: 32px; + background: rgba(76, 172, 255, 1); + border-radius: 16px; + text-align: center; + color: #fff; } -.titlesttingcssmy{ - min-width: 100px; - height:32px; - line-height: 32px; - font-size:14px; - color:rgba(51,51,51,1); - text-align: center; + +.titlesttingcssmy { + min-width: 100px; + height: 32px; + line-height: 32px; + font-size: 14px; + color: rgba(51, 51, 51, 1); + text-align: center; } -.minleng40{ - min-height: 40px; + +.minleng40 { + min-height: 40px; } -.w60{ - width: 60px !important; +.w60 { + width: 60px !important; } -.h30{ - min-height: 30px !important; +.h30 { + min-height: 30px !important; } -.minheight{ - min-height: 500px !important; +.minheight { + min-height: 500px !important; } -.pd20{ - padding: 20px; + +.pd20 { + padding: 20px; } -.ml58{ - margin-left: 58px; +.ml58 { + margin-left: 58px; } -.questionstishu{ - color: #888888; - font-size: 14px; + +.questionstishu { + color: #888888; + font-size: 14px; } -.questionstotal{ - color: #333333; - font-size: 14px; + +.questionstotal { + color: #333333; + font-size: 14px; } -.pagertdstcolor{ - color: #888888; - font-size: 12px; + +.pagertdstcolor { + color: #888888; + font-size: 12px; } -.mb19{ - margin-bottom: 19px; +.mb19 { + margin-bottom: 19px; } -.yldxtit{ - color: #333333 !important; - font-size: 14px; +.yldxtit { + color: #333333 !important; + font-size: 14px; } -.yldxtits{ - color: #888888; - font-size: 14px; + +.yldxtits { + color: #888888; + font-size: 14px; } -.mt25{ - margin-top: 25px; + +.mt25 { + margin-top: 25px; } -.postitonrelati{ - position: relative; +.postitonrelati { + position: relative; } -.postitonrelatis{ - position: absolute; - right: 2px; - top: 11px; + +.postitonrelatis { + position: absolute; + right: 2px; + top: 11px; } -.postitonrelatiss{ - position: absolute; - right: 2px; - top: -41px; + +.postitonrelatiss { + position: absolute; + right: 2px; + top: -41px; } -.postitonrelatisss{ - position: absolute; - right: 2px; - top: -39px; + +.postitonrelatisss { + position: absolute; + right: 2px; + top: -39px; } -.postitonrelatisssy{ - position: absolute; - right: 1px; - top: 52px; + +.postitonrelatisssy { + position: absolute; + right: 1px; + top: 52px; } -.mt50{ - margin-top: 50px; + +.mt50 { + margin-top: 50px; } -.szdfd{ - width:100px; - height:40px; - background:rgba(51,189,140,1); - border-radius:4px 4px 0px 0px; - text-align: center; - color: #ffffff; - line-height: 40px; - margin-right: 27px; - font-size:12px; + +.szdfd { + width: 100px; + height: 40px; + background: rgba(51, 189, 140, 1); + border-radius: 4px 4px 0px 0px; + text-align: center; + color: #ffffff; + line-height: 40px; + margin-right: 27px; + font-size: 12px; } -.scd{ - width:100px; - height:40px; - background:#4CACFF; - border-radius:4px 4px 0px 0px; - text-align: center; - color: #ffffff; - line-height: 40px; - font-size:12px; + +.scd { + width: 100px; + height: 40px; + background: #4CACFF; + border-radius: 4px 4px 0px 0px; + text-align: center; + color: #ffffff; + line-height: 40px; + font-size: 12px; } -.szdfds{ - width:100px; - height:40px; - background:#FC7E30; - border-radius:4px 4px 0px 0px; - text-align: center; - color: #ffffff; - line-height: 40px; - margin-right: 27px; - font-size:12px; + +.szdfds { + width: 100px; + height: 40px; + background: #FC7E30; + border-radius: 4px 4px 0px 0px; + text-align: center; + color: #ffffff; + line-height: 40px; + margin-right: 27px; + font-size: 12px; } -.pd20{ - padding: 20px; +.pd20 { + padding: 20px; } -.cretitlecolrlis{ - color: #333333; - font-size: 14px !important; +.cretitlecolrlis { + color: #333333; + font-size: 14px !important; } -.cretitlecolrlisobj{ - color: #888888; - font-size: 14px !important; +.cretitlecolrlisobj { + color: #888888; + font-size: 14px !important; } -.cretitlecolrlist{ - color: #333333; - font-size: 14px !important; +.cretitlecolrlist { + color: #333333; + font-size: 14px !important; } -.lh28{ - line-height: 28px; -} -.h20{ - height: 20px; - background-color: #fff; -} -.lh20{ - line-height: 20px; - background-color: #fff; -} -.lh20s{ - line-height: 20px; -} -.backgroudwhites{ - background-color: #fff; +.lh28 { + line-height: 28px; } -.ml5{ - margin-left: 5px; +.h20 { + height: 20px; + background-color: #fff; } -.lh35{ - line-height: 35px; -} -.mt7{ - margin-top: 7px; -} -.ml18{ - margin-left: 18px; +.lh20 { + line-height: 20px; + background-color: #fff; } -.btques{ - width:1021px; - background:rgba(249,249,249,1); - border:1px solid rgba(221,221,221,1); + +.lh20s { + line-height: 20px; } -.borderwdswuhques { - width: 1020px !important; - background: #F9F9F9; - border: 1px solid #DDDDDD; - min-height: 42px; +.backgroudwhites { + background-color: #fff; } -.jixuxuanti{ - width:106px; - height:34px; - background:rgba(51,189,140,1); - border-radius:4px; - color:#ffffff ; - line-height: 34px; - text-align: center; +.ml5 { + margin-left: 5px; } -.lh34{ - line-height: 34px; + +.lh35 { + line-height: 35px; } -.mr2{ - margin-right: 2px; +.mt7 { + margin-top: 7px; } -.ml22{ - margin-left: 22px; +.ml18 { + margin-left: 18px; } -.zjzsdian{ - width: 20px; - height: 20px; - margin-top: 5px; +.btques { + width: 1021px; + background: rgba(249, 249, 249, 1); + border: 1px solid rgba(221, 221, 221, 1); } -.textcen{ - text-align: center; +.borderwdswuhques { + width: 1020px !important; + background: #F9F9F9; + border: 1px solid #DDDDDD; + min-height: 42px; } -.listjihecolors:hover{ - background: #F9F9F9; - background-color: #F9F9F9; + +.jixuxuanti { + width: 106px; + height: 34px; + background: rgba(51, 189, 140, 1); + border-radius: 4px; + color: #ffffff; + line-height: 34px; + text-align: center; } -.nofabu{ - width:46px; - height: 20px; - line-height: 20px; - background:rgba(255,102,1,1); - border-radius:10px; - color: #ffffff; - text-align: center; +.lh34 { + line-height: 34px; } -.jinzhixiaoshou{ - cursor:no-drop +.mr2 { + margin-right: 2px; } -.shitilang{ - height: 40px; - background: #606060; - color: #FFFFFF; - position: absolute; - top: -2px; - width: 100%; - left: 0px; - font-size:14px; - text-align: center; - line-height: 40px; +.ml22 { + margin-left: 22px; } -.xiaoshoums:hover{ - color:#4CACFF; +.zjzsdian { + width: 20px; + height: 20px; + margin-top: 5px; } -.shitikus{ - width: 40px !important; - position: absolute; - border-radius: 4px; - top: -50%; +.textcen { + text-align: center; } -.shitikussmys{ - width:29px !important; - height:20px!important; - background:#FF6601 !important; - border-radius:10px !important; - position: absolute !important; - font-size:11px !important; - color:#ffffff !important; - line-height:20px !important; - top: -14px !important; - right: -14px !important; + +.listjihecolors:hover { + background: #F9F9F9; + background-color: #F9F9F9; } +.nofabu { -.maxnamewidth30{ - max-width: 30px; - overflow:hidden; - text-overflow:ellipsis; - white-space:nowrap; - cursor: default; -} -.ball { - width: 8px; - height: 8px; - background: #FF6601; - position: absolute; - left: 0; - top: 0; - border-radius: 50%; - opacity: 0; - z-index: 1; + width: 46px; + height: 20px; + line-height: 20px; + background: rgba(255, 102, 1, 1); + border-radius: 10px; + color: #ffffff; + text-align: center; } -.mt25{ - margin-top: 25px; +.jinzhixiaoshou { + cursor: no-drop } -.mr15{ - margin-right: 15px; -} -.fangdatwo{ - background: #fefefe; - background-color: #fefefe; - height: 100%; - overflow-y: scroll !important; - width: 100%; - position: fixed; - top:0px; - bottom: 0px; - left: 0px; - z-index: 999999; - right: 0px; +.shitilang { + height: 40px; + background: #606060; + color: #FFFFFF; + position: absolute; + top: -2px; + width: 100%; + left: 0px; + font-size: 14px; + text-align: center; + line-height: 40px; } -.searchwidth{ - width: 347px !important; -} -.lh26{ - line-height: 26px !important; -} -.tites{ - color: #888888 !important; -} -.ant-popover-inner-content{ - padding: 0px !important; +.xiaoshoums:hover { + color: #4CACFF; } -.huanhan{ - flex-wrap: wrap; -} -.mb20{ - margin-bottom: 20px; +.shitikus { + width: 40px !important; + position: absolute; + border-radius: 4px; + top: -50%; } -.inpustred .ant-input{ - border: 1px solid #f30707; - border-radius: 5px; +.shitikussmys { + width: 29px !important; + height: 20px !important; + background: #FF6601 !important; + border-radius: 10px !important; + position: absolute !important; + font-size: 11px !important; + color: #ffffff !important; + line-height: 20px !important; + top: -14px !important; + right: -14px !important; } -.mt15{ - margin-top: 15px; -} -.conditionsetting{ - width:64px; - height:21px; - font-size:16px; - color:#333333; - line-height:21px; -} -.hengxians{ - width:1021px; - height:1px; - background: #EEEEEE; -} -.mt13{ - margin-top: 13px; -} -.inpustredss .ant-input-number{ - border: 1px solid #f30707; - border-radius: 5px; -} -.inpustredssdiv button { - border-radius: 50%; - width: 38px; - height: 38px; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; +.maxnamewidth30 { + max-width: 30px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + cursor: default; } -.inpustredssdiv .ant-input-number-input{ - text-align: center; -} -.lh32{ - line-height: 32px; -} -.ml23{ - margin-left: 23px; -} -.ml12{ - margin-left: 12px; -} -.mr12{ - margin-right: 12px; -} -.tishiyuyan{ - color: #888888 !important; - font-size:14px; -} -.tishiyuyans{ - color: #4CACFF !important; - font-size:14px; -} -.tikutask-btn{ - width:80px; - height:34px; - background:rgba(204,204,204,1); - border-radius:4px; -} -.tikutask-btns{ - width:80px; - height:34px; - background:rgba(76,172,255,1); - border-radius:4px; -} -.w100{ - width: 100px !important; -} -.h34{ - height: 34px !important; -} -.lh34{ - line-height: 34px !important; -} +.ball { + width: 8px; + height: 8px; + background: #FF6601; + position: absolute; + left: 0; + top: 0; + border-radius: 50%; + opacity: 0; + z-index: 1; +} + +.mt25 { + margin-top: 25px; +} + +.mr15 { + margin-right: 15px; +} + +.fangdatwo { + background: #fefefe; + background-color: #fefefe; + height: 100%; + overflow-y: scroll !important; + width: 100%; + position: fixed; + top: 0px; + bottom: 0px; + left: 0px; + z-index: 999999; + right: 0px; +} + +.searchwidth { + width: 347px !important; +} \ No newline at end of file diff --git a/public/react/src/modules/testpaper/Paperlibraryeditid.js b/public/react/src/modules/testpaper/Paperlibraryeditid.js index eaf6a1046..d22047469 100644 --- a/public/react/src/modules/testpaper/Paperlibraryeditid.js +++ b/public/react/src/modules/testpaper/Paperlibraryeditid.js @@ -11,8 +11,10 @@ import Bottomsubmit from "../../modules/modals/Bottomsubmit"; import Seeoagertits from "./component/Seeoagertits"; import Comthetestpaperst from '../question/comthetestpaper/Comthetestpaperst'; import Paperlibraryseeid_itemss from './component/Paperlibraryseeid_itemss'; +import JudquestionEditor from "../question/component/JudquestionEditor"; import NewMyShixunModel from "../question/NewMyShixunModel"; + //试卷编辑 class Paperlibraryeditid extends Component { constructor(props) { @@ -176,6 +178,7 @@ class Paperlibraryeditid extends Component { this.contentMdRef = Ref; } +<<<<<<< HEAD setnewmyshixunmodelbool = (bool) => { if (bool === true) { let scrollToTop = window.setInterval(function () { @@ -184,6 +187,16 @@ class Paperlibraryeditid extends Component { window.scrollTo(0, pos - 20); // how far to scroll on each step } else { window.clearInterval(scrollToTop); +======= + 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 ); +>>>>>>> 1036126... 合并 } }, 2); }