tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent e562855c3b e5ae745d54
commit efa768d64c
4 changed files with 290 additions and 79 deletions
Show Stats Download Patch File Download Diff File

18
admin-core/src/main/resources/static/js/common.js
Unescape Escape View File

@ -609,6 +609,24 @@ var Common = {
}else {
return '';
}
},
toChinesNum:function (num) {
//完成将 toChineseNum， 可以将数字转换成中文大写的表示，处理到万级别，例如 toChineseNum(12345)，返回 一万二千三百四十五。
let changeNum = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九']; //changeNum[0] = "零"
let unit = ["", "十", "百", "千", "万"];
num = parseInt(num);
let getWan = (temp) => {
let strArr = temp.toString().split("").reverse();
let newNum = "";
for (var i = 0; i < strArr.length; i++) {
newNum = (i == 0 && strArr[i] == 0 ? "" : (i > 0 && strArr[i] == 0 && strArr[i - 1] == 0 ? "" : changeNum[strArr[i]] + (strArr[i] == 0 ? unit[0] : unit[i]))) + newNum;
}
return newNum;
}
let overWan = Math.floor(num / 10000);
let noWan = num % 10000;
if (noWan.toString().length < 4) noWan = "0" + noWan;
return overWan ? getWan(overWan) + "万" + getWan(noWan) : getWan(num);
}
});

3
web/src/main/resources/static/js/jlw/teacherOpenCourseMergeSchoolClass/index.js
Unescape Escape View File

@ -34,7 +34,6 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
cols: [[ // 表头
{
type: 'checkbox',
},
{
field: 'teacherOpenCourseTitle',
@ -43,7 +42,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
hideField: false,
hide: $.isEmpty(sx_['teacherOpenCourseTitle']) ? false : sx_['teacherOpenCourseTitle'],
templet:function (d) {
return d.teacherOpenCourse.teacherOpenCourseTitle
return d.teacherOpenCourseIdText
}
},
{

297
web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/index.js
Unescape Escape View File

@ -1,8 +1,31 @@
layui.define([ 'form', 'laydate', 'table' ], function(exports) {
layui.define(function (exports) { //提示：组件也可以依赖其它组件，如：layui.define('jquery', callback);
exports('treetable');
});
//调用
layui.config({
base: Common.ctxPath + '/plugins/treetable-lay/' //假设这是treetable.js所在的目录 可以把你需要扩展的js插件都放在一个文件夹内
}).extend({ //设定组件别名
treetable: 'treetable'
});
layui.define([ 'form', 'laydate', 'table','treetable','element'], function(exports) {
var form = layui.form;
var laydate = layui.laydate;
var table = layui.table;
var element = layui.element;
var teacherOpenCourseScheduleSessionTagTable = null;
var teacherOpenCourseScheduleSessionClassTable = null;
var tagTableData = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionTag/list.json' ).data// 数据接口)
//一些事件触发
element.on('tab(docDemoTabBrief)', function(data){
if(data.index === 0){//tag_add
$("#tag_add").css("display",'flex')
$("#class_add").css("display",'none');
}else {
$("#class_add").css("display",'flex');
$("#tag_add").css("display",'none');
}
});
var view ={
init:function(){
var that = this
@ -17,90 +40,160 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
initTable:function(){
var sx_ = localStorage.getItem("teacherOpenCourseScheduleSessionTagTable_field_"+Common.userInfoId); //筛选值显示、隐藏缓存
if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);}
/*课次设置table*/
teacherOpenCourseScheduleSessionTagTable = table.render({
elem : '#teacherOpenCourseScheduleSessionTagTable',
height : Lib.getTableHeight(1),
cellMinWidth: 100,
method : 'post',
url : Common.ctxPath + '/jlw/teacherOpenCourseScheduleSessionTag/list.json' // 数据接口
,page : Lib.tablePage // 开启分页
data:tagTableData
/*,page : Lib.tablePage // 开启分页
,toolbar: '#toolbar_teacherOpenCourseScheduleSessionTag' //自定义头部左侧工具栏
,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
,limit : 10,
cols : [ [ // 表头
{
type : 'checkbox',
,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
,limit : 100
, cols: [[ // 表头
/* {
field : 'teacherOpenCourseScheduleSessionTagId',
title : '课程开课-课次标签ID',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagId'])?false:sx_['teacherOpenCourseScheduleSessionTagId'],
width : 60,
},
{
field : 'teacherOpenCourseScheduleSessionTagDuration',
title : '课程时长（分钟）',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagDuration'])?false:sx_['teacherOpenCourseScheduleSessionTagDuration'],
},
// {
// field : 'teacherOpenCourseScheduleSessionTagId',
// title : '课程开课-课次标签ID',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagId'])?false:sx_['teacherOpenCourseScheduleSessionTagId'],
//
// width : 60,
// },
{
field : 'teacherOpenCourseScheduleSessionTagName',
title : '课次名称',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagName'])?false:sx_['teacherOpenCourseScheduleSessionTagName'],
},
{
field : 'teacherOpenCourseScheduleSessionTagDuration',
title : '课程时长（分钟）',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagDuration'])?false:sx_['teacherOpenCourseScheduleSessionTagDuration'],
},
{
field : 'teacherOpenCourseScheduleSessionTagAddTime',
title : '创建时间',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagAddTime'])?false:sx_['teacherOpenCourseScheduleSessionTagAddTime'],
},
{
field : 'teacherOpenCourseScheduleSessionTagAddTime',
title : '创建时间',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagAddTime'])?false:sx_['teacherOpenCourseScheduleSessionTagAddTime'],
},
{
field : 'teacherOpenCourseScheduleSessionTagStartTime',
title : '开始时间',
field : 'orgId',
title : '组织ID',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagStartTime'])?false:sx_['teacherOpenCourseScheduleSessionTagStartTime'],
hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
},
{
field : 'teacherOpenCourseScheduleSessionTagEndTime',
title : '结束时间',
field : 'userId',
title : '用户ID',
align:"center",
hideField :false,
hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionTagEndTime'])?false:sx_['teacherOpenCourseScheduleSessionTagEndTime'],
},
// {
// field : 'orgId',
// title : '组织ID',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
// },
// {
// field : 'userId',
// title : '用户ID',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
// }
{
field : 'operation_',title : '操作',align:"center", templet: function (d) {
var htm = '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
return htm;
hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
},*/
{
field: 'teacherOpenCourseScheduleSessionTagName',
title: '课次名称',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionTagName']) ? false : sx_['teacherOpenCourseScheduleSessionTagName'],
},
{
field: 'teacherOpenCourseScheduleSessionTagStartTime',
title: '开始时间',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionTagStartTime']) ? false : sx_['teacherOpenCourseScheduleSessionTagStartTime'],
templet:StartTime,
event:"startTime"
},
{
field: 'teacherOpenCourseScheduleSessionTagEndTime',
title: '结束时间',
align: "center",
hideField: false,
edit:"text",
hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionTagEndTime']) ? false : sx_['teacherOpenCourseScheduleSessionTagEndTime'],
templet:EndTime,
event:"endTime"
},
{
field: 'operation_', title: '操作', align: "center", templet: function (d) {
var htm = '<a class="layui-table-link" lay-event="del" style="color: #FF5722;">删除</a>';
return htm;
}
}
}
] ]
]]
});
/*排课教室table*/
teacherOpenCourseScheduleSessionClassTable = table.render({
elem: '#teacherOpenCourseScheduleSessionClassTable',
height: Lib.getTableHeight(1),
cellMinWidth: 100,
method: 'post',
//url: Common.ctxPath + '/jlw/teacherOpenCourseScheduleSessionClass/levelList.json' // 数据接口 带数据层级
url : Common.ctxPath + '/jlw/teacherOpenCourseScheduleSessionClass/list.json' // 数据接口
/*,page : Lib.tablePage // 开启分页*/
/* ,toolbar: '#toolbar_teacherOpenCourseScheduleSessionClass' //自定义头部左侧工具栏
,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
,limit : 10,*/
, cols: [[ // 表头
// {
// field : 'teacherOpenCourseScheduleSessionClassId',
// title : '课程开课-排课位置ID',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['teacherOpenCourseScheduleSessionClassId'])?false:sx_['teacherOpenCourseScheduleSessionClassId'],
//
// width : 60,
// },
{
field: 'teacherOpenCourseScheduleSessionClassName',
title: '排课位置名称',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionClassName']) ? false : sx_['teacherOpenCourseScheduleSessionClassName'],
},
{
field: 'teacherOpenCourseScheduleSessionClassParentId',
title: '父辈ID',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionClassParentId']) ? false : sx_['teacherOpenCourseScheduleSessionClassParentId'],
},
// {
// field : 'orgId',
// title : '组织ID',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['orgId'])?false:sx_['orgId'],
// },
// {
// field : 'userId',
// title : '用户ID',
// align:"center",
// hideField :false,
// hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
// },
{
field: 'teacherOpenCourseScheduleSessionClassAddTime',
title: '创建时间',
align: "center",
hideField: false,
hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionClassAddTime']) ? false : sx_['teacherOpenCourseScheduleSessionClassAddTime'],
}
,{
field : 'operation_',title : '操作',align:"center", templet: function (d) {
var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>';
htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
return htm;
}
}
});
]]
});
table.on('checkbox(teacherOpenCourseScheduleSessionTagTable)', function(obj){
var teacherOpenCourseScheduleSessionTag = obj.data;
if(obj.checked){
@ -109,6 +202,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}
})
table.on('edit(teacherOpenCourseScheduleSessionTagTable)', function(obj){ //注：edit是固定事件名，test是table原始容器的属性 lay-filter="对应的值"
console.log(obj.value); //得到修改后的值
console.log(obj.field); //当前编辑的字段名
console.log(obj.data); //所在行的所有相关数据
});
},
initSearchForm:function(){
@ -117,9 +215,40 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
initToolBar:function(){
toolbar = {
class_add: function () {
console.log("dd")
},
add: function () {
var url = "/jlw/teacherOpenCourseScheduleSessionTag/add.do";
Common.openDlg(url,"课次管理>新增");
/*var url = "/jlw/teacherOpenCourseScheduleSessionTag/add.do";
Common.openDlg(url,"课次管理>新增");*/
let newRow= {
"teacherOpenCourseScheduleSessionTagId": "",
"teacherOpenCourseScheduleSessionTagName": "第"+$.toChinesNum(tagTableData.length+1)+"节",
"teacherOpenCourseScheduleSessionTagStartTime": "00:00",
"teacherOpenCourseScheduleSessionTagEndTime": "00:00",
"orgId": "1",
"userId": "1"
};
tagTableData.push(newRow);
layui.table.reload('teacherOpenCourseScheduleSessionTagTable',{
data: tagTableData,
done: function(res, curr, count){//curr当前页码
laydate.render({
elem: '#startTime'+newRow.teacherOpenCourseScheduleSessionTagName
, type: 'time'
, trigger: 'click'
, format: 'HH:mm'
, show:true
});
laydate.render({
elem: '#endTime'+newRow.teacherOpenCourseScheduleSessionTagName
, type: 'time'
, trigger: 'click'
, format: 'HH:mm'
, show:true
});
}
});
},
edit: function () {
var data = Common.getOneFromTable(table,"teacherOpenCourseScheduleSessionTagTable");
@ -153,6 +282,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
}, initTableTool: table.on('tool(teacherOpenCourseScheduleSessionTagTable)', function (obj) {
var data = obj.data;
var teacherOpenCourseScheduleSessionTagName = data.teacherOpenCourseScheduleSessionTagName;
if (obj.event === 'edit') {
var url = "/jlw/teacherOpenCourseScheduleSessionTag/add.do?teacherOpenCourseScheduleSessionTagId="+data.teacherOpenCourseScheduleSessionTagId;
Common.openDlg(url,"课次管理>"+data.teacherOpenCourseScheduleSessionTagId+">编辑");
@ -164,14 +294,45 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
icon: ret.code == 0?1:2,
time: 1500 //2秒关闭（如果不配置，默认是3秒）
},function (){
if($.isEmpty(data.teacherOpenCourseScheduleSessionTagId)){
tagTableData.splice($(obj.tr[0]).attr('data-index'),1);
layui.table.reload('teacherOpenCourseScheduleSessionTagTable',{data: tagTableData});
}
if(ret.code == 0){
Lib.tableRefresh();
}
});
});
}else if(obj.event === 'startTime'){
laydate.render({
elem: '#startTime'+teacherOpenCourseScheduleSessionTagName
, type: 'time'
, trigger: 'click'
, format: 'HH:mm'
, show:true
});
}if(obj.event === 'endTime'){
laydate.render({
elem: '#endTime'+teacherOpenCourseScheduleSessionTagName
, type: 'time'
, trigger: 'click'
, format: 'HH:mm'
, show:true
});
}
})
}
function StartTime(obj){
var teacherOpenCourseScheduleSessionTagStartTime = obj.teacherOpenCourseScheduleSessionTagStartTime;
var id = "startTime"+obj.teacherOpenCourseScheduleSessionTagName;
return '<div id='+id+'>'+teacherOpenCourseScheduleSessionTagStartTime+'</div>'
}
function EndTime(obj){
var teacherOpenCourseScheduleSessionTagEndTime = obj.teacherOpenCourseScheduleSessionTagEndTime;
var id = "endTime"+obj.teacherOpenCourseScheduleSessionTagName;
return '<div id='+id+'>'+teacherOpenCourseScheduleSessionTagEndTime+'</div>'
}
exports('index',view);
});

51
web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.html
Unescape Escape View File

@ -1,10 +1,43 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
<div class="layui-layer-title" style="cursor: move;background-color: #fff">排课管理&gt;初始化排课条件设置</div>
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseScheduleSessionTag/"}){ -->
<style>
.layui-laydate-content > .layui-laydate-list {
padding-bottom: 0px;
overflow: hidden;
}
</body>
</html>
.layui-laydate-content > .layui-laydate-list > li {
width: 50%;
}
</style>
<div class="layui-tab layui-tab-brief layuiAdmin" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title">
<li class="layui-this">课次设置</li>
<li >排课教室</li>
<div style="float: right" id="tag_add">
<!--<layui:accessButton function="teacherOpenCourseScheduleSessionTag.edit" action="edit"><i class="iconfont">&#xebd8;</i>修改</layui:accessButton>-->
<layui:accessButton function="teacherOpenCourseScheduleSessionTag.add" action="add" ><i class="layui-icon">&#xe61f;</i>新增</layui:accessButton>
</div>
<div style="float: right;display: none" id="class_add">
<layui:accessButton function="teacherOpenCourseScheduleSessionClass.add" action="class_add"><i class="layui-icon">&#xe61f;</i>新增</layui:accessButton>
</div>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<table id="teacherOpenCourseScheduleSessionTagTable"
lay-filter="teacherOpenCourseScheduleSessionTagTable"></table></div>
<div class="layui-tab-item">
<table id="teacherOpenCourseScheduleSessionClassTable"
lay-filter="teacherOpenCourseScheduleSessionClassTable"></table>
</div>
</div>
</div>
<!--#} -->
<script>
layui.use(['index'], function(){
var index = layui.index;
index.init();
});
</script>

Write Preview
Loading…
Cancel
Save