-
-
+
{ items&&items.program_attr&&items.program_attr.description?
-
编辑 @@ -366,16 +374,26 @@ class Listjihe extends Component { { items.public === false ? items.item_type === "PROGRAM" ? - items.program_attr.status === 0 ? - "" - : - items.apply===false? -
this.props.showmodels(items.id)}> - - 公开 -
- : + ( + items.program_attr.status === 0 ? "" + : + items.apply===false? +this.props.showmodels(items.id)}> + + 公开 +
+ : + ( + items.public==true? + "" + : +this.props.showmodelsInaudit(e)}> + + 公开审核中 +
+ ) + ) :items.apply===false?this.props.showmodels(items.id)}> @@ -433,7 +451,7 @@ class Listjihe extends Component {
{items ?
@@ -442,6 +460,7 @@ class Listjihe extends Component {
""
:
items.analysis.length>0?
+ analysisnames===null || analysisnames===undefined?"":
![]({getImageUrl("images/educoder/zjzsd.png")})
this.NewknTypedeldel(true)}/>
+ this.NewknTypedeldel(true)}/>
+
+
this.NewknTypedeldel(true)}/>
-
-
+ {
+ this.state.sub_disciplineslength === null || this.state.sub_disciplineslength === undefined || this.state.sub_disciplineslength === 0 ? "" :
+ this.NewknTypedeldel(true)}/>
+
+
+
+ ![]({getImageUrl("images/educoder/shijuans.png")})
this.gotoseesj(items.id)}>{names}
试题数：{question_counts}
总分：{total_scores}
@@ -92,9 +92,15 @@ class Listjihe extends Component { 更新时间：{update_times} -- 使用次数：{quotess} -
+ { + quotess===null||quotess===undefined||quotess===0? + "" + : ++ 使用次数：{quotess} +
+ } + { defaultActiveKey===1||defaultActiveKey==="1"?diff --git a/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js b/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js index 7d66a19c4..c7c974c5b 100644 --- a/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js +++ b/public/react/src/modules/testpaper/component/Paperlibraryseeid_items.js @@ -24,6 +24,7 @@ const tagArray = [ ] //单选题 +//Paperreview_single.js Listjihe.js class Paperlibraryseeid_items extends Component { constructor(props) { super(props); @@ -160,10 +161,16 @@ class Paperlibraryseeid_items extends Component {
-
试题库
- -试卷库
+试题库
+试卷库
); return ( @@ -951,7 +950,7 @@ submittojoinclass=(value)=>{this.Selectingpracticaltrainings(items.id)}> - - 撤销
+ {/**/} + 撤销 : items.item_type === "PROGRAM" ? items.program_attr.status === 0 ? @@ -400,7 +400,15 @@ class Listjihe extends Component { 公开 : - "" + ( + items.public==true? + "" + : +this.props.showmodelsInaudit(e)}> + + 公开审核中 +
+ ) : "" } @@ -451,7 +459,12 @@ class Listjihe extends Component {+ 解析： +
+
{items ?
diff --git a/public/react/src/modules/question/component/SingleEditor.js b/public/react/src/modules/question/component/SingleEditor.js
index dffbf620c..fd7f8ce94 100644
--- a/public/react/src/modules/question/component/SingleEditor.js
+++ b/public/react/src/modules/question/component/SingleEditor.js
@@ -253,7 +253,11 @@ class SingleEditor extends Component{
const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
if (!reg.test(_text)) {
// 处理编辑器内容为空
- texts="";
+ try {
+ texts= JSON.stringify(value)
+ }catch (e) {
+ texts="";
+ }
} else {
if(_text.length>=301){
var result = _text.substring(0,300);
@@ -291,9 +295,15 @@ class SingleEditor extends Component{
const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
if (!reg.test(_text)) {
// 处理编辑器内容为空
- this.setState({
- question_titleysl:""
- })
+ try {
+ this.setState({
+ question_titleysl: JSON.stringify(value)
+ })
+ }catch (e) {
+ this.setState({
+ question_titleysl:""
+ })
+ }
} else {
// 提交到后台的内容需要处理一下;
@@ -322,9 +332,15 @@ class SingleEditor extends Component{
const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
if (!reg.test(_text)) {
// 处理编辑器内容为空
- this.setState({
- question_titlesysl:""
- })
+ try {
+ this.setState({
+ question_titlesysl:JSON.stringify(value)
+ })
+ }catch (e) {
+ this.setState({
+ question_titlesysl:""
+ })
+ }
} else {
var texts="";
if(_text.length>=1001){
diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css
index 98edd9915..7f164535b 100644
--- a/public/react/src/modules/question/questioncss/questioncom.css
+++ b/public/react/src/modules/question/questioncss/questioncom.css
@@ -705,6 +705,9 @@
font-size: 14px;
}
+.testfondexsysl{
+ width:5% !important;
+}
.yldxtits{
color: #888888;
font-size: 14px;
@@ -712,7 +715,9 @@
.mt25{
margin-top: 25px;
}
-
+.wt930px{
+ width: 930px !important;
+}
.postitonrelati{
position: relative;
}
@@ -1072,3 +1077,18 @@
.lh34{
line-height: 34px !important;
}
+.titesstwos{
+ position: relative;
+}
+.titesstwostest{
+ position: absolute;
+}
+.text-indents40{
+ text-indent:40px
+}
+.text-indents44{
+ text-indent:44px
+}
+.text-indents50{
+ text-indent: 50px
+}
diff --git a/public/react/src/modules/testpaper/Testpaperlibrary.js b/public/react/src/modules/testpaper/Testpaperlibrary.js
index 86a267b83..4d9ad75a9 100644
--- a/public/react/src/modules/testpaper/Testpaperlibrary.js
+++ b/public/react/src/modules/testpaper/Testpaperlibrary.js
@@ -18,6 +18,7 @@ import SiderBar from "../tpm/SiderBar";
import Headplugselections from "../question/component/Headplugselections";
import QuestionModal from "./component/QuestionModal";
import QuestionModals from "./component/QuestionModals";
+import QuestionModalys from "./component/QuestionModalys";
class Testpaperlibrary extends Component {
constructor(props) {
super(props);
@@ -40,6 +41,7 @@ class Testpaperlibrary extends Component {
modalsTypes:false,
modalsType:false,
timuid:0,
+ modalsTypeInaudit:false,
}
}
getContainer = () => {
@@ -138,11 +140,16 @@ class Testpaperlibrary extends Component {
}
//获取数据
- getdata=(data)=>{
+ getdata=(data,bool)=>{
const url = `/examination_banks.json`;
- this.setState({
- booljupyterurls:true,
- })
+ if(bool){
+
+ }else {
+ this.setState({
+ booljupyterurls:true,
+ })
+ }
+
axios.get((url), {params: data}).then((response) => {
setTimeout(()=>{
this.setState({
@@ -288,7 +295,7 @@ class Testpaperlibrary extends Component {
page: this.state.page,
per_page:10,
};
- this.getdata(data);
+ this.getdata(data,true);
}
}).catch((error) => {
////console.log(error);
@@ -314,7 +321,7 @@ class Testpaperlibrary extends Component {
page: this.state.page,
per_page:10,
};
- this.getdata(data);
+ this.getdata(data,true);
}
})
.catch(function (error) {
@@ -325,8 +332,8 @@ class Testpaperlibrary extends Component {
showmodels = (id) => {
this.setState({
modalsType: true,
- titilesm: "在平台审核后，所有成员均可使用试题",
- titiless: "是否设置为公开？",
+ titilesm: "在平台审核后，所有成员均可使用试卷",
+ titiless: "是否设置为公开",
titbool: true,
timuid: id
})
@@ -337,7 +344,19 @@ class Testpaperlibrary extends Component {
}
+ showmodelsInaudit = (e) => {
+ this.setState({
+ modalsTypeInaudit: true,
+ titilesm: "公开申请已提交，请等待管理员的审核",
+ titiless: "我们将在1-2个工作日内完成审核",
+ })
+ };
+ modalsTypeInauditbool=()=>{
+ this.setState({
+ modalsTypeInaudit:false,
+ })
+ }
showmodelysl = (id) => {
this.setState({
@@ -403,7 +422,7 @@ class Testpaperlibrary extends Component {
render() {
- let{Headertop,items_count,page,per_page,modalsTypes,modalsType}=this.state;
+ let{Headertop,items_count,page,per_page,modalsTypes,modalsType,modalsTypeInaudit}=this.state;
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;
@@ -424,6 +443,12 @@ class Testpaperlibrary extends Component {
setDownload={() => this.setDownload()}>
:""
}
+ {
+ modalsTypeInaudit===true?
+ this.props.showmodels(items.id)}>
公开
this.props.showmodelsInaudit(e)}>
+
+ 公开审核中
+
编辑