diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index 2539403af..08d0da42f 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -46,8 +46,8 @@ class PollsController < ApplicationController
@polls = member_show_polls.size > 0 ? member_show_polls.public_or_unset : []
else #已分班级的成员，可以查看统一设置和单独设置（试卷是发布在该班级）试卷
# 已发布 当前用户班级分组的 试卷id
- not_poll_ids = @course.poll_group_settings.poll_group_not_published.where("course_group_id = #{@member_group_id}").pluck(:poll_id)
- @polls = member_show_polls.where.not(id: not_poll_ids)
+ publish_poll_ids = @course.poll_group_settings.poll_group_published.where("course_group_id = #{@member_group_id}").pluck(:poll_id)
+ @polls = member_show_polls.unified_setting.or(member_show_polls.where(id: publish_poll_ids))
end
else #用户未登陆或不是该课堂成员,仅显示统一设置的（已发布的/已截止的），如有公开，则不显示锁，不公开，则显示锁
@is_teacher_or = 0
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 0ea76a8a3..365e46008 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -19,6 +19,7 @@ class Poll < ApplicationRecord
scope :poll_by_ids, lambda { |ids| where(id: ids) unless ids.blank? }
scope :poll_by_status, lambda { |s| where(polls_status: s) unless s.blank? }
scope :poll_group_ended, -> {where("end_time is NOT NULL AND end_time <= ?",Time.now)}
+ scope :unified_setting, -> { where("unified_setting = ?",true) }
scope :poll_search, lambda { |keywords|
where("polls_name LIKE ?", "%#{keywords}%") unless keywords.blank?}
diff --git a/public/react/src/modules/courses/coursesPublic/ApprausePublic.js b/public/react/src/modules/courses/coursesPublic/ApprausePublic.js
new file mode 100644
index 000000000..af5d1acdd
--- /dev/null
+++ b/public/react/src/modules/courses/coursesPublic/ApprausePublic.js
@@ -0,0 +1,167 @@
+import React,{ Component } from "react";
+import { Modal,Checkbox,Upload,Button,Icon,message,Input,Radio} from "antd";
+import { WordNumberTextarea } from 'educoder';
+
+
+class ApprausePublic extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ group_ids:[],
+ fileList:[],
+ Inputsval:undefined,
+ textareavaltype:false,
+ comment:undefined,
+ hidden_comment:undefined
+ }
+ }
+
+ componentDidMount() {
+
+
+ }
+
+ comment=(e)=>{
+ this.setState({
+ comment:e.target.value
+ })
+ this.hideentyps(e.target.value)
+ }
+
+ hideentyps=(value)=>{
+ if(value===undefined||value===null||value===""){
+
+ }else{
+ this.setState({
+ textareavaltype:false
+ })
+ }
+ }
+ hidden_comment=(e)=>{
+ this.setState({
+ hidden_comment:e.target.value
+ })
+ this.hideentyps(e.target.value)
+ }
+
+ Saves=()=>{
+ let{comment,hidden_comment}=this.state;
+ let commenttype=comment===undefined||comment===null||comment==="";
+ let hidden_commenttype=hidden_comment===undefined||hidden_comment===null||hidden_comment==="";
+
+ if(commenttype===true&&hidden_commenttype===true){
+ this.setState({
+ textareavaltype:true
+ })
+ return
+ }
+ this.props.SaveAppraiseModal(this.state.comment,this.state.hidden_comment);
+ }
+ render(){
+ let {textareavaltype,comment,hidden_comment}=this.state;
+ return(
+
+
+
+
+
+
+
+
+
+ 可见(学生可查看老师的评阅内容）
+
+ {/*
*/}
+ {/*可见 (学生查看老师的评阅内容）*/}
+ {/*不可见 (仅对课堂老师可见）*/}
+ {/**/}
+
this.comment(e)}
+ value={comment}
+ maxlength={500}
+ />
+
+
+ 不可见(仅对课堂老师可见）
+
+ this.hidden_comment(e)}
+ value={hidden_comment}
+ maxlength={500}
+ />
+
+ 评阅内容至少有一个不为空
+
+
+
+
+
{
@@ -313,10 +360,17 @@ class ShixunHomeworkPage extends Component {
this.homeworkstarts(this.child)}>立即发布
: ""
: ""}
+
{this.props.isAdmin() ?
teacherdatapage && teacherdatapage.code_review === true ?
this.workshowmodels(this.child)}>代码查重
: "" : ""}
+
+ {parseInt(tab) === 0 ?this.props.isAdmin() ?
+ jobsettingsdatapage === undefined ? [""] : jobsettingsdatapage.data.homework_status[0] === "未发布" ? "" :
+ this.Akeyreviewit()}>一键评阅
+ : "":""}
+
{
parseInt(tab)===1?
this.props.isAdmin() ?
diff --git a/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css b/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
index 9a85f33d4..003002749 100644
--- a/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
+++ b/public/react/src/modules/tpm/newshixuns/css/Newshixuns.css
@@ -733,7 +733,7 @@ a.white-btn.use_scope-btn:hover{
backgroud: rgba(234, 234, 234, 1);
width: 530px;
margin-left: 10px;
- margin-top: 25px;
+ margin-top: 5px;
height: 214px !important;
}