From eff78f839af4ad805e40ae88ad97fd84963605e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 20 Mar 2020 23:03:20 +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/src/AppConfig.js                                | 2 +-
 .../src/modules/courses/coursesPublic/NewShixunModel.js      | 2 +-
 .../src/modules/courses/signin/component/Teacherentry.js     | 4 +++-
 public/react/src/modules/tpm/TPMBanner.js                    | 5 +++--
 public/react/src/modules/tpm/shixuns/css/TPMBanner.css       | 4 ++++
 .../src/modules/user/usersInfo/video/VideoInReviewItem.js    | 2 +-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index a3efafdb9..178f70438 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -46,7 +46,7 @@ debugType = "admin";
 // 老师
 // debugType="teacher";
 // 学生
-//  debugType="student";
+ debugType="student";
 
 
 
diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
index ce60dc7d7..ed3de7132 100644
--- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -443,7 +443,7 @@ class NewShixunModel extends Component{
 			<div>
 				<style>
 					{
-						`body{ width: calc(100%) !important; }
+						`body{overflow: hidden !important; }
 					   .ant-drawer-content{ overflow:auto !important; background: #f5f5f5; }
 					   .yslbottomsj{position: absolute;bottom: -8px;}
 					   .ant-drawer-close{
diff --git a/public/react/src/modules/courses/signin/component/Teacherentry.js b/public/react/src/modules/courses/signin/component/Teacherentry.js
index 228e25334..94401e75a 100644
--- a/public/react/src/modules/courses/signin/component/Teacherentry.js
+++ b/public/react/src/modules/courses/signin/component/Teacherentry.js
@@ -175,7 +175,9 @@ class Teacherentry extends Component {
 																		<div className="zcqiandao initials">
 																			正常签到
 																		</div>
-																		:""
+																		:item.attendance_status==="ABSENCE"&&item.attendance_mode==="TEACHER"?<div className="kkqiandao initials">
+																			旷课
+																		</div>:""
 															)
 												    :
 															""
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 6bceba17e..109f0187f 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -943,6 +943,7 @@ class TPMBanner extends Component {
               .ant-popover{
                z-index:1000 !important;
               }
+              body{ width: calc(100%) !important; }
               `
             }
           </style>
@@ -1371,7 +1372,7 @@ class TPMBanner extends Component {
 
 
                 {this.props.identity < 8 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0?
-                  <div className="fr kaike kkbth mr20"
+                  <div className="fr kaike kkbth mr20 width155"
                        style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
                     <Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
                        <span className="flex1 edu-txt-center fl font-18"
@@ -1422,7 +1423,7 @@ class TPMBanner extends Component {
                         </Spin> :
                         <div>
                           <div className="task-popup-content">
-                            <div className={"forkfactors"}>请根据实际情况，填写fork本实训的原因</div>
+                            <div className={"forkfactors"}>请根据实际情况，填写复制本实训的原因</div>
                             <Radio.Group onChange={this.onChangeRadiovalue} value={this.state.Radiovalue} className={"ml20 mt20 mb20"} style={{ width: "100%" }}>
                               <Radio style={radioStyle} value={1}>
                                 实训内容升级
diff --git a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
index 32fab5b47..b7a371d9d 100644
--- a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
+++ b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
@@ -165,4 +165,8 @@ a:active{text-decoration:none;}
 .forkfactors{
     text-align: center;
     color: #999999;
+}
+
+.width155{
+    width:150px !important;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
index e7a0afefe..1494d0709 100644
--- a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
+++ b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
@@ -122,7 +122,7 @@ function VideoInReviewItem (props) {
 
                         {
                             isReview !== true && !link ?
-                            <Tooltip title="复制" placement="bottom">
+                            <Tooltip title="复制链接" placement="bottom">
                                 <i className={`icon-fuzhi iconfont copybtn_item_${id}`} data-clipboard-text={getCopyText((play_url || file_url), cover_url)}></i>
                             </Tooltip>:""
                         }