diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index ceddbd81b..dfd54f38b 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -114,21 +114,21 @@ module.exports = {
       // First, run the linter.
       // It's important to do this before Babel processes the JS.
         // 上线然后要注释回来
-      // {
-      //   test: /\.(js|jsx|mjs)$/,
-      //   enforce: 'pre',
-      //   use: [
-      //     {
-      //       options: {
-      //         formatter: eslintFormatter,
-      //         eslintPath: require.resolve('eslint'),
-			//
-      //       },
-      //       loader: require.resolve('eslint-loader'),
-      //     },
-      //   ],
-      //   include: paths.appSrc,
-      // },
+      {
+        test: /\.(js|jsx|mjs)$/,
+        enforce: 'pre',
+        use: [
+          {
+            options: {
+              formatter: eslintFormatter,
+              eslintPath: require.resolve('eslint'),
+
+            },
+            loader: require.resolve('eslint-loader'),
+          },
+        ],
+        include: paths.appSrc,
+      },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall
diff --git a/public/react/public/index.html b/public/react/public/index.html
index 028b1cb68..bafefaf47 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -55,7 +55,7 @@
 
     <!-- <link href="/react/build/css/iconfont.css" rel="stylesheet" type="text/css"> -->
 
-    <link href="https://testeduplus2.educoder.net/stylesheets/educoder/edu-all.css" rel="stylesheet" type="text/css">
+    <link href="/stylesheets/educoder/edu-all.css" rel="stylesheet" type="text/css">
 
     <!--<link href="https://pandao.github.io/editor.md/examples/css/style.css" rel="stylesheet" type="text/css">-->
 
@@ -148,12 +148,12 @@
       (function() { // Scoping function to avoid globals
         var href = location.href;
           if (href.indexOf('/tasks/') != -1) {
-            document.write('<script type="text/javascript" src="https://testeduplus2.educoder.net/assets/kindeditor/kindeditor.js"><\/script>');
+            document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>');
             // build.js中会将这个url附加一个前缀 react/build
             document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
-            document.write('<script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
+            document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
           } else if (href.indexOf('/paths/') != -1) {
-            document.write('<script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
+            document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
 
           }
       })();
diff --git a/public/react/public/index.test.html b/public/react/public/index.test.html
index 7d584f876..b275cf90a 100755
--- a/public/react/public/index.test.html
+++ b/public/react/public/index.test.html
@@ -38,7 +38,7 @@
 
     <link rel="stylesheet" type="text/css" href="/css/css_min_all.css">
 
-    <link href="https://testeduplus2.educoder.net/stylesheets/educoder/edu-all.css" rel="stylesheet" type="text/css">
+    <link href="/stylesheets/educoder/edu-all.css" rel="stylesheet" type="text/css">
 
     <link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_653600_qa9lwwv74z.css">
 
diff --git a/public/react/src/common/UrlTool.js b/public/react/src/common/UrlTool.js
index c0402b325..6a6bb348d 100644
--- a/public/react/src/common/UrlTool.js
+++ b/public/react/src/common/UrlTool.js
@@ -1,51 +1,52 @@
-const isDev = window.location.port == 3007;
-export function getImageUrl(path) {
-	// https://www.educoder.net
-	// https://testbdweb.trustie.net
-  // const local = 'http://localhost:3000'
-  const local = 'https://testeduplus2.educoder.net'
-	if (isDev) {
-		return `${local}/${path}`
-	}
-	return `/${path}`;
-}
-
-export function setImagesUrl(path){
-	const local = 'http://47.96.87.25:48080'
-	let firstStr=path.substr(0,1);
-	console.log(firstStr);
-	if(firstStr=="/"){
-		return isDev?`${local}${path}`:`${path}`;
-	}else{
-		return isDev?`${local}/${path}`:`/${path}`;
-	}
-}
-
-export function getUrl(path, goTest) {
-	// https://www.educoder.net
-	// https://testbdweb.trustie.net
-
-	// 如果想所有url定位到测试版，可以反注释掉下面这行
-	//goTest = true
-	// testbdweb.educoder.net testbdweb.trustie.net
-  // const local = goTest ? 'https://testeduplus2.educoder.net' : 'http://localhost:3000'
-  const local = 'https://testeduplus2.educoder.net'
-	if (isDev) {
-		return `${local}${path?path:''}`
-	}
-	return `${path ? path: ''}`;
-}
-export function getUploadActionUrl(path, goTest) {
-	return `${getUrl()}/api/attachments.json${isDev ? `?debug=${window._debugType || 'admin'}` : ''}`
-}
-
-export function test(path) {
-	return `${path}`;
-}
-
-export function toPath(path) {
-	window.open(path, '_blank');
-}
-
-
+const isDev = window.location.port == 3007;
+export function getImageUrl(path) {
+	// https://www.educoder.net
+	// https://testbdweb.trustie.net
+  // const local = 'http://localhost:3000'
+  const local = 'https://testeduplus2.educoder.net'
+	if (isDev) {
+		return `${local}/${path}`
+	}
+	return `/${path}`;
+}
+
+export function setImagesUrl(path){
+	const local = 'http://47.96.87.25:48080'
+	let firstStr=path.substr(0,1);
+	console.log(firstStr);
+	if(firstStr=="/"){
+		return isDev?`${local}${path}`:`${path}`;
+	}else{
+		return isDev?`${local}/${path}`:`/${path}`;
+	}
+}
+
+export function getUrl(path, goTest) {
+	// https://www.educoder.net
+	// https://testbdweb.trustie.net
+
+	// 如果想所有url定位到测试版，可以反注释掉下面这行
+	//goTest = true
+	// testbdweb.educoder.net testbdweb.trustie.net
+  // const local = goTest ? 'https://testeduplus2.educoder.net' : 'http://localhost:3000'
+  // const local = 'https://testeduplus2.educoder.net'
+	const local = 'http://47.96.87.25:48080'
+	if (isDev) {
+		return `${local}${path?path:''}`
+	}
+	return `${path ? path: ''}`;
+}
+export function getUploadActionUrl(path, goTest) {
+	return `${getUrl()}/api/attachments.json${isDev ? `?debug=${window._debugType || 'admin'}` : ''}`
+}
+
+export function test(path) {
+	return `${path}`;
+}
+
+export function toPath(path) {
+	window.open(path, '_blank');
+}
+
+
 // export default queryString
\ No newline at end of file
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 6476ef2bb..96338818f 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -315,14 +315,14 @@ class Fileslists extends Component{
 
     this.setState({
       Modalstype:true,
-      Modalstopval:"公开后非课堂成员也可以访问查看",
-      ModalsBottomval:"是否确认公开？",
+      Modalstopval:"设为公开后，非课堂成员也可以访问查看",
+      ModalsBottomval:"是否确认设为公开？",
       ModalCancel:this.cancelmodel,
       ModalSave:this.saveonOpen,
     })
   }
 
-  saveonOpen=()=>{
+	saveonOpen=()=>{
     this.setState({
       Modalstype:false,
     })
diff --git a/public/react/src/modules/courses/boards/BoardsListItem.js b/public/react/src/modules/courses/boards/BoardsListItem.js
index 2a6aaae2f..cf667dc6d 100644
--- a/public/react/src/modules/courses/boards/BoardsListItem.js
+++ b/public/react/src/modules/courses/boards/BoardsListItem.js
@@ -48,8 +48,9 @@ class BoardsListItem extends Component{
           <div className="clearfix ds pr pt5 contentSection" onClick={() => onItemClick(discussMessage)}>
             <h6>
               <a href="javascript:void(0)" className="panel-list-title hide fl mt5 color-dark font-bd" 
-                style={{ fontWeight: 'bold', cursor: (canNotLink ? 'default' : 'poninter') }}
+                style={{ fontWeight: 'bold', cursor: (canNotLink ? 'default' : 'poninter'), maxWidth: '700px' }}
                 onClick={canNotLink ? () => {} : () => this.onTitleClick(discussMessage)}
+                title={`${discussMessage.subject.length > 40 ? discussMessage.subject : ''}`}
               >{discussMessage.subject}</a>
               { !!discussMessage.sticky && <span className="btn-cir btn-cir-red fl mt5 ml5">置顶</span> }
               {
diff --git a/public/react/src/modules/courses/boards/index.js b/public/react/src/modules/courses/boards/index.js
index 10c8accea..cc761cd5d 100644
--- a/public/react/src/modules/courses/boards/index.js
+++ b/public/react/src/modules/courses/boards/index.js
@@ -446,7 +446,9 @@ class Boards extends Component{
               </Tooltip>
             </a>
             </p> } */}
-          {pagination.total_count > 15 && <Pagination className="coursePagination" showQuickJumper pageSize={15} total={pagination.total_count} onChange={this.onPageChange} />}
+          {pagination.total_count > 15 && <Pagination className="coursePagination" 
+              current={pagination.page}
+              showQuickJumper pageSize={15} total={pagination.total_count} onChange={this.onPageChange} />}
                
       </React.Fragment>
       )
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAnswer.js b/public/react/src/modules/courses/busyWork/CommonWorkAnswer.js
index 51031de17..d7614459c 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkAnswer.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkAnswer.js
@@ -86,7 +86,7 @@ class CommonWorkAnswer extends Component{
         {/* 内容区 */}
         <div className="padding40 memoContent new_li">
           {reference_answer ? <MarkdownToHtml content={reference_answer || "还未设置答案。"}></MarkdownToHtml> :
-            reference_answer === undefined ? '' : <NoneData></NoneData>}
+            reference_answer === undefined ? '' : ((!attachments || attachments.length == 0) && <NoneData></NoneData>)}
           
           { attachments && attachments.map((item) => {
             return ( <div className="color-grey">
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
index 08832a059..99b16a20f 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
@@ -190,28 +190,28 @@ class CommonWorkAppraise extends Component{
             <div className={"color-grey-6 mb15 font-16"}>
               内容
             </div>
-            <div className="pl20">
-              <div className={"ml20"} className="markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(description)}}>
-              </div>
-              {attachments.map((item,key)=>{
-                return(
-                  <div className="color-grey" key={key}>
-                    <a className="color-grey">
-                      <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
-                    </a>
-                    <a href={item.url}
-                        className="mr12 color9B9B" length="58">
-                      {item.title}
-                    </a>
-                    <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
-                    {/*{item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}*/}
-                    {item.delete===true?<i className="font-14 iconfont  icon-guanbi " style={{display: 'none'}} id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
-                  </div>
-                )
-              })}
-            </div>  
+            <div className="markdown-body ml20" dangerouslySetInnerHTML={{__html: markdownToHTML(description)}}>
+            </div>
 
-            <div className={"color-grey-6 clearfix lineh-25 ml20"}>
+            {attachments.map((item,key)=>{
+              return(
+                <div className="color-grey" key={key}>
+                  <a className="color-grey ml20">
+                    <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
+                  </a>
+                  <a href={item.url}
+                      className="mr12 color9B9B" length="58" title={`${item.title && item.title.length > 40 ? item.title : ''}`}>
+                    {item.title}
+                  </a>
+                  <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
+                  {/*{item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}*/}
+                  {item.delete===true?<i className="font-14 iconfont  icon-guanbi " style={{display: 'none'}} id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
+                </div>
+              )
+            })}
+          
+
+            <div className={"color-grey-6 h20 ml20"}>
               { update_time &&
               <React.Fragment>
                 <span className={"color9B9B fr"}>更新</span>
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index da4a92be1..4e3214e50 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -150,7 +150,7 @@ class CommonWorkDetailIndex extends Component{
               ]}></CBreadcrumb>
 
               <div style={{ width:'100%',height:'52px'}} >
-                <span className=" fl color-black summaryname">
+                <span className=" fl color-black summaryname" title={`${homework_name && homework_name.length > 36 ? homework_name : ''}`}>
                    {homework_name}
                   {/* <Link to={"/courses/"+courseId+"/graduation"+"/graduation_tasks/"}>{homework_name}</Link> */}
                 </span>
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 25ddaa146..2243310a2 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -1,5 +1,5 @@
 import React,{Component} from "React";
-import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip,Spin} from "antd";
+import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip,Spin, Pagination} from "antd";
 import {Link} from 'react-router-dom';
 import locale from 'antd/lib/date-picker/locale/zh_CN';
 import { WordsBtn, ConditionToolTip, queryString,getImageUrl, on, off} from 'educoder';
@@ -64,7 +64,9 @@ function buildColumns(that, student_works) {
     key: 'id',
     render: (text, record, index) => {
       return (
-       <span style={{ minWidth: '50px', display: 'inline-block', textAlign: 'center' }} >{(that.state.page - 1) * PAGE_SIZE + index + 1}</span>
+       <span style={{ minWidth: '50px', display: 'inline-block', textAlign: 'center' }} >
+        {record.isMine == true ? '我' : (that.state.page - 1) * PAGE_SIZE + index + 1}
+      </span>
     )},
   }, {
     title: '姓名',
@@ -77,7 +79,8 @@ function buildColumns(that, student_works) {
 					
 					overflow: 'hidden',
 					textOverflow: 'ellipsis',
-					whiteSpace: 'nowrap'
+					whiteSpace: 'nowrap',
+          width: '98px'
 					 }} title={text}>
 				{/* <Tooltip placement="bottom" title={text}>
 				</Tooltip> */}
@@ -94,7 +97,10 @@ function buildColumns(that, student_works) {
 
       render: (text, record) => (
         <span>
-          <a href="javascript:;"  style={{color:'#9A9A9A'}}>{record.student_id}</a>
+          <a href="javascript:;"  
+            title={record.student_id}
+            style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '100px', display: 'block', overflow: 'hidden'}}
+          >{record.student_id}</a>
       </span>
       ),
     })
@@ -228,7 +234,7 @@ function buildColumns(that, student_works) {
         <span>
           <Tooltip title={
             getScoreTip(student_score,
-            <div>
+            isNiPing ? `你的评阅分数：${record.student_score}分` : <div>
               {record.student_comment_count && <div>{`${record.student_comment_count}名学生进行了匿评`}</div>}
               <div>有效平均分：{record.student_score}分</div>
             </div>
@@ -256,7 +262,7 @@ function buildColumns(that, student_works) {
                 {`${record.appeal_deal_count}/${appeal_all_count}`}
               </span>
             </Tooltip> }
-          { !appeal_all_count && '-/-'}
+          { !appeal_all_count && <span style={{ color: '#747A7F' }}>-/-</span>}
       </span>
       ),
     })
@@ -299,7 +305,7 @@ function buildColumns(that, student_works) {
       key: 'operation',
       dataIndex: 'operation',
       render: (operation, record) => (
-        record.work_status === 0 ? '--':
+        record.work_status === 0 && !isAdmin ? <span style={{ color: '#747A7F' }}>--</span>:
         <div>
           {/* 0 未提交 */}
           {/*<React.Fragment>*/}
@@ -330,7 +336,7 @@ const orderMap = {
 }
 const PAGE_SIZE = 50
 // 类似页面 http://localhost:3007/courses/1309/graduation/graduation_tasks/48/76/setting
-class CommonWorkSetting extends Component{
+class CommonWorkList extends Component{
 
   constructor(props){
     super(props)
@@ -355,8 +361,8 @@ class CommonWorkSetting extends Component{
       category: {},
     }
   }
-  onTablePagination = (pageInfo) => {
-    this.setState({ page: pageInfo.current }, () => {
+  onTablePagination = (page) => {
+    this.setState({ page: page }, () => {
       this.fetchList()
     })
 
@@ -543,7 +549,7 @@ class CommonWorkSetting extends Component{
       StudentData=isStudent ? [{ id, user_name, user_login, student_id, group_name, work_status, update_time, teacher_score, teaching_asistant_score, student_score,
       ultimate_score, work_score, student_comment_count, appeal_all_count, appeal_deal_count,
       late_penalty, absence_penalty, appeal_penalty,
-      work_group: '' }] : []
+      work_group: '', isMine: true }] : []
     }
     let params = this._getRequestParams()
     let exportUrl = `/api/homework_commons/${workId}/works_list.zip?${queryString.stringify(params)}`;
@@ -706,7 +712,7 @@ class CommonWorkSetting extends Component{
             }
 
 
-            <div className={"justify break_full_word new_li edu-back-white course_table_wrap"} style={{minHeight:"480px"}}>
+            <div className={"justify break_full_word new_li edu-back-white course_table_wrap"} style={{minHeight:"480px", marginBottom: '30px'}}>
               <style>{`
               .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
                           top: 72%;}
@@ -730,31 +736,35 @@ class CommonWorkSetting extends Component{
 										</div>
 									</div>
 								</Spin>
-								:<Table
-                dataSource={student_works}
-                columns={columns}
-                showQuickJumper
-                pagination={work_count > PAGE_SIZE ? {  //分页
+								:
+              <React.Fragment>
+              {/* pagination={work_count > PAGE_SIZE ? {  //分页
                   total: work_count, //数据总数量
                   pageSize: PAGE_SIZE,  //显示几条一页
                   current: page,
-                } : false}
-                loading={loadingstate}
+                } : false} 
+                
                 onChange={this.onTablePagination}
-              />}
-            </div>
-
-            {/* <div className={"justify break_full_word new_li edu-back-white singleLine"} style={{minHeight:"480px"}}>
-              {data2===undefined?"":<Table
-                showHeader={false}
-                dataSource={data2}
+                */}
+              <Table
+                className="stageTable"
+                dataSource={student_works}
                 columns={columns}
+                showQuickJumper
                 pagination={false}
                 loading={loadingstate}
-              />}
-            </div> */}
+              />
+              </React.Fragment>
+
+              }
+            </div>
           </div>
 
+          {work_count > PAGE_SIZE && <Pagination 
+              style={{ textAlign: 'center', marginBottom: '20px' }}
+              showQuickJumper pageSize={PAGE_SIZE} onChange={this.onTablePagination} current={page} total={work_count} />}
+
+
 
       </React.Fragment>
 
@@ -762,5 +772,5 @@ class CommonWorkSetting extends Component{
   }
 }
 
-const CommonWorkSettingForm = Form.create({ name: 'commonworkSettingForm' })(CommonWorkSetting);
-export default CommonWorkSettingForm;
\ No newline at end of file
+const CommonWorkListForm = Form.create({ name: 'commonworkListForm' })(CommonWorkList);
+export default CommonWorkListForm;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
index 0193d8659..c9c5c7b45 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js
@@ -633,7 +633,7 @@ render(){
       </p>
 
       <div style={{ width:'100%',height:'75px'}} >
-        <p className=" fl color-black mt25 summaryname">{homework_name}</p>
+        <p className=" fl color-black mt25 summaryname" title={homework_name}>{homework_name}</p>
         <a className="color-grey-6 fr font-16 ml30 mt10 mr20" onClick={this.goback}>返回</a>
       </div>
 
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
index 4a30990ef..ca5668961 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js
@@ -982,6 +982,9 @@ class CommonWorkSetting extends Component{
           .settingForm .ant-radio-group, .settingForm.ant-form {
             color: #666;
           }
+          .settingForm.ant-form {
+            margin-bottom: 30px;
+          }
 
           .settingForm input.ant-input {
             height: 40px
diff --git a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
index 02e2d2b0f..92ff54178 100644
--- a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
+++ b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
@@ -88,6 +88,7 @@ class TabRightComponents extends Component{
               .drop_down_menu li a {
                   padding: 0px;
                   font-size: 14px;
+                  color: #333;
               }
               .drop_down_menu {
                   width: 121px;
diff --git a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
index 21bd2f241..c16d285dd 100644
--- a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
+++ b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
@@ -103,7 +103,7 @@ class WorkDetailPageHeader extends Component{
                 />
                
 
-                {category && <a className="color-grey-6 fr font-16 ml30 mt5 mr20" onClick={this.goback} style={{ marginRight: '26px'}}>返回</a>}
+                {category && <a className="color-grey-6 fr font-16 ml30 mt7 mr20" onClick={this.goback} style={{ marginRight: '26px'}}>返回</a>}
 
                 {this.props.update_atta &&
                 <React.Fragment>
diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js
index 28199c4c0..cc4aff4f9 100644
--- a/public/react/src/modules/courses/busyWork/commonWork.js
+++ b/public/react/src/modules/courses/busyWork/commonWork.js
@@ -219,7 +219,10 @@ class commonWork extends Component{
       return;
     }
     this.props.confirm({
-      content: `是否确认公开？`,
+      content: <div>
+        <div>设为公开后，非课堂成员也可以访问查看</div>
+        <div>是否确认设为公开？</div>
+      </div>,
       onOk: () => {
         let coursesId=this.props.match.params.coursesId;
         const url = `/courses/${coursesId}/homework_commons/set_public.json`
@@ -395,8 +398,9 @@ class commonWork extends Component{
             secondRowLeft={
               <div style={{"display":"inline-block", "marginTop": "22px"}}>
                 <span>共 {mainList&&mainList.all_count} 个作业</span>
-                <span style={{"marginLeft":"16px"}}>已发布作业：{published_count}个</span>
-                {this.props.isAdmin()?<span style={{"marginLeft":"16px"}}>未发布作业：{unpublished_count}个</span>:""}
+                <span style={{"marginLeft":"16px"}}>已发布：{published_count}个</span>
+                {/* {this.props.isAdmin()?:""} */}
+                <span style={{"marginLeft":"16px"}}>未发布：{unpublished_count}个</span>
               </div>
             }
             searchPlaceholder={"请输入名称进行搜索"}
diff --git a/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js b/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
index f267e93e9..314796414 100644
--- a/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
+++ b/public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js
@@ -209,7 +209,9 @@ class CommonWorkAppraiseReply extends Component{
       isAdmin || 评阅入口：超级管理员、老师和助教显示；  -》 改成admin也不显示
       匿评人：匿评期间显示
      */
-    const needNiPingEditor = (allow_score  && isNiPing);
+
+    //  && isNiPing
+    const needNiPingEditor = (allow_score );
     if (!needNiPingEditor && comment_scores.length == 0) {
       return ''
     }
@@ -257,7 +259,7 @@ class CommonWorkAppraiseReply extends Component{
             <span className="labal">全部评阅</span>
             <span className="count">（{comment_scores.length}）</span> 
            </div>)} */}
-          <div className="padding10-20 bor-bottom-greyE">
+          <div className={`padding10-20 ${comment_scores.length ? 'bor-bottom-greyE' : ''}`}>
             {!!comment_scores.length && <div className={"color-grey-6 font-16"}>
               全部评阅<span className="count">{comment_scores.length===0?"":`(${comment_scores.length})`}</span>
 
diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js
index 45ebb364b..e4286e456 100644
--- a/public/react/src/modules/courses/common/comments/CCommentItem.js
+++ b/public/react/src/modules/courses/common/comments/CCommentItem.js
@@ -51,7 +51,7 @@ class CCommentItem extends Component{
           })
         .then((response) => {
           if (response.data.status == 0) {
-						this.showNotification('撤销成功')
+						this.props.showNotification('撤销成功')
 						this.props.replySuccess()
           }
         })
@@ -67,7 +67,7 @@ class CCommentItem extends Component{
 
     let { item, commentIndex }=this.props;
 	if (!this.state.secondReplyContent || !this.state.secondReplyContent.trim()) {
-		this.showNotification('内容不能为空')
+		this.props.showNotification('内容不能为空')
 		return;
 	}
 	if (this.state.show_reply) {
@@ -313,7 +313,7 @@ class CCommentItem extends Component{
 										{ item.is_invalid ? <span className="validate_area fr">失效</span> : 
 										<React.Fragment>
 											<WordsBtn style="blue" className="fr" onClick={this.state.show_reply ? this.cancelReply : this.showReply}>回复</WordsBtn>
-											{(isAppealing || isAnonymous) && item.can_appeal && item.appeal_status == 0 && <WordsBtn style="blue" className="fr mr5" onClick={this.state.show_appeal ? this.cancelAppeal : this.showAppeal}>申诉</WordsBtn>}
+											{(isAppealing || isAnonymous) && item.can_appeal && item.appeal_status == 0 && <WordsBtn style="blue" className="fr mr20" onClick={this.state.show_appeal ? this.cancelAppeal : this.showAppeal}>申诉</WordsBtn>}
 											
 											
 										</React.Fragment>
diff --git a/public/react/src/modules/courses/common/courseMessage.css b/public/react/src/modules/courses/common/courseMessage.css
index a7bbd8f1a..fede51ded 100644
--- a/public/react/src/modules/courses/common/courseMessage.css
+++ b/public/react/src/modules/courses/common/courseMessage.css
@@ -33,9 +33,14 @@
 .course-message .panel-comment_item .editor__resize {
   left: 47%;
 }
+.course-message .childrenCommentsView .comment_item_cont:first-child {
+  border-top: 1px solid #e3e3e3;
+  margin-top: 8px;
+}
 .course-message .comment_item_cont:last-child {
   /* 作品评阅需要 */
   border-bottom: none;
+  padding-bottom: 0px;
 }
 
 .course-message .memoMore {
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index 363a83187..f4f097a33 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -122,11 +122,12 @@ class CoursesBanner extends Component {
             this.showActionPoll(i,s)
         }
         if (i === 3) {
-            s = "您确定要设置为公开?";
-            this.showActionPoll(i,s)
+            s = "设为公开后，非课堂成员也可以访问查看";
+					  ss =  "是否确认设为公开？";
+            this.showActionPoll(i,s,ss)
         }
 
-      if(i===4){
+			if(i===4){
             if(coursedata.code_halt === true){
                 var url = `/courses/${this.props.match.params.coursesId}/set_invite_code_halt.json`
                 axios.post(url, {}).then((result) => {
diff --git a/public/react/src/modules/courses/coursesHome/coursesHomeCard.js b/public/react/src/modules/courses/coursesHome/coursesHomeCard.js
index c5f6aeca7..c0a1a93f0 100644
--- a/public/react/src/modules/courses/coursesHome/coursesHomeCard.js
+++ b/public/react/src/modules/courses/coursesHome/coursesHomeCard.js
@@ -40,7 +40,8 @@ class coursesHomeCard extends Component{
                               className="mt80 mb25"/>
                               <p className="font-14 color-white">非成员不能访问</p>
                           </div>
-                           <a href={item.first_category_url} className="square-img" target="_blank">
+                           <a href={item.first_category_url} className="square-img" >
+														 {/*target="_blank"*/}
                              {
                                item.is_public===1&&item.id===1309?
                                  <div>
diff --git a/public/react/src/modules/courses/coursesPublic/Startshixuntask.js b/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
index 9cf44c9a7..dfe56f945 100644
--- a/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
+++ b/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
@@ -46,7 +46,8 @@ class Startshixuntask extends Component{
 				}else{
 
 					if(response.data.status!=401&&response.data.status!=403){
-						window.location.href = "/tasks/"+response.data.game_identifier;
+						const w=window.open('about:blank');
+						w.location.href= "/tasks/"+response.data.game_identifier
 					}
 
 				}
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 6dd7984d1..3579f983b 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -1,6 +1,12 @@
 i.iconfont {
     cursor: pointer;
 }
+.overflowHidden1{
+    overflow: hidden; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    display: inline-block;
+}
 
 /* BASICS */
 .editormd-preview ol li {
@@ -837,6 +843,14 @@ a.white-btn.use_scope-btn:hover{
     font-weight: 400;
     margin-left: 28px;
 }
+.commitcontentsysl{
+    width: 43px;
+    height: 15px;
+    font-size: 16px;
+    font-family: MicrosoftYaHei;
+    font-weight: 400;
+    margin-left: -4px;
+}
 
 
 /*列表状态*/
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index 1ba465dfe..314aa5447 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -2,7 +2,7 @@ import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Spin,Tooltip} from "antd";
 import {Link} from 'react-router-dom';
 import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import { WordsBtn,getUrl ,bytesToSize} from 'educoder';
+import { WordsBtn,getUrl ,bytesToSize,getImageUrl} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
 const Search = Input.Search;
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index c044c1711..10d71afe4 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -235,15 +235,17 @@ class GraduationTasks extends Component{
 
     this.setState({
       Modalstype:true,
-      Modalstopval:"公开后非课堂成员也可以访问查看",
-      ModalsBottomval:"是否确认公开？",
+      Modalstopval:"设为公开后，非课堂成员也可以访问查看",
+      ModalsBottomval:"是否确认设为公开？",
       ModalCancel:this.cancelmodel,
       ModalSave:this.saveonOpen,
     })
   }
 
 
-  // onSticky = (message) => {
+
+
+	// onSticky = (message) => {
   //   const cid = this.props.match.params.coursesId
   //   const url = `/messages/${message.id}/sticky_top.json`
   //   axios.put(url, {
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index d997592ef..9c6254cbd 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -46,24 +46,30 @@ const buildColumns = (that) => {
     key: 'login',
     align:'center',
     className:"color-grey-6",
-    // render: (name, record) => {
-    //   return <a className="color-dark" target="_blank" href={`/users/${record.login}`}>{name}</a>
-    // }
+    render: (name, record) => {
+      return <span className="color-dark overflowHidden1" style={{maxWidth: '110px'}}>{name}</span>
+    }
   }, {
     title: '姓名',
     dataIndex: 'name',
     key: 'name',
     align:'center',
+    width:"10%",
     className:"color-grey-6",
     render: (name, record) => {
-      return <a className="color-dark" target="_blank" href={`/users/${record.login}`}>{name}</a>
+      return <a className="color-dark overflowHidden1" target="_blank" 
+          style={{maxWidth: '120px'}} href={`/users/${record.login}`}>{name}</a>
     }
   }, {
     title: '学号',
     dataIndex: 'student_id',
     key: 'student_id',
     align:'center',
-    className:"color-grey-6"
+    className:"color-grey-6",
+    render: (student_id, record) => {
+      return <span className="color-dark overflowHidden1" 
+          style={{maxWidth: '110px'}} >{student_id}</span>
+    }
   }, {
     title: '分班',
     dataIndex: 'course_group_name',
diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index 19bb74d44..10e646590 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -7,7 +7,8 @@ import Titlesearchsection from '../common/titleSearch/TitleSearchSection'
 import ColorCountText from '../common/titleSearch/ColorCountText'
 import update from 'immutability-helper'
 
-import { WordsBtn, ConditionToolTip, on, off } from 'educoder'
+import { WordsBtn, ConditionToolTip, on, off ,trigger} from 'educoder'
+
 import axios from 'axios'
 
 import _ from 'lodash'
@@ -33,24 +34,27 @@ function buildColumns(that) {
   const { course_groups } = that.state
   const columns = [{
     title: '序号',
-    width: 28,
-    // dataIndex: 'name',
+    dataIndex: 'name',
     key: 'index',
     render: (content, item, index) => {
-      return <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1}</a>
+      return <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1}　</a>
     }
   },{
     title: '用户ID',
-    width: 82,
+    width: 120,
     dataIndex: 'login',
-    key: 'login'
+    key: 'login',
+    render: (login, record) => {
+      return <span className="overflowHidden1" style={{ maxWidth: '110px'}} title={`${login.length > 8 ? login : ''}`}>{login}</span>
+    }
   }, {
     title: '姓名',
     dataIndex: 'name',
-    width: 140,
+    width: 120,
     key: 'name',
     render: (name, record) => {
-      return <a href={`/login/${record.login}`} target="_blank">{name}</a>
+      return <a href={`/login/${record.login}`} target="_blank" className="overflowHidden1" style={{ maxWidth: '110px'}} 
+          title={`${name.length > 4 ? name : ''}`}>{name}</a>
     }
   }, {
     title: '角色',
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 7b936a0b6..392acf57c 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -1,2844 +1,2844 @@
-import React, {Component} from "react";
-import {Form, Input, Tooltip, Checkbox, Radio, Select, message, Modal, Button} from 'antd'
-import {WordsBtn, ActionBtn} from 'educoder'
-import '../css/members.css'
-import "../common/formCommon.css"
-
-import './pollStyle.css'
-import '../css/Courses.css'
-import axios from 'axios'
-import moment from "../new/CoursesNew";
-import Modals from "../../modals/Modals";
-
-
-const TextArea = Input.TextArea
-const RadioGroup = Radio.Group
-const CheckboxGroup = Checkbox.Group
-const Option = Select.Option;
-const maps = {1: "未发布", 2: "提交中", 3: "已截止"}
-const confirm = Modal.confirm;
-
-class PollNew extends Component {
-	// 问卷新建和编辑
-	//
-	// * addonAfter  字数限制
-	// * q_counts  题目总数
-	// * mysingles 单选题数量
-	// * mydoubles 多选题数量
-	// * mymainsint  主观题数量
-	// * adddom     添加编辑的数据   页面点击新增题目
-	// * editentry  编辑条目       新增的题目点击到条目中
-	//* questionnair  问卷是否存在 默认不存在
-	// *
-
-	constructor(props) {
-		super(props);
-		this.state = {
-			visible: false,
-			poll_questions: [],
-			user_permission: "",
-			addonAfter: 60,
-			addonAftertwo: 100,
-			mysingles: 0,
-			mydoubles: 0,
-			mymainsint: 0,
-			adddom: [],
-			editentry: [],
-			questionnair: false,
-			polls_name: undefined,
-			polls_nametest: "",
-			polls_description: "",
-			polls_descriptiontest: "",
-			storagedesc:"",
-			storagedesctwo:"",
-			coursesId: "",
-			pollid: undefined,
-			polls_status: undefined,
-			q_countst: 0,
-			Newedit: true,
-			Insertposition: undefined,
-			Modalstype: false,
-			mysave: false,
-			readOnlys: "readOnly",
-			problemtopic: null,
-			problemtopicbool: false,
-			newoption: false,
-			cancellation: false,
-		}
-		// console.log("试卷新建和编辑");
-		// console.log(JSON.stringify(props));
-
-	}
-
-	changeTopicName = (e) => {
-		let num = 60 - parseInt(e.target.value.length);
-		this.setState({
-			addonAfter: num < 0 ? 0 : num
-		})
-		this.setState({
-			polls_nametest: e.target.value
-		})
-	}
-
-
-	changeTopicNametwo = (e) => {
-		// console.log("获取的值" + e.target.value);
-		let num = 100 - parseInt(e.target.value.length);
-		this.setState({
-			addonAftertwo: num < 0 ? 0 : num
-		})
-		this.setState({
-			polls_descriptiontest: e.target.value
-		})
-	}
-
-	// 初始化数据
-	componentDidMount = () => {
-		console.log("componentDidMount 50")
-		if (this.props.match.params.news !== undefined) {
-			if (this.props.match.params.news === "new") {
-				this.state.Newedit === true;
-				this.setState({
-					Newedit: true,
-					mysave: true,
-					readOnlys: "",
-					cancellation: true,
-				})
-			} else {
-				this.Initializatio_data();
-				this.state.Newedit === false;
-				this.setState({
-					Newedit: false,
-					mysave: false,
-					readOnlys: "readOnly",
-				})
-			}
-		}
-
-
-		// this.getPollInfo();
-
-	}
-	//获取权限
-	// getPollInfo(){
-	//     // console.log(this.props.match);
-	//     let pollId=this.props.match.params.pollId;
-	//     let url=`/polls/${pollId}/common_header.json`
-	//     axios.get(url).then((result)=>{
-	//         if(result.status==200){
-	//             this.setState({
-	//                 pollDetail:result.data,
-	//                 user_permission:result.data.user_permission
-	//             })
-	//         }
-	//     }).catch((error)=>{
-	//         console.log(error);
-	//     })
-	// }
-	//初始化请求网络
-	Initializatio_data = () => {
-		console.log("Initializatio_data 582")
-		//课堂id
-		let coursesId = this.props.match.params.coursesId;
-		//时间id
-		let pollid = this.props.match.params.pollid;
-		console.log(pollid);
-		// let coursesId = 557;
-		if (pollid === undefined) {
-			// console.log("没有问卷新建问卷~~~")
-			// let coursesId=this.props.match.params.coursesId;
-			// // to={`/courses/${coursesId}/polls/new`}
-			//
-			// const urll = `/courses/${coursesId}/polls/new.json`
-			// axios.get(urll).then((result) => {
-			//     if (result.status === 200) {
-			//         console.log(urll)
-			//         console.log("问卷新建成功")
-			//         console.log(JSON.stringify(result))
-			//         // var path=`/courses/${coursesId}/polls/new`;
-			//         //
-			//         // this.props.history.push({ pathname: path, state: { } });
-			//     }
-			// }).catch((error) => {
-			//     console.log(error)
-			// })
-
-			// const urlls = `/courses/${coursesId}/polls.json`
-			// axios.post(urlls,{
-			//     polls_name: "这是标题",
-			//     polls_description:"这是标题须知"
-			// }).then((result)=>{
-			//     console.log("创建问卷++++++")
-			//     console.log(result)
-			//    try {
-			//        if(result.data.status===0){
-			//            console.log("创建问卷")
-			//            console.log(JSON.stringify(result.data))
-			//        }
-			//    }catch (e) {
-			//
-			//    }
-			//
-			// })
-			//没有问卷
-			this.setState({
-				projects: [],
-				polls_name: "",
-				polls_description: "",
-				poll_questions: [],
-				question_types: [],
-				pollid: undefined,
-				mysingles: 0,
-				mydoubles: 0,
-				mymainsint: 0,
-				polls_nametest: "",
-				polls_descriptiontest: "",
-				coursesId: 0,
-				questionnair: false
-			})
-		} else {
-			const url = `/polls/${pollid}/edit.json`;
-			axios.get(url).then((result) => {
-				if (result !== undefined)
-
-				// console.log("有问卷~~~")
-				// if (result.status === 200) {
-				// console.log(JSON.stringify(result.data))
-					this.props.form.setFieldsValue({
-						polls_nametest: result.data.poll.polls_name,
-						polls_descriptiontest: result.data.poll.polls_description,
-					});
-				this.setState({
-					projects: result.data,
-					pollid: pollid,
-					polls_status: result.data.poll.polls_status,
-					polls_name: result.data.poll.polls_name,
-					polls_description: result.data.poll.polls_description,
-					poll_questions: result.data.poll_questions,
-					question_types: result.data.question_types,
-					mysingles: result.data.question_types.q_singles,
-					mydoubles: result.data.question_types.q_doubles,
-					mymainsint: result.data.question_types.q_mains,
-					polls_nametest: result.data.poll.polls_name,
-					polls_descriptiontest: result.data.poll.polls_description,
-					questionnair: true,
-				})
-				console.log(this.state.polls_nametest)
-				console.log(this.state.polls_descriptiontest)
-				// }
-			}).catch((error) => {
-				console.log(error)
-			})
-		}
-
-	}
-
-	//重新获取数据
-	thisinitializationdatanew = () => {
-		var pollidsy = null;
-		if (this.state.pollid !== undefined) {
-			pollidsy = this.state.pollid;
-			if (pollidsy === null || pollidsy === undefined) {
-				pollidsy = this.props.match.params.pollid;
-			}
-		}
-
-		if (pollidsy === null || pollidsy === undefined) {
-			return
-		}
-
-		const url = `/polls/${pollidsy}/edit.json`;
-		axios.get(url).then((result) => {
-			if (result !== undefined)
-
-			// console.log("有问卷~~~")
-			// if (result.status === 200) {
-			// console.log(JSON.stringify(result.data))
-				this.setState({
-					projects: result.data,
-					pollid: pollidsy,
-					polls_status: result.data.poll.polls_status,
-					polls_name: result.data.poll.polls_name,
-					polls_description: result.data.poll.polls_description,
-					poll_questions: result.data.poll_questions,
-					question_types: result.data.question_types,
-					mysingles: result.data.question_types.q_singles,
-					mydoubles: result.data.question_types.q_doubles,
-					mymainsint: result.data.question_types.q_mains,
-					polls_nametest: result.data.poll.polls_name,
-					polls_descriptiontest: result.data.poll.polls_description,
-					questionnair: true,
-				})
-
-			// }
-		}).catch((error) => {
-			console.log(error)
-		})
-	}
-	//新建问卷
-	newword = () => {
-		if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") {
-			this.props.showNotification(`请输入标题`);
-			return
-		}
-		let coursesId = this.props.match.params.coursesId;
-		const urlls = `/courses/${coursesId}/polls.json`
-		axios.post(urlls, {
-			polls_name: this.state.polls_nametest,
-			polls_description: this.state.polls_descriptiontest
-		}).then((result) => {
-			if (result.data.status === 0) {
-				this.state.Newedit === false;
-				// this.props.showNotification(`试卷创建成功`);
-				this.setState({
-					pollid: result.data.data.id,
-					Newedit: false,
-				})
-				this.props.history.push(`/courses/${this.props.match.params.coursesId}/polls/${result.data.data.id}/detail?tab=2`)
-			}
-		})
-	}
-	//添加单选题目
-	addmysingles = () => {
-
-		if (this.state.newoption === true) {
-			this.setState({
-				newoption: false
-			})
-		}
-
-		var Insertposition = this.state.poll_questions.length;
-		// console.log(JSON.stringify(this.state.poll_questions));
-		for (var i = 0; i < this.state.poll_questions.length; i++) {
-			if (this.state.poll_questions[i].question.question_type === 1) {
-				Insertposition = i;
-			}
-
-		}
-		this.addMytopic(1, this.state.pollid, Insertposition, false, 0);
-		// }
-	}
-
-	//添加多选题目
-	addmydoubles = () => {
-		console.log("addmymainsint 70")
-		if (this.state.newoption === true) {
-			this.setState({
-				newoption: false
-			})
-		}
-
-		var Insertposition = this.state.poll_questions.length;
-		// console.log(JSON.stringify(this.state.poll_questions));
-		for (var i = 0; i < this.state.poll_questions.length; i++) {
-			if (this.state.poll_questions[i].question.question_type === 2) {
-				Insertposition = i;
-			}
-
-
-		}
-		this.addMytopic(2, this.state.pollid, Insertposition, false, 0);
-
-		// }
-	}
-
-	//添加主观题目
-	addmymainsint = () => {
-
-		var Insertposition = this.state.poll_questions.length;
-		// console.log(JSON.stringify(this.state.poll_questions));
-		for (var i = 0; i < this.state.poll_questions.length; i++) {
-			if (this.state.poll_questions[i].question.question_type === 3) {
-				Insertposition = i;
-			}
-
-
-		}
-
-		this.addMytopic(3, this.state.pollid, Insertposition, false, 0);
-		// }
-	}
-
-	//编辑方法
-	adddomedit = (object) => {
-		console.log("adddomedit 76");
-		if (this.state.q_countst > 0) {
-			this.props.showNotification(`不能同时编辑两题`);
-
-			return;
-		}
-		var anserbool = false;
-		this.setState({
-			q_countst: 1,
-		})
-		window.scrollTo(0, this.refs.targetElement.offsetTop)
-		let {adddom} = this.state;
-		// var arr =new Object(objects);
-		// console.log(arr)
-		// adddom.push(arr);
-		var question = {};
-		var Insertposition = this.state.poll_questions.length;
-		if (object.question.question_type === 1) {
-			var answers = [];
-			var questiontwo = {};
-			///////////////////////////daying
-			for (var y = 0; y < object.question.answers.length; y++) {
-				var answerstwo;
-				if (object.question.answers[y].answer_text === "其他") {
-					answerstwo = {
-						"answer_id": object.question.answers[y].answer_id,
-						"answer_position": object.question.answers[y].answer_position,
-						"answer_text": object.question.answers[y].answer_text
-					}
-					anserbool = true;
-				} else {
-					answerstwo = {
-						"answer_id": object.question.answers[y].answer_id,
-						"answer_position": object.question.answers[y].answer_position,
-						"answer_text": object.question.answers[y].answer_text
-					}
-				}
-				answers.push(answerstwo);
-
-
-			}
-			// 插入单选题
-			questiontwo = {
-				// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
-				"id": object.question.id,
-				"is_necessary": object.question.is_necessary,
-				"question_number": 1,
-				"question_title": object.question.question_title,
-				"question_type": 1,
-				"new": "",
-				"answers": answers
-			};
-			question = {"question": questiontwo};
-			adddom.push(question);
-			for (var i = 0; i < this.state.poll_questions.length; i++) {
-				if (this.state.poll_questions[i].question.question_type === 1) {
-					Insertposition = i;
-				}
-			}
-		} else if (object.question.question_type === 2) {
-			//插入多选题
-			var answers = [];
-			var questiontwo = {};
-
-			for (var y = 0; y < object.question.answers.length; y++) {
-				if (object.question.answers[y].answer_text === "其他") {
-					answerstwo = {
-						"answer_id": object.question.answers[y].answer_id,
-						"answer_position": object.question.answers[y].answer_position,
-						"answer_text": object.question.answers[y].answer_text
-					}
-					anserbool = true;
-				} else {
-					answerstwo = {
-						"answer_id": object.question.answers[y].answer_id,
-						"answer_position": object.question.answers[y].answer_position,
-						"answer_text": object.question.answers[y].answer_text
-					}
-				}
-				answers.push(answerstwo);
-			}
-			questiontwo = {
-				"id": object.question.id,
-				"is_necessary": object.question.is_necessary,
-				"question_number": 2,
-				"question_title": object.question.question_title,
-				"question_type": 2,
-				"max_choices": object.question.max_choices,
-				"min_choices": object.question.min_choices,
-				"new": "",
-				"answers": answers
-			};
-			question = {"question": questiontwo};
-			adddom.push(question);
-			for (var i = 0; i < this.state.poll_questions.length; i++) {
-				if (this.state.poll_questions[i].question.question_type === 2) {
-					Insertposition = i;
-				}
-			}
-		} else if (object.question.question_type === 3) {
-			//插入主观题
-			var answers = [];
-			var questiontwo = {};
-
-			if (object.question.answers.length > 0) {
-				for (var y = 0; y < object.question.answers.length; y++) {
-					var answerstwo;
-					if (object.question.answers[y].answer_text === "其他") {
-						answerstwo = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-					} else {
-						answerstwo = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-					}
-					answers.push(answerstwo);
-				}
-			}
-			questiontwo = {
-				"id": object.question.id,
-				"is_necessary": object.question.is_necessary,
-				"question_number": 3,
-				"question_title": object.question.question_title,
-				"question_type": 3,
-				"new": "",
-				"answers": answers
-			};
-			question = {"question": questiontwo};
-			adddom.push(question);
-			for (var i = 0; i < this.state.poll_questions.length; i++) {
-				if (this.state.poll_questions[i].question.question_type === 3) {
-					Insertposition = i;
-				}
-			}
-		}
-		this.setState({
-			adddom: adddom,
-			newoption: anserbool,
-			Insertposition: Insertposition
-		})
-
-	}
-
-	//新增添加题目 有new
-	addMytopic = (index, pollid, Insertposition, Whether, id) => {
-		//Whether 是否插入
-		// console.log("id")
-		// console.log(id)
-		// console.log("Whether")
-		// console.log(Whether)
-		console.log("addMytopic 90")
-		if (this.state.q_countst > 0) {
-			this.props.showNotification(`不能同时编辑两题`);
-
-			return;
-		}
-		this.state.Insertposition = Insertposition;
-		var Whethername = null;
-		if (Whether === true) {
-			Whethername = id;
-		}
-		this.setState({
-			Insertposition: Insertposition,
-			q_countst: 1,
-		})
-		window.scrollTo(0, this.refs.targetElement.offsetTop)
-		var arrr = this.state.adddom;
-		let newarrr = [...arrr];
-
-		var arr = this.state.poll_questions;
-		let newarr = [...arr];
-
-		if (newarr.length > 0) {
-			if (index === 1) {
-				// 插入单选题
-				// console.log(this.state.poll_questions[newarr.length - 1].question.id);
-				var question = {}
-				var questiontwo = {
-					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
-					"id": this.state.poll_questions[newarr.length - 1].question.id + 1,
-					"is_necessary": 1,
-					"question_number": 1,
-					"question_title": "",
-					"question_type": 1,
-					"new": "new",
-					"answers": [
-						{"answer_id": 1, "answer_position": 1, "answer_text": ""},
-						{"answer_id": 2, "answer_position": 2, "answer_text": ""},
-						{"answer_id": 3, "answer_position": 3, "answer_text": ""},
-						{"answer_id": 4, "answer_position": 4, "answer_text": ""},
-						// {"answer_id": 5, "answer_position": 5, "answer_text": "其他"},
-					]
-				};
-				question = {"question": questiontwo};
-				newarrr.push(question);
-
-				this.setState({
-					adddom: newarrr,
-					problemtopic: Whethername,
-					problemtopicbool: Whether,
-				})
-
-			} else if (index === 2) {
-				//插入多选题
-				var question = {}
-				var questiontwo = {
-					"id": this.state.poll_questions[newarr.length - 1].question.id + 1,
-					"is_necessary": 1,
-					"question_number": 2,
-					"question_title": "",
-					"question_type": 2,
-					"max_choices": 0,
-					"min_choices": 0,
-					"new": "new",
-					"answers": [
-						{"answer_id": 1, "answer_position": 1, "answer_text": ""},
-						{"answer_id": 2, "answer_position": 2, "answer_text": ""},
-						{"answer_id": 3, "answer_position": 3, "answer_text": ""},
-						{"answer_id": 4, "answer_position": 4, "answer_text": ""},
-						// {"answer_id": 5, "answer_position": 5, "answer_text": "其他"},
-					]
-				};
-				question = {"question": questiontwo};
-				newarrr.push(question);
-
-				this.setState({
-					adddom: newarrr,
-					problemtopic: Whethername,
-					problemtopicbool: Whether,
-				})
-
-			} else if (index === 3) {
-				//插入主观题
-				// console.log(this.state.poll_questions[newarr.length - 1].question.id);
-				var question = {}
-				var questiontwo = {
-					"id": this.state.poll_questions[newarr.length - 1].question.id + 1,
-					"is_necessary": 1,
-					"question_number": 3,
-					"question_title": "",
-					"question_type": 3,
-					"new": "new",
-					"answers": []
-				};
-				question = {"question": questiontwo};
-				newarrr.push(question);
-				this.setState({
-					adddom: newarrr,
-					problemtopic: Whethername,
-					problemtopicbool: Whether,
-				})
-
-			}
-		} else {
-			/////上面视图全部删除后  要加载的
-			if (index === 1) {
-				// 插入单选题
-				var id;
-				try {
-					id = this.state.poll_questions[newarr.length - 1].question.id + 1
-				} catch (e) {
-					id = 1;
-				}
-				var questiontwo = {
-					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
-					"id": id,
-					"is_necessary": 1,
-					"question_number": 1,
-					"question_title": "",
-					"question_type": 1,
-					"new": "new",
-					"answers": [
-						{"answer_id": 1, "answer_position": 1, "answer_text": ""},
-						{"answer_id": 2, "answer_position": 2, "answer_text": ""},
-						{"answer_id": 3, "answer_position": 3, "answer_text": ""},
-						{"answer_id": 4, "answer_position": 4, "answer_text": ""},
-						// {"answer_id": 5, "answer_position": 5, "answer_text": "其他"},
-					]
-				};
-				question = {"question": questiontwo};
-				newarrr.push(question);
-
-				this.setState({
-					adddom: newarrr,
-					problemtopic: Whethername,
-					problemtopicbool: Whether,
-				})
-
-			} else if (index === 2) {
-				//插入多选题
-				var id;
-				try {
-					id = this.state.poll_questions[newarr.length - 1].question.id + 1
-				} catch (e) {
-					id = 1;
-				}
-				var questiontwo = {
-					"id": id,
-					"is_necessary": 1,
-					"question_number": 2,
-					"question_title": "",
-					"question_type": 2,
-					"max_choices": 0,
-					"min_choices": 0,
-					"new": "new",
-					"answers": [
-						{"answer_id": 1, "answer_position": 1, "answer_text": ""},
-						{"answer_id": 2, "answer_position": 2, "answer_text": ""},
-						{"answer_id": 3, "answer_position": 3, "answer_text": ""},
-						{"answer_id": 4, "answer_position": 4, "answer_text": ""},
-						// {"answer_id": 5, "answer_position": 5, "answer_text": "其他"},
-					]
-				};
-				question = {"question": questiontwo};
-				newarrr.push(question);
-
-				this.setState({
-					adddom: newarrr,
-					problemtopic: Whethername,
-					problemtopicbool: Whether,
-				})
-
-			} else if (index === 3) {
-				//插入主观题
-				var id;
-				try {
-					id = this.state.poll_questions[newarr.length - 1].question.id + 1
-				} catch (e) {
-					id = 1;
-				}
-				var questiontwo = {
-					"id": id,
-					"is_necessary": 1,
-					"question_number": 3,
-					"question_title": "",
-					"question_type": 3,
-					"new": "new",
-					"answers": []
-				};
-				question = {"question": questiontwo};
-				newarrr.push(question);
-				this.setState({
-					adddom: newarrr,
-					problemtopic: Whethername,
-					problemtopicbool: Whether,
-				})
-			}
-		}
-	}
-
-	//删除指定条目
-	deleteadddom = (indexo) => {
-		console.log("deleteadddom 259")
-		var arr = this.state.adddom;
-		let newarr = [...arr];
-
-		newarr.splice(indexo, 1);
-		this.setState({
-			adddom: newarr,
-			q_countst: 0,
-			problemtopic: null,
-			problemtopicbool: false,
-		})
-	}
-	//保存并继续
-	//保存并继续，即提交本题的新建并继续创建一个相同的题（该新题处于编辑模式，题目和选项不要清空）
-	deleteadddomtwo = (indexo, object) => {
-		var thiss = this;
-		this.setState({
-			q_countst: 1,
-		})
-		var poll_questionslength = this.state.poll_questions.length;
-		// console.log("deleteadddomtwo|||||||||||||||||||||||||||||||||||||||||\\");
-		// console.log(indexo);
-		// console.log(object);
-		// console.log(object.question.question_type);
-		let arr = this.state.adddom;
-		let arrpoll = this.state.poll_questions;
-		let newarr = [...arr];
-		let newarrpoll = [...arrpoll];
-
-		//选项内容不能为空
-		let max = 0;
-		let maxtie = newarr[indexo].question.answers.length;
-		for (var k = 0; k < newarr[indexo].question.answers.length; k++) {
-			try {
-				if (newarr[indexo].question.answers[k].answer_text != undefined) {
-					if (newarr[indexo].question.answers[k].answer_text === "") {
-						max = max + 1;
-					}
-				}
-			} catch (e) {
-				console.log("PollNew281")
-				console.log(e)
-			}
-		}
-		if (newarr[indexo].question.question_title === "") {
-			this.props.showNotification(`题目不能为空`);
-
-			return
-		}
-		if (max > 0) {
-			if (object.question.question_type === 1) {
-				this.props.showNotification(`选项内容不能为空`);
-
-				return
-			} else if (object.question.question_type === 2) {
-				this.props.showNotification(`选项内容不能为空`);
-
-				return
-			}
-
-		}
-		if (maxtie < 2) {
-			if (object.question.question_type === 1) {
-				this.props.showNotification(`选项不能少于2个!`);
-
-				return
-			} else if (object.question.question_type === 2) {
-				this.props.showNotification(`选项不能少于2个!`);
-
-				return
-			}
-
-
-		}
-
-		if (object.question.question_type === 2) {
-			if (object.question.max_choices > 0) {
-				if (object.question.min_choices < 2) {
-					this.props.showNotification(`可选最小不能少于2个`);
-
-					return;
-
-				}
-			}
-
-		}
-		if (object.question.new === "new") {
-			// 根据数组里面的new 来确定是否是新增还是 修改
-			//添加道数组上
-			//不能共用数组 所以自己写个新数组 然后push 上面卷子中
-			var question = {};
-			if (object.question.question_type === 1) {
-
-				var questiontwo = {};
-				var other = [];
-				var option = [];
-				var answerstwos = [];
-				var answerstwoss = [];
-				///////////////////////////daying
-				// 这个是装选项和其他的
-				for (var y = 0; y < object.question.answers.length; y++) {
-					if (object.question.answers[y].answer_text === "其他") {
-						var dataone = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						other.push(object.question.answers[y].answer_text);
-						answerstwos.push(dataone);
-					} else {
-						var datatwo = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						option.push(object.question.answers[y].answer_text)
-						answerstwoss.push(datatwo);
-					}
-
-
-				}
-
-				var arrc = option.concat(other);
-				var answers = answerstwoss.concat(answerstwos);
-				// 插入单选题
-				// var id
-				// try {
-				// 	id = newarrpoll[newarrpoll.length - 1].question.id + 1;
-				// } catch (e) {
-				// 	id = 1;
-				// }
-				questiontwo = {
-					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
-					"id": null,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 1,
-					"question_title": object.question.question_title,
-					"question_type": 1,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-				var insindex = null;
-				// if (poll_questionslength !== thiss.state.Insertposition) {
-				// 	insindex = newarrpoll[thiss.state.Insertposition].question.id;
-				// }
-				if (this.state.problemtopicbool === true) {
-					insindex = this.state.problemtopic;
-				}
-				this.createquestionsandanswers(object, 1, arrc, null, 0, 0, insindex);
-				// newarrpoll.push(question);
-				newarrpoll.splice(thiss.state.Insertposition, 0, question);
-
-			} else if (object.question.question_type === 2) {
-				//插入多选题
-				if (object.question.max_choices < object.question.min_choices) {
-					this.props.showNotification(`可选的最大限制不能小于最小限制`);
-
-					return;
-				}
-
-				var questiontwo = {};
-				var other = [];
-				var option = [];
-				var answerstwos = [];
-				var answerstwoss = [];
-				for (var y = 0; y < object.question.answers.length; y++) {
-					if (object.question.answers[y].answer_text === "其他") {
-						var dataone = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						other.push(object.question.answers[y].answer_text);
-						answerstwos.push(dataone);
-					} else {
-						var datatwo = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						option.push(object.question.answers[y].answer_text)
-						answerstwoss.push(datatwo);
-					}
-				}
-				var arrc = option.concat(other);
-				var answers = answerstwoss.concat(answerstwos);
-				// var id
-				// try {
-				// 	id = newarrpoll[newarrpoll.length - 1].question.id + 1;
-				// } catch (e) {
-				// 	id = 1;
-				// }
-				questiontwo = {
-					"id": null,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 2,
-					"question_title": object.question.question_title,
-					"question_type": 2,
-					"max_choices": object.question.max_choices,
-					"min_choices": object.question.min_choices,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-				var insindex = null;
-				if (this.state.problemtopicbool === true) {
-					insindex = this.state.problemtopic;
-				}
-				this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, insindex);
-				//插入多选题
-				// if (object.question.max_choices > arrc.length) {
-				//     // console.log("选择题的最大可选项不能大于选项数")
-				//     this.props.showNotification(`选择题的最大可选项不能大于选项数`);
-				//
-				//     return;
-				// }
-				// if (object.question.min_choices === 0) {
-				// 	// console.log("选择题的最大可选项不能小于2项目")
-				// 	this.props.showNotification(`选择题的最大可选项不能小于2项目`);
-				//
-				// 	return;
-				//
-				// }
-				// newarrpoll.push(question);
-				newarrpoll.splice(thiss.state.Insertposition, 0, question);
-			} else if (object.question.question_type === 3) {
-				//插入主观题
-				var answers = [];
-				var questiontwo = {};
-				var answerstwos = [];
-				var answerstwoss = [];
-				if (object.question.answers.length > 0) {
-					for (var y = 0; y < object.question.answers.length; y++) {
-						var answerstwo;
-						if (object.question.answers[y].answer_text === "其他") {
-							var dataone = {
-								"answer_id": object.question.answers[y].answer_id,
-								"answer_position": object.question.answers[y].answer_position,
-								"answer_text": object.question.answers[y].answer_text
-							}
-							answerstwos.push(dataone);
-						} else {
-							var datatwo = {
-								"answer_id": object.question.answers[y].answer_id,
-								"answer_position": object.question.answers[y].answer_position,
-								"answer_text": object.question.answers[y].answer_text
-							}
-							answerstwoss.push(datatwo);
-						}
-					}
-				}
-
-				answers = answerstwoss.concat(answerstwos);
-				// var id
-				// try {
-				// 	id = newarrpoll[newarrpoll.length - 1].question.id + 1;
-				// } catch (e) {
-				// 	id = 1;
-				// }
-				questiontwo = {
-					"id": null,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 3,
-					"question_title": object.question.question_title,
-					"question_type": 3,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-				// var insindex = null;
-				// if (poll_questionslength !== thiss.state.Insertposition) {
-				// 	insindex = newarrpoll[thiss.state.Insertposition].question.id;
-				// }
-				//主观题不需要可选选项
-				var insindex = null;
-				if (this.state.problemtopicbool === true) {
-					insindex = this.state.problemtopic;
-				}
-				this.createquestionsandanswers(object, 3, null, null, 0, 0, insindex);
-				// newarrpoll.push(question);
-				newarrpoll.splice(thiss.state.Insertposition, 0, question);
-			}
-			//////////////////////////////////////////////////////////////////////////////////////////////////// 上面是新增
-		} else {
-			///////////////////////////////////////////////////////////////////////////////////////////////////修改点了编辑
-			console.log("点了编辑")
-			var uuk = -1
-			//这个地方判断 点了编辑上面题目又把他删除了 保存的时候就只能是插入新增了
-			for (var uk = 0; uk < newarrpoll.length; uk++) {
-				if (object.question.id === newarrpoll[uk].question.id) {
-					uuk = uk;
-				}
-			}
-
-
-			var question = {};
-			if (object.question.question_type === 1) {
-				var questiontwo = {};
-				var other = [];
-				var option = [];
-				var answerstwos = [];
-				var answerstwoss = [];
-				///////////////////////////daying
-				//这个装选项和其他的
-				for (var y = 0; y < object.question.answers.length; y++) {
-					if (object.question.answers[y].answer_text === "其他") {
-						var dataone = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						other.push(object.question.answers[y].answer_text);
-						answerstwos.push(dataone);
-					} else {
-						var datatwo = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						option.push(object.question.answers[y].answer_text)
-						answerstwoss.push(datatwo);
-					}
-
-
-				}
-				var arrc = option.concat(other);
-				var answers = answerstwoss.concat(answerstwos);
-				// 插入单选题
-				questiontwo = {
-					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
-					"id": object.question.id,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 1,
-					"question_title": object.question.question_title,
-					"question_type": 1,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-				if (uuk !== -1) {
-					// console.log("修改")
-					this.edittotheserver(object, 1, arrc, null, 0, 0);
-					newarrpoll.splice(uuk, 1, question);
-				} else {
-					// console.log("他原来的删除掉了")
-					this.createquestionsandanswers(object, 1, arrc, null, 0, 0, object.question.id);
-					newarrpoll.push(question);
-				}
-				newarr[indexo].question.new = "new"
-				// console.log(newarrpoll)
-			} else if (object.question.question_type === 2) {
-				//插入多选题
-
-				if (object.question.max_choices < object.question.min_choices) {
-					this.props.showNotification('可选的最大限制不能小于最小限制！');
-
-					return;
-				}
-				var questiontwo = {};
-				var other = [];
-				var option = [];
-				var answerstwos = [];
-				var answerstwoss = [];
-				for (var y = 0; y < object.question.answers.length; y++) {
-					if (object.question.answers[y].answer_text === "其他") {
-						var dataone = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						other.push(object.question.answers[y].answer_text);
-						answerstwos.push(dataone);
-					} else {
-						var datatwo = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						option.push(object.question.answers[y].answer_text)
-						answerstwoss.push(datatwo);
-					}
-				}
-				var arrc = option.concat(other);
-				var answers = answerstwoss.concat(answerstwos);
-				questiontwo = {
-					"id": object.question.id,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 2,
-					"question_title": object.question.question_title,
-					"question_type": 2,
-					"max_choices": object.question.max_choices,
-					"min_choices": object.question.min_choices,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-				//插入多选题
-				// if (object.question.max_choices > arrc.length) {
-				//     // console.log("选择题的最大可选项不能大于答案数")
-				//     this.props.showNotification('选择题的最大可选项不能大于选项数！');
-				//
-				//     return;
-				// }
-				// if (object.question.min_choices === 0) {
-				// 	// console.log("选择题的最大可选项不能小于2项目")
-				// 	this.props.showNotification('选择题的最大可选项不能小于2项目！');
-				//
-				// 	return;
-				//
-				// }
-				if (uuk !== -1) {
-					console.log("修改")
-					this.edittotheserver(object, 2, arrc, null, object.question.max_choices, object.question.min_choices);
-					newarrpoll.splice(uuk, 1, question);
-				} else {
-					console.log("删除")
-					this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, object.question.id);
-					newarrpoll.push(question);
-				}
-				console.log(newarrpoll)
-				newarr[indexo].question.new = "new"
-			} else if (object.question.question_type === 3) {
-				//插入主观题
-				var answers = [];
-				var questiontwo = {};
-
-				if (object.question.answers.length > 0) {
-					for (var y = 0; y < object.question.answers.length; y++) {
-						var answerstwo;
-						if (object.question.answers[y].answer_text === "其他") {
-							answerstwo = {
-								"answer_id": object.question.answers[y].answer_id,
-								"answer_position": object.question.answers[y].answer_position,
-								"answer_text": object.question.answers[y].answer_text
-							}
-						} else {
-							answerstwo = {
-								"answer_id": object.question.answers[y].answer_id,
-								"answer_position": object.question.answers[y].answer_position,
-								"answer_text": object.question.answers[y].answer_text
-							}
-						}
-						answers.push(answerstwo);
-					}
-				}
-				questiontwo = {
-					"id": object.question.id,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 3,
-					"question_title": object.question.question_title,
-					"question_type": 3,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-
-				if (uuk !== -1) {
-					console.log("修改")
-					this.edittotheserver(object, 3, null, null, 0, 0);
-					newarrpoll.splice(uuk, 1, question);
-				} else {
-					console.log("删除")
-					this.createquestionsandanswers(object, 3, null, null, 0, 0, object.question.id);
-					newarrpoll.push(question);
-				}
-				console.log(newarrpoll)
-				newarr[indexo].question.new = "new"
-			}
-
-		}
-
-
-		//添加到上面列表中
-		//改变题目总数
-		if (object.question.question_type === 1) {
-			//单选题
-			this.state.mysingles = this.state.mysingles + 1;
-		} else if (object.question.question_type === 2) {
-			//多选题
-			this.state.mydoubles = this.state.mydoubles + 1;
-		} else if (object.question.question_type === 3) {
-			//主观题
-			this.state.mymainsint = this.state.mymainsint + 1;
-
-		}
-		this.setState({
-			// poll_questions: newarrpoll,
-			adddom: newarr,
-			problemtopic: null,
-			problemtopicbool: false,
-			// mysingles: this.state.mysingles,
-			// mydoubles: this.state.mydoubles,
-			// mymainsint: this.state.mymainsint
-		})
-
-	}
-
-
-	//保存 后期可以考虑和保存并继续 合并
-	//保存，即完成新建并退出本题编辑
-	// indexo 第几个数组
-	//object 单个数组数据
-	deleteadddomthree = (indexo, object) => {
-		// console.log("deleteadddom 349")
-		var thiss = this;
-		let arr = this.state.adddom;
-		let arrpoll = this.state.poll_questions;
-		let newarr = [...arr];
-		let newarrpoll = [...arrpoll];
-		var poll_questionslength = this.state.poll_questions.length; //获取单前问题最大长度
-		//选项内容不能为空
-		let max = 0;
-		let maxtie = newarr[indexo].question.answers.length;
-		//判断选项值是否不为空
-		for (var k = 0; k < newarr[indexo].question.answers.length; k++) {
-			try {
-				if (newarr[indexo].question.answers[k].answer_text != undefined) {
-					if (newarr[indexo].question.answers[k].answer_text === "") {
-						max = max + 1;
-					}
-				}
-			} catch (e) {
-				// console.log("PollNew281")
-				// console.log(e)
-			}
-		}
-		if (newarr[indexo].question.question_title === "") {
-			this.props.showNotification('题目不能为空！');
-			return
-		}
-		if (max > 0) {
-			if (object.question.question_type === 1) {
-				this.props.showNotification('选项内容不能为空！');
-				return
-			} else if (object.question.question_type === 2) {
-				this.props.showNotification('选项内容不能为空！');
-				return
-			}
-
-		}
-		if (maxtie < 2) {
-			if (object.question.question_type === 1) {
-				this.props.showNotification('选项不能少于2个!');
-				return
-			} else if (object.question.question_type === 2) {
-				this.props.showNotification('选项不能少于2个!');
-				return
-			}
-
-
-		}
-
-		if (object.question.question_type === 2) {
-			if (object.question.max_choices > 0) {
-				if (object.question.min_choices < 2) {
-					this.props.showNotification(`可选最小不能少于2个`);
-					return;
-				}
-			}
-		}
-		if (object.question.new === "new") {
-			///////////////////////////////////////////////////////////////////新增模式
-			// 根据数组里面的new 来确定是否是新增还是 修改
-			//添加道数组上
-			//不能共用数组 所以自己写个新数组 然后push 上面卷子中
-			var question = {};
-			if (object.question.question_type === 1) {
-				var questiontwo = {};
-				var other = [];
-				var option = [];
-				var answerstwos = [];
-				var answerstwoss = [];
-				///////////////////////////daying
-				// 这个是装选项和其他的
-				for (var y = 0; y < object.question.answers.length; y++) {
-					if (object.question.answers[y].answer_text === "其他") {
-						var dataone = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						other.push(object.question.answers[y].answer_text);
-						answerstwos.push(dataone);
-					} else {
-						var datatwo = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						option.push(object.question.answers[y].answer_text)
-						answerstwoss.push(datatwo);
-					}
-				}
-				var arrc = option.concat(other);
-				var answers = answerstwoss.concat(answerstwos);
-				// 插入单选题'
-				// var id;
-				// try {
-				// 	id = newarrpoll[newarrpoll.length - 1].question.id + 1
-				// } catch (e) {
-				// 	id = 1;
-				// }
-				questiontwo = {
-					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
-					"id": null,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 1,
-					"question_title": object.question.question_title,
-					"question_type": 1,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-				//获取指定id 号 用来插入，如果不是就是在最后添加
-
-				//执行新增操作
-				var insindex = null;
-				if (this.state.problemtopicbool === true) {
-					insindex = this.state.problemtopic;
-				}
-				this.createquestionsandanswers(object, 1, arrc, null, 0, 0, insindex);
-				newarrpoll.splice(thiss.state.Insertposition, 0, question);
-			} else if (object.question.question_type === 2) {
-				//插入多选题
-				if (object.question.max_choices < object.question.min_choices) {
-					this.props.showNotification(`可选的最大限制不能小于最小限制`);
-
-					return;
-				}
-
-				var questiontwo = {};
-				var other = [];
-				var option = [];
-				var answerstwos = [];
-				var answerstwoss = [];
-				for (var y = 0; y < object.question.answers.length; y++) {
-					if (object.question.answers[y].answer_text === "其他") {
-						var dataone = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						other.push(object.question.answers[y].answer_text);
-						answerstwos.push(dataone);
-					} else {
-						var datatwo = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						option.push(object.question.answers[y].answer_text)
-						answerstwoss.push(datatwo);
-					}
-				}
-				var arrc = option.concat(other);
-				var answers = answerstwoss.concat(answerstwos);
-
-				questiontwo = {
-					"id": null,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 2,
-					"question_title": object.question.question_title,
-					"question_type": 2,
-					"max_choices": object.question.max_choices,
-					"min_choices": object.question.min_choices,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-
-				var insindex = null;
-				if (this.state.problemtopicbool === true) {
-					insindex = this.state.problemtopic;
-				}
-				this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, insindex);
-				//插入多选题
-				// if (object.question.max_choices > arrc.length) {
-
-				newarrpoll.splice(thiss.state.Insertposition, 0, question);
-			} else if (object.question.question_type === 3) {
-				//插入主观题
-				var answers = [];
-				var questiontwo = {};
-				var answerstwos = [];
-				var answerstwoss = [];
-				if (object.question.answers.length > 0) {
-					for (var y = 0; y < object.question.answers.length; y++) {
-						if (object.question.answers[y].answer_text === "其他") {
-							var dataone = {
-								"answer_id": object.question.answers[y].answer_id,
-								"answer_position": object.question.answers[y].answer_position,
-								"answer_text": object.question.answers[y].answer_text
-							}
-							answerstwos.push(dataone);
-						} else {
-							var datatwo = {
-								"answer_id": object.question.answers[y].answer_id,
-								"answer_position": object.question.answers[y].answer_position,
-								"answer_text": object.question.answers[y].answer_text
-							}
-							answerstwoss.push(datatwo);
-						}
-					}
-				}
-				answers = answerstwoss.concat(answerstwos);
-
-				questiontwo = {
-					"id": null,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 3,
-					"question_title": object.question.question_title,
-					"question_type": 3,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-				//主观题不需要可选选项
-
-				var insindex = null;
-				if (this.state.problemtopicbool === true) {
-					insindex = this.state.problemtopic;
-				}
-				this.createquestionsandanswers(object, 3, null, null, 0, 0, insindex);
-				// newarrpoll.push(question);
-				newarrpoll.splice(thiss.state.Insertposition, 0, question);
-			}
-			///////////////////////////////////////////////////////////////////新增模式
-		} else {
-			//////////////////////////////////////////////////////////////////////////////修改模式
-			//修改
-			var uuk = -1
-			for (var uk = 0; uk < newarrpoll.length; uk++) {
-				if (object.question.id === newarrpoll[uk].question.id) {
-					uuk = uk;
-					console.log("删除了数据=-09876543234567890-111111111111")
-				}
-			}
-
-
-			var question = {};
-			if (object.question.question_type === 1) {
-				var questiontwo = {};
-				var other = [];
-				var option = [];
-				var answerstwos = [];
-				var answerstwoss = [];
-				///////////////////////////daying
-				//这个装选项和其他的
-				for (var y = 0; y < object.question.answers.length; y++) {
-					if (object.question.answers[y].answer_text === "其他") {
-						var dataone = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						other.push(object.question.answers[y].answer_text);
-						answerstwos.push(dataone);
-					} else {
-						var datatwo = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						option.push(object.question.answers[y].answer_text)
-						answerstwoss.push(datatwo);
-					}
-				}
-				var arrc = option.concat(other);
-				var answers = answerstwoss.concat(answerstwos);
-				// 插入单选题
-				questiontwo = {
-					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
-					"id": object.question.id,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 1,
-					"question_title": object.question.question_title,
-					"question_type": 1,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-				if (uuk !== -1) {
-					console.log("修改")
-					this.edittotheserver(object, 1, arrc, null, 0, 0);
-					newarrpoll.splice(uuk, 1, question);
-				} else {
-					console.log("删除")
-					this.createquestionsandanswers(object, 1, arrc, null, 0, 0, object.question.id);
-					newarrpoll.push(question);
-				}
-				console.log(newarrpoll)
-			} else if (object.question.question_type === 2) {
-				//插入多选题
-				if (object.question.max_choices < object.question.min_choices) {
-					this.props.showNotification(`可选的最大限制不能小于最小限制`);
-
-					return;
-				}
-				var questiontwo = {};
-				var other = [];
-				var option = [];
-				var answerstwos = [];
-				var answerstwoss = [];
-				for (var y = 0; y < object.question.answers.length; y++) {
-					if (object.question.answers[y].answer_text === "其他") {
-						var dataone = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						other.push(object.question.answers[y].answer_text);
-						answerstwos.push(dataone);
-					} else {
-						var datatwo = {
-							"answer_id": object.question.answers[y].answer_id,
-							"answer_position": object.question.answers[y].answer_position,
-							"answer_text": object.question.answers[y].answer_text
-						}
-						option.push(object.question.answers[y].answer_text)
-						answerstwoss.push(datatwo);
-					}
-				}
-				var arrc = option.concat(other);
-				var answers = answerstwoss.concat(answerstwos);
-				questiontwo = {
-					"id": object.question.id,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 2,
-					"question_title": object.question.question_title,
-					"question_type": 2,
-					"max_choices": object.question.max_choices,
-					"min_choices": object.question.min_choices,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-				//插入多选题
-				if (uuk !== -1) {
-					console.log("修改")
-					this.edittotheserver(object, 2, arrc, null, object.question.max_choices, object.question.min_choices);
-					newarrpoll.splice(uuk, 1, question);
-				} else {
-					console.log("删除")
-					this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, object.question.id);
-					newarrpoll.push(question);
-				}
-				console.log(newarrpoll)
-
-			} else if (object.question.question_type === 3) {
-				//插入主观题
-				var answers = [];
-				var questiontwo = {};
-
-				if (object.question.answers.length > 0) {
-					for (var y = 0; y < object.question.answers.length; y++) {
-						var answerstwo;
-						if (object.question.answers[y].answer_text === "其他") {
-							answerstwo = {
-								"answer_id": object.question.answers[y].answer_id,
-								"answer_position": object.question.answers[y].answer_position,
-								"answer_text": object.question.answers[y].answer_text
-							}
-						} else {
-							answerstwo = {
-								"answer_id": object.question.answers[y].answer_id,
-								"answer_position": object.question.answers[y].answer_position,
-								"answer_text": object.question.answers[y].answer_text
-							}
-						}
-						answers.push(answerstwo);
-					}
-				}
-				questiontwo = {
-					"id": object.question.id,
-					"is_necessary": object.question.is_necessary,
-					"question_number": 3,
-					"question_title": object.question.question_title,
-					"question_type": 3,
-					"new": "",
-					"answers": answers
-				};
-				question = {"question": questiontwo};
-				if (uuk !== -1) {
-					console.log("修改")
-					this.edittotheserver(object, 3, null, null, 0, 0);
-					newarrpoll.splice(uuk, 1, question);
-				} else {
-					console.log("删除")
-					this.createquestionsandanswers(object, 3, null, null, 0, 0, object.question.id);
-					newarrpoll.push(question);
-				}
-				console.log(newarrpoll)
-
-			}
-
-		}
-
-
-		//添加到上面列表中
-		//改变题目总数
-		if (object.question.question_type === 1) {
-			//单选题
-			this.state.mysingles = this.state.mysingles + 1;
-		} else if (object.question.question_type === 2) {
-			//多选题
-			this.state.mydoubles = this.state.mydoubles + 1;
-		} else if (object.question.question_type === 3) {
-			//主观题
-			this.state.mymainsint = this.state.mymainsint + 1;
-
-		}
-
-		//这里更新数据
-		if (this.state.q_countst == 1) {
-			this.setState({
-				q_countst: 0,
-			})
-		}
-		this.deleteadddom(indexo);
-		// console.log(indexo)
-	}
-
-
-	////新增到服务器中
-	createquestionsandanswers = (object, number, option, other, max_choices, min_choices, insert_id) => {
-		var thiss = this;
-		var poll_id = this.state.pollid;
-		var urlly = `/polls/${poll_id}/poll_questions.json`
-		var max_choicess = null;
-		var min_choicess = null;
-		if (max_choices === 0 && min_choices === 0) {
-			max_choicess = null;
-			min_choicess = null;
-		} else {
-			max_choicess = max_choices;
-			min_choicess = min_choices;
-		}
-		axios.post(urlly, {
-			question_title: object.question.question_title,
-			question_type: number,
-			is_necessary: object.question.is_necessary,
-			max_choices: max_choicess,
-			min_choices: min_choicess,
-			question_answers: option,
-			question_other_answer: null,
-			insert_id: insert_id
-		}).then((result) => {
-			// try {
-			if (result !== undefined) {
-				if (result.data.status === 0) {
-					this.props.showNotification(`已完成`);
-					thiss.thisinitializationdatanew();
-					// console.log("确认创建问题")
-					// console.log(result)
-					// try {
-					//     if (result.data.status === 0) {
-					//         console.log("确认创建问题")
-					//         console.log(JSON.stringify(result.data))
-					//     }
-					// } catch (e) {
-					//
-					// }
-				}
-			}
-			// } catch (e) {
-			//
-			// }
-
-		})
-
-
-	}
-	///编辑修改到服务器当中
-	edittotheserver = (object, number, option, other, max_choices, min_choices) => {
-		console.log("调用了edittotheserver")
-		var url = `/poll_questions/${object.question.id}.json`
-		var thiss = this;
-		axios.put(url, {
-			// debug: true,
-			question_title: object.question.question_title,
-			question_type: number,
-			is_necessary: object.question.is_necessary,
-			max_choices: max_choices,
-			min_choices: min_choices,
-			question_answers: option,
-			question_other_answer: null,
-		}).then((result) => {
-			try {
-				if (result.data.status === 0) {
-					this.props.showNotification(`编辑题目成功`);
-					thiss.thisinitializationdatanew();
-				}
-			} catch (e) {
-				// console.log("调用了edittotheserver")
-				console.log(e)
-			}
-		})
-	}
-
-	//删除到服务器当中
-	eletetoserver = (pollid, newarr, type, index) => {
-		console.log("调用了eletetoserver")
-		var id = pollid;
-		var url = `/poll_questions/${id}.json`
-		let {mysingles, mydoubles, mymainsint} = this.state
-		var thiss = this;
-
-		axios
-			.delete(url, {})
-			.then(function (response) {
-				console.log(response)
-				if (response === undefined) {
-					return;
-				}
-				if (response.data.message === "删除成功") {
-					thiss.props.showNotification(`删除成功`);
-
-					newarr.splice(index, 1);
-					if (type === 1) {
-						mysingles = mysingles - 1;
-					} else if (type === 2) {
-						mydoubles = mydoubles - 1;
-
-					} else if (type === 3) {
-						mymainsint = mymainsint - 1;
-
-					}
-					// thiss.setState({
-					//     poll_questions: newarr,
-					//     mysingles: mysingles,
-					//     mydoubles: mydoubles,
-					//     mymainsint: mymainsint
-					// });
-					thiss.thisinitializationdatanew();
-				}
-			})
-	}
-
-	//上移到服务器中
-	Upanddownmovementof = (bool, poll_question_id) => {
-		// console.log("调用了Upanddownmovementofr")
-		// console.log(poll_question_id)
-		var thiss = this;
-		if (bool === true) {
-			var url = `/poll_questions/${poll_question_id}/up_down.json`;
-			axios.post(url, {
-				opr: "up",
-			}).then((result) => {
-				try {
-					if (result.data.status === 0) {
-						this.props.showNotification(`已完成`);
-						thiss.thisinitializationdatanew();
-					}
-					// console.log(JSON.stringify(result))
-				} catch (e) {
-					console.log("上移题目成功 错误")
-					console.log(e)
-				}
-
-			})
-		} else {
-			var url = `/poll_questions/${poll_question_id}/up_down.json`;
-			axios.post(url, {
-				opr: "down",
-			}).then((result) => {
-				try {
-					if (result.data.status === 0) {
-						// message.success("下移题目成功", 1)
-						this.props.showNotification(`已完成`);
-						thiss.thisinitializationdatanew();
-					}
-					// console.log(JSON.stringify(result))
-				} catch (e) {
-					console.log("下移题目成功 错误")
-					console.log(e)
-				}
-			})
-		}
-
-	}
-
-	//删除编辑新增条目
-	//id 条目的唯一id
-	//i 为要删除的子条目
-	deleteentrys = (id, i, stirngname) => {
-		console.log(id)
-		console.log(stirngname);
-		var arrtwoy = this.state.adddom;
-		let newarrtwoy = [...arrtwoy];
-		for (var k = 0; k < newarrtwoy.length; k++) {
-			if (newarrtwoy[k] != undefined) {
-				if (newarrtwoy[k].question.id === id) {
-					for (var c = 0; c < newarrtwoy[k].question.answers.length; c++) {
-						if (c === i) {
-							// console.log("删除了")
-							// console.log(c)
-							newarrtwoy[k].question.answers.splice(c, 1);
-						}
-					}
-				}
-			}
-		}
-		if (stirngname === true) {
-			console.log(stirngname);
-			this.setState({
-				newoption: false,
-				adddom: newarrtwoy,
-
-			})
-		} else {
-			console.log(stirngname);
-			this.setState({
-				adddom: newarrtwoy,
-			});
-		}
-
-
-	}
-
-
-	//  新增选项
-	ewoption = (id, object) => {
-		console.log("ewoption 440")
-		console.log("是否是新建题目还是编辑")
-		// console.log(object.question.new)
-
-
-		let arrtwo = this.state.adddom;
-		let newarrtwo = [...arrtwo];
-
-
-		for (var k = 0; k < newarrtwo.length; k++) {
-			// console.log(arrtwo[k].question.id);
-			if (newarrtwo[k] != undefined) {
-				if (newarrtwo[k].question.id === id) {
-					var data = {
-						"answer_id": newarrtwo[k].question.answers.length + 1,
-						"answer_position": newarrtwo[k].question.answers.length + 1,
-						"answer_text": ""
-					};
-					//向头部添加元素
-					// newarrtwo[k].question.answers.unshift(data);
-					//如果有其他这一项就删除掉
-					if (newarrtwo[k].question.answers.length > 0) {
-						for (var o = 0; o < newarrtwo[k].question.answers.length; o++) {
-							if (newarrtwo[k].question.answers[o].answer_text != undefined) {
-								if (newarrtwo[k].question.answers[o].answer_text === "其他") {
-									newarrtwo[k].question.answers.splice(o, 0, data);
-									this.setState({
-										adddom: newarrtwo
-									})
-									return
-								} else {
-									if (o === newarrtwo[k].question.answers.length - 1) {
-										newarrtwo[k].question.answers.push(data);
-										this.setState({
-											adddom: newarrtwo
-										})
-										return
-									}
-								}
-							}
-						}
-					} else {
-						newarrtwo[k].question.answers.push(data);
-						this.setState({
-							adddom: newarrtwo
-						})
-					}
-
-				}
-			}
-		}
-
-	}
-
-
-	swapArray = (arr, index1, index2) => {
-		arr[index1] = arr.splice(index2, 1, arr[index1])[0];
-		return arr;
-	}
-
-	//新增其他选项
-	addanotheroption = (id) => {
-		console.log("addanotheroption 457")
-		let arrtwo = this.state.adddom;
-		let newarrtwo = [...arrtwo];
-		console.log(newarrtwo)
-		for (var k = 0; k < newarrtwo.length; k++) {
-			if (newarrtwo[k] != undefined) {
-				if (newarrtwo[k].question.id === id) {
-					var data = {
-						"answer_id": newarrtwo[k].question.answers.length + 1,
-						"answer_position": newarrtwo[k].question.answers.length + 1,
-						"answer_text": "其他"
-					};
-					newarrtwo[k].question.answers.push(data);
-				}
-			}
-		}
-		this.setState({
-			adddom: newarrtwo,
-			newoption: true,
-		})
-	}
-
-
-	//点击向上排序按钮事件
-	handleClickBySortUp = (index, object) => {
-		console.log("handleClickBySortUp 521")
-		let arr = this.state.poll_questions;
-		let newarr = [...arr];
-		console.log(newarr)
-		if (index != 0) {
-			this.Upanddownmovementof(true, object.question.id);
-			let temp = newarr[index - 1];
-			newarr[index - 1] = newarr[index];
-			newarr[index] = temp;
-			this.setState({
-				poll_questions: newarr,
-			});
-		}
-	}
-
-	//点击向下排序按钮事件
-	handleClickBySortDown = (index, object) => {
-		console.log("handleClickBySortDown 536")
-		let arr = this.state.poll_questions;
-		let newarr = [...arr];
-		//
-		if (index != newarr.length - 1) {
-			this.Upanddownmovementof(false, object.question.id);
-			let temp = newarr[index + 1];
-			newarr[index + 1] = newarr[index];
-			newarr[index] = temp;
-			this.setState({
-				poll_questions: newarr,
-			});
-		} else {
-			console.log("2222index==arr.length");
-			console.log(this.state.poll_questions);
-		}
-	}
-
-	//点击删除按钮事件
-	handleClickByDelete = (type, index, object) => {
-		console.log("handleClickByDelete 556")
-		console.log("object.question.id")
-		console.log(object.question.id)
-		let arr = this.state.poll_questions;
-		let newarr = [...arr];
-		this.eletetoserver(object.question.id, newarr, type, index)
-
-	}
-
-	// 数字输入监听
-	//e为获取组件对象
-	//i外层数组
-	//k为内层数组
-	handleInputChanges = (e, i, k) => {
-		console.log("handleInputChanges 612")
-
-		let value = e.target.value;//取到input的数据
-		console.log("handleInputChanges value is  :" + value);
-		console.log(k);
-		let arr = this.state.adddom;
-		let newarr = [...arr];
-
-		newarr[i].question.answers[k].answer_text = value
-		this.setState({
-			adddom: newarr
-		})
-
-	}
-
-	//标题输入监听
-	handleInputTopic = (e, i) => {
-		console.log("handleInputTopic 633")
-
-		let value = e.target.value;//取到input的数据
-		console.log("handleInputTopic value is  :" + value);
-		console.log(i);
-		let arr = this.state.adddom;
-		let newarr = [...arr];
-		newarr[i].question.question_title = value
-		this.setState({
-			adddom: newarr
-		})
-	}
-
-	//最小值
-	handleGradationGroupChangee = (value, index, max, length) => {
-
-		debugger
-		var minbool = false;
-		var maxbool = false;
-		let arr = this.state.adddom;
-		if (parseInt(value) === 0 || parseInt(value) === "0" || parseInt(value) === null || parseInt(value) === undefined || parseInt(value) < 1) {
-			minbool = true;
-		}
-		if (max === 0 || max === "0" || max === null || max === undefined) {
-			maxbool = true;
-		}
-
-		if (minbool === true && maxbool === true) {
-			for (var i = 0; i < arr.length; i++) {
-				if (index === i) {
-					arr[i].question.min_choices = parseInt(value);
-				}
-			}
-			this.setState({
-				adddom: arr
-			})
-		} else {
-			for (var i = 0; i < arr.length; i++) {
-				if (index === i) {
-					arr[i].question.min_choices = parseInt(value);
-					arr[i].question.max_choices = length;
-				}
-			}
-			this.setState({
-				adddom: arr
-			})
-		}
-
-	}
-
-	//最大值
-	handleGradationGroupChangeee = (value, index) => {
-
-		let arr = this.state.adddom;
-		for (var i = 0; i < arr.length; i++) {
-			if (index === i) {
-				arr[i].question.max_choices = parseInt(value);
-			}
-		}
-		this.setState({
-			adddom: arr
-		})
-		// console.log(this.state.adddom);
-	}
-
-	//提交题目//没有就创建新的题库，新建问题和保存题目不一样不能同时保存 这里只是新建 和编辑 标题和须知
-	submitQuestionnaire = () => {
-		console.log("调用了submitQuestionnaire")
-		if (this.state.Newedit === true) {
-
-			this.newword();
-
-		} else {
-			if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") {
-				this.props.showNotification("请输入标题");
-				return
-			}
-
-			if (this.state.polls_descriptiontest.length > 100) {
-
-			}
-			var pollid;
-			if (this.state.pollid === undefined) {
-				pollid = this.props.match.params.pollid;
-			} else {
-				pollid = this.state.pollid;
-			}
-
-
-			var url = `/polls/${pollid}.json`;
-			axios.put(url, {
-				polls_name: this.state.polls_nametest,
-				polls_description: this.state.polls_descriptiontest
-			}).then((result) => {
-				try {
-					// console.log(JSON.stringify(result))
-					if (result.data.status === 0) {
-						// console.log("更新题目成功")
-						// this.props.showNotification("保存成功");
-						this.props.history.push(`/courses/${this.props.match.params.coursesId}/polls/${pollid}/detail?tab=2`)
-					}
-				} catch (e) {
-
-				}
-			})
-		}
-	}
-
-	cancelmodel = () => {
-
-		this.setState({
-			Modalstype: false,
-			Modalstopval: "",
-			ModalsBottomval: "",
-		})
-
-	}
-	savedelete = (question_type, index, item) => {
-		console.log("savedelete");
-		this.handleClickByDelete(question_type, index, item);
-		this.setState({
-			Modalstype: false,
-			Modalstopval: "",
-			ModalsBottomval: "",
-		})
-	}
-	// 问题的类型，1单选题，2为多选题，3为主观题
-	showDeleteConfirm = (question_type, index, item) => {
-		this.setState({
-			Modalstype: true,
-			Modalstopval: "是否确认删除？",
-			ModalsBottomval: "",
-			ModalCancel: this.cancelmodel,
-			ModalSave: () => this.savedelete(question_type, index, item),
-		})
-
-	}
-	//必答选项
-	onCheckAllChange = (e, index) => {
-		console.log("onCheckAllChange");
-		console.log(e.target.checked);
-		// console.log(e.target.value);
-		let arr = this.state.adddom;
-		for (var i = 0; i < arr.length; i++) {
-			if (index === i) {
-				if (e.target.checked === true) {
-					arr[i].question.is_necessary = 1;
-
-				} else {
-					arr[i].question.is_necessary = 0;
-				}
-			}
-		}
-		this.setState({
-			adddom: arr
-		})
-	}
-
-	//重新编辑标题和须知
-	adddomeditit = () => {
-		if (this.state.mysave === true) {
-			this.setState({
-				mysave: false,
-				readOnlys: "readOnly",
-				storagedesc:this.state.polls_nametest,
-				storagedesctwo:this.state.polls_descriptiontest,
-			})
-		} else if (this.state.mysave === false) {
-			this.setState({
-				mysave: true,
-				readOnlys: "",
-				storagedesc:this.state.polls_nametest,
-				storagedesctwo:this.state.polls_descriptiontest,
-			})
-		}
-	}
-	//取消保存
-	onSaveExercisetwo = () => {
-		if (this.state.mysave === true) {
-			this.setState({
-				mysave: false,
-				Newedit: false,
-				readOnlys: "readOnly",
-				polls_nametest:this.state.storagedesc,
-				polls_descriptiontest:this.state.storagedesctwo,
-			})
-		} else {
-			this.setState({
-				mysave: false,
-				Newedit: false,
-				readOnlys: "readOnly",
-				polls_nametest:this.state.storagedesc,
-				polls_descriptiontest:this.state.storagedesctwo,
-			})
-		}
-	}
-	// 创建问卷
-	onSaveExercise = () => {
-		if (this.state.Newedit === true) {
-
-			if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") {
-				this.props.showNotification(`请输入标题`);
-				return
-			}
-			let coursesId = this.props.match.params.coursesId;
-			const urlls = `/courses/${coursesId}/polls.json`
-			axios.post(urlls, {
-				polls_name: this.state.polls_nametest,
-				polls_description: this.state.polls_descriptiontest
-			}).then((result) => {
-				if (result === undefined) {
-					return;
-				}
-				this.state.Newedit === false;
-				this.props.showNotification(`问卷创建成功!`);
-				this.setState({
-					pollid: result.data.data.id,
-					Newedit: false,
-					mysave: false,
-					readOnlys: "readOnly",
-					cancellation: false,
-				})
-
-
-			})
-		} else {
-			if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") {
-				this.props.showNotification("请输入标题");
-				return
-			}
-
-			var pollid;
-			if (this.state.pollid === undefined) {
-				pollid = this.props.match.params.pollid;
-			} else {
-				pollid = this.state.pollid;
-			}
-
-
-			var url = `/polls/${pollid}.json`;
-			axios.put(url, {
-				polls_name: this.state.polls_nametest,
-				polls_description: this.state.polls_descriptiontest
-			}).then((result) => {
-				if (result !== undefined) {
-					this.props.showNotification(`问卷更新成功!`);
-					this.setState({
-						mysave: false,
-						readOnlys: "readOnly",
-					})
-				}
-
-			})
-		}
-
-	}
-
-	//试图
-	render() {
-		let {
-			addonAfter,
-			user_permission,
-			polls_status,
-			Modalstype,
-			mysave,
-			readOnlys,
-			newoption,
-			cancellation,
-		} = this.state
-		//获取老师权限
-		// console.log("[`${maps[polls_status && polls_status]}`]]");
-		// console.log(polls_status);
-		// console.log([[`${maps[polls_status && polls_status]}`]] + "");
-
-		const IsAdmin = this.props.isAdmin();
-		const {getFieldDecorator} = this.props.form;
-		const formItemLayout = {
-			labelCol: {
-				xs: {span: 24},
-				// sm: { span: 8 },
-				sm: {span: 24},
-			},
-			wrapperCol: {
-				xs: {span: 24},
-				// sm: { span: 16 },
-				sm: {span: 24},
-			},
-		};
-
-		const radioStyle = {
-			display: 'block',
-			height: '30px',
-			lineHeight: '30px',
-		};
-
-		// console.log(this.state.projects===undefined?"":this.state.projects.poll_questions)
-		var displaymysave = (mysave === true) ? "" : "display:none;";
-		return (
-			<div className="newMain">
-				{/*提示*/}
-				{Modalstype && Modalstype === true ? <Modals
-					modalsType={this.state.Modalstype}
-					modalsTopval={this.state.Modalstopval}
-					modalCancel={this.state.ModalCancel}
-					modalSave={this.state.ModalSave}
-					modalsBottomval={this.state.ModalsBottomval}
-					loadtype={this.state.Loadtype}
-				/> : ""}
-				<div className="educontent mb50">
-					<p className="clearfix mb20 mt10">
-						<ActionBtn className=" btn colorgrey fl hovercolorblue"
-											 to={`/courses/${this.props.match.params.coursesId}`}>{this.props.coursedata.name}</ActionBtn>
-						<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-						<ActionBtn className=" btn colorgrey fl hovercolorblue"
-											 to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}>问卷</ActionBtn>
-						<span className="color-grey-9 fl ml3 mr3">&gt;</span>
-						<span>{this.props.match.params.news === undefined ? "新建" : this.props.match.params.news === "new" ? "新建" : "编辑"}</span>
-					</p>
-					<div className="clearfix mb30">
-						<p
-							className="fl color-black summaryname mt5">{this.props.match.params.news === undefined ? "新建问卷" : this.props.match.params.news === "new" ? "新建问卷" : "编辑问卷"}</p>
-						<ActionBtn to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}
-											 className=" fr font-16">返回</ActionBtn>
-					</div>
-
-					{/*<Form {...formItemLayout} onSubmit={this.handleSubmit}>*/}
-					<div className="edu-back-white">
-						<div className="createPage bor-bottom-greyE">
-							<style>
-								{`
-                   .ant-form-item-label{width:180px;}
-                  `}
-							</style>
-
-							<div>
-								<div style={{"color": "#212121", "font-size": "16px"}} className="fl"><span
-									style={{"color": "#f5222d"}}>*</span>问卷标题
-								</div>
-								{
-									this.props.match.params.news === undefined ? "" : this.props.match.params.news === "new" ?
-										(
-											this.state.mysave === false ?
-												<div className="fr">
-									<span><a onClick={() => this.adddomeditit()}><Tooltip title="编辑"><i
-										className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip></a></span>
-												</div>
-												: "")
-										:
-										<div className="fr">
-									<span><a onClick={() => this.adddomeditit()}><Tooltip title="编辑"><i
-										className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip></a></span>
-										</div>
-								}
-
-							</div>
-
-							<Input placeholder="请输入问卷标题，最大限制60个字符" maxLength="60"
-										 style={{"margin-top": "15px", "text-align": "left"}}
-										 onInput={this.changeTopicName}
-										 readOnly={readOnlys}
-										 autoComplete="off" addonAfter={String(addonAfter)}
-										 value={this.state.polls_nametest}
-										 className="searchViewAfter"></Input>
-
-						</div>
-						<div style={{
-							"padding": "20px 30px 50px",
-							"position": "relative",
-							"border-bottom": "1px solid #EDEDED",
-							"margin-bottom": " 0px"
-						}}>
-							<style>
-								{`
-                   .ant-form-item-label{width:80px;}
-                  `}
-							</style>
-
-							<div style={{"color": "#212121", "font-size": "16px"}}>问卷须知</div>
-
-							<TextArea placeholder="请输入本次问卷答题的相关说明，最大限制100个字符"
-												style={{"height": "120px", "margin-top": "15px", "text-align": "left"}}
-												maxLength="100"
-												readOnly={readOnlys}
-												onInput={this.changeTopicNametwo}
-												value={this.state.polls_descriptiontest}
-												autoComplete="off" addonAfter={"100"}></TextArea>
-							{
-								this.state.Newedit === true || this.state.mysave === true ?
-									<div>
-										<Button type="primary" onClick={this.onSaveExercise} className=" fr   "
-														style={{
-															"margin-top": "10px",
-															"height": "32px",
-															"width": " 70px",
-															"font-size": "14px",
-															"line-height": " 30px",
-														}}>保存</Button>
-										{cancellation === false ?
-											<Button onClick={this.onSaveExercisetwo} className="defalutCancelbtn  fr mr20  "
-															style={{
-																"margin-top": "10px",
-																"height": "32px",
-																"width": " 70px",
-																"font-size": "14px",
-																"line-height": " 30px"
-															}}>取消</Button>
-											: ""}
-
-									</div>
-									: ""
-							}
-
-						</div>
-
-					</div>
-					<p className="clearfix padding20-30 color-grey-9">
-
-
-						{
-							this.state.mysingles + this.state.mydoubles + this.state.mymainsint === 0 ? "" :
-								<div>
-                                                  <span className="fl">
-                                                      {this.state.mysingles === 0 ? "" : <span
-																												className="mr20">单选题{this.state.mysingles === undefined ? "" : this.state.mysingles} 题</span>}
-
-																										{this.state.mydoubles === 0 ? "" :
-																											<span
-																												className="mr20">多选题{this.state.mydoubles === undefined ? "" : this.state.mydoubles}题</span>}
-																										{this.state.mymainsint === 0 ? "" :
-																											<span className="mr20">
-                                                              主观题{this.state.mymainsint === undefined ? "" : this.state.mymainsint}题
-                                                          </span>
-																										}
-                                                  </span>
-
-									<span className="fr">合计 <span
-										className="color-blue">{this.state.mysingles === undefined ? "" : this.state.mydoubles === undefined ? "" : this.state.mymainsint === undefined ? "" : this.state.mysingles + this.state.mydoubles + this.state.mymainsint}</span> 题</span>
-								</div>
-
-						}
-
-					</p>
-					<div className="edu-back-white">
-
-						{/*自动生成修改好的获取到的*/}
-						{/**************************************************************************/}
-						{this.state.poll_questions === undefined ? "" : this.state.poll_questions.map((item, index) => {
-							// console.log('打印this.state.poll_questions')
-							// console.log(item.question)
-							let resultDom;
-							resultDom = <div className="problemShow  bor-bottom-greyE">
-								<p className="clearfix font-16">
-									<span className="color-grey-6 fl">第{index + 1}题：</span>
-									<span
-										className="color-grey-9 fl">{item.question.question_type === 1 ? "(单选题)" : item.question.question_type === 2 ? "(多选题)" : "(主观题)"}</span>
-									<span
-										className="selectAnswer ml10">{item.question.is_necessary === 1 ? "必答" : item.question.question_type === 2 ? "选答" : "选答"}</span>
-									<span style={{color: "#4B4B4B"}}
-												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "" : item.question.min_choices === null && item.question.max_choices === null ? "" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "" : "可选" + item.question.min_choices + "-" + item.question.max_choices + "项")}</span>
-									{
-										polls_status === undefined || polls_status === 1 ?
-											<span className="fr">
-                      <a className="mr30"
-												 onClick={() => this.showDeleteConfirm(item.question.question_type, index, item)}><Tooltip
-												title="删除"><i
-												className="color-grey-cd font-16 iconfont icon-shanchu"></i></Tooltip></a>
-												{index === 0 ? "" :
-													<a className="mr30"
-														 onClick={() => this.handleClickBySortUp(index, item)}><Tooltip
-														title="上移"><i
-														className="color-green font-18 iconfont icon-xiangshangyi"></i></Tooltip></a>}
-												{index === this.state.poll_questions.length - 1 ? "" :
-													<a className="mr30"
-														 onClick={() => this.handleClickBySortDown(index, item)}><Tooltip
-														title="下移"><i
-														className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a>}
-												<a className="mr30"
-													 onClick={() => this.addMytopic(item.question.question_type, this.state.pollid, index + 1, true, item.question.id)}><Tooltip
-													title={item.question.question_type === 1 ? "插入单选题" : item.question.question_type === 2 ? "插入多选题" : "插入主观题"}><i
-													className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
-                      <a onClick={() => this.adddomedit(item)}><Tooltip title="编辑"><i
-												className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip></a>
-                    </span> : <span className="fr">     <a onClick={() => this.adddomedit(item)}><Tooltip title="编辑"><i
-												className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip></a>  </span>
-									}
-
-								</p>
-								<p className="mt20"> <span className="font-16  flex1" style={{"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{item.question.question_title}</span></p>
-								{/*<pre className="mt20 mb20 font-16 break_word flex1">{item.question.question_title}</pre>*/}
-								{item.question.question_type === 1 ?
-									(<RadioGroup defaultChecked={false} disabled>
-										{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
-											return (
-												<div className={"h20 mt20 mb20 "} style={{"clear": "both"}}>
-													<Radio value={i} className={"fl"} style={{"text-align": "left"}}></Radio>
-													{/*<pre className={"break_word flex1 fl"}*/}
-													{/*		 style={{"text-align": "left"}}>{items.answer_text}</pre>*/}
-													{/*<span className={"break_word flex1"}><pre className={"break_word flex1"}>{items.answer_text}</pre> </span>*/}
-													<span className={" flex1 "} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}} >{items.answer_text}</span>
-
-												</div>
-											)
-										})}
-									</RadioGroup>)
-									: item.question.question_type === 2 ?
-										(<CheckboxGroup defaultChecked={false} disabled>
-											{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
-												return (
-													<div className="mt10 mt20 mb20 " style={{"clear": "both"}}>
-														<Checkbox value={i} className={"fl"} style={{"text-align": "left"}}></Checkbox>
-														<span className={" flex1"} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{items.answer_text}</span>
-
-														{/*<span*/}
-														{/*	className={"break_word flex1 fl"} style={{"text-align": "left"}}><pre*/}
-														{/*	style={{"text-align": "left"}}>{items.answer_text}</pre></span>*/}
-													</div>
-												)
-											})}
-										</CheckboxGroup>)
-										: item.question.question_type === 3 ? (<div></div>) : (<div></div>)}
-							</div>
-
-							return (
-								<div>
-									{resultDom}
-								</div>
-							)
-						})}
-						{/**************************************************************************/}
-						{/*编辑用的新增用的*/}
-						{/**************************************************************************/}
-
-						{this.state.adddom === undefined ? "" : this.state.adddom.map((itemo, indexo) => {
-							// console.log('打印this.state.adddom')
-							// console.log(itemo.question)
-							let arrid = itemo.question.id;
-							let resultDomtwo;
-							resultDomtwo =
-								<div className="problemShow">
-									<span
-										className="font-16 color-grey-6 mb20">{itemo.question.question_type === 1 ? "单选题" : itemo.question.question_type === 2 ? "多选题" : "主观题"}
-										<Checkbox value={itemo.question.is_necessary}
-															checked={itemo.question.is_necessary === 1 ? true : false}
-															onChange={(e) => this.onCheckAllChange(e, indexo)}
-															className="lineh-40"
-															style={{"marginLeft": "20px"}}>必答</Checkbox>
-									</span>
-
-									<TextArea placeholder="请输入题目" className="mb20 TextAreas"
-														autosize={{minRows: 1, maxRows: 5}}
-														id="textArea"
-														style={{
-															"height": "45px",
-															"max-height": "9.0072e+15px",
-															"overflow-y": "hidden",
-															"line-height": "35px",
-														}}
-
-														onInput={(e) => this.handleInputTopic(e, indexo)}>{itemo.question.question_title}</TextArea>
-
-									{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
-										return (
-											<div>
-												{itemt.answer_text === undefined ? (
-													<div></div>) : itemt.answer_text === "其他" ? (
-													<p className="df mb20">
-															<span
-																className="color-grey-6 mr10 w60 font-16 lineh-40"
-																style={{"text-align": "center"}}>其它</span>
-
-														<input
-															className="mr20 input-flex-40 TextAreainput" disabled
-															placeholder='无法编辑！将由参与答题的人手动录入'></input>
-														{polls_status === undefined || polls_status === 1 ?
-															<a className="lineh-40"
-																 onClick={() => this.deleteentrys(arrid, indext, true)}><Tooltip
-																title="删除"
-																placement={"bottom"}><i
-																className="iconfont icon-htmal5icon19 font-20 color-grey-c"></i></Tooltip></a>
-															: ""}
-													</p>) : (<p className="df mb20">
-													<span className="color-grey-6 mr10 w60 font-16 lineh-40"
-																style={{"text-align": "center"}}>选项</span>
-
-													<TextArea
-														autosize={{minRows: 1, maxRows: 5}}
-														className="mr20 TextAreas"
-														value={itemt.answer_text}
-														style={{
-															"height": "45px",
-															"max-height": "9.0072e+15px",
-															"overflow-y": "hidden",
-															"line-height": "35px",
-														}}
-														onInput={(e) => this.handleInputChanges(e, indexo, indext)}></TextArea>
-													{polls_status === undefined || polls_status === 1 ?
-														<a className="lineh-40"
-															 onClick={() => this.deleteentrys(arrid, indext, false)}><Tooltip
-															title="删除" placement={"bottom"}><i
-															className="iconfont icon-htmal5icon19 font-20 color-grey-c"></i></Tooltip></a>
-														: ""}
-												</p>)}
-											</div>
-										)
-									})}
-
-									<div className="df">
-										{itemo.question.question_type === 1 ? (
-												<div>
-													<div style={{minWidth: "1100px"}}>
-														{polls_status === undefined || polls_status === 1 ?
-															<ActionBtn style="grey" className="mr20 mt5"
-																				 onClick={() => this.ewoption(itemo.question.id, itemo)}>新增选项</ActionBtn>
-
-															: ""}
-														{polls_status === undefined || polls_status === 1 ?
-
-															(newoption === false ?
-																<ActionBtn style="grey" className="mr20 mt5"
-																					 onClick={() => this.addanotheroption(itemo.question.id)}>新增其他选项</ActionBtn>
-																: "")
-															: ""}
-														<span className="fr mt5">
-                        <ActionBtn style="greyBack" className="mr20 w100"
-																	 onClick={() => this.deleteadddom(indexo)}>取消</ActionBtn>
-                        <ActionBtn style="blue" className="mr20 w100"
-																	 onClick={() => this.deleteadddomthree(indexo, itemo)}>保存</ActionBtn>
-											 <ActionBtn style="blue" className=" w100"
-																	onClick={() => this.deleteadddomtwo(indexo, itemo)}>保存并继续</ActionBtn>
-                      </span>
-													</div>
-												</div>
-
-
-											)
-
-
-											: itemo.question.question_type === 2 ? (
-													//////////////////////////////////////////// 可选
-													<div>
-														<div style={{minWidth: "1100px"}}>
-															<div>
-                                                        <span
-																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
-																<div className="mr40 flex1 ">
-																	{/*可选最小*/}
-																	<style>
-																		{
-																			`
-																			.ant-select-selection .ant-select-selection-selected .ant-select-selection__rendered .ant-select-selection-selected-value{
-																				"width":"100%";
-                                  "height": "80%";
-																	"margin-top": "5px";
-																 "margin-left": "5px";
-																 "text-align": "center";
-																 "display": "block";
-																 "opacity": "1";
-																			}
-																	`
-																		}
-																	</style>
-																	<Select className="fl  w100"
-																					onChange={(value) => this.handleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
-																					value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices}
-
-																	>
-																		<Option value={String("0")}>--</Option>
-																		{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
-																			return (
-																				indext >= 1 ? <Option value={String(indext + 1)}>{indext + 1}</Option> : ""
-																			)
-																		})}
-																	</Select>
-																	<span
-																		className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
-																	{/*可选最大*/}
-																	<Select className="fl w100"
-																					onChange={(value) => this.handleGradationGroupChangeee(value, indexo)}
-																					value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
-																	>
-																		<Option value={String("0")}>--</Option>
-																		{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
-																			return (
-																				indext >= 1 ? <Option value={String(indext + 1)}>{indext + 1}</Option> : ""
-
-																			)
-																		})}
-																	</Select>
-																	<span
-																		className="ml10 mr20 color-grey-6 lineh-40 fl font-16">项</span>
-																	<span
-																		className="color-grey-9 fl lineh-40">（学生答题时，系统对其选择的选项个数进行限制，--表示不限制）</span>
-																</div>
-
-															</div>
-														</div>
-													</div>
-												)
-
-												: (<div style={{minWidth: "1100px"}}></div>)
-
-										}
-									</div>
-									<div>
-										{itemo.question.question_type === 2 ?
-											(
-												polls_status === undefined || polls_status === 1 ?
-													<div className="clearfix mt30" >
-
-														<div><ActionBtn style="grey" className="mr20 fl mt5"
-																						onClick={() => this.ewoption(itemo.question.id, itemo)}>新增选项</ActionBtn>
-
-															{
-																newoption === false ? <ActionBtn style="grey" className="mr20 fl mt5"
-																																 onClick={() => this.addanotheroption(itemo.question.id)}>新增其他选项</ActionBtn> : ""
-															}
-
-														</div>
-
-
-														<span className="fr mt5">
-                        <ActionBtn style="greyBack" className=" mr20 w100"
-																	 onClick={() => this.deleteadddom(indexo)}>取消</ActionBtn>
-                        <ActionBtn style="blue" className="mr20 w100"
-																	 onClick={() => this.deleteadddomthree(indexo, itemo)}>保存</ActionBtn>
-											 <ActionBtn style="blue" className=" w100"
-																	onClick={() => this.deleteadddomtwo(indexo, itemo)}>保存并继续</ActionBtn>
-                      </span>
-													</div>
-
-
-													: ""
-											)
-
-											: itemo.question.question_type === 3 ?
-												<div className="clearfix mt30">
-												<span className="fr">
-                        <ActionBtn style="greyBack" className="mr20 w100"
-																	 onClick={() => this.deleteadddom(indexo)}>取消</ActionBtn>
-                        <ActionBtn style="blue" className="mr20 w100"
-																	 onClick={() => this.deleteadddomthree(indexo, itemo)}>保存</ActionBtn>
-											 <ActionBtn style="blue" className=" w100"
-																	onClick={() => this.deleteadddomtwo(indexo, itemo)}>保存并继续</ActionBtn>
-                      </span>
-												</div>
-												:
-												""}
-
-
-									</div>
-								</div>
-
-
-							return (
-								<div>
-									{resultDomtwo}
-								</div>
-							)
-						})}
-						{/**************************************************************************/}
-
-						{polls_status === undefined || polls_status === 1 ?
-							<div>
-								{
-									this.props.match.params.news === "new" ?
-										this.state.Newedit === false ?
-											<div>
-												<div  className=" mb10"  style={{"border-bottom": "1px solid #eee"}}></div>
-
-												<div style={{"padding": "10px 30px 20px 30px"}}>
-													<ActionBtn style="green" className="mr20" onClick={() => this.addmysingles()}><i
-														className="iconfont icon-tianjiafangda font-15 mr10"></i>单选题</ActionBtn>
-													<ActionBtn style="green" className="mr20" onClick={() => this.addmydoubles()}><i
-														className="iconfont icon-tianjiafangda font-15 mr10"></i>多选题</ActionBtn>
-													<ActionBtn style="green" className="mr20" onClick={() => this.addmymainsint()}><i
-														className="iconfont icon-tianjiafangda font-15 mr10"></i>主观题</ActionBtn>
-												</div>
-											</div>
-
-											: ""
-										:
-										<div>
-											<div  className=" mb10"  style={{"border-bottom": "1px solid #eee"}}></div>
-										<div style={{"padding": "10px 30px 20px 30px"}}>
-											<ActionBtn style="green" className="mr20" onClick={() => this.addmysingles()}><i
-												className="iconfont icon-tianjiafangda font-15 mr10"></i>单选题</ActionBtn>
-											<ActionBtn style="green" className="mr20" onClick={() => this.addmydoubles()}><i
-												className="iconfont icon-tianjiafangda font-15 mr10"></i>多选题</ActionBtn>
-											<ActionBtn style="green" className="mr20" onClick={() => this.addmymainsint()}><i
-												className="iconfont icon-tianjiafangda font-15 mr10"></i>主观题</ActionBtn>
-										</div>
-										</div>
-								}
-							</div>
-							: <div></div>}
-					</div>
-					{
-						this.props.match.params.news === "new" ?
-							(this.state.Newedit === false ?
-								<div
-									style={{
-										"display": "flex",
-										"justify-content": "center",
-										"align-items": "center",
-										"width": "100%",
-									}}
-								>
-									<li className="clearfix mt30 mb50">
-										<a type="primary" className="defalutSubmitbtn fl mr20"
-											 onClick={() => this.submitQuestionnaire()}>提交</a>
-										<a className="defalutCancelbtn fl" onClick={() => this.props.history.goBack()}>取消</ a>
-									</li>
-
-
-								</div>
-
-								: "")
-							:
-							<div
-								style={{
-									"display": "flex",
-									"justify-content": "center",
-									"align-items": "center",
-									"width": "100%",
-								}}
-							>
-								<li className="clearfix mt30 mb50">
-									<a type="primary" className="defalutSubmitbtn fl mr20"
-										 onClick={() => this.submitQuestionnaire()}>提交</a>
-									<a className="defalutCancelbtn fl" onClick={() => this.props.history.goBack()}>取消</ a>
-								</li>
-							</div>
-					}
-
-					{/*</Form>*/}
-				</div>
-				<div ref='targetElement'></div>
-			</div>
-		)
-	}
-
-}
-
-const WrappedPollNew = Form.create({name: 'taskPollNew'})(PollNew);
-// RouteHOC()
+import React, {Component} from "react";
+import {Form, Input, Tooltip, Checkbox, Radio, Select, message, Modal, Button} from 'antd'
+import {WordsBtn, ActionBtn} from 'educoder'
+import '../css/members.css'
+import "../common/formCommon.css"
+
+import './pollStyle.css'
+import '../css/Courses.css'
+import axios from 'axios'
+import moment from "../new/CoursesNew";
+import Modals from "../../modals/Modals";
+
+
+const TextArea = Input.TextArea
+const RadioGroup = Radio.Group
+const CheckboxGroup = Checkbox.Group
+const Option = Select.Option;
+const maps = {1: "未发布", 2: "提交中", 3: "已截止"}
+const confirm = Modal.confirm;
+
+class PollNew extends Component {
+	// 问卷新建和编辑
+	//
+	// * addonAfter  字数限制
+	// * q_counts  题目总数
+	// * mysingles 单选题数量
+	// * mydoubles 多选题数量
+	// * mymainsint  主观题数量
+	// * adddom     添加编辑的数据   页面点击新增题目
+	// * editentry  编辑条目       新增的题目点击到条目中
+	//* questionnair  问卷是否存在 默认不存在
+	// *
+
+	constructor(props) {
+		super(props);
+		this.state = {
+			visible: false,
+			poll_questions: [],
+			user_permission: "",
+			addonAfter: 60,
+			addonAftertwo: 100,
+			mysingles: 0,
+			mydoubles: 0,
+			mymainsint: 0,
+			adddom: [],
+			editentry: [],
+			questionnair: false,
+			polls_name: undefined,
+			polls_nametest: "",
+			polls_description: "",
+			polls_descriptiontest: "",
+			storagedesc:"",
+			storagedesctwo:"",
+			coursesId: "",
+			pollid: undefined,
+			polls_status: undefined,
+			q_countst: 0,
+			Newedit: true,
+			Insertposition: undefined,
+			Modalstype: false,
+			mysave: false,
+			readOnlys: "readOnly",
+			problemtopic: null,
+			problemtopicbool: false,
+			newoption: false,
+			cancellation: false,
+		}
+		// console.log("试卷新建和编辑");
+		// console.log(JSON.stringify(props));
+
+	}
+
+	changeTopicName = (e) => {
+		let num = 60 - parseInt(e.target.value.length);
+		this.setState({
+			addonAfter: num < 0 ? 0 : num
+		})
+		this.setState({
+			polls_nametest: e.target.value
+		})
+	}
+
+
+	changeTopicNametwo = (e) => {
+		// console.log("获取的值" + e.target.value);
+		let num = 100 - parseInt(e.target.value.length);
+		this.setState({
+			addonAftertwo: num < 0 ? 0 : num
+		})
+		this.setState({
+			polls_descriptiontest: e.target.value
+		})
+	}
+
+	// 初始化数据
+	componentDidMount = () => {
+		console.log("componentDidMount 50")
+		if (this.props.match.params.news !== undefined) {
+			if (this.props.match.params.news === "new") {
+				this.state.Newedit === true;
+				this.setState({
+					Newedit: true,
+					mysave: true,
+					readOnlys: "",
+					cancellation: true,
+				})
+			} else {
+				this.Initializatio_data();
+				this.state.Newedit === false;
+				this.setState({
+					Newedit: false,
+					mysave: false,
+					readOnlys: "readOnly",
+				})
+			}
+		}
+
+
+		// this.getPollInfo();
+
+	}
+	//获取权限
+	// getPollInfo(){
+	//     // console.log(this.props.match);
+	//     let pollId=this.props.match.params.pollId;
+	//     let url=`/polls/${pollId}/common_header.json`
+	//     axios.get(url).then((result)=>{
+	//         if(result.status==200){
+	//             this.setState({
+	//                 pollDetail:result.data,
+	//                 user_permission:result.data.user_permission
+	//             })
+	//         }
+	//     }).catch((error)=>{
+	//         console.log(error);
+	//     })
+	// }
+	//初始化请求网络
+	Initializatio_data = () => {
+		console.log("Initializatio_data 582")
+		//课堂id
+		let coursesId = this.props.match.params.coursesId;
+		//时间id
+		let pollid = this.props.match.params.pollid;
+		console.log(pollid);
+		// let coursesId = 557;
+		if (pollid === undefined) {
+			// console.log("没有问卷新建问卷~~~")
+			// let coursesId=this.props.match.params.coursesId;
+			// // to={`/courses/${coursesId}/polls/new`}
+			//
+			// const urll = `/courses/${coursesId}/polls/new.json`
+			// axios.get(urll).then((result) => {
+			//     if (result.status === 200) {
+			//         console.log(urll)
+			//         console.log("问卷新建成功")
+			//         console.log(JSON.stringify(result))
+			//         // var path=`/courses/${coursesId}/polls/new`;
+			//         //
+			//         // this.props.history.push({ pathname: path, state: { } });
+			//     }
+			// }).catch((error) => {
+			//     console.log(error)
+			// })
+
+			// const urlls = `/courses/${coursesId}/polls.json`
+			// axios.post(urlls,{
+			//     polls_name: "这是标题",
+			//     polls_description:"这是标题须知"
+			// }).then((result)=>{
+			//     console.log("创建问卷++++++")
+			//     console.log(result)
+			//    try {
+			//        if(result.data.status===0){
+			//            console.log("创建问卷")
+			//            console.log(JSON.stringify(result.data))
+			//        }
+			//    }catch (e) {
+			//
+			//    }
+			//
+			// })
+			//没有问卷
+			this.setState({
+				projects: [],
+				polls_name: "",
+				polls_description: "",
+				poll_questions: [],
+				question_types: [],
+				pollid: undefined,
+				mysingles: 0,
+				mydoubles: 0,
+				mymainsint: 0,
+				polls_nametest: "",
+				polls_descriptiontest: "",
+				coursesId: 0,
+				questionnair: false
+			})
+		} else {
+			const url = `/polls/${pollid}/edit.json`;
+			axios.get(url).then((result) => {
+				if (result !== undefined)
+
+				// console.log("有问卷~~~")
+				// if (result.status === 200) {
+				// console.log(JSON.stringify(result.data))
+					this.props.form.setFieldsValue({
+						polls_nametest: result.data.poll.polls_name,
+						polls_descriptiontest: result.data.poll.polls_description,
+					});
+				this.setState({
+					projects: result.data,
+					pollid: pollid,
+					polls_status: result.data.poll.polls_status,
+					polls_name: result.data.poll.polls_name,
+					polls_description: result.data.poll.polls_description,
+					poll_questions: result.data.poll_questions,
+					question_types: result.data.question_types,
+					mysingles: result.data.question_types.q_singles,
+					mydoubles: result.data.question_types.q_doubles,
+					mymainsint: result.data.question_types.q_mains,
+					polls_nametest: result.data.poll.polls_name,
+					polls_descriptiontest: result.data.poll.polls_description,
+					questionnair: true,
+				})
+				console.log(this.state.polls_nametest)
+				console.log(this.state.polls_descriptiontest)
+				// }
+			}).catch((error) => {
+				console.log(error)
+			})
+		}
+
+	}
+
+	//重新获取数据
+	thisinitializationdatanew = () => {
+		var pollidsy = null;
+		if (this.state.pollid !== undefined) {
+			pollidsy = this.state.pollid;
+			if (pollidsy === null || pollidsy === undefined) {
+				pollidsy = this.props.match.params.pollid;
+			}
+		}
+
+		if (pollidsy === null || pollidsy === undefined) {
+			return
+		}
+
+		const url = `/polls/${pollidsy}/edit.json`;
+		axios.get(url).then((result) => {
+			if (result !== undefined)
+
+			// console.log("有问卷~~~")
+			// if (result.status === 200) {
+			// console.log(JSON.stringify(result.data))
+				this.setState({
+					projects: result.data,
+					pollid: pollidsy,
+					polls_status: result.data.poll.polls_status,
+					polls_name: result.data.poll.polls_name,
+					polls_description: result.data.poll.polls_description,
+					poll_questions: result.data.poll_questions,
+					question_types: result.data.question_types,
+					mysingles: result.data.question_types.q_singles,
+					mydoubles: result.data.question_types.q_doubles,
+					mymainsint: result.data.question_types.q_mains,
+					polls_nametest: result.data.poll.polls_name,
+					polls_descriptiontest: result.data.poll.polls_description,
+					questionnair: true,
+				})
+
+			// }
+		}).catch((error) => {
+			console.log(error)
+		})
+	}
+	//新建问卷
+	newword = () => {
+		if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") {
+			this.props.showNotification(`请输入标题`);
+			return
+		}
+		let coursesId = this.props.match.params.coursesId;
+		const urlls = `/courses/${coursesId}/polls.json`
+		axios.post(urlls, {
+			polls_name: this.state.polls_nametest,
+			polls_description: this.state.polls_descriptiontest
+		}).then((result) => {
+			if (result.data.status === 0) {
+				this.state.Newedit === false;
+				// this.props.showNotification(`试卷创建成功`);
+				this.setState({
+					pollid: result.data.data.id,
+					Newedit: false,
+				})
+				this.props.history.push(`/courses/${this.props.match.params.coursesId}/polls/${result.data.data.id}/detail?tab=2`)
+			}
+		})
+	}
+	//添加单选题目
+	addmysingles = () => {
+
+		if (this.state.newoption === true) {
+			this.setState({
+				newoption: false
+			})
+		}
+
+		var Insertposition = this.state.poll_questions.length;
+		// console.log(JSON.stringify(this.state.poll_questions));
+		for (var i = 0; i < this.state.poll_questions.length; i++) {
+			if (this.state.poll_questions[i].question.question_type === 1) {
+				Insertposition = i;
+			}
+
+		}
+		this.addMytopic(1, this.state.pollid, Insertposition, false, 0);
+		// }
+	}
+
+	//添加多选题目
+	addmydoubles = () => {
+		console.log("addmymainsint 70")
+		if (this.state.newoption === true) {
+			this.setState({
+				newoption: false
+			})
+		}
+
+		var Insertposition = this.state.poll_questions.length;
+		// console.log(JSON.stringify(this.state.poll_questions));
+		for (var i = 0; i < this.state.poll_questions.length; i++) {
+			if (this.state.poll_questions[i].question.question_type === 2) {
+				Insertposition = i;
+			}
+
+
+		}
+		this.addMytopic(2, this.state.pollid, Insertposition, false, 0);
+
+		// }
+	}
+
+	//添加主观题目
+	addmymainsint = () => {
+
+		var Insertposition = this.state.poll_questions.length;
+		// console.log(JSON.stringify(this.state.poll_questions));
+		for (var i = 0; i < this.state.poll_questions.length; i++) {
+			if (this.state.poll_questions[i].question.question_type === 3) {
+				Insertposition = i;
+			}
+
+
+		}
+
+		this.addMytopic(3, this.state.pollid, Insertposition, false, 0);
+		// }
+	}
+
+	//编辑方法
+	adddomedit = (object) => {
+		console.log("adddomedit 76");
+		if (this.state.q_countst > 0) {
+			this.props.showNotification(`不能同时编辑两题`);
+
+			return;
+		}
+		var anserbool = false;
+		this.setState({
+			q_countst: 1,
+		})
+		window.scrollTo(0, this.refs.targetElement.offsetTop)
+		let {adddom} = this.state;
+		// var arr =new Object(objects);
+		// console.log(arr)
+		// adddom.push(arr);
+		var question = {};
+		var Insertposition = this.state.poll_questions.length;
+		if (object.question.question_type === 1) {
+			var answers = [];
+			var questiontwo = {};
+			///////////////////////////daying
+			for (var y = 0; y < object.question.answers.length; y++) {
+				var answerstwo;
+				if (object.question.answers[y].answer_text === "其他") {
+					answerstwo = {
+						"answer_id": object.question.answers[y].answer_id,
+						"answer_position": object.question.answers[y].answer_position,
+						"answer_text": object.question.answers[y].answer_text
+					}
+					anserbool = true;
+				} else {
+					answerstwo = {
+						"answer_id": object.question.answers[y].answer_id,
+						"answer_position": object.question.answers[y].answer_position,
+						"answer_text": object.question.answers[y].answer_text
+					}
+				}
+				answers.push(answerstwo);
+
+
+			}
+			// 插入单选题
+			questiontwo = {
+				// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
+				"id": object.question.id,
+				"is_necessary": object.question.is_necessary,
+				"question_number": 1,
+				"question_title": object.question.question_title,
+				"question_type": 1,
+				"new": "",
+				"answers": answers
+			};
+			question = {"question": questiontwo};
+			adddom.push(question);
+			for (var i = 0; i < this.state.poll_questions.length; i++) {
+				if (this.state.poll_questions[i].question.question_type === 1) {
+					Insertposition = i;
+				}
+			}
+		} else if (object.question.question_type === 2) {
+			//插入多选题
+			var answers = [];
+			var questiontwo = {};
+
+			for (var y = 0; y < object.question.answers.length; y++) {
+				if (object.question.answers[y].answer_text === "其他") {
+					answerstwo = {
+						"answer_id": object.question.answers[y].answer_id,
+						"answer_position": object.question.answers[y].answer_position,
+						"answer_text": object.question.answers[y].answer_text
+					}
+					anserbool = true;
+				} else {
+					answerstwo = {
+						"answer_id": object.question.answers[y].answer_id,
+						"answer_position": object.question.answers[y].answer_position,
+						"answer_text": object.question.answers[y].answer_text
+					}
+				}
+				answers.push(answerstwo);
+			}
+			questiontwo = {
+				"id": object.question.id,
+				"is_necessary": object.question.is_necessary,
+				"question_number": 2,
+				"question_title": object.question.question_title,
+				"question_type": 2,
+				"max_choices": object.question.max_choices,
+				"min_choices": object.question.min_choices,
+				"new": "",
+				"answers": answers
+			};
+			question = {"question": questiontwo};
+			adddom.push(question);
+			for (var i = 0; i < this.state.poll_questions.length; i++) {
+				if (this.state.poll_questions[i].question.question_type === 2) {
+					Insertposition = i;
+				}
+			}
+		} else if (object.question.question_type === 3) {
+			//插入主观题
+			var answers = [];
+			var questiontwo = {};
+
+			if (object.question.answers.length > 0) {
+				for (var y = 0; y < object.question.answers.length; y++) {
+					var answerstwo;
+					if (object.question.answers[y].answer_text === "其他") {
+						answerstwo = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+					} else {
+						answerstwo = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+					}
+					answers.push(answerstwo);
+				}
+			}
+			questiontwo = {
+				"id": object.question.id,
+				"is_necessary": object.question.is_necessary,
+				"question_number": 3,
+				"question_title": object.question.question_title,
+				"question_type": 3,
+				"new": "",
+				"answers": answers
+			};
+			question = {"question": questiontwo};
+			adddom.push(question);
+			for (var i = 0; i < this.state.poll_questions.length; i++) {
+				if (this.state.poll_questions[i].question.question_type === 3) {
+					Insertposition = i;
+				}
+			}
+		}
+		this.setState({
+			adddom: adddom,
+			newoption: anserbool,
+			Insertposition: Insertposition
+		})
+
+	}
+
+	//新增添加题目 有new
+	addMytopic = (index, pollid, Insertposition, Whether, id) => {
+		//Whether 是否插入
+		// console.log("id")
+		// console.log(id)
+		// console.log("Whether")
+		// console.log(Whether)
+		console.log("addMytopic 90")
+		if (this.state.q_countst > 0) {
+			this.props.showNotification(`不能同时编辑两题`);
+
+			return;
+		}
+		this.state.Insertposition = Insertposition;
+		var Whethername = null;
+		if (Whether === true) {
+			Whethername = id;
+		}
+		this.setState({
+			Insertposition: Insertposition,
+			q_countst: 1,
+		})
+		window.scrollTo(0, this.refs.targetElement.offsetTop)
+		var arrr = this.state.adddom;
+		let newarrr = [...arrr];
+
+		var arr = this.state.poll_questions;
+		let newarr = [...arr];
+
+		if (newarr.length > 0) {
+			if (index === 1) {
+				// 插入单选题
+				// console.log(this.state.poll_questions[newarr.length - 1].question.id);
+				var question = {}
+				var questiontwo = {
+					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
+					"id": this.state.poll_questions[newarr.length - 1].question.id + 1,
+					"is_necessary": 1,
+					"question_number": 1,
+					"question_title": "",
+					"question_type": 1,
+					"new": "new",
+					"answers": [
+						{"answer_id": 1, "answer_position": 1, "answer_text": ""},
+						{"answer_id": 2, "answer_position": 2, "answer_text": ""},
+						{"answer_id": 3, "answer_position": 3, "answer_text": ""},
+						{"answer_id": 4, "answer_position": 4, "answer_text": ""},
+						// {"answer_id": 5, "answer_position": 5, "answer_text": "其他"},
+					]
+				};
+				question = {"question": questiontwo};
+				newarrr.push(question);
+
+				this.setState({
+					adddom: newarrr,
+					problemtopic: Whethername,
+					problemtopicbool: Whether,
+				})
+
+			} else if (index === 2) {
+				//插入多选题
+				var question = {}
+				var questiontwo = {
+					"id": this.state.poll_questions[newarr.length - 1].question.id + 1,
+					"is_necessary": 1,
+					"question_number": 2,
+					"question_title": "",
+					"question_type": 2,
+					"max_choices": 0,
+					"min_choices": 0,
+					"new": "new",
+					"answers": [
+						{"answer_id": 1, "answer_position": 1, "answer_text": ""},
+						{"answer_id": 2, "answer_position": 2, "answer_text": ""},
+						{"answer_id": 3, "answer_position": 3, "answer_text": ""},
+						{"answer_id": 4, "answer_position": 4, "answer_text": ""},
+						// {"answer_id": 5, "answer_position": 5, "answer_text": "其他"},
+					]
+				};
+				question = {"question": questiontwo};
+				newarrr.push(question);
+
+				this.setState({
+					adddom: newarrr,
+					problemtopic: Whethername,
+					problemtopicbool: Whether,
+				})
+
+			} else if (index === 3) {
+				//插入主观题
+				// console.log(this.state.poll_questions[newarr.length - 1].question.id);
+				var question = {}
+				var questiontwo = {
+					"id": this.state.poll_questions[newarr.length - 1].question.id + 1,
+					"is_necessary": 1,
+					"question_number": 3,
+					"question_title": "",
+					"question_type": 3,
+					"new": "new",
+					"answers": []
+				};
+				question = {"question": questiontwo};
+				newarrr.push(question);
+				this.setState({
+					adddom: newarrr,
+					problemtopic: Whethername,
+					problemtopicbool: Whether,
+				})
+
+			}
+		} else {
+			/////上面视图全部删除后  要加载的
+			if (index === 1) {
+				// 插入单选题
+				var id;
+				try {
+					id = this.state.poll_questions[newarr.length - 1].question.id + 1
+				} catch (e) {
+					id = 1;
+				}
+				var questiontwo = {
+					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
+					"id": id,
+					"is_necessary": 1,
+					"question_number": 1,
+					"question_title": "",
+					"question_type": 1,
+					"new": "new",
+					"answers": [
+						{"answer_id": 1, "answer_position": 1, "answer_text": ""},
+						{"answer_id": 2, "answer_position": 2, "answer_text": ""},
+						{"answer_id": 3, "answer_position": 3, "answer_text": ""},
+						{"answer_id": 4, "answer_position": 4, "answer_text": ""},
+						// {"answer_id": 5, "answer_position": 5, "answer_text": "其他"},
+					]
+				};
+				question = {"question": questiontwo};
+				newarrr.push(question);
+
+				this.setState({
+					adddom: newarrr,
+					problemtopic: Whethername,
+					problemtopicbool: Whether,
+				})
+
+			} else if (index === 2) {
+				//插入多选题
+				var id;
+				try {
+					id = this.state.poll_questions[newarr.length - 1].question.id + 1
+				} catch (e) {
+					id = 1;
+				}
+				var questiontwo = {
+					"id": id,
+					"is_necessary": 1,
+					"question_number": 2,
+					"question_title": "",
+					"question_type": 2,
+					"max_choices": 0,
+					"min_choices": 0,
+					"new": "new",
+					"answers": [
+						{"answer_id": 1, "answer_position": 1, "answer_text": ""},
+						{"answer_id": 2, "answer_position": 2, "answer_text": ""},
+						{"answer_id": 3, "answer_position": 3, "answer_text": ""},
+						{"answer_id": 4, "answer_position": 4, "answer_text": ""},
+						// {"answer_id": 5, "answer_position": 5, "answer_text": "其他"},
+					]
+				};
+				question = {"question": questiontwo};
+				newarrr.push(question);
+
+				this.setState({
+					adddom: newarrr,
+					problemtopic: Whethername,
+					problemtopicbool: Whether,
+				})
+
+			} else if (index === 3) {
+				//插入主观题
+				var id;
+				try {
+					id = this.state.poll_questions[newarr.length - 1].question.id + 1
+				} catch (e) {
+					id = 1;
+				}
+				var questiontwo = {
+					"id": id,
+					"is_necessary": 1,
+					"question_number": 3,
+					"question_title": "",
+					"question_type": 3,
+					"new": "new",
+					"answers": []
+				};
+				question = {"question": questiontwo};
+				newarrr.push(question);
+				this.setState({
+					adddom: newarrr,
+					problemtopic: Whethername,
+					problemtopicbool: Whether,
+				})
+			}
+		}
+	}
+
+	//删除指定条目
+	deleteadddom = (indexo) => {
+		console.log("deleteadddom 259")
+		var arr = this.state.adddom;
+		let newarr = [...arr];
+
+		newarr.splice(indexo, 1);
+		this.setState({
+			adddom: newarr,
+			q_countst: 0,
+			problemtopic: null,
+			problemtopicbool: false,
+		})
+	}
+	//保存并继续
+	//保存并继续，即提交本题的新建并继续创建一个相同的题（该新题处于编辑模式，题目和选项不要清空）
+	deleteadddomtwo = (indexo, object) => {
+		var thiss = this;
+		this.setState({
+			q_countst: 1,
+		})
+		var poll_questionslength = this.state.poll_questions.length;
+		// console.log("deleteadddomtwo|||||||||||||||||||||||||||||||||||||||||\\");
+		// console.log(indexo);
+		// console.log(object);
+		// console.log(object.question.question_type);
+		let arr = this.state.adddom;
+		let arrpoll = this.state.poll_questions;
+		let newarr = [...arr];
+		let newarrpoll = [...arrpoll];
+
+		//选项内容不能为空
+		let max = 0;
+		let maxtie = newarr[indexo].question.answers.length;
+		for (var k = 0; k < newarr[indexo].question.answers.length; k++) {
+			try {
+				if (newarr[indexo].question.answers[k].answer_text != undefined) {
+					if (newarr[indexo].question.answers[k].answer_text === "") {
+						max = max + 1;
+					}
+				}
+			} catch (e) {
+				console.log("PollNew281")
+				console.log(e)
+			}
+		}
+		if (newarr[indexo].question.question_title === "") {
+			this.props.showNotification(`题目不能为空`);
+
+			return
+		}
+		if (max > 0) {
+			if (object.question.question_type === 1) {
+				this.props.showNotification(`选项内容不能为空`);
+
+				return
+			} else if (object.question.question_type === 2) {
+				this.props.showNotification(`选项内容不能为空`);
+
+				return
+			}
+
+		}
+		if (maxtie < 2) {
+			if (object.question.question_type === 1) {
+				this.props.showNotification(`选项不能少于2个!`);
+
+				return
+			} else if (object.question.question_type === 2) {
+				this.props.showNotification(`选项不能少于2个!`);
+
+				return
+			}
+
+
+		}
+
+		if (object.question.question_type === 2) {
+			if (object.question.max_choices > 0) {
+				if (object.question.min_choices < 2) {
+					this.props.showNotification(`可选最小不能少于2个`);
+
+					return;
+
+				}
+			}
+
+		}
+		if (object.question.new === "new") {
+			// 根据数组里面的new 来确定是否是新增还是 修改
+			//添加道数组上
+			//不能共用数组 所以自己写个新数组 然后push 上面卷子中
+			var question = {};
+			if (object.question.question_type === 1) {
+
+				var questiontwo = {};
+				var other = [];
+				var option = [];
+				var answerstwos = [];
+				var answerstwoss = [];
+				///////////////////////////daying
+				// 这个是装选项和其他的
+				for (var y = 0; y < object.question.answers.length; y++) {
+					if (object.question.answers[y].answer_text === "其他") {
+						var dataone = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						other.push(object.question.answers[y].answer_text);
+						answerstwos.push(dataone);
+					} else {
+						var datatwo = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						option.push(object.question.answers[y].answer_text)
+						answerstwoss.push(datatwo);
+					}
+
+
+				}
+
+				var arrc = option.concat(other);
+				var answers = answerstwoss.concat(answerstwos);
+				// 插入单选题
+				// var id
+				// try {
+				// 	id = newarrpoll[newarrpoll.length - 1].question.id + 1;
+				// } catch (e) {
+				// 	id = 1;
+				// }
+				questiontwo = {
+					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
+					"id": null,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 1,
+					"question_title": object.question.question_title,
+					"question_type": 1,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+				var insindex = null;
+				// if (poll_questionslength !== thiss.state.Insertposition) {
+				// 	insindex = newarrpoll[thiss.state.Insertposition].question.id;
+				// }
+				if (this.state.problemtopicbool === true) {
+					insindex = this.state.problemtopic;
+				}
+				this.createquestionsandanswers(object, 1, arrc, null, 0, 0, insindex);
+				// newarrpoll.push(question);
+				newarrpoll.splice(thiss.state.Insertposition, 0, question);
+
+			} else if (object.question.question_type === 2) {
+				//插入多选题
+				if (object.question.max_choices < object.question.min_choices) {
+					this.props.showNotification(`可选的最大限制不能小于最小限制`);
+
+					return;
+				}
+
+				var questiontwo = {};
+				var other = [];
+				var option = [];
+				var answerstwos = [];
+				var answerstwoss = [];
+				for (var y = 0; y < object.question.answers.length; y++) {
+					if (object.question.answers[y].answer_text === "其他") {
+						var dataone = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						other.push(object.question.answers[y].answer_text);
+						answerstwos.push(dataone);
+					} else {
+						var datatwo = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						option.push(object.question.answers[y].answer_text)
+						answerstwoss.push(datatwo);
+					}
+				}
+				var arrc = option.concat(other);
+				var answers = answerstwoss.concat(answerstwos);
+				// var id
+				// try {
+				// 	id = newarrpoll[newarrpoll.length - 1].question.id + 1;
+				// } catch (e) {
+				// 	id = 1;
+				// }
+				questiontwo = {
+					"id": null,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 2,
+					"question_title": object.question.question_title,
+					"question_type": 2,
+					"max_choices": object.question.max_choices,
+					"min_choices": object.question.min_choices,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+				var insindex = null;
+				if (this.state.problemtopicbool === true) {
+					insindex = this.state.problemtopic;
+				}
+				this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, insindex);
+				//插入多选题
+				// if (object.question.max_choices > arrc.length) {
+				//     // console.log("选择题的最大可选项不能大于选项数")
+				//     this.props.showNotification(`选择题的最大可选项不能大于选项数`);
+				//
+				//     return;
+				// }
+				// if (object.question.min_choices === 0) {
+				// 	// console.log("选择题的最大可选项不能小于2项目")
+				// 	this.props.showNotification(`选择题的最大可选项不能小于2项目`);
+				//
+				// 	return;
+				//
+				// }
+				// newarrpoll.push(question);
+				newarrpoll.splice(thiss.state.Insertposition, 0, question);
+			} else if (object.question.question_type === 3) {
+				//插入主观题
+				var answers = [];
+				var questiontwo = {};
+				var answerstwos = [];
+				var answerstwoss = [];
+				if (object.question.answers.length > 0) {
+					for (var y = 0; y < object.question.answers.length; y++) {
+						var answerstwo;
+						if (object.question.answers[y].answer_text === "其他") {
+							var dataone = {
+								"answer_id": object.question.answers[y].answer_id,
+								"answer_position": object.question.answers[y].answer_position,
+								"answer_text": object.question.answers[y].answer_text
+							}
+							answerstwos.push(dataone);
+						} else {
+							var datatwo = {
+								"answer_id": object.question.answers[y].answer_id,
+								"answer_position": object.question.answers[y].answer_position,
+								"answer_text": object.question.answers[y].answer_text
+							}
+							answerstwoss.push(datatwo);
+						}
+					}
+				}
+
+				answers = answerstwoss.concat(answerstwos);
+				// var id
+				// try {
+				// 	id = newarrpoll[newarrpoll.length - 1].question.id + 1;
+				// } catch (e) {
+				// 	id = 1;
+				// }
+				questiontwo = {
+					"id": null,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 3,
+					"question_title": object.question.question_title,
+					"question_type": 3,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+				// var insindex = null;
+				// if (poll_questionslength !== thiss.state.Insertposition) {
+				// 	insindex = newarrpoll[thiss.state.Insertposition].question.id;
+				// }
+				//主观题不需要可选选项
+				var insindex = null;
+				if (this.state.problemtopicbool === true) {
+					insindex = this.state.problemtopic;
+				}
+				this.createquestionsandanswers(object, 3, null, null, 0, 0, insindex);
+				// newarrpoll.push(question);
+				newarrpoll.splice(thiss.state.Insertposition, 0, question);
+			}
+			//////////////////////////////////////////////////////////////////////////////////////////////////// 上面是新增
+		} else {
+			///////////////////////////////////////////////////////////////////////////////////////////////////修改点了编辑
+			console.log("点了编辑")
+			var uuk = -1
+			//这个地方判断 点了编辑上面题目又把他删除了 保存的时候就只能是插入新增了
+			for (var uk = 0; uk < newarrpoll.length; uk++) {
+				if (object.question.id === newarrpoll[uk].question.id) {
+					uuk = uk;
+				}
+			}
+
+
+			var question = {};
+			if (object.question.question_type === 1) {
+				var questiontwo = {};
+				var other = [];
+				var option = [];
+				var answerstwos = [];
+				var answerstwoss = [];
+				///////////////////////////daying
+				//这个装选项和其他的
+				for (var y = 0; y < object.question.answers.length; y++) {
+					if (object.question.answers[y].answer_text === "其他") {
+						var dataone = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						other.push(object.question.answers[y].answer_text);
+						answerstwos.push(dataone);
+					} else {
+						var datatwo = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						option.push(object.question.answers[y].answer_text)
+						answerstwoss.push(datatwo);
+					}
+
+
+				}
+				var arrc = option.concat(other);
+				var answers = answerstwoss.concat(answerstwos);
+				// 插入单选题
+				questiontwo = {
+					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
+					"id": object.question.id,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 1,
+					"question_title": object.question.question_title,
+					"question_type": 1,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+				if (uuk !== -1) {
+					// console.log("修改")
+					this.edittotheserver(object, 1, arrc, null, 0, 0);
+					newarrpoll.splice(uuk, 1, question);
+				} else {
+					// console.log("他原来的删除掉了")
+					this.createquestionsandanswers(object, 1, arrc, null, 0, 0, object.question.id);
+					newarrpoll.push(question);
+				}
+				newarr[indexo].question.new = "new"
+				// console.log(newarrpoll)
+			} else if (object.question.question_type === 2) {
+				//插入多选题
+
+				if (object.question.max_choices < object.question.min_choices) {
+					this.props.showNotification('可选的最大限制不能小于最小限制！');
+
+					return;
+				}
+				var questiontwo = {};
+				var other = [];
+				var option = [];
+				var answerstwos = [];
+				var answerstwoss = [];
+				for (var y = 0; y < object.question.answers.length; y++) {
+					if (object.question.answers[y].answer_text === "其他") {
+						var dataone = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						other.push(object.question.answers[y].answer_text);
+						answerstwos.push(dataone);
+					} else {
+						var datatwo = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						option.push(object.question.answers[y].answer_text)
+						answerstwoss.push(datatwo);
+					}
+				}
+				var arrc = option.concat(other);
+				var answers = answerstwoss.concat(answerstwos);
+				questiontwo = {
+					"id": object.question.id,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 2,
+					"question_title": object.question.question_title,
+					"question_type": 2,
+					"max_choices": object.question.max_choices,
+					"min_choices": object.question.min_choices,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+				//插入多选题
+				// if (object.question.max_choices > arrc.length) {
+				//     // console.log("选择题的最大可选项不能大于答案数")
+				//     this.props.showNotification('选择题的最大可选项不能大于选项数！');
+				//
+				//     return;
+				// }
+				// if (object.question.min_choices === 0) {
+				// 	// console.log("选择题的最大可选项不能小于2项目")
+				// 	this.props.showNotification('选择题的最大可选项不能小于2项目！');
+				//
+				// 	return;
+				//
+				// }
+				if (uuk !== -1) {
+					console.log("修改")
+					this.edittotheserver(object, 2, arrc, null, object.question.max_choices, object.question.min_choices);
+					newarrpoll.splice(uuk, 1, question);
+				} else {
+					console.log("删除")
+					this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, object.question.id);
+					newarrpoll.push(question);
+				}
+				console.log(newarrpoll)
+				newarr[indexo].question.new = "new"
+			} else if (object.question.question_type === 3) {
+				//插入主观题
+				var answers = [];
+				var questiontwo = {};
+
+				if (object.question.answers.length > 0) {
+					for (var y = 0; y < object.question.answers.length; y++) {
+						var answerstwo;
+						if (object.question.answers[y].answer_text === "其他") {
+							answerstwo = {
+								"answer_id": object.question.answers[y].answer_id,
+								"answer_position": object.question.answers[y].answer_position,
+								"answer_text": object.question.answers[y].answer_text
+							}
+						} else {
+							answerstwo = {
+								"answer_id": object.question.answers[y].answer_id,
+								"answer_position": object.question.answers[y].answer_position,
+								"answer_text": object.question.answers[y].answer_text
+							}
+						}
+						answers.push(answerstwo);
+					}
+				}
+				questiontwo = {
+					"id": object.question.id,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 3,
+					"question_title": object.question.question_title,
+					"question_type": 3,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+
+				if (uuk !== -1) {
+					console.log("修改")
+					this.edittotheserver(object, 3, null, null, 0, 0);
+					newarrpoll.splice(uuk, 1, question);
+				} else {
+					console.log("删除")
+					this.createquestionsandanswers(object, 3, null, null, 0, 0, object.question.id);
+					newarrpoll.push(question);
+				}
+				console.log(newarrpoll)
+				newarr[indexo].question.new = "new"
+			}
+
+		}
+
+
+		//添加到上面列表中
+		//改变题目总数
+		if (object.question.question_type === 1) {
+			//单选题
+			this.state.mysingles = this.state.mysingles + 1;
+		} else if (object.question.question_type === 2) {
+			//多选题
+			this.state.mydoubles = this.state.mydoubles + 1;
+		} else if (object.question.question_type === 3) {
+			//主观题
+			this.state.mymainsint = this.state.mymainsint + 1;
+
+		}
+		this.setState({
+			// poll_questions: newarrpoll,
+			adddom: newarr,
+			problemtopic: null,
+			problemtopicbool: false,
+			// mysingles: this.state.mysingles,
+			// mydoubles: this.state.mydoubles,
+			// mymainsint: this.state.mymainsint
+		})
+
+	}
+
+
+	//保存 后期可以考虑和保存并继续 合并
+	//保存，即完成新建并退出本题编辑
+	// indexo 第几个数组
+	//object 单个数组数据
+	deleteadddomthree = (indexo, object) => {
+		// console.log("deleteadddom 349")
+		var thiss = this;
+		let arr = this.state.adddom;
+		let arrpoll = this.state.poll_questions;
+		let newarr = [...arr];
+		let newarrpoll = [...arrpoll];
+		var poll_questionslength = this.state.poll_questions.length; //获取单前问题最大长度
+		//选项内容不能为空
+		let max = 0;
+		let maxtie = newarr[indexo].question.answers.length;
+		//判断选项值是否不为空
+		for (var k = 0; k < newarr[indexo].question.answers.length; k++) {
+			try {
+				if (newarr[indexo].question.answers[k].answer_text != undefined) {
+					if (newarr[indexo].question.answers[k].answer_text === "") {
+						max = max + 1;
+					}
+				}
+			} catch (e) {
+				// console.log("PollNew281")
+				// console.log(e)
+			}
+		}
+		if (newarr[indexo].question.question_title === "") {
+			this.props.showNotification('题目不能为空！');
+			return
+		}
+		if (max > 0) {
+			if (object.question.question_type === 1) {
+				this.props.showNotification('选项内容不能为空！');
+				return
+			} else if (object.question.question_type === 2) {
+				this.props.showNotification('选项内容不能为空！');
+				return
+			}
+
+		}
+		if (maxtie < 2) {
+			if (object.question.question_type === 1) {
+				this.props.showNotification('选项不能少于2个!');
+				return
+			} else if (object.question.question_type === 2) {
+				this.props.showNotification('选项不能少于2个!');
+				return
+			}
+
+
+		}
+
+		if (object.question.question_type === 2) {
+			if (object.question.max_choices > 0) {
+				if (object.question.min_choices < 2) {
+					this.props.showNotification(`可选最小不能少于2个`);
+					return;
+				}
+			}
+		}
+		if (object.question.new === "new") {
+			///////////////////////////////////////////////////////////////////新增模式
+			// 根据数组里面的new 来确定是否是新增还是 修改
+			//添加道数组上
+			//不能共用数组 所以自己写个新数组 然后push 上面卷子中
+			var question = {};
+			if (object.question.question_type === 1) {
+				var questiontwo = {};
+				var other = [];
+				var option = [];
+				var answerstwos = [];
+				var answerstwoss = [];
+				///////////////////////////daying
+				// 这个是装选项和其他的
+				for (var y = 0; y < object.question.answers.length; y++) {
+					if (object.question.answers[y].answer_text === "其他") {
+						var dataone = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						other.push(object.question.answers[y].answer_text);
+						answerstwos.push(dataone);
+					} else {
+						var datatwo = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						option.push(object.question.answers[y].answer_text)
+						answerstwoss.push(datatwo);
+					}
+				}
+				var arrc = option.concat(other);
+				var answers = answerstwoss.concat(answerstwos);
+				// 插入单选题'
+				// var id;
+				// try {
+				// 	id = newarrpoll[newarrpoll.length - 1].question.id + 1
+				// } catch (e) {
+				// 	id = 1;
+				// }
+				questiontwo = {
+					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
+					"id": null,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 1,
+					"question_title": object.question.question_title,
+					"question_type": 1,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+				//获取指定id 号 用来插入，如果不是就是在最后添加
+
+				//执行新增操作
+				var insindex = null;
+				if (this.state.problemtopicbool === true) {
+					insindex = this.state.problemtopic;
+				}
+				this.createquestionsandanswers(object, 1, arrc, null, 0, 0, insindex);
+				newarrpoll.splice(thiss.state.Insertposition, 0, question);
+			} else if (object.question.question_type === 2) {
+				//插入多选题
+				if (object.question.max_choices < object.question.min_choices) {
+					this.props.showNotification(`可选的最大限制不能小于最小限制`);
+
+					return;
+				}
+
+				var questiontwo = {};
+				var other = [];
+				var option = [];
+				var answerstwos = [];
+				var answerstwoss = [];
+				for (var y = 0; y < object.question.answers.length; y++) {
+					if (object.question.answers[y].answer_text === "其他") {
+						var dataone = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						other.push(object.question.answers[y].answer_text);
+						answerstwos.push(dataone);
+					} else {
+						var datatwo = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						option.push(object.question.answers[y].answer_text)
+						answerstwoss.push(datatwo);
+					}
+				}
+				var arrc = option.concat(other);
+				var answers = answerstwoss.concat(answerstwos);
+
+				questiontwo = {
+					"id": null,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 2,
+					"question_title": object.question.question_title,
+					"question_type": 2,
+					"max_choices": object.question.max_choices,
+					"min_choices": object.question.min_choices,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+
+				var insindex = null;
+				if (this.state.problemtopicbool === true) {
+					insindex = this.state.problemtopic;
+				}
+				this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, insindex);
+				//插入多选题
+				// if (object.question.max_choices > arrc.length) {
+
+				newarrpoll.splice(thiss.state.Insertposition, 0, question);
+			} else if (object.question.question_type === 3) {
+				//插入主观题
+				var answers = [];
+				var questiontwo = {};
+				var answerstwos = [];
+				var answerstwoss = [];
+				if (object.question.answers.length > 0) {
+					for (var y = 0; y < object.question.answers.length; y++) {
+						if (object.question.answers[y].answer_text === "其他") {
+							var dataone = {
+								"answer_id": object.question.answers[y].answer_id,
+								"answer_position": object.question.answers[y].answer_position,
+								"answer_text": object.question.answers[y].answer_text
+							}
+							answerstwos.push(dataone);
+						} else {
+							var datatwo = {
+								"answer_id": object.question.answers[y].answer_id,
+								"answer_position": object.question.answers[y].answer_position,
+								"answer_text": object.question.answers[y].answer_text
+							}
+							answerstwoss.push(datatwo);
+						}
+					}
+				}
+				answers = answerstwoss.concat(answerstwos);
+
+				questiontwo = {
+					"id": null,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 3,
+					"question_title": object.question.question_title,
+					"question_type": 3,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+				//主观题不需要可选选项
+
+				var insindex = null;
+				if (this.state.problemtopicbool === true) {
+					insindex = this.state.problemtopic;
+				}
+				this.createquestionsandanswers(object, 3, null, null, 0, 0, insindex);
+				// newarrpoll.push(question);
+				newarrpoll.splice(thiss.state.Insertposition, 0, question);
+			}
+			///////////////////////////////////////////////////////////////////新增模式
+		} else {
+			//////////////////////////////////////////////////////////////////////////////修改模式
+			//修改
+			var uuk = -1
+			for (var uk = 0; uk < newarrpoll.length; uk++) {
+				if (object.question.id === newarrpoll[uk].question.id) {
+					uuk = uk;
+					console.log("删除了数据=-09876543234567890-111111111111")
+				}
+			}
+
+
+			var question = {};
+			if (object.question.question_type === 1) {
+				var questiontwo = {};
+				var other = [];
+				var option = [];
+				var answerstwos = [];
+				var answerstwoss = [];
+				///////////////////////////daying
+				//这个装选项和其他的
+				for (var y = 0; y < object.question.answers.length; y++) {
+					if (object.question.answers[y].answer_text === "其他") {
+						var dataone = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						other.push(object.question.answers[y].answer_text);
+						answerstwos.push(dataone);
+					} else {
+						var datatwo = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						option.push(object.question.answers[y].answer_text)
+						answerstwoss.push(datatwo);
+					}
+				}
+				var arrc = option.concat(other);
+				var answers = answerstwoss.concat(answerstwos);
+				// 插入单选题
+				questiontwo = {
+					// "id": this.state.poll_questions[arr.length - 1].question.id + 1 + arrr.length,
+					"id": object.question.id,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 1,
+					"question_title": object.question.question_title,
+					"question_type": 1,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+				if (uuk !== -1) {
+					console.log("修改")
+					this.edittotheserver(object, 1, arrc, null, 0, 0);
+					newarrpoll.splice(uuk, 1, question);
+				} else {
+					console.log("删除")
+					this.createquestionsandanswers(object, 1, arrc, null, 0, 0, object.question.id);
+					newarrpoll.push(question);
+				}
+				console.log(newarrpoll)
+			} else if (object.question.question_type === 2) {
+				//插入多选题
+				if (object.question.max_choices < object.question.min_choices) {
+					this.props.showNotification(`可选的最大限制不能小于最小限制`);
+
+					return;
+				}
+				var questiontwo = {};
+				var other = [];
+				var option = [];
+				var answerstwos = [];
+				var answerstwoss = [];
+				for (var y = 0; y < object.question.answers.length; y++) {
+					if (object.question.answers[y].answer_text === "其他") {
+						var dataone = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						other.push(object.question.answers[y].answer_text);
+						answerstwos.push(dataone);
+					} else {
+						var datatwo = {
+							"answer_id": object.question.answers[y].answer_id,
+							"answer_position": object.question.answers[y].answer_position,
+							"answer_text": object.question.answers[y].answer_text
+						}
+						option.push(object.question.answers[y].answer_text)
+						answerstwoss.push(datatwo);
+					}
+				}
+				var arrc = option.concat(other);
+				var answers = answerstwoss.concat(answerstwos);
+				questiontwo = {
+					"id": object.question.id,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 2,
+					"question_title": object.question.question_title,
+					"question_type": 2,
+					"max_choices": object.question.max_choices,
+					"min_choices": object.question.min_choices,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+				//插入多选题
+				if (uuk !== -1) {
+					console.log("修改")
+					this.edittotheserver(object, 2, arrc, null, object.question.max_choices, object.question.min_choices);
+					newarrpoll.splice(uuk, 1, question);
+				} else {
+					console.log("删除")
+					this.createquestionsandanswers(object, 2, arrc, null, object.question.max_choices, object.question.min_choices, object.question.id);
+					newarrpoll.push(question);
+				}
+				console.log(newarrpoll)
+
+			} else if (object.question.question_type === 3) {
+				//插入主观题
+				var answers = [];
+				var questiontwo = {};
+
+				if (object.question.answers.length > 0) {
+					for (var y = 0; y < object.question.answers.length; y++) {
+						var answerstwo;
+						if (object.question.answers[y].answer_text === "其他") {
+							answerstwo = {
+								"answer_id": object.question.answers[y].answer_id,
+								"answer_position": object.question.answers[y].answer_position,
+								"answer_text": object.question.answers[y].answer_text
+							}
+						} else {
+							answerstwo = {
+								"answer_id": object.question.answers[y].answer_id,
+								"answer_position": object.question.answers[y].answer_position,
+								"answer_text": object.question.answers[y].answer_text
+							}
+						}
+						answers.push(answerstwo);
+					}
+				}
+				questiontwo = {
+					"id": object.question.id,
+					"is_necessary": object.question.is_necessary,
+					"question_number": 3,
+					"question_title": object.question.question_title,
+					"question_type": 3,
+					"new": "",
+					"answers": answers
+				};
+				question = {"question": questiontwo};
+				if (uuk !== -1) {
+					console.log("修改")
+					this.edittotheserver(object, 3, null, null, 0, 0);
+					newarrpoll.splice(uuk, 1, question);
+				} else {
+					console.log("删除")
+					this.createquestionsandanswers(object, 3, null, null, 0, 0, object.question.id);
+					newarrpoll.push(question);
+				}
+				console.log(newarrpoll)
+
+			}
+
+		}
+
+
+		//添加到上面列表中
+		//改变题目总数
+		if (object.question.question_type === 1) {
+			//单选题
+			this.state.mysingles = this.state.mysingles + 1;
+		} else if (object.question.question_type === 2) {
+			//多选题
+			this.state.mydoubles = this.state.mydoubles + 1;
+		} else if (object.question.question_type === 3) {
+			//主观题
+			this.state.mymainsint = this.state.mymainsint + 1;
+
+		}
+
+		//这里更新数据
+		if (this.state.q_countst == 1) {
+			this.setState({
+				q_countst: 0,
+			})
+		}
+		this.deleteadddom(indexo);
+		// console.log(indexo)
+	}
+
+
+	////新增到服务器中
+	createquestionsandanswers = (object, number, option, other, max_choices, min_choices, insert_id) => {
+		var thiss = this;
+		var poll_id = this.state.pollid;
+		var urlly = `/polls/${poll_id}/poll_questions.json`
+		var max_choicess = null;
+		var min_choicess = null;
+		if (max_choices === 0 && min_choices === 0) {
+			max_choicess = null;
+			min_choicess = null;
+		} else {
+			max_choicess = max_choices;
+			min_choicess = min_choices;
+		}
+		axios.post(urlly, {
+			question_title: object.question.question_title,
+			question_type: number,
+			is_necessary: object.question.is_necessary,
+			max_choices: max_choicess,
+			min_choices: min_choicess,
+			question_answers: option,
+			question_other_answer: null,
+			insert_id: insert_id
+		}).then((result) => {
+			// try {
+			if (result !== undefined) {
+				if (result.data.status === 0) {
+					this.props.showNotification(`已完成`);
+					thiss.thisinitializationdatanew();
+					// console.log("确认创建问题")
+					// console.log(result)
+					// try {
+					//     if (result.data.status === 0) {
+					//         console.log("确认创建问题")
+					//         console.log(JSON.stringify(result.data))
+					//     }
+					// } catch (e) {
+					//
+					// }
+				}
+			}
+			// } catch (e) {
+			//
+			// }
+
+		})
+
+
+	}
+	///编辑修改到服务器当中
+	edittotheserver = (object, number, option, other, max_choices, min_choices) => {
+		console.log("调用了edittotheserver")
+		var url = `/poll_questions/${object.question.id}.json`
+		var thiss = this;
+		axios.put(url, {
+			// debug: true,
+			question_title: object.question.question_title,
+			question_type: number,
+			is_necessary: object.question.is_necessary,
+			max_choices: max_choices,
+			min_choices: min_choices,
+			question_answers: option,
+			question_other_answer: null,
+		}).then((result) => {
+			try {
+				if (result.data.status === 0) {
+					this.props.showNotification(`编辑题目成功`);
+					thiss.thisinitializationdatanew();
+				}
+			} catch (e) {
+				// console.log("调用了edittotheserver")
+				console.log(e)
+			}
+		})
+	}
+
+	//删除到服务器当中
+	eletetoserver = (pollid, newarr, type, index) => {
+		console.log("调用了eletetoserver")
+		var id = pollid;
+		var url = `/poll_questions/${id}.json`
+		let {mysingles, mydoubles, mymainsint} = this.state
+		var thiss = this;
+
+		axios
+			.delete(url, {})
+			.then(function (response) {
+				console.log(response)
+				if (response === undefined) {
+					return;
+				}
+				if (response.data.message === "删除成功") {
+					thiss.props.showNotification(`删除成功`);
+
+					newarr.splice(index, 1);
+					if (type === 1) {
+						mysingles = mysingles - 1;
+					} else if (type === 2) {
+						mydoubles = mydoubles - 1;
+
+					} else if (type === 3) {
+						mymainsint = mymainsint - 1;
+
+					}
+					// thiss.setState({
+					//     poll_questions: newarr,
+					//     mysingles: mysingles,
+					//     mydoubles: mydoubles,
+					//     mymainsint: mymainsint
+					// });
+					thiss.thisinitializationdatanew();
+				}
+			})
+	}
+
+	//上下移到服务器中
+	Upanddownmovementof = (bool, poll_question_id) => {
+		// console.log("调用了Upanddownmovementofr")
+		// console.log(poll_question_id)
+		var thiss = this;
+		if (bool === true) {
+			var url = `/poll_questions/${poll_question_id}/up_down.json`;
+			axios.post(url, {
+				opr: "up",
+			}).then((result) => {
+				try {
+					if (result.data.status === 0) {
+						this.props.showNotification(`上移成功`);
+						thiss.thisinitializationdatanew();
+					}
+					// console.log(JSON.stringify(result))
+				} catch (e) {
+					console.log("上移题目成功 错误")
+					console.log(e)
+				}
+
+			})
+		} else {
+			var url = `/poll_questions/${poll_question_id}/up_down.json`;
+			axios.post(url, {
+				opr: "down",
+			}).then((result) => {
+				try {
+					if (result.data.status === 0) {
+						// message.success("下移题目成功", 1)
+						this.props.showNotification(`下移成功`);
+						thiss.thisinitializationdatanew();
+					}
+					// console.log(JSON.stringify(result))
+				} catch (e) {
+					console.log("下移题目成功 错误")
+					console.log(e)
+				}
+			})
+		}
+
+	}
+
+	//删除编辑新增条目
+	//id 条目的唯一id
+	//i 为要删除的子条目
+	deleteentrys = (id, i, stirngname) => {
+		console.log(id)
+		console.log(stirngname);
+		var arrtwoy = this.state.adddom;
+		let newarrtwoy = [...arrtwoy];
+		for (var k = 0; k < newarrtwoy.length; k++) {
+			if (newarrtwoy[k] != undefined) {
+				if (newarrtwoy[k].question.id === id) {
+					for (var c = 0; c < newarrtwoy[k].question.answers.length; c++) {
+						if (c === i) {
+							// console.log("删除了")
+							// console.log(c)
+							newarrtwoy[k].question.answers.splice(c, 1);
+						}
+					}
+				}
+			}
+		}
+		if (stirngname === true) {
+			console.log(stirngname);
+			this.setState({
+				newoption: false,
+				adddom: newarrtwoy,
+
+			})
+		} else {
+			console.log(stirngname);
+			this.setState({
+				adddom: newarrtwoy,
+			});
+		}
+
+
+	}
+
+
+	//  新增选项
+	ewoption = (id, object) => {
+		console.log("ewoption 440")
+		console.log("是否是新建题目还是编辑")
+		// console.log(object.question.new)
+
+
+		let arrtwo = this.state.adddom;
+		let newarrtwo = [...arrtwo];
+
+
+		for (var k = 0; k < newarrtwo.length; k++) {
+			// console.log(arrtwo[k].question.id);
+			if (newarrtwo[k] != undefined) {
+				if (newarrtwo[k].question.id === id) {
+					var data = {
+						"answer_id": newarrtwo[k].question.answers.length + 1,
+						"answer_position": newarrtwo[k].question.answers.length + 1,
+						"answer_text": ""
+					};
+					//向头部添加元素
+					// newarrtwo[k].question.answers.unshift(data);
+					//如果有其他这一项就删除掉
+					if (newarrtwo[k].question.answers.length > 0) {
+						for (var o = 0; o < newarrtwo[k].question.answers.length; o++) {
+							if (newarrtwo[k].question.answers[o].answer_text != undefined) {
+								if (newarrtwo[k].question.answers[o].answer_text === "其他") {
+									newarrtwo[k].question.answers.splice(o, 0, data);
+									this.setState({
+										adddom: newarrtwo
+									})
+									return
+								} else {
+									if (o === newarrtwo[k].question.answers.length - 1) {
+										newarrtwo[k].question.answers.push(data);
+										this.setState({
+											adddom: newarrtwo
+										})
+										return
+									}
+								}
+							}
+						}
+					} else {
+						newarrtwo[k].question.answers.push(data);
+						this.setState({
+							adddom: newarrtwo
+						})
+					}
+
+				}
+			}
+		}
+
+	}
+
+
+	swapArray = (arr, index1, index2) => {
+		arr[index1] = arr.splice(index2, 1, arr[index1])[0];
+		return arr;
+	}
+
+	//新增其他选项
+	addanotheroption = (id) => {
+		console.log("addanotheroption 457")
+		let arrtwo = this.state.adddom;
+		let newarrtwo = [...arrtwo];
+		console.log(newarrtwo)
+		for (var k = 0; k < newarrtwo.length; k++) {
+			if (newarrtwo[k] != undefined) {
+				if (newarrtwo[k].question.id === id) {
+					var data = {
+						"answer_id": newarrtwo[k].question.answers.length + 1,
+						"answer_position": newarrtwo[k].question.answers.length + 1,
+						"answer_text": "其他"
+					};
+					newarrtwo[k].question.answers.push(data);
+				}
+			}
+		}
+		this.setState({
+			adddom: newarrtwo,
+			newoption: true,
+		})
+	}
+
+
+	//点击向上排序按钮事件
+	handleClickBySortUp = (index, object) => {
+		console.log("handleClickBySortUp 521")
+		let arr = this.state.poll_questions;
+		let newarr = [...arr];
+		console.log(newarr)
+		if (index != 0) {
+			this.Upanddownmovementof(true, object.question.id);
+			let temp = newarr[index - 1];
+			newarr[index - 1] = newarr[index];
+			newarr[index] = temp;
+			this.setState({
+				poll_questions: newarr,
+			});
+		}
+	}
+
+	//点击向下排序按钮事件
+	handleClickBySortDown = (index, object) => {
+		console.log("handleClickBySortDown 536")
+		let arr = this.state.poll_questions;
+		let newarr = [...arr];
+		//
+		if (index != newarr.length - 1) {
+			this.Upanddownmovementof(false, object.question.id);
+			let temp = newarr[index + 1];
+			newarr[index + 1] = newarr[index];
+			newarr[index] = temp;
+			this.setState({
+				poll_questions: newarr,
+			});
+		} else {
+			console.log("2222index==arr.length");
+			console.log(this.state.poll_questions);
+		}
+	}
+
+	//点击删除按钮事件
+	handleClickByDelete = (type, index, object) => {
+		console.log("handleClickByDelete 556")
+		console.log("object.question.id")
+		console.log(object.question.id)
+		let arr = this.state.poll_questions;
+		let newarr = [...arr];
+		this.eletetoserver(object.question.id, newarr, type, index)
+
+	}
+
+	// 数字输入监听
+	//e为获取组件对象
+	//i外层数组
+	//k为内层数组
+	handleInputChanges = (e, i, k) => {
+		console.log("handleInputChanges 612")
+
+		let value = e.target.value;//取到input的数据
+		console.log("handleInputChanges value is  :" + value);
+		console.log(k);
+		let arr = this.state.adddom;
+		let newarr = [...arr];
+
+		newarr[i].question.answers[k].answer_text = value
+		this.setState({
+			adddom: newarr
+		})
+
+	}
+
+	//标题输入监听
+	handleInputTopic = (e, i) => {
+		console.log("handleInputTopic 633")
+
+		let value = e.target.value;//取到input的数据
+		console.log("handleInputTopic value is  :" + value);
+		console.log(i);
+		let arr = this.state.adddom;
+		let newarr = [...arr];
+		newarr[i].question.question_title = value
+		this.setState({
+			adddom: newarr
+		})
+	}
+
+	//最小值
+	handleGradationGroupChangee = (value, index, max, length) => {
+
+		debugger
+		var minbool = false;
+		var maxbool = false;
+		let arr = this.state.adddom;
+		if (parseInt(value) === 0 || parseInt(value) === "0" || parseInt(value) === null || parseInt(value) === undefined || parseInt(value) < 1) {
+			minbool = true;
+		}
+		if (max === 0 || max === "0" || max === null || max === undefined) {
+			maxbool = true;
+		}
+
+		if (minbool === true && maxbool === true) {
+			for (var i = 0; i < arr.length; i++) {
+				if (index === i) {
+					arr[i].question.min_choices = parseInt(value);
+				}
+			}
+			this.setState({
+				adddom: arr
+			})
+		} else {
+			for (var i = 0; i < arr.length; i++) {
+				if (index === i) {
+					arr[i].question.min_choices = parseInt(value);
+					arr[i].question.max_choices = length;
+				}
+			}
+			this.setState({
+				adddom: arr
+			})
+		}
+
+	}
+
+	//最大值
+	handleGradationGroupChangeee = (value, index) => {
+
+		let arr = this.state.adddom;
+		for (var i = 0; i < arr.length; i++) {
+			if (index === i) {
+				arr[i].question.max_choices = parseInt(value);
+			}
+		}
+		this.setState({
+			adddom: arr
+		})
+		// console.log(this.state.adddom);
+	}
+
+	//提交题目//没有就创建新的题库，新建问题和保存题目不一样不能同时保存 这里只是新建 和编辑 标题和须知
+	submitQuestionnaire = () => {
+		console.log("调用了submitQuestionnaire")
+		if (this.state.Newedit === true) {
+
+			this.newword();
+
+		} else {
+			if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") {
+				this.props.showNotification("请输入标题");
+				return
+			}
+
+			if (this.state.polls_descriptiontest.length > 100) {
+
+			}
+			var pollid;
+			if (this.state.pollid === undefined) {
+				pollid = this.props.match.params.pollid;
+			} else {
+				pollid = this.state.pollid;
+			}
+
+
+			var url = `/polls/${pollid}.json`;
+			axios.put(url, {
+				polls_name: this.state.polls_nametest,
+				polls_description: this.state.polls_descriptiontest
+			}).then((result) => {
+				try {
+					// console.log(JSON.stringify(result))
+					if (result.data.status === 0) {
+						// console.log("更新题目成功")
+						// this.props.showNotification("保存成功");
+						this.props.history.push(`/courses/${this.props.match.params.coursesId}/polls/${pollid}/detail?tab=2`)
+					}
+				} catch (e) {
+
+				}
+			})
+		}
+	}
+
+	cancelmodel = () => {
+
+		this.setState({
+			Modalstype: false,
+			Modalstopval: "",
+			ModalsBottomval: "",
+		})
+
+	}
+	savedelete = (question_type, index, item) => {
+		console.log("savedelete");
+		this.handleClickByDelete(question_type, index, item);
+		this.setState({
+			Modalstype: false,
+			Modalstopval: "",
+			ModalsBottomval: "",
+		})
+	}
+	// 问题的类型，1单选题，2为多选题，3为主观题
+	showDeleteConfirm = (question_type, index, item) => {
+		this.setState({
+			Modalstype: true,
+			Modalstopval: "是否确认删除？",
+			ModalsBottomval: "",
+			ModalCancel: this.cancelmodel,
+			ModalSave: () => this.savedelete(question_type, index, item),
+		})
+
+	}
+	//必答选项
+	onCheckAllChange = (e, index) => {
+		console.log("onCheckAllChange");
+		console.log(e.target.checked);
+		// console.log(e.target.value);
+		let arr = this.state.adddom;
+		for (var i = 0; i < arr.length; i++) {
+			if (index === i) {
+				if (e.target.checked === true) {
+					arr[i].question.is_necessary = 1;
+
+				} else {
+					arr[i].question.is_necessary = 0;
+				}
+			}
+		}
+		this.setState({
+			adddom: arr
+		})
+	}
+
+	//重新编辑标题和须知
+	adddomeditit = () => {
+		if (this.state.mysave === true) {
+			this.setState({
+				mysave: false,
+				readOnlys: "readOnly",
+				storagedesc:this.state.polls_nametest,
+				storagedesctwo:this.state.polls_descriptiontest,
+			})
+		} else if (this.state.mysave === false) {
+			this.setState({
+				mysave: true,
+				readOnlys: "",
+				storagedesc:this.state.polls_nametest,
+				storagedesctwo:this.state.polls_descriptiontest,
+			})
+		}
+	}
+	//取消保存
+	onSaveExercisetwo = () => {
+		if (this.state.mysave === true) {
+			this.setState({
+				mysave: false,
+				Newedit: false,
+				readOnlys: "readOnly",
+				polls_nametest:this.state.storagedesc,
+				polls_descriptiontest:this.state.storagedesctwo,
+			})
+		} else {
+			this.setState({
+				mysave: false,
+				Newedit: false,
+				readOnlys: "readOnly",
+				polls_nametest:this.state.storagedesc,
+				polls_descriptiontest:this.state.storagedesctwo,
+			})
+		}
+	}
+	// 创建问卷
+	onSaveExercise = () => {
+		if (this.state.Newedit === true) {
+
+			if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") {
+				this.props.showNotification(`请输入标题`);
+				return
+			}
+			let coursesId = this.props.match.params.coursesId;
+			const urlls = `/courses/${coursesId}/polls.json`
+			axios.post(urlls, {
+				polls_name: this.state.polls_nametest,
+				polls_description: this.state.polls_descriptiontest
+			}).then((result) => {
+				if (result === undefined) {
+					return;
+				}
+				this.state.Newedit === false;
+				this.props.showNotification(`问卷创建成功!`);
+				this.setState({
+					pollid: result.data.data.id,
+					Newedit: false,
+					mysave: false,
+					readOnlys: "readOnly",
+					cancellation: false,
+				})
+
+
+			})
+		} else {
+			if (this.state.polls_nametest === undefined || this.state.polls_nametest === "") {
+				this.props.showNotification("请输入标题");
+				return
+			}
+
+			var pollid;
+			if (this.state.pollid === undefined) {
+				pollid = this.props.match.params.pollid;
+			} else {
+				pollid = this.state.pollid;
+			}
+
+
+			var url = `/polls/${pollid}.json`;
+			axios.put(url, {
+				polls_name: this.state.polls_nametest,
+				polls_description: this.state.polls_descriptiontest
+			}).then((result) => {
+				if (result !== undefined) {
+					this.props.showNotification(`问卷更新成功!`);
+					this.setState({
+						mysave: false,
+						readOnlys: "readOnly",
+					})
+				}
+
+			})
+		}
+
+	}
+
+	//试图
+	render() {
+		let {
+			addonAfter,
+			user_permission,
+			polls_status,
+			Modalstype,
+			mysave,
+			readOnlys,
+			newoption,
+			cancellation,
+		} = this.state
+		//获取老师权限
+		// console.log("[`${maps[polls_status && polls_status]}`]]");
+		// console.log(polls_status);
+		// console.log([[`${maps[polls_status && polls_status]}`]] + "");
+
+		const IsAdmin = this.props.isAdmin();
+		const {getFieldDecorator} = this.props.form;
+		const formItemLayout = {
+			labelCol: {
+				xs: {span: 24},
+				// sm: { span: 8 },
+				sm: {span: 24},
+			},
+			wrapperCol: {
+				xs: {span: 24},
+				// sm: { span: 16 },
+				sm: {span: 24},
+			},
+		};
+
+		const radioStyle = {
+			display: 'block',
+			height: '30px',
+			lineHeight: '30px',
+		};
+
+		// console.log(this.state.projects===undefined?"":this.state.projects.poll_questions)
+		var displaymysave = (mysave === true) ? "" : "display:none;";
+		return (
+			<div className="newMain">
+				{/*提示*/}
+				{Modalstype && Modalstype === true ? <Modals
+					modalsType={this.state.Modalstype}
+					modalsTopval={this.state.Modalstopval}
+					modalCancel={this.state.ModalCancel}
+					modalSave={this.state.ModalSave}
+					modalsBottomval={this.state.ModalsBottomval}
+					loadtype={this.state.Loadtype}
+				/> : ""}
+				<div className="educontent mb50">
+					<p className="clearfix mb20 mt10">
+						<ActionBtn className=" btn colorgrey fl hovercolorblue"
+											 to={`/courses/${this.props.match.params.coursesId}`}>{this.props.coursedata.name}</ActionBtn>
+						<span className="color-grey-9 fl ml3 mr3">&gt;</span>
+						<ActionBtn className=" btn colorgrey fl hovercolorblue"
+											 to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}>问卷</ActionBtn>
+						<span className="color-grey-9 fl ml3 mr3">&gt;</span>
+						<span>{this.props.match.params.news === undefined ? "新建" : this.props.match.params.news === "new" ? "新建" : "编辑"}</span>
+					</p>
+					<div className="clearfix mb30">
+						<p
+							className="fl color-black summaryname mt5">{this.props.match.params.news === undefined ? "新建问卷" : this.props.match.params.news === "new" ? "新建问卷" : "编辑问卷"}</p>
+						<ActionBtn to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}
+											 className=" fr font-16">返回</ActionBtn>
+					</div>
+
+					{/*<Form {...formItemLayout} onSubmit={this.handleSubmit}>*/}
+					<div className="edu-back-white">
+						<div className="createPage bor-bottom-greyE">
+							<style>
+								{`
+                   .ant-form-item-label{width:180px;}
+                  `}
+							</style>
+
+							<div>
+								<div style={{"color": "#212121", "font-size": "16px"}} className="fl"><span
+									style={{"color": "#f5222d"}}>*</span>问卷标题
+								</div>
+								{
+									this.props.match.params.news === undefined ? "" : this.props.match.params.news === "new" ?
+										(
+											this.state.mysave === false ?
+												<div className="fr">
+									<span><a onClick={() => this.adddomeditit()}><Tooltip title="编辑"><i
+										className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip></a></span>
+												</div>
+												: "")
+										:
+										<div className="fr">
+									<span><a onClick={() => this.adddomeditit()}><Tooltip title="编辑"><i
+										className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip></a></span>
+										</div>
+								}
+
+							</div>
+
+							<Input placeholder="请输入问卷标题，最大限制60个字符" maxLength="60"
+										 style={{"margin-top": "15px", "text-align": "left"}}
+										 onInput={this.changeTopicName}
+										 readOnly={readOnlys}
+										 autoComplete="off" addonAfter={String(addonAfter)}
+										 value={this.state.polls_nametest}
+										 className="searchViewAfter"></Input>
+
+						</div>
+						<div style={{
+							"padding": "20px 30px 50px",
+							"position": "relative",
+							"border-bottom": "1px solid #EDEDED",
+							"margin-bottom": " 0px"
+						}}>
+							<style>
+								{`
+                   .ant-form-item-label{width:80px;}
+                  `}
+							</style>
+
+							<div style={{"color": "#212121", "font-size": "16px"}}>问卷须知</div>
+
+							<TextArea placeholder="请输入本次问卷答题的相关说明，最大限制100个字符"
+												style={{"height": "120px", "margin-top": "15px", "text-align": "left"}}
+												maxLength="100"
+												readOnly={readOnlys}
+												onInput={this.changeTopicNametwo}
+												value={this.state.polls_descriptiontest}
+												autoComplete="off" addonAfter={"100"}></TextArea>
+							{
+								this.state.Newedit === true || this.state.mysave === true ?
+									<div>
+										<Button type="primary" onClick={this.onSaveExercise} className=" fr   "
+														style={{
+															"margin-top": "10px",
+															"height": "32px",
+															"width": " 70px",
+															"font-size": "14px",
+															"line-height": " 30px",
+														}}>保存</Button>
+										{cancellation === false ?
+											<Button onClick={this.onSaveExercisetwo} className="defalutCancelbtn  fr mr20  "
+															style={{
+																"margin-top": "10px",
+																"height": "32px",
+																"width": " 70px",
+																"font-size": "14px",
+																"line-height": " 30px"
+															}}>取消</Button>
+											: ""}
+
+									</div>
+									: ""
+							}
+
+						</div>
+
+					</div>
+					<p className="clearfix padding20-30 color-grey-9">
+
+
+						{
+							this.state.mysingles + this.state.mydoubles + this.state.mymainsint === 0 ? "" :
+								<div>
+                                                  <span className="fl">
+                                                      {this.state.mysingles === 0 ? "" : <span
+																												className="mr20">单选题{this.state.mysingles === undefined ? "" : this.state.mysingles} 题</span>}
+
+																										{this.state.mydoubles === 0 ? "" :
+																											<span
+																												className="mr20">多选题{this.state.mydoubles === undefined ? "" : this.state.mydoubles}题</span>}
+																										{this.state.mymainsint === 0 ? "" :
+																											<span className="mr20">
+                                                              主观题{this.state.mymainsint === undefined ? "" : this.state.mymainsint}题
+                                                          </span>
+																										}
+                                                  </span>
+
+									<span className="fr">合计 <span
+										className="color-blue">{this.state.mysingles === undefined ? "" : this.state.mydoubles === undefined ? "" : this.state.mymainsint === undefined ? "" : this.state.mysingles + this.state.mydoubles + this.state.mymainsint}</span> 题</span>
+								</div>
+
+						}
+
+					</p>
+					<div className="edu-back-white">
+
+						{/*自动生成修改好的获取到的*/}
+						{/**************************************************************************/}
+						{this.state.poll_questions === undefined ? "" : this.state.poll_questions.map((item, index) => {
+							// console.log('打印this.state.poll_questions')
+							// console.log(item.question)
+							let resultDom;
+							resultDom = <div className="problemShow  bor-bottom-greyE">
+								<p className="clearfix font-16">
+									<span className="color-grey-6 fl">第{index + 1}题：</span>
+									<span
+										className="color-grey-9 fl">{item.question.question_type === 1 ? "(单选题)" : item.question.question_type === 2 ? "(多选题)" : "(主观题)"}</span>
+									<span
+										className="selectAnswer ml10">{item.question.is_necessary === 1 ? "必答" : item.question.question_type === 2 ? "选答" : "选答"}</span>
+									<span style={{color: "#4B4B4B"}}
+												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "" : item.question.min_choices === null && item.question.max_choices === null ? "" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "" : "可选" + item.question.min_choices + "-" + item.question.max_choices + "项")}</span>
+									{
+										polls_status === undefined || polls_status === 1 ?
+											<span className="fr">
+                      <a className="mr30"
+												 onClick={() => this.showDeleteConfirm(item.question.question_type, index, item)}><Tooltip
+												title="删除"><i
+												className="color-grey-cd font-16 iconfont icon-shanchu"></i></Tooltip></a>
+												{index === 0 ? "" :
+													<a className="mr30"
+														 onClick={() => this.handleClickBySortUp(index, item)}><Tooltip
+														title="上移"><i
+														className="color-green font-18 iconfont icon-xiangshangyi"></i></Tooltip></a>}
+												{index === this.state.poll_questions.length - 1 ? "" :
+													<a className="mr30"
+														 onClick={() => this.handleClickBySortDown(index, item)}><Tooltip
+														title="下移"><i
+														className="color-green font-18 iconfont icon-xiangxiayi"></i></Tooltip></a>}
+												<a className="mr30"
+													 onClick={() => this.addMytopic(item.question.question_type, this.state.pollid, index + 1, true, item.question.id)}><Tooltip
+													title={item.question.question_type === 1 ? "插入单选题" : item.question.question_type === 2 ? "插入多选题" : "插入主观题"}><i
+													className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
+                      <a onClick={() => this.adddomedit(item)}><Tooltip title="编辑"><i
+												className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip></a>
+                    </span> : <span className="fr">     <a onClick={() => this.adddomedit(item)}><Tooltip title="编辑"><i
+												className="color-green font-18 iconfont icon-bianjidaibeijing"></i></Tooltip></a>  </span>
+									}
+
+								</p>
+								<p className="mt20"> <span className="font-16  flex1" style={item.question.question_type === 1?{"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1116px"}:item.question.question_type === 2? {"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1120px"}: {"white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{item.question.question_title}</span></p>
+								{/*<pre className="mt20 mb20 font-16 break_word flex1">{item.question.question_title}</pre>*/}
+								{item.question.question_type === 1 ?
+									(<RadioGroup defaultChecked={false} disabled>
+										{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
+											return (
+												<div className={"h20 mt20 mb20 "} style={{"clear": "both"}}>
+													<Radio value={i} className={"fl"} style={{"text-align": "left"}}></Radio>
+													{/*<pre className={"break_word flex1 fl"}*/}
+													{/*		 style={{"text-align": "left"}}>{items.answer_text}</pre>*/}
+													{/*<span className={"break_word flex1"}><pre className={"break_word flex1"}>{items.answer_text}</pre> </span>*/}
+													<span className={" flex1 "} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}} >{items.answer_text}</span>
+
+												</div>
+											)
+										})}
+									</RadioGroup>)
+									: item.question.question_type === 2 ?
+										(<CheckboxGroup defaultChecked={false} disabled>
+											{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
+												return (
+													<div className="mt10 mt20 mb20 " style={{"clear": "both"}}>
+														<Checkbox value={i} className={"fl"} style={{"text-align": "left"}}></Checkbox>
+														<span className={" flex1"} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word"}}>{items.answer_text}</span>
+
+														{/*<span*/}
+														{/*	className={"break_word flex1 fl"} style={{"text-align": "left"}}><pre*/}
+														{/*	style={{"text-align": "left"}}>{items.answer_text}</pre></span>*/}
+													</div>
+												)
+											})}
+										</CheckboxGroup>)
+										: item.question.question_type === 3 ? (<div></div>) : (<div></div>)}
+							</div>
+
+							return (
+								<div>
+									{resultDom}
+								</div>
+							)
+						})}
+						{/**************************************************************************/}
+						{/*编辑用的新增用的*/}
+						{/**************************************************************************/}
+
+						{this.state.adddom === undefined ? "" : this.state.adddom.map((itemo, indexo) => {
+							// console.log('打印this.state.adddom')
+							// console.log(itemo.question)
+							let arrid = itemo.question.id;
+							let resultDomtwo;
+							resultDomtwo =
+								<div className="problemShow">
+									<span
+										className="font-16 color-grey-6 mb20">{itemo.question.question_type === 1 ? "单选题" : itemo.question.question_type === 2 ? "多选题" : "主观题"}
+										<Checkbox value={itemo.question.is_necessary}
+															checked={itemo.question.is_necessary === 1 ? true : false}
+															onChange={(e) => this.onCheckAllChange(e, indexo)}
+															className="lineh-40"
+															style={{"marginLeft": "20px"}}>必答</Checkbox>
+									</span>
+
+									<TextArea placeholder="请输入题目" className="mb20 TextAreas"
+														autosize={{minRows: 1, maxRows: 5}}
+														id="textArea"
+														style={{
+															"height": "45px",
+															"max-height": "9.0072e+15px",
+															"overflow-y": "hidden",
+															"line-height": "35px",
+														}}
+
+														onInput={(e) => this.handleInputTopic(e, indexo)}>{itemo.question.question_title}</TextArea>
+
+									{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
+										return (
+											<div>
+												{itemt.answer_text === undefined ? (
+													<div></div>) : itemt.answer_text === "其他" ? (
+													<p className="df mb20">
+															<span
+																className="color-grey-6 mr10 w60 font-16 lineh-40"
+																style={{"text-align": "center"}}>其它</span>
+
+														<input
+															className="mr20 input-flex-40 TextAreainput" disabled
+															placeholder='无法编辑！将由参与答题的人手动录入'></input>
+														{polls_status === undefined || polls_status === 1 ?
+															<a className="lineh-40"
+																 onClick={() => this.deleteentrys(arrid, indext, true)}><Tooltip
+																title="删除"
+																placement={"bottom"}><i
+																className="iconfont icon-htmal5icon19 font-20 color-grey-c"></i></Tooltip></a>
+															: ""}
+													</p>) : (<p className="df mb20">
+													<span className="color-grey-6 mr10 w60 font-16 lineh-40"
+																style={{"text-align": "center"}}>选项</span>
+
+													<TextArea
+														autosize={{minRows: 1, maxRows: 5}}
+														className="mr20 TextAreas"
+														value={itemt.answer_text}
+														style={{
+															"height": "45px",
+															"max-height": "9.0072e+15px",
+															"overflow-y": "hidden",
+															"line-height": "35px",
+														}}
+														onInput={(e) => this.handleInputChanges(e, indexo, indext)}></TextArea>
+													{polls_status === undefined || polls_status === 1 ?
+														<a className="lineh-40"
+															 onClick={() => this.deleteentrys(arrid, indext, false)}><Tooltip
+															title="删除" placement={"bottom"}><i
+															className="iconfont icon-htmal5icon19 font-20 color-grey-c"></i></Tooltip></a>
+														: ""}
+												</p>)}
+											</div>
+										)
+									})}
+
+									<div className="df">
+										{itemo.question.question_type === 1 ? (
+												<div>
+													<div style={{minWidth: "1100px"}}>
+														{polls_status === undefined || polls_status === 1 ?
+															<ActionBtn style="grey" className="mr20 mt5"
+																				 onClick={() => this.ewoption(itemo.question.id, itemo)}>新增选项</ActionBtn>
+
+															: ""}
+														{polls_status === undefined || polls_status === 1 ?
+
+															(newoption === false ?
+																<ActionBtn style="grey" className="mr20 mt5"
+																					 onClick={() => this.addanotheroption(itemo.question.id)}>新增其他选项</ActionBtn>
+																: "")
+															: ""}
+														<span className="fr mt5">
+                        <ActionBtn style="greyBack" className="mr20 w100"
+																	 onClick={() => this.deleteadddom(indexo)}>取消</ActionBtn>
+                        <ActionBtn style="blue" className="mr20 w100"
+																	 onClick={() => this.deleteadddomthree(indexo, itemo)}>保存</ActionBtn>
+											 <ActionBtn style="blue" className=" w100"
+																	onClick={() => this.deleteadddomtwo(indexo, itemo)}>保存并继续</ActionBtn>
+                      </span>
+													</div>
+												</div>
+
+
+											)
+
+
+											: itemo.question.question_type === 2 ? (
+													//////////////////////////////////////////// 可选
+													<div>
+														<div style={{minWidth: "1100px"}}>
+															<div>
+                                                        <span
+																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
+																<div className="mr40 flex1 ">
+																	{/*可选最小*/}
+																	<style>
+																		{
+																			`
+																			.ant-select-selection .ant-select-selection-selected .ant-select-selection__rendered .ant-select-selection-selected-value{
+																				"width":"100%";
+                                  "height": "80%";
+																	"margin-top": "5px";
+																 "margin-left": "5px";
+																 "text-align": "center";
+																 "display": "block";
+																 "opacity": "1";
+																			}
+																	`
+																		}
+																	</style>
+																	<Select className="fl  w100"
+																					onChange={(value) => this.handleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
+																					value={itemo.question.min_choices === 0 || itemo.question.min_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.min_choices}
+
+																	>
+																		<Option value={String("0")}>--</Option>
+																		{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
+																			return (
+																				indext >= 1 ? <Option value={String(indext + 1)}>{indext + 1}</Option> : ""
+																			)
+																		})}
+																	</Select>
+																	<span
+																		className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
+																	{/*可选最大*/}
+																	<Select className="fl w100"
+																					onChange={(value) => this.handleGradationGroupChangeee(value, indexo)}
+																					value={itemo.question.max_choices === 0 || itemo.question.max_choices === "0" ? "--" : itemo.question.min_choices === null ? "--" : itemo.question.min_choices === undefined ? "--" : itemo.question.max_choices}
+																	>
+																		<Option value={String("0")}>--</Option>
+																		{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
+																			return (
+																				indext >= 1 ? <Option value={String(indext + 1)}>{indext + 1}</Option> : ""
+
+																			)
+																		})}
+																	</Select>
+																	<span
+																		className="ml10 mr20 color-grey-6 lineh-40 fl font-16">项</span>
+																	<span
+																		className="color-grey-9 fl lineh-40">（学生答题时，系统对其选择的选项个数进行限制，--表示不限制）</span>
+																</div>
+
+															</div>
+														</div>
+													</div>
+												)
+
+												: (<div style={{minWidth: "1100px"}}></div>)
+
+										}
+									</div>
+									<div>
+										{itemo.question.question_type === 2 ?
+											(
+												polls_status === undefined || polls_status === 1 ?
+													<div className="clearfix mt30" >
+
+														<div><ActionBtn style="grey" className="mr20 fl mt5"
+																						onClick={() => this.ewoption(itemo.question.id, itemo)}>新增选项</ActionBtn>
+
+															{
+																newoption === false ? <ActionBtn style="grey" className="mr20 fl mt5"
+																																 onClick={() => this.addanotheroption(itemo.question.id)}>新增其他选项</ActionBtn> : ""
+															}
+
+														</div>
+
+
+														<span className="fr mt5">
+                        <ActionBtn style="greyBack" className=" mr20 w100"
+																	 onClick={() => this.deleteadddom(indexo)}>取消</ActionBtn>
+                        <ActionBtn style="blue" className="mr20 w100"
+																	 onClick={() => this.deleteadddomthree(indexo, itemo)}>保存</ActionBtn>
+											 <ActionBtn style="blue" className=" w100"
+																	onClick={() => this.deleteadddomtwo(indexo, itemo)}>保存并继续</ActionBtn>
+                      </span>
+													</div>
+
+
+													: ""
+											)
+
+											: itemo.question.question_type === 3 ?
+												<div className="clearfix mt30">
+												<span className="fr">
+                        <ActionBtn style="greyBack" className="mr20 w100"
+																	 onClick={() => this.deleteadddom(indexo)}>取消</ActionBtn>
+                        <ActionBtn style="blue" className="mr20 w100"
+																	 onClick={() => this.deleteadddomthree(indexo, itemo)}>保存</ActionBtn>
+											 <ActionBtn style="blue" className=" w100"
+																	onClick={() => this.deleteadddomtwo(indexo, itemo)}>保存并继续</ActionBtn>
+                      </span>
+												</div>
+												:
+												""}
+
+
+									</div>
+								</div>
+
+
+							return (
+								<div>
+									{resultDomtwo}
+								</div>
+							)
+						})}
+						{/**************************************************************************/}
+
+						{polls_status === undefined || polls_status === 1 ?
+							<div>
+								{
+									this.props.match.params.news === "new" ?
+										this.state.Newedit === false ?
+											<div>
+												<div  className=" mb10"  style={{"border-bottom": "1px solid #eee"}}></div>
+
+												<div style={{"padding": "10px 30px 20px 30px"}}>
+													<ActionBtn style="green" className="mr20" onClick={() => this.addmysingles()}><i
+														className="iconfont icon-tianjiafangda font-15 mr10"></i>单选题</ActionBtn>
+													<ActionBtn style="green" className="mr20" onClick={() => this.addmydoubles()}><i
+														className="iconfont icon-tianjiafangda font-15 mr10"></i>多选题</ActionBtn>
+													<ActionBtn style="green" className="mr20" onClick={() => this.addmymainsint()}><i
+														className="iconfont icon-tianjiafangda font-15 mr10"></i>主观题</ActionBtn>
+												</div>
+											</div>
+
+											: ""
+										:
+										<div>
+											<div  className=" mb10"  style={{"border-bottom": "1px solid #eee"}}></div>
+										<div style={{"padding": "10px 30px 20px 30px"}}>
+											<ActionBtn style="green" className="mr20" onClick={() => this.addmysingles()}><i
+												className="iconfont icon-tianjiafangda font-15 mr10"></i>单选题</ActionBtn>
+											<ActionBtn style="green" className="mr20" onClick={() => this.addmydoubles()}><i
+												className="iconfont icon-tianjiafangda font-15 mr10"></i>多选题</ActionBtn>
+											<ActionBtn style="green" className="mr20" onClick={() => this.addmymainsint()}><i
+												className="iconfont icon-tianjiafangda font-15 mr10"></i>主观题</ActionBtn>
+										</div>
+										</div>
+								}
+							</div>
+							: <div></div>}
+					</div>
+					{
+						this.props.match.params.news === "new" ?
+							(this.state.Newedit === false ?
+								<div
+									style={{
+										"display": "flex",
+										"justify-content": "center",
+										"align-items": "center",
+										"width": "100%",
+									}}
+								>
+									<li className="clearfix mt30 mb50">
+										<a type="primary" className="defalutSubmitbtn fl mr20"
+											 onClick={() => this.submitQuestionnaire()}>提交</a>
+										<a className="defalutCancelbtn fl" onClick={() => this.props.history.goBack()}>取消</ a>
+									</li>
+
+
+								</div>
+
+								: "")
+							:
+							<div
+								style={{
+									"display": "flex",
+									"justify-content": "center",
+									"align-items": "center",
+									"width": "100%",
+								}}
+							>
+								<li className="clearfix mt30 mb50">
+									<a   className="defalutSubmitbtn fl mr20"onClick={() => this.props.history.goBack()}>取消</a>
+									<a type="primary" className="defalutCancelbtn fl"
+										 onClick={() => this.submitQuestionnaire()}>提交</a>
+								</li>
+							</div>
+					}
+
+					{/*</Form>*/}
+				</div>
+				<div ref='targetElement'></div>
+			</div>
+		)
+	}
+
+}
+
+const WrappedPollNew = Form.create({name: 'taskPollNew'})(PollNew);
+// RouteHOC()
 export default (WrappedPollNew);
\ No newline at end of file
diff --git a/public/react/src/modules/courses/shixunHomework/CommitSummary.js b/public/react/src/modules/courses/shixunHomework/CommitSummary.js
index 3e12e2bb6..64f975446 100644
--- a/public/react/src/modules/courses/shixunHomework/CommitSummary.js
+++ b/public/react/src/modules/courses/shixunHomework/CommitSummary.js
@@ -119,10 +119,10 @@ class CommitSummary extends Component{
                     <div className={"educontent mb20"}>
                         <div style={{
                           width:'100%',
-                          height:'100px'
+                          height:'20px'
                         }} >
                             <div className="educontent mb30">
-                                <p className="clearfix mb20 mt10">
+                                <p className="clearfix mb20 mt10 ml29">
                                     <WordsBtn className="btn colorgrey fl hovercolorblue "
                                               style="grey">{data === undefined ? "" :data.course_name===undefined?"": data.course_name}</WordsBtn>
                                     <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@@ -135,23 +135,23 @@ class CommitSummary extends Component{
 
                         </div>
                         <div>
-                            <p className="ml15 fl color-black mt10 summaryname" onClick={this.asdasdsad}>提交总结</p>
-                                <a href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/openlist`} className="color-grey-6 fr font-16 ml30 mt10 mr20">返回</a>
+                            <p className="ml29 fl color-black mt10 summaryname" onClick={this.asdasdsad}>提交总结</p>
+                                <a href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/openlist`} className="color-grey-6 fr font-16 ml30 mt10">返回</a>
                         </div>
                         {/*educontentbox*/}
                       <div className="stud-class-set pt40 pb40">
 
-                              <div className={"ml30 mr30 mt10"}>
+                              <div className={"mt10"}>
                                   <div style={{ "background": "#fff", "padding": "15px"}}>
-                                     <span className="commitcontents ">
-                            <span className="color-red mt20">*</span>
+                                     <span className="commitcontentsysl">
+                            <span className="color-red">*</span>
                             内容</span>
                                   </div>
                                   <div className="new-wrap">
                                       <Form labelCol={{span: 5}}layout='vertical' onSubmit={this.handleSubmit}  wrapperCol={{span: 12}}>
                                           <Form.Item
                                           >
-                                              <div style={{ "background": "#fff","padding-bottom":"10px","padding-left":"10px","padding-right":"10px"}}>
+                                              <div style={{ "background": "#fff","padding-bottom":"20px","padding-left":"20px","padding-right":"20px"}}>
                                                   {getFieldDecorator('description', {
                                                       rules: [{
                                                           required: true, message: '请输入帖子内容',
diff --git a/public/react/src/modules/courses/shixunHomework/Homeworddescription.js b/public/react/src/modules/courses/shixunHomework/Homeworddescription.js
index a6e1351e0..405490f38 100644
--- a/public/react/src/modules/courses/shixunHomework/Homeworddescription.js
+++ b/public/react/src/modules/courses/shixunHomework/Homeworddescription.js
@@ -1,114 +1,114 @@
-import React, {Component} from "react";
-import {
-    Form,
-    Select,
-    Input,
-    Button,
-    Checkbox,
-    Upload,
-    Icon,
-    message,
-    Modal,
-    Table,
-    Divider,
-    InputNumber,
-    Tag,
-    DatePicker,
-    Radio,
-    Tooltip,
-    notification
-} from "antd";
-import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
-import {Link, Switch, Route, Redirect} from 'react-router-dom';
-import axios from 'axios';
-import '../css/members.css'
-import "../common/formCommon.css"
-import '../css/Courses.css'
-import '../css/members.css'
-import "../common/formCommon.css"
-import '../css/Courses.css'
-import moment from 'moment';
-import '../css/members.css'
-import "../common/formCommon.css"
-import './style.css'
-import Workquestionandanswer from "./Workquestionandanswer";
-const { TextArea } = Input;
-
-
-class Homeworddescription extends Component {
-
-    constructor(props) {
-        super(props);
-        this.state = {
-            props: props,
-            description:undefined,
-        }
-
-
-    }
-
-    componentDidMount() {
-
-
-    }
-    //取消操作
-    clickcancel =()=>{
-      this.props.NOReleaseNotes();
-    }
-    //确认操作
-    onSaveExercise=()=>{
-        if(this.state.description === "" || this.state.description===undefined || this.state.description === null){
-            this.props.showNotification("请输入作业说明");
-            return
-        }
-        this.props.ReleaseNotes(this.state.description);
-    }
-    //获取输入框
-    settextarea=(e)=>{
-        this.setState({
-            description:e
-        })
-    }
-    render() {
-        return (
-            <div >
-                <div  style={{
-                    "background-color":"#FFFFff",
-                    "margin-top":"20px",
-                    "padding":"20px 20px",
-                    "position": "relative",
-                    "border-bottom": "1px solid #EDEDED",
-                    "margin-bottom":" 0px"}}>
-                    <style>
-                        {`
-                   .ant-form-item-label{width:80px;}
-                  `}
-                    </style>
-                    <Form.Item
-                        label="作业说明"
-                    >
-                        {/*<TextArea  placeholder="作业说明..." value={this.state.description} onInput={this.settextarea} style={{"height": "120px"}}/>*/}
-                            {/*<TextArea style={{"height": "120px"}}*/}
-                            {/*          autoComplete="off" ></TextArea>*/}
-                        <TPMMDEditor ref={this.mdRef} placeholder={'请在此输入帖子详情，最大限制为5000个字符'}
-                                     mdID={'courseMessageMD'} initValue={this.state.description}   className="courseMessageMD" onChange={this.settextarea} style={{"height": "120px"}}></TPMMDEditor>
-                    </Form.Item>
-                    <div className="clearfix">
-                            <Button  type="primary" className="defalutSubmitbtn  fr mr20 "style={{"width":"90px"}} onClick={this.onSaveExercise} >保存</Button>
-                            <Button className="defalutCancelbtn fr mr20 w20"  style={{"width":"90px"}} onClick={this.clickcancel} >取消</Button>
-                    </div>
-
-
-                </div>
-            </div>
-        )
-    }
-
-
-
-
-
-
-}
-const Homeworddescriptions = Form.create({name: 'taskPollNew'})(Homeworddescription);
+import React, {Component} from "react";
+import {
+    Form,
+    Select,
+    Input,
+    Button,
+    Checkbox,
+    Upload,
+    Icon,
+    message,
+    Modal,
+    Table,
+    Divider,
+    InputNumber,
+    Tag,
+    DatePicker,
+    Radio,
+    Tooltip,
+    notification
+} from "antd";
+import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
+import {Link, Switch, Route, Redirect} from 'react-router-dom';
+import axios from 'axios';
+import '../css/members.css'
+import "../common/formCommon.css"
+import '../css/Courses.css'
+import '../css/members.css'
+import "../common/formCommon.css"
+import '../css/Courses.css'
+import moment from 'moment';
+import '../css/members.css'
+import "../common/formCommon.css"
+import './style.css'
+import Workquestionandanswer from "./Workquestionandanswer";
+const { TextArea } = Input;
+
+
+class Homeworddescription extends Component {
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            props: props,
+            description:undefined,
+        }
+
+
+    }
+
+    componentDidMount() {
+
+
+    }
+    //取消操作
+    clickcancel =()=>{
+      this.props.NOReleaseNotes();
+    }
+    //确认操作
+    onSaveExercise=()=>{
+        if(this.state.description === "" || this.state.description===undefined || this.state.description === null){
+            this.props.showNotification("请输入作业说明");
+            return
+        }
+        this.props.ReleaseNotes(this.state.description);
+    }
+    //获取输入框
+    settextarea=(e)=>{
+        this.setState({
+            description:e
+        })
+    }
+    render() {
+        return (
+            <div >
+                <div  style={{
+                    "background-color":"#FFFFff",
+                    "margin-top":"20px",
+                    "padding":"20px 20px",
+                    "position": "relative",
+                    "border-bottom": "1px solid #EDEDED",
+                    "margin-bottom":" 0px"}}>
+                    <style>
+                        {`
+                   .ant-form-item-label{width:80px;}
+                  `}
+                    </style>
+                    <Form.Item
+                        label="作业说明"
+                    >
+                        {/*<TextArea  placeholder="作业说明..." value={this.state.description} onInput={this.settextarea} style={{"height": "120px"}}/>*/}
+                            {/*<TextArea style={{"height": "120px"}}*/}
+                            {/*          autoComplete="off" ></TextArea>*/}
+                        <TPMMDEditor ref={this.mdRef} placeholder={'作业说明'}
+                                     mdID={'courseMessageMD'} initValue={this.state.description}   className="courseMessageMD" onChange={this.settextarea} style={{"height": "120px"}}></TPMMDEditor>
+                    </Form.Item>
+                    <div className="clearfix">
+                            <Button  type="primary" className="defalutSubmitbtn  fr mr20 "style={{"width":"90px"}} onClick={this.onSaveExercise} >保存</Button>
+                            <Button className="defalutCancelbtn fr mr20 w20"  style={{"width":"90px"}} onClick={this.clickcancel} >取消</Button>
+                    </div>
+
+
+                </div>
+            </div>
+        )
+    }
+
+
+
+
+
+
+}
+const Homeworddescriptions = Form.create({name: 'taskPollNew'})(Homeworddescription);
 export default Homeworddescriptions;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 9650ad32a..be30128c7 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -75,7 +75,7 @@ class Listofworks extends Component {
 			teacherlist: undefined,
 			searchtext: "",
 			course_groupysls: undefined,
-			course_groupyslstwo: undefined,
+			course_groupyslstwo: [],
 			visible: false,
 			userid: 0,
 			course_group: null,
@@ -93,6 +93,7 @@ class Listofworks extends Component {
 			code_review: false,
 			boolgalist:true,
 			challenges_count:0,
+			experience:0,
 			columns: [
 				{
 					title: '序号',
@@ -384,7 +385,7 @@ class Listofworks extends Component {
 		// course_group:分班情况 [232, 231]， []:不限（空数组）
 		var data = {
 			search: "",
-			order: "",
+			order: "desc",
 			b_order: "asc",
 			work_status: "",
 			course_group: "",
@@ -457,6 +458,11 @@ class Listofworks extends Component {
 					task_status: result.data.task_status,
 					course_group_info: result.data.course_group_info,
 					loadingstate: false,
+					jobsettingsdata: result,
+					publish_immediately: result.data.publish_immediately,
+					work_efficiency: result.data.work_efficiency,
+					end_immediately: result.data.end_immediately,
+					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
 				})
 
@@ -1164,7 +1170,7 @@ class Listofworks extends Component {
 			// console.log(checkedValues);
 			this.setState({
 				unlimited: 0,
-				course_groupyslstwo: undefined,
+				course_groupyslstwo: [],
 				loadingstate: true,
 
 			})
@@ -1172,7 +1178,7 @@ class Listofworks extends Component {
 		} else if (checkedValues.length === data.length) {
 			this.setState({
 				unlimited: 0,
-				course_groupyslstwo: undefined,
+				course_groupyslstwo: [],
 				loadingstate: true,
 			})
 			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
@@ -1198,6 +1204,7 @@ class Listofworks extends Component {
 			this.setState({
 				unlimitedtwo: 1,
 				course_groupysls: undefined,
+				checkedValuesineinfo:[],
 				loadingstate: true,
 
 			})
@@ -1206,6 +1213,7 @@ class Listofworks extends Component {
 			this.setState({
 				unlimitedtwo: 1,
 				course_groupysls: undefined,
+				checkedValuesineinfo:[],
 				loadingstate: true,
 			})
 			this.Startsorting(this.state.order, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, this.state.page, this.state.limit);
@@ -1359,6 +1367,7 @@ class Listofworks extends Component {
 				let datalist = [];
 				var game_list = result.data.game_list
 				var boolgalist=true;
+				var experience=0;
 				for (var i = 0; i < game_list.length; i++) {
 
 					datalist.push({
@@ -1368,6 +1377,7 @@ class Listofworks extends Component {
 						classroom: game_list[i].score,
 						complete_status: game_list[i].complete_status,
 					})
+					experience=game_list[i].score+experience;
 
 					if(game_list[i].complete_status === 2 || game_list[i].complete_status===3){
 						boolgalist=false;
@@ -1381,6 +1391,7 @@ class Listofworks extends Component {
 					viewtrainingdata: result.data,
 					visibles: true,
 					game_list: datalist,
+					experience:experience,
 					boolgalist:boolgalist,
 				})
 			}
@@ -1485,22 +1496,22 @@ class Listofworks extends Component {
 	notlimiteds = () => {
 		this.setState({
 			checkedValuesine: undefined,
-			course_groupyslstwo: undefined,
+			course_groupyslstwo: [],
 			unlimited: 0,
 			loadingstate: true,
 		})
-		this.Startsorting(this.state.order, null, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+		this.Startsorting(this.state.order, [], this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
 
 	}
 	notlimitedst = () => {
 		// console.log(this.state.course_group_info);
 		this.setState({
 			unlimitedtwo: 1,
-			checkedValuesineinfo: undefined,
+			checkedValuesineinfo: [],
 			course_groupysls: undefined,
 			loadingstate: true,
 		})
-		this.Startsorting(this.state.order, this.state.course_groupyslstwo, undefined, this.state.searchtext, this.state.page, this.state.limit);
+		this.Startsorting(this.state.order, this.state.course_groupyslstwo, [], this.state.searchtext, this.state.page, this.state.limit);
 	}
 	//立即截止确定按钮
 	coursetaskend = () => {
@@ -1586,7 +1597,7 @@ class Listofworks extends Component {
 	render() {
 		// console.log("Listofworks.js000")
 
-		let {columns, page, boolgalist,limit, course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, order, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state;
+		let {columns, page, boolgalist,limit,experience,course_groupysls, course_groupyslstwo, unlimited, unlimitedtwo, loadingstate, viewtrainingdata, game_list, data, course_group_info, order, teacherdata, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, jobsettingsdata} = this.state;
 		//
 		// console.log(teacherdata&&teacherdata.shixun_identifier)
 		// console.log(course_group_info)
@@ -1630,6 +1641,7 @@ class Listofworks extends Component {
 							viewtrainingdata={viewtrainingdata}
 							game_list={game_list}
 							visible={visibles}
+							experience={experience}
 							boolgalist={boolgalist}
 							Cancel={() => this.cancelModulationModels()}
 						/>
@@ -1702,10 +1714,34 @@ class Listofworks extends Component {
 								<Link
 									to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/settings`}
 								>设置</Link>
-								{this.props.isAdmin() ? <a
-									className="fr color-blue font-16"
-									href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}
-								>导出</a> : ""}
+								{/*{this.props.isAdmin() ? <a*/}
+								{/*	className="fr color-blue font-16"*/}
+								{/*	href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*/}
+								{/*>导出</a> : ""}*/}
+								<style>{`
+                        .drop_down_menu li a {
+                            padding: 0px;
+                            font-size: 14px;
+                        }
+                        .drop_down_menu {
+                            width: 121px;
+                        }
+                        .drop_down_menu li {
+                            overflow: visible;
+                            width: 121px;
+                        }
+                        .drop_down_menu, .drop_down_normal {
+                            padding-top: 10px;
+                            padding-bottom: 8px;
+                        }
+                        `}</style>
+								{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
+									导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+									<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
+										<li><a href={`/api/student_works/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/export_shixun_work_report.pdf`} calssName="color-dark">实训报告</a></li>
+										<li><a href={`/api/homework_commons/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/works_list.xlsx`} calssName="color-dark">学生成绩</a></li>
+									</ul>
+								</li>:""}
 								{this.props.isAdmin() ?
 									teacherdata && teacherdata.end_immediately === true ?
 										<a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a> : ""
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index d5dbaf06d..29af983e5 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -90,7 +90,7 @@ class Listofworksstudentone extends Component {
 		var data = {
 			search: "",
 			order: "",
-			b_order: "asc",
+			b_order: "desc",
 			page: 1,
 			limit: 20,
 			work_status: "",
@@ -107,6 +107,9 @@ class Listofworksstudentone extends Component {
 					publish_immediately: result.data.publish_immediately,
 					end_immediately: result.data.end_immediately,
 					id: result.data.id,
+					work_efficiency: result.data.work_efficiency,
+					code_review: result.data.code_review,
+					challenges_count:result.data.challenges_count,
 				})
 				if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
 					this.seacthdata();
@@ -154,6 +157,13 @@ class Listofworksstudentone extends Component {
 					task_status: result.data.task_status,
 					course_group_info: result.data.course_group_info,
 					student_works: result.data.student_works,
+					loadingstate: false,
+					jobsettingsdata: result,
+					publish_immediately: result.data.publish_immediately,
+					work_efficiency: result.data.work_efficiency,
+					end_immediately: result.data.end_immediately,
+					code_review: result.data.code_review,
+					challenges_count:result.data.challenges_count,
 				})
 				if (result.data.student_works === undefined || result.data.student_works === null || JSON.stringify(result.data.student_works) === "[]") {
 					this.seacthdata();
@@ -214,11 +224,15 @@ class Listofworksstudentone extends Component {
 						// updatetime:this.state.teacherdata.student_works[i].update_time,
 						// updatetime:"",
 						updatetime: timedata === "Invalid date" ? "--" : timedata,
-						completion: this.state.teacherdata.complete_count === 4 ? "4/4" : this.state.teacherdata.complete_count === 3 ? "3/4" : this.state.teacherdata.complete_count === 2 ? "2/4" : this.state.teacherdata.complete_count === 1 ? "1/4" : this.state.teacherdata.complete_count === 0 ? "0" : 0,
+						completion:  this.state.teacherdata.complete_count === null ? "0" :this.state.teacherdata.complete_count === undefined ? "0": this.state.teacherdata.complete_count,
 						levelscore: this.state.teacherdata.final_score,
 						efficiencyscore: this.state.teacherdata.eff_score,
 						finalscore: this.state.teacherdata.work_score,
 						operating: "查看",
+						late_penalty: this.state.teacherdata.late_penalty=== null?"0":this.state.teacherdata.late_penalty === undefined?"0":this.state.teacherdata.late_penalty,
+						ultimate_score:this.state.teacherdata.ultimate_score,
+						user_name: this.state.teacherdata.user_name,
+						user_login: this.state.teacherdata.user_login,
 					})
 
 					// }
@@ -253,11 +267,15 @@ class Listofworksstudentone extends Component {
 					// updatetime:this.state.teacherdata.student_works[i].update_time,
 					// updatetime:"",
 					updatetime: timedata === "Invalid date" ? "--" : timedata,
-					completion: this.state.student_works[i].complete_count === 4 ? "4/4" : this.state.student_works[i].complete_count === 3 ? "3/4" : this.state.student_works[i].complete_count === 2 ? "2/4" : this.state.student_works[i].complete_count === 1 ? "1/4" : this.state.student_works[i].complete_count === 0 ? "0" : 0,
+					completion:  this.state.teacherdata.student_works[i].complete_count === null ? "0" :this.state.teacherdata.student_works[i].complete_count === undefined ? "0": this.state.teacherdata.student_works[i].complete_count,
 					levelscore: this.state.student_works[i].final_score,
 					efficiencyscore: this.state.student_works[i].eff_score,
 					finalscore: this.state.student_works[i].work_score,
 					operating: "查看",
+					late_penalty: this.state.teacherdata.student_works[i].late_penalty=== null?"0":this.state.teacherdata.student_works[i].late_penalty === undefined?"0":this.state.teacherdata.student_works[i].late_penalty,
+					ultimate_score:this.state.teacherdata.student_works[i].ultimate_score,
+					user_name: this.state.teacherdata.student_works[i].user_name,
+					user_login: this.state.teacherdata.student_works[i].user_login,
 				})
 
 			}
@@ -310,11 +328,15 @@ class Listofworksstudentone extends Component {
 					// updatetime:this.state.teacherdata.student_works[i].update_time,
 					// updatetime:"",
 					updatetime: timedata === "Invalid date" ? "--" : timedata,
-					completion: this.state.teacherdata.complete_count === 4 ? "4/4" : this.state.teacherdata.complete_count === 3 ? "3/4" : this.state.teacherdata.complete_count === 2 ? "2/4" : this.state.teacherdata.complete_count === 1 ? "1/4" : this.state.teacherdata.complete_count === 0 ? "0" : 0,
+					completion:  this.state.teacherdata.complete_count === null ? "0" :this.state.teacherdata.complete_count === undefined ? "0": this.state.teacherdata.complete_count,
 					levelscore: this.state.teacherdata.final_score,
 					efficiencyscore: this.state.teacherdata.eff_score,
 					finalscore: this.state.teacherdata.work_score,
 					operating: "查看",
+					late_penalty: this.state.teacherdata.late_penalty=== null?"0":this.state.teacherdata.late_penalty === undefined?"0":this.state.teacherdata.late_penalty,
+					ultimate_score:this.state.teacherdata.ultimate_score,
+					user_name: this.state.teacherdata.user_name,
+					user_login: this.state.teacherdata.user_login,
 				})
 
 				// }
@@ -333,8 +355,8 @@ class Listofworksstudentone extends Component {
 
 			var teacherlist = undefined;
 		}
-		console.log("datalistdatalist文件");
-		console.log(datalist);
+		// console.log("datalistdatalist文件");
+		// console.log(datalist);
 		this.setState({
 			data: datalist,
 			teacherlist: teacherlist,
@@ -361,7 +383,8 @@ class Listofworksstudentone extends Component {
 				// console.log(JSON.stringify(result))
 				let datalist = [];
 				var game_list = result.data.game_list
-
+				var boolgalist=true;
+				var experience=0;
 				for (var i = 0; i < game_list.length; i++) {
 
 					datalist.push({
@@ -371,7 +394,11 @@ class Listofworksstudentone extends Component {
 						classroom: game_list[i].score,
 						complete_status: game_list[i].complete_status,
 					})
+					experience=game_list[i].score+experience;
 
+					if(game_list[i].complete_status === 2 || game_list[i].complete_status===3){
+						boolgalist=false;
+					}
 				}
 				// console.log("viewtraining");
 				// console.log(datalist);
@@ -379,7 +406,9 @@ class Listofworksstudentone extends Component {
 				this.setState({
 					viewtrainingdata: result.data,
 					visibles: true,
-					game_list: datalist
+					game_list: datalist,
+					experience:experience,
+					boolgalist:boolgalist,
 				})
 			}
 		}).catch((error) => {
@@ -458,7 +487,13 @@ class Listofworksstudentone extends Component {
 					task_status: result.data.task_status,
 					course_group_info: result.data.course_group_info,
 					student_works: result.data.student_works,
-					loadingstate: false
+					loadingstate: false,
+					jobsettingsdata: result,
+					publish_immediately: result.data.publish_immediately,
+					work_efficiency: result.data.work_efficiency,
+					end_immediately: result.data.end_immediately,
+					code_review: result.data.code_review,
+					challenges_count:result.data.challenges_count,
 				})
 				this.seacthdata();
 			}
@@ -495,7 +530,7 @@ class Listofworksstudentone extends Component {
 	}
 
 	render() {
-		let {visibles, game_list, limit, viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate} = this.state;
+		let {visibles, game_list, limit,experience, boolgalist,viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate} = this.state;
 		let columns = [
 			{
 				title: '序号',
@@ -639,10 +674,7 @@ class Listofworksstudentone extends Component {
 				align: "center",
 				render: (text, record) => (
 					<span>
-             <a style={{
-							 "color": '#9A9A9A',
-							 "text-align": "center"
-						 }}>{record.completion === undefined ? "--" : record.completion === "" ? "--" : record.completion}</a>
+											<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
         </span>
 				),
 			},
@@ -719,6 +751,8 @@ class Listofworksstudentone extends Component {
 								viewtrainingdata={viewtrainingdata}
 								game_list={game_list}
 								visible={visibles}
+								experience={experience}
+								boolgalist={boolgalist}
 								Cancel={() => this.cancelModulationModels()}
 							/>
 						</div>
@@ -851,6 +885,8 @@ class Listofworksstudentone extends Component {
 							viewtrainingdata={viewtrainingdata}
 							game_list={game_list}
 							visible={visibles}
+							experience={experience}
+							boolgalist={boolgalist}
 							Cancel={() => this.cancelModulationModels()}
 						/> : ""
 					}
@@ -925,7 +961,6 @@ class Listofworksstudentone extends Component {
 									pagination={false}
 									loading={false}
 									showHeader={false}
-									scroll={{y: 240}}
 								/>}
 							</div>
 							{JSON.stringify(datas) !== "[]" ?
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 272ac6418..b63e210ef 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -304,7 +304,7 @@ class ShixunhomeWorkItem extends Component{
               }
 
               {
-                this.props.isNotMember?this.props.discussMessage.private_icon===false?
+                this.props.isNotMember?this.props.discussMessage.private_icon===true?
                   <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</span>
                   :
                   <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/openlist`}
@@ -313,7 +313,7 @@ class ShixunhomeWorkItem extends Component{
 
 
               {
-                 this.props.discussMessage.private_icon===false?
+                 this.props.discussMessage.private_icon===true?
                   <Tooltip title={ this.props.isNotMember?"私有属性，非课堂成员不能访问":"私有属性"} placement="bottom">
                     <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
                   </Tooltip>
@@ -334,7 +334,7 @@ class ShixunhomeWorkItem extends Component{
 								{discussMessage.commit_count===undefined?"":<span className="mr15 color-grey9">{discussMessage.commit_count} 已交</span>}
 								{discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9">{discussMessage.uncommit_count} 未交</span>}
                 {/*<span className="mr15 color-grey9">{discussMessage.replies_count} 3 未评</span>*/}
-                <Tooltip title={discussMessage.time_status>0?"剩余时间":""} placement="bottom">
+                <Tooltip title={discussMessage.time_status===1?"提交剩余时间":"补交剩余时间"} placement="bottom">
                     <span className="mr15 color-grey9">{discussMessage.status_time}</span>
                 </Tooltip>
 
@@ -349,7 +349,7 @@ class ShixunhomeWorkItem extends Component{
 
             {this.props.isAdmin?<div className="homepagePostSetting" style={{"right":"4px","top":"44px","display":"block","width":"192px"}}>
               <a className="btn colorblue font-16" href={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</a>
-              <a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>
+								{this.props.isClassManagement?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
               <WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings`}  > 设置</WordsBtn>
             </div>:""}
 
diff --git a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
index 9f82abcfe..7d34eb9a1 100644
--- a/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
+++ b/public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
@@ -37,6 +37,7 @@ class TraineetraininginformationModal extends Component {
             userids: this.props.userids,
             game_list:this.props.game_list,
             boolgalist:this.props.boolgalist,
+            experience:this.props.experience,
 
         })
        // console.log("TraineetraininginformationModal")
@@ -51,6 +52,26 @@ class TraineetraininginformationModal extends Component {
         // this.seacthdata();
 
     }
+  componentWillReceiveProps(nextProps) {
+    // console.log("46");
+    // console.log(nextProps);
+    // console.log(this.props);
+    if (nextProps.boolgalist != this.props.boolgalist) {
+      // console.log("50");
+      // console.log(nextProps.user);
+      if (nextProps.boolgalist !== undefined) {
+        // console.log("53");
+        // console.log(nextProps.user);
+        this.setState({
+          boolgalist: nextProps.boolgalist,
+        })
+      }
+
+
+    }
+
+
+  }
   LimitNumber=(txt)=> {
     var str = txt;
     if(str.length>25){
@@ -60,7 +81,7 @@ class TraineetraininginformationModal extends Component {
   }
     render() {
       var columns;
-      if(this.props.boolgalist === true) {
+      if(this.state.boolgalist&&this.state.boolgalist === true) {
         columns = [
           {
             title: '关卡',
@@ -195,7 +216,7 @@ class TraineetraininginformationModal extends Component {
                     <div style={{"width": "100%","text-align": "left","clear": "both"}}>
                         <div className="mt5 fl" >
                             <span style={{"text-align": "left"}}>{this.props.viewtrainingdata === undefined ? "" :  this.LimitNumber(this.props.viewtrainingdata.shixun_name)}</span>
-                            <span className="ml10  "  style={{"text-align": "left","color":'#29BD8B'}} >经验值：<span style={{"color":'#29BD8B'}}> {this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}</span></span>
+                          <span className="ml10  "  style={{"text-align": "left","color":'#29BD8B'}} >经验值：<span style={{"color":'#29BD8B'}}> {this.props.experience=== undefined?"0" :this.props.experience}/</span><span style={{"color":'#29BD8B'}}>{this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}</span></span>
                         </div>
                         {/*<Button type="primary" className="ml30"  >实训报告</Button>*/}
                         <Button  type="primary" className="lh38 fr" style={{"text-align": "center","width": "100px",color: "#fff"}} href={`/courses/${this.props.coursesId}/shixun_homeworks/${this.props.viewtrainingdata.work_id}/shixun_work_report`}>
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 6a3379222..bece9862f 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -750,12 +750,42 @@ class Trainingjobsetting extends Component {
                     srorelength++
                 }
             }
+            //算下面值是否是奇数
+            var srbool=false;
+            if( srorelength%2 ==0 ){
+                // 偶数
+                srbool=false;
+            }else{
+                // 奇数
+                srbool=true;
+            }
             //计算平均值
             Proportion= Proportion/srorelength;
+            var intkk=0;
+             if(srbool==true){
+                 var exams = Math.round(Proportion)
+                 var intk = srorelength*exams;
+                 intkk=100 - intk;
+
+             }
+             var mact=0;
+
             //给每到题目赋平均值
             for (var i=0;i<challenge_settingsdata.length;i++){
                 if(challenge_settingsdata[i].checked  === true) {
-                    challenge_settingsdata[i].challenge_score = Proportion.toFixed(2);
+                    if(srbool===false){
+                        challenge_settingsdata[i].challenge_score = Math.round(Proportion);
+
+                    }else{
+                        mact=mact+1;
+                        if(mact===srorelength){
+                            challenge_settingsdata[i].challenge_score = Math.round(Proportion)+intkk;
+
+                        }else {
+                            challenge_settingsdata[i].challenge_score = Math.round(Proportion);
+                        }
+
+                    }
                 }else{
                     challenge_settingsdata[i].challenge_score = 0;
                 }
@@ -1919,7 +1949,7 @@ class Trainingjobsetting extends Component {
                             <p className="ml95 mt15 c_grey font-13 " style={{"color":"#666666"}}> 关卡名称<span
                                 className="color-grey-9 font-10 ml30s" style={{"color":"#999999"}}>(选中的关卡将计入评分计算范围，暂时不支持跳关选择)</span><span
                                 className="color-grey-9 ml90" style={{"color":"#666666"}}>分值</span></p>
-                            <div>
+                            <div className="ml95 mt15">
                                 {this.state.challenge_settings === undefined ? "" : this.state.challenge_settings.map((object, index) => {
                                     return (
                                         <li>
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index 7ebbeb473..35b9d7de7 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -23,6 +23,7 @@ import {
     notification
 } from "antd";
 import {Link, Switch, Route, Redirect} from 'react-router-dom';
+import moment from 'moment'
 import axios from 'axios';
 import '../css/members.css'
 import "../common/formCommon.css"
@@ -429,27 +430,36 @@ class Workquestionandanswer extends Component {
 
                         {jobsettingsdata === undefined|| jobsettingsdata.data.description===null? "无" :  <div className=" clearfix edu-back-white poll_list mt20 mr20 ">
                               <span>
+																<style>
+																	{
+																		`
+																		hr{
+																		display:none;
+																		}
+																		`
+																	}
+																</style>
                              <div className={"font-16 color-dark fl pl20 "}>
                                   <div dangerouslySetInnerHTML={{__html: markdownToHTML(jobsettingsdata.data.description).replace(/▁/g,"▁▁▁")}}></div>
                                  {/*    /!*{}}></div>
                                   {/*    /!*{jobsettingsdata.data.description}*!/*/}
-                             {/*             <textarea>*/}
-                             {/*    {*/}
-                             {/*        this.state.namestring*/}
-                             {/*    }*/}
-                             {/*    </textarea>*/}
+																	 {/*             <textarea>*/}
+																	 {/*    {*/}
+																	 {/*        this.state.namestring*/}
+																	 {/*    }*/}
+																	 {/*    </textarea>*/}
                              </div>
-          {/*                        <div className="justify break_full_word new_li markdown-body"*/}
-          {/*                             id="challenge_editorMd_description">*/}
-          {/*  <p id="ReactMarkdown" style={{overflow:'hidden'}}>*/}
-          {/*    /!*{ChallengesDataList === undefined ? "" :ChallengesDataList.description===null?""*!/*/}
-          {/*      <textarea className="w200">*/}
-          {/*                          {jobsettingsdata.data.description}*/}
-          {/*                        </textarea>*/}
-          {/*    /!*}*!/*/}
-          {/*  </p>*/}
-
-          {/*</div>*/}
+															{/*                        <div className="justify break_full_word new_li markdown-body"*/}
+															{/*                             id="challenge_editorMd_description">*/}
+															{/*  <p id="ReactMarkdown" style={{overflow:'hidden'}}>*/}
+															{/*    /!*{ChallengesDataList === undefined ? "" :ChallengesDataList.description===null?""*!/*/}
+															{/*      <textarea className="w200">*/}
+															{/*                          {jobsettingsdata.data.description}*/}
+															{/*                        </textarea>*/}
+															{/*    /!*}*!/*/}
+															{/*  </p>*/}
+
+															{/*</div>*/}
                               </span>
                         </div>}
 
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 70acf0f80..c3be53486 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -827,8 +827,8 @@ class ShixunHomework extends Component{
 
     this.setState({
       Modalstype:true,
-      Modalstopval:"公开后非课堂成员也可以访问查看",
-      ModalsBottomval:"是否确认公开？",
+      Modalstopval:"设为公开后，非课堂成员也可以访问查看",
+      ModalsBottomval:"是否确认设为公开？",
       ModalCancel:this.cancelmodel,
       ModalSave:this.saveonOpen,
     })
@@ -1190,6 +1190,7 @@ class ShixunHomework extends Component{
                     isAdmin={this.props.isAdmin()}
                     isStudent={this.props.isStudent()}
                     isNotMember={this.props.isNotMember()}
+										isClassManagement={this.props.isClassManagement()}
                     checkBox={this.props.isAdmin()?<Checkbox value={item.homework_id}></Checkbox>:""}
                     match={this.props.match}
                     coursedata={this.props.coursedata}
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
index 9fe14dc02..99b9d5748 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
@@ -10,6 +10,9 @@ function startechart(data){
 	var effChart =  echarts.init(document.getElementById('shixun_skill_chart'));
 
 	var option = {
+		title: {
+			text: '工作效率',
+		},
 		grid:{
 			left: '3%',
 			right: '9%',
@@ -42,7 +45,7 @@ function startechart(data){
 		xAxis:  [
 			{
 				type : 'value',
-				name: '学生序号',
+				name: '学生排名',
 				scale:true,
 				axisLabel : {
 					formatter: ' ',
@@ -57,11 +60,16 @@ function startechart(data){
 		],
 		yAxis:  [
 			{
-				type : 'value',
-				name : '工作效率 = log(实训总得分/实训总耗时)',
+				type : "value",
+				name : "       实训总得分/实训总耗时",
+				nameGap: 20,
+				nameTextStyle: {
+					color: '#000',
+					fontSize:12
+				},
 				scale:true,
 				axisLabel : {
-					formatter:  '{value} '
+					formatter:  '{value}'
 				},
 				splitLine: {
 					show: false
@@ -100,6 +108,7 @@ function startechart(data){
 							name: data.username,
 							xAxis:data.echart_data.myself_eff[0],
 							yAxis:data.echart_data.myself_eff[1],
+							value:data.echart_data.myself_eff[1],
 						}
 					],
 					itemStyle: {
@@ -158,6 +167,9 @@ function startechart(data){
 
 
 	var option1 = {
+		title: {
+			text: '能力值',
+		},
 		backgroundColor: '#fff',
 		color: [
 			'#dd4444', '#fec42c', '#80F1BE'
@@ -200,7 +212,7 @@ function startechart(data){
 		},
 		yAxis: {
 			type: 'value',
-			name: '能力值（实训获得经验值/实训评测次数）',
+			name: "    实训获得经验值/实训评测次数",
 			nameLocation: 'end',
 			nameGap: 20,
 			nameTextStyle: {
@@ -230,7 +242,8 @@ function startechart(data){
 						{
 							name: data.username,
 							xAxis: data.echart_data.myself_object[0],
-							yAxis:data.echart_data.myself_object[1]
+							yAxis:data.echart_data.myself_object[1],
+							value:data.echart_data.myself_object[1]
 						}
 					],
 					itemStyle: {
diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index e5bc75466..846971e82 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -30,7 +30,7 @@ class Trialapplication extends Component {
 			Phonenumberisnotco: undefined,
 			Phonenumberisnotcobool: false,
 			readonlyInput: true,
-			user_phone_binded: false,
+			user_phone_binded: props.user_phone_binded,
 			showTrial: false,
 			user: undefined,
 		}
@@ -383,7 +383,7 @@ class Trialapplication extends Component {
 				{
 					isRenders === false ? "" :
 
-						<div style={{"border-radius": "15px"}}>
+						<div style={{"border-radius": "10px"}}>
 							<style>
 								{
 									`
@@ -427,7 +427,7 @@ class Trialapplication extends Component {
 												#DialogIDysl div  {
 														overflow-y:visible !important;
 														box-shadow:none !important;
-														border-radius:15px !important;
+														border-radius:10px !important;
 												}
 												#wrapper{
 														position: relative;
@@ -541,19 +541,19 @@ class Trialapplication extends Component {
 										 style={{height: '0', width: '0', border: 'none', display: "none"}}/>
 
 							<Dialog open={true} id="DialogIDysl"
-											style={{display: isRenders == false ? 'none' : '', "border-radius": "15px"}}
+											style={{display: isRenders == false ? 'none' : '', "border-radius": "10px"}}
 							>
 								<div id="closeIcon" onClick={() => {
 									this.handleDialogClose()
 								}}>
 									<i className="iconfont icon-shanchudiao"></i>
 								</div>
-								<div className={"login_register_content"} style={{"border-radius": "15px", "width": "560px"}}>
+								<div className={"login_register_content"} style={{"border-radius": "10px", "width": "560px"}}>
 
 									<div className={"login_register_content"} style={
 										user_phone_binded === true ?
 											{
-												"width": "560px", "height": "280px",
+												"width": "560px", "height": "295px",
 												"border-radius": "15px",
 												"background": " #FFFFff",
 												"text-align": "center",
@@ -564,8 +564,8 @@ class Trialapplication extends Component {
 											}
 											:
 											{
-												"width": "560px", "height": "390px",
-												"border-radius": "15px",
+												"width": "560px", "height": "410px",
+												"border-radius": "10px",
 												"background": " #FFFFff",
 												"text-align": "center",
 												// "position": "absolute",
@@ -575,14 +575,12 @@ class Trialapplication extends Component {
 											}
 									}
 									>
-										<ul>
+										<ul style={{"margin-top": "10px","margin-bottom": "10px"}}>
                                 <span style={{
-																	"padding": "20px",
 																	"text-align": "center!important",
 																	"color": "#05101A",
 																	"font-weight": "bold",
 																	"font-size": "17px",
-																	"margin-top": "10px",
 																}}>试用申请</span>
 										</ul>
 
@@ -597,7 +595,7 @@ class Trialapplication extends Component {
 										{
 											user_phone_binded === true ? "" :
 												<div style={{
-													"margin-top": "15px", "padding-left": "50px",
+													"margin-top": "20px", "padding-left": "50px",
 													"padding-right": "50px"
 												}}>
 													<Input placeholder="请输入手机号码" value={login}
@@ -611,7 +609,7 @@ class Trialapplication extends Component {
 															<p className="color-red  mt5 mb5" style={{width: " 100%", height: "20px"}}>
 																<span>{Phonenumberisnotco}</span>
 															</p>
-															: <div className="mt5 mb5" style={{height: "20px"}}></div>
+															: <div style={{height: "20px"}}></div>
 													}
 												</div>
 										}
@@ -665,10 +663,10 @@ class Trialapplication extends Component {
 
 										{
 											Phonenumberisnotcocodes && Phonenumberisnotcocodes != "" ?
-												<p className="color-red  mt2 mb2" style={{width: " 100%", height: "23px"}}>
+												<p className="color-red " style={{width: " 100%", height: "20px"}}>
 													<span>{Phonenumberisnotcocodes}</span>
 												</p>
-												: <div className="mt2 mb2" style={{height: "23px"}}></div>
+												: <div  style={{height: "20px"}}></div>
 										}
 										<div style={{
 											"padding-left": "50px",
@@ -680,10 +678,10 @@ class Trialapplication extends Component {
 														 name="mynames"></Input>
 											{
 												Phonenumberisnotcoreason && Phonenumberisnotcoreason != "" ?
-													<p className="color-red  mt2 mb2" style={{width: " 100%", height: "23px"}}>
+													<p className="color-red" style={{width: " 100%", height: "20px"}}>
 														<span>{Phonenumberisnotcoreason}</span>
 													</p>
-													: <div className="mt2 mb2" style={{height: "23px"}}></div>
+													: <div style={{height: "20px"}}></div>
 											}
 										</div>
 
diff --git a/public/react/src/modules/page/component/monaco/TPIMonaco.js b/public/react/src/modules/page/component/monaco/TPIMonaco.js
index 608669c5e..1d5193a6e 100644
--- a/public/react/src/modules/page/component/monaco/TPIMonaco.js
+++ b/public/react/src/modules/page/component/monaco/TPIMonaco.js
@@ -1,509 +1,510 @@
-import React, { Component } from 'react';
-
-import Dialog, {
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-} from 'material-ui/Dialog';
-import _ from 'lodash'
-import Drawer from 'material-ui/Drawer';
-
-import './TPIMonaco.css'
-import TPICodeSetting from '../TPICodeSetting'
-
-import * as monaco from 'monaco-editor'
-
-
-import { fromStore, toStore } from 'educoder'
-import './TPIMonacoConfig'
-monaco.editor.defineTheme('myCoolTheme', {
-      base: 'vs-dark',
-      inherit: true,
-      rules: [       
-        { token: 'green', background: 'FF0000', foreground: '00FF00', fontStyle: 'italic'},
-        { token: 'red', foreground: 'FF0000' , fontStyle: 'bold underline'},
-        { background: '#121c23' },
-        // { foreground: 'FFFFFF' }
-      ],
-      // editor_monaco._themeService._knownThemes.get('myCoolTheme')
-      colors: {
-        // 'editor.foreground': '#FFFFFF',
-        'editor.background': '#121c23',
-
-        // 'editor.selectionHighlightBorder': '#ffffff',
-        // 'input.border': '#ffffff',
-        'editor.lineHighlightBorder': '#222c34',        // .current-line
-        
-      }
-});
-
-const $ = window.$;
-function loadMonacoResouce(callback) {
-    let _url_origin = ``;
-    let prefix = 'react/build'
-    if (window.location.port == 3007) {
-        prefix = ''
-    } else {
-        _url_origin = `https://testeduplus2.educoder.net/`;
-    }
-    const $ = window.$;
-
-    if (!window['monaco']) {
-        // How to import this library in a create-react-app?
-        // https://github.com/Microsoft/monaco-editor/issues/82
-        // window.require = { paths: { 'vs': '../node_modules/monaco-editor/min/vs' } };
-        // window.require = { paths: { 'vs': `${_url_origin}${prefix}/js/monaco/vs` } };
-       
-        // $('head').append($('<link rel="stylesheet" type="text/css" />')
-        //     .attr('href', `${_url_origin}${prefix}/js/monaco/vs/editor/editor.main.css`));
-
-        // $.ajaxSetup({
-        //     cache: true
-        // });
-        // $.when(
-            
-        //     // $.getScript( `${_url_origin}${prefix}/js/monaco/vs/language/typescript/tsMode.js` ),
-        //     // $.getScript( `${_url_origin}${prefix}/js/monaco/vs/basic-languages/javascript/javascript.js` ),
-        //     $.getScript( `${_url_origin}${prefix}/js/monaco/vs/basic-languages/python/python.js` ),
-        //     // $.getScript( `${_url_origin}${prefix}/js/monaco/vs/language/typescript/tsWorker.js` ),
-
-        //     $.getScript(  `${_url_origin}${prefix}/js/monaco/vs/loader.js` ),
-        //     $.getScript( `${_url_origin}${prefix}/js/monaco/vs/editor/editor.main.nls.js` ),
-        //     $.getScript( `${_url_origin}${prefix}/js/monaco/vs/editor/editor.main.js` ),
-        //     $.Deferred(function( deferred ){
-        //         console.log('Deferred')
-                
-        //         // TODO 暂时放这里
-        //         $( deferred.resolve );
-        //         checkIfLoaded(callback);
-
-        //     })
-        // ).done(function(){
-        //     debugger;
-        //     // TODO 没执行到这里
-        //     console.log('done done done ')
-        //     //place your code here, the scripts are all loaded
-        //     // callback && callback()
-        // });
-
-        // require.config({ paths: { 'vs': `/monaco/vs` }});
-
-        // require(['/vs/editor/editor.main'], function() {
-            callback && callback()
-            var editor = monaco.editor.create(document.getElementById('container'), {
-                value: [
-                    'function x() {',
-                    '\tconsole.log("Hello world!");',
-                    '}'
-                ].join('\n'),
-                language: 'javascript'
-            });
-        // });
-
-    } else {
-        callback && callback()
-    }
-}
-function checkIfLoaded (callback) {
-    if (window.monaco && window.monaco.editor) {
-        $.ajaxSetup({
-            cache: false
-        });
-        callback && callback()
-    } else {
-        console.log('check again 2s later..')
-        setTimeout(() => {
-            checkIfLoaded(callback)
-        }, 2000);
-    }
-}
-
-/*
-    language  
-    javascript css less scss html typescript
-    java ruby vb r python php perl go cpp csharp
-    sql pgsql mysql
-    swift objective-c
-    shell
-    redis
-    xml yaml
-    markdown
-
-    'JFinal': 'text/x-java',
-    'Java': 'text/x-java',
-    'Kotlin': 'text/x-kotlin',
-    'C/C++' : 'text/x-c++src',
-    'MachineLearning': {
-                name: "python",
-                version: 3,
-                singleLineStringErrors: false
-    },
-    'Python2.7': {
-                name: "python",
-                version: 3,
-                singleLineStringErrors: false
-    },
-    'Python3.6': {
-                name: "python",
-                version: 3,
-                singleLineStringErrors: false
-    },
-*/ 
-const mirror2LanguageMap = {
-    'JFinal': 'java',
-    'Java': 'java',
-    'Kotlin': 'java',
-
-    'Html': 'html',
-    'Css': 'css',
-    'Javascript': 'javascript',
-
-    'C/C++': 'cpp',
-    'MachineLearning': 'python',
-    'Python2.7': 'python',
-    'Python3.6': 'python',
-
-    'C#': 'csharp',
-    'R': 'r'
-
-}
-function getLanguageByMirrorName(mirror_name) {
-    let lang = 'javascript'
-    if (mirror_name && mirror_name.length) {
-        // 需要倒着遍历， html、css的实训，主评测语言环境是python，小类别是html或css
-        for (let i = mirror_name.length - 1; i >= 0; i--) {
-            let languageVal = mirror2LanguageMap[mirror_name[i]];
-            if (languageVal) {
-                lang = languageVal;
-                break;
-            }
-        }
-    }
-    return lang;
-}
-
-let notCallCodeMirrorOnChangeFlag = false;
-class TPIMonaco extends Component {
-
-	constructor(props) {
-		super(props)
-
-        loadMonacoResouce();
-		this.state = {
-            cmFontSize: fromStore('cmFontSize', 16),
-            autoCompleteSwitch: fromStore('autoCompleteSwitch', true),
-		}
-	}
-    
-	componentDidUpdate(prevProps, prevState, snapshot) {
-        const { game, mirror_name } = this.props
-        const editor_monaco = this.editor_monaco;
-        if (editor_monaco && !_.isEqual(prevProps.mirror_name, mirror_name)) {
-            // TODO 后期考虑加入，根据文件类型的不同，使用不同的lang
-            const lang = getLanguageByMirrorName(mirror_name);
-            // https://github.com/Microsoft/monaco-editor/issues/539
-            window.monaco.editor.setModelLanguage(editor_monaco.getModel(), lang)
-        } else if (prevProps.isEditablePath != this.props.isEditablePath) {
-            if (this.props.isEditablePath) {
-                editor_monaco.updateOptions({readOnly: false})
-            } else {
-                editor_monaco.updateOptions({readOnly: true})
-            }
-        
-        } else if (editor_monaco && prevProps.codeLoading === true && this.props.codeLoading === false 
-                ) {
-            if (this.props.repositoryCode != editor_monaco.getValue()) {
-                // newProps.repositoryCode !== this.props.repositoryCode && 
-                notCallCodeMirrorOnChangeFlag = true;
-                
-                // 重要：setState(因获取代码、重置代码等接口引起的调用)调用引起的变化才需要setValue
-                editor_monaco.setValue(this.props.repositoryCode)
-            }
-            // 代码没变也需要layout，可能从命令行自动切回了代码tab
-            editor_monaco.layout();
-
-            // Clears the editor's undo history.
-            // TODO
-            // extend_editor.clearHistory()
-        } 
-    }
-	componentDidMount() {
-        checkIfLoaded(() => {
-            let value = [
-                'define([], function() {',
-                '\treturn ({p1, p2}) => {',
-                '\t\treturn Promise.resolve("Hello, World");',
-                '\t};',
-                '});'
-            ].join('\n');
-            // value = [
-            //         'function x() {',
-            //         '\tconsole.log("Hello world!");',
-            //         '}'
-            //     ].join('\n'),
-            value =  "<h1>Hello</h1>↵<!-- ********* Begin ********* -->↵    ↵    ↵<!-- ********* End ********* -->"
-
-            value = this.props.repositoryCode
-
-            const height =  $('#games_repository_contents').height() - 40
-            const width =  $('#games_repository_contents').width()
-
-            $('#codetab_con_1').height(height)
-
-            const lang = getLanguageByMirrorName(this.props.mirror_name);
-            const editor = window.monaco.editor.create(document.getElementById('extend-challenge-file-edit'), {
-                value: value,
-                // 属性说明
-                // http://testeduplus2.educoder.net/react/build/static/node_modules/_monaco-editor@0.15.6@monaco-editor/esm/vs/editor/common/config/commonEditorConfig.js
-                // https://github.com/Microsoft/monaco-editor/issues/29
-                scrollBeyondLastLine: false,
- 
-                language: lang,
-                // language: 'css',
-
-                // theme: "vs-dark",
-                theme: "myCoolTheme",
-                fontSize: this.state.cmFontSize
-                
-            });
-
-            window.editor_monaco = editor;
-            this.editor_monaco = editor
-            
-            // editor.setPosition({ lineNumber: 2, column: 30 });
-
-            // editor.model.onDidChangeContent((event) => {
-            //     if (notCallCodeMirrorOnChangeFlag === true) {
-            //         notCallCodeMirrorOnChangeFlag = false
-            //         return;
-            //     }
-            //     this.props.onRepositoryCodeUpdate(editor.getValue())
-            // });
-
-            editor.onDidChangeModelContent((event) => {
-                if (notCallCodeMirrorOnChangeFlag === true) {
-                    notCallCodeMirrorOnChangeFlag = false
-                    return;
-                }
-                this.props.onRepositoryCodeUpdate(editor.getValue())
-            })
-            this.props.codemirrorDidMount && this.props.codemirrorDidMount()
-            
-            if(this.props.shixun.forbid_copy == true) {
-                // 禁用粘贴
-                // https://github.com/Microsoft/monaco-editor/issues/100
-                window.editor_monaco.onDidPaste( (a, b, c) => { window.__pastePosition = a })
-                window.addEventListener('paste', (a, b, c) => { 
-                    const selection = window.editor_monaco.getSelection(); 
-                    const range = new monaco.Range( 
-                        window.__pastePosition.startLineNumber || selection.endLineNumber, 
-                        window.__pastePosition.startColumn || selection.endColumn, 
-                        window.__pastePosition.endLineNumber || selection.endLineNumber, 
-                        window.__pastePosition.endColumn || selection.endColumn,); 
-                    window.editor_monaco.executeEdits('', [{range, text: ''}] )
-
-                })  
-
-                // 禁用复制
-                window.editor_monaco.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_C, () => null);
-            }
-             
-
-            setTimeout(() => {
-                editor.layout();
-                editor.focus();
-            }, 600)
-
-            
-        })
-
-        window.document.onkeydown = (e) => { 
-            e = window.event || e;
-            if(e.keyCode== 83 && e.ctrlKey){ 
-            /*延迟，兼容FF浏览器  */
-                // setTimeout(function(){
-                    // alert('ctrl+s'); 
-                // },1); 
-                this.props.doFileUpdateRequestOnCodeMirrorBlur();
-                return false;      
-            }    
-        };
-    }
-    onFontSizeChange = (value) => {
-        toStore('cmFontSize', value)
-        this.editor_monaco.updateOptions({fontSize: value})
-
-        this.setState({ cmFontSize: value });
-    }
-    onAutoCompleteSwitchChange = () => {
-
-    }
-	render() {
-		const { repositoryCode, showSettingDrawer, settingDrawerOpen } = this.props;
-		const { cmFontSize } = this.state;
-         
-	    return (
-            <React.Fragment>
-                <Drawer
-                    anchor="right"
-
-                    className="settingDrawer"
-
-                    width={260}
-                    open={settingDrawerOpen}
-                    
-                    onClose={() => showSettingDrawer( false )}
-                >
-                    <TPICodeSetting {...this.props} {...this.state} 
-                        onFontSizeChange={this.onFontSizeChange}
-                        onAutoCompleteSwitchChange={this.onAutoCompleteSwitchChange}
-                         ></TPICodeSetting>
-                </Drawer>
-                <div className = "" id="extend-challenge-file-edit" name="content"
-                    style={{ width: '100%', height: '100%', border:'1px solid grey' }}></div>
-            </React.Fragment>
-	    );
-  	}
-}
-
-
-export default ( TPIMonaco ) ;
-
-
-
-/**
-// http://testeduplus2.educoder.net/react/build/static/node_modules/
-    _monaco-editor@0.15.6@monaco-editor/esm/vs/editor/common/config/editorOptions.js
-export var EDITOR_DEFAULTS = {
-    inDiffEditor: false,
-    wordSeparators: USUAL_WORD_SEPARATORS,
-    lineNumbersMinChars: 5,
-    lineDecorationsWidth: 10,
-    readOnly: false,
-    mouseStyle: 'text',
-    disableLayerHinting: false,
-    automaticLayout: false,
-    wordWrap: 'off',
-    wordWrapColumn: 80,
-    wordWrapMinified: true,
-    wrappingIndent: 1 
-    wordWrapBreakBeforeCharacters: '([{‘“〈《「『【〔（［｛｢£¥＄￡￥+＋',
-    wordWrapBreakAfterCharacters: ' \t})]?|&,;¢°′″‰℃、。｡､￠，．：；？！％・･ゝゞヽヾーァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ々〻ｧｨｩｪｫｬｭｮｯｰ”〉》」』】〕）］｝｣',
-    wordWrapBreakObtrusiveCharacters: '.',
-    autoClosingBrackets: 'languageDefined',
-    autoClosingQuotes: 'languageDefined',
-    autoSurround: 'languageDefined',
-    autoIndent: true,
-    dragAndDrop: true,
-    emptySelectionClipboard: true,
-    copyWithSyntaxHighlighting: true,
-    useTabStops: true,
-    multiCursorModifier: 'altKey',
-    multiCursorMergeOverlapping: true,
-    accessibilitySupport: 'auto',
-    showUnused: true,
-    viewInfo: {
-        extraEditorClassName: '',
-        disableMonospaceOptimizations: false,
-        rulers: [],
-        ariaLabel: nls.localize('editorViewAccessibleLabel', "Editor content"),
-        renderLineNumbers: 1 // On ,
-        renderCustomLineNumbers: null,
-        selectOnLineNumbers: true,
-        glyphMargin: true,
-        revealHorizontalRightPadding: 30,
-        roundedSelection: true,
-        overviewRulerLanes: 2,
-        overviewRulerBorder: true,
-        cursorBlinking: 1 /* Blink ,
-        mouseWheelZoom: false,
-        cursorStyle: TextEditorCursorStyle.Line,
-        cursorWidth: 0,
-        hideCursorInOverviewRuler: false,
-        scrollBeyondLastLine: true,
-        scrollBeyondLastColumn: 5,
-        smoothScrolling: false,
-        stopRenderingLineAfter: 10000,
-        renderWhitespace: 'none',
-        renderControlCharacters: false,
-        fontLigatures: false,
-        renderIndentGuides: true,
-        highlightActiveIndentGuide: true,
-        renderLineHighlight: 'line',
-        scrollbar: {
-            vertical: 1 /* Auto ,
-            horizontal: 1 /* Auto ,
-            arrowSize: 11,
-            useShadows: true,
-            verticalHasArrows: false,
-            horizontalHasArrows: false,
-            horizontalScrollbarSize: 10,
-            horizontalSliderSize: 10,
-            verticalScrollbarSize: 14,
-            verticalSliderSize: 14,
-            handleMouseWheel: true,
-            mouseWheelScrollSensitivity: 1,
-        },
-        minimap: {
-            enabled: true,
-            side: 'right',
-            showSlider: 'mouseover',
-            renderCharacters: true,
-            maxColumn: 120
-        },
-        fixedOverflowWidgets: false,
-    },
-    contribInfo: {
-        selectionClipboard: true,
-        hover: {
-            enabled: true,
-            delay: 300,
-            sticky: true
-        },
-        links: true,
-        contextmenu: true,
-        quickSuggestions: { other: true, comments: false, strings: false },
-        quickSuggestionsDelay: 10,
-        parameterHints: {
-            enabled: true,
-            cycle: false
-        },
-        iconsInSuggestions: true,
-        formatOnType: false,
-        formatOnPaste: false,
-        suggestOnTriggerCharacters: true,
-        acceptSuggestionOnEnter: 'on',
-        acceptSuggestionOnCommitCharacter: true,
-        wordBasedSuggestions: true,
-        suggestSelection: 'recentlyUsed',
-        suggestFontSize: 0,
-        suggestLineHeight: 0,
-        tabCompletion: 'off',
-        suggest: {
-            filterGraceful: true,
-            snippets: 'inline',
-            snippetsPreventQuickSuggestions: true,
-            localityBonus: false
-        },
-        selectionHighlight: true,
-        occurrencesHighlight: true,
-        codeLens: true,
-        folding: true,
-        foldingStrategy: 'auto',
-        showFoldingControls: 'mouseover',
-        matchBrackets: true,
-        find: {
-            seedSearchStringFromSelection: true,
-            autoFindInSelection: false,
-            globalFindClipboard: false
-        },
-        colorDecorators: true,
-        lightbulbEnabled: true,
-        codeActionsOnSave: {},
-        codeActionsOnSaveTimeout: 750
-    },
-};
-
-
+import React, { Component } from 'react';
+
+import Dialog, {
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle,
+} from 'material-ui/Dialog';
+import _ from 'lodash'
+import Drawer from 'material-ui/Drawer';
+
+import './TPIMonaco.css'
+import TPICodeSetting from '../TPICodeSetting'
+
+import * as monaco from 'monaco-editor'
+
+
+import { fromStore, toStore } from 'educoder'
+import './TPIMonacoConfig'
+monaco.editor.defineTheme('myCoolTheme', {
+      base: 'vs-dark',
+      inherit: true,
+      rules: [       
+        { token: 'green', background: 'FF0000', foreground: '00FF00', fontStyle: 'italic'},
+        { token: 'red', foreground: 'FF0000' , fontStyle: 'bold underline'},
+        { background: '#121c23' },
+        // { foreground: 'FFFFFF' }
+      ],
+      // editor_monaco._themeService._knownThemes.get('myCoolTheme')
+      colors: {
+        // 'editor.foreground': '#FFFFFF',
+        'editor.background': '#121c23',
+
+        // 'editor.selectionHighlightBorder': '#ffffff',
+        // 'input.border': '#ffffff',
+        'editor.lineHighlightBorder': '#222c34',        // .current-line
+        
+      }
+});
+
+const $ = window.$;
+function loadMonacoResouce(callback) {
+    let _url_origin = ``;
+    let prefix = 'react/build'
+    if (window.location.port == 3007) {
+        prefix = ''
+    } else {
+        // _url_origin = `https://testeduplus2.educoder.net/`;
+		   	_url_origin  = 'http://47.96.87.25:48080';
+    }
+    const $ = window.$;
+
+    if (!window['monaco']) {
+        // How to import this library in a create-react-app?
+        // https://github.com/Microsoft/monaco-editor/issues/82
+        // window.require = { paths: { 'vs': '../node_modules/monaco-editor/min/vs' } };
+        // window.require = { paths: { 'vs': `${_url_origin}${prefix}/js/monaco/vs` } };
+       
+        // $('head').append($('<link rel="stylesheet" type="text/css" />')
+        //     .attr('href', `${_url_origin}${prefix}/js/monaco/vs/editor/editor.main.css`));
+
+        // $.ajaxSetup({
+        //     cache: true
+        // });
+        // $.when(
+            
+        //     // $.getScript( `${_url_origin}${prefix}/js/monaco/vs/language/typescript/tsMode.js` ),
+        //     // $.getScript( `${_url_origin}${prefix}/js/monaco/vs/basic-languages/javascript/javascript.js` ),
+        //     $.getScript( `${_url_origin}${prefix}/js/monaco/vs/basic-languages/python/python.js` ),
+        //     // $.getScript( `${_url_origin}${prefix}/js/monaco/vs/language/typescript/tsWorker.js` ),
+
+        //     $.getScript(  `${_url_origin}${prefix}/js/monaco/vs/loader.js` ),
+        //     $.getScript( `${_url_origin}${prefix}/js/monaco/vs/editor/editor.main.nls.js` ),
+        //     $.getScript( `${_url_origin}${prefix}/js/monaco/vs/editor/editor.main.js` ),
+        //     $.Deferred(function( deferred ){
+        //         console.log('Deferred')
+                
+        //         // TODO 暂时放这里
+        //         $( deferred.resolve );
+        //         checkIfLoaded(callback);
+
+        //     })
+        // ).done(function(){
+        //     debugger;
+        //     // TODO 没执行到这里
+        //     console.log('done done done ')
+        //     //place your code here, the scripts are all loaded
+        //     // callback && callback()
+        // });
+
+        // require.config({ paths: { 'vs': `/monaco/vs` }});
+
+        // require(['/vs/editor/editor.main'], function() {
+            callback && callback()
+            var editor = monaco.editor.create(document.getElementById('container'), {
+                value: [
+                    'function x() {',
+                    '\tconsole.log("Hello world!");',
+                    '}'
+                ].join('\n'),
+                language: 'javascript'
+            });
+        // });
+
+    } else {
+        callback && callback()
+    }
+}
+function checkIfLoaded (callback) {
+    if (window.monaco && window.monaco.editor) {
+        $.ajaxSetup({
+            cache: false
+        });
+        callback && callback()
+    } else {
+        console.log('check again 2s later..')
+        setTimeout(() => {
+            checkIfLoaded(callback)
+        }, 2000);
+    }
+}
+
+/*
+    language  
+    javascript css less scss html typescript
+    java ruby vb r python php perl go cpp csharp
+    sql pgsql mysql
+    swift objective-c
+    shell
+    redis
+    xml yaml
+    markdown
+
+    'JFinal': 'text/x-java',
+    'Java': 'text/x-java',
+    'Kotlin': 'text/x-kotlin',
+    'C/C++' : 'text/x-c++src',
+    'MachineLearning': {
+                name: "python",
+                version: 3,
+                singleLineStringErrors: false
+    },
+    'Python2.7': {
+                name: "python",
+                version: 3,
+                singleLineStringErrors: false
+    },
+    'Python3.6': {
+                name: "python",
+                version: 3,
+                singleLineStringErrors: false
+    },
+*/ 
+const mirror2LanguageMap = {
+    'JFinal': 'java',
+    'Java': 'java',
+    'Kotlin': 'java',
+
+    'Html': 'html',
+    'Css': 'css',
+    'Javascript': 'javascript',
+
+    'C/C++': 'cpp',
+    'MachineLearning': 'python',
+    'Python2.7': 'python',
+    'Python3.6': 'python',
+
+    'C#': 'csharp',
+    'R': 'r'
+
+}
+function getLanguageByMirrorName(mirror_name) {
+    let lang = 'javascript'
+    if (mirror_name && mirror_name.length) {
+        // 需要倒着遍历， html、css的实训，主评测语言环境是python，小类别是html或css
+        for (let i = mirror_name.length - 1; i >= 0; i--) {
+            let languageVal = mirror2LanguageMap[mirror_name[i]];
+            if (languageVal) {
+                lang = languageVal;
+                break;
+            }
+        }
+    }
+    return lang;
+}
+
+let notCallCodeMirrorOnChangeFlag = false;
+class TPIMonaco extends Component {
+
+	constructor(props) {
+		super(props)
+
+        loadMonacoResouce();
+		this.state = {
+            cmFontSize: fromStore('cmFontSize', 16),
+            autoCompleteSwitch: fromStore('autoCompleteSwitch', true),
+		}
+	}
+    
+	componentDidUpdate(prevProps, prevState, snapshot) {
+        const { game, mirror_name } = this.props
+        const editor_monaco = this.editor_monaco;
+        if (editor_monaco && !_.isEqual(prevProps.mirror_name, mirror_name)) {
+            // TODO 后期考虑加入，根据文件类型的不同，使用不同的lang
+            const lang = getLanguageByMirrorName(mirror_name);
+            // https://github.com/Microsoft/monaco-editor/issues/539
+            window.monaco.editor.setModelLanguage(editor_monaco.getModel(), lang)
+        } else if (prevProps.isEditablePath != this.props.isEditablePath) {
+            if (this.props.isEditablePath) {
+                editor_monaco.updateOptions({readOnly: false})
+            } else {
+                editor_monaco.updateOptions({readOnly: true})
+            }
+        
+        } else if (editor_monaco && prevProps.codeLoading === true && this.props.codeLoading === false 
+                ) {
+            if (this.props.repositoryCode != editor_monaco.getValue()) {
+                // newProps.repositoryCode !== this.props.repositoryCode && 
+                notCallCodeMirrorOnChangeFlag = true;
+                
+                // 重要：setState(因获取代码、重置代码等接口引起的调用)调用引起的变化才需要setValue
+                editor_monaco.setValue(this.props.repositoryCode)
+            }
+            // 代码没变也需要layout，可能从命令行自动切回了代码tab
+            editor_monaco.layout();
+
+            // Clears the editor's undo history.
+            // TODO
+            // extend_editor.clearHistory()
+        } 
+    }
+	componentDidMount() {
+        checkIfLoaded(() => {
+            let value = [
+                'define([], function() {',
+                '\treturn ({p1, p2}) => {',
+                '\t\treturn Promise.resolve("Hello, World");',
+                '\t};',
+                '});'
+            ].join('\n');
+            // value = [
+            //         'function x() {',
+            //         '\tconsole.log("Hello world!");',
+            //         '}'
+            //     ].join('\n'),
+            value =  "<h1>Hello</h1>↵<!-- ********* Begin ********* -->↵    ↵    ↵<!-- ********* End ********* -->"
+
+            value = this.props.repositoryCode
+
+            const height =  $('#games_repository_contents').height() - 40
+            const width =  $('#games_repository_contents').width()
+
+            $('#codetab_con_1').height(height)
+
+            const lang = getLanguageByMirrorName(this.props.mirror_name);
+            const editor = window.monaco.editor.create(document.getElementById('extend-challenge-file-edit'), {
+                value: value,
+                // 属性说明
+                // http://testeduplus2.educoder.net/react/build/static/node_modules/_monaco-editor@0.15.6@monaco-editor/esm/vs/editor/common/config/commonEditorConfig.js
+                // https://github.com/Microsoft/monaco-editor/issues/29
+                scrollBeyondLastLine: false,
+ 
+                language: lang,
+                // language: 'css',
+
+                // theme: "vs-dark",
+                theme: "myCoolTheme",
+                fontSize: this.state.cmFontSize
+                
+            });
+
+            window.editor_monaco = editor;
+            this.editor_monaco = editor
+            
+            // editor.setPosition({ lineNumber: 2, column: 30 });
+
+            // editor.model.onDidChangeContent((event) => {
+            //     if (notCallCodeMirrorOnChangeFlag === true) {
+            //         notCallCodeMirrorOnChangeFlag = false
+            //         return;
+            //     }
+            //     this.props.onRepositoryCodeUpdate(editor.getValue())
+            // });
+
+            editor.onDidChangeModelContent((event) => {
+                if (notCallCodeMirrorOnChangeFlag === true) {
+                    notCallCodeMirrorOnChangeFlag = false
+                    return;
+                }
+                this.props.onRepositoryCodeUpdate(editor.getValue())
+            })
+            this.props.codemirrorDidMount && this.props.codemirrorDidMount()
+            
+            if(this.props.shixun.forbid_copy == true) {
+                // 禁用粘贴
+                // https://github.com/Microsoft/monaco-editor/issues/100
+                window.editor_monaco.onDidPaste( (a, b, c) => { window.__pastePosition = a })
+                window.addEventListener('paste', (a, b, c) => { 
+                    const selection = window.editor_monaco.getSelection(); 
+                    const range = new monaco.Range( 
+                        window.__pastePosition.startLineNumber || selection.endLineNumber, 
+                        window.__pastePosition.startColumn || selection.endColumn, 
+                        window.__pastePosition.endLineNumber || selection.endLineNumber, 
+                        window.__pastePosition.endColumn || selection.endColumn,); 
+                    window.editor_monaco.executeEdits('', [{range, text: ''}] )
+
+                })  
+
+                // 禁用复制
+                window.editor_monaco.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_C, () => null);
+            }
+             
+
+            setTimeout(() => {
+                editor.layout();
+                editor.focus();
+            }, 600)
+
+            
+        })
+
+        window.document.onkeydown = (e) => { 
+            e = window.event || e;
+            if(e.keyCode== 83 && e.ctrlKey){ 
+            /*延迟，兼容FF浏览器  */
+                // setTimeout(function(){
+                    // alert('ctrl+s'); 
+                // },1); 
+                this.props.doFileUpdateRequestOnCodeMirrorBlur();
+                return false;      
+            }    
+        };
+    }
+    onFontSizeChange = (value) => {
+        toStore('cmFontSize', value)
+        this.editor_monaco.updateOptions({fontSize: value})
+
+        this.setState({ cmFontSize: value });
+    }
+    onAutoCompleteSwitchChange = () => {
+
+    }
+	render() {
+		const { repositoryCode, showSettingDrawer, settingDrawerOpen } = this.props;
+		const { cmFontSize } = this.state;
+         
+	    return (
+            <React.Fragment>
+                <Drawer
+                    anchor="right"
+
+                    className="settingDrawer"
+
+                    width={260}
+                    open={settingDrawerOpen}
+                    
+                    onClose={() => showSettingDrawer( false )}
+                >
+                    <TPICodeSetting {...this.props} {...this.state} 
+                        onFontSizeChange={this.onFontSizeChange}
+                        onAutoCompleteSwitchChange={this.onAutoCompleteSwitchChange}
+                         ></TPICodeSetting>
+                </Drawer>
+                <div className = "" id="extend-challenge-file-edit" name="content"
+                    style={{ width: '100%', height: '100%', border:'1px solid grey' }}></div>
+            </React.Fragment>
+	    );
+  	}
+}
+
+
+export default ( TPIMonaco ) ;
+
+
+
+/**
+// http://testeduplus2.educoder.net/react/build/static/node_modules/
+    _monaco-editor@0.15.6@monaco-editor/esm/vs/editor/common/config/editorOptions.js
+export var EDITOR_DEFAULTS = {
+    inDiffEditor: false,
+    wordSeparators: USUAL_WORD_SEPARATORS,
+    lineNumbersMinChars: 5,
+    lineDecorationsWidth: 10,
+    readOnly: false,
+    mouseStyle: 'text',
+    disableLayerHinting: false,
+    automaticLayout: false,
+    wordWrap: 'off',
+    wordWrapColumn: 80,
+    wordWrapMinified: true,
+    wrappingIndent: 1 
+    wordWrapBreakBeforeCharacters: '([{‘“〈《「『【〔（［｛｢£¥＄￡￥+＋',
+    wordWrapBreakAfterCharacters: ' \t})]?|&,;¢°′″‰℃、。｡､￠，．：；？！％・･ゝゞヽヾーァィゥェォッャュョヮヵヶぁぃぅぇぉっゃゅょゎゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ々〻ｧｨｩｪｫｬｭｮｯｰ”〉》」』】〕）］｝｣',
+    wordWrapBreakObtrusiveCharacters: '.',
+    autoClosingBrackets: 'languageDefined',
+    autoClosingQuotes: 'languageDefined',
+    autoSurround: 'languageDefined',
+    autoIndent: true,
+    dragAndDrop: true,
+    emptySelectionClipboard: true,
+    copyWithSyntaxHighlighting: true,
+    useTabStops: true,
+    multiCursorModifier: 'altKey',
+    multiCursorMergeOverlapping: true,
+    accessibilitySupport: 'auto',
+    showUnused: true,
+    viewInfo: {
+        extraEditorClassName: '',
+        disableMonospaceOptimizations: false,
+        rulers: [],
+        ariaLabel: nls.localize('editorViewAccessibleLabel', "Editor content"),
+        renderLineNumbers: 1 // On ,
+        renderCustomLineNumbers: null,
+        selectOnLineNumbers: true,
+        glyphMargin: true,
+        revealHorizontalRightPadding: 30,
+        roundedSelection: true,
+        overviewRulerLanes: 2,
+        overviewRulerBorder: true,
+        cursorBlinking: 1 /* Blink ,
+        mouseWheelZoom: false,
+        cursorStyle: TextEditorCursorStyle.Line,
+        cursorWidth: 0,
+        hideCursorInOverviewRuler: false,
+        scrollBeyondLastLine: true,
+        scrollBeyondLastColumn: 5,
+        smoothScrolling: false,
+        stopRenderingLineAfter: 10000,
+        renderWhitespace: 'none',
+        renderControlCharacters: false,
+        fontLigatures: false,
+        renderIndentGuides: true,
+        highlightActiveIndentGuide: true,
+        renderLineHighlight: 'line',
+        scrollbar: {
+            vertical: 1 /* Auto ,
+            horizontal: 1 /* Auto ,
+            arrowSize: 11,
+            useShadows: true,
+            verticalHasArrows: false,
+            horizontalHasArrows: false,
+            horizontalScrollbarSize: 10,
+            horizontalSliderSize: 10,
+            verticalScrollbarSize: 14,
+            verticalSliderSize: 14,
+            handleMouseWheel: true,
+            mouseWheelScrollSensitivity: 1,
+        },
+        minimap: {
+            enabled: true,
+            side: 'right',
+            showSlider: 'mouseover',
+            renderCharacters: true,
+            maxColumn: 120
+        },
+        fixedOverflowWidgets: false,
+    },
+    contribInfo: {
+        selectionClipboard: true,
+        hover: {
+            enabled: true,
+            delay: 300,
+            sticky: true
+        },
+        links: true,
+        contextmenu: true,
+        quickSuggestions: { other: true, comments: false, strings: false },
+        quickSuggestionsDelay: 10,
+        parameterHints: {
+            enabled: true,
+            cycle: false
+        },
+        iconsInSuggestions: true,
+        formatOnType: false,
+        formatOnPaste: false,
+        suggestOnTriggerCharacters: true,
+        acceptSuggestionOnEnter: 'on',
+        acceptSuggestionOnCommitCharacter: true,
+        wordBasedSuggestions: true,
+        suggestSelection: 'recentlyUsed',
+        suggestFontSize: 0,
+        suggestLineHeight: 0,
+        tabCompletion: 'off',
+        suggest: {
+            filterGraceful: true,
+            snippets: 'inline',
+            snippetsPreventQuickSuggestions: true,
+            localityBonus: false
+        },
+        selectionHighlight: true,
+        occurrencesHighlight: true,
+        codeLens: true,
+        folding: true,
+        foldingStrategy: 'auto',
+        showFoldingControls: 'mouseover',
+        matchBrackets: true,
+        find: {
+            seedSearchStringFromSelection: true,
+            autoFindInSelection: false,
+            globalFindClipboard: false
+        },
+        colorDecorators: true,
+        lightbulbEnabled: true,
+        codeActionsOnSave: {},
+        codeActionsOnSaveTimeout: 750
+    },
+};
+
+
  */
\ No newline at end of file
diff --git a/public/react/src/modules/page/main/Webssh.js b/public/react/src/modules/page/main/Webssh.js
index 9a052b6cf..c706085d4 100644
--- a/public/react/src/modules/page/main/Webssh.js
+++ b/public/react/src/modules/page/main/Webssh.js
@@ -1,74 +1,75 @@
-import React, { Component } from 'react';
-
-export function loadSshScript(callback) {
-    let _url_origin = ``;
-    let prefix = 'react/build'
-    if (window.location.port == 3007) {
-        prefix = ''
-    } else {
-        _url_origin = `https://testeduplus2.educoder.net/`;
-    }
-    const $ = window.$;
-    // 未加载过
-    if (!window['Terminal']) {
-        // /js/js_min_all.
-        $('head').append($('<link rel="stylesheet" type="text/css" />')
-            .attr('href', `${_url_origin}${prefix}/js/xterm/xterm.css`));
-
-        // $.getScript(
-        // `${_url_origin}${prefix}/js/xterm/xterm.js`,
-        //     (data, textStatus, jqxhr) => {
-        // });
-        // $.getScript(
-        // `${_url_origin}${prefix}/js/jsFromMiddleLayer/base64.js`,
-        //     (data, textStatus, jqxhr) => {
-        // });
-        // $.getScript(
-        //     `${_url_origin}${prefix}/js/jsFromMiddleLayer/ws.js`,
-        //     (data, textStatus, jqxhr) => {
-        //         $.getScript(
-        //             `${_url_origin}${prefix}/js/jsFromMiddleLayer/main.js`,
-        //                 (data, textStatus, jqxhr) => {
-        //             callback && callback()
-        //         });
-        // });
-
-        $.when(
-            $.getScript( `${_url_origin}${prefix}/js/xterm/xterm.js` ),
-            $.getScript(  `${_url_origin}${prefix}/js/jsFromMiddleLayer/base64.js` ),
-            $.getScript( `${_url_origin}${prefix}/js/jsFromMiddleLayer/ws.js` ),
-            $.getScript( `${_url_origin}${prefix}/js/jsFromMiddleLayer/main.js` ),
-            $.Deferred(function( deferred ){
-                $( deferred.resolve );
-            })
-        ).done(function(){
-            //place your code here, the scripts are all loaded
-            callback && callback()
-        });
-    } else {
-        callback && callback()
-    }
-}
-
-export function openTerminal(props, parentDomId) {
-    const { game_id, host, password, port, username, webssh_url, ws_url,
-            rows, cols, width, height} = props;
-
-    var options = {
-        host: host,
-        port: port,
-        username: username,
-        secret: password,
-        gameid: game_id,
-        rows: rows,
-        columns: cols,
-        width,
-        height,
-        parentDomId,
-        // tab: $("#terminalTab").val(),
-    }
-    window.g_websocket_url = ws_url;
-    // TODO 加一个parentDomId 来做多ssh tab
-    window.openTerminal(options)
-}
-
+import React, { Component } from 'react';
+
+export function loadSshScript(callback) {
+    let _url_origin = ``;
+    let prefix = 'react/build'
+    if (window.location.port == 3007) {
+        prefix = ''
+    } else {
+        // _url_origin = `https://testeduplus2.educoder.net/`;
+			  _url_origin  = 'http://47.96.87.25:48080';
+    }
+    const $ = window.$;
+    // 未加载过
+    if (!window['Terminal']) {
+        // /js/js_min_all.
+        $('head').append($('<link rel="stylesheet" type="text/css" />')
+            .attr('href', `${_url_origin}${prefix}/js/xterm/xterm.css`));
+
+        // $.getScript(
+        // `${_url_origin}${prefix}/js/xterm/xterm.js`,
+        //     (data, textStatus, jqxhr) => {
+        // });
+        // $.getScript(
+        // `${_url_origin}${prefix}/js/jsFromMiddleLayer/base64.js`,
+        //     (data, textStatus, jqxhr) => {
+        // });
+        // $.getScript(
+        //     `${_url_origin}${prefix}/js/jsFromMiddleLayer/ws.js`,
+        //     (data, textStatus, jqxhr) => {
+        //         $.getScript(
+        //             `${_url_origin}${prefix}/js/jsFromMiddleLayer/main.js`,
+        //                 (data, textStatus, jqxhr) => {
+        //             callback && callback()
+        //         });
+        // });
+
+        $.when(
+            $.getScript( `${_url_origin}${prefix}/js/xterm/xterm.js` ),
+            $.getScript(  `${_url_origin}${prefix}/js/jsFromMiddleLayer/base64.js` ),
+            $.getScript( `${_url_origin}${prefix}/js/jsFromMiddleLayer/ws.js` ),
+            $.getScript( `${_url_origin}${prefix}/js/jsFromMiddleLayer/main.js` ),
+            $.Deferred(function( deferred ){
+                $( deferred.resolve );
+            })
+        ).done(function(){
+            //place your code here, the scripts are all loaded
+            callback && callback()
+        });
+    } else {
+        callback && callback()
+    }
+}
+
+export function openTerminal(props, parentDomId) {
+    const { game_id, host, password, port, username, webssh_url, ws_url,
+            rows, cols, width, height} = props;
+
+    var options = {
+        host: host,
+        port: port,
+        username: username,
+        secret: password,
+        gameid: game_id,
+        rows: rows,
+        columns: cols,
+        width,
+        height,
+        parentDomId,
+        // tab: $("#terminalTab").val(),
+    }
+    window.g_websocket_url = ws_url;
+    // TODO 加一个parentDomId 来做多ssh tab
+    window.openTerminal(options)
+}
+
diff --git a/public/react/src/modules/paths/ShixunPathCard.js b/public/react/src/modules/paths/ShixunPathCard.js
index e2c529aea..2d1090820 100644
--- a/public/react/src/modules/paths/ShixunPathCard.js
+++ b/public/react/src/modules/paths/ShixunPathCard.js
@@ -1,78 +1,80 @@
-import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
-import { BrowserRouter as Router, Route, Link } from "react-router-dom";
-import { Tooltip } from 'antd';
-import axios from 'axios';
-
-
-class ShixunPathCard extends Component{
-  constructor(props) {
-    super(props)
-  }
-  render(){
-    let {pathList}=this.props;
-    return(
-      <div className="educontent" id="subjects_list_content">
-        {
-          pathList && pathList.length > 0 ? 
-          (
-            <div className="square-list clearfix">
-              {
-                pathList && pathList.map((item,key)=>{
-
-                  return(
-                    <div className="square-Item" id={"item_"+key}>
-                      {
-                        item.tag_name === null ? "" :
-                          <div className="tag-green">
-                            <span className="tag-name">{item.tag_name}</span>
-                            <img src={getImageUrl('images/educoder/tag2.png')}/>
-                          </div>
-                      }
-                      
-
-                      <div className={item.allow_visit=== false ? "closeSquare" : "none"}>
-                        <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
-                            className="mt80 mb25"/>
-                        <p className="font-14 color-white">非试用内容，需要授权</p>
-                      </div>
-                      <Link to={"/paths/"+item.id} className="square-img" target="_blank">
-                        <img alt="13?1543211263" src={item.image_url} style={{"display":"block"}}/>
-                      </Link>
-                      <div className="square-main">
-                        <p className="task-hide">
-                          <Link to={"/paths/"+item.id}  className="justify color-grey-name" target="_blank">{item.name}</Link>
-                        </p>
-                        <p className="clearfix mt8 font-12 color-grey-B4">
-
-                          <Tooltip placement="bottom" title={"章节"}>
-                              <span className="mr10 fl squareIconSpan"><i className="iconfont icon-shixun fl mr3"></i>{item.stages_count}</span>
-                          </Tooltip>
-
-                          {/*<Tooltip placement="bottom" title={"经验值"}>*/}
-                              {/*<span className="mr10 fl squareIconSpan"><i className="iconfont icon-jingyan fl mr3"></i>{item.shixuns_count}</span>*/}
-                          {/*</Tooltip>*/}
-
-                          <Tooltip placement="bottom" title={"学习人数"}>
-                              <span className="mr10 fl squareIconSpan"><i className="iconfont icon-chengyuan fl mr3"></i>{item.members_count}</span>
-                          </Tooltip>
-                        </p>
-                      </div>
-                    </div>
-                  )
-                })
-              }
-            </div>
-          ):(
-            <div className="edu-tab-con-box clearfix edu-txt-center">
-              <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-              <p className="edu-nodata-p mb20">暂无数据哦~</p>
-            </div>
-          )
-        }
-        
-      </div>
-    )
-  }
-}
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { BrowserRouter as Router, Route, Link } from "react-router-dom";
+import { Tooltip } from 'antd';
+import axios from 'axios';
+
+
+class ShixunPathCard extends Component{
+  constructor(props) {
+    super(props)
+  }
+  render(){
+    let {pathList}=this.props;
+    return(
+      <div className="educontent" id="subjects_list_content">
+        {
+          pathList && pathList.length > 0 ? 
+          (
+            <div className="square-list clearfix">
+              {
+                pathList && pathList.map((item,key)=>{
+
+                  return(
+                    <div className="square-Item" id={"item_"+key}>
+                      {
+                        item.tag_name === null ? "" :
+                          <div className="tag-green">
+                            <span className="tag-name">{item.tag_name}</span>
+                            <img src={getImageUrl('images/educoder/tag2.png')}/>
+                          </div>
+                      }
+                      
+
+                      <div className={item.allow_visit=== false ? "closeSquare" : "none"}>
+                        <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
+                            className="mt80 mb25"/>
+                        <p className="font-14 color-white">非试用内容，需要授权</p>
+                      </div>
+                      <Link to={"/paths/"+item.id} className="square-img" >
+												{/*target="_blank"*/}
+                        <img alt="13?1543211263" src={item.image_url} style={{"display":"block"}}/>
+                      </Link>
+                      <div className="square-main">
+                        <p className="task-hide">
+                          <Link to={"/paths/"+item.id}  className="justify color-grey-name" >{item.name}</Link>
+													{/*target="_blank"*/}
+                        </p>
+                        <p className="clearfix mt8 font-12 color-grey-B4">
+
+                          <Tooltip placement="bottom" title={"章节"}>
+                              <span className="mr10 fl squareIconSpan"><i className="iconfont icon-shixun fl mr3"></i>{item.stages_count}</span>
+                          </Tooltip>
+
+                          {/*<Tooltip placement="bottom" title={"经验值"}>*/}
+                              {/*<span className="mr10 fl squareIconSpan"><i className="iconfont icon-jingyan fl mr3"></i>{item.shixuns_count}</span>*/}
+                          {/*</Tooltip>*/}
+
+                          <Tooltip placement="bottom" title={"学习人数"}>
+                              <span className="mr10 fl squareIconSpan"><i className="iconfont icon-chengyuan fl mr3"></i>{item.members_count}</span>
+                          </Tooltip>
+                        </p>
+                      </div>
+                    </div>
+                  )
+                })
+              }
+            </div>
+          ):(
+            <div className="edu-tab-con-box clearfix edu-txt-center">
+              <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+              <p className="edu-nodata-p mb20">暂无数据哦~</p>
+            </div>
+          )
+        }
+        
+      </div>
+    )
+  }
+}
 export default ShixunPathCard;
\ No newline at end of file
diff --git a/public/react/src/modules/paths/ShixunPaths.css b/public/react/src/modules/paths/ShixunPaths.css
index b7bd7bba6..d1e0a2325 100644
--- a/public/react/src/modules/paths/ShixunPaths.css
+++ b/public/react/src/modules/paths/ShixunPaths.css
@@ -1,129 +1,129 @@
-.paragraph:hover .status_li a{
-  display: block;
-}
-
-.newedu-filter-btn{
-  display: block;
-  float: left;
-  padding: 0 9px;
-  height: 28px;
-  line-height: 28px;
-  border-radius: 14px;
-  background-color: #F5F5F5;
-  color: #666;
-  margin-right: 10px;
-  margin-bottom: 9px;
-}
-
-.edu-filter-btn29BD8B{
-  display: block;
-  float: left;
-  padding: 0 9px;
-  height: 28px;
-  line-height: 28px;
-  border-radius: 14px;
-  background-color: #29BD8B;
-  color: #FFF;
-  margin-right: 10px;
-  margin-bottom: 9px;
-}
-
-.lesson-saved-list-item{
-  border-bottom: none!important;
-  margin-bottom: 10px;
-  background-color: #fff;
-}
-
-.click_add{
-  border-top: none!important;
-}
-.white-panel li{border:1px solid #fafafa!important;}
-.white-panel li.active{border:1px solid #4CACFF!important;}
-
-/* 选择实训列表 */
-.greybackHead{height: 40px;line-height: 40px;padding: 0px 20px;box-sizing: border-box;color: #676767;background-color: #eaeaea;}
-
-.mtf3{
-  margin-top:-3px;
-}
-
-.mtf5{
-  margin-top: -5px;
-}
-
-.color204{
-    color:rgba(204,204,204,1);
-}
-
-.lesson-saved-list-itemdrop{
-    height: 93px;
-    overflow: hidden;
-}
-
-.lesson-saved-list{
-    position: relative;
-}
-
-.itempositionleft{
-    position: absolute;
-}
-
-.itempositionright{
-    position: absolute;
-}
-
-.ant-input{
-  background-color: #fafafa!important;
-}
-.ant-input:focus{
-  background-color:#ffffff!important; 
-}
-
-.pathNavLine{bottom: -11px;}
-
-#shixun_operation:hover{
-    color:#fff !important;
-}
-
-.cursor{
-    cursor: pointer;
-}
-.paragraph_nameid:hover{
-    color:#4cacff !important;
-}
-/* 学习统计 */
-.statisticsNav{height: 100px;}
-.statisticsNav ul{margin-top: 35px;}
-.statisticsNav ul li{float: left;font-size: 18px;color: #4D4D4D;height: 64px;line-height: 64px;margin:0px 30px;cursor: pointer;}
-.statisticsNav ul li a{color: #4D4D4D!important;}
-.statisticsNav ul li.active{color: #05101A;border-bottom: 2px solid #05101A;}
-.statisticsNav ul li.active a{color: #05101A!important; text-decoration: none !important;}
-
-
-.next-loading{
-     width:100%;
- }
-
-.paddingleft22{
-    text-align: left;
-    padding-left: 22px;
-}
-
-.paddingl5{
-    padding-left: 5px;
-}
-
-.paddingl10{
-    padding-left: 10px;
-}
-
-.red{
-    color:red;
-}
-
-.pl38{
-    padding-left: 38px;
-}
-.ml37{
-    margin-left: 37px;
+.paragraph:hover .status_li a{
+  display: block;
+}
+
+.newedu-filter-btn{
+  display: block;
+  float: left;
+  padding: 0 9px;
+  /*height: 28px;*/
+  line-height: 28px;
+  border-radius: 14px;
+  background-color: #F5F5F5;
+  color: #666;
+  margin-right: 10px;
+  margin-bottom: 9px;
+}
+
+.edu-filter-btn29BD8B{
+  display: block;
+  float: left;
+  padding: 0 9px;
+  height: 28px;
+  line-height: 28px;
+  border-radius: 14px;
+  background-color: #29BD8B;
+  color: #FFF;
+  margin-right: 10px;
+  margin-bottom: 9px;
+}
+
+.lesson-saved-list-item{
+  border-bottom: none!important;
+  margin-bottom: 10px;
+  background-color: #fff;
+}
+
+.click_add{
+  border-top: none!important;
+}
+.white-panel li{border:1px solid #fafafa!important;}
+.white-panel li.active{border:1px solid #4CACFF!important;}
+
+/* 选择实训列表 */
+.greybackHead{height: 40px;line-height: 40px;padding: 0px 20px;box-sizing: border-box;color: #676767;background-color: #eaeaea;}
+
+.mtf3{
+  margin-top:-3px;
+}
+
+.mtf5{
+  margin-top: -5px;
+}
+
+.color204{
+    color:rgba(204,204,204,1);
+}
+
+.lesson-saved-list-itemdrop{
+    height: 93px;
+    overflow: hidden;
+}
+
+.lesson-saved-list{
+    position: relative;
+}
+
+.itempositionleft{
+    position: absolute;
+}
+
+.itempositionright{
+    position: absolute;
+}
+
+.ant-input{
+  background-color: #fafafa!important;
+}
+.ant-input:focus{
+  background-color:#ffffff!important; 
+}
+
+.pathNavLine{bottom: -11px;}
+
+#shixun_operation:hover{
+    color:#fff !important;
+}
+
+.cursor{
+    cursor: pointer;
+}
+.paragraph_nameid:hover{
+    color:#4cacff !important;
+}
+/* 学习统计 */
+.statisticsNav{height: 100px;}
+.statisticsNav ul{margin-top: 35px;}
+.statisticsNav ul li{float: left;font-size: 18px;color: #4D4D4D;height: 64px;line-height: 64px;margin:0px 30px;cursor: pointer;}
+.statisticsNav ul li a{color: #4D4D4D!important;}
+.statisticsNav ul li.active{color: #05101A;border-bottom: 2px solid #05101A;}
+.statisticsNav ul li.active a{color: #05101A!important; text-decoration: none !important;}
+
+
+.next-loading{
+     width:100%;
+ }
+
+.paddingleft22{
+    text-align: left;
+    padding-left: 22px;
+}
+
+.paddingl5{
+    padding-left: 5px;
+}
+
+.paddingl10{
+    padding-left: 10px;
+}
+
+.red{
+    color:red;
+}
+
+.pl38{
+    padding-left: 38px;
+}
+.ml37{
+    margin-left: 37px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 841687f20..294339b54 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -170,7 +170,7 @@ class NewHeader extends Component {
       submitapplications:false,
       isRender:false,
       isRenders:false,
-      showTrial:true,
+      showTrial:false,
     }
     // console.log("176")
     // console.log(props);
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 25a6ab9c7..64c2b39dd 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -10,7 +10,9 @@ import {Modal,Input,Radio,Pagination,message,Spin,Icon,Tooltip} from 'antd';
 
 import 'antd/lib/pagination/style/index.css';
 
-import axios from 'axios';
+import axios from 'axios'
+
+import Modals from '../modals/Modals';
 
 // import { Rating,Progress } from '@icedesign/base';
 
@@ -264,16 +266,29 @@ class TPMBanner extends Component {
     /*
     * 撤销发布按钮
     * */
-    cancel_publish=()=>{
 
-        let id = this.props.match.params.shixunId;
-        let url="/shixuns/" + id +"/cancel_publish.json";
-        axios.get(url).then((response) => {
-            this.props.showSnackbar(response.data.message);
-            window.location.reload()
-        }).catch((error) => {
-            console.log(error)
-        });
+	ModalCancel=()=>{
+		this.setState({
+			Modalstype:false
+		})
+	}
+	ModalSave=()=>{
+		let id = this.props.match.params.shixunId;
+		let url="/shixuns/" + id +"/cancel_publish.json";
+		axios.get(url).then((response) => {
+			this.props.showSnackbar(response.data.message);
+			window.location.reload()
+		}).catch((error) => {
+			console.log(error)
+		});
+	}
+    cancel_publish=()=>{
+    	this.setState({
+				Modalstype:true,
+				Modalstopval:"是否确认撤销发布？",
+				ModalCancel:this.ModalCancel,
+				ModalSave:this.ModalSave,
+			})
     }
 
 
@@ -523,6 +538,15 @@ class TPMBanner extends Component {
 <div>
     <div className="shixunDetail_top">
 
+			{this.state.Modalstype===true?<Modals
+				modalsType={this.state.Modalstype}
+				modalsTopval={this.state.Modalstopval}
+				modalCancel={this.state.ModalCancel}
+				modalSave={this.state.ModalSave}
+				modalsBottomval={this.state.ModalsBottomval}
+				loadtype={this.state.Loadtype}
+			/>:""}
+
         <div className="educontent clearfix">
             <p className="clearfix">
                 <a href={"/shixuns/" + shixunsDetails.identifier + "/challenges"}
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 66d3d9273..e44fb4145 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -18,7 +18,7 @@ import Trialapplication from "../login/Trialapplication";
 const $ = window.$;
 const versionNum = '0001';
 // let _url_origin = getUrl()
-let _url_origin=`https://testeduplus2.educoder.net`;
+let _url_origin=``;
 // let _url_origin=`https://www.educoder.net`;
 
 if (!window['indexHOCLoaded']) {
@@ -28,16 +28,13 @@ if (!window['indexHOCLoaded']) {
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
   //     .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1525440977`));
+      .attr('href', `/stylesheets/css/edu-common.css?1525440977`));
 
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1525440977`));
-
-  $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440977`));
+      .attr('href', `/stylesheets/educoder/edu-main.css?1525440977`));
 
     $('head').append($('<link rel="stylesheet" type="text/css" />')
-        .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440977`));
+        .attr('href', `/stylesheets/educoder/edu-all.css?1525440977`));
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
   //       .attr('href', `${_url_origin}/stylesheets/educoder/css_min_all.css?1525440977`));
@@ -183,7 +180,12 @@ export function TPMIndexHOC(WrappedComponent) {
         // return false
         return this.state.coursedata&&this.state.coursedata.course_identity === 0
       }
-			//  管理员等
+			//  课堂管理等
+			isClassManagement = () => {
+				// return this.state.coursedata&&this.state.coursedata.course_identity >= 0 &&
+				return  this.state.coursedata&&this.state.coursedata.course_identity < 2
+			}
+			//老师等
       isAdminOrCreator = () => {
         // return this.state.coursedata&&this.state.coursedata.course_identity >= 0 &&
         return  this.state.coursedata&&this.state.coursedata.course_identity < 3
@@ -279,7 +281,7 @@ export function TPMIndexHOC(WrappedComponent) {
           const common = {
             isSuperAdmin:this.isSuperAdmin,
             isAdminOrCreator:this.isAdminOrCreator,
-            
+						isClassManagement:this.isClassManagement,
             isAdmin: this.isAdmin,
             isAdminOrTeacher: this.isAdminOrTeacher,
             isStudent: this.isStudent,
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index 85275e620..b60b641e0 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -324,7 +324,7 @@ export default class TPMsettings extends Component {
           opening_time:response.data.shixun.opening_time,
           newuse_scope:response.data.shixun.use_scope,
           scope_partments: response.data.shixun.scope_partment.length,
-          shixunmemoMDvalue:response.data.shixun.evaluate_script
+          shixunmemoMDvalue:response.data.shixun.evaluate_script,
         })
 
         // if(response.data.status===403){
@@ -598,7 +598,7 @@ export default class TPMsettings extends Component {
       evaluate_script, exec_time, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc,multi_webssh,
       opening_time, pod_exist_time,shixunmemoMDvalue
     } = this.state;
-    let operateauthority=this.props.identity<4&&this.props.status==0||this.props.identity===1&&this.props.status==2||this.props.identity===1&&this.props.status==1;
+    let operateauthority=this.props.identity<4&&this.state.status==0||this.props.identity===1&&this.state.status==2||this.props.identity===1&&this.state.status==1;
 
     const description_editormd = this.description_editormd.getValue();
 
@@ -1084,7 +1084,7 @@ export default class TPMsettings extends Component {
     }
 
     const dateFormat = 'YYYY-MM-DD HH:mm:ss';
-    let operateauthority=this.props.identity===1?true:this.props.identity<4&&this.props.status==0;
+    let operateauthority=this.props.identity===1?true:this.props.identity<4&&this.state.status==0?true:false;
 
     return (
       <div className="educontent mt30 mb50" id="shixun_settings_show" onClick={this.bigopens}  onMouseEnter={this.bigopens}>
@@ -1092,21 +1092,21 @@ export default class TPMsettings extends Component {
           <div className="padding30 bor-bottom-greyE clearfix">
             <span className="fl font-16">配置</span>
             {
-              this.props.identity===1&&this.props.status==2?
+              this.props.identity===1&&this.state.status==2?
                 <a className="edu-default-btn edu-blueline-btn ml20 fr"
                    onClick={()=>this.operateshixuns(2)}>
                   永久关闭
                 </a>:""
             }
             {
-              this.props.identity < 4 && this.props.status==0?
+              this.props.identity < 4 && this.state.status==0?
                 <a className="edu-default-btn edu-blueline-btn ml20 fr"
                    onClick={()=>this.operateshixuns(1)}>
                   删除实训
                 </a>:""
             }
             {
-              this.props.identity == 1 && this.props.status == 2 ?
+              this.props.identity == 1 && this.state.status == 2 ?
                 <a className="edu-default-btn edu-blueline-btn ml20 fr"
                    onClick={()=>this.operateshixuns(1)}>
                   删除实训
@@ -1510,7 +1510,7 @@ export default class TPMsettings extends Component {
           </RadioGroup>
         </div>
 
-        <div className="edu-back-white mb10 padding40-20" style={{display:this.props.identity===1?"block":this.props.status===2&&newuse_scope===0||this.props.status===1&&newuse_scope===0?"none":"block"}}>
+        <div className="edu-back-white mb10 padding40-20" style={{display:this.props.identity===1?"block":this.state.status===2&&newuse_scope===0||this.state.status===1&&newuse_scope===0?"none":"block"}}>
           <p className="color-grey-6 font-16 mb30">公开程度</p>
           <RadioGroup onChange={this.SelectOpenpublic} value={use_scope}>
             <Radio className="radioStyle" value={0}><span>对所有公开</span> <span  className="color-grey-9">(选中则所有已被试用授权的用户可以学习)</span></Radio>
@@ -1556,7 +1556,7 @@ export default class TPMsettings extends Component {
                               onClick={(key)=>this.deleteScopeInput(key)}
                             // style={{display:this.props.status===2&&this.props.identity>1||this.props.status===1&&this.props.identity>1===true?"none":"block"}}
                           >
-                            {this.props.identity===1?"x":this.props.status===2&&scope_partment===scope_partments||this.props.status===1&&scope_partment===scope_partments?"":"×"}
+                            {this.props.identity===1?"x":this.state.status===2&&scope_partment===scope_partments||this.state.status===1&&scope_partment===scope_partments?"":"×"}
                           </a>
                         </li>
                       )
diff --git a/public/react/src/modules/tpm/component/TPMright.css b/public/react/src/modules/tpm/component/TPMright.css
index 92f290dba..63f718f26 100644
--- a/public/react/src/modules/tpm/component/TPMright.css
+++ b/public/react/src/modules/tpm/component/TPMright.css
@@ -1,78 +1,78 @@
-/*b新标签*/
-.newedu-filter-btn{
-    display: block;
-    float: left;
-    padding: 0 9px;
-    height: 28px;
-    line-height: 28px;
-    border-radius: 14px;
-    background-color: #F5F5F5;
-    color: #666;
-    margin-right: 10px;
-    margin-bottom: 9px;
-}
-.newedbox{
-    /*flex-wrap:  wrap;*/
-    /*display: -webkit-flex; !* Safari *!*/
-    /*display: flex;*/
-    width: 340px;
-    position:relative;
-    overflow: hidden;
-}
-.newsubscript{
-    position: absolute;
-    right: 23px;
-    bottom: 38px;
-    cursor: pointer;
-}
-.newsubscript:hover{
-    color:deepskyblue;
-}
-.edu-filter-btn29BD8B{
-    display: block;
-    float: left;
-    padding: 0 9px;
-    height: 28px;
-    line-height: 28px;
-    border-radius: 14px;
-    background-color: #29BD8B;
-    color: #FFF;
-    margin-right: 10px;
-    margin-bottom: 9px;
-}
-.relative{
-    position:relative;
-}
-.newedboxheight{
-    max-height:181px;
-}
-.newminheight{
-    /*max-height: 670px;*/
-    max-height: 300px;
-    overflow: auto;
-}
-
-.delSubentry{
-    font-size:7px;
-    font-family:MicrosoftYaHei;
-    font-weight:400;
-    color:rgba(76,172,255,1);
-    line-height:9px;
-    cursor: pointer;
-}
-.operationalter .delSubentry{
-    font-size:15px !important;
-    line-height: 25px;
-}
-/*临时的tpi关闭按钮样式*/
-.headerRight a {
-    color: #1a3f5f;
-}
-/*实训做成弹窗a标签样式调整*/
-.-task-list-title a:link, .-task-list-title a:visited {color: #bcc6cd;}
-.-task-list-title a:hover{
-    color: #459be5;
-}
-.headerLeft .-header-right{
-    height: 32px;
+/*b新标签*/
+.newedu-filter-btn{
+    display: block;
+    float: left;
+    padding: 0 9px;
+    /*height: 28px;*/
+    line-height: 28px;
+    border-radius: 14px;
+    background-color: #F5F5F5;
+    color: #666;
+    margin-right: 10px;
+    margin-bottom: 9px;
+}
+.newedbox{
+    /*flex-wrap:  wrap;*/
+    /*display: -webkit-flex; !* Safari *!*/
+    /*display: flex;*/
+    width: 340px;
+    position:relative;
+    overflow: hidden;
+}
+.newsubscript{
+    position: absolute;
+    right: 23px;
+    bottom: 38px;
+    cursor: pointer;
+}
+.newsubscript:hover{
+    color:deepskyblue;
+}
+.edu-filter-btn29BD8B{
+    display: block;
+    float: left;
+    padding: 0 9px;
+    height: 28px;
+    line-height: 28px;
+    border-radius: 14px;
+    background-color: #29BD8B;
+    color: #FFF;
+    margin-right: 10px;
+    margin-bottom: 9px;
+}
+.relative{
+    position:relative;
+}
+.newedboxheight{
+    max-height:181px;
+}
+.newminheight{
+    /*max-height: 670px;*/
+    max-height: 300px;
+    overflow: auto;
+}
+
+.delSubentry{
+    font-size:7px;
+    font-family:MicrosoftYaHei;
+    font-weight:400;
+    color:rgba(76,172,255,1);
+    line-height:9px;
+    cursor: pointer;
+}
+.operationalter .delSubentry{
+    font-size:15px !important;
+    line-height: 25px;
+}
+/*临时的tpi关闭按钮样式*/
+.headerRight a {
+    color: #1a3f5f;
+}
+/*实训做成弹窗a标签样式调整*/
+.-task-list-title a:link, .-task-list-title a:visited {color: #bcc6cd;}
+.-task-list-title a:hover{
+    color: #459be5;
+}
+.headerLeft .-header-right{
+    height: 32px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index 895b5dd7f..aa5b62a0a 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -1,1191 +1,1195 @@
-import React, {Component} from 'react';
-
-import {TPMIndexHOC} from '../TPMIndexHOC';
-
-import {SnackbarHOC} from 'educoder';
-
-import {Input, Select, Radio, Checkbox, Modal, Icon, DatePicker,Upload,Button,message,Form} from 'antd';
-
-// import "antd/dist/antd.css";
-
-import locale from 'antd/lib/date-picker/locale/zh_CN';
-
-import axios from 'axios';
-
-import './css/Newshixuns.css';
-
-import {getUrl} from 'educoder'
-
-let path = getUrl("/editormd/lib/")
-
-const $ = window.$;
-
-let timeout;
-
-let currentValue;
-
-const Option = Select.Option;
-
-const RadioGroup = Radio.Group;
-const confirm = Modal.confirm;
-// 恢复数据
-function md_rec_data(k, mdu, id, editor) {
-    if (window.sessionStorage.getItem(k + mdu) !== null) {
-        editor.setValue(window.sessionStorage.getItem(k + mdu));
-        md_clear_data(k, mdu, id);
-    }
-}
-
-// 保存数据
-function md_add_data(k, mdu, d) {
-    window.sessionStorage.setItem(k + mdu, d);
-}
-
-// 清空保存的数据
-function md_clear_data(k, mdu, id) {
-    window.sessionStorage.removeItem(k + mdu);
-    var id1 = "#e_tip_" + id;
-    var id2 = "#e_tips_" + id;
-    if (k == 'content') {
-        $(id2).html("");
-    } else {
-        $(id1).html("");
-    }
-}
-
-function md_elocalStorage(editor, mdu, id) {
-    if (window.sessionStorage) {
-        var oc = window.sessionStorage.getItem('content' + mdu);
-        if (oc !== null) {
-            $("#e_tips_" + id).data('editor', editor);
-            var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\'' + mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\'' + mdu + '\',\'' + id + '\')">不恢复</a>';
-            $("#e_tips_" + id).html(h);
-        }
-        setInterval(function () {
-            var d = new Date();
-            var h = d.getHours();
-            var m = d.getMinutes();
-            var s = d.getSeconds();
-            h = h < 10 ? '0' + h : h;
-            m = m < 10 ? '0' + m : m;
-            s = s < 10 ? '0' + s : s;
-            if (editor.getValue().trim() != "") {
-                md_add_data("content", mdu, editor.getValue());
-                var id1 = "#e_tip_" + id;
-                var id2 = "#e_tips_" + id;
-
-                $(id1).html(" 数据已于 " + h + ':' + m + ':' + s + " 保存   ");
-                $(id2).html("");
-            }
-        }, 10000);
-
-    } else {
-        $("#e_tip_" + id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
-    }
-}
-
-
-function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
-    var editorName = window.editormd(id, {
-        width: width,
-        height: high,
-        path: path,   // "/editormd/lib/"
-
-        syncScrolling: "single",
-        tex: true,
-        tocm: true,
-        emoji: true,
-        taskList: true,
-        codeFold: true,
-        searchReplace: true,
-        htmlDecode: "style,script,iframe",
-        sequenceDiagram: true,
-        autoFocus: false,
-        toolbarIcons: function () {
-            // Or return editormd.toolbarModes[name]; // full, simple, mini
-            // Using "||" set icons align right.
-            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
-        },
-        toolbarCustomIcons: {
-            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
-            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
-        },
-        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
-        saveHTMLToTextarea: true,
-        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
-        dialogMaskOpacity: 0.6,
-        placeholder: placeholder,
-        imageUpload: true,
-        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL: imageUrl,//url
-        onload: function () {
-            // this.previewing();
-            $("#" + id + " [type=\"latex\"]").bind("click", function () {
-                editorName.cm.replaceSelection("```latex");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("\n");
-                editorName.cm.replaceSelection("```");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line - 1, 0);
-            });
-
-            $("#" + id + " [type=\"inline\"]").bind("click", function () {
-                editorName.cm.replaceSelection("$$$$");
-                var __Cursor = editorName.cm.getDoc().getCursor();
-                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
-                editorName.cm.focus();
-            });
-            $("[type=\"inline\"]").attr("title", "行内公式");
-            $("[type=\"latex\"]").attr("title", "多行公式");
-
-            md_elocalStorage(editorName, `memoNew_${id}`, "memoNew");
-
-            callback && callback()
-        }
-    });
-    return editorName;
-}
-
-
-class Newshixuns extends Component {
-    constructor(props) {
-        super(props)
-        this.state = {
-            fileList: [],
-            newshixunlist: undefined,
-            departmentslist: undefined,
-            name: "",
-            main_type: "",
-            small_type: "",
-            trainee: "",
-            webssh: 0,
-            use_scope: 0,
-            can_copy: "",
-            scope_partment: undefined,
-            vnc: "",
-            scopetype: false,
-            postapplyvisible: false,
-            sendsure_applyvalue: undefined,
-            postapplytitle: false,
-            shixun_nametype: false,
-            main_types: false,
-            trainee_types: false,
-            SelectTheCommandtype: false,
-            opers: false,
-            operss: false,
-            TimePickervalue: "",
-            opensmail: false,
-            onSearchvalue: "",
-            scope_partmenttype: false,
-            languagewrite: undefined,
-            systemenvironment:undefined,
-            testcoderunmode:undefined,
-            file:undefined,
-        }
-    }
-
-    initMD(initValue) {
-        this.contentChanged = false;
-        const placeholder = "";
-        // amp;
-        // 编辑时要传memoId
-        const imageUrl = `/api/attachments.json`;
-        // 创建editorMd
-
-        const taskpass_editormd = create_editorMD("memoMD", '100%', 400, placeholder, imageUrl, () => {
-            setTimeout(() => {
-                taskpass_editormd.resize()
-                taskpass_editormd.cm && taskpass_editormd.cm.refresh()
-            }, 500)
-
-            if (initValue) {
-                taskpass_editormd.setValue(initValue)
-            }
-            taskpass_editormd.cm.on("change", (_cm, changeObj) => {
-                // console.log('....contentChanged')
-                this.contentChanged = true;
-            })
-        });
-        this.taskpass_editormd = taskpass_editormd;
-        window.taskpass_editormd = taskpass_editormd;
-
-    }
-
-    componentDidMount() {
-        let newshixunUrl = `/shixuns/new.json`;
-        axios.get(newshixunUrl).then((response) => {
-            if (response.status === 200) {
-                if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
-
-                } else {
-                    this.setState({
-                        newshixunlist: response.data
-                    });
-                    this.initMD(response.data.sample[0][1]);
-                }
-
-            }
-        }).catch((error) => {
-            console.log(error)
-        });
-
-        let departmentsUrl = `/shixuns/departments.json`;
-        axios.get(departmentsUrl).then((response) => {
-            if (response.status === 200) {
-                this.setState({
-                    departmentslist: response.data.shools_name
-                });
-            }
-        }).catch((error) => {
-            console.log(error)
-        });
-    }
-
-    setlanguagewrite = (e)=>{
-        this.setState({
-            languagewrite: e.target.value
-        })
-    }
-
-    setsystemenvironment = (e) => {
-        this.setState({
-            systemenvironment: e.target.value
-        })
-    }
-    settestcoderunmode = (e) => {
-        this.setState({
-            testcoderunmode: e.target.value
-        })
-
-    }
-    shixunname = (e) => {
-        this.setState({
-            name: e.target.value,
-            shixun_nametype: false
-        });
-    }
-
-    bigClass = (value) => {
-        this.setState({
-            main_type: value
-        })
-    }
-
-    littleClass = (value) => {
-        this.setState({
-            small_type: value
-        })
-    }
-
-    Selectthestudent = (value) => {
-        this.setState({
-            trainee: value
-        })
-    }
-
-    SelectTheCommand = (e) => {
-        this.setState({
-            webssh: e.target.value,
-        });
-
-        if (e.target.value === 2) {
-            this.setState({
-                SelectTheCommandtype: true,
-                multi_webssh: false
-            });
-        } else {
-            this.setState({
-                SelectTheCommandtype: false,
-                multi_webssh: false
-            });
-        }
-    }
-
-    Selectpublic = (e) => {
-        this.setState({
-            scopetype: false,
-            use_scope: e.target.value,
-        });
-        if (e.target.value === 1) {
-            this.setState({
-                scopetype: true
-            });
-        }
-
-    }
-
-    Teacherscopy = (e) => {
-        let sum = ""
-        if (e.target.checked === false) {
-            sum = 0
-        } else if (e.target.checked === true) {
-            sum = 1
-        }
-        this.setState({
-            can_copy: sum,
-        });
-    }
-
-    TeachersUbuntu = (e) => {
-        let sum = ""
-        if (e.target.checked === false) {
-            sum = 0
-        } else if (e.target.checked === true) {
-            sum = 1
-        }
-        this.setState({
-            vnc: sum,
-        });
-    }
-
-    adduse_scopeinput = () => {
-        let {scope_partment} = this.state;
-        let array = scope_partment;
-        let newarray = ""
-        array.push(newarray)
-        this.setState({
-            scope_partment: array,
-        });
-    }
-
-    shixunScopeInput = (e, id) => {
-        let {scope_partment} = this.state;
-        let datalist = scope_partment;
-        if (datalist === undefined) {
-            datalist = []
-        }
-        datalist.push(e)
-        // else{
-        //   datalist[id]=e
-        // }
-
-        this.setState({
-            scope_partment: datalist,
-            onSearchvalue: ""
-        });
-    }
-
-    deleteScopeInput = (key) => {
-        let {scope_partment} = this.state;
-        let datalist = scope_partment;
-        datalist.splice(key, 1);
-        this.setState({
-            scope_partment: datalist
-        });
-    }
-
-    //提交数据
-    submit_new_shixun = () => {
-        const mdVal = this.taskpass_editormd.getValue();
-        let {can_copy, main_type, name, scope_partment, small_type, trainee, use_scope, vnc, webssh, multi_webssh, TimePickervalue} = this.state;
-        let Url = `/shixuns.json`
-        if (name === "") {
-            this.setState({
-                shixun_nametype: true
-            })
-            this.props.showSnackbar("实训名称为空");
-            $('html').animate({
-                scrollTop: 10
-            }, 1000);
-            return
-        }
-        if (main_type === "") {
-            this.setState({
-                main_types: true
-            })
-            $('html').animate({
-                scrollTop: 700
-            }, 1000);
-            this.props.showSnackbar("请选择技术平台大类别");
-
-            return
-        }
-
-        if (use_scope === 1) {
-            if (scope_partment === undefined || scope_partment.length === 0) {
-                this.setState({
-                    scope_partmenttype: true
-                })
-                $('html').animate({
-                    scrollTop: 900
-                }, 1000);
-                this.props.showSnackbar("公开程度，指定单位为空");
-                return
-            }
-        }
-        if (trainee === "") {
-            this.setState({
-                trainee_types: true
-            })
-            // $('html').animate({
-            //     scrollTop: 700
-            // }, 1000);
-            this.props.showSnackbar("请选择发布信息");
-            return
-        }
-        let newmulti_webssh = multi_webssh;
-        if (newmulti_webssh === true) {
-            newmulti_webssh = 1
-        } else {
-            newmulti_webssh = ""
-        }
-        axios.post(Url, {
-                name: name,
-                can_copy: can_copy,
-                description: mdVal,
-                main_type: main_type,
-                scope_partment: scope_partment,
-                small_type: small_type,
-                trainee: trainee,
-                use_scope: use_scope,
-                vnc: vnc,
-                webssh: webssh,
-                multi_webssh: newmulti_webssh,
-                task_pass: 1,
-                opening_time: TimePickervalue
-            }
-        ).then((response) => {
-            if (response.status === 200) {
-                window.location.href = "/shixuns/" + response.data.shixun_identifier + "/challenges";
-                // window.open("/shixuns/"+response.data.shixun_identifier+"/challenges");
-            }
-        }).catch((error) => {
-            console.log(error)
-        })
-    }
-
-
-    shixunsfetch = (value, callback) => {
-        if (timeout) {
-            clearTimeout(timeout);
-            timeout = null;
-        }
-        currentValue = value;
-
-        function fake() {
-            let departmentsUrl = `/shixuns/departments.json?q=` + currentValue;
-            axios.get(departmentsUrl).then((response) => {
-                callback(response.data.shools_name);
-            }).catch((error) => {
-                console.log(error)
-            });
-        }
-
-        timeout = setTimeout(fake, 300);
-    }
-
-    shixunHandleSearch = (value) => {
-        this.shixunsfetch(value, departmentslist => this.setState({departmentslist}));
-        this.setState({
-            onSearchvalue: ""
-        })
-    }
-
-    post_apply = () => {
-        this.setState({
-            postapplyvisible: true
-        })
-    }
-    sendsure_apply = () => {
-        let {languagewrite,systemenvironment,testcoderunmode} = this.state;
-        // console.log("点击确定")
-        // console.log("languagewrite"+languagewrite);
-        // console.log("systemenvironment"+systemenvironment);
-        // console.log("testcoderunmode"+testcoderunmode);
-
-        // let attachment_ids = undefined
-        // if (this.state.fileList) {
-        //     attachment_ids = this.state.fileList.map(item => {
-        //         return item.response ? item.response.id : item.id
-        //     })
-        // }
-        if(languagewrite === undefined || languagewrite === "" ){
-            this.props.showNotification(`请填写该镜像是基于什么语言`);
-
-            return
-        }
-        if(systemenvironment === undefined || systemenvironment === ""){
-            this.props.showNotification(`请填写该镜像是基于什么语言系统环境`);
-
-            return;
-
-        }
-        if(testcoderunmode === undefined ||  testcoderunmode === "") {
-            this.props.showNotification(`请填写该镜像中测试代码运行方式`);
-
-            return;
-
-        }
-        var  attachment_ids=undefined;
-        if (this.state.fileList) {
-            attachment_ids = this.state.fileList.map(item => {
-                return item.response ? item.response.id : item.id
-            })
-        }
-        if( attachment_ids === undefined ||  attachment_ids.length===0){
-            this.props.showNotification(`请上传附件`);
-
-            return;
-        }
-        // console.log("attachment_ids"+attachment_ids);
-
-        // alert(languagewrite +"  "+systemenvironment +"   "+testcoderunmode + "   "+attachment_ids);
-
-        var data={
-            language:languagewrite,
-            runtime:systemenvironment,
-            run_method:testcoderunmode,
-            attachment_id:attachment_ids[0],
-        }
-        var url =`/shixuns/apply_shixun_mirror.json`;
-        axios.post(url,data
-        ).then((response) => {
-
-            try {
-                if (response.data) {
-                    // const { id } = response.data;
-                    // if (id) {
-                    if(this.state.file !== undefined){
-                        this.deleteAttachment(this.state.file);
-                        this.setState({
-                            file:undefined,
-                            languagewrite:"",
-                            systemenvironment:"",
-                            testcoderunmode:"",
-                        })
-                    }else {
-                        this.setState({
-                            file:undefined,
-                            languagewrite:"",
-                            systemenvironment:"",
-                            testcoderunmode:"",
-                        })
-                    }
-                    this.props.showNotification('提交成功！');
-                    // this.props.history.push(`/courses/${cid}/graduation_topics`);
-                    // }
-                }
-            }catch (e) {
-
-            }
-
-        })
-
-    }
-    sendhideModaly = () => {
-        this.setState({
-            postapplyvisible: false,
-        })
-        if(this.state.file !== undefined){
-            this.deleteAttachment(this.state.file);
-            this.setState({
-                file:undefined,
-                languagewrite:"",
-                systemenvironment:"",
-                testcoderunmode:"",
-            })
-        }else {
-            this.setState({
-                file:undefined,
-                languagewrite:"",
-                systemenvironment:"",
-                testcoderunmode:"",
-            })
-        }
-    }
-    sendsure_applyvalues = (e) => {
-        this.setState({
-            sendsure_applyvalue: e.target.value
-        })
-    }
-    yeshidemodel = () => {
-        this.setState({
-            postapplytitle: false
-        })
-    }
-
-    SelectTheCommandonChange = (e) => {
-        this.setState({
-            multi_webssh: e.target.checked
-        })
-    }
-
-
-    bigopen = () => {
-        this.setState({
-            opers: true
-        })
-    }
-
-    bigopens = () => {
-        this.setState({
-            opers: false,
-            operss: false,
-            opensmail: false
-        })
-
-    }
-
-    bigopensmal = () => {
-        this.setState({
-            opensmail: true
-        })
-    }
-
-    sbigopen = () => {
-        this.setState({
-            operss: true
-        })
-    }
-
-    // sbigopens=()=>{
-    //     this.setState({
-    //         operss:false
-    //     })
-    // }
-
-    onChangeTimePicker = (value, dateString) => {
-        this.setState({
-            TimePickervalue: dateString
-        })
-    }
-    // 附件相关 START
-    handleChange = (info) => {
-        console.log("handleChange1");
-        let fileList = info.fileList;
-        this.setState({ fileList });
-    }
-    onAttachmentRemove = (file) => {
-        confirm({
-            title: '确定要删除这个附件吗?',
-            okText: '确定',
-            cancelText: '取消',
-            // content: 'Some descriptions',
-            onOk: () => {
-                this.deleteAttachment(file)
-            },
-            onCancel() {
-                console.log('Cancel');
-            },
-        });
-        return false;
-    }
-    deleteAttachment = (file) => {
-        // console.log(file);
-        let id=file.response ==undefined ? file.id : file.response.id
-        const url = `/attachments/${id}.json`
-        axios.delete(url, {
-        })
-            .then((response) => {
-                if (response.data) {
-                    const { status } = response.data;
-                    if (status == 0) {
-                        // console.log('--- success')
-
-                        this.setState((state) => {
-                            const index = state.fileList.indexOf(file);
-                            const newFileList = state.fileList.slice();
-                            newFileList.splice(index, 1);
-                            return {
-                                fileList: newFileList,
-                            };
-                        });
-                    }
-                }
-            })
-            .catch(function (error) {
-                console.log(error);
-            });
-    }
-
-
-    handleSubmit=()=>{
-        // console.log(this.state.languagewrite)
-        // console.log(this.state.systemenvironment)
-        // console.log(this.state.testcoderunmode)
-        var  attachment_ids;
-        if (this.state.fileList) {
-            attachment_ids = this.state.fileList.map(item => {
-                return item.response ? item.response.id : item.id
-            })
-        }
-        // console.log(attachment_ids);
-        // var data={
-        //     language:"",
-        //     runtime:"",
-        //     run_method:"",
-        //     attachment_id:"",
-        // }
-        // axios.post(url,data
-        // ).then((response) => {
-        //     if (response.data) {
-        //         // const { id } = response.data;
-        //         // if (id) {
-        //             this.props.showNotification('提交成功！');
-        //             // this.props.history.push(`/courses/${cid}/graduation_topics`);
-        //         // }
-        //     }
-        // })
-
-
-
-    }
-    render() {
-        const { getFieldDecorator } = this.props.form;
-        const  thiss=this;
-        let {testcoderunmode ,systemenvironment,languagewrite, fileList,TimePickervalue, scope_partmenttype, opensmail, newshixunlist, name, scope_partment, departmentslist, postapplyvisible, sendsure_applyvalue, postapplytitle, shixun_nametype, main_types, trainee_types, SelectTheCommandtype, opers, operss, onSearchvalue} = this.state;
-        let options
-        if (departmentslist != undefined) {
-            options = this.state.departmentslist.map((d, k) => {
-                return (
-                    <Option key={d} id={k}>{d}</Option>
-                )
-            })
-        }
-        const uploadProps = {
-            width: 600,
-            fileList,
-            multiple: true,
-            // https://github.com/ant-design/ant-design/issues/15505
-            // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-            // showUploadList: false,
-            action:  `${getUrl()}/api/attachments.json`,
-            onChange: this.handleChange,
-            onRemove: this.onAttachmentRemove,
-            beforeUpload: (file) => {
-                // console.log('beforeUpload', file.name);
-                const isLt150M = file.size / 1024 / 1024 < 50;
-                if (!isLt150M) {
-                    this.props.showNotification(`文件大小必须小于50MB`);
-
-                }
-                if(thiss.state.file !== undefined){
-                    thiss.deleteAttachment(thiss.state.file);
-                    thiss.setState({
-                        file:file
-                    })
-                }else {
-                    thiss.setState({
-                        file:file
-                    })
-                }
-
-                console.log("handleChange2");
-                return isLt150M;
-            },
-        }
-        // const uploadProps = {
-        //     width: 600,
-        //     fileList,
-        //     multiple: true,
-        //     // https://github.com/ant-design/ant-design/issues/15505
-        //     // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-        //     // showUploadList: false,
-        //     action:  `${getUrl()}/api/attachments.json`,
-        //     onChange: this.handleChange,
-        //     onRemove: this.onAttachmentRemove,
-        //     beforeUpload: (file) => {
-        //         // console.log('beforeUpload', file.name);
-        //         const isLt50M = file.size / 1024 / 1024 < 50;
-        //         if (!isLt50M) {
-        //             message.error('文件大小必须小于150MB!');
-        //         }
-        //         return isLt50M;
-        //     },
-        // };
-        return (
-
-            <div className="newMain clearfix" onClick={this.bigopens}>
-                <div className="educontent mt20 mb60 clearfix">
-                    <div className="new_shixun">
-
-                        <div className="mb10 edu-back-white">
-                            <p className="padding10-20 bor-bottom-greyE color-grey-3 clearfix">
-                                <span className="fl font-18 lineh-35">创建实训</span>
-                                <a className="fr font-16 mt3 color-blue" href="https://www.educoder.net/forums/2943"
-                                   target="_blank">实训制作指南</a>
-                            </p>
-
-                            <div className="padding30-20">
-                                <p className="color-grey-6 font-16 mb15">实训名称</p>
-                                <div className="df">
-                                    <span className="mr30 color-orange pt10">*</span>
-                                    <div className="flex1">
-                                        <input
-                                            className={shixun_nametype === true ? "input-100-45 greyInput bor-red" : "input-100-45 greyInput"}
-                                            id="shixun_name" maxLength="60"
-                                            name="shixun[name]"
-                                            value={name}
-                                            onInput={this.shixunname}
-                                            placeholder="请输入实训名称，最多60个字符"
-                                            size="60"
-                                            type="text"
-                                            style={{width: shixun_nametype === false ? '1123px' : '93%'}}
-                                        />
-                                        <span
-                                            className={shixun_nametype === true ? "color-orange fr mt10" : "color-orange fr none"}
-                                            id="shixun_name_notice">
-                                                <i className="fa fa-exclamation-circle mr3"></i>必填项
-                                            </span>
-                                    </div>
-
-                                </div>
-                            </div>
-
-                        </div>
-
-
-                        <div className="mb10 edu-back-white padding30-20">
-
-                            <p className="color-grey-6 font-16 mb15">简介</p>
-
-                            <div className="df">
-                                <div className="flex1 break_word show_content_grey new_li" id="memoMD">
-                                    <textarea style={{display: 'none'}} id="evaluate_script_shows"
-                                              name="content"></textarea>
-                                </div>
-                            </div>
-                            <p id="e_tip_memoNew" className="edu-txt-right color-grey-cd font-12"></p>
-                            <p id="e_tips_memoNew" className="edu-txt-right color-grey-cd font-12"></p>
-                        </div>
-
-                        <div className="mb10 edu-back-white padding30-20">
-                            <p className="color-grey-6 font-16 mb15">技术平台</p>
-                            <div className="clearfix mb20">
-                                <span className="mr30 color-orange pt5 fl">*</span>
-                                <div className="width15 fl mr20" onMouseLeave={this.bigopens}>
-                                    <Select placeholder="请更新主类别"
-                                            style={{width: 180}}
-                                            onChange={this.bigClass}
-                                            onMouseEnter={this.bigopen}
-                                            onSelect={this.bigopens}
-                                            defaultOpen={false}
-                                            open={opers}
-                                    >
-                                        {
-                                            newshixunlist === undefined ? "" : newshixunlist.main_type.map((item, key) => {
-                                                return (
-                                                    <Option value={item.id} key={key}>{item.type_name}</Option>
-
-
-                                                )
-                                            })
-                                        }
-                                    </Select>
-                                    <p className="edu-txt-right font-12">
-                                        列表中没有？
-                                        <a className="color-blue" onClick={this.post_apply}> 申请新建</a>
-                                    </p>
-
-                                    <Modal
-                                        keyboard={false}
-                                        title="申请新建"
-                                        visible={postapplyvisible}
-                                        closable={false}
-                                        footer={null}
-                                        width={850}
-                                        heigth={720}
-                                    >
-                                        {/*<Form  onSubmit={this.handleSubmit}>*/}
-                                        <div>
-                                            <li className="clearfix mb15 ml85" >
-                                                <label className="fl mt10 "><span
-                                                    className="color-red fl mt3">*</span>语言：&nbsp;&nbsp;</label>
-                                                <textarea className="fl task-form-80 task-height-150"
-                                                          onInput={this.setlanguagewrite}
-                                                          value={languagewrite}
-                                                          placeholder="请填写该镜像是基于什么语言：示例：Python"
-                                                          id="demand_info"></textarea>
-                                            </li>
-                                            <li className="clearfix mb15">
-                                                <label className="panel-form-label fl ml50"><span
-                                                    className="color-red fl mt3">*</span>系统环境：&nbsp;&nbsp;</label>
-                                                <textarea className="fl task-form-80 task-height-150 "
-                                                          onInput={this.setsystemenvironment}
-                                                          value={systemenvironment}
-                                                          placeholder="请填写该镜像是基于什么linux系统环境,代码运行环境"
-                                                          id="demand_info"></textarea>
-                                            </li>
-
-                                            <li className="clearfix mb15">
-                                                <label className="fl mt10" ><span
-                                                    className="color-red fl mt3">*</span>测试代码运行方式：&nbsp;&nbsp;</label>
-
-                                                <textarea className="fl task-form-80 task-height-150 "
-                                                          onInput={this.settestcoderunmode}
-                                                          value={testcoderunmode}
-                                                          placeholder="请填写该镜像中测试代码运行方式"
-                                                          id="demand_info"></textarea>
-                                            </li>
-
-                                            <li className="clearfix mb15  ml50">
-                                                <label className="panel-form-label fl mt-5"><span
-                                                    className="color-red fl">*</span>测试代码：&nbsp;&nbsp;</label>
-                                                <div  className="mt10" style={{
-                                                    display: "inline-block"
-                                                }}>
-                                                    {/*<Form.Item>*/}
-                                                    {/*    {*/}
-                                                    {/*        getFieldDecorator('file',{*/}
-                                                    {/*            rules:[{*/}
-                                                    {/*            }]*/}
-                                                    {/*        })(*/}
-                                                <Upload {...uploadProps} >
-                                                    <Icon type="upload"  className="fl mt5" > </Icon>
-                                                    <span className="color-blue fl">上传附件</span>
-                                                    <span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>
-
-                                                </Upload>
-                                                    {/*        )*/}
-                                                    {/*    }*/}
-                                                    {/*</Form.Item>*/}
-                                        </div>
-
-                                            </li>
-                                            <li className="edu-txt-center clearfix ">
-
-                                                <Form.Item>
-                                                <a className="pop_close task-btn  mr30 mb30 mt35"
-                                                   onClick={() => this.sendhideModaly()}
-                                                >取消</a>
-                                                <Button type="primary"  onClick={()=>this.sendsure_apply()}
-                                                   className="task-btn task-btn-orange mb30 mt35">确定</Button>
-                                                </Form.Item>
-                                            </li>
-                                            <div className="cl"></div>
-                                        </div>
-                                        {/*</Form>*/}
-                                    </Modal>
-
-                                    <Modal
-                                        keyboard={false}
-                                        title="提示"
-                                        visible={postapplytitle}
-                                        closable={false}
-                                        footer={null}
-                                    >
-                                        <div>
-                                            <div className="task-popup-content"><p
-                                                className="task-popup-text-center font-16"><span
-                                                className="font-17 mt10">新建申请已提交，请等待管理员的审核</span></p>
-                                                <li className="font-14 mt15 color-grey-6 edu-txt-center">我们将在1-2个工作日内与您联系
-                                                </li>
-                                            </div>
-                                            <div className="task-popup-OK clearfix">
-                                                <a className="task-btn task-btn-orange"
-                                                   onClick={this.yeshidemodel}>知道啦</a>
-                                            </div>
-                                        </div>
-                                    </Modal>
-                                </div>
-                                <div className=" fl pr mr20" onMouseLeave={this.bigopens}>
-                                    <Select mode="multiple" placeholder="请选择小类别"
-                                            style={{minWidth: 180}}
-                                            onChange={this.littleClass}
-                                            onMouseEnter={this.bigopensmal}
-                                            onSelect={this.bigopens}
-                                            defaultOpen={false}
-                                            open={opensmail}
-                                    >
-                                        {
-                                            newshixunlist === undefined ? "" : newshixunlist.small_type.map((item, key) => {
-                                                return (
-                                                    <Option value={item.id} key={key}>{item.type_name}</Option>
-                                                )
-                                            })
-                                        }
-                                    </Select>
-                                </div>
-                                <p className="fl ml10 color-grey-9 mt5">请在配置页面完成后续的评测脚本设置操作</p>
-                                <div style={{width: '57px'}} className="ml20 fl">
-                                    <span className={main_types === true ? "color-orange fl" : "color-orange fl none"}
-                                          id="shixun_tech_platform_notice"><i
-                                        className="fa fa-exclamation-circle mr3"></i>必填项</span>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div className="mb10 edu-back-white padding30-20">
-                            <p className="color-grey-6 font-16 mb20">命令行</p>
-                            <div className="pl25">
-                                <RadioGroup onChange={this.SelectTheCommand} value={this.state.webssh}>
-                                    <Radio className="radioStyle" value={0}><span>无命令行窗口</span> <span
-                                      className="color-grey-9">（选中则不给学员的实践任务提供命令窗口）</span></Radio>
-                                    <Radio className="radioStyle" value={1}><span>命令行练习窗口</span> <span
-                                      className="color-grey-9">（选中则给学员提供用于练习操作的命令行窗口）</span></Radio>
-                                    <Radio className="radioStyle" value={2}><span>命令行评测窗口</span> <span
-                                      className="color-grey-9">（选中则给学员提供用于关卡评测的命令行窗口）</span></Radio>
-                                    <Checkbox style={{display: SelectTheCommandtype ? "block" : "none"}}
-                                              className={"ml36"} checked={this.state.multi_webssh}
-                                              onChange={this.SelectTheCommandonChange}>
-                                        多个命令行窗口<span className="color-grey-9">（选中则允许学员同时开启多个命令行窗口）</span>
-                                    </Checkbox>
-                                </RadioGroup>
-                            </div>
-                        </div>
-
-
-                        <div className="mb10 edu-back-white padding30-20">
-                            <p className="color-grey-6 font-16 mb20">公开程度</p>
-                            <div className="pl25">
-                                <RadioGroup onChange={this.Selectpublic} value={this.state.use_scope}>
-                                    <Radio className="radioStyle" value={0}><span>对所有公开</span> <span
-                                      className="color-grey-9">(选中则所有已被试用授权的用户可以学习)</span></Radio>
-                                    <Radio className="radioStyle" value={1}><span>对指定单位公开</span> <span
-                                      className="color-grey-9">(选中则下方指定单位的已被试用授权的用户可以学习)</span></Radio>
-                                </RadioGroup>
-
-                                <div className="clearfix none" id="unit-all"
-                                     style={{display: this.state.scopetype === false ? 'none' : 'block'}}>
-                                    <div className="fl ml25">
-                                        <div className="fl" id="unit-input-part" style={{width: '100%'}}>
-                                            <div id="person-unit" className="fl pr mr10">
-                                                <div className="shixunScopeInput fl">
-                                                    <Select
-                                                        style={{width: '200px'}}
-                                                        placeholder="请输入并选择单位名称"
-                                                        onChange={(value) => this.shixunScopeInput(value)}
-                                                        onSearch={this.shixunHandleSearch}
-                                                        showSearch
-                                                        defaultActiveFirstOption={false}
-                                                        showArrow={false}
-                                                        filterOption={false}
-                                                        notFoundContent={null}
-                                                        value={onSearchvalue}
-                                                        className={scope_partmenttype === true ? "bor-red" : ""}
-                                                        // ifd={key}
-                                                    >
-                                                        {options}
-                                                    </Select>
-                                                </div>
-                                                <span className="color-grey-9">(搜索选中添加单位名称)</span>
-                                                {/*<a className="white-btn orange-btn fl mt1 use_scope-btn" onClick={this.adduse_scopeinput}>+ 添加</a>*/}
-                                            </div>
-                                        </div>
-
-                                        <div style={{width: '100%'}}>
-                                            <div className="mt20 clearfix" id="task_tag_content">
-                                                {
-                                                    scope_partment === undefined ? "" : scope_partment.map((item, key) => {
-                                                        return (
-                                                            <li className="task_tag_span" key={key}><span>{item}</span>
-                                                                <a style={{color: 'rgba(0,0,0,.25)'}}
-                                                                   onClick={(key) => this.deleteScopeInput(key)}>×</a>
-                                                            </li>
-                                                        )
-                                                    })
-                                                }
-                                            </div>
-                                            {/*{*/}
-                                            {/*scope_partment===undefined?"":scope_partment.map((item,key)=>{*/}
-                                            {/*return(*/}
-                                            {/*<div className="shixunScopeInput fl" key={key}>*/}
-                                            {/*<Input*/}
-                                            {/*style={{width:'200px'}}*/}
-                                            {/*key={key}*/}
-                                            {/*className=""*/}
-                                            {/*suffix={<Icon type="close-circle" onClick={(key)=>this.deleteScopeInput(key)} style={{ color: 'rgba(0,0,0,.25)' }} />}*/}
-                                            {/*value={item}*/}
-                                            {/*/>*/}
-                                            {/*</div>*/}
-
-                                            {/*)*/}
-                                            {/*})*/}
-                                            {/*}*/}
-                                        </div>
-
-                                        <span className={scope_partmenttype === true ? "color-orange ml20 fl" : "none"}
-                                              id="public_unit_notice">
-                                        <i className="fa fa-exclamation-circle mr3"></i>
-                                    请选择需要公开的单位
-                                    </span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div className="mb10 edu-back-white padding30-20">
-                            <p className="color-grey-6 font-16 mb20">发布信息</p>
-                            <div className="clearfix" onMouseLeave={this.bigopens}>
-                                <div className="clearfix mb20 pl25">
-                                    <span className="fl color-grey-6 lineh-30 mr20"><span
-                                        className="mr10 color-orange mt2 fl">*</span>面向学员：</span>
-                                    <div className="with15 fl pr">
-                                        <Select placeholder="请选择学员类别"
-                                                style={{width: 180}}
-                                                onChange={this.Selectthestudent}
-                                                onMouseEnter={this.sbigopen}
-                                                onSelect={this.bigopens}
-                                                open={operss}
-                                        >
-                                            <Option value={1}>初级学员</Option>
-                                            <Option value={2}>中级学员</Option>
-                                            <Option value={3}>高级学员</Option>
-                                            <Option value={4}>顶级学员</Option>
-                                        </Select>
-                                    </div>
-                                    <span className="fl ml20 mt3 color-grey">实训难易度定位，不限定用户群体</span>
-                                    <div style={{width: '57px'}} className="ml20 mt2 fl">
-                                        <span
-                                            className={trainee_types === true ? "color-orange fl" : "color-orange fl none"}
-                                            id="shixun_tech_platform_notice"><i
-                                            className="fa fa-exclamation-circle mr3"></i>必填项</span>
-                                    </div>
-                                </div>
-                            </div>
-                            <li className="mb20 pl25">
-                                <span className="fl edu-txt-right color-grey-6 mr20"
-                                      style={{"width": "86px"}}>复制：</span>
-                                <Checkbox onChange={this.Teacherscopy}></Checkbox>
-                                <label style={{top: '6px'}} className="color-grey-6 ml10">勾选则允许已认证的教师复制该实训</label>
-                            </li>
-                            <div className="clearfix pl25">
-                                <span className="fl edu-txt-right color-grey-6 lineh-30 mr20"
-                                      style={{"width": "86px"}}>开启时间：</span>
-                                <li className="fl">
-                                    <DatePicker
-                                        showToday={false}
-                                        showTime
-                                        locale={locale}
-                                        format="YYYY-MM-DD HH:mm:ss"
-                                        placeholder="请选择开启时间"
-                                        onChange={this.onChangeTimePicker}
-                                    />
-                                    <label style={{top: '6px'}} className="color-grey-6 ml10">
-                                        （为空，则学员在实训发布后，能随时开启实训挑战；否则，学员在开启时间后，才能开启实训挑战）
-                                    </label>
-                                </li>
-                            </div>
-                        </div>
-                        {/*<div className="mb10 edu-back-white padding30-20">*/}
-                        {/*<p className="color-grey-6 font-16 mb10">VNC图形化</p>*/}
-                        {/*<li className="mb20">*/}
-                        {/*<Checkbox onChange={this.TeachersUbuntu}></Checkbox>*/}
-                        {/*<label style={{top:'6px'}}  className="color-grey-6 ml10">勾选则给学员的实践任务提供Ubuntu系统图形化实践窗口，否则不提供</label>*/}
-                        {/*</li>*/}
-                        {/*</div>*/}
-
-
-                        <div className="clearfix mt30">
-                            <a className="defalutSubmitbtn fl mr20" onClick={this.submit_new_shixun}>提交</a>
-                            <a href="/shixuns" className="defalutCancelbtn fl">取消</a>
-                        </div>
-
-
-                    </div>
-                </div>
-            </div>
-
-        );
-    }
-}
-const NewshixunsNew = Form.create({ name: 'newshixunsnew' })(Newshixuns);
-export default SnackbarHOC()(TPMIndexHOC(NewshixunsNew));
-
-
-
-
-
-
+import React, {Component} from 'react';
+
+import {TPMIndexHOC} from '../TPMIndexHOC';
+
+import {SnackbarHOC} from 'educoder';
+
+import {Input, Select, Radio, Checkbox, Modal, Icon, DatePicker,Upload,Button,message,Form} from 'antd';
+
+// import "antd/dist/antd.css";
+
+import locale from 'antd/lib/date-picker/locale/zh_CN';
+
+import axios from 'axios';
+
+import './css/Newshixuns.css';
+
+import {getUrl} from 'educoder'
+
+let path = getUrl("/editormd/lib/")
+
+const $ = window.$;
+
+let timeout;
+
+let currentValue;
+
+const Option = Select.Option;
+
+const RadioGroup = Radio.Group;
+const confirm = Modal.confirm;
+// 恢复数据
+function md_rec_data(k, mdu, id, editor) {
+    if (window.sessionStorage.getItem(k + mdu) !== null) {
+        editor.setValue(window.sessionStorage.getItem(k + mdu));
+        md_clear_data(k, mdu, id);
+    }
+}
+
+// 保存数据
+function md_add_data(k, mdu, d) {
+    window.sessionStorage.setItem(k + mdu, d);
+}
+
+// 清空保存的数据
+function md_clear_data(k, mdu, id) {
+    window.sessionStorage.removeItem(k + mdu);
+    var id1 = "#e_tip_" + id;
+    var id2 = "#e_tips_" + id;
+    if (k == 'content') {
+        $(id2).html("");
+    } else {
+        $(id1).html("");
+    }
+}
+
+function md_elocalStorage(editor, mdu, id) {
+    if (window.sessionStorage) {
+        var oc = window.sessionStorage.getItem('content' + mdu);
+        if (oc !== null) {
+            $("#e_tips_" + id).data('editor', editor);
+            var h = '您上次有已保存的数据，是否<a style="cursor: pointer;" class="link-color-blue" onclick="md_rec_data(\'content\',\'' + mdu + '\',\'' + id + '\')">恢复</a> ? / <a style="cursor: pointer;" class="link-color-blue" onclick="md_clear_data(\'content\',\'' + mdu + '\',\'' + id + '\')">不恢复</a>';
+            $("#e_tips_" + id).html(h);
+        }
+        setInterval(function () {
+            var d = new Date();
+            var h = d.getHours();
+            var m = d.getMinutes();
+            var s = d.getSeconds();
+            h = h < 10 ? '0' + h : h;
+            m = m < 10 ? '0' + m : m;
+            s = s < 10 ? '0' + s : s;
+            if (editor.getValue().trim() != "") {
+                md_add_data("content", mdu, editor.getValue());
+                var id1 = "#e_tip_" + id;
+                var id2 = "#e_tips_" + id;
+
+                $(id1).html(" 数据已于 " + h + ':' + m + ':' + s + " 保存   ");
+                $(id2).html("");
+            }
+        }, 10000);
+
+    } else {
+        $("#e_tip_" + id).after('您的浏览器不支持localStorage.无法开启自动保存草稿服务,请升级浏览器！');
+    }
+}
+
+
+function create_editorMD(id, width, high, placeholder, imageUrl, callback) {
+    var editorName = window.editormd(id, {
+        width: width,
+        height: high,
+        path: path,   // "/editormd/lib/"
+
+        syncScrolling: "single",
+        tex: true,
+        tocm: true,
+        emoji: true,
+        taskList: true,
+        codeFold: true,
+        searchReplace: true,
+        htmlDecode: "style,script,iframe",
+        sequenceDiagram: true,
+        autoFocus: false,
+        toolbarIcons: function () {
+            // Or return editormd.toolbarModes[name]; // full, simple, mini
+            // Using "||" set icons align right.
+            return ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"]
+        },
+        toolbarCustomIcons: {
+            testIcon: "<a type=\"inline\" class=\"latex\" ><div class='zbg'></div></a>",
+            testIcon1: "<a type=\"latex\" class=\"latex\" ><div class='zbg_latex'></div></a>"
+        },
+        //这个配置在simple.html中并没有，但是为了能够提交表单，使用这个配置可以让构造出来的HTML代码直接在第二个隐藏的textarea域中，方便post提交表单。
+        saveHTMLToTextarea: true,
+        // 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
+        dialogMaskOpacity: 0.6,
+        placeholder: placeholder,
+        imageUpload: true,
+        imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
+        imageUploadURL: imageUrl,//url
+        onload: function () {
+            // this.previewing();
+            $("#" + id + " [type=\"latex\"]").bind("click", function () {
+                editorName.cm.replaceSelection("```latex");
+                editorName.cm.replaceSelection("\n");
+                editorName.cm.replaceSelection("\n");
+                editorName.cm.replaceSelection("```");
+                var __Cursor = editorName.cm.getDoc().getCursor();
+                editorName.cm.setCursor(__Cursor.line - 1, 0);
+            });
+
+            $("#" + id + " [type=\"inline\"]").bind("click", function () {
+                editorName.cm.replaceSelection("$$$$");
+                var __Cursor = editorName.cm.getDoc().getCursor();
+                editorName.cm.setCursor(__Cursor.line, __Cursor.ch - 2);
+                editorName.cm.focus();
+            });
+            $("[type=\"inline\"]").attr("title", "行内公式");
+            $("[type=\"latex\"]").attr("title", "多行公式");
+
+            md_elocalStorage(editorName, `memoNew_${id}`, "memoNew");
+
+            callback && callback()
+        }
+    });
+    return editorName;
+}
+
+
+class Newshixuns extends Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            fileList: [],
+            newshixunlist: undefined,
+            departmentslist: undefined,
+            name: "",
+            main_type: "",
+            small_type: "",
+            trainee: "",
+            webssh: 0,
+            use_scope: 0,
+            can_copy: "",
+            scope_partment: undefined,
+            vnc: "",
+            scopetype: false,
+            postapplyvisible: false,
+            sendsure_applyvalue: undefined,
+            postapplytitle: false,
+            shixun_nametype: false,
+            main_types: false,
+            trainee_types: false,
+            SelectTheCommandtype: false,
+            opers: false,
+            operss: false,
+            TimePickervalue: "",
+            opensmail: false,
+            onSearchvalue: "",
+            scope_partmenttype: false,
+            languagewrite: undefined,
+            systemenvironment:undefined,
+            testcoderunmode:undefined,
+            file:undefined,
+        }
+    }
+
+    initMD(initValue) {
+        this.contentChanged = false;
+        const placeholder = "";
+        // amp;
+        // 编辑时要传memoId
+        const imageUrl = `/api/attachments.json`;
+        // 创建editorMd
+
+        const taskpass_editormd = create_editorMD("memoMD", '100%', 400, placeholder, imageUrl, () => {
+            setTimeout(() => {
+                taskpass_editormd.resize()
+                taskpass_editormd.cm && taskpass_editormd.cm.refresh()
+            }, 500)
+
+            if (initValue) {
+                taskpass_editormd.setValue(initValue)
+            }
+            taskpass_editormd.cm.on("change", (_cm, changeObj) => {
+                // console.log('....contentChanged')
+                this.contentChanged = true;
+            })
+        });
+        this.taskpass_editormd = taskpass_editormd;
+        window.taskpass_editormd = taskpass_editormd;
+
+    }
+
+    componentDidMount() {
+        let newshixunUrl = `/shixuns/new.json`;
+        axios.get(newshixunUrl).then((response) => {
+            if (response.status === 200) {
+                if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
+
+                } else {
+                    this.setState({
+                        newshixunlist: response.data
+                    });
+                    this.initMD(response.data.sample[0][1]);
+                }
+
+            }
+        }).catch((error) => {
+            console.log(error)
+        });
+
+        let departmentsUrl = `/shixuns/departments.json`;
+        axios.get(departmentsUrl).then((response) => {
+            if (response.status === 200) {
+                this.setState({
+                    departmentslist: response.data.shools_name
+                });
+            }
+        }).catch((error) => {
+            console.log(error)
+        });
+    }
+
+    setlanguagewrite = (e)=>{
+        this.setState({
+            languagewrite: e.target.value
+        })
+    }
+
+    setsystemenvironment = (e) => {
+        this.setState({
+            systemenvironment: e.target.value
+        })
+    }
+    settestcoderunmode = (e) => {
+        this.setState({
+            testcoderunmode: e.target.value
+        })
+
+    }
+    shixunname = (e) => {
+        this.setState({
+            name: e.target.value,
+            shixun_nametype: false
+        });
+    }
+
+    bigClass = (value) => {
+        this.setState({
+            main_type: value
+        })
+    }
+
+    littleClass = (value) => {
+        this.setState({
+            small_type: value
+        })
+    }
+
+    Selectthestudent = (value) => {
+        this.setState({
+            trainee: value
+        })
+    }
+
+    SelectTheCommand = (e) => {
+        this.setState({
+            webssh: e.target.value,
+        });
+
+        if (e.target.value === 2) {
+            this.setState({
+                SelectTheCommandtype: true,
+                multi_webssh: false
+            });
+        } else {
+            this.setState({
+                SelectTheCommandtype: false,
+                multi_webssh: false
+            });
+        }
+    }
+
+    Selectpublic = (e) => {
+        this.setState({
+            scopetype: false,
+            use_scope: e.target.value,
+        });
+        if (e.target.value === 1) {
+            this.setState({
+                scopetype: true
+            });
+        }
+
+    }
+
+    Teacherscopy = (e) => {
+        let sum = ""
+        if (e.target.checked === false) {
+            sum = 0
+        } else if (e.target.checked === true) {
+            sum = 1
+        }
+        this.setState({
+            can_copy: sum,
+        });
+    }
+
+    TeachersUbuntu = (e) => {
+        let sum = ""
+        if (e.target.checked === false) {
+            sum = 0
+        } else if (e.target.checked === true) {
+            sum = 1
+        }
+        this.setState({
+            vnc: sum,
+        });
+    }
+
+    adduse_scopeinput = () => {
+        let {scope_partment} = this.state;
+        let array = scope_partment;
+        let newarray = ""
+        array.push(newarray)
+        this.setState({
+            scope_partment: array,
+        });
+    }
+
+    shixunScopeInput = (e, id) => {
+        let {scope_partment} = this.state;
+        let datalist = scope_partment;
+        if (datalist === undefined) {
+            datalist = []
+        }
+        datalist.push(e)
+        // else{
+        //   datalist[id]=e
+        // }
+
+        this.setState({
+            scope_partment: datalist,
+            onSearchvalue: ""
+        });
+    }
+
+    deleteScopeInput = (key) => {
+        let {scope_partment} = this.state;
+        let datalist = scope_partment;
+        datalist.splice(key, 1);
+        this.setState({
+            scope_partment: datalist
+        });
+    }
+
+    //提交数据
+    submit_new_shixun = () => {
+        const mdVal = this.taskpass_editormd.getValue();
+        let {can_copy, main_type, name, scope_partment, small_type, trainee, use_scope, vnc, webssh, multi_webssh, TimePickervalue} = this.state;
+        let Url = `/shixuns.json`
+        if (name === "") {
+            this.setState({
+                shixun_nametype: true
+            })
+            this.props.showSnackbar("实训名称为空");
+            $('html').animate({
+                scrollTop: 10
+            }, 1000);
+            return
+        }
+        if (main_type === "") {
+            this.setState({
+                main_types: true
+            })
+            $('html').animate({
+                scrollTop: 700
+            }, 1000);
+            this.props.showSnackbar("请选择技术平台大类别");
+
+            return
+        }
+
+        if (use_scope === 1) {
+            if (scope_partment === undefined || scope_partment.length === 0) {
+                this.setState({
+                    scope_partmenttype: true
+                })
+                $('html').animate({
+                    scrollTop: 900
+                }, 1000);
+                this.props.showSnackbar("公开程度，指定单位为空");
+                return
+            }
+        }
+        if (trainee === "") {
+            this.setState({
+                trainee_types: true
+            })
+            // $('html').animate({
+            //     scrollTop: 700
+            // }, 1000);
+            this.props.showSnackbar("请选择发布信息");
+            return
+        }
+        let newmulti_webssh = multi_webssh;
+        if (newmulti_webssh === true) {
+            newmulti_webssh = 1
+        } else {
+            newmulti_webssh = ""
+        }
+        axios.post(Url, {
+                name: name,
+                can_copy: can_copy,
+                description: mdVal,
+                main_type: main_type,
+                scope_partment: scope_partment,
+                small_type: small_type,
+                trainee: trainee,
+                use_scope: use_scope,
+                vnc: vnc,
+                webssh: webssh,
+                multi_webssh: newmulti_webssh,
+                task_pass: 1,
+                opening_time: TimePickervalue
+            }
+        ).then((response) => {
+            if (response.status === 200) {
+                window.location.href = "/shixuns/" + response.data.shixun_identifier + "/challenges";
+                // window.open("/shixuns/"+response.data.shixun_identifier+"/challenges");
+            }
+        }).catch((error) => {
+            console.log(error)
+        })
+    }
+
+
+    shixunsfetch = (value, callback) => {
+        if (timeout) {
+            clearTimeout(timeout);
+            timeout = null;
+        }
+        currentValue = value;
+
+        function fake() {
+            let departmentsUrl = `/shixuns/departments.json?q=` + currentValue;
+            axios.get(departmentsUrl).then((response) => {
+                callback(response.data.shools_name);
+            }).catch((error) => {
+                console.log(error)
+            });
+        }
+
+        timeout = setTimeout(fake, 300);
+    }
+
+    shixunHandleSearch = (value) => {
+        this.shixunsfetch(value, departmentslist => this.setState({departmentslist}));
+        this.setState({
+            onSearchvalue: ""
+        })
+    }
+
+    post_apply = () => {
+        this.setState({
+            postapplyvisible: true
+        })
+    }
+    sendsure_apply = () => {
+        let {languagewrite,systemenvironment,testcoderunmode} = this.state;
+        // console.log("点击确定")
+        // console.log("languagewrite"+languagewrite);
+        // console.log("systemenvironment"+systemenvironment);
+        // console.log("testcoderunmode"+testcoderunmode);
+
+        // let attachment_ids = undefined
+        // if (this.state.fileList) {
+        //     attachment_ids = this.state.fileList.map(item => {
+        //         return item.response ? item.response.id : item.id
+        //     })
+        // }
+        if(languagewrite === undefined || languagewrite === "" ){
+            this.props.showNotification(`请填写该镜像是基于什么语言`);
+
+            return
+        }
+        if(systemenvironment === undefined || systemenvironment === ""){
+            this.props.showNotification(`请填写该镜像是基于什么语言系统环境`);
+
+            return;
+
+        }
+        if(testcoderunmode === undefined ||  testcoderunmode === "") {
+            this.props.showNotification(`请填写该镜像中测试代码运行方式`);
+
+            return;
+
+        }
+        var  attachment_ids=undefined;
+        if (this.state.fileList) {
+            attachment_ids = this.state.fileList.map(item => {
+                return item.response ? item.response.id : item.id
+            })
+        }
+        if( attachment_ids === undefined ||  attachment_ids.length===0){
+            this.props.showNotification(`请上传附件`);
+
+            return;
+        }
+        // console.log("attachment_ids"+attachment_ids);
+
+        // alert(languagewrite +"  "+systemenvironment +"   "+testcoderunmode + "   "+attachment_ids);
+
+        var data={
+            language:languagewrite,
+            runtime:systemenvironment,
+            run_method:testcoderunmode,
+            attachment_id:attachment_ids[0],
+        }
+        var url =`/shixuns/apply_shixun_mirror.json`;
+        axios.post(url,data
+        ).then((response) => {
+
+            try {
+                if (response.data) {
+                    // const { id } = response.data;
+                    // if (id) {
+                    if(this.state.file !== undefined){
+                        console.log("549");
+                        this.deleteAttachment(this.state.file);
+                        this.setState({
+                            file:undefined,
+                            languagewrite:"",
+                            systemenvironment:"",
+                            testcoderunmode:"",
+                        })
+                    }else {
+                        this.setState({
+                            file:undefined,
+                            languagewrite:"",
+                            systemenvironment:"",
+                            testcoderunmode:"",
+                        })
+                    }
+                    this.props.showNotification('提交成功！');
+                    // this.props.history.push(`/courses/${cid}/graduation_topics`);
+                    // }
+                }
+            }catch (e) {
+
+            }
+
+        })
+
+    }
+    sendhideModaly = () => {
+        this.setState({
+            postapplyvisible: false,
+        })
+        if(this.state.file !== undefined){
+            console.log("580");
+            this.deleteAttachment(this.state.file);
+            this.setState({
+                file:undefined,
+                languagewrite:"",
+                systemenvironment:"",
+                testcoderunmode:"",
+            })
+        }else {
+            this.setState({
+                file:undefined,
+                languagewrite:"",
+                systemenvironment:"",
+                testcoderunmode:"",
+            })
+        }
+    }
+    sendsure_applyvalues = (e) => {
+        this.setState({
+            sendsure_applyvalue: e.target.value
+        })
+    }
+    yeshidemodel = () => {
+        this.setState({
+            postapplytitle: false
+        })
+    }
+
+    SelectTheCommandonChange = (e) => {
+        this.setState({
+            multi_webssh: e.target.checked
+        })
+    }
+
+
+    bigopen = () => {
+        this.setState({
+            opers: true
+        })
+    }
+
+    bigopens = () => {
+        this.setState({
+            opers: false,
+            operss: false,
+            opensmail: false
+        })
+
+    }
+
+    bigopensmal = () => {
+        this.setState({
+            opensmail: true
+        })
+    }
+
+    sbigopen = () => {
+        this.setState({
+            operss: true
+        })
+    }
+
+    // sbigopens=()=>{
+    //     this.setState({
+    //         operss:false
+    //     })
+    // }
+
+    onChangeTimePicker = (value, dateString) => {
+        this.setState({
+            TimePickervalue: dateString
+        })
+    }
+    // 附件相关 START
+    handleChange = (info) => {
+        console.log("handleChange1");
+        let fileList = info.fileList;
+        this.setState({ fileList });
+    }
+    onAttachmentRemove = (file) => {
+        confirm({
+            title: '确定要删除这个附件吗?',
+            okText: '确定',
+            cancelText: '取消',
+            // content: 'Some descriptions',
+            onOk: () => {
+                console.log("665")
+                this.deleteAttachment(file)
+            },
+            onCancel() {
+                console.log('Cancel');
+            },
+        });
+        return false;
+    }
+    deleteAttachment = (file) => {
+         console.log(file);
+        let id=file.response ==undefined ? file.id : file.response.id
+        const url = `/attachments/${id}.json`
+        axios.delete(url, {
+        })
+            .then((response) => {
+                if (response.data) {
+                    const { status } = response.data;
+                    if (status == 0) {
+                        // console.log('--- success')
+
+                        this.setState((state) => {
+                            const index = state.fileList.indexOf(file);
+                            const newFileList = state.fileList.slice();
+                            newFileList.splice(index, 1);
+                            return {
+                                fileList: newFileList,
+                            };
+                        });
+                    }
+                }
+            })
+            .catch(function (error) {
+                console.log(error);
+            });
+    }
+
+
+    handleSubmit=()=>{
+        // console.log(this.state.languagewrite)
+        // console.log(this.state.systemenvironment)
+        // console.log(this.state.testcoderunmode)
+        var  attachment_ids;
+        if (this.state.fileList) {
+            attachment_ids = this.state.fileList.map(item => {
+                return item.response ? item.response.id : item.id
+            })
+        }
+        // console.log(attachment_ids);
+        // var data={
+        //     language:"",
+        //     runtime:"",
+        //     run_method:"",
+        //     attachment_id:"",
+        // }
+        // axios.post(url,data
+        // ).then((response) => {
+        //     if (response.data) {
+        //         // const { id } = response.data;
+        //         // if (id) {
+        //             this.props.showNotification('提交成功！');
+        //             // this.props.history.push(`/courses/${cid}/graduation_topics`);
+        //         // }
+        //     }
+        // })
+
+
+
+    }
+    render() {
+        const { getFieldDecorator } = this.props.form;
+        const  thiss=this;
+        let {testcoderunmode ,systemenvironment,languagewrite, fileList,TimePickervalue, scope_partmenttype, opensmail, newshixunlist, name, scope_partment, departmentslist, postapplyvisible, sendsure_applyvalue, postapplytitle, shixun_nametype, main_types, trainee_types, SelectTheCommandtype, opers, operss, onSearchvalue} = this.state;
+        let options
+        if (departmentslist != undefined) {
+            options = this.state.departmentslist.map((d, k) => {
+                return (
+                    <Option key={d} id={k}>{d}</Option>
+                )
+            })
+        }
+        const uploadProps = {
+            width: 600,
+            fileList,
+            multiple: true,
+            // https://github.com/ant-design/ant-design/issues/15505
+            // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
+            // showUploadList: false,
+            action:  `${getUrl()}/api/attachments.json`,
+            onChange: this.handleChange,
+            onRemove: this.onAttachmentRemove,
+            beforeUpload: (file) => {
+                // console.log('beforeUpload', file.name);
+                const isLt150M = file.size / 1024 / 1024 < 50;
+                if (!isLt150M) {
+                    this.props.showNotification(`文件大小必须小于50MB`);
+
+                }
+                if(thiss.state.file !== undefined){
+                    console.log("763")
+                    thiss.deleteAttachment(thiss.state.file);
+                    thiss.setState({
+                        file:file
+                    })
+                }else {
+                    thiss.setState({
+                        file:file
+                    })
+                }
+
+                console.log("handleChange2");
+                return isLt150M;
+            },
+        }
+        // const uploadProps = {
+        //     width: 600,
+        //     fileList,
+        //     multiple: true,
+        //     // https://github.com/ant-design/ant-design/issues/15505
+        //     // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
+        //     // showUploadList: false,
+        //     action:  `${getUrl()}/api/attachments.json`,
+        //     onChange: this.handleChange,
+        //     onRemove: this.onAttachmentRemove,
+        //     beforeUpload: (file) => {
+        //         // console.log('beforeUpload', file.name);
+        //         const isLt50M = file.size / 1024 / 1024 < 50;
+        //         if (!isLt50M) {
+        //             message.error('文件大小必须小于150MB!');
+        //         }
+        //         return isLt50M;
+        //     },
+        // };
+        return (
+
+            <div className="newMain clearfix" onClick={this.bigopens}>
+                <div className="educontent mt20 mb60 clearfix">
+                    <div className="new_shixun">
+
+                        <div className="mb10 edu-back-white">
+                            <p className="padding10-20 bor-bottom-greyE color-grey-3 clearfix">
+                                <span className="fl font-18 lineh-35">创建实训</span>
+                                <a className="fr font-16 mt3 color-blue" href="https://www.educoder.net/forums/2943"
+                                   target="_blank">实训制作指南</a>
+                            </p>
+
+                            <div className="padding30-20">
+                                <p className="color-grey-6 font-16 mb15">实训名称</p>
+                                <div className="df">
+                                    <span className="mr30 color-orange pt10">*</span>
+                                    <div className="flex1">
+                                        <input
+                                            className={shixun_nametype === true ? "input-100-45 greyInput bor-red" : "input-100-45 greyInput"}
+                                            id="shixun_name" maxLength="60"
+                                            name="shixun[name]"
+                                            value={name}
+                                            onInput={this.shixunname}
+                                            placeholder="请输入实训名称，最多60个字符"
+                                            size="60"
+                                            type="text"
+                                            style={{width: shixun_nametype === false ? '1123px' : '93%'}}
+                                        />
+                                        <span
+                                            className={shixun_nametype === true ? "color-orange fr mt10" : "color-orange fr none"}
+                                            id="shixun_name_notice">
+                                                <i className="fa fa-exclamation-circle mr3"></i>必填项
+                                            </span>
+                                    </div>
+
+                                </div>
+                            </div>
+
+                        </div>
+
+
+                        <div className="mb10 edu-back-white padding30-20">
+
+                            <p className="color-grey-6 font-16 mb15">简介</p>
+
+                            <div className="df">
+                                <div className="flex1 break_word show_content_grey new_li" id="memoMD">
+                                    <textarea style={{display: 'none'}} id="evaluate_script_shows"
+                                              name="content"></textarea>
+                                </div>
+                            </div>
+                            <p id="e_tip_memoNew" className="edu-txt-right color-grey-cd font-12"></p>
+                            <p id="e_tips_memoNew" className="edu-txt-right color-grey-cd font-12"></p>
+                        </div>
+
+                        <div className="mb10 edu-back-white padding30-20">
+                            <p className="color-grey-6 font-16 mb15">技术平台</p>
+                            <div className="clearfix mb20">
+                                <span className="mr30 color-orange pt5 fl">*</span>
+                                <div className="width15 fl mr20" onMouseLeave={this.bigopens}>
+                                    <Select placeholder="请更新主类别"
+                                            style={{width: 180}}
+                                            onChange={this.bigClass}
+                                            onMouseEnter={this.bigopen}
+                                            onSelect={this.bigopens}
+                                            defaultOpen={false}
+                                            open={opers}
+                                    >
+                                        {
+                                            newshixunlist === undefined ? "" : newshixunlist.main_type.map((item, key) => {
+                                                return (
+                                                    <Option value={item.id} key={key}>{item.type_name}</Option>
+
+
+                                                )
+                                            })
+                                        }
+                                    </Select>
+                                    <p className="edu-txt-right font-12">
+                                        列表中没有？
+                                        <a className="color-blue" onClick={this.post_apply}> 申请新建</a>
+                                    </p>
+
+                                    <Modal
+                                        keyboard={false}
+                                        title="申请新建"
+                                        visible={postapplyvisible}
+                                        closable={false}
+                                        footer={null}
+                                        width={850}
+                                        heigth={720}
+                                    >
+                                        {/*<Form  onSubmit={this.handleSubmit}>*/}
+                                        <div>
+                                            <li className="clearfix mb15 ml85" >
+                                                <label className="fl mt10 "><span
+                                                    className="color-red fl mt3">*</span>语言：&nbsp;&nbsp;</label>
+                                                <textarea className="fl task-form-80 task-height-150"
+                                                          onInput={this.setlanguagewrite}
+                                                          value={languagewrite}
+                                                          placeholder="请填写该镜像是基于什么语言：示例：Python"
+                                                          id="demand_info"></textarea>
+                                            </li>
+                                            <li className="clearfix mb15">
+                                                <label className="panel-form-label fl ml50"><span
+                                                    className="color-red fl mt3">*</span>系统环境：&nbsp;&nbsp;</label>
+                                                <textarea className="fl task-form-80 task-height-150 "
+                                                          onInput={this.setsystemenvironment}
+                                                          value={systemenvironment}
+                                                          placeholder="请填写该镜像是基于什么linux系统环境,代码运行环境"
+                                                          id="demand_info"></textarea>
+                                            </li>
+
+                                            <li className="clearfix mb15">
+                                                <label className="fl mt10" ><span
+                                                    className="color-red fl mt3">*</span>测试代码运行方式：&nbsp;&nbsp;</label>
+
+                                                <textarea className="fl task-form-80 task-height-150 "
+                                                          onInput={this.settestcoderunmode}
+                                                          value={testcoderunmode}
+                                                          placeholder="请填写该镜像中测试代码运行方式"
+                                                          id="demand_info"></textarea>
+                                            </li>
+
+                                            <li className="clearfix mb15  ml50">
+                                                <label className="panel-form-label fl mt-5"><span
+                                                    className="color-red fl">*</span>测试代码：&nbsp;&nbsp;</label>
+                                                <div  className="mt10" style={{
+                                                    display: "inline-block"
+                                                }}>
+                                                    {/*<Form.Item>*/}
+                                                    {/*    {*/}
+                                                    {/*        getFieldDecorator('file',{*/}
+                                                    {/*            rules:[{*/}
+                                                    {/*            }]*/}
+                                                    {/*        })(*/}
+                                                <Upload {...uploadProps} >
+                                                    <Icon type="upload"  className="fl mt5" > </Icon>
+                                                    <span className="color-blue fl">上传附件</span>
+                                                    <span className="color-grey-c fl ml10 ">(单个文件50M以内)</span>
+
+                                                </Upload>
+                                                    {/*        )*/}
+                                                    {/*    }*/}
+                                                    {/*</Form.Item>*/}
+                                        </div>
+
+                                            </li>
+                                            <li className="edu-txt-center clearfix ">
+
+                                                <Form.Item>
+                                                <a className="pop_close task-btn  mr30 mb30 mt35"
+                                                   onClick={() => this.sendhideModaly()}
+                                                >取消</a>
+                                                <Button type="primary"  onClick={()=>this.sendsure_apply()}
+                                                   className="task-btn task-btn-orange mb30 mt35">确定</Button>
+                                                </Form.Item>
+                                            </li>
+                                            <div className="cl"></div>
+                                        </div>
+                                        {/*</Form>*/}
+                                    </Modal>
+
+                                    <Modal
+                                        keyboard={false}
+                                        title="提示"
+                                        visible={postapplytitle}
+                                        closable={false}
+                                        footer={null}
+                                    >
+                                        <div>
+                                            <div className="task-popup-content"><p
+                                                className="task-popup-text-center font-16"><span
+                                                className="font-17 mt10">新建申请已提交，请等待管理员的审核</span></p>
+                                                <li className="font-14 mt15 color-grey-6 edu-txt-center">我们将在1-2个工作日内与您联系
+                                                </li>
+                                            </div>
+                                            <div className="task-popup-OK clearfix">
+                                                <a className="task-btn task-btn-orange"
+                                                   onClick={this.yeshidemodel}>知道啦</a>
+                                            </div>
+                                        </div>
+                                    </Modal>
+                                </div>
+                                <div className=" fl pr mr20" onMouseLeave={this.bigopens}>
+                                    <Select mode="multiple" placeholder="请选择小类别"
+                                            style={{minWidth: 180}}
+                                            onChange={this.littleClass}
+                                            onMouseEnter={this.bigopensmal}
+                                            onSelect={this.bigopens}
+                                            defaultOpen={false}
+                                            open={opensmail}
+                                    >
+                                        {
+                                            newshixunlist === undefined ? "" : newshixunlist.small_type.map((item, key) => {
+                                                return (
+                                                    <Option value={item.id} key={key}>{item.type_name}</Option>
+                                                )
+                                            })
+                                        }
+                                    </Select>
+                                </div>
+                                <p className="fl ml10 color-grey-9 mt5">请在配置页面完成后续的评测脚本设置操作</p>
+                                <div style={{width: '57px'}} className="ml20 fl">
+                                    <span className={main_types === true ? "color-orange fl" : "color-orange fl none"}
+                                          id="shixun_tech_platform_notice"><i
+                                        className="fa fa-exclamation-circle mr3"></i>必填项</span>
+                                </div>
+                            </div>
+                        </div>
+
+
+                        <div className="mb10 edu-back-white padding30-20">
+                            <p className="color-grey-6 font-16 mb20">命令行</p>
+                            <div className="pl25">
+                                <RadioGroup onChange={this.SelectTheCommand} value={this.state.webssh}>
+                                    <Radio className="radioStyle" value={0}><span>无命令行窗口</span> <span
+                                      className="color-grey-9">（选中则不给学员的实践任务提供命令窗口）</span></Radio>
+                                    <Radio className="radioStyle" value={1}><span>命令行练习窗口</span> <span
+                                      className="color-grey-9">（选中则给学员提供用于练习操作的命令行窗口）</span></Radio>
+                                    <Radio className="radioStyle" value={2}><span>命令行评测窗口</span> <span
+                                      className="color-grey-9">（选中则给学员提供用于关卡评测的命令行窗口）</span></Radio>
+                                    <Checkbox style={{display: SelectTheCommandtype ? "block" : "none"}}
+                                              className={"ml36"} checked={this.state.multi_webssh}
+                                              onChange={this.SelectTheCommandonChange}>
+                                        多个命令行窗口<span className="color-grey-9">（选中则允许学员同时开启多个命令行窗口）</span>
+                                    </Checkbox>
+                                </RadioGroup>
+                            </div>
+                        </div>
+
+
+                        <div className="mb10 edu-back-white padding30-20">
+                            <p className="color-grey-6 font-16 mb20">公开程度</p>
+                            <div className="pl25">
+                                <RadioGroup onChange={this.Selectpublic} value={this.state.use_scope}>
+                                    <Radio className="radioStyle" value={0}><span>对所有公开</span> <span
+                                      className="color-grey-9">(选中则所有已被试用授权的用户可以学习)</span></Radio>
+                                    <Radio className="radioStyle" value={1}><span>对指定单位公开</span> <span
+                                      className="color-grey-9">(选中则下方指定单位的已被试用授权的用户可以学习)</span></Radio>
+                                </RadioGroup>
+
+                                <div className="clearfix none" id="unit-all"
+                                     style={{display: this.state.scopetype === false ? 'none' : 'block'}}>
+                                    <div className="fl ml25">
+                                        <div className="fl" id="unit-input-part" style={{width: '100%'}}>
+                                            <div id="person-unit" className="fl pr mr10">
+                                                <div className="shixunScopeInput fl">
+                                                    <Select
+                                                        style={{width: '200px'}}
+                                                        placeholder="请输入并选择单位名称"
+                                                        onChange={(value) => this.shixunScopeInput(value)}
+                                                        onSearch={this.shixunHandleSearch}
+                                                        showSearch
+                                                        defaultActiveFirstOption={false}
+                                                        showArrow={false}
+                                                        filterOption={false}
+                                                        notFoundContent={null}
+                                                        value={onSearchvalue}
+                                                        className={scope_partmenttype === true ? "bor-red" : ""}
+                                                        // ifd={key}
+                                                    >
+                                                        {options}
+                                                    </Select>
+                                                </div>
+                                                <span className="color-grey-9">(搜索选中添加单位名称)</span>
+                                                {/*<a className="white-btn orange-btn fl mt1 use_scope-btn" onClick={this.adduse_scopeinput}>+ 添加</a>*/}
+                                            </div>
+                                        </div>
+
+                                        <div style={{width: '100%'}}>
+                                            <div className="mt20 clearfix" id="task_tag_content">
+                                                {
+                                                    scope_partment === undefined ? "" : scope_partment.map((item, key) => {
+                                                        return (
+                                                            <li className="task_tag_span" key={key}><span>{item}</span>
+                                                                <a style={{color: 'rgba(0,0,0,.25)'}}
+                                                                   onClick={(key) => this.deleteScopeInput(key)}>×</a>
+                                                            </li>
+                                                        )
+                                                    })
+                                                }
+                                            </div>
+                                            {/*{*/}
+                                            {/*scope_partment===undefined?"":scope_partment.map((item,key)=>{*/}
+                                            {/*return(*/}
+                                            {/*<div className="shixunScopeInput fl" key={key}>*/}
+                                            {/*<Input*/}
+                                            {/*style={{width:'200px'}}*/}
+                                            {/*key={key}*/}
+                                            {/*className=""*/}
+                                            {/*suffix={<Icon type="close-circle" onClick={(key)=>this.deleteScopeInput(key)} style={{ color: 'rgba(0,0,0,.25)' }} />}*/}
+                                            {/*value={item}*/}
+                                            {/*/>*/}
+                                            {/*</div>*/}
+
+                                            {/*)*/}
+                                            {/*})*/}
+                                            {/*}*/}
+                                        </div>
+
+                                        <span className={scope_partmenttype === true ? "color-orange ml20 fl" : "none"}
+                                              id="public_unit_notice">
+                                        <i className="fa fa-exclamation-circle mr3"></i>
+                                    请选择需要公开的单位
+                                    </span>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+
+                        <div className="mb10 edu-back-white padding30-20">
+                            <p className="color-grey-6 font-16 mb20">发布信息</p>
+                            <div className="clearfix" onMouseLeave={this.bigopens}>
+                                <div className="clearfix mb20 pl25">
+                                    <span className="fl color-grey-6 lineh-30 mr20"><span
+                                        className="mr10 color-orange mt2 fl">*</span>面向学员：</span>
+                                    <div className="with15 fl pr">
+                                        <Select placeholder="请选择学员类别"
+                                                style={{width: 180}}
+                                                onChange={this.Selectthestudent}
+                                                onMouseEnter={this.sbigopen}
+                                                onSelect={this.bigopens}
+                                                open={operss}
+                                        >
+                                            <Option value={1}>初级学员</Option>
+                                            <Option value={2}>中级学员</Option>
+                                            <Option value={3}>高级学员</Option>
+                                            <Option value={4}>顶级学员</Option>
+                                        </Select>
+                                    </div>
+                                    <span className="fl ml20 mt3 color-grey">实训难易度定位，不限定用户群体</span>
+                                    <div style={{width: '57px'}} className="ml20 mt2 fl">
+                                        <span
+                                            className={trainee_types === true ? "color-orange fl" : "color-orange fl none"}
+                                            id="shixun_tech_platform_notice"><i
+                                            className="fa fa-exclamation-circle mr3"></i>必填项</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <li className="mb20 pl25">
+                                <span className="fl edu-txt-right color-grey-6 mr20"
+                                      style={{"width": "86px"}}>复制：</span>
+                                <Checkbox onChange={this.Teacherscopy}></Checkbox>
+                                <label style={{top: '6px'}} className="color-grey-6 ml10">勾选则允许已认证的教师复制该实训</label>
+                            </li>
+                            <div className="clearfix pl25">
+                                <span className="fl edu-txt-right color-grey-6 lineh-30 mr20"
+                                      style={{"width": "86px"}}>开启时间：</span>
+                                <li className="fl">
+                                    <DatePicker
+                                        showToday={false}
+                                        showTime
+                                        locale={locale}
+                                        format="YYYY-MM-DD HH:mm:ss"
+                                        placeholder="请选择开启时间"
+                                        onChange={this.onChangeTimePicker}
+                                    />
+                                    <label style={{top: '6px'}} className="color-grey-6 ml10">
+                                        （为空，则学员在实训发布后，能随时开启实训挑战；否则，学员在开启时间后，才能开启实训挑战）
+                                    </label>
+                                </li>
+                            </div>
+                        </div>
+                        {/*<div className="mb10 edu-back-white padding30-20">*/}
+                        {/*<p className="color-grey-6 font-16 mb10">VNC图形化</p>*/}
+                        {/*<li className="mb20">*/}
+                        {/*<Checkbox onChange={this.TeachersUbuntu}></Checkbox>*/}
+                        {/*<label style={{top:'6px'}}  className="color-grey-6 ml10">勾选则给学员的实践任务提供Ubuntu系统图形化实践窗口，否则不提供</label>*/}
+                        {/*</li>*/}
+                        {/*</div>*/}
+
+
+                        <div className="clearfix mt30">
+                            <a className="defalutSubmitbtn fl mr20" onClick={this.submit_new_shixun}>提交</a>
+                            <a href="/shixuns" className="defalutCancelbtn fl">取消</a>
+                        </div>
+
+
+                    </div>
+                </div>
+            </div>
+
+        );
+    }
+}
+const NewshixunsNew = Form.create({ name: 'newshixunsnew' })(Newshixuns);
+export default SnackbarHOC()(TPMIndexHOC(NewshixunsNew));
+
+
+
+
+
+
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 09bab590d..ecc94e905 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -336,12 +336,12 @@ class Challenges extends Component {
                           {this.props.identity<4?
                             item.st === 1 ?
                               <a onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editquestion")}
-                                 className="font-16 color05101a">{item.name+1}</a>
+                                 className="font-16 color05101a">{item.name}</a>
                               :
                               <a onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editcheckpoint")}
-                                 className="font-16 color05101a">{item.name+2}</a>:<span
+                                 className="font-16 color05101a">{item.name}</a>:<span
                               // onClick={() => this.startshixunCombat(this.props.identity, item.challenge_id, "/editcheckpoint")}
-                              className="font-16 color05101a">{item.name+2}</span>
+                              className="font-16 color05101a">{item.name}</span>
                           }
 
                           <Modal
diff --git a/public/react/src/modules/tpm/shixuns/ShixunCard.js b/public/react/src/modules/tpm/shixuns/ShixunCard.js
index 7237f9e35..e0850143c 100644
--- a/public/react/src/modules/tpm/shixuns/ShixunCard.js
+++ b/public/react/src/modules/tpm/shixuns/ShixunCard.js
@@ -1,174 +1,177 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames';
-
-// import { Rating,Loading} from '@icedesign/base';
-
-import {getImageUrl,setImagesUrl, toPath} from 'educoder';
-
-// import { Pagination,Row,Col } from 'antd';
-
-import 'antd/lib/pagination/style/index.css';
-
-import './shixunCss/shixunCard.css';
-
-import Rating from '@icedesign/base/lib/rating';
-
-import Pagination from '@icedesign/base/lib/pagination';
-
-// import Loading from '@icedesign/base/lib/loading';
-
-// 引入业务组件样式
-import '@icedesign/base/lib/pagination/style.js';
-
-import '@icedesign/base/lib/rating/style.js';
-
-import { Tooltip } from 'antd';
-
-// import '@icedesign/base/lib/loading/style.js';
-
-import axios from 'axios';
-
-const $ = window.$;
-
-class ShixunCard extends Component {
-  constructor(props) {
-    super(props)
-
-    this.state = {
-      startValue:[],
-      order_by:"",
-      page:1,
-      limit:16,
-      keyword:"",
-      status:0,
-      diff:0,
-      hideme:false,
-      tag_level:3,
-      tag_id:''
-    }
-
-  }
-
-  PaginationonChange=(pageNumber)=> {
-    this.props.shixunsPage(pageNumber);
-  }
-
-  render() {
-    let {middleshixundata, pagination, typepvisible, pages, totalcount} = this.props;
-    return (
-      <div className="educontent mb80">
-        {/*<Loading visible={typepvisible} shape="dot-circle" color='#4AC7FF'>*/}
-
-        <div id="shixun_list_content"
-             style={{display: middleshixundata === undefined || middleshixundata.length === 0 ? "block" : "none"}}>
-          <div className="square-list clearfix">
-            <div className="edu-tab-con-box clearfix edu-txt-center">
-              <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-              <p className="edu-nodata-p mb20">暂无数据哦~</p>
-            </div>
-          </div>
-          <div className="educontent edu-txt-center mb80">
-            <div className="inline pages_user_show">
-              <ul>
-
-              </ul>
-              <div className="cl"></div>
-            </div>
-          </div>
-        </div>
-
-        <div className="mt10 mb20 clearfix"
-             style={{display: middleshixundata === undefined || middleshixundata.length === 0 ? "none" : "block"}}>
-          <div className="shixun_list_content">
-            <div className="square-list clearfix">
-              { middleshixundata===undefined?" ":middleshixundata.map((item,key)=>{
-                return(
-                  <div className="square-Item" key={key} id={item.id}>
-                    {
-                      item.tag_name === null ? "":
-                        <div className="tag-green">
-                          <span className="tag-name"> {item.tag_name}</span>
-                          <img style={{display:'block',height: '28px'}} src={require(`./shixunCss/tag2.png`)}/>
-                        </div>
-                    }
-                    <div className={item.power === false ? "closeSquare" : "none"}>
-                      <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
-                           className="mt80 mb25"/>
-                      <p className="font-14 color-white">非试用内容，需要授权</p>
-                    </div>
-
-                    <a href={"/shixuns/"+item.identifier+"/challenges"} target="_blank" className="square-img">
-                      {/*<img  src={getImageUrl("images/"+item.pic+"?1540534846")}/>*/}
-                      <img  src={setImagesUrl(`${item.pic}`)}/>
-                    </a>
-
-                    <div className="square-main">
-                      <p className="task-hide">
-                        <a href={"/shixuns/"+item.identifier+"/challenges"} target="_blank"  className="justify color-grey-name" title={item.name}>
-                          {item.name}
-                        </a>
-                      </p>
-
-                      <p className="clearfix mt8 ml-3">
-                        <span className="rateYoStar fl" style={{padding: '0px',height: '20px',lineHeight: '19px',cursor: 'default'}} title="">
-                              <Rating key={key} value={item.score_info===null?5:item.score_info} disabled allowHalf />
-                        </span>
-                        <span className="fl ml25 font-12 color-grey-9 lineh-12 mt4">{item.score_info===null?"5分":item.score_info+"分"}</span>
-                      </p>
-
-                      <p className="clearfix mt8 font-12 color-grey-B4">
-                        <Tooltip placement="bottom" title={"关卡"}>
-                            <span className="mr10 fl squareIconSpan">
-                              <i className="iconfont icon-shixunguanqia fl mr3"></i>{item.challenges_count}
-                            </span>
-                        </Tooltip>
-
-                        {/*<Tooltip placement="bottom" title={"经验值"}>*/}
-                            {/*<span className="mr10 fl squareIconSpan">*/}
-                                {/*<i className="iconfont icon-jingyan fl mr3"></i>{item.exp}*/}
-                            {/*</span>*/}
-                        {/*</Tooltip>*/}
-
-                        <Tooltip placement="bottom" title={"学习人数"}>
-                            <span className="mr10 fl squareIconSpan" style={{display:item.stu_num===0?"none":"block"}}>
-                               <i className="iconfont icon-chengyuan fl mr3"></i>{item.stu_num}
-                            </span>
-                        </Tooltip>
-
-                        <span className="fr color-grey-B3 squareIconSpan">{item.level}</span>
-                      </p>
-
-                    </div>
-                  </div>
-                )
-              })
-              }
-
-            </div>
-
-            <div className="both"></div>
-            {/*totalcount*/}
-            <div className={"ml425"}
-              //className={totalcount < 22 ? "ml425" : "ml425"}
-                 style={{display: pagination ? "block" : "none"}}>
-              {/*<Pagination showQuickJumper defaultCurrent={1} current={pages} total={totalcount} pageSize={12} onChange={this.PaginationonChange} />*/}
-              {/* 不加参数请求的时候，没返回总数了。加了个比较大的数字，让他可以翻页 */}
-              <Pagination defaultCurrent={1} current={pages} total={ totalcount || 1299 } type="mini" pageSize={16}  onChange={this.PaginationonChange} />
-            </div>
-
-          </div>
-
-        </div>
-        {/*</Loading>*/}
-      </div>
-    )
-  }
-}
-
-export default ShixunCard;
+import React, { Component } from 'react';
+import { Redirect } from 'react-router';
+
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import PropTypes from 'prop-types';
+
+import classNames from 'classnames';
+
+// import { Rating,Loading} from '@icedesign/base';
+
+import {getImageUrl,setImagesUrl, toPath} from 'educoder';
+
+// import { Pagination,Row,Col } from 'antd';
+
+import 'antd/lib/pagination/style/index.css';
+
+import './shixunCss/shixunCard.css';
+
+import Rating from '@icedesign/base/lib/rating';
+
+import Pagination from '@icedesign/base/lib/pagination';
+
+// import Loading from '@icedesign/base/lib/loading';
+
+// 引入业务组件样式
+import '@icedesign/base/lib/pagination/style.js';
+
+import '@icedesign/base/lib/rating/style.js';
+
+import { Tooltip } from 'antd';
+
+// import '@icedesign/base/lib/loading/style.js';
+
+import axios from 'axios';
+
+const $ = window.$;
+
+class ShixunCard extends Component {
+  constructor(props) {
+    super(props)
+
+    this.state = {
+      startValue:[],
+      order_by:"",
+      page:1,
+      limit:16,
+      keyword:"",
+      status:0,
+      diff:0,
+      hideme:false,
+      tag_level:3,
+      tag_id:''
+    }
+
+  }
+
+  PaginationonChange=(pageNumber)=> {
+    this.props.shixunsPage(pageNumber);
+  }
+
+  render() {
+    let {middleshixundata, pagination, typepvisible, pages, totalcount} = this.props;
+    return (
+      <div className="educontent mb80">
+        {/*<Loading visible={typepvisible} shape="dot-circle" color='#4AC7FF'>*/}
+
+        <div id="shixun_list_content"
+             style={{display: middleshixundata === undefined || middleshixundata.length === 0 ? "block" : "none"}}>
+          <div className="square-list clearfix">
+            <div className="edu-tab-con-box clearfix edu-txt-center">
+              <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+              <p className="edu-nodata-p mb20">暂无数据哦~</p>
+            </div>
+          </div>
+          <div className="educontent edu-txt-center mb80">
+            <div className="inline pages_user_show">
+              <ul>
+
+              </ul>
+              <div className="cl"></div>
+            </div>
+          </div>
+        </div>
+
+        <div className="mt10 mb20 clearfix"
+             style={{display: middleshixundata === undefined || middleshixundata.length === 0 ? "none" : "block"}}>
+          <div className="shixun_list_content">
+            <div className="square-list clearfix">
+              { middleshixundata===undefined?" ":middleshixundata.map((item,key)=>{
+                return(
+                  <div className="square-Item" key={key} id={item.id}>
+                    {
+                      item.tag_name === null ? "":
+                        <div className="tag-green">
+                          <span className="tag-name"> {item.tag_name}</span>
+                          <img style={{display:'block',height: '28px'}} src={require(`./shixunCss/tag2.png`)}/>
+                        </div>
+                    }
+                    <div className={item.power === false ? "closeSquare" : "none"}>
+                      <img src={getImageUrl("images/educoder/icon/lockclose.svg")}
+                           className="mt80 mb25"/>
+                      <p className="font-14 color-white">非试用内容，需要授权</p>
+                    </div>
+
+                    <a href={"/shixuns/"+item.identifier+"/challenges"}  className="square-img">
+                      {/*<img  src={getImageUrl("images/"+item.pic+"?1540534846")}/>*/}
+                      <img  src={setImagesUrl(`${item.pic}`)}/>
+                    </a>
+										{/*target="_blank"*/}
+
+                    <div className="square-main">
+                      <p className="task-hide">
+                        <a href={"/shixuns/"+item.identifier+"/challenges"} className="justify color-grey-name" title={item.name}>
+                          {item.name}
+                        </a>
+                      </p>
+
+											{/*target="_blank"*/}
+
+                      <p className="clearfix mt8 ml-3">
+                        <span className="rateYoStar fl" style={{padding: '0px',height: '20px',lineHeight: '19px',cursor: 'default'}} title="">
+                              <Rating key={key} value={item.score_info===null?5:item.score_info} disabled allowHalf />
+                        </span>
+                        <span className="fl ml25 font-12 color-grey-9 lineh-12 mt4">{item.score_info===null?"5分":item.score_info+"分"}</span>
+                      </p>
+
+                      <p className="clearfix mt8 font-12 color-grey-B4">
+                        <Tooltip placement="bottom" title={"关卡"}>
+                            <span className="mr10 fl squareIconSpan">
+                              <i className="iconfont icon-shixunguanqia fl mr3"></i>{item.challenges_count}
+                            </span>
+                        </Tooltip>
+
+                        {/*<Tooltip placement="bottom" title={"经验值"}>*/}
+                            {/*<span className="mr10 fl squareIconSpan">*/}
+                                {/*<i className="iconfont icon-jingyan fl mr3"></i>{item.exp}*/}
+                            {/*</span>*/}
+                        {/*</Tooltip>*/}
+
+                        <Tooltip placement="bottom" title={"学习人数"}>
+                            <span className="mr10 fl squareIconSpan" style={{display:item.stu_num===0?"none":"block"}}>
+                               <i className="iconfont icon-chengyuan fl mr3"></i>{item.stu_num}
+                            </span>
+                        </Tooltip>
+
+                        <span className="fr color-grey-B3 squareIconSpan">{item.level}</span>
+                      </p>
+
+                    </div>
+                  </div>
+                )
+              })
+              }
+
+            </div>
+
+            <div className="both"></div>
+            {/*totalcount*/}
+            <div className={"ml425"}
+              //className={totalcount < 22 ? "ml425" : "ml425"}
+                 style={{display: pagination ? "block" : "none"}}>
+              {/*<Pagination showQuickJumper defaultCurrent={1} current={pages} total={totalcount} pageSize={12} onChange={this.PaginationonChange} />*/}
+              {/* 不加参数请求的时候，没返回总数了。加了个比较大的数字，让他可以翻页 */}
+              <Pagination defaultCurrent={1} current={pages} total={ totalcount || 1299 } type="mini" pageSize={16}  onChange={this.PaginationonChange} />
+            </div>
+
+          </div>
+
+        </div>
+        {/*</Loading>*/}
+      </div>
+    )
+  }
+}
+
+export default ShixunCard;
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index 074c4ed89..4c9bc616a 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -101,7 +101,7 @@ a.decoration{text-decoration: underline}
 /*通用内外边距*/
 .mt-10{ margin-top:-10px;}.mt-3{ margin-top:-3px;}.mt0{ margin-top:0px!important;} .mt1{ margin-top:1px;}.mt2{ margin-top:2px;}.mt3{ margin-top:3px;}.mt4{ margin-top:4px;}.mt5{ margin-top:5px!important;}.mt6{ margin-top:6px;}.mt7{ margin-top:7px!important;}.mt8{ margin-top:8px;}.mt9{ margin-top:9px;}.mt10{ margin-top:10px!important;}.mt12{ margin-top:12px;}.mt13{ margin-top:13px;}.mt14{ margin-top:14px;}.mt15{ margin-top:15px!important;}.mt16{ margin-top:16px;}.mt17{ margin-top:17px;}.mt18{ margin-top:18px;}.mt20{ margin-top:20px!important;}.mt22{ margin-top:22px!important;}.mt23{ margin-top:23px!important;}.mt24{ margin-top:24px!important;}.mt25{ margin-top:25px;}.mt28{ margin-top:28px;}.mt30{ margin-top:30px!important;}.mt34{ margin-top:34px!important;}.mt35{ margin-top:35px!important;}.mt36{ margin-top:36px!important;}.mt40{ margin-top:40px;}.mt45{ margin-top:45px;}.mt46{ margin-top:46px;}.mt50{ margin-top:50px;!important;}.mt56{ margin-top:56px;!important;}.mt60{ margin-top:60px;}.mt70{ margin-top:70px;}.mt80{ margin-top:80px;}.mt95{ margin-top:95px;}.mt100{ margin-top:100px;}.mt110{ margin-top:110px;}.mt120{ margin-top:120px;}.mt130{ margin-top:130px;}.mt140{ margin-top:140px;}.mt150{ margin-top:150px;}.mt160{ margin-top:160px;}
 .mb0{margin-bottom: 0px!important;}.mb3{ margin-bottom: 3px;}.mb5{ margin-bottom: 5px;}.mb7{ margin-bottom: 7px;}.mb10{ margin-bottom: 10px;}.mb11{ margin-bottom: 11px;}.mb14{ margin-bottom: 14px;}.mb15{ margin-bottom: 15px;}.mb16{ margin-bottom: 16px;}.mb20{ margin-bottom: 20px!important;}.mb25{ margin-bottom: 25px;}.mb26{ margin-bottom: 26px;}.mb28{ margin-bottom: 28px;}.mb30{ margin-bottom: 30px!important;}.mb40{ margin-bottom: 40px!important;}.mb50{ margin-bottom: 50px!important;}.mb60{ margin-bottom: 60px!important;}.mb70{ margin-bottom: 70px!important;}.mb80{ margin-bottom: 80px!important;}.mb90{ margin-bottom: 90px!important;}.mb100{ margin-bottom: 100px!important;}.mb110{ margin-bottom: 110px;}
-.ml-3{ margin-left: -3px;}.ml1{margin-left: 1px;}.ml2{margin-left: 2px;}.ml3{margin-left: 3px;}.ml4{margin-left: 4px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml12{ margin-left:12px!important;}.ml13{ margin-left:13px!important;}.ml15{ margin-left: 15px;}.ml18{ margin-left: 18px;}.ml20{ margin-left: 20px;}.ml22{ margin-left: 22px;}.ml25{ margin-left: 25px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml45{ margin-left: 45px;}.ml50{ margin-left: 50px;}.ml55{ margin-left: 55px;}.ml60{ margin-left: 60px;}.ml72{ margin-left: 72px;}.ml73{ margin-left: 73px;}.ml75{ margin-left: 75px;}.ml80{ margin-left: 80px;}.ml85{margin-left:85px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml123{ margin-left: 123px;}.ml150{ margin-left: 150px;}.ml180{ margin-left: 180px;}.ml230{ margin-left: 230px;}.ml240{margin-left: 240px;}.ml250{ margin-left: 250px;}.ml290{ margin-left: 290px;}
+.ml-3{ margin-left: -3px;}.ml1{margin-left: 1px;}.ml2{margin-left: 2px;}.ml3{margin-left: 3px;}.ml4{margin-left: 4px;}.ml5{ margin-left: 5px;}.ml6{ margin-left: 6px;}.ml10{ margin-left: 10px;}.ml12{ margin-left:12px!important;}.ml13{ margin-left:13px!important;}.ml15{ margin-left: 15px;}.ml18{ margin-left: 18px;}.ml20{ margin-left: 20px;}.ml22{ margin-left: 22px;}.ml25{ margin-left: 25px;}.ml29{margin-left: 29px;}.ml30{ margin-left: 30px;}.ml33{ margin-left: 33px;}.ml35{ margin-left:35px;}.ml40{margin-left:40px;}.ml42{margin-left:42px;}.ml45{ margin-left: 45px;}.ml50{ margin-left: 50px;}.ml55{ margin-left: 55px;}.ml60{ margin-left: 60px;}.ml72{ margin-left: 72px;}.ml73{ margin-left: 73px;}.ml75{ margin-left: 75px;}.ml80{ margin-left: 80px;}.ml85{margin-left:85px;}.ml95{ margin-left: 95px;}.ml115{margin-left: 115px}.ml123{ margin-left: 123px;}.ml150{ margin-left: 150px;}.ml180{ margin-left: 180px;}.ml230{ margin-left: 230px;}.ml240{margin-left: 240px;}.ml250{ margin-left: 250px;}.ml290{ margin-left: 290px;}
 .mr3{margin-right: 3px}.mr4{margin-right: 4px}.mr5{ margin-right: 5px;}.mr8{ margin-right: 8px;}.mr10{ margin-right: 10px;}.mr12{ margin-right:12px!important;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr24{ margin-right: 24px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr35{margin-right:35px;}.mr40{margin-right:40px;}.mr45{margin-right:45px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}.mr70{ margin-right: 70px;}.mr75{ margin-right: 75px;}.mr80{ margin-right:80px;}.mr90{ margin-right:90px;}.mr100{ margin-right: 100px;}.mr110{ margin-right:110px;}.mr350{ margin-right:350px;}
 
 .pt1{ padding-top:1px;}.pt3{ padding-top:3px!important;}.pt5{ padding-top:5px!important;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt17{ padding-top:17px;}.pt20{ padding-top:20px!important;}.pt25{ padding-top:25px;}.pt30{ padding-top:30px;}.pt35{ padding-top:35px;}.pt37{ padding-top:37px;}.pt40{ padding-top:40px;}.pt47{ padding-top:47px;}.pt49{ padding-top:49px;}.pt50{ padding-top:50px;}.pt60{ padding-top:60px;}.pt70{ padding-top:70px;}.pt80{ padding-top:80px;}.pt90{ padding-top:90px;}.pt100{padding-top:100px;}.pt110{ padding-top:110px;}.pt120{ padding-top:120px;}.pt130{padding-top:130px;}