From 0c79019aebaf9d98b815c6e87fe3f067f35f9273 Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 20 Jan 2020 18:29:50 +0800
Subject: [PATCH 1/3] optimize oj

---
 .../components/controlSetting/index.js        | 18 ++++++++++----
 .../components/controlSetting/index.scss      | 24 +++++++++++++++++++
 .../components/myMonacoEditor/index.scss      |  7 ++++++
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/developer/components/controlSetting/index.js b/public/react/src/modules/developer/components/controlSetting/index.js
index 53b66a359..5960187d9 100644
--- a/public/react/src/modules/developer/components/controlSetting/index.js
+++ b/public/react/src/modules/developer/components/controlSetting/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 16:02:36
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 18:05:50
+ * @LastEditTime : 2020-01-20 17:42:06
  */
 import './index.scss';
 import React, { useState, useRef, useEffect } from 'react';
@@ -99,9 +99,17 @@ const ControlSetting = (props) => {
     // debuggerCode(identifier, values);
     onDebuggerCode(values);
   }
-
+  // icon-shangjiantou
   return (
     <div className="pane_control_area">
+      <div
+        className="pane_control_collapse" 
+        onClick={handleShowControl}
+        style={{ top: showTextResult ? '-267px' : 0 }}
+      >
+        {/* <i className="iconfont icon-xiajiantou icon"></i> */}
+        <Icon type={ showTextResult ? "down" : "up" } />
+      </div>
       <Tabs
         className={classNames}
         activeKey={defaultActiveKey} 
@@ -126,8 +134,10 @@ const ControlSetting = (props) => {
         <Button 
           type="link" 
           style={{ color: '#fff' }} 
-          onClick={handleShowControl}>
-            控制台 <Icon type={ showTextResult ? "down" : "up" } />
+          // onClick={handleShowControl}
+        >
+            控制台
+             {/* <Icon type={ showTextResult ? "down" : "up" } /> */}
           </Button>
         <p>
           <Button ghost 
diff --git a/public/react/src/modules/developer/components/controlSetting/index.scss b/public/react/src/modules/developer/components/controlSetting/index.scss
index eaa97bea7..e72eb6258 100644
--- a/public/react/src/modules/developer/components/controlSetting/index.scss
+++ b/public/react/src/modules/developer/components/controlSetting/index.scss
@@ -2,6 +2,30 @@
   position: absolute;
   bottom: 0;
   width: 100%;
+  .pane_control_collapse{
+    position: absolute;
+    width: 55px;
+    height: 27px;
+    background:rgba(42,58,79,1);
+    border-bottom-left-radius: 55px;
+    border-bottom-right-radius: 55px;
+    left: 50%;
+    margin-left: -27px;
+    text-align: center;
+    color: #fff;
+    line-height: 27px;
+    opacity: 0.5;
+    transition: opacity .3s;
+    z-index: 10;
+    .icon{
+      position: relative;
+      top: 0px;
+    }
+
+    &:hover{
+      opacity: .8;
+    }
+  }
   // background: red;
   // background:rgba(30,30,30,1);
   // height: 56px;
diff --git a/public/react/src/modules/developer/components/myMonacoEditor/index.scss b/public/react/src/modules/developer/components/myMonacoEditor/index.scss
index 61cc8a694..b3f305e68 100644
--- a/public/react/src/modules/developer/components/myMonacoEditor/index.scss
+++ b/public/react/src/modules/developer/components/myMonacoEditor/index.scss
@@ -76,6 +76,13 @@
   animation-iteration-count: 3;
 }
 
+// .monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input,
+// .monaco-editor .margin,
+// .minimap slider-mouseover,
+// .minimap-decorations-layer{
+//   background:rgba(3,19,40,1) !important;
+// }
+
 @keyframes blink{
   50% {
     color: #fff;

From 442d4090b51db0563c9e494035acac0a366f2dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 20 Jan 2020 20:34:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/shixuns/ShixunCardList.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/tpm/shixuns/ShixunCardList.js b/public/react/src/modules/tpm/shixuns/ShixunCardList.js
index 46abc5bf0..235b11323 100644
--- a/public/react/src/modules/tpm/shixuns/ShixunCardList.js
+++ b/public/react/src/modules/tpm/shixuns/ShixunCardList.js
@@ -211,7 +211,7 @@ class ShixunCardList extends Component {
 			})
 		}
 
-
+    console.log(this.props.middleshixundata.search_tags)
 		return (
 			<div className="educontent mt20">
 				<div className="clearfix">
@@ -241,8 +241,14 @@ class ShixunCardList extends Component {
 						 id="hot"
 						 onClick={(e)=>this.latestHot(e,3)}>最热
 					</div>
+
 					{shixuntype===true?"":<span className={  "fr font-16 bestChoose color-blue"  }  onClick={(url)=>this.getUser("/shixuns/new")}>+新建实训项目</span>}
 
+					<div className="fr mr20 mt3">
+						{
+							this.props.middleshixundata&&this.props.middleshixundata.search_tags
+						}
+					</div>
 					{/*<div className="fl font-16 bestChoose shixun_repertoire ml20 mt1"*/}
 					    {/*style={{display:upcircle===true?"block":"none"}}*/}
 						 {/*// onClick={()=>this.upcircles("asc")}*/}

From 7e3062001e2ce3a5916826bb317f602e01b15b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 20 Jan 2020 20:37:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/coursesPublic/NewShixunModel.js     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
index 226c6c7c7..b57498895 100644
--- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -58,7 +58,7 @@ class NewShixunModel extends Component{
 		}else{
 			url="/subject_lists.json";
 		}
-		
+
 		axios.get(url,{params:{
 				page:page,
 				type:type,
@@ -520,8 +520,8 @@ class NewShixunModel extends Component{
 									<p className={diff===0?"clickbuts ml13":"clickbutst ml13"} onClick={()=>this.DropdownClick(0)}>全部</p>
 									<p className={diff===1?"clickbuts ml30":"clickbutst ml30"} onClick={()=>this.DropdownClick(1)}>初级</p>
 									<p className={diff===2?"clickbuts ml30":"clickbutst ml30"} onClick={()=>this.DropdownClick(2)}>中级</p>
-									<p className={diff===3?"clickbuts ml30":"clickbutst ml30"}  onClick={()=>this.DropdownClick(3)}>高级</p>
-									<p className={diff===4?"clickbuts ml30":"clickbutst ml30"} onClick={()=>this.DropdownClick(4)}>顶级</p>
+									<p className={diff===3?"clickbuts ml30":"clickbutst ml30"}  onClick={()=>this.DropdownClick(3)}>中高级</p>
+									<p className={diff===4?"clickbuts ml30":"clickbutst ml30"} onClick={()=>this.DropdownClick(4)}>高级</p>
 								</div>:""
 							}