提交 fa7e050c 编写于 作者: L LAPTOP-UV1MNL38\18023

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

......@@ -122,7 +122,7 @@ layui.config({
}
function getTableParams() {
return $.extend(true, {objectId: subjectClassesId,subjectClassesId: subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
return $.extend(true, {objectKey: objectKey,objectId: subjectClassesId,subjectClassesId: subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('chapterList', {});
......
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
// 根据以下两个参数判断:工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
......@@ -37,6 +38,8 @@ layui.config({
let data = json.bean;
dsFormUtil.initEditPageForStatic('content', 'FP2023082800011', data, {
savePreParams: function (params) {
params.objectId = objectId;
params.objectKey = objectKey;
params.subjectClassesId = subjectClassesId;
}
});
......
var objectKey = "";
var objectId = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
table = layui.table;
objectKey = GetUrlParam("objectKey");
objectId = GetUrlParam("objectId");
subjectClassesId = GetUrlParam("subjectClassesId");
if (isNull(objectKey) || isNull(objectId)) {
winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
return false;
}
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'get',
url: sysMainMation.schoolBasePath + 'queryCoursewareListBySubjectClassesId',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'name', title: '名称', align: 'left', width: 300, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
}},
{ field: 'remark', title: '相关描述', align: 'left', width: 300},
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ 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 () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'details') { //详情
details(data);
} else if (layEvent === 'del') { //删除
del(data);
}
});
// 新增
$("body").on("click", "#addBean", function() {
parent._openNewWindows({
url: '../../tpl/courseware/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId,
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "coursewareAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 编辑
function edit(data) {
parent._openNewWindows({
url: '../../tpl/courseware/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId+ '&id=' + data.id,
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "coursewareEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 详情
function details(data) {
parent._openNewWindows({
url: systemCommonUtil.getUrl('FP2024070900001&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "coursewareDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
// 删除
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 + "deleteCoursewareById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {objectKey: objectKey, objectId: subjectClassesId,subjectClassesId: subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('coursewareList', {});
});
\ No newline at end of file
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
var objectParams = {};
// 根据以下两个参数判断:工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var id = GetUrlParam("id");
var objectId = GetUrlParam("objectId");
var objectKey = GetUrlParam("objectKey");
objectParams.subjectClassesId = GetUrlParam("subjectClassesId");
if (isNull(id)) {
dsFormUtil.initAddPageForStatic('content', 'FP2024070900003', {
savePreParams: function (params) {
params.objectId = objectId;
params.objectKey = objectKey;
params.subjectClassesId = objectParams.subjectClassesId;
}
});
}else{
AjaxPostUtil.request({
url: sysMainMation.schoolBasePath + "queryCoursewareById",
params: {id: id},
type: 'json',
method: 'GET',
callback: function (json) {
let data = json.bean;
dsFormUtil.initEditPageForStatic('content', 'FP2024070900004', data, {
savePreParams: function (params) {
params.objectId = objectId;
params.objectKey = objectKey;
params.subjectClassesId = objectParams.subjectClassesId;
}
});
}
});
}
});
\ No newline at end of file
var objectKey = "";
var objectId = "";
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
var $ = layui.$,
form = layui.form,
table = layui.table;
objectKey = GetUrlParam("objectKey");
objectId = GetUrlParam("objectId");
subjectClassesId = GetUrlParam("subjectClassesId");
if (isNull(objectKey) || isNull(objectId)) {
winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
return false;
}
table.render({
id: 'messageTable',
elem: '#messageTable',
method: 'get',
url: sysMainMation.schoolBasePath + 'queryAssignmentListBySubjectClassesId',
where: getTableParams(),
even: true,
page: true,
limits: getLimits(),
limit: getLimit(),
cols: [[
{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
{ field: 'name', title: '名称', align: 'left', width: 300, templet: function (d) {
return '<a lay-event="details" class="notice-title-click">' + d.name + '</a>';
}},
{ field: 'remark', title: '相关描述', align: 'left', width: 300},
{ field: 'endTime', title: '截止时间', align: 'left', width: 120 },
{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
{ 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 () {
table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
});
}
});
table.on('tool(messageTable)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'edit') { //编辑
edit(data);
} else if (layEvent === 'details') { //详情
details(data);
} else if (layEvent === 'del') { //删除
del(data);
}
});
// 新增
$("body").on("click", "#addBean", function() {
parent._openNewWindows({
url: '../../tpl/homework/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId,
title: systemLanguage["com.skyeye.addPageTitle"][languageType],
pageId: "homeworkAdd",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
// 编辑
function edit(data) {
parent._openNewWindows({
url: '../../tpl/homework/write.html?objectId=' + objectId + '&objectKey=' + objectKey + '&subjectClassesId=' + subjectClassesId+ '&id=' + data.id,
title: systemLanguage["com.skyeye.editPageTitle"][languageType],
pageId: "homeworkEdit",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
loadTable();
}});
}
// 详情
function details(data) {
parent._openNewWindows({
url: systemCommonUtil.getUrl('FP2024070900002&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
pageId: "homeworkDetails",
area: ['90vw', '90vh'],
callBack: function (refreshCode) {
}});
}
// 删除
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 + "deleteAssignmentById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
loadTable();
}});
});
}
form.render();
$("body").on("click", "#reloadTable", function() {
loadTable();
});
function loadTable() {
table.reloadData("messageTable", {where: getTableParams()});
}
function getTableParams() {
return $.extend(true, {objectKey: objectKey, objectId: subjectClassesId,subjectClassesId: subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('coursewareList', {});
});
\ No newline at end of file
// 以下两个参数开启团队权限时有值
var objectId = '', objectKey = '';
var objectParams = {};
// 根据以下两个参数判断:工作流的判断是否要根据serviceClassName的判断
var serviceClassName;
layui.config({
base: basePath,
version: skyeyeVersion
}).extend({
window: 'js/winui.window'
}).define(['window', 'table', 'jquery'], function (exports) {
winui.renderColor();
var index = parent.layer.getFrameIndex(window.name);
var $ = layui.$;
var id = GetUrlParam("id");
var objectId = GetUrlParam("objectId");
var objectKey = GetUrlParam("objectKey");
objectParams.subjectClassesId = GetUrlParam("subjectClassesId");
if (isNull(id)) {
dsFormUtil.initAddPageForStatic('content', 'FP2024070900005', {
savePreParams: function (params) {
params.objectId = objectId;
params.objectKey = objectKey;
params.subjectClassesId = objectParams.subjectClassesId;
}
});
}else{
AjaxPostUtil.request({
url: sysMainMation.schoolBasePath + "queryAssignmentById",
params: {id: id},
type: 'json',
method: 'GET',
callback: function (json) {
let data = json.bean;
dsFormUtil.initEditPageForStatic('content', 'FP2024070900006', data, {
savePreParams: function (params) {
params.objectId = objectId;
params.objectKey = objectKey;
params.subjectClassesId = objectParams.subjectClassesId;
}
});
}
});
}
});
\ No newline at end of file
......@@ -119,7 +119,7 @@ layui.config({
}
function getTableParams() {
return $.extend(true, {objectKey: objectKey, objectId: subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
return $.extend(true, {objectKey: objectKey, objectId: subjectClassesId,subjectClassesId: subjectClassesId}, initTableSearchUtil.getSearchValue("messageTable"));
}
exports('knowledgeList', {});
......
......@@ -37,7 +37,9 @@ layui.config({
let data = json.bean;
dsFormUtil.initEditPageForStatic('content', 'FP2023082800014', data, {
savePreParams: function (params) {
params.subjectClassesId = subjectClassesId;
params.objectId = objectId;
params.objectKey = objectKey;
params.subjectClassesId = objectParams.subjectClassesId;
}
});
}
......
......@@ -25,6 +25,12 @@ layui.config({
}, {
title: '知识点',
pageUrl: '../../tpl/knowledge/knowledgeList.html?subjectClassesId=' + subjectClassesId
}, {
title: '互动课件',
pageUrl: '../../tpl/courseware/coursewareList.html?subjectClassesId=' + subjectClassesId
}, {
title: '作业',
pageUrl: '../../tpl/homework/homeworkList.html?subjectClassesId=' + subjectClassesId
}],
element: layui.element,
object: {
......
<!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 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;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del"><language showName="com.skyeye.deleteBtn"></language></a>
</script>
</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/courseware/'}).use('coursewareList');
</script>
</body>
</html>
\ No newline at end of file
<!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/courseware/'}).use('write');
</script>
</body>
</html>
\ No newline at end of file
<!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 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;">
<table id="messageTable" lay-filter="messageTable"></table>
<script type="text/html" id="tableBar">
<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="del"><language showName="com.skyeye.deleteBtn"></language></a>
</script>
</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('homeworkList');
</script>
</body>
</html>
\ No newline at end of file
<!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('write');
</script>
</body>
</html>
\ No newline at end of file
......@@ -229,5 +229,12 @@
"orderQualityInspectionType": {"name": "ERP-采购订单质检状态", "className": "skyeye-erp#com.skyeye.business.classenum.OrderQualityInspectionType"},
"deliveryPutState": {"name": "ERP-采购到货单免检商品入库状态", "className": "skyeye-erp#com.skyeye.purchase.classenum.DeliveryPutState"},
"qualityInspectionPutState": {"name": "ERP-采购质检单商品入库状态", "className": "skyeye-erp#com.skyeye.inspection.classenum.QualityInspectionPutState"},
"qualityInspectionReturnState": {"name": "ERP-采购质检单商品退货状态", "className": "skyeye-erp#com.skyeye.inspection.classenum.QualityInspectionReturnState"}
"qualityInspectionReturnState": {"name": "ERP-采购质检单商品退货状态", "className": "skyeye-erp#com.skyeye.inspection.classenum.QualityInspectionReturnState"},
"homeworkApplicationProcessEnum": {"name": "云课堂-作业应用环节", "className": "skyeye-school#com.skyeye.school.assignment.classenum.AssignmentApplicationProcess"},
"homeworkCorrectStatusEnum": {"name": "云课堂-作业提交批改状态", "className": "skyeye-school#com.skyeye.school.assignment.classenum.AssignmentCorrectState"},
"homeworkSubStatusEnum": {"name": "云课堂-学生作业提交状态", "className": "skyeye-school#com.skyeye.school.assignment.classenum.AssignmentSubState"},
"homeworkTimeStatusEnum": {"name": "云课堂-作业的时间状态", "className": "skyeye-school#com.skyeye.school.assignment.classenum.AssignmentTimeState"},
"homeworkTypeEnum": {"name": "云课堂-作业类型", "className": "skyeye-school#com.skyeye.school.assignment.classenum.AssignmentType"}
}
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册