update:作业批改

school/src/main/resources/template/js/homework/correct.js

+
+// 以下两个参数开启团队权限时有值
+var objectId = '', objectKey = '';
+// 根据以下两个参数判断：工作流的判断是否要根据serviceClassName的判断
+var serviceClassName;
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form', 'tagEditor', 'laydate'], function (exports) {
+    winui.renderColor();
+    var index = parent.layer.getFrameIndex(window.name);
+    var $ = layui.$;
+    var id = GetUrlParam("id");
+
+    AjaxPostUtil.request({
+        url: sysMainMation.schoolBasePath + "queryAssignmentSubById",
+        params: {id: id},
+        type: 'json',
+        method: 'GET',
+        callback: function (json) {
+            let data = json.bean;
+            dsFormUtil.initEditPageForStatic('content', 'FP2024071300013', data, {
+                savePreParams: function (params) {
+                }
+            });
+        }
+    });
+
+});
\ No newline at end of file

school/src/main/resources/template/js/homework/hasSubmit.js

@@ -29,6 +29,9 @@ layui.config({
             { field: 'accountNumber', title: '学号', align: 'left', width: 180, templet: function(d) {
                     return getNotUndefinedVal(d.createMation?.accountNumber);
             }},
+            { field: 'content', title: '内容', align: 'left', width: 180, templet: function (d) {
+                    return '<a lay-event="details" class="notice-title-click">' + d.content + '</a>';
+            }},
             { field: 'state', title: '状态', align: 'left',width: 150, templet: function(d) {
                 var str = '';
                 if (d.state == 'beCorrected') {
@@ -39,12 +42,12 @@ layui.config({
                     return str;
             }},
             { field: 'score', title: '分数', align: 'left',width: 150},
-            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 250 },
+            { field: 'lastUpdateTime', title: '最后提交时间', align: 'center', width: 250 },
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#tableBar' }
         ]],
         done: function(json) {
             matchingLanguage();
-            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () {
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "暂不支持搜索", function () {
                 table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
             });
         }
@@ -55,11 +58,25 @@ layui.config({
         var layEvent = obj.event;
         if (layEvent === 'correct') { //批改
             correct(data);
+        } else if (layEvent === 'details') { //详情
+            details(data);
         }
     });
 
+    // 详情
+    function details(data) {
+        parent.parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2024071300001&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "homeworkDetails",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+            }});
+    }
+
     //批改
     function correct(data) {
+        console.log(11)
         parent.parent._openNewWindows({
             url: '../../tpl/homework/correct.html?id=' + data.id,
             title: '作业批改',

school/src/main/resources/template/js/homework/homeworkList.js

@@ -117,8 +117,8 @@ layui.config({
     function submit(data) {
         parent.parent._openNewWindows({
             url: '../../tpl/homework/submit.html?id=' + data.id,
-            title: '作业批改',
-            pageId: "homeworkCorrect",
+            title: '提交情况',
+            pageId: "homeworkSubmit",
             area: ['90vw', '90vh'],
             callBack: function (refreshCode) {
                 winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});

school/src/main/resources/template/js/homework/noSubmit.js

@@ -25,11 +25,12 @@ layui.config({
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
             { field: 'name', title: '姓名', align: 'center', width: 200},
             { field: 'accountNumber', title: '学号', align: 'left', width: 200 },
-            { field: 'signature', title: '个性签名', align: 'left',width: 250}
+            { field: 'signature', title: '个性签名', align: 'left',width: 250},
+            { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 250 }
         ]],
         done: function(json) {
             matchingLanguage();
-            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () {
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "暂不支持搜索", function () {
                 table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
             });
         }

school/src/main/resources/template/tpl/homework/correct.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+<div style="margin:0 auto;padding:20px;">
+    <form class="layui-form" action="" id="showForm" autocomplete="off">
+        <div id="content"></div>
+        <div class="layui-form-item layui-col-xs12">
+            <div class="layui-input-block">
+                <button class="winui-btn" type="button" id="cancle"><language showName="com.skyeye.cancel"></language></button>
+                <button class="winui-btn" lay-submit lay-filter="formWriteBean" id="formWriteBean">保存</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<script src="../../assets/lib/layui/layui.js"></script>
+<script src="../../assets/lib/layui/custom.js"></script>
+<script type="text/javascript">
+    layui.config({base: '../../js/homework/'}).use('correct');
+</script>
+</body>
+</html>

school/src/main/resources/template/tpl/homework/hasSubmit.html

@@ -10,7 +10,6 @@
 <div class="winui-toolbar">
     <div class="winui-tool">
         <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-        <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="add"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
     </div>
 </div>
 <div style="margin:auto 10px;">