From 1f0b9429cd8e03046a48fbae712b56de8e1deae0 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 13:05:47 +0800
Subject: [PATCH 01/23] =?UTF-8?q?=E9=A2=98=E5=BA=93=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/exercise_choice.rb   | 2 +-
 app/models/exercise_question.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/exercise_choice.rb b/app/models/exercise_choice.rb
index 3cfd7a17c..617f5b453 100644
--- a/app/models/exercise_choice.rb
+++ b/app/models/exercise_choice.rb
@@ -7,6 +7,6 @@ class ExerciseChoice < ApplicationRecord
   scope :find_choice_custom, lambda {|k,v| where("#{k} = ?",v)}  #根据传入的参数查找问题
   scope :left_choice_choose, lambda {|k,v| where("#{k} > ?",v)}  #根据传入的参数查找问题
 
-  validates :choice_text, length: { maximum: 500, too_long: "不能超过500个字符" }
+  # validates :choice_text, length: { maximum: 500, too_long: "不能超过500个字符" }
 
 end
\ No newline at end of file
diff --git a/app/models/exercise_question.rb b/app/models/exercise_question.rb
index 2b8d88c57..e34c316aa 100644
--- a/app/models/exercise_question.rb
+++ b/app/models/exercise_question.rb
@@ -16,7 +16,7 @@ class ExerciseQuestion < ApplicationRecord
   scope :left_question_choose, lambda {|k,v| where("#{k} > ?",v)}  #根据传入的参数查找问题
   scope :find_objective_questions, -> {where("question_type != ?",4)}  #查找全部客观题
 
-  validates :question_title, length: { maximum: 1000, too_long: "不能超过1000个字符" }
+  # validates :question_title, length: { maximum: 1000, too_long: "不能超过1000个字符" }
 
 
   def question_type_name

From 448151f51a406cd3c95c613c4b201b70b2abc166 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 13:23:17 +0800
Subject: [PATCH 02/23] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AF=95=E5=8D=B7?=
 =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=9A=84=E5=AD=97=E6=95=B0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/exercise_bank_choice.rb   | 2 +-
 app/models/exercise_bank_question.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/exercise_bank_choice.rb b/app/models/exercise_bank_choice.rb
index 4a4c46251..70465a72e 100644
--- a/app/models/exercise_bank_choice.rb
+++ b/app/models/exercise_bank_choice.rb
@@ -5,6 +5,6 @@ class ExerciseBankChoice < ApplicationRecord
   scope :find_choice_custom, lambda {|k,v| where("#{k} = ?",v)}  #根据传入的参数查找问题
   scope :left_choice_choose, lambda {|k,v| where("#{k} > ?",v)}  #根据传入的参数查找问题
 
-  validates :choice_text, length: { maximum: 500, too_long: "不能超过500个字符" }
+  # validates :choice_text, length: { maximum: 500, too_long: "不能超过500个字符" }
 
 end
\ No newline at end of file
diff --git a/app/models/exercise_bank_question.rb b/app/models/exercise_bank_question.rb
index 75d6bfedf..311c81491 100644
--- a/app/models/exercise_bank_question.rb
+++ b/app/models/exercise_bank_question.rb
@@ -11,7 +11,7 @@ class ExerciseBankQuestion < ApplicationRecord
   scope :left_question_choose, lambda {|k,v| where("#{k} > ?",v)}  #根据传入的参数查找问题
   scope :find_objective_questions, -> {where("question_type != ?",4)}  #查找全部客观题
 
-  validates :question_title, length: { maximum: 1000, too_long: "不能超过1000个字符" }
+  # validates :question_title, length: { maximum: 1000, too_long: "不能超过1000个字符" }
 
   def question_type_name
     case self.question_type

From a62e539a834cf9ca5e5587247cc6ba7c1b5ec1ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 24 Mar 2020 15:13:46 +0800
Subject: [PATCH 03/23] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=B7=BB=E5=8A=A0zoom?=
 =?UTF-8?q?=20=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/Video/Live.js   |  56 ++++++++++++++----
 .../src/modules/courses/Video/LiveNew.js      |   6 +-
 .../src/modules/courses/Video/VideoIndex.js   |   8 ++-
 .../src/modules/courses/Video/images/zoom.png | Bin 0 -> 3403 bytes
 .../question/questioncss/questioncom.css      |   2 +-
 5 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100755 public/react/src/modules/courses/Video/images/zoom.png

diff --git a/public/react/src/modules/courses/Video/Live.js b/public/react/src/modules/courses/Video/Live.js
index d869922fb..a7b7f6890 100644
--- a/public/react/src/modules/courses/Video/Live.js
+++ b/public/react/src/modules/courses/Video/Live.js
@@ -9,6 +9,7 @@ import bilibili from './images/bilibili.png';
 import tencent from './images/tencent.png';
 import WeiBaiTong from './images/WeiBaiTong.png';
 import douyu from './images/douyu.jpg';
+import zoom from './images/zoom.png';
 class Live extends Component{
 
    render(){
@@ -16,32 +17,65 @@ class Live extends Component{
 
       return(
        <div className="livePanel">
+				 <style>
+					 {
+					 	`
+					 	.verticallayout{
+						display: flex;
+						 flex-direction:column;
+						}
+						
+						.myspacearound{
+						display: flex;
+						justify-content: space-around;
+						}
+						.mr0{
+						margin-right: 0px !important;
+						}
+						.mr5{
+						margin-right: 5px !important;
+						}
+						.ml0{
+						margin-left: 0px !important;
+						}
+					 	`
+					 }
+				 </style>
           <p className="mt30 mb10 color-grey-9 pl10">EduCoder支持所有第三方直播平台，特别推荐：</p>
-          <ul className="platform">
-            <li>
+          <ul className="platform myspacearound">
+            <li className="verticallayout mr0">
               <a href="https://ke.qq.com/act/speed_pc/index.html?from=800021837" target="_blank"><img alt="" src={tencent} className="mr8" width="28px"/>
               <label className="color-grey-3 pointer">腾讯课堂</label>
               </a>
-              <a href="https://pub.idqqimg.com/pc/misc/files/20200204/2e4cb765bef54f0c919c0ab8ab79d969.pdf" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://pub.idqqimg.com/pc/misc/files/20200204/2e4cb765bef54f0c919c0ab8ab79d969.pdf" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
+            <li className="verticallayout mr0">
               <a href="https://live.bilibili.com/liveHime?visit_id=a81rbm7v2kk0" target="_blank"><img alt="" src={bilibili} className="mr8" width="52px"/>
               <label className="color-grey-3 pointer">哔哩哔哩</label>
               </a>
-              <a href="https://www.bilibili.com/blackboard/live/broadcast-intro.html#/" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.bilibili.com/blackboard/live/broadcast-intro.html#/" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
+            <li className="verticallayout mr0">
               <a href="https://www.douyu.com/" target="_blank"><img alt="" src={douyu} className="mr8" width="28px"/>
               <label className="color-grey-3 pointer">斗鱼</label>
               </a>
-              <a href="https://www.douyu.com/special/guide/anchor" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.douyu.com/special/guide/anchor" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
-              <div><img alt="" src={WeiBaiTong} className="mr8" width="28px"/>
+            <li className="verticallayout mr0">
+              <div>
+								<img alt="" src={WeiBaiTong} className="mr8" width="28px"/>
                 <label className="color-grey-3">威佰通</label>
               </div>
-              <a href="https://www.educoder.net/forums/3734" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.educoder.net/forums/3734" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
+						<li className="verticallayout mr0">
+							<a href="https://zoom.com.cn/download" target="_blank"><img alt="" src={zoom} className="mr8" width="63px"/>
+								<label className="color-grey-3" style={{
+									cursor:"pointer"
+								}}>zoom</label>
+							</a>
+							<a href="https://support.zoom.us/hc/zh-cn/articles/201362033-Windows%E5%92%8CMAC%E5%85%A5%E9%97%A8%E6%8C%87%E5%8D%97" target="_blank" className="color-blue ml0">(简明手册)</a>
+						</li>
           </ul>
           {
             lives && lives.length > 0 ?
@@ -79,4 +113,4 @@ class Live extends Component{
      )
    }
 }
-export default Live;
\ No newline at end of file
+export default Live;
diff --git a/public/react/src/modules/courses/Video/LiveNew.js b/public/react/src/modules/courses/Video/LiveNew.js
index e95400ed0..2c10bfe32 100644
--- a/public/react/src/modules/courses/Video/LiveNew.js
+++ b/public/react/src/modules/courses/Video/LiveNew.js
@@ -9,7 +9,7 @@ import axios from 'axios';
 
 const { TextArea } = Input;
 const { Option  } = Select;
-const array=['腾讯课堂','斗鱼直播','Bilibili','威佰通'];
+const array=['腾讯课堂','斗鱼直播','Bilibili','威佰通','zoom'];
 
 function range(start, end) {
   const result = [];
@@ -290,7 +290,7 @@ class LiveNew extends Component{
                   <TextArea rows={4} placeholder="可在此介绍开播具体事项，如开播时间安排等。" />
                 )}
               </Form.Item>
-              
+
             </Form>
             <div className="clearfix mt30 edu-txt-center">
               <a onClick={this.cancelNew} className="task-btn mr30">取消</a>
@@ -303,4 +303,4 @@ class LiveNew extends Component{
   }
 }
 const WrappedLiveNew = Form.create({name: 'LiveNew'})(LiveNew);
-export default WrappedLiveNew;
\ No newline at end of file
+export default WrappedLiveNew;
diff --git a/public/react/src/modules/courses/Video/VideoIndex.js b/public/react/src/modules/courses/Video/VideoIndex.js
index 0815bc8aa..c6d736824 100644
--- a/public/react/src/modules/courses/Video/VideoIndex.js
+++ b/public/react/src/modules/courses/Video/VideoIndex.js
@@ -299,8 +299,7 @@ class VideoIndex extends Component {
 		const flag = parseInt(course_identity) < 5;
 		const newOperation = flag;
 		const new_upload = flag && (is_teacher && this.props.checkIfProfessionalCertification());
-
-
+		let isAdmin = this.props&&this.props.isAdmin();
 
 		return (
 			<React.Fragment>
@@ -404,7 +403,10 @@ class VideoIndex extends Component {
 
 											</React.Fragment>
 											:
-											<WordsBtn style="blue" className="font-16 ml30" onClick={this.liveSetting}>添加直播</WordsBtn>
+											isAdmin===true?
+												<WordsBtn style="blue" className="font-16 ml30" onClick={this.liveSetting}>添加直播</WordsBtn>
+												:
+												""
 									}
 								</li>
 							</div>
diff --git a/public/react/src/modules/courses/Video/images/zoom.png b/public/react/src/modules/courses/Video/images/zoom.png
new file mode 100755
index 0000000000000000000000000000000000000000..67880716191443a1ae96c009d925b30f0ff9ec91
GIT binary patch
literal 3403
zcmV-R4Ycx!P)<h;3K|Lk000e1NJLTq003VA000yS1^@s6>(k*{000dVNkl<ZSVzT~
zdz4qzb;m#Z+<SlX9)_2IT6ql&jzF|vQ86tIZE9mBW@SN*l2l!Z8cGv+M|}L8;W^+S
z7#|BvG1e??)YMjLU8JJc#M)NTh$09`5Qc{^z`SRE^Sk%#u5;%%!_2^p<Em@*{55Ot
zIs2UR-TUnQ-QS;#tJGfuqeTc&zW7j7d>U=YJN2LN#Nle*<~fPl4V5M}L4StYRxVeM
zD~xan$`BwS&}`wTC_9YdO=;%6564i=tTXF-JkYc1jXg+zql{ONt5GHyVHirDK-$6y
zh20wQpBCOpG;-*pGHLB>uXK$LwH^x)uEMg_2wNgcO(a|`@Ta~|B2c8D2uIcOj*WQ5
zMEq`diqn*db@xjbG1`mxsu8}bFjk;Yp;?70BHopNSDTd`2j)==(t)y!tJK#a-pu>r
z$ah)M8a4Aq+OqKX_sRS2%g7ZvBrBWifo}^;Ldi!60O_>S9maujN-h5-hF@kGw*GFO
z)bw<o(xm2V0e@yKH;7@Xz#xPKV7l2&15Fk_!1BC${A$m9Iov*HVufCq_IUvK>v*2B
z7ictw5>fgo_}$KsQl(lvw$)Vec&*3&;luc*T4n>|1@h>MqmA!oIA$aM<@9bgAOD%`
zXtyb2*Xj+PVKp%P{|LU@w!!!;-#J$*N-DGj!`()hfl$y5m~(F>L@3pfWwS|BxqGRc
z>^{*&TA0fM&*z5<=l3ya6pfwm@2M1J2bS_aB06@RUSO0p0yoC{2yR~6U%d<w(y0`?
zt#BYai$B4}_v?L)p*2;*Z)^6m^yE|W-|;3_uG5@T5nmU>^#UVRNr?1nC{!5g0=xUg
z6<Sc1nUG&tpOpwVbj)!_Q<_w95q&}+m2pacpa>zmJ?$yftFk#%R(`Tbj<@4*Nm2)-
z3%J7w3j_vq;3K3^YBIL#1OgQXi_j0q@03nem474TuH8S84>I6a2;9^K>ozAe0VmZ`
ztwP`lgH_@^6V9G^AQo&UiNweY^=dh;a0($ugds*4U@e|QR0M3AEm4Xkd+%j;yk=Tb
z{X_W-2z+t_?ecWb@_&nEw7a~4>2!UT&A@X}nsuHqlYk$`X~qph6t%Kjg%^zQnhHk}
zmbCTB4wd1gxkiL*y(~s*)ZzFB8?yXV6OWuIlZFe|X-+}NO?a#UoWl@5zRY23c}YB8
zGM4=&q$NsV5Qaq&SDTP;dD%>GK^220G=(A0`g#0an4+Iix`OY3w|pA4@U)l179vhY
z2G6uo99eGkvbfH8<ZI{pDA=%tJsR?)$>P-@;8e<zFexU|%HMcJOh*agATZQL5v!UE
z8+v^z-H|V;(8=PlN?;n&B_F!n_H&f-lrlbHcwAsu=KY506mPbk;;unscxU@<gzm|A
z*jAMxi^wf3;F_S2H7KLnFJ_e;c+B~Dp1fJQPA`d+O$M&&NDRu6rq8&~tKs?m!>D%!
z@XVQ2Cf$Z#Whg1UfE7VLf2lUEH>hw@l{=$=*MpFiDBtbK!_Zh4ad(Tdxq6Azci2m+
z8Mc={$Q#3&U;y8i2+y6<0T_84s6D~rV<-4$Hi@e<Z6m2>(AyLjP2%BTAk&F33XY6y
zOIyC%C-6rkH9L{V*NovF5w7g?+}$&-R(R61ur6IdXwt0k;0Nt<RM?TKX5sGxwsi%k
zn`>{=;Jjw8>wg&=jNt;@3lN&rvSN2VtH&1dLjy^H!S2SY9BV$t^58>$w(n(0^_HWD
z-L8`hNAQrB#}%56@lp$0BV~aP3q`o4J<%I@<I@yBs9!33&a#<QQ*5|4DC99L7i7Li
zR(QG*?yQ<Gr_NfVDkJY>X7&Ic!7?cR-d5QE{ByydmelMc{kYyJi-E65S4MFdVS^^v
zynC*k9J5}hcp;lanAo-lHd2yW&qMplq^>uB;%^f*uVglBy?~q5k^_VmUdT=Hw@q2B
zG;njA>Vzn=Jlk5uoCE87W<~A$jksB}{bJ@M3P@^5VdiZ6vD_(!8Nm13=SJ{It)=|4
zPPL}<xks(hF@fP%MwpQKe@calx;iS3+%K+9oHbm=Fh0)!#hH&s{Wdz=^O(3+^Fo+y
zg>n(j>pWA53(H*tglFEGFD~CRu2TO>;HkKPwuRS;2yWcFNM89|;4>3S*6J)VJRC<j
zSd_Oz<;T9qy(rgaBImS?DF1kgtnZs$m68f3;qeP2l*DHfPKafNqlicw_#)`(6f2us
zc%Y{2+)f>w)S><I*pl#>9NSTvnnTLNfQPCwICMYL=(RfDhi5#GOH|{!d)!1^)g$;B
zj()2s^O4MRX|w9+;0}f5rk;Q8Xk1jK^g(8-@&u3@rv}SjYnZ)fzWh($K!R~=)zy=y
zM7Xf+ZtO(k)Ub%QBJUFIQ9^#QYq9)8pY0}fgw5v#&*Rbz`*A5^9WcU0zC%O|dbo<^
zHFZ?7Novn!d*pf@k{$6P@JGf#6wz2$OL@ZZ(19{(IoFzt*XnpRJT1a_*RF~1nF-_m
z<m^#gp%)sTd4{+sxCrbR7Je%c%S<D$ckLKeO4l(%6$eQB(>@$V+_Z18{6}9wDyh^N
z1~$@0XI)Ks*IMTJ9!nLj$=IomLXvxy$fJF=J8rd3z~>)DD2*c)s*SK(E#q9|cYuG8
z<uwgo0Q``~hC0gqF9ZB>t8@eb%f&D&rblOn<G!y(!h$^u*wML7Zl7}Tdi`S?@`Mpa
zWiA*+A#)0gcw+nQomfCmh)vR9><ujSJr<}^;Fy8J)&TAZVYR?_GR;hAEt@`G#N2b8
z<1F(@^^3FkPLRtwi5TRlmMT@iViCU9CGtNH{1rMRJG)cle<|Q6)sz<U6{{>2;W{9z
z(<K_M<pp0@wR53-)Dw2jahhO_fti`~;F^$a(McBXTgiL90yR^;L6*w~Udi7Zp9zlb
zWSX}1L+iQsNCAsY8(95ZO0&wY=EE#Lc!-xfYf0xi+j+O>sG>1c`uWVzbld}|Ro;qP
znHwaW1G%-&k^g0bKWU=|jde^l9`~v;wKMQa-05u&Bi8R*#QrWEz57i!YEazB_k5*N
zh`URNQ)9ZB=UP5v`Jtc6C+BqBH1&(8GTG#_%ug^)T@T@?66`mYAMIKsFO@u~Q$=}H
zG{dBXNL$(7e2lvf9_9_6>nfVH?=xt&4l5eX;-HXQ5el7M6&h4nW+HxxP!4?W{{?)f
zmDqg#LOjY*F6{=+QLC&UVEAcmZQLC6IC9QMw;v%Y&SIdSV1r03R=Fs1nol}i%j*)b
z(fa&GvZzg*M4P~Pg$$MkzAirB4+@w<x<mG}syx<UxX<zD;-nV(c`Oi*rR|-yNkG)Z
z&Zw1*p3jz+7LMhDZ5@c1RtmyKrWngDS^eV%E7w(Tb^1}r8-=;dtZ5~?y~FJ*_#@Wn
z&|Hrf6)ukpZeP=m@Qj#P(LGaeiyzR^K;i=DI>#=mpbCdjwu+@urDxT%EemkU!rQGL
zZ)K+_)gaE%uA;{_#elUOQP^daPo3oIQiz4&rmYALbfF%zBuFW2GnOU07RiUP$5my*
zYDTsOlpEn&F{5g0*WH5C&MwZba@uJ-7)FSbgoTS-N0mu~u7JO1m3#Iql$SeeI}Uu8
zj!spxEETfubVUzrXN3;Q$&SHqV>^8X|6FXRv{Ekvo>mywJ*-{96V3FRz0(Q@Lx|)4
z!sB5r51U*r7oYnLT+vMfa+VxjbsD*YuCv1(p3PR-;wj5^HSkfFt~jY?Y``$GC^Lpx
zLaZis9?oi8Z`@5HcUer89brV7<nZ#oA4#gau;v^P!Q%Wn9@*YQ!*uC`T9k@-9$|W4
z!5>$tV@3Hn5@T^D@*ST~WU<x=v$_@8-r?@ytA#^^%>8(Yyy!Ls<_mlyLml0323^3;
zm~pY`G?7CpJZs_6&boW|t;Rj915FFJTStY3k+?`dw_O($u}rPPuSxTOQ#0G`IZEyO
zv83!+lvPWWXSjLi0(q^c%g>yt-uqKn;yGEu(BE2`8|o<Yg$+IN{EJp;|7@RoJj3lk
zo@?+tT$7blGb)!qOa#n9<1|swM~(cf^VzoSqAHZ_n#W_VIJ-z`iI@^=8HQ4ni!yzH
z`=O#$m0E-Y2HuS#UTO4sx2I0A^M+34%uO-g1WZSmEW&6s?yR%K6=S7dp-PmGtn!-Q
zz;AYzb=6)<D)f94a6ig*Dtwq~=E+o=f9gplXy1SM3LTb{#T~}*O=~G^sAGdKZ0req
zhe&ZH7yH5-*C;y4K7?<yHCfI9ITU316d6Nc!`^=w_`E0K=TrT`968-FFRA9req^0!
zAwN5d?355Bz_hw(^J(=PXl_Z-c%Y0_pLlzRVU^M(f%GFkl_u9S1ipvo%1dMjQ)ya?
z3TfDWgqCxOdQM6|p2r~Z$!{{$56IzEpZXD0CaxuyEc!QxBvQvYeQ*^uy)r>3$_*qx
hVJV8zc=?4?{Vy-q8mn7@{V)Ik002ovPDHLkV1iYQq6`24

literal 0
HcmV?d00001

diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css
index cfe92fdeb..1f4e75f9e 100644
--- a/public/react/src/modules/question/questioncss/questioncom.css
+++ b/public/react/src/modules/question/questioncss/questioncom.css
@@ -428,7 +428,7 @@
     color: #4CACFF;
 }
 .xiaoshou{
-    cursor:pointer !important;
+    cursor:√ !important;
 }
 .xiaoshout{
     cursor:default !important;

From e7fb988db55e226ee0c0aac65d88d98f628e75d2 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 15:41:03 +0800
Subject: [PATCH 04/23] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=BE=85=E6=89=B9=E9=98=85?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/exercises_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
index 1887aee5a..26a9aa9ec 100644
--- a/app/helpers/exercises_helper.rb
+++ b/app/helpers/exercises_helper.rb
@@ -714,9 +714,9 @@ module ExercisesHelper
     end
     teacher_review = ex_user.subjective_score < 0.0 ? false : true
     if (user_status == 0 && commit_status == 1) || (user_status == 1 && ex_user_exercise_status == 3 && commit_status == 1)  #老师都可以看，学生，需在试卷已提交，且已截止的情况下看
-      ex_object_score = ex_user.objective_score < 0.0 ? 0.0 : ex_user.objective_score.round(1).to_s
+      ex_object_score = ex_user.objective_score <= 0.0 ? 0 : ex_user.objective_score.round(1).to_s
       ex_subject_score = ex_user.subjective_score < 0.0 ? nil : ex_user.subjective_score.round(1).to_s
-      score = ex_user.score.present? ? ex_user.score.round(1).to_s : 0.0.to_s
+      score = ex_user.score.present? && ex_user.score > 0.0 ? ex_user.score.round(1).to_s : 0.to_s
     else
       ex_object_score = nil
       ex_subject_score = nil

From ad43667c941b882298111f6a02da97c45f02412e Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 15:48:07 +0800
Subject: [PATCH 05/23] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=BE=85=E6=89=B9=E9=98=85?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/exercises_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
index 26a9aa9ec..b57c8525b 100644
--- a/app/helpers/exercises_helper.rb
+++ b/app/helpers/exercises_helper.rb
@@ -715,7 +715,7 @@ module ExercisesHelper
     teacher_review = ex_user.subjective_score < 0.0 ? false : true
     if (user_status == 0 && commit_status == 1) || (user_status == 1 && ex_user_exercise_status == 3 && commit_status == 1)  #老师都可以看，学生，需在试卷已提交，且已截止的情况下看
       ex_object_score = ex_user.objective_score <= 0.0 ? 0 : ex_user.objective_score.round(1).to_s
-      ex_subject_score = ex_user.subjective_score < 0.0 ? nil : ex_user.subjective_score.round(1).to_s
+      ex_subject_score = ex_user.subjective_score < 0.0 ? nil : (ex_user.subjective_score > 0.0 ? ex_user.subjective_score.round(1).to_s : 0)
       score = ex_user.score.present? && ex_user.score > 0.0 ? ex_user.score.round(1).to_s : 0.to_s
     else
       ex_object_score = nil

From c34da99969b1872eca7082061876cab01d3ffa99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 24 Mar 2020 16:06:00 +0800
Subject: [PATCH 06/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OfficialAcademicTranscript.js             | 31 ++++++++++---------
 .../shixunreport/Shixunbage.css               | 15 +++++++++
 public/react/src/modules/tpm/TPMBanner.js     |  4 +--
 3 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 public/react/src/modules/courses/shixunHomework/shixunreport/Shixunbage.css

diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
index a156d8d01..2d0f61a0e 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
@@ -1,9 +1,7 @@
 import React, {Component} from "react";
-import {WordsBtn} from 'educoder';
-import {Table, InputNumber, Tooltip} from "antd";
-import {Link, Switch, Route, Redirect} from 'react-router-dom';
+import {Table, InputNumber, Tooltip,Badge} from "antd";
 import axios from 'axios';
-
+import './Shixunbage.css';
 class OfficialAcademicTranscript extends Component {
 
 	constructor(props) {
@@ -116,14 +114,15 @@ class OfficialAcademicTranscript extends Component {
 			className: "TaskForms",
 			render: (text, record) => (
 				<span>
-					<span className={"task-hide linhe15"} style={{color: "#676767"}}><a className="tasknameName font-14"
-																																							onClick={() => this.myjumptopic("id" + record.customs)}
-																																							title={record.taskname.name.length > 15 ? record.taskname.name : ""}>
-						{record.taskname.name}
-					</a>
-						{record.taskname.complete_status === 2 ?
-							<span className={"tasknamebox ml10"}>延时</span> : record.taskname.complete_status === 3 ?
-								<span className={"tasknameboxs ml10"}>延时</span> : ""}
+					<span className={"task-hide"} style={{color: "#676767"}}>
+						<a className="relative font-14"	onClick={() => this.myjumptopic("id" + record.customs)}
+								title={record.taskname.name.length > 15 ? record.taskname.name : ""}>
+					    	<span className={"tasknameName fl mr5"}>{record.taskname.name}</span>
+
+							{record.taskname.complete_status === 2 ?
+								<Badge count={"延时"} className="site-badge-red fl pdt3" /> : record.taskname.complete_status === 3 ?
+									<Badge count={"无效"} className="site-badge-white fl pdt3" />: ""}
+					  </a>
 					</span>
         </span>
 			),
@@ -305,10 +304,11 @@ class OfficialAcademicTranscript extends Component {
 					.tasknameName:link{color:#676767}
 					.tasknameName:hover{color:#4CACFF}
 					.tasknameName{
-					     overflow: hidden;
+								display: inline-block;
+					      overflow: hidden;
 								text-overflow: ellipsis;
 								white-space: nowrap;
-				        max-width: 225px;
+				        max-width: 210px;
 						    text-align: left !important;
 					}
 					.TaskForms{
@@ -331,6 +331,9 @@ class OfficialAcademicTranscript extends Component {
 					.mr22{
 					    margin-right: 22px;
 					}
+					.pdt3{
+					 padding-top:3px;
+					}
 			`}
 				</style>
 				{datas === undefined ? "" : <Table
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunbage.css b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunbage.css
new file mode 100644
index 000000000..084dc435b
--- /dev/null
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunbage.css
@@ -0,0 +1,15 @@
+.site-badge-red .ant-badge-count {
+    background-color: #FC2B6A;
+    color: #fff;
+    /*box-shadow: 0 0 0 1px #d9d9d9 inset;*/
+}
+
+.site-badge-white .ant-badge-count {
+    background-color: #EDEDED;
+    color: #666666;
+    /*box-shadow: 0 0 0 1px #d9d9d9 inset;*/
+}
+
+.relative{
+    position: relative;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 109f0187f..e8da601fd 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -1372,14 +1372,14 @@ class TPMBanner extends Component {
 
 
                 {this.props.identity < 8 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0?
-                  <div className="fr kaike kkbth mr20 width155"
+                  <div className="fr kaike kkbth mr20"
                        style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
                     <Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
                        <span className="flex1 edu-txt-center fl font-18"
                              onClick={this.copyForkvisible}
                              style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "inline-block"}}
                        >
-                              复制实训
+                              复制
                         </span>
                     </Tooltip>
 

From 65479bcf8bef278e2903fb1521475069558f545b Mon Sep 17 00:00:00 2001
From: anke1460 <zuosjob@gmail.com>
Date: Tue, 24 Mar 2020 16:31:46 +0800
Subject: [PATCH 07/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=A6=E6=A0=A1?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../school_base_statistics_controller.rb      |  17 +++
 .../admins/school_base_statistic_service.rb   | 138 ++++++++++++++++++
 .../school_base_statistics/_list.html.erb     |  48 ++++++
 .../school_base_statistics/index.html.erb     |  14 ++
 .../school_base_statistics/index.js.erb       |   1 +
 app/views/admins/shared/_sidebar.html.erb     |   3 +-
 config/routes.rb                              |   2 +
 7 files changed, 222 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/admins/school_base_statistics_controller.rb
 create mode 100644 app/services/admins/school_base_statistic_service.rb
 create mode 100644 app/views/admins/school_base_statistics/_list.html.erb
 create mode 100644 app/views/admins/school_base_statistics/index.html.erb
 create mode 100644 app/views/admins/school_base_statistics/index.js.erb

diff --git a/app/controllers/admins/school_base_statistics_controller.rb b/app/controllers/admins/school_base_statistics_controller.rb
new file mode 100644
index 000000000..026fd9492
--- /dev/null
+++ b/app/controllers/admins/school_base_statistics_controller.rb
@@ -0,0 +1,17 @@
+class Admins::SchoolBaseStatisticsController < Admins::BaseController
+
+  def index
+    params[:sort_by] = params[:sort_by].presence || :teacher_count
+    params[:sort_direction] = params[:sort_direction].presence || :desc
+
+    total_count, statistics = Admins::SchoolBaseStatisticService.call(params)
+
+    @statistics = paginate statistics, total_count: total_count
+    @params_page = params[:page] || 1
+
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+end
diff --git a/app/services/admins/school_base_statistic_service.rb b/app/services/admins/school_base_statistic_service.rb
new file mode 100644
index 000000000..cbad5d45a
--- /dev/null
+++ b/app/services/admins/school_base_statistic_service.rb
@@ -0,0 +1,138 @@
+class Admins::SchoolBaseStatisticService < ApplicationService
+  include CustomSortable
+
+  attr_reader :params
+
+  sort_columns :student_count, :teacher_count, :course_count, :course_group_count,
+               :attachment_count, :video_count, :normal_work_count, :shixun_work_count, :evaluate_count,
+               :student_work_count, :exercise_count, default_direction: :desc
+
+  def initialize(params)
+    @params = params
+  end
+
+  def call
+    schools = School.group('schools.id')
+
+    keyword = params[:keyword].try(:to_s).try(:strip)
+    if keyword.present?
+      schools = schools.where("schools.name LIKE :keyword OR schools.id LIKE :keyword", keyword: "%#{keyword}%")
+    end
+
+    count = schools.count.count
+    # 根据排序字段进行查询
+    schools = query_by_sort_column(schools, params[:sort_by])
+    schools.reorder("#{ params[:sort_by] != 0} desc")
+
+    schools = custom_sort(schools, params[:sort_by], params[:sort_direction])
+    schools = schools.limit(page_size).offset(offset)
+    schools = package_other_data(schools)
+    [count, schools]
+  end
+
+  def package_other_data(schools)
+    ids = schools.map(&:id)
+
+    student_count = CourseMember.course_students.joins(course: :school).group(:school_id).where("role= 'STUDENT' AND courses.is_delete = false AND schools.id in (?)", ids).count("distinct user_id")
+    teachers = UserExtension.where(school_id: ids, identity: :teacher).group(:school_id)
+    teacher_count = teachers.count
+    courses = Course.where(is_delete: 0, school_id: ids).group(:school_id)
+    course_count= courses.count
+    course_group_count = courses.joins(:course_groups).count
+    attachment_count = courses.joins(:attachments).count
+    video_count = teachers.joins(user: :videos).where("videos.delete_state IS NOT NULL").count
+
+    homeworks = HomeworkCommon.joins(:course).where(courses: { school_id: ids }).where("courses.is_delete = false")
+    shixun_work_count = homeworks.where(homework_type: 4).group(:school_id).count
+    normal_work_count = homeworks.where(homework_type: 1).group(:school_id).count
+    student_work_count = homeworks.joins(:student_works).group(:school_id).count
+    evaluate_count = EvaluateRecord.unscoped.joins('JOIN homework_commons_shixuns hcs ON hcs.shixun_id = evaluate_records.shixun_id
+                                                    JOIN homework_commons hc ON hcs.homework_common_id = hc.id AND hc.homework_type = 4
+                                                    JOIN course_members ON course_members.user_id = evaluate_records.user_id
+                                                    JOIN courses ON course_members.course_id = courses.id AND hc.course_id = courses.id')
+                                  .where(courses: { school_id: ids })
+                                  .group(:school_id).count
+    exercise_count = Exercise.joins(:course).where(courses: { school_id: ids }).group(:school_id).count
+
+    schools.map do |school|
+      {
+        id: school.id,
+        name: school.name,
+        teacher_count: teacher_count[school.id],
+        student_count:  student_count[school.id],
+        course_count: course_count[school.id],
+        course_group_count: course_group_count[school.id],
+        attachment_count: attachment_count[school.id],
+        video_count: video_count[school.id],
+        normal_work_count: normal_work_count[school.id],
+        shixun_work_count: shixun_work_count[school.id],
+        student_work_count: student_work_count[school.id],
+        evaluate_count: evaluate_count[school.id],
+        exercise_count: exercise_count[school.id]
+      }
+    end
+  end
+
+  private
+  def query_by_sort_column(schools, sort_by_column)
+    base_query_column = 'schools.id, schools.name'
+
+    case sort_by_column.to_s
+    when 'teacher_count' then
+      schools.joins('LEFT JOIN user_extensions ue ON ue.school_id = schools.id AND ue.identity = 0')
+        .select("#{base_query_column}, COUNT(*) teacher_count")
+    when 'student_count' then
+      schools.joins("LEFT JOIN courses ue ON ue.school_id = schools.id AND ue.is_delete = FALSE
+                     LEFT JOIN course_members ON course_members.course_id = ue.id AND course_members.role = 'STUDENT'")
+        .select("#{base_query_column}, COUNT(distinct user_id) student_count")
+    when 'course_count' then
+      schools.joins('LEFT JOIN courses ON courses.school_id = schools.id AND courses.is_delete = false')
+        .select("#{base_query_column}, COUNT(*) course_count")
+    when 'course_group_count' then
+      schools.joins("LEFT JOIN courses ON courses.school_id = schools.id AND courses.is_delete = false
+                     LEFT JOIN course_groups ON course_groups.course_id = courses.id")
+        .select("#{base_query_column}, COUNT(*) course_group_count")
+    when 'attachment_count' then
+      schools.joins("LEFT JOIN courses cs ON cs.school_id = schools.id AND cs.is_delete = 0
+                     LEFT JOIN attachments ON attachments.container_type ='Course' AND attachments.container_id = cs.id")
+        .select("#{base_query_column}, COUNT(*) attachment_count")
+    when 'video_count' then
+      schools.joins("LEFT JOIN user_extensions ue ON ue.school_id = schools.id AND ue.identity = 0
+                     LEFT JOIN videos ON videos.user_id = ue.user_id AND videos.delete_state IS NOT NULL")
+        .select("#{base_query_column}, COUNT(*) video_count")
+    when 'normal_work_count' then
+      schools.joins("LEFT JOIN courses ON courses.school_id = schools.id
+                     LEFT JOIN homework_commons ON homework_commons.course_id = courses.id AND homework_commons.homework_type = 0")
+        .select("#{base_query_column},  COUNT(*) normal_work_count")
+    when 'shixun_work_count' then
+      schools.joins("LEFT JOIN courses ON courses.school_id = schools.id
+                     LEFT JOIN homework_commons ON homework_commons.course_id = courses.id AND homework_commons.homework_type = 4")
+        .select("#{base_query_column}, COUNT(*) shixun_work_count")
+    when 'student_work_count' then
+      schools.joins("LEFT JOIN courses ON courses.school_id = schools.id
+                     LEFT JOIN homework_commons ON homework_commons.course_id = courses.id
+                     LEFT JOIN student_works ON student_works.homework_common_id = homework_commons.id")
+        .select("#{base_query_column}, COUNT(*) student_work_count")
+    when 'evaluate_count' then
+      schools.joins('
+                     LEFT JOIN courses ON courses.school_id = schools.id AND courses.is_delete = false
+                     LEFT JOIN course_members ON course_members.course_id = courses.id
+                     LEFT JOIN evaluate_records ON course_members.user_id = evaluate_records.user_id
+                     LEFT JOIN homework_commons_shixuns hcs ON hcs.shixun_id = evaluate_records.shixun_id
+                     LEFT JOIN homework_commons hc ON hcs.homework_common_id = hc.id AND hc.homework_type = 4')
+        .select("#{base_query_column}, COUNT(*) evaluate_count")
+    when 'exercise_count' then
+      schools.joins('LEFT JOIN courses cs ON cs.school_id = schools.id AND cs.is_delete = 0
+                     LEFT JOIN exercises ON exercises.course_id = cs.id')
+        .select("#{base_query_column}, COUNT(*) exercise_count")
+    end
+  end
+
+  def page_size
+    params[:per_page] || 20
+  end
+
+  def offset
+    (params[:page].to_i.zero? ? 0 : params[:page].to_i - 1) * page_size
+  end
+end
\ No newline at end of file
diff --git a/app/views/admins/school_base_statistics/_list.html.erb b/app/views/admins/school_base_statistics/_list.html.erb
new file mode 100644
index 000000000..aab91f5c7
--- /dev/null
+++ b/app/views/admins/school_base_statistics/_list.html.erb
@@ -0,0 +1,48 @@
+<table class="table table-hover text-center school-base-statistic-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="4%">序号</th>
+    <th width="10%" class="text-left">单位名称</th>
+    <th width="8%"><%= sort_tag('注册教师', name: 'teacher_count', path: admins_school_base_statistics_path) %></th>
+    <th width="8%"><%= sort_tag('注册学生', name: 'student_count', path: admins_school_base_statistics_path) %></th>
+    <th width="8%"><%= sort_tag('教学课堂', name: 'course_count', path: admins_school_base_statistics_path) %></th>
+    <th width="8%"><%= sort_tag('管理分班', name: 'course_group_count', path: admins_school_base_statistics_path) %></th>
+    <th width="8%"><%= sort_tag('课件资源', name: 'attachment_count', path: admins_school_base_statistics_path) %></th>
+    <th width="8%"><%= sort_tag('教学视频', name: 'video_count', path: admins_school_base_statistics_path) %></th>
+    <th width="8%"><%= sort_tag('普通作业', name: 'normal_work_count', path: admins_school_base_statistics_path) %></th>
+    <th width="8%"><%= sort_tag('实训作业', name: 'shixun_work_count', path: admins_school_base_statistics_path) %></th>
+    <th width="8%"><%= sort_tag('作业文件', name: 'student_work_count', path: admins_school_base_statistics_path) %></th>
+    <th width="8%"><%= sort_tag('评测次数', name: 'evaluate_count', path: admins_school_base_statistics_path) %></th>
+    <th width="8%"><%= sort_tag('在线试卷', name: 'exercise_count', path: admins_school_base_statistics_path) %></th>
+  </tr>
+  </thead>
+  <tbody>
+  <% if statistics.present? %>
+    <% statistics.each_with_index do |statistic, index| %>
+      <tr>
+        <td><%= list_index_no(@params_page.to_i, index) %></td>
+        <td class="text-left">
+          <%= link_to statistic[:name], "/colleges/#{statistic[:id]}/statistics",
+                      target: '_blank', data: { toggle: 'tooltip', title: '点击查看学校统计概况' } %>
+        </td>
+        <td><%= statistic[:teacher_count].to_i %></td>
+        <td><%= statistic[:student_count].to_i %></td>
+        <td><%= statistic[:course_count].to_i %></td>
+        <td><%= statistic[:course_group_count].to_i %></td>
+        <td><%= statistic[:attachment_count].to_i %></td>
+        <td><%= statistic[:video_count].to_i %></td>
+        <td><%= statistic[:normal_work_count].to_i %></td>
+        <td><%= statistic[:shixun_work_count].to_i %></td>
+        <td><%= statistic[:student_work_count].to_i %></td>
+        <td><%= statistic[:evaluate_count].to_i %></td>
+        <td><%= statistic[:exercise_count].to_i %></td>
+              
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: statistics } %>
\ No newline at end of file
diff --git a/app/views/admins/school_base_statistics/index.html.erb b/app/views/admins/school_base_statistics/index.html.erb
new file mode 100644
index 000000000..a519f245f
--- /dev/null
+++ b/app/views/admins/school_base_statistics/index.html.erb
@@ -0,0 +1,14 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('数据项列表', admins_school_base_statistics_path) %>
+<% end %>
+
+<div class="box search-form-container school-base-statistic-list-form">
+  <%= form_tag(admins_school_base_statistics_path, method: :get, class: 'form-inline search-form', remote: true) do %>
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '学校名称搜索') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+  <% end %>
+</div>
+
+<div class="box admin-list-container school-base-statistic-list-container">
+  <%= render partial: 'admins/school_base_statistics/list', locals: { statistics: @statistics } %>
+</div>
\ No newline at end of file
diff --git a/app/views/admins/school_base_statistics/index.js.erb b/app/views/admins/school_base_statistics/index.js.erb
new file mode 100644
index 000000000..64df1e490
--- /dev/null
+++ b/app/views/admins/school_base_statistics/index.js.erb
@@ -0,0 +1 @@
+$(".school-base-statistic-list-container").html("<%= j(render partial: 'admins/school_base_statistics/list', locals: { statistics: @statistics }) %>")
\ No newline at end of file
diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb
index c7c487dcf..d77e4ed4e 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -17,7 +17,8 @@
     <li>
       <%= sidebar_item_group('#school-submenu', '学校统计', icon: 'area-chart') do %>
         <li><%= sidebar_item(admins_daily_school_statistics_path, '统计总表', icon: 'bar-chart', controller: 'admins-daily_school_statistics') %></li>
-        <li><%= sidebar_item(admins_school_statistics_path, '数据变化报表', icon: 'line-chart', controller: 'admins-schools') %></li>
+        <li><%= sidebar_item(admins_school_statistics_path, '数据变化报表', icon: 'line-chart', controller: 'admins-school_statistics') %></li>
+        <li><%= sidebar_item(admins_school_base_statistics_path, '数据项列表', icon: 'eyedropper', controller: 'admins-school_base_statistics') %></li>
       <% end %>
     </li>
 
diff --git a/config/routes.rb b/config/routes.rb
index f858056a7..9a471fb7f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1173,6 +1173,8 @@ Rails.application.routes.draw do
       get :contrast, on: :collection
     end
 
+    resources :school_base_statistics, only: [:index]
+
     resources :users, only: [:index, :edit, :update, :destroy] do
       member do
         post :reward_grade

From 9475c6c35ce49d890b67405354f5e890387bc7b2 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 16:53:20 +0800
Subject: [PATCH 08/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercises_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index e20a8bd28..7cda7f7cb 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -1201,7 +1201,7 @@ class ExercisesController < ApplicationController
       # 分页
       @page = params[:page] || 1
       @limit = params[:limit] || 20
-      @exercise_users_list = @exercise_users_list.page(@page).per(@limit)
+      @exercise_users_list = @exercise_users_list.preload(:exercise_user_scores, user: :user_extension).page(@page).per(@limit)
 
     else
       @exercise_users_list = []

From 42146c13d402015d5cceef718f907049160639df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 24 Mar 2020 17:30:39 +0800
Subject: [PATCH 09/23] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E5=BE=85=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exercise/Studentshavecompletedthelist.js  | 996 ++++++++++--------
 1 file changed, 584 insertions(+), 412 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index b8880c6f2..5d3579238 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -23,12 +23,17 @@ import './yslexercisetable.css';
 import {getImageUrl, toPath, sortDirections} from 'educoder';
 import NoneData from '../../../modules/courses/coursesPublic/NoneData';
 import ModulationModal_exercise from "../coursesPublic/ModulationModal_exercise";
+
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
 const CheckboxGroup = Checkbox.Group;
 const {Option} = Select;
 //学生老师页面
-let columnsystwo=[];
+let columnsystwo = [];
+let myssubjective = 0; //是否显示主观题
+let mysubjective_score = 0;//主观题得分
+let myobjective_score = 0;//客观题得分
+
 class Studentshavecompletedthelist extends Component {
 	// http://localhost:3007/courses/1309/exercises/722/exercises/student_exercise_list?debug=s
 	constructor(props) {
@@ -47,7 +52,7 @@ class Studentshavecompletedthelist extends Component {
 			teacherlist: undefined,
 			searchtext: "",
 			Teacherliststudentlist: undefined,
-			mylistansum:0,
+			mylistansum: 0,
 			review: null,
 			course_groupysls: undefined,
 			nocomment: false,
@@ -72,13 +77,13 @@ class Studentshavecompletedthelist extends Component {
 					key: 'number',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span>
 							{record.number === "--" ?
-								<span style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.number}</span>
+								<span style={{color: '#999999', textAlign: "center", width: '100px'}}>{record.number}</span>
 								:
-								<span style={{color: '#07111B', textAlign: "center",width:'100px'}}>{record.number}</span>
+								<span style={{color: '#07111B', textAlign: "center", width: '100px'}}>{record.number}</span>
 
 							}
         </span>
@@ -90,15 +95,16 @@ class Studentshavecompletedthelist extends Component {
 					key: 'name',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth110",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span className="maxnamewidth110 font-14" style={{
-							width:'100px'
+							width: '100px'
 						}}>
 								{record.name === "--" ?
-									<span style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.name}</span>
+									<span style={{color: '#999999', textAlign: "center", width: '100px'}}>{record.name}</span>
 									:
-									<a className="maxnamewidth110" style={{color: '#07111B', textAlign: "center",width:'100px'}} title={record.name}>{record.name}</a>
+									<a className="maxnamewidth110" style={{color: '#07111B', textAlign: "center", width: '100px'}}
+										 title={record.name}>{record.name}</a>
 
 								}
         </span>
@@ -110,30 +116,30 @@ class Studentshavecompletedthelist extends Component {
 					key: 'stduynumber',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth175",
-					width:'175px',
+					width: '175px',
 					sorter: true,
 					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span className="maxnamewidth175" style={{
-							width:'175px',
+							width: '175px',
 						}}>
 							{record.stduynumber === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'175px',
+									width: '175px',
 								}}>--</span> :
 								record.stduynumber ===
 								"" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}}>--</span> :
 									<a className="maxnamewidth175" style={{
 										color: '#9A9A9A',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}} title={record.stduynumber}>{record.stduynumber}</a>
 							}
 
@@ -146,26 +152,26 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth255",
-					width:'255px',
+					width: '255px',
 					render: (text, record) => (
-						<span className="maxnamewidth255" style={{width:'255px'}}>
+						<span className="maxnamewidth255" style={{width: '255px'}}>
 								{record.classroom === null ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'255px',
+										width: '255px',
 									}}>--</span> :
 									record.classroom ===
 									"" ?
 										<span style={{
 											color: '#999999',
 											textAlign: "center",
-											width:'255px',
+											width: '255px',
 										}}>--</span> :
 										<a className="maxnamewidth255" style={{
 											color: '#07111B',
 											textAlign: "center",
-											width:'255px',
+											width: '255px',
 										}} title={record.classroom}>{record.classroom}</a>
 								}
 
@@ -178,19 +184,19 @@ class Studentshavecompletedthelist extends Component {
 					key: 'submitstate',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
 						<span style={{
-							width:'98px',
+							width: '98px',
 						}}>
              <span style={record.submitstate === "未提交" ? {
 							 color: '#999999',
 							 textAlign: "center",
-							 width:'98px',
-						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center",	width:'98px'} : {
+							 width: '98px',
+						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center", width: '98px'} : {
 							 color: '#29BD8B',
 							 textAlign: "center",
-							 width:'98px',
+							 width: '98px',
 						 }}>{record.submitstate}</span>
         </span>
 					)
@@ -202,18 +208,18 @@ class Studentshavecompletedthelist extends Component {
 					key: 'updatetime',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'175px',
+					width: '175px',
 					sorter: true,
 					defaultSortOrder: 'descend',
 					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span style={{
-							width:'175px',
+							width: '175px',
 						}}>
 							{record.updatetime === "--" ?
-								<span style={{color: '#999999', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
+								<span style={{color: '#999999', textAlign: "center", width: '175px'}}>{record.updatetime}</span>
 								:
-								<span style={{color: '#9A9A9A', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
+								<span style={{color: '#9A9A9A', textAlign: "center", width: '175px'}}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -224,14 +230,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
 						<span>   {
 							record.completion === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								}}>
 									{record.completion}
 								</span>
@@ -239,20 +245,20 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.completion) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'98px',
-								} : parseInt(record.completion) <= 90 ? {
+									width: '98px',
+								} : parseInt(record.completion) <= 90 &&parseInt(record.completion)>60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								} : parseInt(record.completion) <= 60 ? {
 										color: '#747A7F',
 										textAlign: "center",
-										width:'98px',
+										width: '98px',
 									} :
 									{
 										color: '#747A7F',
 										textAlign: "center",
-										width:'98px',
+										width: '98px',
 									}}>{record.completion}</span>
 						}
 
@@ -265,14 +271,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'levelscore',
 					align: 'center',
 					className: "edu-txt-center font-14",
-					width:'99px',
+					width: '99px',
 					render: (text, record) => (
 						<span>
 							{record.levelscore === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'99px',
+									width: '99px',
 								}}>
 									{record.levelscore}
 								</span>
@@ -280,22 +286,36 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.levelscore) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'99px',
-								} : parseInt(record.levelscore) <= 90 ? {
+									width: '99px',
+								} : parseInt(record.levelscore) <= 90 &&parseInt(record.levelscore) >60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'99px',
+									width: '99px',
 								} : parseInt(record.levelscore) <= 60 ? {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'99px',
-								} : {color: '#747A7F', textAlign: "center",width:'99px'}}>{record.levelscore}</span>
+									width: '99px',
+								} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
+									{
+										//主观题老师没有评分是
+										parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
+											<span style={{
+												color: '#DD1717',
+												textAlign: "center",
+												marginLeft: "5px",
+											}}>
+																					(待批阅)
+																					</span> :
+											""
+
+									}
+								</span>
 							}
         </span>
 					)
 				},
 				{
-					title:<span>最终成绩<Tooltip placement="top" title={<pre>
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
 						 鼠标停留具体分值上可查<br/>
              看得分明细<br/>
 					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
@@ -305,11 +325,11 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					sorter: true,
 					sortDirections: sortDirections,
-					width:'199px',
+					width: '199px',
 					render: (text, record) => (
-						<span style={{width:"199px"}}>
+						<span style={{width: "199px"}}>
 							{record.efficiencyscore === "--" ?
-								<Tooltip  placement="bottom" title={<div>
+								<Tooltip placement="bottom" title={<div>
 									<div>未评分</div>
 								</div>}>
 									<a style={{
@@ -320,15 +340,15 @@ class Studentshavecompletedthelist extends Component {
 									</a>
 								</Tooltip>
 								:
-								record.commit_method===5?
-									<Tooltip  placement="bottom" title={
+								record.commit_method === 5 ?
+									<Tooltip placement="bottom" title={
 										<div>
 											<div>最终调整成绩：{record.efficiencyscore}分</div>
 										</div>}>
 									<span style={parseInt(record.efficiencyscore) > 90 ? {
 										color: '#DD1717',
 										textAlign: "center"
-									} : parseInt(record.efficiencyscore) <= 90 ? {
+									} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 										color: '#FF6800',
 										textAlign: "center"
 									} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -342,24 +362,32 @@ class Studentshavecompletedthelist extends Component {
 									:
 									<Tooltip placement="right" title={<div>
 
-										<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+										<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+											<span>客观题得分：0分</span> :
 											<span>客观题得分：{record.objective_score}分</span>}
 										</div>
 
-										<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+										<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+											<span>主观题得分：0分</span> :
 											<span>主观题得分：{record.subjective_score}分</span>}
 										</div>
-
-										<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
-											<span>最终成绩：{record.efficiencyscore}分</span>}
-										</div>
+										{
+											parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+												<div>
+													<span>待批阅</span>
+												</div>
+												:
+												<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+													<span>最终成绩：{record.efficiencyscore}分</span>}
+												</div>
+										}
 									</div>
 
 									}>
 								<span style={parseInt(record.efficiencyscore) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center"
-								} : parseInt(record.efficiencyscore) <= 90 ? {
+								} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 									color: '#FF6800',
 									textAlign: "center"
 								} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -369,6 +397,17 @@ class Studentshavecompletedthelist extends Component {
 									color: '#747A7F',
 									textAlign: "center"
 								}}>{record.efficiencyscore}</span>
+										{//只有一个主观题的时候
+											parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+												<span style={{
+													color: '#DD1717',
+													textAlign: "center",
+													marginLeft: "5px",
+												}}>
+																					(待批阅)
+																				</span> :
+												""
+										}
 									</Tooltip>
 							}
         </span>
@@ -380,9 +419,9 @@ class Studentshavecompletedthelist extends Component {
 					key: 'finalscore',
 					align: 'center',
 					className: "edu-txt-center  font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
-						<span style={{width:'98px'}}>
+						<span style={{width: '98px'}}>
 						<span style={{textAlign: "center", color: '#999999'}}>--</span>
             </span>
 					)
@@ -395,11 +434,11 @@ class Studentshavecompletedthelist extends Component {
 					key: 'number',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span>
 							{
-								<span style={{color: '#999999', textAlign: "center",width:'100px'}}>我</span>
+								<span style={{color: '#999999', textAlign: "center", width: '100px'}}>我</span>
 							}
         </span>
 					)
@@ -410,14 +449,16 @@ class Studentshavecompletedthelist extends Component {
 					key: 'name',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 maxnamewidth110",
-					width:'100px',
+					width: '100px',
 					render: (text, record) => (
 						<span className="maxnamewidth110 font-14">
 							{
 								record.name === "--" ?
-									<span className="maxnamewidth110" style={{color: '#999999', textAlign: "center",width:'100px'}}>{record.name}</span>
+									<span className="maxnamewidth110"
+												style={{color: '#999999', textAlign: "center", width: '100px'}}>{record.name}</span>
 									:
-									<span className="maxnamewidth110" style={{color: '#07111B', textAlign: "center",width:'100px'}}>{record.name}</span>
+									<span className="maxnamewidth110"
+												style={{color: '#07111B', textAlign: "center", width: '100px'}}>{record.name}</span>
 
 							}
         </span>
@@ -429,29 +470,29 @@ class Studentshavecompletedthelist extends Component {
 					key: 'stduynumber',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 maxnamewidth175",
-					width:'175px',
+					width: '175px',
 					render: (text, record) => (
 						<span className="maxnamewidth175" style={{
-							width:'175px',
+							width: '175px',
 						}}>
 							{record.stduynumber === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'175px',
+									width: '175px',
 								}}>--</span>
 								:
 								record.stduynumber === "" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}}>--</span>
 									:
 									<a className="maxnamewidth175 font-14" style={{
 										color: '#9A9A9A',
 										textAlign: "center",
-										width:'175px',
+										width: '175px',
 									}} title={record.stduynumber}>{record.stduynumber}</a>
 							}
 
@@ -464,26 +505,26 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 maxnamewidth255",
-					width:'255px',
+					width: '255px',
 					render: (text, record) => (
 						<span className="font-14 maxnamewidth255" style={{
-							width:'255px',
+							width: '255px',
 						}}>
 							{record.classroom === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'255px',
-								}}>--</span>: record.classroom === "" ?
+									width: '255px',
+								}}>--</span> : record.classroom === "" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
-										width:'255px',
-									}}>--</span>:
+										width: '255px',
+									}}>--</span> :
 									<a className="maxnamewidth255" style={{
 										color: '#07111B',
 										textAlign: "center",
-										width:'255px',
+										width: '255px',
 									}} title={record.classroom}>{record.classroom}</a>
 							}
 
@@ -496,17 +537,17 @@ class Studentshavecompletedthelist extends Component {
 					key: 'submitstate',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
-						<span style={{width:'98px',}}>
+						<span style={{width: '98px',}}>
              <span style={record.submitstate === "未提交" ? {
 							 color: '#999999',
 							 textAlign: "center",
-							 width:'98px',
-						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center",		 width:'98px',} : {
+							 width: '98px',
+						 } : record.submitstate === "已提交" ? {color: '#29BD8B', textAlign: "center", width: '98px',} : {
 							 color: '#29BD8B',
 							 textAlign: "center",
-							 width:'98px',
+							 width: '98px',
 						 }}>{record.submitstate}</span>
         </span>
 					)
@@ -518,15 +559,15 @@ class Studentshavecompletedthelist extends Component {
 					key: 'updatetime',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'175px',
+					width: '175px',
 					render: (text, record) => (
 						<span style={{
-							width:'175px',
+							width: '175px',
 						}}>
-							{record.updatetime === "--"?
-								<span style={{color: '#999999', textAlign: "center",width:'175px'}}>--</span>
+							{record.updatetime === "--" ?
+								<span style={{color: '#999999', textAlign: "center", width: '175px'}}>--</span>
 								:
-								<span style={{color: '#9A9A9A', textAlign: "center",width:'175px'}}>{record.updatetime}</span>
+								<span style={{color: '#9A9A9A', textAlign: "center", width: '175px'}}>{record.updatetime}</span>
 							}
         </span>
 					),
@@ -537,14 +578,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'98px',
+					width: '98px',
 					render: (text, record) => (
 						<span>
 							{record.completion === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								}}>
 									--
 								</span>
@@ -553,19 +594,19 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.completion) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'98px',
-								} : parseInt(record.completion) <= 90 ? {
+									width: '98px',
+								} : parseInt(record.completion) <= 90 && parseInt(record.completion)>60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								} : parseInt(record.completion) <= 60 ? {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								} : {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'98px',
+									width: '98px',
 								}}>{record.completion}</span>
 							}
         </span>
@@ -577,14 +618,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'levelscore',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:'99px',
+					width: '99px',
 					render: (text, record) => (
 						<span>
-							{record.levelscore === "--"?
+							{record.levelscore === "--" ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center",
-									width:'99px',
+									width: '99px',
 								}}>
 									--
 								</span>
@@ -592,22 +633,36 @@ class Studentshavecompletedthelist extends Component {
 								<span style={parseInt(record.levelscore) > 90 ? {
 									color: '#DD1717',
 									textAlign: "center",
-									width:'99px'
-								} : parseInt(record.levelscore) <= 90 ? {
+									width: '99px'
+								} : parseInt(record.levelscore) <= 90 && parseInt(record.levelscore) >60? {
 									color: '#FF6800',
 									textAlign: "center",
-									width:'99px'
+									width: '99px'
 								} : parseInt(record.levelscore) <= 60 ? {
 									color: '#747A7F',
 									textAlign: "center",
-									width:'99px'
-								} : {color: '#747A7F', textAlign: "center",	width:'99px'}}>{record.levelscore}</span>
+									width: '99px'
+								} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
+									{
+										//主观题老师没有评分是
+										parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
+											<span style={{
+												color: '#DD1717',
+												textAlign: "center",
+												marginLeft: "5px",
+											}}>
+																					(待批阅)
+																					</span> :
+											""
+
+									}
+								</span>
 							}
         </span>
 					)
 				},
 				{
-					title:<span>最终成绩<Tooltip placement="top"  title={<pre>
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
 						 鼠标停留具体分值上可查<br/>
              看得分明细<br/>
 					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
@@ -615,78 +670,97 @@ class Studentshavecompletedthelist extends Component {
 					key: 'efficiencyscore',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14 columnstwoachievement",
-					width:"199px",
+					width: "199px",
 					render: (text, record) => (
-						<span style={{width:"199px"}}>
+						<span style={{width: "199px"}}>
 							{
-								record.efficiencyscore === "--"?
-									<Tooltip  placement="bottom" title={<div>
+								record.efficiencyscore === "--" ?
+									<Tooltip placement="bottom" title={<div>
 										<div>未评分</div>
 									</div>}>
 										<a style={{
 											color: '#DD1717',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										}}>--</a>
 									</Tooltip>
 									:
-									record.commit_method===5?
-										<Tooltip  placement="bottom" title={
+									record.commit_method === 5 ?
+										<Tooltip placement="bottom" title={
 											<div>
 												<div>最终调整成绩：{record.efficiencyscore}分</div>
 											</div>}>
 										<span style={parseInt(record.efficiencyscore) > 90 ? {
 											color: '#DD1717',
 											textAlign: "center",
-											width:"199px"
-										} : parseInt(record.efficiencyscore) <= 90 ? {
+											width: "199px"
+										} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 											color: '#FF6800',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										} : parseInt(record.efficiencyscore) <= 60 ? {
 											color: '#747A7F',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										} : {
 											color: '#747A7F',
 											textAlign: "center",
-											width:"199px"
+											width: "199px"
 										}}>{record.efficiencyscore}</span>
 										</Tooltip>
 										:
 										<Tooltip placement="right" title={<div>
 
-											<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+											<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+												<span>客观题得分：0分</span> :
 												<span>客观题得分：{record.objective_score}分</span>}
 											</div>
 
-											<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+											<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+												<span>主观题得分：0分</span> :
 												<span>主观题得分：{record.subjective_score}分</span>}
 											</div>
-
-											<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
-												<span>最终成绩：{record.efficiencyscore}分</span>}
-											</div>
+											{
+												parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+													<div>
+														<span>待批阅</span>
+													</div>
+													:
+													<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+														<span>最终成绩：{record.efficiencyscore}分</span>}
+													</div>
+											}
 										</div>
 
 										}>
 									<span style={parseInt(record.efficiencyscore) > 90 ? {
 										color: '#DD1717',
 										textAlign: "center",
-										width:"199px"
-									} : parseInt(record.efficiencyscore) <= 90 ? {
+										width: "199px"
+									} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 										color: '#FF6800',
 										textAlign: "center",
-										width:"199px"
+										width: "199px"
 									} : parseInt(record.efficiencyscore) <= 60 ? {
 										color: '#747A7F',
 										textAlign: "center",
-										width:"199px"
+										width: "199px"
 									} : {
 										color: '#747A7F',
 										textAlign: "center",
-										width:"199px"
+										width: "199px"
 									}}>{record.efficiencyscore}</span>
+											{//只有一个主观题的时候
+												parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+													<span style={{
+														color: '#DD1717',
+														textAlign: "center",
+														marginLeft: "5px",
+													}}>
+																					(待批阅)
+																				</span> :
+													""
+											}
 										</Tooltip>
 							}
 
@@ -699,21 +773,21 @@ class Studentshavecompletedthelist extends Component {
 					key: 'finalscore',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:"98px",
+					width: "98px",
 					render: (text, record) => (
-						<span style={{width:"98px"}}>
+						<span style={{width: "98px"}}>
 							{
-								record.submitstate === "未提交"||record.commit_method===5?
-									<span style={{textAlign: "center", color: '#999999',width:"98px"}}>-aa-</span>
-									:record.submitstate === "已提交"?
-									record.score_open===null||record.score_open===undefined?"":
-										record.score_open===true?
-											<a style={{textAlign: "center",width:"98px"}} className="color-blue"
+								record.submitstate === "未提交" || record.commit_method === 5 ?
+									<span style={{textAlign: "center", color: '#999999', width: "98px"}}>-aa-</span>
+									: record.submitstate === "已提交" ?
+									record.score_open === null || record.score_open === undefined ? "" :
+										record.score_open === true ?
+											<a style={{textAlign: "center", width: "98px"}} className="color-blue"
 												 target="_blank"
 												 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>查看</a>
-											:""
+											: ""
 									:
-									<span style={{textAlign: "center", color: '#999999',width:"98px"}}>--</span>
+									<span style={{textAlign: "center", color: '#999999', width: "98px"}}>--</span>
 							}
                     </span>
 					)
@@ -729,7 +803,7 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{
-								record.number=== "--"?
+								record.number === "--" ?
 									<span style={{color: '#999999', textAlign: "center"}}>--</span>
 									:
 									<span style={{color: '#07111B', textAlign: "center"}}>{record.number}</span>
@@ -789,14 +863,14 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth260",
-					width:"260px",
+					width: "260px",
 					render: (text, record) => (
 						<span>
 							{record.classroom === null ?
 								<span style={{
 									color: '#999999',
 									textAlign: "center"
-								}}  className="maxnamewidth260">--</span>  : record.classroom === "" ?
+								}} className="maxnamewidth260">--</span> : record.classroom === "" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center"
@@ -857,7 +931,7 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{
-								record.completion === "--"?
+								record.completion === "--" ?
 									<span style={{
 										color: '#999999',
 										textAlign: "center",
@@ -866,7 +940,7 @@ class Studentshavecompletedthelist extends Component {
 									<span style={parseInt(record.completion) > 90 ? {
 										color: '#DD1717',
 										textAlign: "center",
-									} : parseInt(record.completion) <= 90 ? {
+									} : parseInt(record.completion) <= 90&& parseInt(record.completion) >60 ? {
 										color: '#FF6800',
 										textAlign: "center",
 									} : parseInt(record.completion) <= 60 ? {
@@ -898,20 +972,34 @@ class Studentshavecompletedthelist extends Component {
 											<span style={parseInt(record.levelscore) > 90 ? {
 												color: '#DD1717',
 												textAlign: "center",
-											} : parseInt(record.levelscore) <= 90 ? {
+											} : parseInt(record.levelscore) <= 90 &&parseInt(record.levelscore)>60? {
 												color: '#FF6800',
 												textAlign: "center",
 											} : parseInt(record.levelscore) <= 60 ? {
 												color: '#747A7F',
 												textAlign: "center",
-											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}</span>
+											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
+												{
+													//主观题老师没有评分是
+													parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
+														<span style={{
+															color: '#DD1717',
+															textAlign: "center",
+															marginLeft: "5px",
+														}}>
+																					(待批阅)
+																					</span> :
+														""
+
+												}
+											</span>
 									}
 
         </span>
 					)
 				},
 				{
-					title: <span>最终成绩<Tooltip placement="top"  title={<pre>
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
 						 鼠标停留具体分值上可查<br/>
              看得分明细<br/>
 					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
@@ -923,7 +1011,7 @@ class Studentshavecompletedthelist extends Component {
 						<span>
 							              {
 															record.efficiencyscore === "--" ?
-																<Tooltip  placement="bottom" title={<div>
+																<Tooltip placement="bottom" title={<div>
 																	<div>未评分</div>
 																</div>}>
 																	<a style={{
@@ -932,15 +1020,15 @@ class Studentshavecompletedthelist extends Component {
 																	}}>--</a>
 																</Tooltip>
 																:
-																record.commit_method===5?
-																	<Tooltip  placement="bottom" title={
+																record.commit_method === 5 ?
+																	<Tooltip placement="bottom" title={
 																		<div>
-																		<div>最终调整成绩：{record.efficiencyscore}分</div>
-																	  </div>}>
+																			<div>最终调整成绩：{record.efficiencyscore}分</div>
+																		</div>}>
 																	<span style={parseInt(record.efficiencyscore) > 90 ? {
 																		color: '#DD1717',
 																		textAlign: "center",
-																	} : parseInt(record.efficiencyscore) <= 90 ? {
+																	} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																		color: '#FF6800',
 																		textAlign: "center",
 																	} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -954,24 +1042,32 @@ class Studentshavecompletedthelist extends Component {
 																	:
 																	<Tooltip placement="right" title={<div>
 
-																		<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+																		<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+																			<span>客观题得分：0分</span> :
 																			<span>客观题得分：{record.objective_score}分</span>}
 																		</div>
 
-																		<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+																		<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+																			<span>主观题得分：0分</span> :
 																			<span>主观题得分：{record.subjective_score}分</span>}
 																		</div>
-
-																		<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
-																			<span>最终成绩：{record.efficiencyscore}分</span>}
-																		</div>
+																		{
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+																				<div>
+																					<span>待批阅</span>
+																				</div>
+																				:
+																				<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
+																					<span>最终成绩：{record.efficiencyscore}分</span>}
+																				</div>
+																		}
 																	</div>
 
 																	}>
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
 																	color: '#DD1717',
 																	textAlign: "center",
-																} : parseInt(record.efficiencyscore) <= 90 ? {
+																} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																	color: '#FF6800',
 																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -981,6 +1077,17 @@ class Studentshavecompletedthelist extends Component {
 																	color: '#747A7F',
 																	textAlign: "center",
 																}}>{record.efficiencyscore}</span>
+																		{//只有一个主观题的时候
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+																				<span style={{
+																					color: '#DD1717',
+																					textAlign: "center",
+																					marginLeft: "5px",
+																				}}>
+																					(待批阅)
+																				</span> :
+																				""
+																		}
 																	</Tooltip>
 														}
 						</span>
@@ -994,10 +1101,10 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							       {record.operating==="--"?
-											 <span style={{textAlign: "center",color: '#999999',}}>{record.operating}</span>
-											 :record.submitstate === "未提交"?
-												 <span style={{textAlign: "center",color: '#999999',}}>--</span>
+							       {record.operating === "--" ?
+											 <span style={{textAlign: "center", color: '#999999',}}>{record.operating}</span>
+											 : record.submitstate === "未提交" ?
+												 <span style={{textAlign: "center", color: '#999999',}}>--</span>
 												 :
 												 <a style={{textAlign: "center"}} className="color-blue"
 														target="_blank"
@@ -1040,7 +1147,7 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							{record.name==="--"?
+							{record.name === "--" ?
 								<span style={{color: '#999999', textAlign: "center"}}>{record.name}</span>
 								:
 								<span style={{color: '#07111B', textAlign: "center"}}>{record.name}</span>
@@ -1072,13 +1179,15 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'classroom',
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth260",
-					width:'260px',
+					width: '260px',
 					render: (text, record) => (
 						<span>
-							{record.classroom==="--"?
-								<span style={{color: '#999999', textAlign: "center"}} className="maxnamewidth260">{record.classroom}</span>
+							{record.classroom === "--" ?
+								<span style={{color: '#999999', textAlign: "center"}}
+											className="maxnamewidth260">{record.classroom}</span>
 								:
-								<a style={{color: '#07111B', textAlign: "center"}} className="maxnamewidth260" title={record.classroom}>{record.classroom}</a>
+								<a style={{color: '#07111B', textAlign: "center"}} className="maxnamewidth260"
+									 title={record.classroom}>{record.classroom}</a>
 							}
         </span>
 					)
@@ -1114,7 +1223,7 @@ class Studentshavecompletedthelist extends Component {
 					sortDirections: sortDirections,
 					render: (text, record) => (
 						<span>
-							{record.updatetime==="--"?
+							{record.updatetime === "--" ?
 								<span style={{color: '#999999', textAlign: "center"}}>--</span>
 								:
 								<span style={{color: '#9A9A9A', textAlign: "center"}}>{record.updatetime}</span>
@@ -1130,12 +1239,28 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							{record.completion=== "--"?
-								<span style={{color: '#999999', textAlign: "center"}}>--</span>
+						{
+							record.completion === "--" ?
+								<span style={{
+									color: '#999999',
+									textAlign: "center",
+								}}>--</span>
 								:
-								<span style={{color: '#07111B', textAlign: "center"}}>{record.completion}</span>
-							}
-        </span>
+								<span style={parseInt(record.completion) > 90 ? {
+									color: '#DD1717',
+									textAlign: "center",
+								} : parseInt(record.completion) <= 90 && parseInt(record.completion) > 60 ? {
+									color: '#FF6800',
+									textAlign: "center",
+								} : parseInt(record.completion) <= 60 ? {
+									color: '#747A7F',
+									textAlign: "center",
+								} : {
+									color: '#747A7F',
+									textAlign: "center",
+								}}>{record.completion}</span>
+						}
+	           </span>
 					)
 				},
 				{
@@ -1146,16 +1271,44 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center font-14",
 					render: (text, record) => (
 						<span>
-							{record.levelscore==="--"?
-								<span style={{color: '#999999', textAlign: "center"}}>--</span>
-								:
-								<span style={{color: '#FF6800', textAlign: "center"}}>{record.levelscore}</span>
-							}
+									{
+										record.levelscore === "--" ?
+											<span style={{
+												color: '#999999',
+												textAlign: "center",
+											}}>--</span> :
+											<span style={parseInt(record.levelscore) > 90 ? {
+												color: '#DD1717',
+												textAlign: "center",
+											} : parseInt(record.levelscore) <= 90 && parseInt(record.levelscore) > 60 ? {
+												color: '#FF6800',
+												textAlign: "center",
+											} : parseInt(record.levelscore) <= 60 ? {
+												color: '#747A7F',
+												textAlign: "center",
+											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
+												{
+													//主观题老师没有评分是
+													parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
+														<span style={{
+															color: '#DD1717',
+															textAlign: "center",
+															marginLeft: "5px",
+														}}>
+																					(待批阅)
+																					</span> :
+														""
+
+												}
+
+											</span>
+									}
+
         </span>
 					)
 				},
 				{
-					title: <span>最终成绩<Tooltip placement="top"  title={<pre>
+					title: <span>最终成绩<Tooltip placement="top" title={<pre>
 						 鼠标停留具体分值上可查<br/>
              看得分明细<br/>
 					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
@@ -1168,22 +1321,24 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 															{record.efficiencyscore === "--" ?
-																<Tooltip  placement="bottom" title={<div>
+																<Tooltip placement="bottom" title={<div>
 																	<div>未评分</div>
 																</div>}>
-																	<a style={{color: '#999999',
-																		textAlign: "center",}}>--</a>
+																	<a style={{
+																		color: '#999999',
+																		textAlign: "center",
+																	}}>--</a>
 																</Tooltip>
 																:
-																record.commit_method===5?
-																	<Tooltip  placement="bottom" title={
+																record.commit_method === 5 ?
+																	<Tooltip placement="bottom" title={
 																		<div>
 																			<div>最终调整成绩：{record.efficiencyscore}分</div>
 																		</div>}>
 																	<span style={parseInt(record.efficiencyscore) > 90 ? {
 																		color: '#DD1717',
 																		textAlign: "center",
-																	} : parseInt(record.efficiencyscore) <= 90 ? {
+																	} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																		color: '#FF6800',
 																		textAlign: "center",
 																	} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -1197,24 +1352,37 @@ class Studentshavecompletedthelist extends Component {
 																	:
 																	<Tooltip placement="right" title={<div>
 
-																		<div>{record.objective_score===undefined?"":record.objective_score === "--" ? <span>客观题得分：0分</span> :
+																		<div>{record.objective_score === undefined ? "" : record.objective_score === "--" ?
+																			<span>客观题得分：0分</span> :
 																			<span>客观题得分：{record.objective_score}分</span>}
 																		</div>
 
-																		<div>{record.subjective_score===undefined?"":record.subjective_score === "--" ? <span>主观题得分：0分</span> :
+																		<div>{record.subjective_score === undefined ? "" : record.subjective_score === "--" ?
+																			<span>主观题得分：0分</span> :
 																			<span>主观题得分：{record.subjective_score}分</span>}
 																		</div>
+																		{
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+																				<div>
+																					<span>待批阅</span>
+																				</div>
+																				:
+																				<div>
+																					{record.efficiencyscore === "--" ?
+																						<span>最终成绩：0分</span>
+																						:
+																						<span>最终成绩：{record.efficiencyscore}分</span>
+																					}
+																				</div>
+																		}
 
-																		<div>{record.efficiencyscore === "--" ? <span>最终成绩：0分</span> :
-																			<span>最终成绩：{record.efficiencyscore}分</span>}
-																		</div>
-																		</div>
+																	</div>
 
 																	}>
 																<span style={parseInt(record.efficiencyscore) > 90 ? {
 																	color: '#DD1717',
 																	textAlign: "center",
-																} : parseInt(record.efficiencyscore) <= 90 ? {
+																} : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? {
 																	color: '#FF6800',
 																	textAlign: "center",
 																} : parseInt(record.efficiencyscore) <= 60 ? {
@@ -1223,7 +1391,19 @@ class Studentshavecompletedthelist extends Component {
 																} : {
 																	color: '#747A7F',
 																	textAlign: "center",
-																}}>{record.efficiencyscore}</span>
+																}}>{parseInt(record.efficiencyscore) === 0 ? 0 : record.efficiencyscore}</span>
+																		{//只有一个主观题的时候
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+																				<span style={{
+																					color: '#DD1717',
+																					textAlign: "center",
+																					marginLeft: "5px",
+																				}}>
+																					(待批阅)
+																				</span> :
+																				""
+																		}
+
 																	</Tooltip>
 															}
         </span>
@@ -1238,37 +1418,40 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
 							{
-								record.submitstate === "未提交"||record.commit_method===5?
+								record.submitstate === "未提交" || record.commit_method === 5 ?
 									(//是否助教
-										this.props.isAssistant()&&this.props.isAssistant()===true?
+										this.props.isAssistant() && this.props.isAssistant() === true ?
 											(//助教是否有权限
-												this.props.assistant_auth&&this.props.assistant_auth===true?
+												this.props.assistant_auth && this.props.assistant_auth === true ?
 													<a style={{textAlign: "center"}} className="color-blue"
-														 target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"}</a>
+														 target="_blank"
+														 onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
 													:
 													(//是否截止
-														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
+														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 3 ?
 															<a style={{textAlign: "center"}} className="color-blue"
-																 target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"}</a>
+																 target="_blank"
+																 onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
 															:
 															<span style={{textAlign: "center", color: '#999999'}}>--</span>
 													)
 											)
 											:
 											<a style={{textAlign: "center"}} className="color-blue"
-												 target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"}</a>
+												 target="_blank"
+												 onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"}</a>
 									)
-									:record.submitstate === "已提交"?
+									: record.submitstate === "已提交" ?
 									(//是否助教
-										this.props.isAssistant()&&this.props.isAssistant()===true?
+										this.props.isAssistant() && this.props.isAssistant() === true ?
 											(//助教是否有权限
-												this.props.assistant_auth&&this.props.assistant_auth===true?
+												this.props.assistant_auth && this.props.assistant_auth === true ?
 													<a style={{textAlign: "center"}} className="color-blue"
 														 target="_blank"
 														 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
 													:
 													(//是否截止
-														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
+														this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 3 ?
 															<a style={{textAlign: "center"}} className="color-blue"
 																 target="_blank"
 																 href={`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
@@ -1288,8 +1471,8 @@ class Studentshavecompletedthelist extends Component {
 					)
 				},
 			],
-		// 也会被columnsys当作参数接收
-			exercise_status:0,
+			// 也会被columnsys当作参数接收
+			exercise_status: 0,
 			order_type: "desc",
 			exeuserid: 0,
 			subjective: 0,
@@ -1302,8 +1485,10 @@ class Studentshavecompletedthelist extends Component {
 		}
 		{/*	 onClick={() => this.Adjustment(record.user_id)}>评阅</a>*/
 		}
-		{/*<span style={{textAlign: "center", color: '#999999'}}*/}
-		{/*>--</span>*/}
+		{/*<span style={{textAlign: "center", color: '#999999'}}*/
+		}
+		{/*>--</span>*/
+		}
 		// //console.log("Studentshavecompletedthelist");
 		// //console.log(props.current_status);
 		// columnsys 老师列表
@@ -1353,16 +1538,16 @@ class Studentshavecompletedthelist extends Component {
 		// console.log("componentDidMount");
 		// console.log(columnsystwo);
 		try {
-			columnsystwo=this.state.columnsys;
-		}catch (e) {
+			columnsystwo = this.state.columnsys;
+		} catch (e) {
 
 		}
-   // console.log(columnsystwo);
+		// console.log(columnsystwo);
 		this.Teacherliststudentlist();
 
 		try {
 			this.props.triggerRef(this);
-		}catch (e) {
+		} catch (e) {
 
 		}
 
@@ -1391,6 +1576,17 @@ class Studentshavecompletedthelist extends Component {
 				limit: null,
 			}
 		}).then((response) => {
+			if (response === undefined) {
+				return
+			}
+			try {
+				myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
+				mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
+				myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
+			} catch (e) {
+
+			}
+
 			//学生
 			if (response.data.exercise_types.user_permission === 1) {
 				this.setState({
@@ -1400,7 +1596,7 @@ class Studentshavecompletedthelist extends Component {
 					exercise_users: response.data.exercise_users,
 					current_answer_user: response.data.current_answer_user,
 					course_groups: response.data.course_groups,
-					mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users
+					mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users
 				})
 				if (response.data.current_answer_user === undefined || response.data.current_answer_user === null) {
 					// 学生未截止
@@ -1410,19 +1606,15 @@ class Studentshavecompletedthelist extends Component {
 
 						if (this.state.noclassroom === undefined || this.state.noclassroom === "" || this.state.noclassroom === null) {
 							console.log("4");
-							var arr =[];
-							for(var i=0;i<this.state.columnss.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnss.length; i++) {
 								var item = this.state.columnss[i];
-								if(item.title==="分班"){
-								}
-								else if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "分班") {
+								} else if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
@@ -1433,18 +1625,15 @@ class Studentshavecompletedthelist extends Component {
 						} else {
 							console.log("5");
 							debugger
-							var arr =[];
-							for(var i=0;i<this.state.columnss.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnss.length; i++) {
 								var item = this.state.columnss[i];
-								if(item.title==="客观题得分"){
+								if (item.title === "客观题得分") {
 
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
@@ -1459,32 +1648,26 @@ class Studentshavecompletedthelist extends Component {
 					// //console.log("试卷学生已截止");
 					if (response.data.exercise_types.subjective === 0) {
 						if (this.state.loadingstate === false) {
-							var arr =[];
-							for(var i=0;i<this.state.columnstwo.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnstwo.length; i++) {
 								var item = this.state.columnstwo[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
 
-							var arr2 =[];
-							for(var i=0;i<this.state.columns.length;i++){
+							var arr2 = [];
+							for (var i = 0; i < this.state.columns.length; i++) {
 								var item = this.state.columns[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr2.push(item);
 								}
 							}
@@ -1495,43 +1678,37 @@ class Studentshavecompletedthelist extends Component {
 							})
 						} else {
 
-							var arr =[];
-							for(var i=0;i<this.state.columnstwo.length;i++){
+							var arr = [];
+							for (var i = 0; i < this.state.columnstwo.length; i++) {
 								var item = this.state.columnstwo[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr.push(item);
 								}
 							}
-							var arr2 =[];
-							for(var i=0;i<this.state.columns.length;i++){
+							var arr2 = [];
+							for (var i = 0; i < this.state.columns.length; i++) {
 								var item = this.state.columns[i];
-								if(item.title==="客观题得分"){
-								}
-								else if(item.title==="主观题得分"){
-								}
-								else if(this.props.isNotMember()===true&&item.title==="学号") {
+								if (item.title === "客观题得分") {
+								} else if (item.title === "主观题得分") {
+								} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-								}
-								else{
+								} else {
 									arr2.push(item);
 								}
 							}
 							thiss.setState({
 								columns: arr2,
-								columnstwo:arr,
+								columnstwo: arr,
 							})
 						}
 
 
 					}
-					thiss.Generatenewdata(response.data.exercise_users, response.data.current_answer_user,response.data.exercise_types);
+					thiss.Generatenewdata(response.data.exercise_users, response.data.current_answer_user, response.data.exercise_types);
 				}
 			}
 			//老师
@@ -1557,7 +1734,7 @@ class Studentshavecompletedthelist extends Component {
 
 	}
 
-	Generatenewdata(exercise_users, current_answer_user,exercise_types) {
+	Generatenewdata(exercise_users, current_answer_user, exercise_types) {
 		let {page, limit} = this.state;
 		let datalist = [];
 		let datalisttwo = [];
@@ -1580,10 +1757,10 @@ class Studentshavecompletedthelist extends Component {
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
 						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-						subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
-						operating:exercise_users[i].has_comment===true?"已评阅":"评阅",
-						commit_method:exercise_users[i].commit_method,
-						has_comment:exercise_users[i].has_comment
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						operating: exercise_users[i].has_comment === true ? "已评阅" : "评阅",
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment
 					})
 				} else {
 					datalist.push({
@@ -1599,10 +1776,10 @@ class Studentshavecompletedthelist extends Component {
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
 						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-						subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
-						operating:exercise_users[i].has_comment===true?"已评阅":"--",
-						commit_method:exercise_users[i].commit_method,
-						has_comment:exercise_users[i].has_comment
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						operating: exercise_users[i].has_comment === true ? "已评阅" : "--",
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment
 					})
 
 				}
@@ -1627,12 +1804,12 @@ class Studentshavecompletedthelist extends Component {
 				updatetime: moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm') === "Invalid date" ? "--" : moment(current_answer_user.end_at).format('YYYY-MM-DD HH:mm'),
 				efficiencyscore: current_answer_user.score === undefined ? "--" : current_answer_user.score === null ? "--" : current_answer_user.score === "" ? "--" : current_answer_user.score,
 				objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-				subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+				subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 				review_status: current_answer_user.review_status,
 				completion: current_answer_user.objective_score === undefined ? "--" : current_answer_user.objective_score === null ? "--" : current_answer_user.objective_score === "" ? "--" : current_answer_user.objective_score,
 				levelscore: current_answer_user.subjective_score === undefined ? "--" : current_answer_user.subjective_score === null ? "--" : current_answer_user.subjective_score === "" ? "--" : current_answer_user.subjective_score,
-				score_open:exercise_types.score_open,
-				commit_method:current_answer_user.commit_method
+				score_open: exercise_types.score_open,
+				commit_method: current_answer_user.commit_method
 
 			})
 
@@ -1671,10 +1848,10 @@ class Studentshavecompletedthelist extends Component {
 					levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 					efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
 					objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-					subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
-					operating:exercise_users[i].has_comment===true?"已评阅":"查看",
-					commit_method:exercise_users[i].commit_method,
-					has_comment:exercise_users[i].has_comment
+					subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+					operating: exercise_users[i].has_comment === true ? "已评阅" : "查看",
+					commit_method: exercise_users[i].commit_method,
+					has_comment: exercise_users[i].has_comment
 				})
 				noclassroom = exercise_users[i].user_group_name;
 			}
@@ -1739,42 +1916,46 @@ class Studentshavecompletedthelist extends Component {
 			params: params
 		}).then((response) => {
 			// //console.log(JSON.stringify(response));
+			if (response === undefined) {
+				return
+			}
 			this.setState({
 				Teacherliststudentlist: response.data,
 				review: response.data.review,
 				commit_status: response.data.commit_status,
 				exercise_users: response.data.exercise_users,
 				current_answer_user: response.data.current_answer_user,
-				mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+				mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 			})
+			try {
+				myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
+				mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
+				myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
+			} catch (e) {
+
+			}
 			if (response.data.exercise_types.subjective === 0) {
 
-				var arr =[];
-				for(var i=0;i<this.state.columnstwo.length;i++){
+				var arr = [];
+				for (var i = 0; i < this.state.columnstwo.length; i++) {
 					var item = this.state.columnstwo[i];
-					if(item.title==="客观题得分"){
-					}
-					else if(item.title==="主观题得分"){
-					}
-					else if(this.props.isNotMember()===true&&item.title==="学号") {
+					if (item.title === "客观题得分") {
+					} else if (item.title === "主观题得分") {
+					} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-					}
-					else{
+					} else {
 						arr.push(item);
 					}
 				}
 
-				var arr2 =[];
-				for(var i=0;i<this.state.columns.length;i++){
+				var arr2 = [];
+				for (var i = 0; i < this.state.columns.length; i++) {
 					var item = this.state.columns[i];
-					if(item.title==="客观题得分"){
-					}
-					else if(item.title==="主观题得分"){
-					}
-					else if(this.props.isNotMember()===true&&item.title==="学号") {
+					if (item.title === "客观题得分") {
+					} else if (item.title === "主观题得分") {
+					} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-					}
-					else{
+					} else {
 						arr2.push(item);
 					}
 				}
@@ -1784,7 +1965,7 @@ class Studentshavecompletedthelist extends Component {
 					loadingstate: false,
 				})
 			}
-			this.Generatenewdata(response.data.exercise_users, response.data.current_answer_user,response.data.exercise_types);
+			this.Generatenewdata(response.data.exercise_users, response.data.current_answer_user, response.data.exercise_types);
 		}).catch((error) => {
 			//console.log(error)
 			this.setState({
@@ -1819,11 +2000,11 @@ class Studentshavecompletedthelist extends Component {
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
 						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-						subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
-						finalscore:exercise_users[i].has_comment===true?"已评阅":"评阅",
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						finalscore: exercise_users[i].has_comment === true ? "已评阅" : "评阅",
 						user_id: exercise_users[i].user_id,
-						commit_method:exercise_users[i].commit_method,
-						has_comment:exercise_users[i].has_comment
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment
 					})
 				} else {
 					datalist.push({
@@ -1839,11 +2020,11 @@ class Studentshavecompletedthelist extends Component {
 						levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score,
 						objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score,
-						subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
-						finalscore:exercise_users[i].has_comment===true?"已评阅":"--",
+						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
+						finalscore: exercise_users[i].has_comment === true ? "已评阅" : "--",
 						user_id: exercise_users[i].user_id,
-						commit_method:exercise_users[i].commit_method,
-						has_comment:exercise_users[i].has_comment
+						commit_method: exercise_users[i].commit_method,
+						has_comment: exercise_users[i].has_comment
 					})
 					indexi++;
 				}
@@ -1867,17 +2048,14 @@ class Studentshavecompletedthelist extends Component {
 					// this.state.columnsys.map((item,key)=>{
 					//
 					// })
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -1890,7 +2068,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
@@ -1901,18 +2079,14 @@ class Studentshavecompletedthelist extends Component {
 					//分班小于0不显示分班
 					//6ge
 
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
-						}
-						else if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
-						}
-						else{
+						if (item.title === "分班") {
+						} else if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
+						} else {
 							arr.push(item);
 						}
 					}
@@ -1926,7 +2100,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
@@ -1941,16 +2115,14 @@ class Studentshavecompletedthelist extends Component {
 					//显示分班
 					//8ge
 
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -1965,28 +2137,25 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
-						columnsys:	arr,
+						columnsys: arr,
 					})
 				} else {
 					//不显示分班
 					//7ge
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
-						}
-						else if(item.title==="客观题得分"){
-						}
-						else if(item.title==="主观题得分"){
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (item.title === "分班") {
+						} else if (item.title === "客观题得分") {
+						} else if (item.title === "主观题得分") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2000,7 +2169,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
@@ -2017,13 +2186,12 @@ class Studentshavecompletedthelist extends Component {
 				//console.log("2548包含主观题不包含分班");
 
 				if (response.data.exercise_types.groups_count > 0) {
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(this.props.isNotMember()===true&&item.title==="学号") {
+						if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2035,23 +2203,21 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						columnsys: arr,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
 					})
 				} else {
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
+						if (item.title === "分班") {
 
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2063,8 +2229,8 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
-						columnsys:arr,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
+						columnsys: arr,
 						subjective: response.data.exercise_types.subjective,
 						objective_score: response.data.exercise_types.objective_score,
 						subjective_score: response.data.exercise_types.subjective_score,
@@ -2081,7 +2247,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys: columnsystwo,
 						subjective: response.data.exercise_types.subjective,
@@ -2089,16 +2255,14 @@ class Studentshavecompletedthelist extends Component {
 						subjective_score: response.data.exercise_types.subjective_score,
 					})
 				} else {
-					var arr =[];
-					for(var i=0;i<this.state.columnsys.length;i++){
+					var arr = [];
+					for (var i = 0; i < this.state.columnsys.length; i++) {
 						var item = this.state.columnsys[i];
-						if(item.title==="分班"){
+						if (item.title === "分班") {
 
-						}
-						else if(this.props.isNotMember()===true&&item.title==="学号") {
+						} else if (this.props.isNotMember() === true && item.title === "学号") {
 
-						}
-						else{
+						} else {
 							arr.push(item);
 						}
 					}
@@ -2110,7 +2274,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
-						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
+						mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys: arr,
 						subjective: response.data.exercise_types.subjective,
@@ -2158,12 +2322,21 @@ class Studentshavecompletedthelist extends Component {
 		}).then((response) => {
 			// //console.log("528");
 			// //console.log(JSON.stringify(response));
-			if(response===undefined){
+			if (response === undefined) {
 				return
 			}
+
+
 			this.setState({
 				loadingstate: false,
 			})
+			try {
+				myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有
+				mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0;
+				myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0;
+			} catch (e) {
+
+			}
 			// //console.log(response);
 			// //console.log(1997);
 			this.Generatenewdatasy(response.data.exercise_users, response);
@@ -2181,13 +2354,13 @@ class Studentshavecompletedthelist extends Component {
 				unlimited: 0,
 				course_groupyslsthree: undefined,
 				loadingstate: true,
-				page:1
+				page: 1
 			})
 		} else {
 			this.setState({
 				unlimited: 0,
 				course_groupyslsthree: undefined,
-				page:1,
+				page: 1,
 			})
 		}
 		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
@@ -2207,13 +2380,13 @@ class Studentshavecompletedthelist extends Component {
 				unlimiteds: 0,
 				course_groupyslstwo: undefined,
 				loadingstate: true,
-				page:1,
+				page: 1,
 			})
 		} else {
 			this.setState({
 				unlimiteds: 0,
 				course_groupyslstwo: undefined,
-				page:1,
+				page: 1,
 			})
 		}
 
@@ -2228,13 +2401,13 @@ class Studentshavecompletedthelist extends Component {
 					loadingstate: true,
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
-					page:1,
+					page: 1,
 				})
 			}
 
@@ -2268,13 +2441,13 @@ class Studentshavecompletedthelist extends Component {
 					loadingstate: true,
 					course_groupyslstwo: checkedValues,
 					unlimiteds: 1,
-					page:1,
+					page: 1,
 				})
 			} else {
 				this.setState({
 					course_groupyslstwo: checkedValues,
 					unlimiteds: 1,
-					page:1,
+					page: 1,
 				})
 			}
 
@@ -2311,13 +2484,13 @@ class Studentshavecompletedthelist extends Component {
 					unlimited: 0,
 					course_groupyslsthree: undefined,
 					loadingstate: true,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					unlimited: 0,
 					course_groupyslsthree: undefined,
-					page:1
+					page: 1
 				})
 			}
 
@@ -2348,13 +2521,13 @@ class Studentshavecompletedthelist extends Component {
 					unlimited: 1,
 					loadingstate: true,
 					course_groupyslsthree: checkedValues,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					unlimited: 1,
 					course_groupyslsthree: checkedValues,
-					page:1
+					page: 1
 				})
 			}
 
@@ -2370,14 +2543,14 @@ class Studentshavecompletedthelist extends Component {
 				checkedValuesineinfo: undefined,
 				course_groupysls: undefined,
 				loadingstate: true,
-				page:1,
+				page: 1,
 			})
 		} else {
 			this.setState({
 				unlimitedtwo: 0,
 				checkedValuesineinfo: undefined,
 				course_groupysls: undefined,
-				page:1,
+				page: 1,
 			})
 		}
 
@@ -2393,13 +2566,13 @@ class Studentshavecompletedthelist extends Component {
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
 					loadingstate: true,
-					page:1,
+					page: 1,
 				})
 			} else {
 				this.setState({
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
-					page:1,
+					page: 1,
 				})
 			}
 
@@ -2431,14 +2604,14 @@ class Studentshavecompletedthelist extends Component {
 					course_groupysls: checkedValues,
 					unlimitedtwo: 1,
 					loadingstate: true,
-					page:1
+					page: 1
 				})
 			} else {
 				this.setState({
 					checkedValuesineinfo: checkedValues,
 					course_groupysls: checkedValues,
 					unlimitedtwo: 1,
-					page:1
+					page: 1
 				})
 
 			}
@@ -2460,7 +2633,7 @@ class Studentshavecompletedthelist extends Component {
 			if (this.state.loadingstate === false) {
 				this.setState({
 					loadingstate: true,
-					page:1
+					page: 1
 				})
 			}
 
@@ -2477,7 +2650,7 @@ class Studentshavecompletedthelist extends Component {
 		if (this.state.loadingstate === false) {
 			this.setState({
 				loadingstate: true,
-				page:1,
+				page: 1,
 			})
 		}
 
@@ -2487,14 +2660,15 @@ class Studentshavecompletedthelist extends Component {
 
 
 	};
+
 	_getRequestParams() {
-		const { order, checkedValuesineinfo,course_groupyslstwo ,searchtext, page ,limit,course_groupyslsthree} = this.state
+		const {order, checkedValuesineinfo, course_groupyslstwo, searchtext, page, limit, course_groupyslsthree} = this.state
 		return {
 			page,
-			review:course_groupyslsthree,
-			commit_status:course_groupyslstwo,
-			search:searchtext,
-			exercise_group_id:checkedValuesineinfo,
+			review: course_groupyslsthree,
+			commit_status: course_groupyslstwo,
+			search: searchtext,
+			exercise_group_id: checkedValuesineinfo,
 			limit: limit,
 			order,
 		}
@@ -2694,14 +2868,13 @@ class Studentshavecompletedthelist extends Component {
 	Adjustment = (e) => {
 		// console.log("Adjustment");
 		// console.log(e);
-		if(this.state.objective_score===0&&this.state.subjective_score===0){
+		if (this.state.objective_score === 0 && this.state.subjective_score === 0) {
 			this.props.showNotification('试卷题型分被限制为0分，不能调分，请点击编辑试卷修改题型分数');
 
 			return
 		}
 
 
-
 		this.setState({
 			testpapergradingboll: true,
 			exeuserid: e,
@@ -2743,7 +2916,6 @@ class Studentshavecompletedthelist extends Component {
 	}
 
 
-
 	render() {
 		const isAdmin = this.props.isAdmin();
 
@@ -2767,7 +2939,7 @@ class Studentshavecompletedthelist extends Component {
 					}}>
 						{/*老师*/}
 						{
-							this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status===0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status===1 ?
+							this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?
 								<div className="edu-back-white">
 									<NoneData></NoneData>
 								</div>
@@ -2787,7 +2959,7 @@ class Studentshavecompletedthelist extends Component {
 											Saves={(value, num) => this.Testpapergrading(value, num)}
 										/> : ""
 									}
-									<div className="edu-back-white" >
+									<div className="edu-back-white">
 										<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
 
 											{/*你的评阅：*/}
@@ -2988,7 +3160,7 @@ class Studentshavecompletedthelist extends Component {
 							<div className=" clearfix "
 									 style={{"margin": "0 auto", "padding-bottom": "100px", minWidth: " 1200px"}}>
 								{
-									this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 1 ?
+									this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?
 										<div className="edu-back-white">
 											<NoneData></NoneData>
 										</div>
@@ -3075,7 +3247,7 @@ class Studentshavecompletedthelist extends Component {
 								minWidth: " 1200px"
 							}}>
 								{
-									this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 1 ?
+									this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?
 										<div className="edu-back-white">
 											<NoneData></NoneData>
 										</div>

From 8f67f721e7e6ef9c1c8b116de7f7b9b4f73db1aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 24 Mar 2020 17:38:33 +0800
Subject: [PATCH 10/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/Video/LiveItem.js   | 12 ++++++------
 .../courses/exercise/Studentshavecompletedthelist.js |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/Video/LiveItem.js b/public/react/src/modules/courses/Video/LiveItem.js
index b54b0f03d..c0cef91c4 100644
--- a/public/react/src/modules/courses/Video/LiveItem.js
+++ b/public/react/src/modules/courses/Video/LiveItem.js
@@ -24,7 +24,7 @@ class LiveItem extends Component{
       visible:false
     }
   }
-  
+
   deleteLive=(id)=>{
     this.props.confirm({
       content: '是否确认删除?',
@@ -136,7 +136,7 @@ class LiveItem extends Component{
                 item.url ?
                 <React.Fragment>
                   {
-                    wei_flag ? 
+                    wei_flag ?
                       <a className="btns going" onClick={this.alertInfo}>进入</a>
                     :
                       <a className="btns going" target="_blank" href={`${item.url}`}>进入</a>
@@ -154,17 +154,17 @@ class LiveItem extends Component{
           <span className="lineMiddle color-grey-9">
             <img alt={`${item.author_name}`} className="liveAuthor" src={getImageUrl(`images/${item.author_img}`)}/>
             <label className="mr50">{item.author_name}</label>
-            { item.platform && <span className="mr50">直播平台：{item.platform}</span>   }      
-            { item.live_time && <span className="mr50">开播时间：{item.live_time}</span>}   
+            { item.platform && <span className="mr50">直播平台：{item.platform}</span>   }
+            { item.live_time && <span className="mr50">开播时间：{item.live_time}</span>}
             { item.duration && <span className="mr50">直播预计时长：{item.duration}分钟</span> }
           </span>
-          <span className="edu-txt-right" style={{width:"80px"}}>
+          <span className="edu-txt-right" style={{width:"120px"}}>
             {
               item.op_auth ?
               <WordsBtn style="grey" onClick={()=>setLiveId(item.id)}>编辑</WordsBtn>:""
             }
             {
-              item.delete_auth ? 
+              item.delete_auth ?
               <WordsBtn style="grey" className="ml30" onClick={()=>this.deleteLive(item.id)}>删除</WordsBtn>
               :""
             }
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 5d3579238..b3f126e9f 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -35,7 +35,6 @@ let mysubjective_score = 0;//主观题得分
 let myobjective_score = 0;//客观题得分
 
 class Studentshavecompletedthelist extends Component {
-	// http://localhost:3007/courses/1309/exercises/722/exercises/student_exercise_list?debug=s
 	constructor(props) {
 		super(props);
 		this.state = {

From 00fb3eb6e12f893b124a1209868ded78c2f119b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 24 Mar 2020 18:08:54 +0800
Subject: [PATCH 11/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/shixunHomework/ShixunhomeWorkItem.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 70e561c73..f43a37e90 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -305,7 +305,7 @@ class ShixunhomeWorkItem extends Component{
           <div className="clearfix ds pr contentSection" >
 						<style>{`
             .maxwidth333{
-                max-width: 333px;
+                max-width: 300px;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 white-space: nowrap;

From 5e7dbb0cfc924825d375cb21ee75f2ea9f55ae12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 24 Mar 2020 18:56:48 +0800
Subject: [PATCH 12/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                      |  2 +-
 .../modules/courses/coursesDetail/CoursesBanner.js | 14 +++++++-------
 .../courses/shixunHomework/shixunHomework.js       |  2 +-
 .../shixunreport/OfficialAcademicTranscript.js     |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index afed0fa9d..c630abf7e 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -46,7 +46,7 @@ debugType = "admin";
 // 老师
 // debugType="teacher";
 // 学生
-//  debugType="student";
+//debugType="student";
 
 
 
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index a6e22f080..5ef7173ee 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -404,7 +404,7 @@ class CoursesBanner extends Component {
     exitclass=()=>{
       this.setState({
         modalsType: true,
-        modalsTopval: "退出后您将不再是本课题的成员,作品将全部被删除，",
+        modalsTopval: "退出后您将不再是本课堂的成员，作品将全部被删除，",
         modalsBottomval:"确定要退出该课堂吗？",
         metype:6
       })
@@ -620,13 +620,13 @@ class CoursesBanner extends Component {
                   </div>
 
                   <div className="clearfix ">
-                    <div className="fl fl mr40 mb20" >
+                    <div className="fl fl mr40" >
                       <div className="task-hide" style={{height:25,marginBottom:10,marginLeft:60}}>
                               {coursedata.teacher_users.length===0?'':
                                <span className="color-white" >协作老师：
                                 {coursedata.teacher_users.map((iem,idx)=>{
                                   return(
-                                    <span className="task-hide" style={{width:50,marginLeft:5}}>{idx<3?iem:''}  {coursedata.teacher_users.length>3&&idx===2?'...':''} </span> 
+                                    <span className="task-hide" style={{width:50,marginLeft:5}}>{idx<3?iem:''}  {coursedata.teacher_users.length>3&&idx===2?'...':''} </span>
                                   )
                                 })
                                 }
@@ -635,7 +635,7 @@ class CoursesBanner extends Component {
                         </div>
 
                     </div>
-                   
+
 
                     {/*{excellent===false?*/}
                     {/*  :*/}
@@ -765,12 +765,12 @@ background:rgba(204,204,204,0.2) !important;
 														placement="topLeft"
 																		 title={<pre className="antsoancss">
 																			 {coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?
-																				 <span >您有{coursedata.teacher_applies_count}条新的加入申请
-																					 <a className={"daishenp"} onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
+																				 <span>新收到{coursedata.teacher_applies_count}条加入课堂的申请
+																					 <a className={"daishenp ml5"} onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
 																			 <span style={{
 																			 	color:"#FFA804"
 																			 }}>
-																			 待审批
+																			 去审批
 																		 </span></a></span>:""}</pre>}>
 																<span className="color-grey-c font-16" onClick={excellent === true && this.props.isAdminOrStudent() === false ?"":()=>this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers")}>
 																	<span className={"mr10"}>教师</span>
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index cb0d40c32..f9d059669 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -1188,7 +1188,7 @@ class ShixunHomework extends Component{
 								</span>}
 							</span>
               <li className="fr">
-								{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdminOrCreator()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
+								{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
 									<span>
                     <WordsBtn style="blue" className={"mr30 font-16"}>
 											<Link className="color4CACFF" to={`/classrooms/${this.props.match.params.coursesId}/ordering/shixun_homework/${main_id&&main_id}`}>调整排序</Link>
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
index 2d0f61a0e..0cfb3381a 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/OfficialAcademicTranscript.js
@@ -308,7 +308,7 @@ class OfficialAcademicTranscript extends Component {
 					      overflow: hidden;
 								text-overflow: ellipsis;
 								white-space: nowrap;
-				        max-width: 210px;
+				        max-width: 200px;
 						    text-align: left !important;
 					}
 					.TaskForms{

From 78ab3ab22e8cb97291e992cb02fad3adde8fd657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 24 Mar 2020 18:59:24 +0800
Subject: [PATCH 13/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/shixunHomework/ShixunhomeWorkItem.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index f43a37e90..771c0dda8 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -378,7 +378,7 @@ class ShixunhomeWorkItem extends Component{
                 }
 
 
-                {this.props.isAdminOrCreator()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400  "}>重命名</a>:""}
+                {this.props.isAdmin()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400  "}>重命名</a>:""}
 								{/*<WordsBtn className="btn colorblue ml20 font-16"  to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>*/}
 								<WordsBtn className="btn colorblue  font-16 ml15 fontweight400  "  to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
 							</span>:""}

From 2d0e64997bbbde9cfbc54f49dd71438a59c7c3d5 Mon Sep 17 00:00:00 2001
From: anke1460 <zuosjob@gmail.com>
Date: Tue, 24 Mar 2020 19:11:45 +0800
Subject: [PATCH 14/23] =?UTF-8?q?fix=20=E5=90=8E=E5=8F=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=88=B7=E6=96=B0=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admins/dashboards/index.html.erb | 3 +++
 app/views/layouts/admin.html.erb           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/views/admins/dashboards/index.html.erb b/app/views/admins/dashboards/index.html.erb
index b463e5571..2cd7a583f 100644
--- a/app/views/admins/dashboards/index.html.erb
+++ b/app/views/admins/dashboards/index.html.erb
@@ -2,6 +2,9 @@
   <% add_admin_breadcrumb('概览', admins_path) %>
 <% end %>
 
+<% content_for(:head) do %>
+<meta name="turbolinks-cache-control" content="no-cache">
+<% end %>
 <div class="header bg-gradient-primary pb-8 pt-md-8">
   <div class="container-fluid">
     <div class="header-body">
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index f61aaba4f..fed51db61 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link rel='shortcut icon' type='image/x-icon' href='/favicon.ico' />
-
+    <%= yield :head %>
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 

From 95b340d42c53c98986435843a254d99e24ffe42b Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 19:52:50 +0800
Subject: [PATCH 15/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/exercises_helper.rb                  | 10 ++++++++--
 app/models/exercise.rb                           |  4 ++++
 app/views/exercises/_exercise_user.json.jbuilder |  2 +-
 app/views/exercises/exercise_lists.json.jbuilder |  3 ++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
index b57c8525b..ae41816ba 100644
--- a/app/helpers/exercises_helper.rb
+++ b/app/helpers/exercises_helper.rb
@@ -688,7 +688,7 @@ module ExercisesHelper
   end
 
   #获取用户的相关信息
-  def exercise_use_info(ex_user,user_status,exercise)
+  def exercise_use_info(ex_user,user_status,exercise,subject_question_ids)
     course = exercise.course
     current_user_group_id = ""
     current_user_group_name = ""
@@ -712,7 +712,13 @@ module ExercisesHelper
       course_group = course.course_groups.by_group_ids(current_user_group_id)
       current_user_group_name = course_group.first.name if course_group.present?
     end
-    teacher_review = ex_user.subjective_score < 0.0 ? false : true
+    exercise_answer_ids = ex_user.user.exercise_answers.where(exercise_question_id: subject_question_ids).pluck(:id)
+
+    if ex_user.subjective_score > 0.0 || ex_user.exercise_user_scores.size > 0 || ExerciseAnswerComment.where(exercise_answer_id: exercise_answer_ids).exists?
+      teacher_review = true
+    else
+      teacher_review = false
+    end
     if (user_status == 0 && commit_status == 1) || (user_status == 1 && ex_user_exercise_status == 3 && commit_status == 1)  #老师都可以看，学生，需在试卷已提交，且已截止的情况下看
       ex_object_score = ex_user.objective_score <= 0.0 ? 0 : ex_user.objective_score.round(1).to_s
       ex_subject_score = ex_user.subjective_score < 0.0 ? nil : (ex_user.subjective_score > 0.0 ? ex_user.subjective_score.round(1).to_s : 0)
diff --git a/app/models/exercise.rb b/app/models/exercise.rb
index bf752fb92..5079d0ade 100644
--- a/app/models/exercise.rb
+++ b/app/models/exercise.rb
@@ -38,6 +38,10 @@ class Exercise < ApplicationRecord
   DEADLINE = 3    #已截止
   ENDED = 4      #课堂已结束
 
+  def subject_question_ids
+    exercise_questions.where(question_type: [4]).pluck(:id)
+  end
+
   def question_scores
     exercise_questions.pluck(:question_score).sum
   end
diff --git a/app/views/exercises/_exercise_user.json.jbuilder b/app/views/exercises/_exercise_user.json.jbuilder
index acaa07e98..c4c9e396d 100644
--- a/app/views/exercises/_exercise_user.json.jbuilder
+++ b/app/views/exercises/_exercise_user.json.jbuilder
@@ -1,4 +1,4 @@
-ex_user_info = exercise_use_info(exercise_user,user_status,exercise)
+ex_user_info = exercise_use_info(exercise_user,user_status,exercise,question_ids)
 
 json.user_id ex_user_info[:user_id]
 json.user_name ex_user_info[:user_name]
diff --git a/app/views/exercises/exercise_lists.json.jbuilder b/app/views/exercises/exercise_lists.json.jbuilder
index 5cbb63595..b81516fc5 100644
--- a/app/views/exercises/exercise_lists.json.jbuilder
+++ b/app/views/exercises/exercise_lists.json.jbuilder
@@ -47,7 +47,8 @@ if @exercise_users_list.present?
     json.array! @exercise_users_list.each do |exercise_user|
       json.partial! "exercises/exercise_user",locals: {exercise_user:exercise_user, subjective_type:@subjective_type,
                                                        user_status:@exercise_current_user_status, exercise:@exercise,
-                                                       question_ids: @exercise.exercise_questions.pluck(:id)}
+                                                       question_ids: @exercise.exercise_questions.pluck(:id),
+                                                       subject_question_ids: exercise.subject_question_ids}
     end
   end
 else

From 00ec4950ac45535dd62b5009770ee1498ec1f467 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 19:58:34 +0800
Subject: [PATCH 16/23] =?UTF-8?q?=E8=AF=84=E9=98=85=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercises/exercise_lists.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/exercises/exercise_lists.json.jbuilder b/app/views/exercises/exercise_lists.json.jbuilder
index b81516fc5..87a80f11e 100644
--- a/app/views/exercises/exercise_lists.json.jbuilder
+++ b/app/views/exercises/exercise_lists.json.jbuilder
@@ -48,7 +48,7 @@ if @exercise_users_list.present?
       json.partial! "exercises/exercise_user",locals: {exercise_user:exercise_user, subjective_type:@subjective_type,
                                                        user_status:@exercise_current_user_status, exercise:@exercise,
                                                        question_ids: @exercise.exercise_questions.pluck(:id),
-                                                       subject_question_ids: exercise.subject_question_ids}
+                                                       subject_question_ids: @exercise.subject_question_ids}
     end
   end
 else

From c22eff9d4fe1c9c685151020aa4a207dfd576201 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 20:06:53 +0800
Subject: [PATCH 17/23] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=85=B3=E5=8D=A1=E5=BE=97=E5=88=86?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E4=B8=80=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_works/shixun_work_report.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/student_works/shixun_work_report.json.jbuilder b/app/views/student_works/shixun_work_report.json.jbuilder
index c6596d1ee..9a3f8c59f 100644
--- a/app/views/student_works/shixun_work_report.json.jbuilder
+++ b/app/views/student_works/shixun_work_report.json.jbuilder
@@ -39,7 +39,7 @@ if @shixun
       json.challenge_id challenge.id
       challenge_score = @homework.challenge_score challenge.id
       json.game_score_full challenge_score
-      json.game_score @work.work_challenge_score game, challenge_score, challenge.id
+      json.game_score number_with_precision (@work.work_challenge_score game, challenge_score, challenge.id), precision: 1
       challenge_comment = @work.shixun_work_comments.find_by(challenge_id: challenge.id)
       json.challenge_comment challenge_comment&.comment
       json.challenge_comment_hidden @user_course_identity < Course::STUDENT ? challenge_comment&.hidden_comment : nil

From 27bf9b3fd34c56396cc16d73bbbee96e466d005f Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 20:10:26 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A--?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=92=E5=BA=8F=E3=80=81=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb          | 6 +++---
 app/controllers/homework_commons_controller.rb | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index c514bc0ff..bdf3b4b19 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -40,11 +40,11 @@ class CoursesController < ApplicationController
                                          :add_teacher, :export_couser_info, :export_member_act_score,
                                          :update_informs, :new_informs, :delete_informs, :switch_to_student, :move_to_category]
   before_action :admin_allowed, only: [:set_invite_code_halt, :set_public_or_private, :change_course_admin,
-                                       :set_course_group, :create_group_by_importing_file,
-                                       :update_task_position, :tasks_list]
+                                       :set_course_group, :create_group_by_importing_file]
   before_action :teacher_or_admin_allowed, only: [:graduation_group_list, :create_graduation_group, :join_graduation_group,
                                                   :change_course_teacher, :course_group_list, :change_member_role,:inform_up, :inform_down,
-                                                  :teacher_application_review, :apply_teachers, :delete_course_teacher]
+                                                  :teacher_application_review, :apply_teachers, :delete_course_teacher,
+                                                  :update_task_position, :tasks_list]
   before_action :validate_course_name, only: [:create, :update]
   before_action :find_board, only: :board_list
   before_action :validate_page_size, only: :mine
diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index e5df1f6ad..c923e0a0c 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -19,10 +19,10 @@ class HomeworkCommonsController < ApplicationController
                                          :publish_homework, :end_homework, :set_public, :choose_category, :move_to_category,
                                          :choose_category, :create_subject_homework, :multi_destroy, :group_list, :homework_code_repeat,
                                          :code_review_results, :code_review_detail, :update_explanation, :update_settings,
-                                         :add_to_homework_bank, :publish_groups, :end_groups, :batch_comment]
+                                         :add_to_homework_bank, :publish_groups, :end_groups, :batch_comment, :alter_name]
   before_action :require_id_params, only: [:set_public, :multi_destroy, :publish_homework, :end_homework, :move_to_category,
                                            :add_to_homework_bank]
-  before_action :course_manager, only: [:alter_name]
+  # before_action :course_manager, only: [:alter_name]
 
   def index
     tip_exception("type参数有误") if params[:type] && ![1, 3, 4].include?(params[:type].to_i)

From 94c36b0bb5f47eb399b79c433ce42784739c077f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 24 Mar 2020 20:16:48 +0800
Subject: [PATCH 19/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/coursesDetail/CoursesBanner.js | 2 +-
 .../src/modules/courses/shixunHomework/ShixunhomeWorkItem.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index 5ef7173ee..f6c707d94 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -620,7 +620,7 @@ class CoursesBanner extends Component {
                   </div>
 
                   <div className="clearfix ">
-                    <div className="fl fl mr40" >
+                    <div className="fl fl mr40 mb20" >
                       <div className="task-hide" style={{height:25,marginBottom:10,marginLeft:60}}>
                               {coursedata.teacher_users.length===0?'':
                                <span className="color-white" >协作老师：
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 771c0dda8..45c9e8963 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -378,7 +378,7 @@ class ShixunhomeWorkItem extends Component{
                 }
 
 
-                {this.props.isAdmin()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400  "}>重命名</a>:""}
+                {this.props.isAdmin?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"ml20 btn colorblue font-16 fontweight400  "}>重命名</a>:""}
 								{/*<WordsBtn className="btn colorblue ml20 font-16"  to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>*/}
 								<WordsBtn className="btn colorblue  font-16 ml15 fontweight400  "  to={`/classrooms/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
 							</span>:""}

From 25f56e5aa0d8c87ea7d910b8b7cb6109110eae05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 24 Mar 2020 20:22:51 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exercise/Studentshavecompletedthelist.js  | 69 ++++++++++---------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index b3f126e9f..ab4efaf9b 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -297,16 +297,15 @@ class Studentshavecompletedthelist extends Component {
 								} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
 									{
 										//主观题老师没有评分是
-										parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
+										parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false?
 											<span style={{
 												color: '#DD1717',
 												textAlign: "center",
 												marginLeft: "5px",
 											}}>
 																					(待批阅)
-																					</span> :
-											""
-
+																					</span>
+												:""
 									}
 								</span>
 							}
@@ -371,7 +370,7 @@ class Studentshavecompletedthelist extends Component {
 											<span>主观题得分：{record.subjective_score}分</span>}
 										</div>
 										{
-											parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+											parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
 												<div>
 													<span>待批阅</span>
 												</div>
@@ -397,15 +396,15 @@ class Studentshavecompletedthelist extends Component {
 									textAlign: "center"
 								}}>{record.efficiencyscore}</span>
 										{//只有一个主观题的时候
-											parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
-												<span style={{
+											parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
+													<span style={{
 													color: '#DD1717',
 													textAlign: "center",
 													marginLeft: "5px",
 												}}>
 																					(待批阅)
 																				</span> :
-												""
+													""
 										}
 									</Tooltip>
 							}
@@ -644,16 +643,14 @@ class Studentshavecompletedthelist extends Component {
 								} : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore}
 									{
 										//主观题老师没有评分是
-										parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
+										parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false?
 											<span style={{
 												color: '#DD1717',
 												textAlign: "center",
 												marginLeft: "5px",
 											}}>
 																					(待批阅)
-																					</span> :
-											""
-
+																					</span> :""
 									}
 								</span>
 							}
@@ -720,7 +717,7 @@ class Studentshavecompletedthelist extends Component {
 												<span>主观题得分：{record.subjective_score}分</span>}
 											</div>
 											{
-												parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+												parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
 													<div>
 														<span>待批阅</span>
 													</div>
@@ -750,15 +747,15 @@ class Studentshavecompletedthelist extends Component {
 										width: "199px"
 									}}>{record.efficiencyscore}</span>
 											{//只有一个主观题的时候
-												parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
-													<span style={{
+												parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
+														<span style={{
 														color: '#DD1717',
 														textAlign: "center",
 														marginLeft: "5px",
 													}}>
 																					(待批阅)
 																				</span> :
-													""
+														""
 											}
 										</Tooltip>
 							}
@@ -980,7 +977,7 @@ class Studentshavecompletedthelist extends Component {
 											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
 												{
 													//主观题老师没有评分是
-													parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
+													parseInt(record.levelscore) === 0 && myssubjective === 1 &&record.review_status===false?
 														<span style={{
 															color: '#DD1717',
 															textAlign: "center",
@@ -989,7 +986,6 @@ class Studentshavecompletedthelist extends Component {
 																					(待批阅)
 																					</span> :
 														""
-
 												}
 											</span>
 									}
@@ -1051,7 +1047,7 @@ class Studentshavecompletedthelist extends Component {
 																			<span>主观题得分：{record.subjective_score}分</span>}
 																		</div>
 																		{
-																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0  &&record.review_status===false?
 																				<div>
 																					<span>待批阅</span>
 																				</div>
@@ -1077,8 +1073,8 @@ class Studentshavecompletedthelist extends Component {
 																	textAlign: "center",
 																}}>{record.efficiencyscore}</span>
 																		{//只有一个主观题的时候
-																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
-																				<span style={{
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 &&record.review_status===false?
+																					<span style={{
 																					color: '#DD1717',
 																					textAlign: "center",
 																					marginLeft: "5px",
@@ -1288,8 +1284,8 @@ class Studentshavecompletedthelist extends Component {
 											} : {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
 												{
 													//主观题老师没有评分是
-													parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ?
-														<span style={{
+													parseInt(record.levelscore) === 0 && myssubjective === 1&&record.review_status===false?
+															<span style={{
 															color: '#DD1717',
 															textAlign: "center",
 															marginLeft: "5px",
@@ -1297,7 +1293,6 @@ class Studentshavecompletedthelist extends Component {
 																					(待批阅)
 																					</span> :
 														""
-
 												}
 
 											</span>
@@ -1361,8 +1356,8 @@ class Studentshavecompletedthelist extends Component {
 																			<span>主观题得分：{record.subjective_score}分</span>}
 																		</div>
 																		{
-																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
-																				<div>
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0&&	record.review_status===false?
+																					<div>
 																					<span>待批阅</span>
 																				</div>
 																				:
@@ -1392,7 +1387,7 @@ class Studentshavecompletedthelist extends Component {
 																	textAlign: "center",
 																}}>{parseInt(record.efficiencyscore) === 0 ? 0 : record.efficiencyscore}</span>
 																		{//只有一个主观题的时候
-																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ?
+																			parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && record.review_status===false?
 																				<span style={{
 																					color: '#DD1717',
 																					textAlign: "center",
@@ -1759,7 +1754,8 @@ class Studentshavecompletedthelist extends Component {
 						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						operating: exercise_users[i].has_comment === true ? "已评阅" : "评阅",
 						commit_method: exercise_users[i].commit_method,
-						has_comment: exercise_users[i].has_comment
+						has_comment: exercise_users[i].has_comment,
+						review_status: exercise_users[i].review_status,
 					})
 				} else {
 					datalist.push({
@@ -1778,7 +1774,9 @@ class Studentshavecompletedthelist extends Component {
 						subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 						operating: exercise_users[i].has_comment === true ? "已评阅" : "--",
 						commit_method: exercise_users[i].commit_method,
-						has_comment: exercise_users[i].has_comment
+						has_comment: exercise_users[i].has_comment,
+						review_status: exercise_users[i].review_status,
+
 					})
 
 				}
@@ -1808,7 +1806,7 @@ class Studentshavecompletedthelist extends Component {
 				completion: current_answer_user.objective_score === undefined ? "--" : current_answer_user.objective_score === null ? "--" : current_answer_user.objective_score === "" ? "--" : current_answer_user.objective_score,
 				levelscore: current_answer_user.subjective_score === undefined ? "--" : current_answer_user.subjective_score === null ? "--" : current_answer_user.subjective_score === "" ? "--" : current_answer_user.subjective_score,
 				score_open: exercise_types.score_open,
-				commit_method: current_answer_user.commit_method
+				commit_method: current_answer_user.commit_method,
 
 			})
 
@@ -1850,7 +1848,9 @@ class Studentshavecompletedthelist extends Component {
 					subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score,
 					operating: exercise_users[i].has_comment === true ? "已评阅" : "查看",
 					commit_method: exercise_users[i].commit_method,
-					has_comment: exercise_users[i].has_comment
+					has_comment: exercise_users[i].has_comment,
+					review_status: exercise_users[i].review_status,
+
 				})
 				noclassroom = exercise_users[i].user_group_name;
 			}
@@ -2003,7 +2003,9 @@ class Studentshavecompletedthelist extends Component {
 						finalscore: exercise_users[i].has_comment === true ? "已评阅" : "评阅",
 						user_id: exercise_users[i].user_id,
 						commit_method: exercise_users[i].commit_method,
-						has_comment: exercise_users[i].has_comment
+						has_comment: exercise_users[i].has_comment,
+						review_status: exercise_users[i].review_status,
+
 					})
 				} else {
 					datalist.push({
@@ -2023,7 +2025,8 @@ class Studentshavecompletedthelist extends Component {
 						finalscore: exercise_users[i].has_comment === true ? "已评阅" : "--",
 						user_id: exercise_users[i].user_id,
 						commit_method: exercise_users[i].commit_method,
-						has_comment: exercise_users[i].has_comment
+						has_comment: exercise_users[i].has_comment,
+						review_status: exercise_users[i].review_status,
 					})
 					indexi++;
 				}

From 6b4c16c6230edbaf7c4a838d071f4f2863d5219a Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 20:33:50 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A--?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=92=E5=BA=8F=E3=80=81=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index bdf3b4b19..6f2a66631 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -38,13 +38,13 @@ class CoursesController < ApplicationController
                                          :transfer_to_course_group, :delete_from_course, :export_member_scores_excel,
                                          :search_users, :add_students_by_search, :get_historical_courses, :add_teacher_popup,
                                          :add_teacher, :export_couser_info, :export_member_act_score,
-                                         :update_informs, :new_informs, :delete_informs, :switch_to_student, :move_to_category]
+                                         :update_informs, :new_informs, :delete_informs, :switch_to_student, :move_to_category,
+                                         :update_task_position, :tasks_list]
   before_action :admin_allowed, only: [:set_invite_code_halt, :set_public_or_private, :change_course_admin,
                                        :set_course_group, :create_group_by_importing_file]
   before_action :teacher_or_admin_allowed, only: [:graduation_group_list, :create_graduation_group, :join_graduation_group,
                                                   :change_course_teacher, :course_group_list, :change_member_role,:inform_up, :inform_down,
-                                                  :teacher_application_review, :apply_teachers, :delete_course_teacher,
-                                                  :update_task_position, :tasks_list]
+                                                  :teacher_application_review, :apply_teachers, :delete_course_teacher]
   before_action :validate_course_name, only: [:create, :update]
   before_action :find_board, only: :board_list
   before_action :validate_page_size, only: :mine

From cd69eaeaafb81aab9862a15f0c9bacf4c05a4570 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 21:46:55 +0800
Subject: [PATCH 22/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/exercises_helper.rb                  | 4 ++--
 app/views/exercises/exercise_lists.json.jbuilder | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
index ae41816ba..01b0bab61 100644
--- a/app/helpers/exercises_helper.rb
+++ b/app/helpers/exercises_helper.rb
@@ -712,9 +712,9 @@ module ExercisesHelper
       course_group = course.course_groups.by_group_ids(current_user_group_id)
       current_user_group_name = course_group.first.name if course_group.present?
     end
-    exercise_answer_ids = ex_user.user.exercise_answers.where(exercise_question_id: subject_question_ids).pluck(:id)
 
-    if ex_user.subjective_score > 0.0 || ex_user.exercise_user_scores.size > 0 || ExerciseAnswerComment.where(exercise_answer_id: exercise_answer_ids).exists?
+    if ex_user.subjective_score > 0.0 || ex_user.exercise_user_scores.size > 0 ||
+      ExerciseAnswerComment.where(exercise_answer_id: ex_user.user.exercise_answers.where(exercise_question_id: subject_question_ids)).exists?
       teacher_review = true
     else
       teacher_review = false
diff --git a/app/views/exercises/exercise_lists.json.jbuilder b/app/views/exercises/exercise_lists.json.jbuilder
index 87a80f11e..a5ad1f340 100644
--- a/app/views/exercises/exercise_lists.json.jbuilder
+++ b/app/views/exercises/exercise_lists.json.jbuilder
@@ -38,7 +38,8 @@ if @current_user_ex_answers.present?
   json.current_answer_user do
     json.partial! "exercises/exercise_user",locals: {exercise_user:@current_user_ex_answers.first, subjective_type:@subjective_type,
                                                      user_status:@exercise_current_user_status, exercise:@exercise,
-                                                     question_ids: @exercise.exercise_questions.pluck(:id)}
+                                                     question_ids: @exercise.exercise_questions.pluck(:id),
+                                                     subject_question_ids: @exercise.subject_question_ids}
   end
 end
 

From d06ce47942b39bdc98e3580e62862a837d7e519e Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 21:59:39 +0800
Subject: [PATCH 23/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercises/_exercise_user.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/exercises/_exercise_user.json.jbuilder b/app/views/exercises/_exercise_user.json.jbuilder
index c4c9e396d..4e567bdc3 100644
--- a/app/views/exercises/_exercise_user.json.jbuilder
+++ b/app/views/exercises/_exercise_user.json.jbuilder
@@ -1,4 +1,4 @@
-ex_user_info = exercise_use_info(exercise_user,user_status,exercise,question_ids)
+ex_user_info = exercise_use_info(exercise_user,user_status,exercise,subject_question_ids)
 
 json.user_id ex_user_info[:user_id]
 json.user_name ex_user_info[:user_name]