From 81852407d0ee09b46170baa7a5b64682e5f8c0cb Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 4 Jul 2019 16:40:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=BB=84=EF=BC=8C=E5=BB=B6=E8=BF=9F?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/common/components/Cropper.js | 42 ++++++++++---------
 .../GraduationTasksappraiseReplyChild.js      |  2 +-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/public/react/src/common/components/Cropper.js b/public/react/src/common/components/Cropper.js
index f11248751..94b47747f 100644
--- a/public/react/src/common/components/Cropper.js
+++ b/public/react/src/common/components/Cropper.js
@@ -6,27 +6,8 @@ const $ = window.$
 let _url_origin = getUrl2()
 // let _url_origin = `http://47.96.87.25:48080`;
 
-if (!window.Cropper) {
-    $.ajaxSetup({
-        cache: true
-    });
 
 
-    $('head').append($('<link rel="stylesheet" type="text/css" />')
-        .attr('href', `${_url_origin}/react/public/js/cropper/cropper.min.css`));
-
-    $.getScript(
-      `${_url_origin}/react/public/js/cropper/cropper.js`,
-      (data, textStatus, jqxhr) => {
-      
-    });
-    $.getScript(
-      `${_url_origin}/react/public/js/cropper/html2canvas.min.js`,
-      (data, textStatus, jqxhr) => {
-      
-    });
-}
-
 function save_avatar(){        
         
     // if($(img_lg).html().trim() == ""){            
@@ -93,9 +74,30 @@ class Cropper extends Component {
             // console.log(event.detail.scaleX);
             // console.log(event.detail.scaleY);
         },
-
         preview: this.props.previewId ? `#${this.props.previewId}` : '.img-preview',
       }
+
+      if (!window.Cropper) {
+        $.ajaxSetup({
+            cache: true
+        });
+
+
+        $('head').append($('<link rel="stylesheet" type="text/css" />')
+            .attr('href', `${_url_origin}/react/public/js/cropper/cropper.min.css`));
+
+        $.getScript(
+          `${_url_origin}/react/public/js/cropper/cropper.js`,
+          (data, textStatus, jqxhr) => {
+          
+        });
+        $.getScript(
+          `${_url_origin}/react/public/js/cropper/html2canvas.min.js`,
+          (data, textStatus, jqxhr) => {
+          
+        });
+      }
+
       setTimeout(() => {
         const image = document.getElementById(this.props.imageId || '__image');
         this.cropper = new window.Cropper(image, this.options);
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
index 83d42f9fc..56f633d2a 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js
@@ -77,7 +77,7 @@ class GraduationTasksappraiseReplyChild extends Component{
 
 						{this.props.ultimate===true ? "": isAdmin && <GraduationTasksappraiseMainEditor {...this.props}
 								addSuccess={() => this.props.addSuccess()}
-								showSameScore={true}																																							
+								showSameScore={this.props.task_type == 2}																																							
 							></GraduationTasksappraiseMainEditor> }
 				</div>