diff --git a/app/models/shixun.rb b/app/models/shixun.rb index 61d15de55..3977e9204 100644 --- a/app/models/shixun.rb +++ b/app/models/shixun.rb @@ -246,6 +246,10 @@ class Shixun < ApplicationRecord Game.joins(:myshixun).where(user_id: user.id, status: 2, myshixuns: { shixun_id: id }).count end + def has_web_route? + self.mirror_name.include?('JFinal') || self.mirror_name.include?('PHP') && self.mirror_name.include?('Mysql') || self.mirror_name.include?('Web') + end + private def send_tiding diff --git a/app/views/challenges/edit.json.jbuilder b/app/views/challenges/edit.json.jbuilder index 2774b5a05..5ae15cf67 100644 --- a/app/views/challenges/edit.json.jbuilder +++ b/app/views/challenges/edit.json.jbuilder @@ -13,6 +13,7 @@ elsif @tab == 1 # 评测设置的编辑模式 json.(@challenge, :id, :path, :exec_path, :show_type, :original_picture_path, :expect_picture_path, :picture_path, :web_route, :test_set_score, :test_set_average) + json.has_web_route @shixun.has_web_route? json.test_sets @challenge.test_sets do |set| json.hidden (set.is_public ? 0 : 1) json.(set, :input, :output, :score) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index f6e7c4532..4ff1580ac 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -85,9 +85,9 @@ function buildColumns(that, student_works) { overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', - width: '98px', + width: '74px', margin: '0 auto' - }} title={text}> + }} title={text && text.length > 5 ? text : ''}> {/* */} {text} @@ -185,7 +185,7 @@ function buildColumns(that, student_works) { )}, }, { - width: 150, + width: 106, title: '更新时间', dataIndex: 'update_time', key: 'update_time', @@ -325,7 +325,7 @@ function buildColumns(that, student_works) { } if (isAdminOrStudent || that.props.work_public == true) { columns.push({ - width: 92, + width: 72, title: '操作', key: 'operation', dataIndex: 'operation', @@ -654,7 +654,7 @@ class CommonWorkList extends Component{ } .workListContent .ant-table-thead > tr > th, .workListContent .ant-table-tbody > tr > td { - padding: 10px 2px; + padding: 10px 1px; } `}