From d768f8d7c72fdf0004c89a9c32da6b9260164277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 16 Oct 2019 11:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=2024692=20=20=E9=A2=98?=
 =?UTF-8?q?=E5=BA=93=E9=80=89=E7=94=A8=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/busyWork/UseBank.js   | 23 ++++++++++++++++---
 .../modules/courses/graduation/tasks/index.js |  2 +-
 .../courses/graduation/topics/index.js        |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/UseBank.js b/public/react/src/modules/courses/busyWork/UseBank.js
index a9e854e39..724474b7c 100644
--- a/public/react/src/modules/courses/busyWork/UseBank.js
+++ b/public/react/src/modules/courses/busyWork/UseBank.js
@@ -184,6 +184,9 @@ class UseBank extends Component{
     let { flag, nav_my, loading, hasMore, object_list, search, checkBoxValues,isChecked,page,is_teacher }=this.state
     let { object_type }=this.props;
     const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
+    console.log("题库选用2222");
+    console.log("UseBank");
+    console.log(this.props);
     return(
       <a>
         <style>{`
@@ -199,7 +202,7 @@ class UseBank extends Component{
           width: 170px !important;
         }
         .bankwidth{
-					width:24% !important;
+					width:27% !important;
 					overflow:hidden;
 					text-overflow:ellipsis;
 					white-space:nowrap
@@ -292,8 +295,22 @@ class UseBank extends Component{
                             nav_my==='public' && 
                             <span className="fl with16 color-grey-6 task-hide pl10">{item.username}</span>
                           }
-													<a style={{textAlign: "center"}} className="color-blue font-14"
-													>编辑</a>
+                          {
+                            this.props.object_type && this.props.object_type === "" ?
+                              <a style={{textAlign: "center"}} className="color-blue font-14 pl5"
+                              >编辑</a>
+                              : this.props.object_type && this.props.object_type === "" ?
+                              <a style={{textAlign: "center"}} className="color-blue font-14 pl5"
+                              >编辑</a>
+                              : this.props.object_type && this.props.object_type === "" ?
+                                <a style={{textAlign: "center"}} className="color-blue font-14 pl5"
+                                >编辑</a>
+                                : this.props.object_type && this.props.object_type === "" ?
+                                  <a style={{textAlign: "center"}} className="color-blue font-14 pl5"
+                                  >编辑</a>
+                                  : ""
+                          }
+
 
                         </p>
                       )
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index 0660d9c2f..c96f00f05 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -672,7 +672,7 @@ class GraduationTasks extends Component{
                 </Link>
               </WordsBtn> : ""}
 
-              {this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={(checkBoxValues,object_ids)=>this.useBankSuccess(checkBoxValues,object_ids)}></UseBank>:""}
+              {/*题库选用 {this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={(checkBoxValues,object_ids)=>this.useBankSuccess(checkBoxValues,object_ids)}></UseBank>:""}*/}
             </React.Fragment>
 
           }
diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js
index 2f02113bc..5116b0b12 100644
--- a/public/react/src/modules/courses/graduation/topics/index.js
+++ b/public/react/src/modules/courses/graduation/topics/index.js
@@ -414,7 +414,7 @@ onBoardsNew=()=>{
                 {/* 参考普通作业 - 题库选用 */}
                 {/* <WordsBtn style="blue" className="mr30" onClick={()=>this.useFromBank()}>题库选用</WordsBtn> 正式版没有，先隐藏*/}
                 < a  className={"fl color-blue mr30 font-16"} onClick={(url)=>this.confirmysl(`/courses/${this.props.match.params.coursesId}/graduation_topics/export.xlsx`)}>导出</a>
-                <p className="fl"><UseBank {...this.props} {...this.state} object_type={"gtopic"} useBankSuccess={this.useBankSuccess}></UseBank></p>
+                {/*<p className="fl"><UseBank {...this.props} {...this.state} object_type={"gtopic"} useBankSuccess={this.useBankSuccess}></UseBank></p> 题库选用*/}
                 <WordsBtn style="blue" className="font-16" onClick={()=>this.onBoardsNew()}>新建</WordsBtn>
               </React.Fragment>):""
             }