From 5bc169fffc293479fc19b74b193a2f3b28c72eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 24 Dec 2019 10:26:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/public/css/edu-all.css                         | 2 +-
 .../src/modules/courses/busyWork/CommonWorkDetailIndex.js   | 2 +-
 public/react/src/modules/courses/busyWork/CommonWorkList.js | 2 +-
 .../modules/courses/busyWork/common/TabRightComponents.js   | 2 +-
 public/react/src/modules/courses/css/Courses.css            | 2 +-
 .../courses/exercise/Studentshavecompletedthelist.js        | 4 ++--
 .../courses/graduation/tasks/GraduationTaskssettinglist.js  | 4 ++--
 .../modules/courses/shixunHomework/Listofworksstudentone.js | 2 +-
 .../modules/courses/shixunHomework/ShixunHomeworkPage.js    | 2 +-
 .../src/modules/courses/shixunHomework/ShixunStudentWork.js | 2 +-
 public/react/src/modules/forums/ForumsIndex.js              | 2 +-
 public/react/src/modules/tpm/TPMIndexHOC.js                 | 6 +++---
 public/react/src/modules/tpm/jupyter/index.scss             | 2 +-
 public/stylesheets/educoder/edu-all.css                     | 2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css
index 5988709eb..f628b1e5c 100644
--- a/public/react/public/css/edu-all.css
+++ b/public/react/public/css/edu-all.css
@@ -360,7 +360,7 @@ label.infolabel{display: block;float: left;width: 56px;text-align: right;margin-
 .subshaicontent a{float: left;margin-right: 20px;color: #999;cursor: pointer}
 
 
-.search-new{width: 248px;height:32px;position: relative;margin-right: 35px;}
+.search-new{width: 248px;height:32px;position: relative;}
 .search-span{display: block;position: absolute;width: 100%;height: 100%;left:0px;top:0px;background-color: #F4F4F4;border: 1px solid #EAEAEA; border-radius: 4px;z-index: 1}
 .search-new-input{height: 32px;padding-left: 5px;width: 225px;border: none;box-sizing: border-box;background: none;outline: none;position: absolute;left:0px;top:1px;z-index: 2}
 .search-new img,.search-new a,.search-new .searchicon{cursor: pointer;position: absolute;right:2px;top:2px;z-index: 2}
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index 5799110f2..5c55f8894 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -336,7 +336,7 @@ class CommonWorkDetailIndex extends Component{
                         }
                         `}</style>
                         {this.props.isAdmin()? <Spin spinning={this.state.donwloading} style={{  }}>
-                        <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
+                        <li className="li_line drop_down fr color-blue font-16 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>
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 377dc7dff..8ac0debf5 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -788,7 +788,7 @@ class CommonWorkList extends Component{
 
 
               {/*   value={search} */}
-              <div className="fr mr5 search-new mr8" style={{marginBottom:'1px'}}>
+              <div className="fr search-new mr8" style={{marginBottom:'1px'}}>
                 <Search
                   placeholder="请输入姓名或学号搜索"
                   id="subject_search_input"
diff --git a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
index f3fd6aaaf..9c8f96cc2 100644
--- a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
+++ b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
@@ -147,7 +147,7 @@ class TabRightComponents extends Component{
                   padding-bottom: 8px;
               }
             `}</style>
-            {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
+            {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 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={exportResultUrl} onClick={(url)=>this.confirmysl(exportResultUrl)} className="color-dark">导出成绩</a></li>
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index d4e3518c6..778122e64 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -1338,7 +1338,7 @@ samp {
     width:237px!important;
     height: 30px;
     margin-bottom: 30px;
-    margin-right: 35px;
+    /*margin-right: 35px;*/
 }
 .search-new-input {
     padding-left: 16px;
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 7cef67aad..e76019deb 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -2882,7 +2882,7 @@ class Studentshavecompletedthelist extends Component {
 																})
 															}
 														</CheckboxGroup>
-														<div className="fr mr5 search-new" style={{marginBottom: '1px'}}>
+														<div className="fr search-new" style={{marginBottom: '1px'}}>
 															<Search
 																placeholder="请输入姓名或学号搜索"
 																id="subject_search_input"
@@ -2914,7 +2914,7 @@ class Studentshavecompletedthelist extends Component {
 																	})
 																}
 															</CheckboxGroup>
-															<div className="fr mr5 search-new" style={{marginBottom: '1px'}}>
+															<div className="fr search-new" style={{marginBottom: '1px'}}>
 																<Search
 																	placeholder="请输入姓名或学号搜索"
 																	id="subject_search_input"
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index c406955ac..21b378635 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -1158,7 +1158,7 @@ class GraduationTaskssettinglist extends Component{
 																)
 															})}
 													</CheckboxGroup>
-													<div className="fr mr5 search-new" style={{marginBottom:'1px',marginRight:"0px"}}>
+													<div className="fr search-new" style={{marginBottom:'1px',marginRight:"0px"}}>
 														<Search
 															placeholder="请输入姓名或学号搜索"
 															id="subject_search_input"
@@ -1350,7 +1350,7 @@ class GraduationTaskssettinglist extends Component{
 														})}
 														</CheckboxGroup>
 
-														<div className="fr mr5 search-new" style={{marginBottom:'1px'}}>
+														<div className="fr search-new" style={{marginBottom:'1px'}}>
 															<Search
 																placeholder="请输入姓名或学号搜索"
 																id="subject_search_input"
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 459421dcd..2326a4fe6 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -3679,7 +3679,7 @@ class Listofworksstudentone extends Component {
 											</li>
 
 											<li className="clearfix mt10">
-												<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
+												<div className="fr search-newysl" style={{marginBottom: '1px'}}>
 													{/*{course_is_end===true?"":<span>*/}
 													{/*{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?*/}
 													{/*	(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>*/}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index f98ecf762..d4ccb2af9 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -291,7 +291,7 @@ class ShixunHomeworkPage extends Component {
 
                         `}</style>
 									{this.props.isAdmin() ?
-										<li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}>
+										<li className="li_line drop_down fr color-blue font-16 mt20" style={{"padding": "0 20px"}}>
 											导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 											<ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
 												{/*<li><a*/}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 78288c466..7fe9f868e 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -898,7 +898,7 @@ class ShixunStudentWork extends Component {
 								</span>:"":""}
 								{/*请输入姓名或学号搜索*/}
 
-								<div className="fr mr5 search-new" style={{marginBottom: '1px'}}>
+								<div className="fr search-new" style={{marginBottom: '1px'}}>
 									<Search
 										placeholder="请输入姓名或学号搜索"
 										id="subject_search_input"
diff --git a/public/react/src/modules/forums/ForumsIndex.js b/public/react/src/modules/forums/ForumsIndex.js
index f88bd45e5..a4f3c61bd 100644
--- a/public/react/src/modules/forums/ForumsIndex.js
+++ b/public/react/src/modules/forums/ForumsIndex.js
@@ -49,7 +49,7 @@ let _url_origin = getUrl()
 
 const $ = window.$
 $('head').append( $('<link rel="stylesheet" type="text/css" />')
-  .attr('href', `${_url_origin}/stylesheets/css/edu-admin.css?1525440977`) );
+  .attr('href', `${_url_origin}/stylesheets/css/edu-admin.css?6`) );
 $('head').append( $('<link rel="stylesheet" type="text/css" />')
   .attr('href', `${_url_origin}/stylesheets/css/edu-forum.css?1525440977`) );
 $('head').append( $('<link rel="stylesheet" type="text/css" />')
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index cc8e28bf7..c9d1c40d4 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -35,14 +35,14 @@ 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?1`));
+      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?6`));
 
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1`));
+      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?6`));
 
   // index.html有加载
 	$('head').append($('<link rel="stylesheet" type="text/css" />')
-		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1`));
+		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?6`));
 
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
diff --git a/public/react/src/modules/tpm/jupyter/index.scss b/public/react/src/modules/tpm/jupyter/index.scss
index 7a237259e..b860fde03 100644
--- a/public/react/src/modules/tpm/jupyter/index.scss
+++ b/public/react/src/modules/tpm/jupyter/index.scss
@@ -187,7 +187,7 @@ line-height: 50px !important;
   }
   .ant-statistic-content-value{
     color:#fff  !important;
-    font-size: 17px  !important;
+    font-size: 14px  !important;
   }
 }
 
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 5eca4c649..28f7cdfdf 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -364,7 +364,7 @@ label.infolabel{display: block;float: left;width: 56px;text-align: right;margin-
 .subshaicontent a{float: left;margin-right: 20px;color: #999;cursor: pointer}
 
 
-.search-new{width: 248px;height:32px;position: relative;margin-right: 35px;}
+.search-new{width: 248px;height:32px;position: relative;}
 .search-span{display: block;position: absolute;width: 100%;height: 100%;left:0px;top:0px;background-color: #F4F4F4;border: 1px solid #EAEAEA; border-radius: 4px;z-index: 1}
 .search-new-input{height: 32px;padding-left: 5px;width: 225px;border: none;box-sizing: border-box;background: none;outline: none;position: absolute;left:0px;top:1px;z-index: 2}
 .search-new img,.search-new a,.search-new .searchicon{cursor: pointer;position: absolute;right:2px;top:2px;z-index: 2}