调整

public/react/package.json

@@ -3,10 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@novnc/novnc": "^1.1.0",
-    
     "@flatten/array": "^1.1.7",
     "@icedesign/base": "^0.2.5",
+    "@novnc/novnc": "^1.1.0",
     "antd": "^3.6.5",
     "array-flatten": "^2.1.2",
     "autoprefixer": "7.1.6",
@@ -41,6 +40,7 @@
     "fs-extra": "3.0.1",
     "html-webpack-plugin": "2.29.0",
     "immutability-helper": "^2.6.6",
+    "install": "^0.12.2",
     "jest": "20.0.4",
     "js-file-download": "^0.4.7",
     "lodash": "^4.17.5",

public/react/src/modules/login/Trialapplication.js

@@ -77,9 +77,9 @@ class Trialapplication extends Component {
 			//TODO 这里如果样式变了会出现css不加载的情况
 
 		});
-		console.log(this.props.isRenders);
-		console.log("89");
-		console.log(this.state.props.user_phone_binded );
+		// console.log(this.props.isRenders);
+		// console.log("89");
+		// console.log(this.state.props.user_phone_binded );
 		try {
 			if (this.state.props.user_phone_binded !== undefined) {
 				console.log(this.state.props.user_phone_binded);

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

@@ -1,5 +1,8 @@
 import React, { Component } from 'react';
 
+import MonacoEditor from 'react-monaco-editor';
+
+//MonacoDiffEditor  对比模式
 import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Icon,DatePicker} from 'antd';
 
 // import "antd/dist/antd.css";
@@ -222,7 +225,8 @@ export default class TPMsettings extends Component {
 
       pod_exist_time: undefined,
       pod_exist_timetype: false,
-      shixunmemoMDvalue:""
+      shixunmemoMDvalue:"",
+			language:""
     }
   }
   descriptionMD=(initValue, id)=> {
@@ -894,6 +898,7 @@ export default class TPMsettings extends Component {
   SelectScput = (value, e) => {
     this.setState({
       choice_standard_scriptssum: value,
+			language:e.props.name,
       choice_standard_scripts: {id:e.props.value,value:""},
       standard_scriptsModal:true
     })
@@ -1003,11 +1008,15 @@ export default class TPMsettings extends Component {
     })
   }
 
-  getshixunmemoMDvalue=(e)=>{
+  getshixunmemoMDvalue=(value, e)=>{
+
     this.setState({
-      shixunmemoMDvalue:e.target.value
+      shixunmemoMDvalue:value
     })
   }
+
+
+
   render() {
     let {
       postapplyvisible,
@@ -1370,15 +1379,26 @@ export default class TPMsettings extends Component {
 
           <div className="mt30 clearfix df">
             <div
-              className={operateauthority===false?'nonemodel':""}
+              className={operateauthority===true?'nonemodel':""}
             ></div>
             <span className="color-orange fl mr30">*</span>
             <div className="flex1">
 
 
-              <div className="fl " id="shixunmemoMD" >
-                  <textarea className={"shixunmemoMDdiv"} value={shixunmemoMDvalue} onInput={this.getshixunmemoMDvalue}  name="content">
-                  </textarea>
+              <div className="fl "  >
+                  {/*<textarea className={"shixunmemoMDdiv"} value={shixunmemoMDvalue} onInput={this.getshixunmemoMDvalue}  name="content">*/}
+                  {/*</textarea>*/}
+								<MonacoEditor
+									height="450"
+									width="1100"
+									language={this.state.language}
+									value={shixunmemoMDvalue}
+									options={ {
+										selectOnLineNumbers: true
+									}}
+
+									onChange={operateauthority===true?this.getshixunmemoMDvalue:""}
+								/>
               </div>
 
 

public/react/src/modules/tpm/TPMsettings/css/TPMsettings.css

@@ -1,96 +1,105 @@
-.radioStyle{
-        display: block;
-        height: 30px;
-      }
-#settingsMarkdown{
-  background:transparent;
-}
-#challenge_begin{
-  height: 30px;
-  line-height: 30px;
-}
-#shixundescription .CodeMirror{
-  width: 570px !important;
-  margin-top: 31px !important;
-  height: 364px !important;
-}
-#shixundescription .editormd-preview{
-  width: 567px !important;
-  top: 40px !important;
-  height: 364px !important;
-}
-
-#shixunmemoMD .CodeMirror{
-  width: 548px !important;
-  margin-top: 31px !important;
-  height: 578px !important;
-}
-
-#shixunmemoMD .editormd-preview{
-  width: 544px !important;
-  top: 40px !important;
-  height: 578px !important;
-}
-
-.radioStyle {
-  display: block;
-  height: 30px;
-}
-
-a.white-btn.use_scope-btn:hover {
-  color: #FFF !important;
-}
-
-.shixunScopeInput {
-  width: 218px;
-  height: 33px;
-  display: block;
-  margin-bottom: 15px;
-}
-
-.ant-modal-title {
-    text-align: center;
-}
-
-a.newuse_scope-btn:hover {
-  border: 1px solid #F06200;
-  color: #fff !important;
-  background: #FF7500;
-}
-
-a.newuse_scope-btn {
-  border: 1px solid #FF7500;
-  color: #FF7500 !important;
-}
-
-.tpmprompt {
-  padding-left: 20px;
-  margin-top: -4px;
-}
-.ml36{
-  margin-left: 26px;
-}
-
-#shixunmemoMD{
-  width:98% !important;
-  height: 620px !important;
-}
-.pdr20{
-  padding-right:20px;
-}
-
-.nonemodel{
-  width: 30%;
-  height: 624px;
-  /*background: rgba(0, 0, 0, 0.65);*/
-  background: #f5f5f5;
-  position: absolute;
-  z-index: 100;
-  opacity: 0.5;
-  left: 21.5%;
-}
-
-.shixunmemoMDdiv{
-    width: 99%;
-    height: 615px;
+.radioStyle{
+        display: block;
+        height: 30px;
+      }
+#settingsMarkdown{
+  background:transparent;
+}
+#challenge_begin{
+  height: 30px;
+  line-height: 30px;
+}
+#shixundescription .CodeMirror{
+  width: 570px !important;
+  margin-top: 31px !important;
+  height: 364px !important;
+}
+#shixundescription .editormd-preview{
+  width: 567px !important;
+  top: 40px !important;
+  height: 364px !important;
+}
+
+#shixunmemoMD .CodeMirror{
+  width: 548px !important;
+  margin-top: 31px !important;
+  height: 578px !important;
+}
+
+#shixunmemoMD .editormd-preview{
+  width: 544px !important;
+  top: 40px !important;
+  height: 578px !important;
+}
+
+.radioStyle {
+  display: block;
+  height: 30px;
+}
+
+a.white-btn.use_scope-btn:hover {
+  color: #FFF !important;
+}
+
+.shixunScopeInput {
+  width: 218px;
+  height: 33px;
+  display: block;
+  margin-bottom: 15px;
+}
+
+.ant-modal-title {
+    text-align: center;
+}
+
+a.newuse_scope-btn:hover {
+  border: 1px solid #F06200;
+  color: #fff !important;
+  background: #FF7500;
+}
+
+a.newuse_scope-btn {
+  border: 1px solid #FF7500;
+  color: #FF7500 !important;
+}
+
+.tpmprompt {
+  padding-left: 20px;
+  margin-top: -4px;
+}
+.ml36{
+  margin-left: 26px;
+}
+
+#shixunmemoMD{
+  width:98% !important;
+  height: 620px !important;
+}
+#shixunmemoMDs{
+    width: 98% !important;
+    height: 420px !important;
+}
+#shixunmemoMDs .CodeMirror {
+    /* width: 548px !important; */
+    margin-top: 31px !important;
+    height: 402px !important;
+}
+.pdr20{
+  padding-right:20px;
+}
+
+.nonemodel{
+  width: 59%;
+  height: 468px;
+  /*background: rgba(0, 0, 0, 0.65);*/
+  background: #f5f5f5;
+  position: absolute;
+  z-index: 100;
+  opacity: 0.5;
+  left: 21.5%;
+}
+
+.shixunmemoMDdiv{
+    width: 99%;
+    height: 615px;
 }