Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

lib/tasks/statistic_subject_info.rake

@@ -47,8 +47,7 @@ namespace :subjects do
       subjects = subjects.where(id:ENV['subject_id'])
     end
     subjects.find_in_batches(batch_size: 20) do |s|
-      str = []
-      Parallel.each(s, in_processes: 6) do |subject|
+      Parallel.each_with_index(s, in_processes: 4) do |subject, index, str = []|
         puts("---------------------course_info_statistic: #{subject.id}")
         Rails.logger.info("---------------------course_info_statistic: #{subject.id}")
         data = Subjects::CourseUsedInfoService.call(subject)

public/react/src/modules/courses/Video/LiveItem.js

@@ -11,6 +11,12 @@ function jsCopy(props){
   document.execCommand("Copy");
   props.showNotification("复制成功!");
 }
+const $ = window.$;
+
+function getRight(){
+  var right = parseInt($(".-task-sidebar").css("right"));
+  return right;
+}
 class LiveItem extends Component{
   constructor(props) {
     super(props);
@@ -42,10 +48,10 @@ class LiveItem extends Component{
   }
 
   alertInfo=()=>{
-    console.log("dddd");
     this.setState({
       visible:true
     })
+    getRight();
   }
   onDialogOkBtnClick=()=>{
     this.setState({
@@ -106,7 +112,7 @@ class LiveItem extends Component{
             overflow: hidden!important;
           }
           .-task-sidebar{
-            right:42px!important
+            right:${getRight()+7}px!important;
           }
           `}
           </style>
@@ -150,7 +156,7 @@ class LiveItem extends Component{
             <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.duration && <span className="mr50">直播时长：{item.duration}分钟</span> }
+            { item.duration && <span className="mr50">直播预计时长：{item.duration}分钟</span> }
           </span>
               <span>
                 {

public/react/src/modules/courses/Video/LiveNew.js

@@ -258,7 +258,7 @@ class LiveNew extends Component{
                     onChange={this.onChangeTime}
                   ></DatePicker>
                 </div>
-                <Form.Item label={`直播时长`}>
+                <Form.Item label={`直播预计时长`}>
                   {getFieldDecorator('duration', {
                       rules: [],
                   })(

public/react/src/modules/courses/Video/VideoIndex.js

@@ -14,6 +14,12 @@ import '../css/Courses.css';
 import '../publicNav/nav.css';
 const PAGE_SIZE = 15;
 const LIVE_PAGE_SIZE = 10;
+const $ = window.$;
+
+function getRight(){
+  var right = parseInt($(".-task-sidebar").css("right"));
+  return right;
+}
 class VideoIndex extends Component{
   constructor(props){
     super(props);
@@ -209,14 +215,11 @@ class VideoIndex extends Component{
             overflow: hidden!important;
           }
           .-task-sidebar{
-            right:42px!important
+            right:${getRight()+7}px!important;
           }
           `}</style>:
           <style>{
             `
-            .-task-sidebar{
-              right:35px
-            }
             body{
               width: 100%!important;
             }