From fdcffdf3355567d3467d454d12bea97615a4608a Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 16 Aug 2019 15:52:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E7=94=A8=E6=A0=B7=E5=BC=8F+=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/index.js | 2 +- .../ecCourseEvaluations/ecCourseEvaluations.js | 11 ++++++----- .../modules/ec/ecStudentList/ecStudentList.js | 16 +++++++++++----- public/stylesheets/educoder/edu-main.css | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/public/react/src/index.js b/public/react/src/index.js index 73bc2829..55cebf17 100644 --- a/public/react/src/index.js +++ b/public/react/src/index.js @@ -41,7 +41,7 @@ var proxy = "http://localhost:3000" // proxy = "http://testbdweb.trustie.net" // proxy = "http://testbdweb.educoder.net" // proxy ="http://192.168.2.63:3000" - proxy='http://localhost:3000' + proxy='http://120.27.231.56:48080' const requestMap={}; // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求； // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制 diff --git a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js index 619353b7..1d53d11d 100644 --- a/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js +++ b/public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js @@ -54,7 +54,8 @@ class ecCourseEvaluations extends Component { checkevalue:undefined, isreload:false, newModallist:false, - isreloads:false + isreloads:false, + isSpin:false } } componentWillMount(){ @@ -880,7 +881,7 @@ class ecCourseEvaluations extends Component { 关联课堂 + >关联课堂11s -
+
{/*课程考核标准*/} {/*（请在完成配置后，使用各项成绩 模板，将本学年所有参与的学生成绩数据导入系统）*/} @@ -930,7 +931,7 @@ class ecCourseEvaluations extends Component {
- +

@@ -1222,7 +1223,7 @@ class ecCourseEvaluations extends Component { }

- + diff --git a/public/react/src/modules/ec/ecStudentList/ecStudentList.js b/public/react/src/modules/ec/ecStudentList/ecStudentList.js index b60ab2ee..50d93de9 100644 --- a/public/react/src/modules/ec/ecStudentList/ecStudentList.js +++ b/public/react/src/modules/ec/ecStudentList/ecStudentList.js @@ -1,6 +1,7 @@ import React, { Component } from 'react'; import axios from 'axios'; +import { Spin } from 'antd'; import { TPMIndexHOC } from '../../tpm/TPMIndexHOC'; @@ -30,7 +31,8 @@ class ecStudentList extends Component { studentall:false, student_id:undefined, Modallisttypess:0, - ismanager:false + ismanager:false, + isSpin:false } } componentDidMount(){ @@ -120,6 +122,7 @@ class ecStudentList extends Component { uploadfile=(file)=>{ + this.setState({isSpin:true}) let {majorschoollist}=this.state; let Url =majorschoollist.import_url; const form = new FormData(); @@ -132,7 +135,8 @@ class ecStudentList extends Component { // titlemessage: response.data.message+"(支撑关系变更)", Modallist: '已成功导入'+response.data.count+"条数据！", Modallisttype:true, - Modallisttypes:1 + Modallisttypes:1, + isSpin:false }) }else if(response.data.status===0){ // message.warning(response.data.message); @@ -140,7 +144,8 @@ class ecStudentList extends Component { // titlemessage: response.data.message+"(支撑关系变更)", Modallist:response.data.message, Modallisttype:true, - Modallisttypes:0 + Modallisttypes:0, + isSpin:false }) } }).catch((error) => { @@ -357,8 +362,8 @@ class ecStudentList extends Component { 删除 } - -
+ +

+
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index 94d38790..1caf5cba 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -122,7 +122,7 @@ a.decoration{text-decoration: underline} .mr3{margin-right: 3px}.mr4{margin-right: 4px}.mr5{ margin-right: 5px;}.mr8{ margin-right: 8px;}.mr10{ margin-right: 10px;}.mr12{ margin-right:12px!important;}.mr15{ margin-right: 15px;}.mr18{ margin-right: 18px;}.mr20{ margin-right: 20px;}.mr24{ margin-right: 24px;}.mr25{ margin-right: 25px;}.mr30{ margin-right:30px;}.mr35{margin-right:35px;}.mr40{margin-right:40px;}.mr45{margin-right:45px;}.mr50{ margin-right: 50px;}.mr60{ margin-right:60px;}.mr70{ margin-right: 70px;}.mr75{ margin-right: 75px;}.mr80{ margin-right:80px;}.mr90{ margin-right:90px;}.mr100{ margin-right: 100px;}.mr110{ margin-right:110px;}.mr350{ margin-right:350px;} .pt1{ padding-top:1px;}.pt3{ padding-top:3px!important;}.pt5{ padding-top:5px!important;}.pt10{ padding-top:10px;}.pt15{ padding-top:15px;}.pt17{ padding-top:17px;}.pt20{ padding-top:20px!important;}.pt25{ padding-top:25px;}.pt30{ padding-top:30px;}.pt35{ padding-top:35px;}.pt37{ padding-top:37px;}.pt40{ padding-top:40px;}.pt47{ padding-top:47px;}.pt49{ padding-top:49px;}.pt50{ padding-top:50px;}.pt60{ padding-top:60px;}.pt70{ padding-top:70px;}.pt80{ padding-top:80px;}.pt90{ padding-top:90px;}.pt100{padding-top:100px;}.pt110{ padding-top:110px;}.pt120{ padding-top:120px;}.pt130{padding-top:130px;}.pt200{padding-top:200px;} -.pb3{ padding-bottom:3px!important;}.pb5{ padding-bottom:5px!important;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}.pb25{ padding-bottom:20px;}.pb25{ padding-bottom:20px;}.pb30{ padding-bottom:30px;}.pb35{ padding-bottom:35px;}.pb40{ padding-bottom:40px;}.pb47{ padding-bottom:47px;}.pb50{ padding-bottom:50px;}.pb60{ padding-bottom:60px;}.pb70{ padding-bottom:70px;}.pb80{ padding-bottom:80px;}.pb90{ padding-bottom:90px;}.pb100{ padding-bottom:100px;}.pb110{ padding-bottom:110px;}.pb155{ padding-bottom:155px;} +.pb3{ padding-bottom:3px!important;}.pb5{ padding-bottom:5px!important;}.pb10{ padding-bottom:10px;}.pb15{ padding-bottom:15px;}.pb20{ padding-bottom:20px;}.pb25{ padding-bottom:25px;}.pb30{ padding-bottom:30px;}.pb35{ padding-bottom:35px;}.pb40{ padding-bottom:40px;}.pb47{ padding-bottom:47px;}.pb50{ padding-bottom:50px;}.pb60{ padding-bottom:60px;}.pb70{ padding-bottom:70px;}.pb80{ padding-bottom:80px;}.pb90{ padding-bottom:90px;}.pb100{ padding-bottom:100px;}.pb110{ padding-bottom:110px;}.pb155{ padding-bottom:155px;} .pr2{ paddding-right:2px;}.pr5{ padding-right:5px;}.pr10{ padding-right:10px;}.pr15{ padding-right:15px;}.pr20{ padding-right:20px!important;}.pr30{ padding-right:30px!important;}.pr35{ padding-right:35px!important;}.pr42{ padding-right:42px;}.pr45{ padding-right:45px;}.pr48{ padding-right:48px;}.pr57{ padding-right:57px;}.pr60{ padding-right:60px;}.pr70{ padding-right:70px;}.pr72{ padding-right:72px;}.pr75{ padding-right:75px;}.pr88{ padding-right:88px;} .pl0{ padding-left:0px!important;}.pl2{ padding-left:2px;}.pl5{ padding-left:5px;}.pl7{ padding-left:7px;}.pl8{ padding-left:8px;}.pl10{ padding-left:10px;}.pl12{ padding-left:12px!important;}.pl15{ padding-left:15px;}.pl20{ padding-left:20px;}.pl22{ padding-left:22px;}.pl25{ padding-left:25px;}.pl28{ padding-left:28px;}.pl30{ padding-left:30px;}.pl33{padding-left: 33px}.pl35{ padding-left:35px;}.pl40{ padding-left:40px;}.pl42{ padding-left:42px;}.pl45{ padding-left:45px;}.pl50{ padding-left:50px;}.pl60{ padding-left:60px;}.pl70{padding-left:70px;}.pl75{padding-left:75px;}.pl80{padding-left:80px;}.pl88{ padding-left:88px;}.pl92{padding-left:92px;}.pl100{ padding-left:100px;}