调整

public/react/src/modules/tpm/TPMIndex.js

@@ -20,7 +20,9 @@ import TPMRepositoryComponent from './TPMRepositoryComponent';
 
 import TPMRepositoryCommits from './shixunchild/Repository/TPMRepositoryCommits';
 
-import TPMsettings from './TPMsettings/oldTPMsettings';
+import TPMsettings from './TPMsettings/TPMsettings';
+
+//import TPMsettings from './TPMsettings/oldTPMsettings';
 
 import TPMChallengeComponent from './TPMChallengeContainer';
 import TPMPropaedeuticsComponent from './TPMPropaedeuticsComponent';

public/react/src/modules/tpm/TPMsettings/Shixuninformation.js

@@ -593,7 +593,7 @@ class Shixuninformation extends Component {
               <div className="fl" style={{border: '1px solid #ccc'}}>
                 <MonacoEditor
                   height="450"
-                  width="1100"
+                  width="1150"
                   language={this.state.language}
                   value={shixunmemoMDvalue}
                   options={{

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -265,7 +265,7 @@ class Newshixuns extends Component {
             {
               message: '提示',
               description:
-                '提交成功！',
+                '新建申请已提交，请等待管理员审核。',
 
             }
           )
@@ -591,8 +591,10 @@ class Newshixuns extends Component {
                               <div>
                                 {this.state.mainvalues === undefined && this.state.subvalues === undefined||this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
                                   <div className={"font-12"} style={{'max-width':'700px'}}>
-                                    {`已安装软件：${this.state.mainvalues===undefined||this.state.mainvalues===""?"":this.state.mainvalues}${this.state.subvalues===undefined||this.state.subvalues===""?"":this.state.subvalues}`}
-                                    {`    说明：添加了${this.state.mainvalues===undefined||this.state.mainvalues===""?"":this.state.mainvalues}${this.state.subvalues===undefined||this.state.subvalues===""?"":this.state.subvalues}`}
+                                    {`${this.state.mainvalues===undefined||this.state.mainvalues=== ""?"":`已安装软件：`+this.state.mainvalues}`}
+                                    {`${this.state.subvalues===undefined||this.state.subvalues=== ""?"":this.state.mainvalues===undefined||this.state.mainvalues=== ""?`已安装软件：`+this.state.subvalues:this.state.subvalues}`}
+                                    {`${this.state.mainvalues===undefined||this.state.mainvalues=== ""?"":`说明：添加了`+this.state.mainvalues}${this.state.subvalues===undefined||this.state.subvalues=== ""?"":
+                                      this.state.mainvalues===undefined||this.state.mainvalues=== ""?`说明：添加了`+this.state.subvalues:this.state.subvalues}`}
                                   </div>}
 
                               </div>
@@ -697,27 +699,6 @@ class Newshixuns extends Component {
                   {/*</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>