diff --git a/app/common/service/SubjectHomeworkService.php b/app/common/service/SubjectHomeworkService.php index 797cd95..8f8ed2b 100644 --- a/app/common/service/SubjectHomeworkService.php +++ b/app/common/service/SubjectHomeworkService.php @@ -194,16 +194,31 @@ class SubjectHomeworkService } else { $subject_homework->last_homework_feedback_url = []; } + if ($subject_homework->last_homework_feedback_version_url) { + $subject_homework->last_homework_feedback_version_url = json_decode($subject_homework->last_homework_feedback_version_url, true); + } else { + $subject_homework->last_homework_feedback_version_url = []; + } if ($subject_homework->subject_report_url) { $subject_homework->subject_report_url = json_decode($subject_homework->subject_report_url, true); } else { $subject_homework->subject_report_url = []; } + if ($subject_homework->subject_report_version_url) { + $subject_homework->subject_report_version_url = json_decode($subject_homework->subject_report_version_url, true); + } else { + $subject_homework->subject_report_version_url = []; + } if ($subject_homework->subject_file_url) { $subject_homework->subject_file_url = json_decode($subject_homework->subject_file_url, true); } else { $subject_homework->subject_file_url = []; } + if ($subject_homework->subject_file_version_url) { + $subject_homework->subject_file_version_url = json_decode($subject_homework->subject_file_version_url, true); + } else { + $subject_homework->subject_file_version_url = []; + } return [ 'code' => ResponseCode::SUCCESS, diff --git a/plugin/admin/app/controller/SubjectHomeworkController.php b/plugin/admin/app/controller/SubjectHomeworkController.php index b4e3ad2..f0115bd 100644 --- a/plugin/admin/app/controller/SubjectHomeworkController.php +++ b/plugin/admin/app/controller/SubjectHomeworkController.php @@ -113,7 +113,6 @@ class SubjectHomeworkController extends Crud } $last_homework_feedback_url = []; - if (isset($data['last_homework_feedback_url'])) { foreach ($data['last_homework_feedback_url'] as $key => $value) { $last_homework_feedback_url[] = [ @@ -122,6 +121,18 @@ class SubjectHomeworkController extends Crud ]; } } + + $last_homework_feedback_version_url = []; + if (isset($data['last_homework_feedback_version_url'])) { + foreach ($data['last_homework_feedback_version_url'] as $key => $value) { + $last_homework_feedback_version_url[] = [ + 'url' => $value, + 'name' => $data['last_homework_feedback_version_url_name'][$key] + ]; + } + } + + $subject_report_url = []; if (isset($data['subject_report_url'])) { foreach ($data['subject_report_url'] as $key => $value) { @@ -131,6 +142,19 @@ class SubjectHomeworkController extends Crud ]; } } + + + $subject_report_version_url = []; + if (isset($data['subject_report_version_url'])) { + foreach ($data['subject_report_version_url'] as $key => $value) { + $subject_report_version_url[] = [ + 'url' => $value, + 'name' => $data['subject_report_version_url_name'][$key] + ]; + } + } + + $subject_file_url = []; if (isset($data['subject_file_url'])) { foreach ($data['subject_file_url'] as $key => $value) { @@ -141,15 +165,34 @@ class SubjectHomeworkController extends Crud } } + + $subject_file_version_url = []; + if (isset($data['subject_file_version_url'])) { + foreach ($data['subject_file_version_url'] as $key => $value) { + $subject_file_version_url[] = [ + 'url' => $value, + 'name' => $data['subject_file_version_url_name'][$key] + ]; + } + } + + + $subject_homework = \app\common\model\SubjectHomework::where(['id' => $data['id']])->findOrEmpty(); $subject_homework->save([ - 'is_publish' => $data['is_publish'], + 'homework_version_is_publish' => $data['homework_version_is_publish'], + 'last_homework_feedback_is_publish' => $data['last_homework_feedback_is_publish'], + 'subject_report_version_is_publish' => $data['subject_report_version_is_publish'], + 'subject_file_version_is_publish' => $data['subject_file_version_is_publish'], 'homework_web_url' => $data['homework_web_url'], 'homework_file_url' => empty($homework_file_url) ? '' : json_encode($homework_file_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), 'homework_version_file_url' => empty($homework_version_file_url) ? '' : json_encode($homework_version_file_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), 'last_homework_feedback_url' => empty($last_homework_feedback_url) ? '' : json_encode($last_homework_feedback_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), + 'last_homework_feedback_version_url' => empty($last_homework_feedback_version_url) ? '' : json_encode($last_homework_feedback_version_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), 'subject_report_url' => empty($subject_report_url) ? '' : json_encode($subject_report_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), + 'subject_report_version_url' => empty($subject_report_version_url) ? '' : json_encode($subject_report_version_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), 'subject_file_url' => empty($subject_file_url) ? '' : json_encode($subject_file_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), + 'subject_file_version_url' => empty($subject_file_version_url) ? '' : json_encode($subject_file_version_url, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES), ]); return json([ @@ -171,13 +214,23 @@ class SubjectHomeworkController extends Crud if ($subject_homework['last_homework_feedback_url']) { $subject_homework['last_homework_feedback_url'] = json_decode($subject_homework['last_homework_feedback_url'], true); } + if ($subject_homework['last_homework_feedback_version_url']) { + $subject_homework['last_homework_feedback_version_url'] = json_decode($subject_homework['last_homework_feedback_version_url'], true); + } if ($subject_homework['subject_report_url']) { $subject_homework['subject_report_url'] = json_decode($subject_homework['subject_report_url'], true); } + if ($subject_homework['subject_report_version_url']) { + $subject_homework['subject_report_version_url'] = json_decode($subject_homework['subject_report_version_url'], true); + } if ($subject_homework['subject_file_url']) { $subject_homework['subject_file_url'] = json_decode($subject_homework['subject_file_url'], true); } + if ($subject_homework['subject_file_version_url']) { + $subject_homework['subject_file_version_url'] = json_decode($subject_homework['subject_file_version_url'], true); + } + return view('subject-homework/update', ['subject_homework' => $subject_homework]); } diff --git a/plugin/admin/app/view/subject-homework/update.html b/plugin/admin/app/view/subject-homework/update.html index 488716f..3b62a28 100644 --- a/plugin/admin/app/view/subject-homework/update.html +++ b/plugin/admin/app/view/subject-homework/update.html @@ -76,160 +76,306 @@ class="layui-input"> +
+ 课程作业 - -
- -
- {if !empty($subject_homework['homework_file_url'])} - {foreach $subject_homework['homework_file_url'] as $index => $item} -
-
- {$item['name']} - - - +
+ +
+ {if !empty($subject_homework['homework_file_url'])} + {foreach $subject_homework['homework_file_url'] as $index => $item} +
+
+ {$item['name']} + + + +
+ {/foreach} + {/if} +
- {/foreach} - {/if} - -
-
- -
-
- -
- -
- {if !empty($subject_homework['homework_version_file_url'])} - {foreach $subject_homework['homework_version_file_url'] as $index => $item} -
-
- {$item['name']} - - - -
-
- {/foreach} - {/if} - -
-
- -
-
- -
- -
- {if !empty($subject_homework['last_homework_feedback_url'])} - {foreach $subject_homework['last_homework_feedback_url'] as $index => $item} -
-
- {$item['name']} - - - -
-
- {/foreach} - {/if} - -
-
- -
-
-
- -
- -
- {if !empty($subject_homework['subject_report_url'])} - {foreach $subject_homework['subject_report_url'] as $index => $item} -
-
- {$item['name']} - - -
- {/foreach} - {/if} -
-
- -
-
+
+ +
+ {if !empty($subject_homework['homework_version_file_url'])} + {foreach $subject_homework['homework_version_file_url'] as $index => $item} +
+
+ {$item['name']} + + + +
+
+ {/foreach} + {/if} -
- -
-
- {if !empty($subject_homework['subject_file_url'])} - {foreach $subject_homework['subject_file_url'] as $index => $item} -
-
- {$item['name']} - - -
+
+ +
+
+ +
+ +
+ + +
+
+
+ + +
+ 上次作业 + +
+ +
+ {if !empty($subject_homework['last_homework_feedback_url'])} + {foreach $subject_homework['last_homework_feedback_url'] as $index => $item} +
+
+ {$item['name']} + + + +
+
+ {/foreach} + {/if} + +
+
+ +
+
+ +
+ +
+ {if !empty($subject_homework['last_homework_feedback_version_url'])} + {foreach $subject_homework['last_homework_feedback_version_url'] as $index => $item} +
+
+ {$item['name']} + + + +
+
+ {/foreach} + {/if} + +
+
+ +
+
+ +
+ +
+ + +
+
+ +
+ + +
+ 课程报告 + +
+ +
+ {if !empty($subject_homework['subject_report_url'])} + {foreach $subject_homework['subject_report_url'] as $index => $item} +
+
+ {$item['name']} + + + +
+
+ {/foreach} + {/if} + +
+
+ +
+
+ +
+ +
+ {if !empty($subject_homework['subject_report_version_url'])} + {foreach $subject_homework['subject_report_version_url'] as $index => $item} +
+
+ {$item['name']} + + + +
+
+ {/foreach} + {/if} + +
+
+ +
+
+ +
+ +
+ + +
+
+
+ + +
+ 课程文件 + +
+ +
+
+ {if !empty($subject_homework['subject_file_url'])} + {foreach $subject_homework['subject_file_url'] as $index => $item} +
+
+ {$item['name']} + + + +
+
+ {/foreach} + {/if} + +
+
+
- {/foreach} - {/if} -
-
- + + +
+ +
+
+ {if !empty($subject_homework['subject_file_version_url'])} + {foreach $subject_homework['subject_file_version_url'] as $index => $item} +
+
+ {$item['name']} + + + +
+
+ {/foreach} + {/if} + +
+
+ +
+
-
+ +
+ +
+ + +
+
+
+ + - -
- -
- - -
-
- - -
@@ -243,6 +389,7 @@
+ @@ -395,6 +542,33 @@ $('#last_homework_feedback_url').on('click', '.remove_last_homework_feedback_url', function () { $(this).parent().parent().remove(); }) + // 字段 上次家庭作业翻译件 last_homework_feedback_url + layui.use(["upload", "layer", "popup", "util"], function () { + let input = layui.$("#last_homework_feedback_version_url").prev(); + input.prev().html(layui.util.escape(input.val())); + layui.upload.render({ + elem: "#last_homework_feedback_version_url_upload", + accept: "file", + url: "/app/admin/upload/uploadFile", + field: "file", + done: function (res) { + if (res.code) return layui.popup.failure(res.msg); + $('#last_homework_feedback_version_url').append('
\n' + + '
\n' + + '' + res.data.name + '\n' + + '\n' + + '\n' + + '\n' + + '
\n' + + '
'); + + } + }); + }); + + $('#last_homework_feedback_version_url').on('click', '.remove_last_homework_feedback_version_url', function () { + $(this).parent().parent().remove(); + }) // 字段课程报告 subject_report_url @@ -425,6 +599,34 @@ $(this).parent().parent().remove(); }) + // 字段课程报告 subject_report_url + layui.use(["upload", "layer", "popup", "util"], function () { + let input = layui.$("#subject_report_version_url").prev(); + input.prev().html(layui.util.escape(input.val())); + layui.upload.render({ + elem: "#subject_report_version_url_upload", + accept: "file", + url: "/app/admin/upload/uploadFile", + field: "file", + done: function (res) { + if (res.code) return layui.popup.failure(res.msg); + $('#subject_report_version_url').append('
\n' + + '
\n' + + '' + res.data.name + '\n' + + '\n' + + '\n' + + '\n' + + '
\n' + + '
'); + + } + }); + }); + + $('#subject_report_version_url').on('click', '.remove_subject_report_version_url', function () { + $(this).parent().parent().remove(); + }) + // 字段课程报告 subject_file_url layui.use(["upload", "layer", "popup", "util"], function () { let input = layui.$("#subject_file_url").prev(); @@ -453,6 +655,43 @@ $(this).parent().parent().remove(); }) + // 字段课程报告 subject_file_url + layui.use(["upload", "layer", "popup", "util"], function () { + let input = layui.$("#subject_file_version_url").prev(); + input.prev().html(layui.util.escape(input.val())); + layui.upload.render({ + elem: "#subject_file_version_url_upload", + accept: "file", + url: "/app/admin/upload/uploadFile", + field: "file", + done: function (res) { + if (res.code) return layui.popup.failure(res.msg); + $('#subject_file_version_url').append('
\n' + + '
\n' + + '' + res.data.name + '\n' + + '\n' + + '\n' + + '\n' + + '
\n' + + '
'); + + } + }); + }); + + $('#subject_file_version_url').on('click', '.remove_subject_file_version_url', function () { + $(this).parent().parent().remove(); + }) + + // 字段 是否发布 is_publish + layui.use(["form"], function () { + layui.$("#homework_version_is_publish").attr("checked", layui.$('input[name="homework_version_is_publish"]').val() != 0); + layui.form.render(); + layui.form.on("switch(homework_version_is_publish)", function (data) { + layui.$('input[name="homework_version_is_publish"]').val(this.checked ? 1 : 0); + }); + }) + // 字段 是否发布 is_publish layui.use(["form"], function () { layui.$("#is_publish").attr("checked", layui.$('input[name="is_publish"]').val() != 0); @@ -462,6 +701,32 @@ }); }) + // 字段 是否发布 is_publish + layui.use(["form"], function () { + layui.$("#last_homework_feedback_is_publish").attr("checked", layui.$('input[name="last_homework_feedback_is_publish"]').val() != 0); + layui.form.render(); + layui.form.on("switch(last_homework_feedback_is_publish)", function (data) { + layui.$('input[name="last_homework_feedback_is_publish"]').val(this.checked ? 1 : 0); + }); + }) + + // 字段 是否发布 is_publish + layui.use(["form"], function () { + layui.$("#subject_report_version_is_publish").attr("checked", layui.$('input[name="subject_report_version_is_publish"]').val() != 0); + layui.form.render(); + layui.form.on("switch(subject_report_version_is_publish)", function (data) { + layui.$('input[name="subject_report_version_is_publish"]').val(this.checked ? 1 : 0); + }); + }) + // 字段 是否发布 is_publish + layui.use(["form"], function () { + layui.$("#subject_file_version_is_publish").attr("checked", layui.$('input[name="subject_file_version_is_publish"]').val() != 0); + layui.form.render(); + layui.form.on("switch(subject_file_version_is_publish)", function (data) { + layui.$('input[name="subject_file_version_is_publish"]').val(this.checked ? 1 : 0); + }); + }) + // 字段 创建时间 created_at layui.use(["laydate"], function () { layui.laydate.render({