Merge remote-tracking branch 'origin/dev_aliyun' into dev_tj

merge aliyun

app/assets/javascripts/admins/shixun_feedback_messages/index.js

@@ -1,12 +1,14 @@
 $(document).on('turbolinks:load', function(){
     if ($('body.admins-shixun-feedback-messages-index-page').length > 0) {
 
+        $(".content-img img").addClass("w-100").addClass("preview-image");
+
         var baseOptions = {
             autoclose: true,
             language: 'zh-CN',
             format: 'yyyy-mm-dd 00:00:00',
             startDate: '2017-04-01'
-        }
+        };
 
         var defineDateRangeSelect = function(element){
             var options = $.extend({inputs: $(element).find('.start-date, .end-date')}, baseOptions);
@@ -14,9 +16,9 @@ $(document).on('turbolinks:load', function(){
 
             $(element).find('.start-date').datepicker().on('changeDate', function(e){
                 $(element).find('.end-date').datepicker('setStartDate', e.date);
-            })
+            });
         };
 
         defineDateRangeSelect('.grow-date-input-daterange');
     }
-})
+});

app/controllers/polls_controller.rb

@@ -1416,7 +1416,7 @@ class PollsController < ApplicationController
             if user_poll_answer_ids.count >1
               u_answer = answer_content.pluck(:answer_text).join(";")
             else
-              u_answer = answer_content.first.answer_text
+              u_answer = answer_content.first&.answer_text
             end
           elsif user_poll_vote_texts.count > 0
             if user_poll_vote_texts.count > 1

app/views/admins/shixun_feedback_messages/shared/_list.html.erb

@@ -15,7 +15,7 @@
         <td><%= (@params_page.to_i - 1) * 20 + index + 1 %></td>
         <% identifier = Game.find_by(challenge_id: discuss.challenge_id, user_id: discuss.user_id)&.identifier %>
         <td class="text-left"><%= link_to discuss.dis.name, "/tasks/#{identifier}", target: '_blank'%></td>
-        <td class="text-left"><%= content_safe discuss.content %></td>
+        <td class="text-left content-img"><%= content_safe discuss.content %></td>
         <td><%= discuss.user.show_real_name %></td>
         <td><%= format_time discuss.created_at %></td>
       </tr>

public/react/src/modules/courses/elearning/YslDetailCards.js

@@ -48,7 +48,9 @@ class YslDetailCards extends Component{
 	};
 	hideparagraph=()=>{
 		this.setState({
-			showparagraph:false
+			showparagraph:false,
+			showparagraphkey:null,
+			showparagraphindex:null
 		})
 	};
 	startgameid=(id)=>{
@@ -509,6 +511,13 @@ class YslDetailCards extends Component{
 
 																					</li>
 																			}
+																			<li className={showparagraph===false?"fr status_li":"fr status_li"}>
+																				{
+																					showparagraphkey === key && showparagraphindex === index ? "" :
+																						<span className="fr color204">实验任务 <span
+																							className={"color000"}>{line.challenges_count}</span></span>
+																				}
+																			</li>
 																		</div>)
 																})
 															}

public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js

@@ -132,11 +132,7 @@ class ExerciseReviewAndAnswer extends Component{
     //   }
     // },1000)
   }
-  autosetimes=(time)=>{
+
-    this.setState({
-      time:parseInt(time)
-    })
-  }
   //自动交卷
   autoCommitExercise=()=>{
 		let eId=this.props.match.params.Id;
@@ -152,14 +148,18 @@ class ExerciseReviewAndAnswer extends Component{
 						modalsBottomval:"不能再修改答题",
 						ModalCancel:undefined,
 						ModalSave:this.sureCommit,
-						Loadtype:true
+						Loadtype:true,
+            time:null,
 					})
 					this.props.showNotification(`${result.data.message}`);
 				}
 
 				if(result.data.status===-2){
 					 // this.remainTime(parseInt(result.data.message))
-            this.autosetimes(result.data.message)
+          this.setState({
+            time:parseInt(result.data.mess)
+          })
+          this.deadline(parseInt(result.data.message))
 				}
 			}
 		}).catch((error)=>{
@@ -258,6 +258,7 @@ class ExerciseReviewAndAnswer extends Component{
           })
           if(result.data.exercise.left_time != null){
             // this.remainTime(result.data.exercise.left_time);
+            this.deadline(result.data.exercise.left_time)
           }
         }
       }).catch((error)=>{
@@ -586,9 +587,14 @@ class ExerciseReviewAndAnswer extends Component{
 
   deadline=(time)=>{
     if(time===null){
-
+      this.setState({
+        Datetime:0
+      })
     }else{
-      return Date.now() + time * 1000 ;
+      this.setState({
+        Datetime:Date.now() + time * 1000
+      })
+      // return Date.now() + time * 1000 ;
     }
 
   }
@@ -695,7 +701,7 @@ class ExerciseReviewAndAnswer extends Component{
               :
               time && time != 0 ?
                 <div className="fr">
-                  <Countdown value={this.deadline(this.state.time)} onFinish={this.autoCommitExercise} />
+                  <Countdown value={this.state.Datetime} onFinish={this.autoCommitExercise} />
                 </div>
                 :""
             }

public/react/src/modules/paths/ShixunPaths.css

@@ -268,3 +268,7 @@
 .color181818{
     color: #181818;
 }
+
+.colorD5D8D6{
+  color:#D5D8D6;
+}