From 5794d7a6a16fd6c7a25b20571eda9073180b63ca 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, 9 Sep 2019 16:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=84=E9=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesPublic/AppraiseModal.js    | 20 ++++++++++------
 .../shixunHomework/ShixunWorkReport.js        |  1 +
 .../OfficialAcademicTranscript.js             | 23 +++++++++++++++++++
 .../src/modules/modals/WordNumberTextarea.css |  8 ++-----
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js
index ab67dddc6..4c1453c2a 100644
--- a/public/react/src/modules/courses/coursesPublic/AppraiseModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AppraiseModal.js
@@ -91,7 +91,7 @@ class AppraiseModal extends Component{
 								    padding: 0px 15px 15px 15px;
 								}
 								.font{
-								    width: 48px;
+
 										height: 16px;
 										font-size: 16px;
 										font-weight: 400;
@@ -111,15 +111,21 @@ class AppraiseModal extends Component{
 						</style>
 						<div className="clearfix">
 							<p className={"font mt10 mb10"}>
-								权限：
+								可见:(学生可查看老师的评阅内容）
 							</p>
-							<Radio.Group onChange={this.onChanges} value={this.state.valuetype}>
-								<Radio value={0} style={radioStyle} className={"newfont"}>可见  (学生查看老师的评阅内容）</Radio>
-								<Radio value={1} style={radioStyle} className={"newfont"}>不可见  (仅对课堂老师可见）</Radio>
-							</Radio.Group>
+							{/*<Radio.Group onChange={this.onChanges} value={this.state.valuetype}>*/}
+								{/*<Radio value={0} style={radioStyle} className={"newfont"}>可见  (学生查看老师的评阅内容）</Radio>*/}
+								{/*<Radio value={1} style={radioStyle} className={"newfont"}>不可见  (仅对课堂老师可见）</Radio>*/}
+							{/*</Radio.Group>*/}
+							<WordNumberTextarea
+								placeholder={"请填写评阅内容"}
+								onInput={(e)=>this.settextarea(e)}
+								value={textareaval}
+								maxlength={500}
+							/>
 
 							<p className={"font mt10 mb20"}>
-								内容：
+								不可见:(仅对课堂老师可见）
 							</p>
 							<WordNumberTextarea
 								placeholder={"请填写评阅内容"}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index d5ab535e2..46259acc0 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -421,6 +421,7 @@ class ShixunWorkReport extends Component {
 								jumptopic={this.jumptopic}
 								getdatalist={()=>this.getdatalist()}
 								setupdalist={(challenge_score,overall_appraisal,work_score)=>this.setupdalist(challenge_score,overall_appraisal,work_score)}
+								showAppraiseModal={(sum)=>this.showAppraiseModal(sum)}
 							/>
 
 						</div>
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
index 2a79ce829..5e12bda06 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
@@ -196,6 +196,19 @@ class OfficialAcademicTranscript extends Component {
 							   // min={0} max={record.game_scores.game_score_full}
 						 /></a>
 						 {/*<a style={{textAlign: "center"}} className="color-blue font-14 mr20">查看</a>*/}
+        </span>
+			),
+		},{
+			title: '操作',
+			key: 'operation',
+			dataIndex: 'operation',
+
+			render: (text, record) => (
+				<span>
+			     <a
+						 className=" color-blue font-14 fr mr22"
+						 onClick={()=>this.props.showAppraiseModal(1)}
+					 >评阅</a>
         </span>
 			),
 		}];
@@ -210,6 +223,13 @@ class OfficialAcademicTranscript extends Component {
 				 }
 			 }
 		 )
+		 columns.some((item,key)=> {
+				 if (item.title === "操作") {
+					 columns.splice(key, 1)
+					 return true
+				 }
+			 }
+		 )
 	 }
 		return (
 			<div>
@@ -276,6 +296,9 @@ class OfficialAcademicTranscript extends Component {
 					.linhe15{
 					    line-height: 15px;
 					}
+					.mr22{
+					    margin-right: 22px;
+					}
 			`}
 				</style>
 				{datas===undefined?"":<Table
diff --git a/public/react/src/modules/modals/WordNumberTextarea.css b/public/react/src/modules/modals/WordNumberTextarea.css
index b1a7ef6a4..7be8c13b3 100644
--- a/public/react/src/modules/modals/WordNumberTextarea.css
+++ b/public/react/src/modules/modals/WordNumberTextarea.css
@@ -12,7 +12,6 @@
     width: 100%;
     height:150px;
     border:none;
-    padding: 10px;
     display: block;
 }
 
@@ -26,12 +25,9 @@
     height: auto;
     border: 1px solid rgba(234,234,234,1);
     border-radius: 0.125rem;
-    margin: 0.31rem;
-    padding: 0.19rem;
+    margin: 10px 10px 0px 10px;
+    padding: 10px 10px 5px 10px
     backgroud:rgba(234,234,234,1);
-    padding-bottom: 10px;
-    padding-right: 10px;
-
 }
 .WordNumberTextarea-count {
     display: inline-block;