Merge branch 'dev_aliyun' into dev_cxt

app/controllers/student_works_controller.rb

@@ -559,6 +559,7 @@ class StudentWorksController < ApplicationController
         if @work.work_status == 0
           @work.work_status = 1
           @work.commit_time = Time.now
+          @work.compelete_status = 1 if @homework.homework_type == "practice"
           # 分组作业更新分组id
           @work.group_id = @homework.max_group_id if @homework.homework_type == "group"
         end

app/views/homework_commons/works_list.json.jbuilder

@@ -43,7 +43,7 @@ elsif @user_course_identity == Course::STUDENT
     json.eff_score work_score_format(@work.eff_score, true, @score_open)
     json.current_complete_count @work.myshixun.try(:passed_count) if @homework.end_or_late
     json.complete_count @work.myshixun&.time_passed_count(@homework.homework_group_setting(@work.user_id)&.end_time)
-    json.view_answer_count @work.myshixun.try(:view_answer_count)
+    json.view_answer_count @work.myshixun.try(:view_answer_count).to_i
     json.work_status @work.compelete_status
   else
     json.(@work, :id, :work_status, :update_time, :ultimate_score)
@@ -100,7 +100,7 @@ if @homework.homework_type == "practice"
     json.cost_time work.myshixun.try(:total_spend_time)
     json.current_complete_count work.myshixun.try(:passed_count) if @homework.end_or_late
     json.complete_count work.myshixun&.time_passed_count(@homework.homework_group_setting(work.user_id)&.end_time)
-    json.view_answer_count work.myshixun.try(:view_answer_count)
+    json.view_answer_count work.myshixun.try(:view_answer_count).to_i
     json.user_login work.user.try(:login)
     json.user_name work.user.try(:real_name)
     json.student_id work.user.try(:student_id)

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -217,7 +217,7 @@ class Listofworksstudentone extends Component {
 										:
 										<a
 											title={record.stduynumber}
-											className="maxnamewidth145"
+											className="maxnamewidth120"
 											style={{
 												color: '#000',
 												textAlign: "center",
@@ -235,36 +235,36 @@ class Listofworksstudentone extends Component {
 					key: 'classroom',
 					dataIndex: 'classroom',
 					align: "center",
-					className: 'font-14 maxnamewidth145',
-					width: '145px',
+					className: 'font-14 maxnamewidth120',
+					width: '120px',
 					render: (text, record) => (
-						<span className="font-14 maxnamewidth145" style={{width: '145px'}}>
+						<span className="font-14 maxnamewidth120" style={{width: '120px'}}>
         {record.classroom === undefined ?
-					<a className=" font-14 maxnamewidth145"
+					<a className=" font-14 maxnamewidth120"
 						 style={{
 							 color: '#9A9A9A',
 							 textAlign: "center",
-							 width: '145px',
+							 width: '120px',
 						 }}>--</a> : record.classroom === "" ?
-						<a className=" font-14 maxnamewidth145"
+						<a className=" font-14 maxnamewidth120"
 							 style={{
 								 color: '#9A9A9A',
 								 textAlign: "center",
-								 width: '145px',
+								 width: '120px',
 							 }}>--</a> : record.classroom === null ?
-							<a className=" font-14 maxnamewidth145"
+							<a className=" font-14 maxnamewidth120"
 								 style={{
 									 color: '#9A9A9A',
 									 textAlign: "center",
-									 width: '145px',
+									 width: '120px',
 								 }}>--</a>
 							:
-							<a className=" font-14 maxnamewidth145"
+							<a className=" font-14 maxnamewidth120"
 								 title={record.classroom}
 								 style={{
 									 color: '#9A9A9A',
 									 textAlign: "center",
-									 width: '145px',
+									 width: '120px',
 								 }}>{record.classroom}</a>
 				}
         </span>
@@ -492,8 +492,9 @@ class Listofworksstudentone extends Component {
 					key: 'operating',
 					align: "center",
 					className: 'font-14',
+					width: '40px',
 					render: (text, record) => (
-						<span>
+						<span style={{width: '40px'}}>
                         {
 													record.submitstate === "未提交" ? <span style={{color: '#9A9A9A'}}>--</span>
 														:

public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js

@@ -232,11 +232,9 @@ class ShixunHomeworkPage extends Component {
 								typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
 							/>
 							<a className="color-grey-9 fr font-16  summaryname  ml20 mr20" onClick={()=>this.gotohome()}>返回</a>
-							{teacherdatapage&&teacherdatapage.shixun_status>1?this.props.isAdmin()?<a className="color-grey-9 fr font-16 mr20"
-								 href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
-								 target={"_blank"}>实训详情</a>: this.props.isStudent()?teacherdatapage&&teacherdatapage.time_status<5?<a className="color-grey-9 fr font-16 mr20"
-								 href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
-								 target={"_blank"}>实训详情</a>:"":"":""}
+							{teacherdatapage&&teacherdatapage.shixun_status>1?<a className="color-grey-9 fr font-16 mr20"
+																																	 href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
+																																	 target={"_blank"}>实训详情</a>:""}
 
 
 						</div>