From 5b5c3c20c710f149181a735ca70ff3d2f168860e 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, 17 Mar 2020 17:23:29 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../courses/coursesPublic/sendResources.js | 62 ++++++++-----------
1 file changed, 26 insertions(+), 36 deletions(-)
diff --git a/public/react/src/modules/courses/coursesPublic/sendResources.js b/public/react/src/modules/courses/coursesPublic/sendResources.js
index 48c50e8b2..75726a51f 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResources.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResources.js
@@ -213,25 +213,17 @@ class sendResources extends Component{
}
- // console.log("description");
- // console.log(description);
- if(description===undefined||description===null){
- }else {
- if(description.length>100){
-
- this.setState({
- descriptiontype:true
- })
- return
- }
+ if(description===undefined){
+ }else if(description.length>100){
+ this.setState({
+ descriptiontype:true
+ })
+ return
}
-
-
-
if(this.props.Exterchainname==="资源设置"){
//设置
let coursesId=this.props.match.params.coursesId;
@@ -248,17 +240,13 @@ class sendResources extends Component{
description:description,
delay_publish:Radiovalue,
}).then((result)=>{
- if(result){
- if(result.data){
- if(result.data.status===0){
- this.ModalCancelModalCancel();
- this.props.updataleftNavfun();
- this.props.showNotification("设置资源成功");
- this.props.setupdate(1,false)
- }else{
- this.props.showNotification(result.data.message);
- }
- }
+ if(result.data.status===0){
+ this.ModalCancelModalCancel();
+ this.props.updataleftNavfun();
+ this.props.showNotification("设置资源成功");
+ this.props.setupdate(1,false)
+ }else{
+ this.props.showNotification(result.data.message);
}
})
@@ -278,20 +266,22 @@ class sendResources extends Component{
description:description,
delay_publish:Radiovalue,
}).then((result)=>{
- if(result){
- if(result.data){
- if(result.data.status===0){
- this.ModalCancelModalCancel();
- this.props.updataleftNavfun();
- this.props.showNotification("上传资源成功");
- this.props.setupdate(1,false)
- }else{
- this.props.showNotification(result.data.message);
- }
- }
+
+
+ if(result.data.status===0){
+ this.ModalCancelModalCancel();
+ this.props.updataleftNavfun();
+ this.props.showNotification("上传资源成功");
+ this.props.setupdate(1,false)
+ }else{
+ this.props.showNotification(result.data.message);
}
})
+
}
+
+
+
}
settextarea=(e)=>{
From a14c67aab42b87dd831d6af0c742f7d4fc8b1377 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, 17 Mar 2020 17:25:16 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../courses/coursesPublic/sendResources.js | 64 +++++++++++--------
1 file changed, 37 insertions(+), 27 deletions(-)
diff --git a/public/react/src/modules/courses/coursesPublic/sendResources.js b/public/react/src/modules/courses/coursesPublic/sendResources.js
index 75726a51f..50c08bf66 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResources.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResources.js
@@ -213,17 +213,25 @@ class sendResources extends Component{
}
+ // console.log("description");
+ // console.log(description);
+ if(description===undefined||description===null){
- if(description===undefined){
+ }else {
+ if(description.length>100){
+
+ this.setState({
+ descriptiontype:true
+ })
+ return
+ }
- }else if(description.length>100){
- this.setState({
- descriptiontype:true
- })
- return
}
+
+
+
if(this.props.Exterchainname==="资源设置"){
//设置
let coursesId=this.props.match.params.coursesId;
@@ -240,13 +248,17 @@ class sendResources extends Component{
description:description,
delay_publish:Radiovalue,
}).then((result)=>{
- if(result.data.status===0){
- this.ModalCancelModalCancel();
- this.props.updataleftNavfun();
- this.props.showNotification("设置资源成功");
- this.props.setupdate(1,false)
- }else{
- this.props.showNotification(result.data.message);
+ if(result){
+ if(result.data){
+ if(result.data.status===0){
+ this.ModalCancelModalCancel();
+ this.props.updataleftNavfun();
+ this.props.showNotification("设置资源成功");
+ this.props.setupdate(1,false)
+ }else{
+ this.props.showNotification(result.data.message);
+ }
+ }
}
})
@@ -266,22 +278,20 @@ class sendResources extends Component{
description:description,
delay_publish:Radiovalue,
}).then((result)=>{
-
-
- if(result.data.status===0){
- this.ModalCancelModalCancel();
- this.props.updataleftNavfun();
- this.props.showNotification("上传资源成功");
- this.props.setupdate(1,false)
- }else{
- this.props.showNotification(result.data.message);
+ if(result){
+ if(result.data){
+ if(result.data.status===0){
+ this.ModalCancelModalCancel();
+ this.props.updataleftNavfun();
+ this.props.showNotification("上传资源成功");
+ this.props.setupdate(1,false)
+ }else{
+ this.props.showNotification(result.data.message);
+ }
+ }
}
})
-
}
-
-
-
}
settextarea=(e)=>{
@@ -348,7 +358,7 @@ class sendResources extends Component{
}
handleChangess=(e)=>{
- this.setState({
+ this.setState({
resourceurl:e.target.value,
resourceurlbool:false,
})
From fa8a8a4f4cce7ebd2e82426bc39d32c3f76472f3 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, 17 Mar 2020 17:55:10 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/shixunHomework/ShixunWorkReport.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 959ba9244..8834df1af 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -315,7 +315,8 @@ class ShixunWorkReport extends Component {
const antIcon =
;
// let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment===null||work_comment===undefined?false:true:work_comment===null||work_comment===undefined?false:true;
- let showAppraiseModals=work_comment===null||work_comment===undefined?false:true;
+ // let showAppraiseModals=work_comment===null||work_comment===undefined?false:true;
+ // console.log(this.props.isAdmin())
document.title=data&&data.course_name;
return (
@@ -460,13 +461,13 @@ class ShixunWorkReport extends Component {
总体评价
{
- shixun_detail&&shixun_detail.map((item,key)=>{
+ this.props&&this.props.isAdmin()===true?shixun_detail&&shixun_detail.map((item,key)=>{
if(key===0){
return(
查看学员实训
)
}
- })
+ }):""
}
From 0d3210f7546ce6dc98433d4d2d0f52a4adc336de Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 17 Mar 2020 18:33:28 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=9A=84=E4=BA=8C?=
=?UTF-8?q?=E7=BA=A7=E7=9B=AE=E5=BD=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/files_controller.rb | 6 +++---
app/views/files/index.json.jbuilder | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 8e6356201..74f7c074a 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -32,8 +32,7 @@ class FilesController < ApplicationController
end
end
- @attachments = @attachments.includes(author: [:user_extension, :course_members])
- .ordered(sort: sort.to_i, sort_type: sort_type.strip)
+ @attachments = @attachments.ordered(sort: sort.to_i, sort_type: sort_type.strip)
@total_count = @attachments.size
@unlink_count = @attachments.no_link.size
@@ -59,7 +58,8 @@ class FilesController < ApplicationController
@attachments = @attachments.no_link
end
- @attachments = @attachments.page(@page).per(@page_size)
+ @attachments = @attachments.includes(:course_second_category, author: [:user_extension, :course_members])
+ .page(@page).per(@page_size)
end
def bulk_publish
diff --git a/app/views/files/index.json.jbuilder b/app/views/files/index.json.jbuilder
index 07430cd7b..f1b3f26d0 100644
--- a/app/views/files/index.json.jbuilder
+++ b/app/views/files/index.json.jbuilder
@@ -17,7 +17,7 @@ json.data do
end
# json.partial! "files/course_groups", attachment_group_settings: attachment.attachment_group_settings
json.category_id attachment.course_second_category_id
- unless @parent_category_id.present? && @parent_category_id != 0
+ if (@parent_category_id.blank? || @parent_category_id != 0) && attachment.course_second_category&.parent_id.to_i != 0
json.category_name attachment.course_second_category&.name
end
end
From 20e86d67297acc20f59f0dc616297777007b710a Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 17 Mar 2020 18:43:16 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=AD=A6=E9=99=A2?=
=?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=9A=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/student_works_controller.rb | 2 ++
app/views/student_works/shixun_work_report.json.jbuilder | 2 ++
2 files changed, 4 insertions(+)
diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb
index 6c9de071d..8770a6519 100644
--- a/app/controllers/student_works_controller.rb
+++ b/app/controllers/student_works_controller.rb
@@ -477,6 +477,8 @@ class StudentWorksController < ApplicationController
@user_evaluate_count = 0
end
+ @view_tpi = ((@user_course_identity < Course::STUDENT && current_user.is_certification_teacher) || current_user.admin_or_business?) && @work.myshixun.present?
+
# 图形效率图的数据
@echart_data = student_efficiency(@homework, @work) if @work.myshixun
end
diff --git a/app/views/student_works/shixun_work_report.json.jbuilder b/app/views/student_works/shixun_work_report.json.jbuilder
index bd618c2d4..adf0a2ea5 100644
--- a/app/views/student_works/shixun_work_report.json.jbuilder
+++ b/app/views/student_works/shixun_work_report.json.jbuilder
@@ -87,4 +87,6 @@ if @shixun
end
end
+json.view_tpi @view_tpi
+
From 3a9135dca26756797f751ce9e34c90f8274c0c82 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, 17 Mar 2020 18:50:42 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=A6=E7=94=9F?=
=?UTF-8?q?=E8=A7=86=E9=A2=91=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/images/qiandao/studentbz1.png | Bin 0 -> 83045 bytes
public/images/qiandao/studentbz2.png | Bin 0 -> 82888 bytes
public/images/qiandao/studentbz3.png | Bin 0 -> 83882 bytes
.../src/modules/courses/Video/VideoIndex.js | 10 +-
.../videostatistics/Videostatistics.js | 45 ++-
.../component/Studenticscom.js | 108 ++++++
.../component/Studentstatistics.js | 318 ++++++++++++++++++
.../component/Videostatisticscom.js | 4 +-
.../component/Videostatisticslist.js | 10 +-
9 files changed, 480 insertions(+), 15 deletions(-)
create mode 100755 public/images/qiandao/studentbz1.png
create mode 100755 public/images/qiandao/studentbz2.png
create mode 100755 public/images/qiandao/studentbz3.png
create mode 100644 public/react/src/modules/courses/videostatistics/component/Studenticscom.js
create mode 100644 public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
diff --git a/public/images/qiandao/studentbz1.png b/public/images/qiandao/studentbz1.png
new file mode 100755
index 0000000000000000000000000000000000000000..fa66f35dbb7ef3578d77566b1d84303b21ade7c1
GIT binary patch
literal 83045
zcmV)HK)t_-P)