From 42163cb3a4c3e3cd489c30b7a9d9077505686582 Mon Sep 17 00:00:00 2001
From: liuzhen <liuzhen@bronet.cn>
Date: Thu, 14 Apr 2022 10:53:48 +0800
Subject: [PATCH] 题卷、测评功能优化
---
application/admin/controller/EvaluationUser.php | 2 +-
application/admin/lang/zh-cn/evaluation.php | 2 +-
application/admin/view/evaluation_user/detail.html | 12 +++++++++---
application/admin/view/que/que/add.html | 12 ++++++------
application/admin/view/que/que/edit.html | 12 ++++++------
application/admin/view/que/que_paper/add.html | 12 ++++++------
application/admin/view/que/que_paper/edit.html | 12 ++++++------
public/assets/js/backend/evaluation.js | 1 +
public/assets/js/backend/que/que.js | 2 +-
public/assets/js/backend/que/que_paper.js | 2 +-
public/assets/js/backend/que/que_paper_subject.js | 15 +++++++++++++++
11 files changed, 53 insertions(+), 31 deletions(-)
diff --git a/application/admin/controller/EvaluationUser.php b/application/admin/controller/EvaluationUser.php
index c719e8e..d7499ac 100644
--- a/application/admin/controller/EvaluationUser.php
+++ b/application/admin/controller/EvaluationUser.php
@@ -95,7 +95,7 @@ class EvaluationUser extends Backend
$v['analysis_text'] = $value['analysis_text'];
$v['analysis_audio'] = $value['analysis_audio'];
/*获取本题答案*/
- $AnswerKey = $value['key'];
+ $AnswerKey = $v['correct_choose'] = $value['key'];
break;
}
}
diff --git a/application/admin/lang/zh-cn/evaluation.php b/application/admin/lang/zh-cn/evaluation.php
index 9eb34f0..b865ee3 100644
--- a/application/admin/lang/zh-cn/evaluation.php
+++ b/application/admin/lang/zh-cn/evaluation.php
@@ -4,7 +4,7 @@ return [
'Id' => 'ID',
'Classroom_id' => '所属班级',
'Time' => '任务日期',
- 'Remark' => '备注',
+ 'Remark' => '任务备注',
'Que_paper_id' => '所属题卷',
'Classroom.title' => '班级名称'
];
diff --git a/application/admin/view/evaluation_user/detail.html b/application/admin/view/evaluation_user/detail.html
index 2792021..c8981dc 100644
--- a/application/admin/view/evaluation_user/detail.html
+++ b/application/admin/view/evaluation_user/detail.html
@@ -2,8 +2,9 @@
<thead>
<tr>
<th>{:__('题目')}</th>
- <th>{:__('文字')}</th>
+<!-- <th>{:__('文字')}</th>-->
<th>{:__('用户所选答案')}</th>
+ <th>{:__('正确答案')}</th>
<th>{:__('答题结果')}</th>
<th>{:__('文字解析')}</th>
<th>{:__('音频解析')}</th>
@@ -13,9 +14,14 @@
{volist name="row.detail.List" id="vo"}
<tr>
<td>{$vo.title}</td>
- <td>{$vo.text}</td>
+<!-- <td>{$vo.text}</td>-->
<td style="word-break: break-all;">{$vo.UserChoose|htmlentities}</td>
- <td style="word-break: break-all;">{$vo.is_true == 1 ? '正确' : '错误'}</td>
+ <td style="word-break: break-all;">{$vo.correct_choose|htmlentities}</td>
+ {eq name="vo.is_true" value="1"}
+ <td style="word-break: break-all;">正确</td>
+ {else/}
+ <td style="word-break: break-all;color:red;">错误</td>
+ {/eq}
<td>{$vo.analysis_text}</td>
<td>{$vo.analysis_audio}</td>
</tr>
diff --git a/application/admin/view/que/que/add.html b/application/admin/view/que/que/add.html
index a708315..75ea5b8 100644
--- a/application/admin/view/que/que/add.html
+++ b/application/admin/view/que/que/add.html
@@ -6,12 +6,12 @@
<input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="">
</div>
</div>
- <div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">
- </div>
- </div>
+<!-- <div class="form-group">-->
+<!-- <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>-->
+<!-- <div class="col-xs-12 col-sm-8">-->
+<!-- <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
diff --git a/application/admin/view/que/que/edit.html b/application/admin/view/que/que/edit.html
index e0c6c67..6205cc5 100644
--- a/application/admin/view/que/que/edit.html
+++ b/application/admin/view/que/que/edit.html
@@ -6,12 +6,12 @@
<input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
</div>
</div>
- <div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
- </div>
- </div>
+<!-- <div class="form-group">-->
+<!-- <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>-->
+<!-- <div class="col-xs-12 col-sm-8">-->
+<!-- <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
diff --git a/application/admin/view/que/que_paper/add.html b/application/admin/view/que/que_paper/add.html
index 386db7e..253712b 100644
--- a/application/admin/view/que/que_paper/add.html
+++ b/application/admin/view/que/que_paper/add.html
@@ -16,12 +16,12 @@
<input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="">
</div>
</div>
- <div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">
- </div>
- </div>
+<!-- <div class="form-group">-->
+<!-- <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>-->
+<!-- <div class="col-xs-12 col-sm-8">-->
+<!-- <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="0">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
diff --git a/application/admin/view/que/que_paper/edit.html b/application/admin/view/que/que_paper/edit.html
index dd56cb3..212d828 100644
--- a/application/admin/view/que/que_paper/edit.html
+++ b/application/admin/view/que/que_paper/edit.html
@@ -16,12 +16,12 @@
<input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
</div>
</div>
- <div class="form-group">
- <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
- <div class="col-xs-12 col-sm-8">
- <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
- </div>
- </div>
+<!-- <div class="form-group">-->
+<!-- <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>-->
+<!-- <div class="col-xs-12 col-sm-8">-->
+<!-- <input id="c-weigh" data-rule="required" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
diff --git a/public/assets/js/backend/evaluation.js b/public/assets/js/backend/evaluation.js
index be946d7..03ad751 100644
--- a/public/assets/js/backend/evaluation.js
+++ b/public/assets/js/backend/evaluation.js
@@ -39,6 +39,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
autocomplete: false,
formatter: Table.api.formatter.datetime2
},
+ {field: 'remark', title: __('Remark')},
{
field: 'operate',
title: __('Operate'),
diff --git a/public/assets/js/backend/que/que.js b/public/assets/js/backend/que/que.js
index 530d0b8..b6debc2 100644
--- a/public/assets/js/backend/que/que.js
+++ b/public/assets/js/backend/que/que.js
@@ -29,7 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'id', title: __('Id')},
{field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE', visible: visible},
{field: 'name', title: __('Name'), operate: 'LIKE'},
- {field: 'weigh', title: __('Weigh'), operate: false},
+ // {field: 'weigh', title: __('Weigh'), operate: false},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
]
diff --git a/public/assets/js/backend/que/que_paper.js b/public/assets/js/backend/que/que_paper.js
index 9b07c34..a8835e2 100644
--- a/public/assets/js/backend/que/que_paper.js
+++ b/public/assets/js/backend/que/que_paper.js
@@ -27,7 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{checkbox: true},
{field: 'id', title: __('Id')},
{field: 'name', title: __('Name'), operate: 'LIKE'},
- {field: 'weigh', title: __('Weigh'), operate: false},
+ // {field: 'weigh', title: __('Weigh'), operate: false},
{field: 'que.name', title: __('Que.name'), operate: 'LIKE'},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
diff --git a/public/assets/js/backend/que/que_paper_subject.js b/public/assets/js/backend/que/que_paper_subject.js
index ae74046..c0bc777 100644
--- a/public/assets/js/backend/que/que_paper_subject.js
+++ b/public/assets/js/backend/que/que_paper_subject.js
@@ -49,6 +49,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
},
api: {
bindevent: function () {
+ //监听上传规格图片
+ $(document).on("click", ".ChooseFile", function () {
+ var self = $(this);
+ console.log(123);
+ parent.Fast.api.open("general/attachment/select", "选择文件", {
+ callback: function (data) {
+ // console.log(data);
+ console.log(data.url);
+ self.val(data.url);
+ // self.hide();
+ // self.next().show();
+ // self.next().find('img').attr('src',data.url);
+ }
+ });
+ });
Form.api.bindevent($("form[role=form]"));
}
}
--
libgit2 0.24.0