From bcf097ecbdd18f0e7eec53d2cda725441bd75f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 29 Aug 2019 09:53:19 +0800
Subject: [PATCH] b

---
 public/react/config/webpack.config.dev.js     |  2 +-
 public/react/config/webpack.config.prod.js    |  3 +
 .../modules/courses/members/studentsList.js   | 99 ++++++++-----------
 3 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index f126bc363..9b9d16406 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -31,7 +31,7 @@ module.exports = {
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
 	// devtool: "cheap-module-eval-source-map",
   // 开启调试
-  devtool: "source-map",  // 开启调试
+  // devtool: "source-map",  // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.
diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js
index 7b9795e80..e1da1d12a 100644
--- a/public/react/config/webpack.config.prod.js
+++ b/public/react/config/webpack.config.prod.js
@@ -54,6 +54,9 @@ const extractTextPluginOptions = shouldUseRelativeAssetPaths
 
 // console.log('publicPath ', publicPath)
 module.exports = {
+  externals: {
+    'react': 'window.React'
+  },
   // Don't attempt to continue if there are any errors.
   bail: true,
   // We generate sourcemaps in production. This is slow but gives good results.
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 3462438f8..da95278a6 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -129,7 +129,7 @@ class studentsList extends Component{
   }
 /// 确认是否下载
   confirmysl(url){
-    axios.get(url + '&export=true').then((response) => {
+    axios.get(url).then((response) => {
       if(response === undefined){
         return
       }
@@ -506,7 +506,10 @@ class studentsList extends Component{
     const { course_group_name, invite_code } = this.state;
 
     const courseId = this.props.match.params.coursesId    
-    let exportUrl = `/courses/${courseId}/export_member_scores_excel.xlsx?`
+    let exportUrl = `/courses/${courseId}/export_member_scores_excel.xlsx?`; //总成绩
+    let exportUrltwo = `/courses/${courseId}/export_couser_info.xlsx?`; //课堂信息
+    let exportUrlthree = `/courses/${courseId}/export_couser_info.xlsx?`; //活跃度
+
     const params = {}
     if (course_group_id) {
       params.group_id = course_group_id
@@ -522,6 +525,8 @@ class studentsList extends Component{
       paramsString += `${key}=${params[key]}&`
     }
     exportUrl += paramsString;
+    exportUrltwo+=paramsString;
+    exportUrlthree+=paramsString;
     return(
       <React.Fragment >
         <DownloadMessageysl
@@ -567,7 +572,41 @@ class studentsList extends Component{
               { isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> }
-              { isAdmin && <WordsBtn style="blue" className=""  onClick={(url)=>this.confirmysl(exportUrl)} >导出成绩</WordsBtn> }
+              <style>{`
+                        .drop_down_menu li a {
+                            padding: 0px;
+                            font-size: 14px;
+                        }
+                        .drop_down_menu {
+                            width: 93px;
+                        }
+                        .drop_down_menu li {
+                            overflow: visible;
+                            width: 93px;
+                        }
+                        .drop_down_menu, .drop_down_normal {
+                            padding-top: 10px;
+                            padding-bottom: 8px;
+                        }
+                       
+                        `}</style>
+              { isAdmin &&
+              <li className="li_line drop_down fr color-blue font-16">
+                导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                <ul className="drop_down_menu" style={{"right": "-20px", "left": "unset", "height": "auto"}}>
+                  <li><a
+                  	onClick={(i) => this.confirmysl(exportUrltwo)}>课堂信息</a>
+                  </li>
+                  <li><a
+                    onClick={(i) => this.confirmysl(exportUrlthree)}>活跃度</a>
+                  </li>
+                  <li><a
+                    onClick={(i) => this.confirmysl(exportUrl)}>总成绩</a>
+                  </li>
+                </ul>
+              </li>
+              }
+              {/*<WordsBtn style="blue" className=""  onClick={(url)=>this.confirmysl(exportUrl)} >导出成绩</WordsBtn>*/}
               {/*  */}
             </React.Fragment>
           }
@@ -576,60 +615,6 @@ class studentsList extends Component{
           }
           onPressEnter={this.onPressEnter}
         ></Titlesearchsection>
-        {/* <div className="edu-back-white">
-          <p className="clearfix padding30 bor-bottom-greyE">
-            <span className="font-18 fl color-dark-21">学生列表</span>
-            <span className="color-grey-9 fl font-16 ml10 lineh-15 mt3">邀请码：<span className="color-orange-tip">CKPYL</span></span>
-            <li className="fr">
-              <a href="javascript:void(0)" className="color-blue mr30">导入创建分班</a>
-              <WordsBtn style="blue" className="mr30" onClick={()=>this.showStuNewBox(1)}>新建分班</WordsBtn>
-              <a href="javascript:void(0)" className="color-blue mr30" onClick={()=>this.delClasses()}>删除分班</a>
-              <a href="javascript:void(0)" className="color-blue mr30" onClick={()=>this.showStuNewBox(2)}>分班重命名</a>
-              <a href="javascript:void(0)" className="color-blue">导出成绩</a>
-            </li>
-          </p>
-          <div className="clearfix pl30 pr30">
-            <span className="fl mt22">共<label className="color-orange-tip ml3 mr3">6</label>位学生</span>
-            <div className="fr mt16 mb16 searchView">
-              <Search 
-              value={StudentList_value}
-              placeholder="请输入姓名进行搜索"
-              onInput={this.inputStudent}
-              ></Search>
-            </div>
-          </div>
-
-          <Modals
-            modalsType={modalsType}
-            modalsTopval={modalsTopval}
-            modalsBottomval={modalsBottomval}
-            modalCancel={this.cancelDelClasses}
-            modalSave={this.sureDelClasses}
-          >
-          </Modals>
-          <Modal
-            title={n_And_e==1?"新建分班":"分班重命名"}
-            visible={stu_new_flag}
-            closable={false}
-            footer={null}
-            destroyOnClose={true}
-            centered={true}
-          >
-            <div className="newupload_conbox clearfix">
-              <div className="df">
-                <span className="fl mr20 lineh-40">分班：</span>
-                <Input placeholder="示例：分班（最佳4个字符）" className="input-flex-40"/>
-              </div>
-              <div className="mt30 marginauto clearfix edu-txt-center">
-                <a onClick={this.hideStuNewBox} className="pop_close task-btn mr30">取消</a>
-                <a className="task-btn task-btn-orange" id="submit_send_shixun">确定</a>
-              </div>
-            </div>
-          </Modal>
-        </div> */}
-
-
-
         {
           total_count > 0 || this.state.isSpin == true ?
           <div className="mt20 edu-back-white padding20">