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

修改bug

Browse Source
beetlsql3-dev
姚丹ab 2 years ago
parent 997e7633cc
commit 8882b78a35
11 changed files with 55 additions and 46 deletions
Show Stats Download Patch File Download Diff File

11
admin-core/src/main/resources/static/js/lib.js
Unescape Escape View File

@ -1014,6 +1014,17 @@ var Lib = {
$(key).empty(); $(key).empty();
$(key).append(htm); $(key).append(htm);
layui.form.render(); layui.form.render();
},getClassByUniCol:function (key, sysId){ //根据院校获取班级
var ret = Common.getAjax("/jlw/schoolClass/getValues.json",{universitiesCollegesId: sysId});
var htm = '<option value="">请选择</option>';
if(ret.code == 0){
for (var i = 0;i < ret.data.length;i++){
htm += '<option value="'+ret.data[i].classId+'">'+ret.data[i].className+'</option>';
}
}
$(key).empty();
$(key).append(htm);
layui.form.render();
},getClassByUniSys:function (key, sysId){ //根据专业获取班级 },getClassByUniSys:function (key, sysId){ //根据专业获取班级
var ret = Common.getAjax("/jlw/schoolClass/getValues.json",{universitySystemId: sysId}); var ret = Common.getAjax("/jlw/schoolClass/getValues.json",{universitySystemId: sysId});
var htm = '<option value="">请选择</option>'; var htm = '<option value="">请选择</option>';

4
web/src/main/resources/static/js/jlw/resourcesInfo/index.js
Unescape Escape View File

@ -81,7 +81,6 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
} }
}, },
{ {
field: 'courseInfoName', title: '归属小节', align: "center", width: 200, templet: function (d) { field: 'courseInfoName', title: '归属小节', align: "center", width: 200, templet: function (d) {
var htm = "<select lay-filter='select_courseInfoIds_2'><option value=''>请选择</option>"; var htm = "<select lay-filter='select_courseInfoIds_2'><option value=''>请选择</option>";
if (!$.isEmpty(d.courseInfoId)) { if (!$.isEmpty(d.courseInfoId)) {
@ -112,11 +111,10 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
field: 'resourcesInfoType', width: 150, title: '资源类型', align: "center", templet: function (d) {//(1视频 2PPT 3PDF) field: 'resourcesInfoType', width: 150, title: '资源类型', align: "center", templet: function (d) {//(1视频 2PPT 3PDF)
var text= d.resourcesInfoType == 1 ? "视频" : d.resourcesInfoType == 2 ? "PPT" : d.resourcesInfoType == 3 ? "PDF" : d.resourcesInfoType == 4 ? "链接" : d.resourcesInfoType == 5 ? "图文" : '-'; var text= d.resourcesInfoType == 1 ? "视频" : d.resourcesInfoType == 2 ? "PPT" : d.resourcesInfoType == 3 ? "PDF" : d.resourcesInfoType == 4 ? "链接" : d.resourcesInfoType == 5 ? "图文" : '-';
return '<span class="textType">' + text + '</span>'; return '<span class="textType">' + text + '</span>';
} }
}, },
{ {
field: 'userId', title: '操作', width: 180, align: "center", templet: function (d) { field: 'userId', title: '操作', width: 180, align: "center",field:'right', templet: function (d) {
var htm = '<a class="layui-table-link" lay-event="edit">编辑</a>'; var htm = '<a class="layui-table-link" lay-event="edit">编辑</a>';
htm += '<a class="layui-table-link" lay-event="previewPage">' + (d.resourcesInfoType == 3 ? '下载' : '预览') + '</a>'; htm += '<a class="layui-table-link" lay-event="previewPage">' + (d.resourcesInfoType == 3 ? '下载' : '预览') + '</a>';
htm += '<a class="layui-table-link" lay-event="del">删除</a>'; htm += '<a class="layui-table-link" lay-event="del">删除</a>';

4
web/src/main/resources/static/js/jlw/student/add.js
Unescape Escape View File

@ -61,9 +61,9 @@ layui.define([ 'form', 'laydate', 'table','studentApi'], function(exports) {
Common.openDlg(url,""); Common.openDlg(url,"");
}); });
//根据所选学校查询院系 //根据所选院校查询班级
form.on('select(select_universitiesColleges)', function (obj) { form.on('select(select_universitiesColleges)', function (obj) {
Lib.getUniversityFacultys($("select[name='classId']"),obj.value); Lib.getClassByUniCol($("select[name='classId']"),obj.value);
}); });
//查询专业 //查询专业
form.on('select(select_universityFacultyIds)', function (obj) { form.on('select(select_universityFacultyIds)', function (obj) {

21
web/src/main/resources/static/js/jlw/student/index.js
Unescape Escape View File

@ -3,6 +3,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
var laydate = layui.laydate; var laydate = layui.laydate;
var table = layui.table; var table = layui.table;
var studentTable = null; var studentTable = null;
var isSignRole = $("input[name='isSignRole']").val();
var view ={ var view ={
init:function(){ init:function(){
this.initTable(); this.initTable();
@ -25,19 +26,25 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
url : Common.ctxPath + '/jlw/student/list.json' // 数据接口 url : Common.ctxPath + '/jlw/student/list.json' // 数据接口
,page : Lib.tablePage // 开启分页 ,page : Lib.tablePage // 开启分页
,limit : 10, ,limit : 10,
cols : [ [ // 表头 cols : [ [ // 表头//isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student
{ {
field : 'universitiesCollegesName', field : 'universitiesCollegesName',
title : '所属院校',align: "center",hide:$("input[name='beTeacher']").val() != 1?false:true title : '所属院校',align: "center",
hide: isSignRole != 2 ? false : true,
}, },
/*{ {
field : 'universitiesCollegesName',
title : '所属院系',align: "center",
hide: isSignRole != 1 ? false : true
},
{
field : 'classIdText', field : 'classIdText',
title : '所属专业',align: "center" title : '所属专业',align: "center",
},*/ hide: isSignRole != 1 ? false : true
},
{ {
field : 'classIdText', field : 'classIdText',
title : '班级名称',align: "center" title : '所属班级',align: "center"
}, },
{ {

1
web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js
Unescape Escape View File

@ -52,6 +52,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
{ {
field : 'schoolClassInfo', field : 'schoolClassInfo',
title : '上课班级', title : '上课班级',
style: "text-align: left;",
hideField :false, hideField :false,
width:'30%', width:'30%',
align:"center", align:"center",

1
web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js
Unescape Escape View File

@ -48,6 +48,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) {
field: 'schoolClassIdsText', field: 'schoolClassIdsText',
title: '上课班级', title: '上课班级',
align: "center", align: "center",
style: "text-align: left;",
hideField: false, hideField: false,
hide: $.isEmpty(sx_['schoolClassIdsText']) ? false : sx_['schoolClassIdsText'], hide: $.isEmpty(sx_['schoolClassIdsText']) ? false : sx_['schoolClassIdsText'],
/*templet:function (d) { /*templet:function (d) {

3
web/src/main/resources/templates/jlw/resourcesQuestion/index.html
Unescape Escape View File

@ -36,10 +36,13 @@
<div class="layui-btn-group"> <div class="layui-btn-group">
<!-- <layui:accessButton function="resourcesQuestion.query" id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>--> <!-- <layui:accessButton function="resourcesQuestion.query" id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>-->
<!--#if(isSignRole.get()!'' != 2){ -->
<layui:accessButton function="resourcesQuestion.add" action="add"><i class="layui-icon">&#xe61f;</i>新增 <layui:accessButton function="resourcesQuestion.add" action="add"><i class="layui-icon">&#xe61f;</i>新增
</layui:accessButton> </layui:accessButton>
<layui:accessButton function="resourcesQuestion.add" action="import"><i class="iconfont">&#xebc9;</i>批量导入 <layui:accessButton function="resourcesQuestion.add" action="import"><i class="iconfont">&#xebc9;</i>批量导入
</layui:accessButton> </layui:accessButton>
<!--#}-->
<layui:accessButton function="resourcesQuestion.add" action="allDel" class="layui-btn-danger"><i <layui:accessButton function="resourcesQuestion.add" action="allDel" class="layui-btn-danger"><i
class="layui-icon">&#xe640;</i>批量删除 class="layui-icon">&#xe640;</i>批量删除
</layui:accessButton> </layui:accessButton>

48
web/src/main/resources/templates/jlw/student/add.html
Unescape Escape View File

@ -4,23 +4,10 @@
<div style="margin-left: 95px;"> <div style="margin-left: 95px;">
<layui:submitButtons id="addButton" buttonType="" /> <layui:submitButtons id="addButton" buttonType="" />
</div> </div>
<!--beTeacher :1是院校老师 2：不是--> <!--isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
<!--#if(beTeacher == 2){ --> <!--#if(isSignRole.get()!'' == 2){ -->
<div class="layui-row"> <div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>所属院校：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitiesCollegesId}"
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="select_universitiesColleges"/>
</div>
</div>
<button type="button" class="layui-btn layui-btn-sm rightOffAdd bg_button">去添加</button>
</div>
</div>
<!--<div class="layui-row">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>所属院系：</label> <label class="layui-form-label"><span class="req">*</span>所属院系：</label>
@ -30,11 +17,11 @@
</div> </div>
</div> </div>
</div> </div>
</div>--> </div>
<div class="layui-row"> <div class="layui-row">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>专业：</label> <label class="layui-form-label"><span class="req">*</span>所属专业：</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universityFacultyId}" <layui:simpleDictSelect style='layui-input-inline' value="${universitySystemId}" type="university_system.university_system_name.university_system_status=1,university_faculty_id=${universityFacultyId}"
id="universitySystemId" name="universitySystemId" layFilter="select_universitySystemId" /> id="universitySystemId" name="universitySystemId" layFilter="select_universitySystemId" />
@ -43,29 +30,28 @@
<button type="button" class="layui-btn layui-btn-sm rightOffUniversityAdd bg_button">去添加</button> <button type="button" class="layui-btn layui-btn-sm rightOffUniversityAdd bg_button">去添加</button>
</div> </div>
</div> </div>
<!--#}else{--> <!--#}else{-->
<input type="hidden" name="universitiesCollegesId" value="${universitiesCollegesId}">
<div class="layui-row"> <div class="layui-row">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label"><span class="req">*</span>班级是：</label> <label class="layui-form-label"><span class="req">*</span>所属院校：</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${student.classId}" <layui:simpleDictSelect style='layui-input-inline' value="${universitiesCollegesId}"
type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="classId" name="classId"/> id="universitiesCollegesId" name="universitiesCollegesId"
</div> layFilter="select_universitiesColleges"/>
</div>
</div> </div>
<button type="button" class="layui-btn layui-btn-sm rightOffClassAdd bg_button">去添加</button> <button type="button" class="layui-btn layui-btn-sm rightOffAdd bg_button">去添加</button>
</div> </div>
</div> </div>
<input type="hidden" name="universitiesCollegesId" value="${universitiesCollegesId}">
<!--#}--> <!--#}-->
<div class="layui-row"> <div class="layui-row">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label"><span class="req" >*</span>班级不是：</label> <label class="layui-form-label"><span class="req" >*</span>所属班级：</label>
<div class="layui-input-inline" value="${beTeacher}"> <div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline' value="${student.classId}" <layui:simpleDictSelect style='layui-input-inline' value="${student.classId}"
type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}" type="school_class.class_name.class_status=1,universities_colleges_id=${universitiesCollegesId}"
id="classId" name="classId"/> id="classId" name="classId"/>
@ -97,7 +83,7 @@
<div class="layui-row"> <div class="layui-row">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">学生电话：</label> <label class="layui-form-label">电话号码：</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" name="studentMobile" maxlength="11" value="${student.studentMobile}" class="layui-input" > <input type="text" name="studentMobile" maxlength="11" value="${student.studentMobile}" class="layui-input" >
</div> </div>

2
web/src/main/resources/templates/jlw/student/index.html
Unescape Escape View File

@ -46,7 +46,7 @@
</div> </div>
<table id="studentTable" lay-filter="studentTable"></table> <table id="studentTable" lay-filter="studentTable"></table>
<input name="beTeacher" value="${beTeacher}" type="hidden" /> <input name="isSignRole" value="${isSignRole.get()!''}" type="hidden" />
<!--#} --> <!--#} -->
<script> <script>

3
web/src/main/resources/templates/jlw/studentClientLink/applicationAdmin.html
Unescape Escape View File

@ -103,7 +103,7 @@
toolbar = { toolbar = {
add : function() { // 获取选中数据 add : function() { // 获取选中数据
var url = "/jlw/resourcesApplication/add.do"; var url = "/jlw/resourcesApplication/add.do";
Common.openDlg(url,"应用管理/新增应用"); //Common.openDlg(url,"应用管理/新增应用");
}, },
refresh: function () {//刷新 refresh: function () {//刷新
searchForm.reset(); searchForm.reset();
@ -148,6 +148,7 @@
function deleteInfo(ids){ function deleteInfo(ids){
layer.confirm('是否确定删除应用？', function (index) { layer.confirm('是否确定删除应用？', function (index) {
return;
var ret = Common.postAjax("/jlw/resourcesApplication/delete.json", {ids: ids}); var ret = Common.postAjax("/jlw/resourcesApplication/delete.json", {ids: ids});
layer.msg(ret.code == 0 ? "删除成功！" : ret.msg, { layer.msg(ret.code == 0 ? "删除成功！" : ret.msg, {
offset: ['50%'], offset: ['50%'],

3
web/src/main/resources/templates/jlw/studentClientLink/applicationOther.html
Unescape Escape View File

@ -110,7 +110,7 @@
toolbar = { toolbar = {
add : function() { // 获取选中数据 add : function() { // 获取选中数据
var url = "/jlw/resourcesApplication/add.do"; var url = "/jlw/resourcesApplication/add.do";
Common.openDlg(url,"应用管理/新增应用"); //Common.openDlg(url,"应用管理/新增应用");
}, },
refresh: function () {//刷新 refresh: function () {//刷新
searchForm.reset(); searchForm.reset();
@ -155,6 +155,7 @@
function deleteInfo(ids){ function deleteInfo(ids){
layer.confirm('是否确定删除应用？', function (index) { layer.confirm('是否确定删除应用？', function (index) {
return;
var ret = Common.postAjax("/jlw/resourcesApplication/delete.json", {ids: ids}); var ret = Common.postAjax("/jlw/resourcesApplication/delete.json", {ids: ids});
layer.msg(ret.code == 0 ? "删除成功！" : ret.msg, { layer.msg(ret.code == 0 ? "删除成功！" : ret.msg, {
offset: ['50%'], offset: ['50%'],

Write Preview
Loading…
Cancel
Save