Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

school/src/main/resources/template/js/announcement/announcementList.js

@@ -23,7 +23,7 @@ layui.config({
     table.render({
         id: 'messageTable',
         elem: '#messageTable',
-        method: 'get',
+        method: 'post',
         url: sysMainMation.schoolBasePath + 'queryAnnouncementAllList',
         where: getTableParams(),
         even: false,
@@ -46,7 +46,7 @@ layui.config({
         ]],
         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/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) {
+}).define(['window', 'jquery', 'winui', 'form'], function (exports) {
     winui.renderColor();
     var index = parent.layer.getFrameIndex(window.name);
-    var $ = layui.$;
+    var $ = layui.$,
+        textool = layui.textool,
+        form = layui.form;
     var id = GetUrlParam("id");
+    var assignmentId = GetUrlParam("assignmentId");
+    var fullMarks
 
-    AjaxPostUtil.request({
-        url: sysMainMation.schoolBasePath + "queryAssignmentSubById",
-        params: {id: id},
-        type: 'json',
+    showGrid({
+        id: "showForm",
+        url: sysMainMation.schoolBasePath + "queryAssignmentById",
+        params: {id: assignmentId},
         method: 'GET',
-        callback: function (json) {
-            let data = json.bean;
-            dsFormUtil.initEditPageForStatic('content', 'FP2024071300013', data, {
-                savePreParams: function (params) {
-                }
-            });
+        pagination: false,
+        template: $("#beanTemplate").html(),
+        ajaxSendAfter: function (json) {
+            fullMarks = json.bean.fullMarks;
+            matchingLanguage();
+            form.render();
+        }
+    });
+
+    if (!isNull(id)) {
+        AjaxPostUtil.request({url: sysMainMation.schoolBasePath + "queryAssignmentSubById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
+                $("#score").val(json.bean.score);
+                $("#comment").val(json.bean.comment);
+                matchingLanguage();
+                form.render();
+            }});
+    }
+
+    form.on('submit(formAddBean)', function (data) {
+        if($("#score").val()>fullMarks ){
+            winui.window.msg('请输入正确评分', {icon: 2, time: 2000});
+            console.log(fullMarks)
+            console.log($("#score").val())
+            return false;
         }
+        if (winui.verifyForm(data.elem)) {
+            let params = {
+                id: id,
+                score:  $("#score").val(),
+                comment: $("#comment").val(),
+            }
+            AjaxPostUtil.request({
+                url: sysMainMation.schoolBasePath + "readOverAssignmentSubById",
+                params: params,
+                type: 'json',
+                method: 'POST',
+                callback: function (json) {
+                parent.layer.close(index);
+                parent.refreshCode = '0';
+            }});
+        }
+        return false;
     });
 
+    $("body").on("click", "#cancle", function() {
+        parent.layer.close(index);
+    });
 });
\ No newline at end of file

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

@@ -24,13 +24,13 @@ layui.config({
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
             { field: 'name', title: '姓名', align: 'left', width: 150, templet: function(d) {
-                    return getNotUndefinedVal(d.createMation?.name);
+                return getNotUndefinedVal(d.createMation?.name);
             }},
             { field: 'accountNumber', title: '学号', align: 'left', width: 180, templet: function(d) {
-                    return getNotUndefinedVal(d.createMation?.accountNumber);
+                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>';
+                return '<a lay-event="details" class="notice-title-click">' + d.content + '</a>';
             }},
             { field: 'state', title: '状态', align: 'left',width: 150, templet: function(d) {
                 var str = '';
@@ -77,7 +77,7 @@ layui.config({
     //批改
     function correct(data) {
         parent.parent._openNewWindows({
-            url: '../../tpl/homework/correct.html?id=' + data.id,
+            url: '../../tpl/homework/correct.html?id=' + data.id+ '&assignmentId=' + assignmentId,
             title: '作业批改',
             pageId: "homeworkCorrect",
             area: ['90vw', '90vh'],

school/src/main/resources/template/js/material/write.js

@@ -32,7 +32,7 @@ layui.config({
             url: sysMainMation.schoolBasePath + "queryDatumById",
             params: {id: id},
             type: 'json',
-            method: 'GET',
+            method: 'POST',
             callback: function (json) {
                 let data = json.bean;
                 dsFormUtil.initEditPageForStatic('content', 'FP2024072000002', data, {

school/src/main/resources/template/js/topic/details.js

@@ -62,7 +62,7 @@ layui.config({
     function del(data, obj) {
         layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
             layer.close(index);
-            AjaxPostUtil.request({url: sysMainMation.schoolBasePath + "deleteTopicById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+            AjaxPostUtil.request({url: sysMainMation.schoolBasePath + "deleteTopicCommentById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
                     winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
                     loadTable();
                 }});

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

@@ -9,16 +9,42 @@
 <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 type="text/x-handlebars-template" id="beanTemplate">
+    {{#bean}}
+    <div class="layui-form-item layui-col-xs12">
+        <span class="hr-title">基本信息</span><hr>
+    </div>
+    <div class="layui-form-item layui-col-xs6">
+        <label class="layui-form-label">总分：</label>
+        <div class="layui-input-block ver-center">
+            {{fullMarks}}
+        </div>
+    </div>
+    <div class="layui-form-item layui-col-xs12">
+        <label class="layui-form-label">分数<i class="red">*</i></label>
+        <div class="layui-input-block">
+            <input type="text" id="score" name="score"  win-verify="required|number" placeholder="请输入分数(小于总分)" class="layui-input" />
+        </div>
+    </div>
+    <div class="layui-form-item layui-col-xs12">
+        <label class="layui-form-label">评语</label>
+        <div class="layui-input-block">
+            <textarea id="comment" name="comment"  placeholder="请输入评语" class="layui-textarea"></textarea>
+        </div>
+    </div>
+    <div class="layui-form-item layui-col-xs12">
+        <div class="layui-input-block">
+            <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
+            <button class="winui-btn" lay-submit lay-filter="formAddBean">保存</button>
+        </div>
+    </div>
+    {{/bean}}
+</script>
+
 <script src="../../assets/lib/layui/layui.js"></script>
 <script src="../../assets/lib/layui/custom.js"></script>
 <script type="text/javascript">