m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整

Browse Source
dev_forum
杨树明 5 years ago
parent 830fe31e95
commit 74ed2ec427
4 changed files with 136 additions and 107 deletions
Show Stats Download Patch File Download Diff File

4
public/react/package.json
Unescape View File

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

6
public/react/src/modules/login/Trialapplication.js
Unescape View File

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

34
public/react/src/modules/tpm/TPMsettings/TPMsettings.js
Unescape View File

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

199
public/react/src/modules/tpm/TPMsettings/css/TPMsettings.css
Unescape View File

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